Post one_tribe cleanup
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
widelands |
Fix Released
|
Undecided
|
Unassigned |
Bug Description
I am collecting a to-do list here for changes that we should do after one tribe has been merged. We might eventually split this up into several bugs. I will keep editing this entry
1. (Fix Committed) Expose something like ScopedTimer to the Lua interface, so we can add this to loading messages in Lua for both the world and the tribes.
2. (Fix Committed) Shift NumberGlob algorithm in Animations from C++ to Lua.
SirVer: But I just grepped the source code and realized that we never use the regular expression ability of list_directory anywhere except tests. How about changing it to do the work of NumGlob? I mean renaming it to path.list_
3. (Fix Committed) Since the website won't be able to parse the init.lua files, we need better help for wares in the Encyclopedia
4. (Fix Committed) All index data types used in DescriptionMain
5. (Fix Committed) We should think about refactoring the directory structure in Logic. Something along the lines of:
src/logic/
src/logic/
src/logic/
6. (Being handled in https:/
7. (Fix Committed) Check if militarysites need to be productionsites, or if the inheritance can be shifted directly to Building. e.g. "outputs" is weird.
8. (Fix Committed) Turn static functions in Tribes into stand-alone functions.
Related branches
- kaputtnik (community): Approve
-
Diff: 6568 lines (+1283/-1042)337 files modifiedsrc/logic/bill_of_materials.h (+1/-1)
src/logic/building.cc (+1/-1)
src/logic/building.h (+2/-2)
src/logic/immovable.cc (+0/-1)
src/logic/production_program.cc (+94/-48)
src/logic/production_program.h (+29/-35)
src/logic/productionsite.cc (+6/-8)
src/logic/productionsite.h (+3/-3)
src/logic/tribes/tribe_descr.cc (+2/-3)
src/logic/ware_descr.cc (+1/-1)
src/logic/ware_descr.h (+2/-2)
src/logic/worker_descr.cc (+1/-1)
src/logic/worker_descr.h (+2/-2)
src/scripting/lua_map.cc (+138/-27)
src/scripting/lua_map.h (+9/-3)
src/wui/encyclopedia_window.cc (+191/-284)
src/wui/encyclopedia_window.h (+46/-82)
src/wui/helpwindow.cc (+1/-1)
tribes/buildings/militarysites/atlanteans/castle/init.lua (+1/-1)
tribes/buildings/militarysites/atlanteans/guardhall/init.lua (+1/-1)
tribes/buildings/militarysites/atlanteans/guardhouse/init.lua (+1/-1)
tribes/buildings/militarysites/atlanteans/tower/init.lua (+1/-1)
tribes/buildings/militarysites/atlanteans/tower_high/init.lua (+1/-1)
tribes/buildings/militarysites/atlanteans/tower_small/init.lua (+1/-1)
tribes/buildings/militarysites/barbarians/barrier/init.lua (+1/-1)
tribes/buildings/militarysites/barbarians/citadel/init.lua (+1/-1)
tribes/buildings/militarysites/barbarians/fortress/init.lua (+1/-1)
tribes/buildings/militarysites/barbarians/sentry/init.lua (+1/-1)
tribes/buildings/militarysites/barbarians/tower/init.lua (+1/-1)
tribes/buildings/militarysites/empire/barrier/init.lua (+1/-1)
tribes/buildings/militarysites/empire/blockhouse/init.lua (+1/-1)
tribes/buildings/militarysites/empire/castle/init.lua (+1/-1)
tribes/buildings/militarysites/empire/fortress/init.lua (+1/-1)
tribes/buildings/militarysites/empire/outpost/init.lua (+1/-1)
tribes/buildings/militarysites/empire/sentry/init.lua (+1/-1)
tribes/buildings/militarysites/empire/tower/init.lua (+1/-1)
tribes/buildings/partially_finished/constructionsite/init.lua (+1/-1)
tribes/buildings/partially_finished/dismantlesite/init.lua (+1/-1)
tribes/buildings/productionsites/atlanteans/armorsmithy/init.lua (+1/-1)
tribes/buildings/productionsites/atlanteans/bakery/init.lua (+1/-1)
tribes/buildings/productionsites/atlanteans/blackroot_farm/init.lua (+1/-1)
tribes/buildings/productionsites/atlanteans/charcoal_kiln/init.lua (+1/-1)
tribes/buildings/productionsites/atlanteans/coalmine/init.lua (+1/-1)
tribes/buildings/productionsites/atlanteans/crystalmine/init.lua (+1/-1)
tribes/buildings/productionsites/atlanteans/farm/init.lua (+1/-1)
tribes/buildings/productionsites/atlanteans/fishbreeders_house/init.lua (+1/-1)
tribes/buildings/productionsites/atlanteans/fishers_house/init.lua (+1/-1)
tribes/buildings/productionsites/atlanteans/foresters_house/init.lua (+1/-1)
tribes/buildings/productionsites/atlanteans/gold_spinning_mill/init.lua (+1/-1)
tribes/buildings/productionsites/atlanteans/goldmine/init.lua (+1/-1)
tribes/buildings/productionsites/atlanteans/horsefarm/init.lua (+1/-1)
tribes/buildings/productionsites/atlanteans/hunters_house/init.lua (+1/-1)
tribes/buildings/productionsites/atlanteans/ironmine/init.lua (+1/-1)
tribes/buildings/productionsites/atlanteans/mill/init.lua (+1/-1)
tribes/buildings/productionsites/atlanteans/quarry/init.lua (+1/-1)
tribes/buildings/productionsites/atlanteans/sawmill/init.lua (+1/-1)
tribes/buildings/productionsites/atlanteans/scouts_house/init.lua (+1/-1)
tribes/buildings/productionsites/atlanteans/shipyard/init.lua (+1/-1)
tribes/buildings/productionsites/atlanteans/smelting_works/init.lua (+1/-1)
tribes/buildings/productionsites/atlanteans/smokery/init.lua (+1/-1)
tribes/buildings/productionsites/atlanteans/spiderfarm/init.lua (+1/-1)
tribes/buildings/productionsites/atlanteans/toolsmithy/init.lua (+1/-1)
tribes/buildings/productionsites/atlanteans/weaponsmithy/init.lua (+1/-1)
tribes/buildings/productionsites/atlanteans/weaving_mill/init.lua (+1/-1)
tribes/buildings/productionsites/atlanteans/well/init.lua (+1/-1)
tribes/buildings/productionsites/atlanteans/woodcutters_house/init.lua (+1/-1)
tribes/buildings/productionsites/barbarians/ax_workshop/init.lua (+1/-1)
tribes/buildings/productionsites/barbarians/bakery/init.lua (+1/-1)
tribes/buildings/productionsites/barbarians/big_inn/init.lua (+1/-1)
tribes/buildings/productionsites/barbarians/brewery/init.lua (+1/-1)
tribes/buildings/productionsites/barbarians/cattlefarm/init.lua (+1/-1)
tribes/buildings/productionsites/barbarians/charcoal_kiln/init.lua (+1/-1)
tribes/buildings/productionsites/barbarians/coalmine/init.lua (+1/-1)
tribes/buildings/productionsites/barbarians/coalmine_deep/init.lua (+1/-1)
tribes/buildings/productionsites/barbarians/coalmine_deeper/init.lua (+1/-1)
tribes/buildings/productionsites/barbarians/farm/init.lua (+1/-1)
tribes/buildings/productionsites/barbarians/fishers_hut/init.lua (+1/-1)
tribes/buildings/productionsites/barbarians/gamekeepers_hut/init.lua (+1/-1)
tribes/buildings/productionsites/barbarians/goldmine/init.lua (+1/-1)
tribes/buildings/productionsites/barbarians/goldmine_deep/init.lua (+1/-1)
tribes/buildings/productionsites/barbarians/goldmine_deeper/init.lua (+1/-1)
tribes/buildings/productionsites/barbarians/granitemine/init.lua (+1/-1)
tribes/buildings/productionsites/barbarians/helmsmithy/init.lua (+1/-1)
tribes/buildings/productionsites/barbarians/hunters_hut/init.lua (+1/-1)
tribes/buildings/productionsites/barbarians/inn/init.lua (+1/-1)
tribes/buildings/productionsites/barbarians/ironmine/init.lua (+1/-1)
tribes/buildings/productionsites/barbarians/ironmine_deep/init.lua (+1/-1)
tribes/buildings/productionsites/barbarians/ironmine_deeper/init.lua (+1/-1)
tribes/buildings/productionsites/barbarians/lime_kiln/init.lua (+1/-1)
tribes/buildings/productionsites/barbarians/lumberjacks_hut/init.lua (+1/-1)
tribes/buildings/productionsites/barbarians/metal_workshop/init.lua (+1/-1)
tribes/buildings/productionsites/barbarians/micro_brewery/init.lua (+1/-1)
tribes/buildings/productionsites/barbarians/quarry/init.lua (+1/-1)
tribes/buildings/productionsites/barbarians/rangers_hut/init.lua (+1/-1)
tribes/buildings/productionsites/barbarians/reed_yard/init.lua (+1/-1)
tribes/buildings/productionsites/barbarians/scouts_hut/init.lua (+1/-1)
tribes/buildings/productionsites/barbarians/shipyard/init.lua (+1/-1)
tribes/buildings/productionsites/barbarians/smelting_works/init.lua (+1/-1)
tribes/buildings/productionsites/barbarians/tavern/init.lua (+1/-1)
tribes/buildings/productionsites/barbarians/warmill/init.lua (+1/-1)
tribes/buildings/productionsites/barbarians/weaving_mill/init.lua (+1/-1)
tribes/buildings/productionsites/barbarians/well/init.lua (+1/-1)
tribes/buildings/productionsites/barbarians/wood_hardener/init.lua (+1/-1)
tribes/buildings/productionsites/empire/armorsmithy/init.lua (+1/-1)
tribes/buildings/productionsites/empire/bakery/init.lua (+1/-1)
tribes/buildings/productionsites/empire/brewery/init.lua (+1/-1)
tribes/buildings/productionsites/empire/charcoal_kiln/init.lua (+1/-1)
tribes/buildings/productionsites/empire/coalmine/init.lua (+1/-1)
tribes/buildings/productionsites/empire/coalmine_deep/init.lua (+1/-1)
tribes/buildings/productionsites/empire/donkeyfarm/init.lua (+1/-1)
tribes/buildings/productionsites/empire/farm/init.lua (+1/-1)
tribes/buildings/productionsites/empire/fishers_house/init.lua (+1/-1)
tribes/buildings/productionsites/empire/foresters_house/init.lua (+1/-1)
tribes/buildings/productionsites/empire/goldmine/init.lua (+1/-1)
tribes/buildings/productionsites/empire/goldmine_deep/init.lua (+1/-1)
tribes/buildings/productionsites/empire/hunters_house/init.lua (+1/-1)
tribes/buildings/productionsites/empire/inn/init.lua (+1/-1)
tribes/buildings/productionsites/empire/ironmine/init.lua (+1/-1)
tribes/buildings/productionsites/empire/ironmine_deep/init.lua (+1/-1)
tribes/buildings/productionsites/empire/lumberjacks_house/init.lua (+1/-1)
tribes/buildings/productionsites/empire/marblemine/init.lua (+1/-1)
tribes/buildings/productionsites/empire/marblemine_deep/init.lua (+1/-1)
tribes/buildings/productionsites/empire/mill/init.lua (+1/-1)
tribes/buildings/productionsites/empire/piggery/init.lua (+1/-1)
tribes/buildings/productionsites/empire/quarry/init.lua (+1/-1)
tribes/buildings/productionsites/empire/sawmill/init.lua (+1/-1)
tribes/buildings/productionsites/empire/scouts_house/init.lua (+1/-1)
tribes/buildings/productionsites/empire/sheepfarm/init.lua (+1/-1)
tribes/buildings/productionsites/empire/shipyard/init.lua (+1/-1)
tribes/buildings/productionsites/empire/smelting_works/init.lua (+1/-1)
tribes/buildings/productionsites/empire/stonemasons_house/init.lua (+1/-1)
tribes/buildings/productionsites/empire/tavern/init.lua (+1/-1)
tribes/buildings/productionsites/empire/toolsmithy/init.lua (+1/-1)
tribes/buildings/productionsites/empire/vineyard/init.lua (+1/-1)
tribes/buildings/productionsites/empire/weaponsmithy/init.lua (+1/-1)
tribes/buildings/productionsites/empire/weaving_mill/init.lua (+1/-1)
tribes/buildings/productionsites/empire/well/init.lua (+1/-1)
tribes/buildings/productionsites/empire/winery/init.lua (+1/-1)
tribes/buildings/trainingsites/atlanteans/dungeon/init.lua (+1/-1)
tribes/buildings/trainingsites/atlanteans/labyrinth/init.lua (+1/-1)
tribes/buildings/trainingsites/barbarians/battlearena/init.lua (+1/-1)
tribes/buildings/trainingsites/barbarians/trainingcamp/init.lua (+1/-1)
tribes/buildings/trainingsites/empire/arena/init.lua (+1/-1)
tribes/buildings/trainingsites/empire/colosseum/init.lua (+1/-1)
tribes/buildings/trainingsites/empire/trainingcamp/init.lua (+1/-1)
tribes/buildings/warehouses/atlanteans/headquarters/init.lua (+1/-1)
tribes/buildings/warehouses/atlanteans/port/init.lua (+1/-1)
tribes/buildings/warehouses/atlanteans/warehouse/init.lua (+1/-1)
tribes/buildings/warehouses/barbarians/headquarters/init.lua (+1/-1)
tribes/buildings/warehouses/barbarians/headquarters_interim/init.lua (+1/-1)
tribes/buildings/warehouses/barbarians/port/init.lua (+1/-1)
tribes/buildings/warehouses/barbarians/warehouse/init.lua (+1/-1)
tribes/buildings/warehouses/empire/headquarters/init.lua (+1/-1)
tribes/buildings/warehouses/empire/headquarters_shipwreck/init.lua (+1/-1)
tribes/buildings/warehouses/empire/port/init.lua (+1/-1)
tribes/buildings/warehouses/empire/warehouse/init.lua (+1/-1)
tribes/scripting/help/building_help.lua (+20/-110)
tribes/scripting/help/format_help.lua (+169/-0)
tribes/scripting/help/ware_help.lua (+162/-54)
tribes/scripting/help/worker_help.lua (+88/-58)
tribes/wares/armor/init.lua (+1/-1)
tribes/wares/armor_chain/init.lua (+1/-1)
tribes/wares/armor_gilded/init.lua (+1/-1)
tribes/wares/armor_helmet/init.lua (+1/-1)
tribes/wares/ax/init.lua (+1/-1)
tribes/wares/ax_battle/init.lua (+1/-1)
tribes/wares/ax_broad/init.lua (+1/-1)
tribes/wares/ax_bronze/init.lua (+1/-1)
tribes/wares/ax_sharp/init.lua (+1/-1)
tribes/wares/ax_warriors/init.lua (+1/-1)
tribes/wares/basket/init.lua (+1/-1)
tribes/wares/beer/init.lua (+1/-1)
tribes/wares/beer_strong/init.lua (+1/-1)
tribes/wares/blackroot/init.lua (+1/-1)
tribes/wares/blackroot_flour/init.lua (+1/-1)
tribes/wares/blackwood/init.lua (+1/-1)
tribes/wares/bread_atlanteans/init.lua (+1/-1)
tribes/wares/bread_barbarians/init.lua (+1/-1)
tribes/wares/bread_empire/init.lua (+1/-1)
tribes/wares/bread_paddle/init.lua (+1/-1)
tribes/wares/buckets/init.lua (+1/-1)
tribes/wares/cloth/init.lua (+1/-1)
tribes/wares/coal/init.lua (+1/-1)
tribes/wares/corn/init.lua (+1/-1)
tribes/wares/cornmeal/init.lua (+1/-1)
tribes/wares/diamond/init.lua (+1/-1)
tribes/wares/felling_ax/init.lua (+1/-1)
tribes/wares/fire_tongs/init.lua (+1/-1)
tribes/wares/fish/init.lua (+1/-1)
tribes/wares/fishing_net/init.lua (+1/-1)
tribes/wares/fishing_rod/init.lua (+1/-1)
tribes/wares/flour/init.lua (+1/-1)
tribes/wares/gold/init.lua (+1/-1)
tribes/wares/gold_ore/init.lua (+1/-1)
tribes/wares/gold_thread/init.lua (+1/-1)
tribes/wares/granite/init.lua (+1/-1)
tribes/wares/grape/init.lua (+1/-1)
tribes/wares/grout/init.lua (+1/-1)
tribes/wares/hammer/init.lua (+1/-1)
tribes/wares/helmet/init.lua (+1/-1)
tribes/wares/helmet_mask/init.lua (+1/-1)
tribes/wares/helmet_warhelm/init.lua (+1/-1)
tribes/wares/hook_pole/init.lua (+1/-1)
tribes/wares/hunting_bow/init.lua (+1/-1)
tribes/wares/hunting_spear/init.lua (+1/-1)
tribes/wares/iron/init.lua (+1/-1)
tribes/wares/iron_ore/init.lua (+1/-1)
tribes/wares/kitchen_tools/init.lua (+1/-1)
tribes/wares/log/init.lua (+1/-1)
tribes/wares/marble/init.lua (+1/-1)
tribes/wares/marble_column/init.lua (+1/-1)
tribes/wares/meal/init.lua (+1/-1)
tribes/wares/meat/init.lua (+1/-1)
tribes/wares/milking_tongs/init.lua (+1/-1)
tribes/wares/pick/init.lua (+1/-1)
tribes/wares/planks/init.lua (+1/-1)
tribes/wares/quartz/init.lua (+1/-1)
tribes/wares/ration/init.lua (+1/-1)
tribes/wares/saw/init.lua (+1/-1)
tribes/wares/scythe/init.lua (+1/-1)
tribes/wares/shield_advanced/init.lua (+1/-1)
tribes/wares/shield_steel/init.lua (+1/-1)
tribes/wares/shovel/init.lua (+1/-1)
tribes/wares/smoked_fish/init.lua (+1/-1)
tribes/wares/smoked_meat/init.lua (+1/-1)
tribes/wares/snack/init.lua (+1/-1)
tribes/wares/spear/init.lua (+1/-1)
tribes/wares/spear_advanced/init.lua (+1/-1)
tribes/wares/spear_heavy/init.lua (+1/-1)
tribes/wares/spear_war/init.lua (+1/-1)
tribes/wares/spear_wooden/init.lua (+1/-1)
tribes/wares/spider_silk/init.lua (+1/-1)
tribes/wares/spidercloth/init.lua (+1/-1)
tribes/wares/tabard/init.lua (+1/-1)
tribes/wares/tabard_golden/init.lua (+1/-1)
tribes/wares/thatch_reed/init.lua (+1/-1)
tribes/wares/trident_double/init.lua (+1/-1)
tribes/wares/trident_heavy_double/init.lua (+1/-1)
tribes/wares/trident_light/init.lua (+1/-1)
tribes/wares/trident_long/init.lua (+1/-1)
tribes/wares/trident_steel/init.lua (+1/-1)
tribes/wares/water/init.lua (+1/-1)
tribes/wares/wheat/init.lua (+1/-1)
tribes/wares/wine/init.lua (+1/-1)
tribes/wares/wool/init.lua (+1/-1)
tribes/workers/atlanteans/armorsmith/init.lua (+1/-1)
tribes/workers/atlanteans/baker/init.lua (+1/-1)
tribes/workers/atlanteans/blackroot_farmer/init.lua (+1/-1)
tribes/workers/atlanteans/builder/init.lua (+1/-1)
tribes/workers/atlanteans/carrier/init.lua (+1/-1)
tribes/workers/atlanteans/charcoal_burner/init.lua (+1/-1)
tribes/workers/atlanteans/farmer/init.lua (+1/-1)
tribes/workers/atlanteans/fishbreeder/init.lua (+1/-1)
tribes/workers/atlanteans/fisher/init.lua (+1/-1)
tribes/workers/atlanteans/forester/init.lua (+1/-1)
tribes/workers/atlanteans/geologist/init.lua (+1/-1)
tribes/workers/atlanteans/horse/init.lua (+1/-1)
tribes/workers/atlanteans/horsebreeder/init.lua (+1/-1)
tribes/workers/atlanteans/hunter/init.lua (+1/-1)
tribes/workers/atlanteans/miller/init.lua (+1/-1)
tribes/workers/atlanteans/miner/init.lua (+1/-1)
tribes/workers/atlanteans/sawyer/init.lua (+1/-1)
tribes/workers/atlanteans/scout/init.lua (+1/-1)
tribes/workers/atlanteans/shipwright/init.lua (+1/-1)
tribes/workers/atlanteans/smelter/init.lua (+1/-1)
tribes/workers/atlanteans/smoker/init.lua (+1/-1)
tribes/workers/atlanteans/soldier/init.lua (+1/-1)
tribes/workers/atlanteans/spiderbreeder/init.lua (+1/-1)
tribes/workers/atlanteans/stonecutter/init.lua (+1/-1)
tribes/workers/atlanteans/toolsmith/init.lua (+1/-1)
tribes/workers/atlanteans/trainer/init.lua (+1/-1)
tribes/workers/atlanteans/weaponsmith/init.lua (+1/-1)
tribes/workers/atlanteans/weaver/init.lua (+1/-1)
tribes/workers/atlanteans/woodcutter/init.lua (+1/-1)
tribes/workers/barbarians/baker/init.lua (+1/-1)
tribes/workers/barbarians/blacksmith/init.lua (+1/-1)
tribes/workers/barbarians/blacksmith_master/init.lua (+1/-1)
tribes/workers/barbarians/brewer/init.lua (+1/-1)
tribes/workers/barbarians/brewer_master/init.lua (+1/-1)
tribes/workers/barbarians/builder/init.lua (+1/-1)
tribes/workers/barbarians/carrier/init.lua (+1/-1)
tribes/workers/barbarians/cattlebreeder/init.lua (+1/-1)
tribes/workers/barbarians/charcoal_burner/init.lua (+1/-1)
tribes/workers/barbarians/farmer/init.lua (+1/-1)
tribes/workers/barbarians/fisher/init.lua (+1/-1)
tribes/workers/barbarians/gamekeeper/init.lua (+1/-1)
tribes/workers/barbarians/gardener/init.lua (+1/-1)
tribes/workers/barbarians/geologist/init.lua (+1/-1)
tribes/workers/barbarians/helmsmith/init.lua (+1/-1)
tribes/workers/barbarians/hunter/init.lua (+1/-1)
tribes/workers/barbarians/innkeeper/init.lua (+1/-1)
tribes/workers/barbarians/lime_burner/init.lua (+1/-1)
tribes/workers/barbarians/lumberjack/init.lua (+1/-1)
tribes/workers/barbarians/miner/init.lua (+1/-1)
tribes/workers/barbarians/miner_chief/init.lua (+1/-1)
tribes/workers/barbarians/miner_master/init.lua (+1/-1)
tribes/workers/barbarians/ox/init.lua (+1/-1)
tribes/workers/barbarians/ranger/init.lua (+1/-1)
tribes/workers/barbarians/scout/init.lua (+1/-1)
tribes/workers/barbarians/shipwright/init.lua (+1/-1)
tribes/workers/barbarians/smelter/init.lua (+1/-1)
tribes/workers/barbarians/soldier/init.lua (+1/-1)
tribes/workers/barbarians/stonemason/init.lua (+1/-1)
tribes/workers/barbarians/trainer/init.lua (+1/-1)
tribes/workers/barbarians/weaver/init.lua (+1/-1)
tribes/workers/empire/armorsmith/init.lua (+1/-1)
tribes/workers/empire/baker/init.lua (+1/-1)
tribes/workers/empire/brewer/init.lua (+1/-1)
tribes/workers/empire/builder/init.lua (+1/-1)
tribes/workers/empire/carpenter/init.lua (+1/-1)
tribes/workers/empire/carrier/init.lua (+1/-1)
tribes/workers/empire/charcoal_burner/init.lua (+1/-1)
tribes/workers/empire/donkey/init.lua (+1/-1)
tribes/workers/empire/donkeybreeder/init.lua (+1/-1)
tribes/workers/empire/farmer/init.lua (+1/-1)
tribes/workers/empire/fisher/init.lua (+1/-1)
tribes/workers/empire/forester/init.lua (+1/-1)
tribes/workers/empire/geologist/init.lua (+1/-1)
tribes/workers/empire/hunter/init.lua (+1/-1)
tribes/workers/empire/innkeeper/init.lua (+1/-1)
tribes/workers/empire/lumberjack/init.lua (+1/-1)
tribes/workers/empire/miller/init.lua (+1/-1)
tribes/workers/empire/miner/init.lua (+1/-1)
tribes/workers/empire/miner_master/init.lua (+1/-1)
tribes/workers/empire/pigbreeder/init.lua (+1/-1)
tribes/workers/empire/scout/init.lua (+1/-1)
tribes/workers/empire/shepherd/init.lua (+1/-1)
tribes/workers/empire/shipwright/init.lua (+1/-1)
tribes/workers/empire/smelter/init.lua (+1/-1)
tribes/workers/empire/soldier/init.lua (+1/-1)
tribes/workers/empire/stonemason/init.lua (+1/-1)
tribes/workers/empire/toolsmith/init.lua (+1/-1)
tribes/workers/empire/trainer/init.lua (+1/-1)
tribes/workers/empire/vinefarmer/init.lua (+1/-1)
tribes/workers/empire/vintner/init.lua (+1/-1)
tribes/workers/empire/weaponsmith/init.lua (+1/-1)
tribes/workers/empire/weaver/init.lua (+1/-1)
- TiborB: Approve
- GunChleoc: Needs Resubmitting
-
Diff: 9646 lines (+929/-1788)499 files modifiedsrc/graphic/animation.cc (+14/-92)
src/scripting/CMakeLists.txt (+0/-1)
src/scripting/lua_path.cc (+75/-26)
test/maps/lua_testsuite.wmf/scripting/path.lua (+9/-9)
tribes/atlanteans.lua (+2/-4)
tribes/barbarians.lua (+2/-4)
tribes/buildings/militarysites/atlanteans/castle/init.lua (+1/-2)
tribes/buildings/militarysites/atlanteans/guardhall/init.lua (+1/-2)
tribes/buildings/militarysites/atlanteans/guardhouse/init.lua (+1/-2)
tribes/buildings/militarysites/atlanteans/tower/init.lua (+1/-2)
tribes/buildings/militarysites/atlanteans/tower_high/init.lua (+1/-2)
tribes/buildings/militarysites/atlanteans/tower_small/init.lua (+1/-2)
tribes/buildings/militarysites/barbarians/barrier/init.lua (+3/-6)
tribes/buildings/militarysites/barbarians/citadel/init.lua (+3/-6)
tribes/buildings/militarysites/barbarians/fortress/init.lua (+3/-6)
tribes/buildings/militarysites/barbarians/sentry/init.lua (+3/-6)
tribes/buildings/militarysites/barbarians/tower/init.lua (+3/-6)
tribes/buildings/militarysites/empire/barrier/init.lua (+1/-2)
tribes/buildings/militarysites/empire/blockhouse/init.lua (+1/-2)
tribes/buildings/militarysites/empire/castle/init.lua (+1/-2)
tribes/buildings/militarysites/empire/fortress/init.lua (+2/-4)
tribes/buildings/militarysites/empire/outpost/init.lua (+1/-2)
tribes/buildings/militarysites/empire/sentry/init.lua (+1/-2)
tribes/buildings/militarysites/empire/tower/init.lua (+2/-4)
tribes/buildings/partially_finished/constructionsite/init.lua (+2/-4)
tribes/buildings/partially_finished/dismantlesite/init.lua (+1/-2)
tribes/buildings/productionsites/atlanteans/armorsmithy/init.lua (+2/-4)
tribes/buildings/productionsites/atlanteans/bakery/init.lua (+2/-4)
tribes/buildings/productionsites/atlanteans/blackroot_farm/init.lua (+1/-2)
tribes/buildings/productionsites/atlanteans/charcoal_kiln/init.lua (+2/-4)
tribes/buildings/productionsites/atlanteans/coalmine/init.lua (+3/-6)
tribes/buildings/productionsites/atlanteans/crystalmine/init.lua (+3/-6)
tribes/buildings/productionsites/atlanteans/farm/init.lua (+1/-2)
tribes/buildings/productionsites/atlanteans/fishbreeders_house/init.lua (+1/-2)
tribes/buildings/productionsites/atlanteans/fishers_house/init.lua (+1/-2)
tribes/buildings/productionsites/atlanteans/foresters_house/init.lua (+1/-2)
tribes/buildings/productionsites/atlanteans/gold_spinning_mill/init.lua (+2/-4)
tribes/buildings/productionsites/atlanteans/goldmine/init.lua (+3/-6)
tribes/buildings/productionsites/atlanteans/horsefarm/init.lua (+2/-4)
tribes/buildings/productionsites/atlanteans/hunters_house/init.lua (+1/-2)
tribes/buildings/productionsites/atlanteans/ironmine/init.lua (+3/-6)
tribes/buildings/productionsites/atlanteans/mill/init.lua (+2/-4)
tribes/buildings/productionsites/atlanteans/quarry/init.lua (+1/-2)
tribes/buildings/productionsites/atlanteans/sawmill/init.lua (+2/-4)
tribes/buildings/productionsites/atlanteans/scouts_house/init.lua (+2/-4)
tribes/buildings/productionsites/atlanteans/shipyard/init.lua (+4/-8)
tribes/buildings/productionsites/atlanteans/smelting_works/init.lua (+2/-4)
tribes/buildings/productionsites/atlanteans/smokery/init.lua (+2/-4)
tribes/buildings/productionsites/atlanteans/spiderfarm/init.lua (+2/-4)
tribes/buildings/productionsites/atlanteans/toolsmithy/init.lua (+2/-4)
tribes/buildings/productionsites/atlanteans/weaponsmithy/init.lua (+2/-4)
tribes/buildings/productionsites/atlanteans/weaving_mill/init.lua (+2/-4)
tribes/buildings/productionsites/atlanteans/well/init.lua (+2/-4)
tribes/buildings/productionsites/atlanteans/woodcutters_house/init.lua (+1/-2)
tribes/buildings/productionsites/barbarians/ax_workshop/init.lua (+4/-8)
tribes/buildings/productionsites/barbarians/bakery/init.lua (+3/-6)
tribes/buildings/productionsites/barbarians/big_inn/init.lua (+3/-6)
tribes/buildings/productionsites/barbarians/brewery/init.lua (+2/-4)
tribes/buildings/productionsites/barbarians/cattlefarm/init.lua (+2/-4)
tribes/buildings/productionsites/barbarians/charcoal_kiln/init.lua (+3/-6)
tribes/buildings/productionsites/barbarians/coalmine/init.lua (+4/-8)
tribes/buildings/productionsites/barbarians/coalmine_deep/init.lua (+4/-8)
tribes/buildings/productionsites/barbarians/coalmine_deeper/init.lua (+4/-8)
tribes/buildings/productionsites/barbarians/farm/init.lua (+4/-8)
tribes/buildings/productionsites/barbarians/fishers_hut/init.lua (+3/-6)
tribes/buildings/productionsites/barbarians/gamekeepers_hut/init.lua (+3/-6)
tribes/buildings/productionsites/barbarians/goldmine/init.lua (+4/-8)
tribes/buildings/productionsites/barbarians/goldmine_deep/init.lua (+4/-8)
tribes/buildings/productionsites/barbarians/goldmine_deeper/init.lua (+4/-8)
tribes/buildings/productionsites/barbarians/granitemine/init.lua (+4/-8)
tribes/buildings/productionsites/barbarians/helmsmithy/init.lua (+4/-8)
tribes/buildings/productionsites/barbarians/hunters_hut/init.lua (+3/-6)
tribes/buildings/productionsites/barbarians/inn/init.lua (+3/-6)
tribes/buildings/productionsites/barbarians/ironmine/init.lua (+4/-8)
tribes/buildings/productionsites/barbarians/ironmine_deep/init.lua (+4/-8)
tribes/buildings/productionsites/barbarians/ironmine_deeper/init.lua (+4/-8)
tribes/buildings/productionsites/barbarians/lime_kiln/init.lua (+2/-4)
tribes/buildings/productionsites/barbarians/lumberjacks_hut/init.lua (+3/-6)
tribes/buildings/productionsites/barbarians/metal_workshop/init.lua (+4/-8)
tribes/buildings/productionsites/barbarians/micro_brewery/init.lua (+2/-4)
tribes/buildings/productionsites/barbarians/quarry/init.lua (+3/-6)
tribes/buildings/productionsites/barbarians/rangers_hut/init.lua (+3/-6)
tribes/buildings/productionsites/barbarians/reed_yard/init.lua (+1/-2)
tribes/buildings/productionsites/barbarians/scouts_hut/init.lua (+3/-6)
tribes/buildings/productionsites/barbarians/shipyard/init.lua (+4/-8)
tribes/buildings/productionsites/barbarians/smelting_works/init.lua (+2/-4)
tribes/buildings/productionsites/barbarians/tavern/init.lua (+3/-6)
tribes/buildings/productionsites/barbarians/warmill/init.lua (+4/-8)
tribes/buildings/productionsites/barbarians/weaving_mill/init.lua (+3/-6)
tribes/buildings/productionsites/barbarians/well/init.lua (+3/-6)
tribes/buildings/productionsites/barbarians/wood_hardener/init.lua (+4/-8)
tribes/buildings/productionsites/empire/armorsmithy/init.lua (+4/-8)
tribes/buildings/productionsites/empire/bakery/init.lua (+3/-6)
tribes/buildings/productionsites/empire/brewery/init.lua (+2/-4)
tribes/buildings/productionsites/empire/charcoal_kiln/init.lua (+2/-4)
tribes/buildings/productionsites/empire/coalmine/init.lua (+3/-6)
tribes/buildings/productionsites/empire/coalmine_deep/init.lua (+3/-6)
tribes/buildings/productionsites/empire/donkeyfarm/init.lua (+2/-4)
tribes/buildings/productionsites/empire/farm/init.lua (+1/-2)
tribes/buildings/productionsites/empire/fishers_house/init.lua (+1/-2)
tribes/buildings/productionsites/empire/foresters_house/init.lua (+1/-2)
tribes/buildings/productionsites/empire/goldmine/init.lua (+3/-6)
tribes/buildings/productionsites/empire/goldmine_deep/init.lua (+3/-6)
tribes/buildings/productionsites/empire/hunters_house/init.lua (+1/-2)
tribes/buildings/productionsites/empire/inn/init.lua (+2/-4)
tribes/buildings/productionsites/empire/ironmine/init.lua (+3/-6)
tribes/buildings/productionsites/empire/ironmine_deep/init.lua (+3/-6)
tribes/buildings/productionsites/empire/lumberjacks_house/init.lua (+1/-2)
tribes/buildings/productionsites/empire/marblemine/init.lua (+3/-6)
tribes/buildings/productionsites/empire/marblemine_deep/init.lua (+3/-6)
tribes/buildings/productionsites/empire/mill/init.lua (+2/-4)
tribes/buildings/productionsites/empire/piggery/init.lua (+2/-4)
tribes/buildings/productionsites/empire/quarry/init.lua (+1/-2)
tribes/buildings/productionsites/empire/sawmill/init.lua (+2/-4)
tribes/buildings/productionsites/empire/scouts_house/init.lua (+2/-4)
tribes/buildings/productionsites/empire/sheepfarm/init.lua (+2/-4)
tribes/buildings/productionsites/empire/shipyard/init.lua (+4/-8)
tribes/buildings/productionsites/empire/smelting_works/init.lua (+3/-6)
tribes/buildings/productionsites/empire/stonemasons_house/init.lua (+2/-4)
tribes/buildings/productionsites/empire/tavern/init.lua (+2/-4)
tribes/buildings/productionsites/empire/toolsmithy/init.lua (+2/-4)
tribes/buildings/productionsites/empire/vineyard/init.lua (+1/-2)
tribes/buildings/productionsites/empire/weaponsmithy/init.lua (+3/-6)
tribes/buildings/productionsites/empire/weaving_mill/init.lua (+4/-8)
tribes/buildings/productionsites/empire/well/init.lua (+2/-4)
tribes/buildings/productionsites/empire/winery/init.lua (+2/-4)
tribes/buildings/trainingsites/atlanteans/dungeon/init.lua (+1/-2)
tribes/buildings/trainingsites/atlanteans/labyrinth/init.lua (+1/-2)
tribes/buildings/trainingsites/barbarians/battlearena/init.lua (+4/-8)
tribes/buildings/trainingsites/barbarians/trainingcamp/init.lua (+3/-6)
tribes/buildings/trainingsites/empire/arena/init.lua (+2/-4)
tribes/buildings/trainingsites/empire/colosseum/init.lua (+1/-2)
tribes/buildings/trainingsites/empire/trainingcamp/init.lua (+1/-2)
tribes/buildings/warehouses/atlanteans/headquarters/init.lua (+1/-2)
tribes/buildings/warehouses/atlanteans/port/init.lua (+2/-4)
tribes/buildings/warehouses/atlanteans/warehouse/init.lua (+1/-2)
tribes/buildings/warehouses/barbarians/headquarters/init.lua (+1/-2)
tribes/buildings/warehouses/barbarians/headquarters_interim/init.lua (+1/-2)
tribes/buildings/warehouses/barbarians/port/init.lua (+2/-4)
tribes/buildings/warehouses/barbarians/warehouse/init.lua (+2/-4)
tribes/buildings/warehouses/empire/headquarters/init.lua (+1/-2)
tribes/buildings/warehouses/empire/headquarters_shipwreck/init.lua (+1/-2)
tribes/buildings/warehouses/empire/port/init.lua (+2/-4)
tribes/buildings/warehouses/empire/warehouse/init.lua (+1/-2)
tribes/empire.lua (+2/-4)
tribes/immovables/ashes/init.lua (+1/-2)
tribes/immovables/blackrootfield_harvested/init.lua (+1/-2)
tribes/immovables/blackrootfield_medium/init.lua (+1/-2)
tribes/immovables/blackrootfield_ripe/init.lua (+1/-2)
tribes/immovables/blackrootfield_small/init.lua (+1/-2)
tribes/immovables/blackrootfield_tiny/init.lua (+1/-2)
tribes/immovables/cornfield_harvested/init.lua (+1/-2)
tribes/immovables/cornfield_medium/init.lua (+1/-2)
tribes/immovables/cornfield_ripe/init.lua (+1/-2)
tribes/immovables/cornfield_small/init.lua (+1/-2)
tribes/immovables/cornfield_tiny/init.lua (+1/-2)
tribes/immovables/destroyed_building/init.lua (+1/-2)
tribes/immovables/field_harvested/init.lua (+1/-2)
tribes/immovables/field_medium/init.lua (+1/-2)
tribes/immovables/field_ripe/init.lua (+1/-2)
tribes/immovables/field_small/init.lua (+1/-2)
tribes/immovables/field_tiny/init.lua (+1/-2)
tribes/immovables/grapevine_medium/init.lua (+1/-2)
tribes/immovables/grapevine_ripe/init.lua (+1/-2)
tribes/immovables/grapevine_small/init.lua (+1/-2)
tribes/immovables/grapevine_tiny/init.lua (+1/-2)
tribes/immovables/reed_medium/init.lua (+1/-2)
tribes/immovables/reed_ripe/init.lua (+1/-2)
tribes/immovables/reed_small/init.lua (+1/-2)
tribes/immovables/reed_tiny/init.lua (+1/-2)
tribes/immovables/resi_coal1/init.lua (+1/-2)
tribes/immovables/resi_coal2/init.lua (+1/-2)
tribes/immovables/resi_gold1/init.lua (+1/-2)
tribes/immovables/resi_gold2/init.lua (+1/-2)
tribes/immovables/resi_iron1/init.lua (+1/-2)
tribes/immovables/resi_iron2/init.lua (+1/-2)
tribes/immovables/resi_none/init.lua (+1/-2)
tribes/immovables/resi_stones1/init.lua (+1/-2)
tribes/immovables/resi_stones2/init.lua (+1/-2)
tribes/immovables/resi_water1/init.lua (+1/-2)
tribes/immovables/shipconstruction_atlanteans/init.lua (+1/-2)
tribes/immovables/shipconstruction_barbarians/init.lua (+1/-2)
tribes/immovables/shipconstruction_empire/init.lua (+1/-2)
tribes/init.lua (+2/-12)
tribes/ships/atlanteans/init.lua (+2/-4)
tribes/ships/barbarians/init.lua (+1/-2)
tribes/ships/empire/init.lua (+1/-2)
tribes/wares/armor/init.lua (+1/-2)
tribes/wares/armor_chain/init.lua (+1/-2)
tribes/wares/armor_gilded/init.lua (+1/-2)
tribes/wares/armor_helmet/init.lua (+1/-2)
tribes/wares/ax/init.lua (+1/-2)
tribes/wares/ax_battle/init.lua (+1/-2)
tribes/wares/ax_broad/init.lua (+1/-2)
tribes/wares/ax_bronze/init.lua (+1/-2)
tribes/wares/ax_sharp/init.lua (+1/-2)
tribes/wares/ax_warriors/init.lua (+1/-2)
tribes/wares/basket/init.lua (+1/-2)
tribes/wares/beer/init.lua (+1/-2)
tribes/wares/beer_strong/init.lua (+1/-2)
tribes/wares/blackroot/init.lua (+1/-2)
tribes/wares/blackroot_flour/init.lua (+1/-2)
tribes/wares/blackwood/init.lua (+1/-2)
tribes/wares/bread_atlanteans/init.lua (+1/-2)
tribes/wares/bread_barbarians/init.lua (+1/-2)
tribes/wares/bread_empire/init.lua (+1/-2)
tribes/wares/bread_paddle/init.lua (+1/-2)
tribes/wares/buckets/init.lua (+1/-2)
tribes/wares/cloth/init.lua (+1/-2)
tribes/wares/coal/init.lua (+1/-2)
tribes/wares/corn/init.lua (+1/-2)
tribes/wares/cornmeal/init.lua (+1/-2)
tribes/wares/diamond/init.lua (+1/-2)
tribes/wares/felling_ax/init.lua (+1/-2)
tribes/wares/fire_tongs/init.lua (+1/-2)
tribes/wares/fish/init.lua (+1/-2)
tribes/wares/fishing_net/init.lua (+1/-2)
tribes/wares/fishing_rod/init.lua (+1/-2)
tribes/wares/flour/init.lua (+1/-2)
tribes/wares/gold/init.lua (+1/-2)
tribes/wares/gold_ore/init.lua (+1/-2)
tribes/wares/gold_thread/init.lua (+1/-2)
tribes/wares/granite/init.lua (+1/-2)
tribes/wares/grape/init.lua (+1/-2)
tribes/wares/grout/init.lua (+1/-2)
tribes/wares/hammer/init.lua (+1/-2)
tribes/wares/helmet/init.lua (+1/-2)
tribes/wares/helmet_mask/init.lua (+1/-2)
tribes/wares/helmet_warhelm/init.lua (+1/-2)
tribes/wares/hook_pole/init.lua (+1/-2)
tribes/wares/hunting_bow/init.lua (+1/-2)
tribes/wares/hunting_spear/init.lua (+1/-2)
tribes/wares/iron/init.lua (+1/-2)
tribes/wares/iron_ore/init.lua (+1/-2)
tribes/wares/kitchen_tools/init.lua (+1/-2)
tribes/wares/log/init.lua (+1/-2)
tribes/wares/marble/init.lua (+1/-2)
tribes/wares/marble_column/init.lua (+1/-2)
tribes/wares/meal/init.lua (+1/-2)
tribes/wares/meat/init.lua (+1/-2)
tribes/wares/milking_tongs/init.lua (+1/-2)
tribes/wares/pick/init.lua (+1/-2)
tribes/wares/planks/init.lua (+1/-2)
tribes/wares/quartz/init.lua (+1/-2)
tribes/wares/ration/init.lua (+1/-2)
tribes/wares/saw/init.lua (+1/-2)
tribes/wares/scythe/init.lua (+1/-2)
tribes/wares/shield_advanced/init.lua (+1/-2)
tribes/wares/shield_steel/init.lua (+1/-2)
tribes/wares/shovel/init.lua (+1/-2)
tribes/wares/smoked_fish/init.lua (+1/-2)
tribes/wares/smoked_meat/init.lua (+1/-2)
tribes/wares/snack/init.lua (+1/-2)
tribes/wares/spear/init.lua (+1/-2)
tribes/wares/spear_advanced/init.lua (+1/-2)
tribes/wares/spear_heavy/init.lua (+1/-2)
tribes/wares/spear_war/init.lua (+1/-2)
tribes/wares/spear_wooden/init.lua (+1/-2)
tribes/wares/spider_silk/init.lua (+1/-2)
tribes/wares/spidercloth/init.lua (+1/-2)
tribes/wares/tabard/init.lua (+1/-2)
tribes/wares/tabard_golden/init.lua (+1/-2)
tribes/wares/thatch_reed/init.lua (+1/-2)
tribes/wares/trident_double/init.lua (+1/-2)
tribes/wares/trident_heavy_double/init.lua (+1/-2)
tribes/wares/trident_light/init.lua (+1/-2)
tribes/wares/trident_long/init.lua (+1/-2)
tribes/wares/trident_steel/init.lua (+1/-2)
tribes/wares/water/init.lua (+1/-2)
tribes/wares/wheat/init.lua (+1/-2)
tribes/wares/wine/init.lua (+1/-2)
tribes/wares/wool/init.lua (+1/-2)
tribes/workers/atlanteans/armorsmith/init.lua (+1/-2)
tribes/workers/atlanteans/baker/init.lua (+1/-2)
tribes/workers/atlanteans/blackroot_farmer/init.lua (+4/-8)
tribes/workers/atlanteans/builder/init.lua (+2/-4)
tribes/workers/atlanteans/carrier/init.lua (+1/-2)
tribes/workers/atlanteans/charcoal_burner/init.lua (+1/-2)
tribes/workers/atlanteans/farmer/init.lua (+4/-8)
tribes/workers/atlanteans/fishbreeder/init.lua (+2/-4)
tribes/workers/atlanteans/fisher/init.lua (+2/-4)
tribes/workers/atlanteans/forester/init.lua (+4/-8)
tribes/workers/atlanteans/geologist/init.lua (+2/-4)
tribes/workers/atlanteans/horse/init.lua (+1/-2)
tribes/workers/atlanteans/horsebreeder/init.lua (+1/-2)
tribes/workers/atlanteans/hunter/init.lua (+1/-2)
tribes/workers/atlanteans/miller/init.lua (+1/-2)
tribes/workers/atlanteans/miner/init.lua (+1/-2)
tribes/workers/atlanteans/sawyer/init.lua (+1/-2)
tribes/workers/atlanteans/scout/init.lua (+1/-2)
tribes/workers/atlanteans/shipwright/init.lua (+1/-2)
tribes/workers/atlanteans/smelter/init.lua (+1/-2)
tribes/workers/atlanteans/smoker/init.lua (+1/-2)
tribes/workers/atlanteans/soldier/init.lua (+11/-22)
tribes/workers/atlanteans/spiderbreeder/init.lua (+1/-2)
tribes/workers/atlanteans/stonecutter/init.lua (+2/-4)
tribes/workers/atlanteans/toolsmith/init.lua (+1/-2)
tribes/workers/atlanteans/trainer/init.lua (+1/-2)
tribes/workers/atlanteans/weaponsmith/init.lua (+1/-2)
tribes/workers/atlanteans/weaver/init.lua (+1/-2)
tribes/workers/atlanteans/woodcutter/init.lua (+2/-4)
tribes/workers/barbarians/baker/init.lua (+1/-2)
tribes/workers/barbarians/blacksmith/init.lua (+1/-2)
tribes/workers/barbarians/blacksmith_master/init.lua (+1/-2)
tribes/workers/barbarians/brewer/init.lua (+1/-2)
tribes/workers/barbarians/brewer_master/init.lua (+1/-2)
tribes/workers/barbarians/builder/init.lua (+2/-4)
tribes/workers/barbarians/carrier/init.lua (+1/-2)
tribes/workers/barbarians/cattlebreeder/init.lua (+1/-2)
tribes/workers/barbarians/charcoal_burner/init.lua (+1/-2)
tribes/workers/barbarians/farmer/init.lua (+4/-8)
tribes/workers/barbarians/fisher/init.lua (+2/-4)
tribes/workers/barbarians/gamekeeper/init.lua (+3/-6)
tribes/workers/barbarians/gardener/init.lua (+3/-6)
tribes/workers/barbarians/geologist/init.lua (+2/-4)
tribes/workers/barbarians/helmsmith/init.lua (+1/-2)
tribes/workers/barbarians/hunter/init.lua (+1/-2)
tribes/workers/barbarians/innkeeper/init.lua (+1/-2)
tribes/workers/barbarians/lime_burner/init.lua (+1/-2)
tribes/workers/barbarians/lumberjack/init.lua (+2/-4)
tribes/workers/barbarians/miner/init.lua (+1/-2)
tribes/workers/barbarians/miner_chief/init.lua (+1/-2)
tribes/workers/barbarians/miner_master/init.lua (+1/-2)
tribes/workers/barbarians/ox/init.lua (+1/-2)
tribes/workers/barbarians/ranger/init.lua (+4/-8)
tribes/workers/barbarians/scout/init.lua (+1/-2)
tribes/workers/barbarians/shipwright/init.lua (+2/-4)
tribes/workers/barbarians/smelter/init.lua (+1/-2)
tribes/workers/barbarians/soldier/init.lua (+11/-22)
tribes/workers/barbarians/stonemason/init.lua (+2/-4)
tribes/workers/barbarians/trainer/init.lua (+1/-2)
tribes/workers/barbarians/weaver/init.lua (+1/-2)
tribes/workers/empire/armorsmith/init.lua (+1/-2)
tribes/workers/empire/baker/init.lua (+1/-2)
tribes/workers/empire/brewer/init.lua (+1/-2)
tribes/workers/empire/builder/init.lua (+2/-4)
tribes/workers/empire/carpenter/init.lua (+1/-2)
tribes/workers/empire/carrier/init.lua (+1/-2)
tribes/workers/empire/charcoal_burner/init.lua (+1/-2)
tribes/workers/empire/donkey/init.lua (+1/-2)
tribes/workers/empire/donkeybreeder/init.lua (+1/-2)
tribes/workers/empire/farmer/init.lua (+4/-8)
tribes/workers/empire/fisher/init.lua (+2/-4)
tribes/workers/empire/forester/init.lua (+4/-8)
tribes/workers/empire/geologist/init.lua (+2/-4)
tribes/workers/empire/hunter/init.lua (+1/-2)
tribes/workers/empire/innkeeper/init.lua (+1/-2)
tribes/workers/empire/lumberjack/init.lua (+2/-4)
tribes/workers/empire/miller/init.lua (+1/-2)
tribes/workers/empire/miner/init.lua (+1/-2)
tribes/workers/empire/miner_master/init.lua (+1/-2)
tribes/workers/empire/pigbreeder/init.lua (+1/-2)
tribes/workers/empire/scout/init.lua (+1/-2)
tribes/workers/empire/shepherd/init.lua (+1/-2)
tribes/workers/empire/shipwright/init.lua (+2/-4)
tribes/workers/empire/smelter/init.lua (+1/-2)
tribes/workers/empire/soldier/init.lua (+11/-22)
tribes/workers/empire/stonemason/init.lua (+2/-4)
tribes/workers/empire/toolsmith/init.lua (+1/-2)
tribes/workers/empire/trainer/init.lua (+1/-2)
tribes/workers/empire/vinefarmer/init.lua (+4/-8)
tribes/workers/empire/vintner/init.lua (+1/-2)
tribes/workers/empire/weaponsmith/init.lua (+1/-2)
tribes/workers/empire/weaver/init.lua (+1/-2)
world/critters/badger/init.lua (+1/-2)
world/critters/brownbear/init.lua (+1/-2)
world/critters/bunny/init.lua (+1/-2)
world/critters/chamois/init.lua (+1/-2)
world/critters/deer/init.lua (+1/-2)
world/critters/duck/init.lua (+1/-2)
world/critters/elk/init.lua (+1/-2)
world/critters/fox/init.lua (+1/-2)
world/critters/lynx/init.lua (+1/-2)
world/critters/marten/init.lua (+1/-2)
world/critters/reindeer/init.lua (+1/-2)
world/critters/sheep/init.lua (+1/-2)
world/critters/stag/init.lua (+1/-2)
world/critters/wildboar/init.lua (+1/-2)
world/critters/wisent/init.lua (+1/-2)
world/critters/wolf/init.lua (+1/-2)
world/immovables/bush1/init.lua (+1/-2)
world/immovables/bush2/init.lua (+1/-2)
world/immovables/bush3/init.lua (+1/-2)
world/immovables/bush4/init.lua (+1/-2)
world/immovables/bush5/init.lua (+1/-2)
world/immovables/cactus1/init.lua (+1/-2)
world/immovables/cactus2/init.lua (+1/-2)
world/immovables/cactus3/init.lua (+1/-2)
world/immovables/cactus4/init.lua (+1/-2)
world/immovables/grass1/init.lua (+1/-2)
world/immovables/grass2/init.lua (+1/-2)
world/immovables/grass3/init.lua (+1/-2)
world/immovables/manmade/artifacts/artifact00/init.lua (+1/-2)
world/immovables/manmade/artifacts/artifact01/init.lua (+1/-2)
world/immovables/manmade/artifacts/artifact02/init.lua (+1/-2)
world/immovables/manmade/artifacts/artifact03/init.lua (+1/-2)
world/immovables/manmade/bar-ruin00/init.lua (+1/-2)
world/immovables/manmade/bar-ruin01/init.lua (+1/-2)
world/immovables/manmade/bar-ruin02/init.lua (+1/-2)
world/immovables/manmade/bar-ruin03/init.lua (+1/-2)
world/immovables/manmade/debris00/init.lua (+1/-2)
world/immovables/manmade/debris01/init.lua (+1/-2)
world/immovables/manmade/debris02/init.lua (+1/-2)
world/immovables/manmade/snowman/init.lua (+1/-2)
world/immovables/mushroom1/init.lua (+1/-2)
world/immovables/mushroom2/init.lua (+1/-2)
world/immovables/pebble1/init.lua (+1/-2)
world/immovables/pebble2/init.lua (+1/-2)
world/immovables/pebble3/init.lua (+1/-2)
world/immovables/pebble4/init.lua (+1/-2)
world/immovables/pebble5/init.lua (+1/-2)
world/immovables/pebble6/init.lua (+1/-2)
world/immovables/rocks/blackland_rocks1/init.lua (+1/-2)
world/immovables/rocks/blackland_rocks2/init.lua (+1/-2)
world/immovables/rocks/blackland_rocks3/init.lua (+1/-2)
world/immovables/rocks/blackland_rocks4/init.lua (+1/-2)
world/immovables/rocks/blackland_rocks5/init.lua (+1/-2)
world/immovables/rocks/blackland_rocks6/init.lua (+1/-2)
world/immovables/rocks/desert_rocks1/init.lua (+1/-2)
world/immovables/rocks/desert_rocks2/init.lua (+1/-2)
world/immovables/rocks/desert_rocks3/init.lua (+1/-2)
world/immovables/rocks/desert_rocks4/init.lua (+1/-2)
world/immovables/rocks/desert_rocks5/init.lua (+1/-2)
world/immovables/rocks/desert_rocks6/init.lua (+1/-2)
world/immovables/rocks/greenland_rocks1/init.lua (+1/-2)
world/immovables/rocks/greenland_rocks2/init.lua (+1/-2)
world/immovables/rocks/greenland_rocks3/init.lua (+1/-2)
world/immovables/rocks/greenland_rocks4/init.lua (+1/-2)
world/immovables/rocks/greenland_rocks5/init.lua (+1/-2)
world/immovables/rocks/greenland_rocks6/init.lua (+1/-2)
world/immovables/rocks/winterland_rocks1/init.lua (+1/-2)
world/immovables/rocks/winterland_rocks2/init.lua (+1/-2)
world/immovables/rocks/winterland_rocks3/init.lua (+1/-2)
world/immovables/rocks/winterland_rocks4/init.lua (+1/-2)
world/immovables/rocks/winterland_rocks5/init.lua (+1/-2)
world/immovables/rocks/winterland_rocks6/init.lua (+1/-2)
world/immovables/ruin1/init.lua (+1/-2)
world/immovables/ruin2/init.lua (+1/-2)
world/immovables/ruin3/init.lua (+1/-2)
world/immovables/ruin4/init.lua (+1/-2)
world/immovables/ruin5/init.lua (+1/-2)
world/immovables/skeleton1/init.lua (+1/-2)
world/immovables/skeleton2/init.lua (+1/-2)
world/immovables/skeleton3/init.lua (+1/-2)
world/immovables/skeleton4/init.lua (+1/-2)
world/immovables/standing_stones/standing_stone1_desert/init.lua (+1/-2)
world/immovables/standing_stones/standing_stone1_summer/init.lua (+1/-2)
world/immovables/standing_stones/standing_stone1_wasteland/init.lua (+1/-2)
world/immovables/standing_stones/standing_stone1_winter/init.lua (+1/-2)
world/immovables/standing_stones/standing_stone2_desert/init.lua (+1/-2)
world/immovables/standing_stones/standing_stone2_summer/init.lua (+1/-2)
world/immovables/standing_stones/standing_stone2_wasteland/init.lua (+1/-2)
world/immovables/standing_stones/standing_stone2_winter/init.lua (+1/-2)
world/immovables/standing_stones/standing_stone3_desert/init.lua (+1/-2)
world/immovables/standing_stones/standing_stone3_summer/init.lua (+1/-2)
world/immovables/standing_stones/standing_stone3_wasteland/init.lua (+1/-2)
world/immovables/standing_stones/standing_stone3_winter/init.lua (+1/-2)
world/immovables/standing_stones/standing_stone4_desert/init.lua (+1/-2)
world/immovables/standing_stones/standing_stone4_summer/init.lua (+1/-2)
world/immovables/standing_stones/standing_stone4_wasteland/init.lua (+1/-2)
world/immovables/standing_stones/standing_stone4_winter/init.lua (+1/-2)
world/immovables/standing_stones/standing_stone5_desert/init.lua (+1/-2)
world/immovables/standing_stones/standing_stone5_summer/init.lua (+1/-2)
world/immovables/standing_stones/standing_stone5_wasteland/init.lua (+1/-2)
world/immovables/standing_stones/standing_stone5_winter/init.lua (+1/-2)
world/immovables/standing_stones/standing_stone6/init.lua (+1/-2)
world/immovables/standing_stones/standing_stone7/init.lua (+1/-2)
world/immovables/track_winter/init.lua (+1/-2)
world/immovables/trees/alder/init.lua (+4/-8)
world/immovables/trees/aspen/init.lua (+5/-10)
world/immovables/trees/beech/init.lua (+4/-8)
world/immovables/trees/birch/init.lua (+4/-8)
world/immovables/trees/cirrus/init.lua (+4/-8)
world/immovables/trees/deadtree1/init.lua (+1/-2)
world/immovables/trees/deadtree2/init.lua (+1/-2)
world/immovables/trees/deadtree3/init.lua (+1/-2)
world/immovables/trees/deadtree4/init.lua (+1/-2)
world/immovables/trees/deadtree5/init.lua (+1/-2)
world/immovables/trees/deadtree6/init.lua (+1/-2)
world/immovables/trees/fallentree/init.lua (+1/-2)
world/immovables/trees/larch/init.lua (+4/-8)
world/immovables/trees/liana/init.lua (+4/-8)
world/immovables/trees/maple/init.lua (+4/-8)
world/immovables/trees/mushroom_dark/init.lua (+4/-8)
world/immovables/trees/mushroom_green/init.lua (+4/-8)
world/immovables/trees/mushroom_red/init.lua (+4/-8)
world/immovables/trees/oak/init.lua (+5/-10)
world/immovables/trees/palm_borassus/init.lua (+4/-8)
world/immovables/trees/palm_coconut/init.lua (+4/-8)
world/immovables/trees/palm_date/init.lua (+4/-8)
world/immovables/trees/palm_oil/init.lua (+4/-8)
world/immovables/trees/palm_roystonea/init.lua (+4/-8)
world/immovables/trees/rowan/init.lua (+4/-8)
world/immovables/trees/spruce/init.lua (+4/-8)
world/immovables/trees/twine/init.lua (+4/-8)
world/immovables/trees/umbrella_green/init.lua (+4/-8)
world/immovables/trees/umbrella_red/init.lua (+4/-8)
world/init.lua (+1/-2)
world/terrains/init.lua (+10/-10)
- TiborB: Approve
-
Diff: 6691 lines (+909/-911)124 files modifiedsrc/ai/ai_help_structs.h (+3/-3)
src/ai/defaultai.cc (+27/-27)
src/ai/defaultai.h (+2/-2)
src/economy/economy.cc (+22/-22)
src/economy/economy.h (+21/-21)
src/economy/economy_data_packet.cc (+3/-3)
src/economy/flag.cc (+2/-2)
src/economy/flag.h (+2/-2)
src/economy/idleworkersupply.cc (+1/-1)
src/economy/idleworkersupply.h (+1/-1)
src/economy/portdock.cc (+1/-1)
src/economy/portdock.h (+1/-1)
src/economy/request.cc (+3/-3)
src/economy/request.h (+4/-4)
src/economy/road.cc (+1/-1)
src/economy/road.h (+1/-1)
src/economy/supply.h (+1/-1)
src/economy/ware_instance.cc (+4/-4)
src/economy/ware_instance.h (+3/-3)
src/economy/warehousesupply.h (+9/-9)
src/economy/wares_queue.cc (+2/-2)
src/economy/wares_queue.h (+5/-5)
src/editor/map_generator.cc (+3/-3)
src/editor/map_generator.h (+1/-1)
src/editor/tools/editor_action_args.h (+1/-1)
src/editor/tools/editor_decrease_resources_tool.h (+3/-3)
src/editor/tools/editor_increase_resources_tool.cc (+1/-1)
src/editor/tools/editor_increase_resources_tool.h (+3/-3)
src/editor/tools/editor_info_tool.cc (+1/-1)
src/editor/tools/editor_set_resources_tool.h (+3/-3)
src/editor/tools/editor_set_terrain_tool.cc (+2/-2)
src/editor/ui_menus/editor_player_menu.cc (+1/-1)
src/editor/ui_menus/editor_tool_change_resources_options_menu.cc (+3/-3)
src/logic/bill_of_materials.h (+1/-1)
src/logic/buildcost.cc (+5/-5)
src/logic/buildcost.h (+1/-1)
src/logic/building.cc (+9/-9)
src/logic/building.h (+12/-12)
src/logic/constructionsite.cc (+7/-7)
src/logic/constructionsite.h (+2/-2)
src/logic/description_maintainer.h (+6/-6)
src/logic/dismantlesite.cc (+7/-7)
src/logic/dismantlesite.h (+1/-1)
src/logic/editor_game_base.cc (+4/-4)
src/logic/editor_game_base.h (+3/-3)
src/logic/expedition_bootstrap.cc (+6/-6)
src/logic/expedition_bootstrap.h (+3/-3)
src/logic/field.h (+9/-9)
src/logic/game.cc (+6/-6)
src/logic/game.h (+4/-4)
src/logic/immovable.cc (+4/-4)
src/logic/immovable.h (+2/-2)
src/logic/map.cc (+1/-1)
src/logic/map.h (+1/-1)
src/logic/militarysite.cc (+1/-1)
src/logic/militarysite.h (+1/-1)
src/logic/partially_finished_building.cc (+1/-1)
src/logic/partially_finished_building.h (+1/-1)
src/logic/player.cc (+25/-25)
src/logic/player.h (+16/-16)
src/logic/playercommand.cc (+10/-10)
src/logic/playercommand.h (+17/-17)
src/logic/production_program.cc (+11/-11)
src/logic/production_program.h (+8/-8)
src/logic/productionsite.cc (+20/-20)
src/logic/productionsite.h (+10/-10)
src/logic/ship.cc (+3/-3)
src/logic/trainingsite.cc (+1/-1)
src/logic/trainingsite.h (+1/-1)
src/logic/tribes/tribe_descr.cc (+45/-45)
src/logic/tribes/tribe_descr.h (+49/-48)
src/logic/tribes/tribes.cc (+37/-36)
src/logic/tribes/tribes.h (+31/-30)
src/logic/ware_descr.cc (+5/-5)
src/logic/ware_descr.h (+7/-7)
src/logic/warehouse.cc (+60/-60)
src/logic/warehouse.h (+22/-22)
src/logic/warelist.cc (+7/-7)
src/logic/warelist.h (+5/-5)
src/logic/widelands.h (+2/-7)
src/logic/worker.cc (+11/-11)
src/logic/worker.h (+3/-3)
src/logic/worker_descr.cc (+3/-3)
src/logic/worker_descr.h (+4/-4)
src/logic/worker_program.cc (+1/-1)
src/logic/world/map_gen.cc (+3/-3)
src/logic/world/map_gen.h (+4/-4)
src/logic/world/terrain_description.cc (+1/-1)
src/logic/world/terrain_description.h (+1/-1)
src/logic/world/world.cc (+10/-10)
src/logic/world/world.h (+10/-10)
src/map_io/map_allowed_building_types_packet.cc (+3/-3)
src/map_io/map_allowed_worker_types_packet.cc (+2/-2)
src/map_io/map_bob_packet.cc (+1/-1)
src/map_io/map_building_packet.cc (+7/-7)
src/map_io/map_buildingdata_packet.cc (+13/-13)
src/map_io/map_players_view_packet.cc (+3/-3)
src/map_io/map_saver.cc (+1/-1)
src/map_io/map_terrain_packet.cc (+4/-4)
src/map_io/s2map.cc (+4/-4)
src/scripting/lua_bases.cc (+6/-6)
src/scripting/lua_game.cc (+11/-11)
src/scripting/lua_game.h (+1/-1)
src/scripting/lua_map.cc (+41/-41)
src/wui/actionconfirm.cc (+4/-4)
src/wui/actionconfirm.h (+1/-1)
src/wui/building_statistics_menu.cc (+10/-10)
src/wui/building_statistics_menu.h (+4/-4)
src/wui/buildingwindow.cc (+3/-3)
src/wui/buildingwindow.h (+1/-1)
src/wui/encyclopedia_window.cc (+6/-6)
src/wui/encyclopedia_window.h (+10/-10)
src/wui/fieldaction.cc (+15/-15)
src/wui/game_debug_ui.cc (+1/-1)
src/wui/itemwaresdisplay.cc (+1/-1)
src/wui/itemwaresdisplay.h (+2/-2)
src/wui/portdockwaresdisplay.cc (+2/-2)
src/wui/transport_ui.cc (+10/-10)
src/wui/ware_statistics_menu.cc (+10/-10)
src/wui/ware_statistics_menu.h (+1/-1)
src/wui/warehousewindow.cc (+5/-5)
src/wui/waresdisplay.cc (+25/-25)
src/wui/waresdisplay.h (+18/-18)
src/wui/waresqueuedisplay.h (+1/-1)
- SirVer: Approve
-
Diff: 5181 lines (+806/-844)246 files modifiedsrc/ai/ai_help_structs.h (+6/-5)
src/ai/defaultai.cc (+10/-10)
src/ai/defaultai.h (+4/-4)
src/economy/CMakeLists.txt (+2/-0)
src/economy/cmd_call_economy_balance.h (+1/-1)
src/economy/economy.cc (+3/-3)
src/economy/economy.h (+3/-3)
src/economy/economy_data_packet.cc (+1/-1)
src/economy/expedition_bootstrap.cc (+2/-2)
src/economy/expedition_bootstrap.h (+3/-3)
src/economy/flag.cc (+5/-5)
src/economy/flag.h (+1/-1)
src/economy/fleet.cc (+2/-2)
src/economy/fleet.h (+1/-1)
src/economy/idleworkersupply.cc (+5/-5)
src/economy/portdock.cc (+3/-3)
src/economy/portdock.h (+2/-2)
src/economy/request.cc (+6/-6)
src/economy/request.h (+2/-2)
src/economy/road.cc (+3/-3)
src/economy/road.h (+1/-1)
src/economy/route.h (+1/-1)
src/economy/router.h (+1/-1)
src/economy/routing_node.h (+1/-1)
src/economy/shippingitem.cc (+1/-1)
src/economy/shippingitem.h (+1/-1)
src/economy/supply.h (+1/-1)
src/economy/test/test_road.cc (+1/-1)
src/economy/test/test_routing.cc (+1/-1)
src/economy/transfer.cc (+3/-3)
src/economy/ware_instance.cc (+4/-4)
src/economy/ware_instance.h (+2/-2)
src/economy/warehousesupply.h (+2/-2)
src/economy/wares_queue.cc (+1/-1)
src/economy/wares_queue.h (+1/-1)
src/editor/editorinteractive.cc (+3/-3)
src/editor/map_generator.cc (+2/-2)
src/editor/map_generator.h (+1/-1)
src/editor/tools/editor_decrease_resources_tool.cc (+2/-2)
src/editor/tools/editor_delete_bob_tool.cc (+1/-1)
src/editor/tools/editor_delete_immovable_tool.cc (+1/-1)
src/editor/tools/editor_increase_resources_tool.cc (+3/-3)
src/editor/tools/editor_info_tool.cc (+3/-3)
src/editor/tools/editor_place_bob_tool.cc (+2/-2)
src/editor/tools/editor_place_immovable_tool.cc (+1/-1)
src/editor/tools/editor_set_port_space_tool.cc (+1/-1)
src/editor/tools/editor_set_resources_tool.cc (+2/-2)
src/editor/tools/editor_set_starting_pos_tool.cc (+1/-1)
src/editor/ui_menus/categorized_item_selection_menu.h (+1/-1)
src/editor/ui_menus/editor_main_menu_new_map.cc (+2/-2)
src/editor/ui_menus/editor_main_menu_random_map.cc (+1/-1)
src/editor/ui_menus/editor_player_menu.cc (+2/-2)
src/editor/ui_menus/editor_tool_change_resources_options_menu.cc (+2/-2)
src/editor/ui_menus/editor_tool_place_bob_options_menu.cc (+2/-2)
src/editor/ui_menus/editor_tool_place_immovable_options_menu.cc (+1/-1)
src/editor/ui_menus/editor_tool_set_terrain_options_menu.cc (+3/-3)
src/editor/ui_menus/editor_tool_set_terrain_options_menu.h (+1/-1)
src/game_io/game_interactive_player_packet.cc (+1/-1)
src/game_io/game_player_economies_packet.cc (+1/-1)
src/game_io/game_player_info_packet.cc (+1/-1)
src/graphic/animation.cc (+2/-2)
src/graphic/game_renderer.cc (+1/-1)
src/graphic/gl/dither_program.h (+1/-1)
src/graphic/gl/fields_to_draw.h (+1/-1)
src/graphic/gl/terrain_program.h (+1/-1)
src/graphic/minimap_renderer.cc (+2/-2)
src/graphic/render_queue.h (+1/-1)
src/graphic/rendertarget.cc (+1/-1)
src/logic/CMakeLists.txt (+88/-91)
src/logic/cmd_incorporate.h (+1/-1)
src/logic/cmd_queue.cc (+2/-2)
src/logic/editor_game_base.cc (+9/-9)
src/logic/editor_game_base.h (+2/-2)
src/logic/findbob.cc (+1/-1)
src/logic/findimmovable.cc (+3/-3)
src/logic/findimmovable.h (+1/-1)
src/logic/findnode.cc (+1/-2)
src/logic/game.cc (+6/-6)
src/logic/game_settings.h (+1/-1)
src/logic/map.cc (+5/-5)
src/logic/map.h (+1/-1)
src/logic/map_objects/attackable.h (+3/-3)
src/logic/map_objects/bob.cc (+6/-6)
src/logic/map_objects/bob.h (+5/-5)
src/logic/map_objects/buildcost.cc (+3/-3)
src/logic/map_objects/buildcost.h (+3/-3)
src/logic/map_objects/checkstep.cc (+1/-1)
src/logic/map_objects/checkstep.h (+3/-3)
src/logic/map_objects/immovable.cc (+6/-6)
src/logic/map_objects/immovable.h (+5/-5)
src/logic/map_objects/immovable_program.h (+5/-5)
src/logic/map_objects/map_object.cc (+1/-1)
src/logic/map_objects/map_object.h (+3/-3)
src/logic/map_objects/terrain_affinity.cc (+2/-2)
src/logic/map_objects/terrain_affinity.h (+3/-3)
src/logic/map_objects/tribes/battle.cc (+2/-2)
src/logic/map_objects/tribes/battle.h (+4/-4)
src/logic/map_objects/tribes/bill_of_materials.h (+3/-3)
src/logic/map_objects/tribes/building.cc (+6/-6)
src/logic/map_objects/tribes/building.h (+8/-9)
src/logic/map_objects/tribes/carrier.cc (+1/-1)
src/logic/map_objects/tribes/carrier.h (+4/-4)
src/logic/map_objects/tribes/constructionsite.cc (+3/-3)
src/logic/map_objects/tribes/constructionsite.h (+4/-4)
src/logic/map_objects/tribes/dismantlesite.cc (+3/-3)
src/logic/map_objects/tribes/dismantlesite.h (+5/-5)
src/logic/map_objects/tribes/militarysite.cc (+5/-5)
src/logic/map_objects/tribes/militarysite.h (+7/-7)
src/logic/map_objects/tribes/partially_finished_building.cc (+3/-3)
src/logic/map_objects/tribes/partially_finished_building.h (+4/-4)
src/logic/map_objects/tribes/production_program.cc (+10/-10)
src/logic/map_objects/tribes/production_program.h (+6/-7)
src/logic/map_objects/tribes/productionsite.cc (+6/-6)
src/logic/map_objects/tribes/productionsite.h (+7/-7)
src/logic/map_objects/tribes/program_result.h (+3/-3)
src/logic/map_objects/tribes/requirements.cc (+2/-2)
src/logic/map_objects/tribes/requirements.h (+4/-4)
src/logic/map_objects/tribes/road_textures.cc (+1/-1)
src/logic/map_objects/tribes/road_textures.h (+3/-3)
src/logic/map_objects/tribes/ship.cc (+4/-4)
src/logic/map_objects/tribes/ship.h (+4/-4)
src/logic/map_objects/tribes/soldier.cc (+8/-8)
src/logic/map_objects/tribes/soldier.h (+5/-5)
src/logic/map_objects/tribes/soldiercontrol.h (+4/-3)
src/logic/map_objects/tribes/training_attribute.h (+3/-3)
src/logic/map_objects/tribes/trainingsite.cc (+5/-5)
src/logic/map_objects/tribes/trainingsite.h (+6/-6)
src/logic/map_objects/tribes/tribe_basic_info.cc (+1/-1)
src/logic/map_objects/tribes/tribe_basic_info.h (+3/-3)
src/logic/map_objects/tribes/tribe_descr.cc (+13/-13)
src/logic/map_objects/tribes/tribe_descr.h (+11/-11)
src/logic/map_objects/tribes/tribes.cc (+1/-1)
src/logic/map_objects/tribes/tribes.h (+17/-17)
src/logic/map_objects/tribes/ware_descr.cc (+2/-2)
src/logic/map_objects/tribes/ware_descr.h (+4/-4)
src/logic/map_objects/tribes/warehouse.cc (+8/-8)
src/logic/map_objects/tribes/warehouse.h (+7/-7)
src/logic/map_objects/tribes/warelist.cc (+1/-1)
src/logic/map_objects/tribes/warelist.h (+3/-3)
src/logic/map_objects/tribes/wareworker.h (+3/-3)
src/logic/map_objects/tribes/workarea_info.h (+3/-3)
src/logic/map_objects/tribes/worker.cc (+13/-13)
src/logic/map_objects/tribes/worker.h (+5/-5)
src/logic/map_objects/tribes/worker_descr.cc (+6/-6)
src/logic/map_objects/tribes/worker_descr.h (+5/-5)
src/logic/map_objects/tribes/worker_program.cc (+1/-1)
src/logic/map_objects/tribes/worker_program.h (+7/-7)
src/logic/map_objects/walkingdir.cc (+1/-1)
src/logic/map_objects/walkingdir.h (+3/-3)
src/logic/map_objects/world/critter.cc (+4/-4)
src/logic/map_objects/world/critter.h (+4/-4)
src/logic/map_objects/world/critter_program.h (+4/-4)
src/logic/map_objects/world/editor_category.cc (+1/-1)
src/logic/map_objects/world/editor_category.h (+3/-3)
src/logic/map_objects/world/map_gen.cc (+2/-2)
src/logic/map_objects/world/map_gen.h (+4/-4)
src/logic/map_objects/world/resource_description.cc (+1/-1)
src/logic/map_objects/world/resource_description.h (+3/-3)
src/logic/map_objects/world/terrain_description.cc (+3/-3)
src/logic/map_objects/world/terrain_description.h (+4/-4)
src/logic/map_objects/world/world.cc (+7/-7)
src/logic/map_objects/world/world.h (+3/-3)
src/logic/mapastar.cc (+1/-1)
src/logic/path.cc (+1/-1)
src/logic/player.cc (+9/-9)
src/logic/player.h (+4/-4)
src/logic/playercommand.cc (+5/-5)
src/logic/playercommand.h (+4/-4)
src/logic/queue_cmd_factory.cc (+1/-1)
src/logic/single_player_game_settings_provider.cc (+1/-1)
src/logic/soldier_counts.h (+0/-31)
src/map_io/map_allowed_building_types_packet.cc (+1/-1)
src/map_io/map_allowed_worker_types_packet.cc (+1/-1)
src/map_io/map_bob_packet.cc (+2/-2)
src/map_io/map_building_packet.cc (+2/-2)
src/map_io/map_buildingdata_packet.cc (+11/-11)
src/map_io/map_flagdata_packet.cc (+2/-2)
src/map_io/map_heights_packet.cc (+1/-1)
src/map_io/map_node_ownership_packet.cc (+1/-1)
src/map_io/map_object_loader.cc (+1/-1)
src/map_io/map_object_loader.h (+1/-1)
src/map_io/map_object_packet.cc (+5/-5)
src/map_io/map_object_packet.h (+1/-1)
src/map_io/map_object_saver.cc (+4/-4)
src/map_io/map_player_names_and_tribes_packet.cc (+1/-1)
src/map_io/map_players_view_packet.cc (+2/-3)
src/map_io/map_resources_packet.cc (+2/-2)
src/map_io/map_roaddata_packet.cc (+2/-2)
src/map_io/map_saver.cc (+1/-1)
src/map_io/map_scripting_packet.cc (+1/-1)
src/map_io/map_terrain_packet.cc (+2/-2)
src/map_io/s2map.cc (+2/-2)
src/map_io/widelands_map_loader.cc (+1/-1)
src/network/netclient.cc (+1/-1)
src/network/nethost.cc (+1/-1)
src/network/network_player_settings_backend.cc (+1/-1)
src/profile/CMakeLists.txt (+0/-1)
src/profile/profile.cc (+1/-3)
src/scripting/lua_bases.cc (+4/-4)
src/scripting/lua_game.cc (+1/-1)
src/scripting/lua_game.h (+1/-1)
src/scripting/lua_map.cc (+10/-10)
src/scripting/lua_map.h (+9/-9)
src/scripting/lua_root.cc (+5/-5)
src/ui_fsmenu/launch_mpg.cc (+1/-1)
src/ui_fsmenu/launch_spg.cc (+1/-1)
src/wlapplication.cc (+0/-1)
src/wui/actionconfirm.cc (+2/-2)
src/wui/attack_box.cc (+1/-1)
src/wui/attack_box.h (+3/-3)
src/wui/building_statistics_menu.cc (+3/-3)
src/wui/building_statistics_menu.h (+1/-1)
src/wui/building_ui.cc (+1/-1)
src/wui/buildingwindow.cc (+6/-6)
src/wui/constructionsitewindow.cc (+1/-1)
src/wui/dismantlesitewindow.cc (+1/-1)
src/wui/encyclopedia_window.cc (+5/-5)
src/wui/encyclopedia_window.h (+2/-2)
src/wui/fieldaction.cc (+4/-4)
src/wui/game_debug_ui.cc (+5/-5)
src/wui/game_message_menu.cc (+1/-1)
src/wui/general_statistics_menu.cc (+2/-2)
src/wui/helpwindow.cc (+1/-1)
src/wui/helpwindow.h (+1/-1)
src/wui/interactive_base.cc (+3/-3)
src/wui/interactive_gamebase.cc (+1/-1)
src/wui/interactive_player.cc (+6/-6)
src/wui/itemwaresdisplay.cc (+1/-1)
src/wui/militarysitewindow.cc (+1/-1)
src/wui/multiplayersetupgroup.cc (+1/-1)
src/wui/playerdescrgroup.cc (+1/-1)
src/wui/portdockwaresdisplay.cc (+1/-1)
src/wui/productionsitewindow.cc (+5/-5)
src/wui/productionsitewindow.h (+1/-1)
src/wui/shipwindow.cc (+3/-3)
src/wui/soldiercapacitycontrol.cc (+1/-1)
src/wui/soldierlist.cc (+4/-4)
src/wui/stock_menu.cc (+1/-1)
src/wui/trainingsitewindow.cc (+1/-1)
src/wui/transport_ui.cc (+2/-2)
src/wui/ware_statistics_menu.cc (+2/-2)
src/wui/warehousewindow.cc (+1/-1)
src/wui/waresdisplay.cc (+3/-3)
src/wui/waresdisplay.h (+3/-3)
src/wui/waresqueuedisplay.h (+2/-2)
src/wui/watchwindow.cc (+1/-1)
- TiborB: Approve
-
Diff: 578 lines (+45/-115)24 files modifiedsrc/logic/militarysite.cc (+18/-13)
src/logic/militarysite.h (+4/-3)
src/map_io/map_buildingdata_packet.cc (+7/-11)
src/scripting/lua_map.cc (+0/-1)
src/scripting/lua_map.h (+5/-5)
tribes/buildings/militarysites/atlanteans/castle/init.lua (+0/-4)
tribes/buildings/militarysites/atlanteans/guardhall/init.lua (+0/-4)
tribes/buildings/militarysites/atlanteans/guardhouse/init.lua (+0/-5)
tribes/buildings/militarysites/atlanteans/tower/init.lua (+0/-4)
tribes/buildings/militarysites/atlanteans/tower_high/init.lua (+0/-4)
tribes/buildings/militarysites/atlanteans/tower_small/init.lua (+0/-4)
tribes/buildings/militarysites/barbarians/barrier/init.lua (+0/-4)
tribes/buildings/militarysites/barbarians/citadel/init.lua (+0/-4)
tribes/buildings/militarysites/barbarians/fortress/init.lua (+0/-4)
tribes/buildings/militarysites/barbarians/sentry/init.lua (+0/-4)
tribes/buildings/militarysites/barbarians/tower/init.lua (+0/-4)
tribes/buildings/militarysites/empire/barrier/init.lua (+0/-4)
tribes/buildings/militarysites/empire/blockhouse/init.lua (+0/-4)
tribes/buildings/militarysites/empire/castle/init.lua (+0/-4)
tribes/buildings/militarysites/empire/fortress/init.lua (+0/-4)
tribes/buildings/militarysites/empire/outpost/init.lua (+0/-4)
tribes/buildings/militarysites/empire/sentry/init.lua (+0/-4)
tribes/buildings/militarysites/empire/tower/init.lua (+0/-4)
tribes/scripting/help/building_help.lua (+11/-9)
- SirVer: Approve
-
Diff: 290 lines (+43/-43)13 files modifiedsrc/editor/ui_menus/player_menu.cc (+4/-4)
src/logic/map.cc (+1/-1)
src/logic/map_objects/tribes/ship.cc (+1/-1)
src/logic/map_objects/tribes/tribes.cc (+17/-17)
src/logic/map_objects/tribes/tribes.h (+12/-12)
src/logic/map_objects/tribes/worker.cc (+1/-1)
src/logic/single_player_game_settings_provider.cc (+1/-1)
src/network/netclient.cc (+1/-1)
src/network/nethost.cc (+1/-1)
src/scripting/lua_bases.cc (+1/-1)
src/scripting/lua_map.cc (+1/-1)
src/website/map_object_info.cc (+1/-1)
src/wui/playerdescrgroup.cc (+1/-1)
- SirVer: Approve
-
Diff: 3285 lines (+998/-959)120 files modifieddata/scripting/mapobjects.lua (+51/-0)
data/tribes/init.lua (+459/-493)
data/tribes/ships/atlanteans/init.lua (+1/-1)
data/tribes/ships/barbarians/init.lua (+1/-1)
data/tribes/ships/empire/init.lua (+1/-1)
data/tribes/workers/atlanteans/armorsmith/init.lua (+2/-2)
data/tribes/workers/atlanteans/baker/init.lua (+2/-2)
data/tribes/workers/atlanteans/blackroot_farmer/init.lua (+2/-2)
data/tribes/workers/atlanteans/builder/init.lua (+2/-2)
data/tribes/workers/atlanteans/carrier/init.lua (+2/-2)
data/tribes/workers/atlanteans/charcoal_burner/init.lua (+2/-2)
data/tribes/workers/atlanteans/farmer/init.lua (+2/-2)
data/tribes/workers/atlanteans/fishbreeder/init.lua (+1/-1)
data/tribes/workers/atlanteans/fisher/init.lua (+2/-2)
data/tribes/workers/atlanteans/forester/init.lua (+2/-2)
data/tribes/workers/atlanteans/geologist/init.lua (+2/-2)
data/tribes/workers/atlanteans/horse/init.lua (+2/-2)
data/tribes/workers/atlanteans/horsebreeder/init.lua (+1/-1)
data/tribes/workers/atlanteans/hunter/init.lua (+2/-2)
data/tribes/workers/atlanteans/miller/init.lua (+2/-2)
data/tribes/workers/atlanteans/miner/init.lua (+2/-2)
data/tribes/workers/atlanteans/recruit/init.lua (+1/-1)
data/tribes/workers/atlanteans/sawyer/init.lua (+2/-2)
data/tribes/workers/atlanteans/scout/init.lua (+1/-1)
data/tribes/workers/atlanteans/shipwright/init.lua (+2/-2)
data/tribes/workers/atlanteans/smelter/init.lua (+2/-2)
data/tribes/workers/atlanteans/smoker/init.lua (+1/-1)
data/tribes/workers/atlanteans/soldier/init.lua (+1/-1)
data/tribes/workers/atlanteans/spiderbreeder/init.lua (+2/-2)
data/tribes/workers/atlanteans/stonecutter/init.lua (+2/-2)
data/tribes/workers/atlanteans/toolsmith/init.lua (+2/-2)
data/tribes/workers/atlanteans/trainer/init.lua (+2/-2)
data/tribes/workers/atlanteans/weaponsmith/init.lua (+2/-2)
data/tribes/workers/atlanteans/weaver/init.lua (+2/-2)
data/tribes/workers/atlanteans/woodcutter/init.lua (+2/-2)
data/tribes/workers/barbarians/baker/init.lua (+2/-2)
data/tribes/workers/barbarians/blacksmith/init.lua (+2/-2)
data/tribes/workers/barbarians/blacksmith_master/init.lua (+2/-2)
data/tribes/workers/barbarians/brewer/init.lua (+2/-2)
data/tribes/workers/barbarians/brewer_master/init.lua (+2/-2)
data/tribes/workers/barbarians/builder/init.lua (+2/-2)
data/tribes/workers/barbarians/carrier/init.lua (+2/-2)
data/tribes/workers/barbarians/cattlebreeder/init.lua (+2/-2)
data/tribes/workers/barbarians/charcoal_burner/init.lua (+2/-2)
data/tribes/workers/barbarians/farmer/init.lua (+2/-2)
data/tribes/workers/barbarians/fisher/init.lua (+2/-2)
data/tribes/workers/barbarians/gamekeeper/init.lua (+2/-2)
data/tribes/workers/barbarians/gardener/init.lua (+2/-2)
data/tribes/workers/barbarians/geologist/init.lua (+2/-2)
data/tribes/workers/barbarians/helmsmith/init.lua (+2/-2)
data/tribes/workers/barbarians/hunter/init.lua (+2/-2)
data/tribes/workers/barbarians/innkeeper/init.lua (+2/-2)
data/tribes/workers/barbarians/lime_burner/init.lua (+2/-2)
data/tribes/workers/barbarians/lumberjack/init.lua (+2/-2)
data/tribes/workers/barbarians/miner/init.lua (+2/-2)
data/tribes/workers/barbarians/miner_chief/init.lua (+2/-2)
data/tribes/workers/barbarians/miner_master/init.lua (+2/-2)
data/tribes/workers/barbarians/ox/init.lua (+2/-2)
data/tribes/workers/barbarians/ranger/init.lua (+2/-2)
data/tribes/workers/barbarians/recruit/init.lua (+1/-1)
data/tribes/workers/barbarians/scout/init.lua (+2/-2)
data/tribes/workers/barbarians/shipwright/init.lua (+2/-2)
data/tribes/workers/barbarians/smelter/init.lua (+2/-2)
data/tribes/workers/barbarians/soldier/init.lua (+1/-1)
data/tribes/workers/barbarians/stonemason/init.lua (+2/-2)
data/tribes/workers/barbarians/trainer/init.lua (+2/-2)
data/tribes/workers/barbarians/weaver/init.lua (+2/-2)
data/tribes/workers/empire/armorsmith/init.lua (+2/-2)
data/tribes/workers/empire/baker/init.lua (+2/-2)
data/tribes/workers/empire/brewer/init.lua (+2/-2)
data/tribes/workers/empire/builder/init.lua (+2/-2)
data/tribes/workers/empire/carpenter/init.lua (+2/-2)
data/tribes/workers/empire/carrier/init.lua (+2/-2)
data/tribes/workers/empire/charcoal_burner/init.lua (+2/-2)
data/tribes/workers/empire/donkey/init.lua (+2/-2)
data/tribes/workers/empire/donkeybreeder/init.lua (+2/-2)
data/tribes/workers/empire/farmer/init.lua (+2/-2)
data/tribes/workers/empire/fisher/init.lua (+2/-2)
data/tribes/workers/empire/forester/init.lua (+2/-2)
data/tribes/workers/empire/geologist/init.lua (+2/-2)
data/tribes/workers/empire/hunter/init.lua (+2/-2)
data/tribes/workers/empire/innkeeper/init.lua (+2/-2)
data/tribes/workers/empire/lumberjack/init.lua (+2/-2)
data/tribes/workers/empire/miller/init.lua (+2/-2)
data/tribes/workers/empire/miner/init.lua (+2/-2)
data/tribes/workers/empire/miner_master/init.lua (+2/-2)
data/tribes/workers/empire/pigbreeder/init.lua (+2/-2)
data/tribes/workers/empire/recruit/init.lua (+1/-1)
data/tribes/workers/empire/scout/init.lua (+2/-2)
data/tribes/workers/empire/shepherd/init.lua (+2/-2)
data/tribes/workers/empire/shipwright/init.lua (+2/-2)
data/tribes/workers/empire/smelter/init.lua (+2/-2)
data/tribes/workers/empire/soldier/init.lua (+1/-1)
data/tribes/workers/empire/stonemason/init.lua (+2/-2)
data/tribes/workers/empire/toolsmith/init.lua (+2/-2)
data/tribes/workers/empire/trainer/init.lua (+2/-2)
data/tribes/workers/empire/vinefarmer/init.lua (+2/-2)
data/tribes/workers/empire/vintner/init.lua (+2/-2)
data/tribes/workers/empire/weaponsmith/init.lua (+2/-2)
data/tribes/workers/empire/weaver/init.lua (+2/-2)
data/world/critters/badger/init.lua (+2/-1)
data/world/critters/brownbear/init.lua (+2/-1)
data/world/critters/bunny/init.lua (+2/-1)
data/world/critters/chamois/init.lua (+2/-1)
data/world/critters/deer/init.lua (+2/-1)
data/world/critters/duck/init.lua (+2/-1)
data/world/critters/elk/init.lua (+2/-1)
data/world/critters/fox/init.lua (+2/-1)
data/world/critters/lynx/init.lua (+3/-1)
data/world/critters/marten/init.lua (+2/-1)
data/world/critters/reindeer/init.lua (+3/-1)
data/world/critters/sheep/init.lua (+2/-1)
data/world/critters/stag/init.lua (+2/-1)
data/world/critters/wildboar/init.lua (+2/-1)
data/world/critters/wisent/init.lua (+2/-1)
data/world/critters/wolf/init.lua (+2/-1)
data/world/init.lua (+257/-260)
data/world/map_generation.lua (+0/-6)
src/scripting/lua_globals.cc (+12/-0)
src/scripting/persistence.cc (+2/-1)
description: | updated |
description: | updated |
description: | updated |
description: | updated |
Changed in widelands: | |
milestone: | none → build19-rc1 |
assignee: | nobody → GunChleoc (gunchleoc) |
status: | New → In Progress |
description: | updated |
description: | updated |
description: | updated |
description: | updated |
description: | updated |
description: | updated |
description: | updated |
description: | updated |
description: | updated |
description: | updated |
description: | updated |
description: | updated |
Changed in widelands: | |
milestone: | build19-rc1 → none |
Changed in widelands: | |
milestone: | none → build20-rc1 |
description: | updated |
description: | updated |
description: | updated |
description: | updated |
Changed in widelands: | |
status: | In Progress → Fix Committed |
assignee: | GunChleoc (gunchleoc) → nobody |
Fixed in build20-rc1