Worker program "plant": Allow "attrib:" for tribe immovables
Bug #1731652 reported by
Benedikt Straub
This bug affects 1 person
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| widelands |
Fix Released
|
Wishlist
|
Unassigned | ||
Bug Description
Scripting worker programs: The "plant" command takes either tribe:<immovable> or attrib:<a> as an argument. Using "attrib:", only immovables belonging to the world but not to the tribes are permitted.
Please allow the worker to choose a tribe immovable when using "attrib:", or make it possible to pass several arguments (one of which will be selected at random) when using "tribe:".
Related branches
lp://staging/~widelands-dev/widelands/bug-1731652-worker-plant-attribute
- kaputtnik (community): Approve
- TiborB: Approve
-
Diff: 2529 lines (+586/-360)114 files modifieddata/scripting/editor/tree_help.lua (+5/-26)
data/scripting/formatting.lua (+24/-0)
data/scripting/help.lua (+53/-0)
data/tribes/immovables/ashes/helptexts.lua (+2/-3)
data/tribes/immovables/ashes/init.lua (+24/-2)
data/tribes/immovables/blackrootfield_harvested/helptexts.lua (+2/-3)
data/tribes/immovables/blackrootfield_harvested/init.lua (+1/-0)
data/tribes/immovables/blackrootfield_medium/helptexts.lua (+2/-3)
data/tribes/immovables/blackrootfield_medium/init.lua (+1/-0)
data/tribes/immovables/blackrootfield_ripe/helptexts.lua (+2/-3)
data/tribes/immovables/blackrootfield_ripe/init.lua (+1/-0)
data/tribes/immovables/blackrootfield_small/helptexts.lua (+2/-3)
data/tribes/immovables/blackrootfield_small/init.lua (+1/-0)
data/tribes/immovables/blackrootfield_tiny/helptexts.lua (+2/-3)
data/tribes/immovables/blackrootfield_tiny/init.lua (+2/-1)
data/tribes/immovables/cornfield_harvested/helptexts.lua (+2/-3)
data/tribes/immovables/cornfield_harvested/init.lua (+1/-0)
data/tribes/immovables/cornfield_medium/helptexts.lua (+2/-3)
data/tribes/immovables/cornfield_medium/init.lua (+1/-0)
data/tribes/immovables/cornfield_ripe/helptexts.lua (+2/-3)
data/tribes/immovables/cornfield_ripe/init.lua (+1/-0)
data/tribes/immovables/cornfield_small/helptexts.lua (+2/-3)
data/tribes/immovables/cornfield_small/init.lua (+1/-0)
data/tribes/immovables/cornfield_tiny/helptexts.lua (+2/-3)
data/tribes/immovables/cornfield_tiny/init.lua (+2/-1)
data/tribes/immovables/destroyed_building/helptexts.lua (+2/-3)
data/tribes/immovables/destroyed_building/init.lua (+1/-0)
data/tribes/immovables/field_harvested/helptexts.lua (+2/-3)
data/tribes/immovables/field_harvested/init.lua (+1/-0)
data/tribes/immovables/field_medium/helptexts.lua (+2/-3)
data/tribes/immovables/field_medium/init.lua (+1/-0)
data/tribes/immovables/field_ripe/helptexts.lua (+2/-3)
data/tribes/immovables/field_ripe/init.lua (+1/-0)
data/tribes/immovables/field_small/helptexts.lua (+2/-3)
data/tribes/immovables/field_small/init.lua (+1/-0)
data/tribes/immovables/field_tiny/helptexts.lua (+2/-3)
data/tribes/immovables/field_tiny/init.lua (+11/-1)
data/tribes/immovables/grapevine_medium/helptexts.lua (+2/-3)
data/tribes/immovables/grapevine_medium/init.lua (+1/-0)
data/tribes/immovables/grapevine_ripe/helptexts.lua (+2/-3)
data/tribes/immovables/grapevine_ripe/init.lua (+1/-0)
data/tribes/immovables/grapevine_small/helptexts.lua (+2/-3)
data/tribes/immovables/grapevine_small/init.lua (+1/-0)
data/tribes/immovables/grapevine_tiny/helptexts.lua (+2/-3)
data/tribes/immovables/grapevine_tiny/init.lua (+2/-1)
data/tribes/immovables/reed_medium/helptexts.lua (+2/-3)
data/tribes/immovables/reed_medium/init.lua (+1/-0)
data/tribes/immovables/reed_ripe/helptexts.lua (+2/-3)
data/tribes/immovables/reed_ripe/init.lua (+1/-0)
data/tribes/immovables/reed_small/helptexts.lua (+2/-3)
data/tribes/immovables/reed_small/init.lua (+1/-0)
data/tribes/immovables/reed_tiny/helptexts.lua (+2/-3)
data/tribes/immovables/reed_tiny/init.lua (+2/-1)
data/tribes/immovables/resi_coal1/helptexts.lua (+5/-4)
data/tribes/immovables/resi_coal1/init.lua (+2/-1)
data/tribes/immovables/resi_coal2/helptexts.lua (+5/-4)
data/tribes/immovables/resi_coal2/init.lua (+2/-1)
data/tribes/immovables/resi_gold1/helptexts.lua (+5/-4)
data/tribes/immovables/resi_gold1/init.lua (+2/-1)
data/tribes/immovables/resi_gold2/helptexts.lua (+5/-4)
data/tribes/immovables/resi_gold2/init.lua (+2/-1)
data/tribes/immovables/resi_iron1/helptexts.lua (+5/-4)
data/tribes/immovables/resi_iron1/init.lua (+2/-1)
data/tribes/immovables/resi_iron2/helptexts.lua (+5/-4)
data/tribes/immovables/resi_iron2/init.lua (+2/-1)
data/tribes/immovables/resi_none/helptexts.lua (+2/-4)
data/tribes/immovables/resi_none/init.lua (+2/-1)
data/tribes/immovables/resi_stones1/helptexts.lua (+15/-8)
data/tribes/immovables/resi_stones1/init.lua (+2/-1)
data/tribes/immovables/resi_stones2/helptexts.lua (+15/-8)
data/tribes/immovables/resi_stones2/init.lua (+2/-1)
data/tribes/immovables/resi_water1/helptexts.lua (+2/-4)
data/tribes/immovables/resi_water1/init.lua (+2/-1)
data/tribes/immovables/shipconstruction_atlanteans/helptexts.lua (+2/-3)
data/tribes/immovables/shipconstruction_atlanteans/init.lua (+2/-0)
data/tribes/immovables/shipconstruction_barbarians/helptexts.lua (+2/-3)
data/tribes/immovables/shipconstruction_barbarians/init.lua (+2/-0)
data/tribes/immovables/shipconstruction_empire/helptexts.lua (+2/-3)
data/tribes/immovables/shipconstruction_empire/init.lua (+2/-0)
data/tribes/scripting/help/building_help.lua (+2/-2)
data/tribes/scripting/help/immovable_help.lua (+85/-0)
data/tribes/scripting/help/init.lua (+13/-0)
data/tribes/scripting/help/ware_help.lua (+1/-3)
data/tribes/wares/armor/init.lua (+27/-1)
data/tribes/workers/atlanteans/blackroot_farmer/init.lua (+1/-1)
data/tribes/workers/atlanteans/farmer/init.lua (+1/-1)
data/tribes/workers/atlanteans/shipwright/init.lua (+1/-1)
data/tribes/workers/barbarians/farmer/init.lua (+1/-1)
data/tribes/workers/barbarians/gardener/init.lua (+1/-1)
data/tribes/workers/barbarians/shipwright/init.lua (+1/-1)
data/tribes/workers/empire/farmer/init.lua (+1/-1)
data/tribes/workers/empire/shipwright/init.lua (+1/-1)
data/tribes/workers/empire/vinefarmer/init.lua (+1/-1)
src/economy/flag.h (+1/-1)
src/economy/fleet.h (+1/-1)
src/economy/portdock.cc (+1/-1)
src/economy/road.h (+1/-1)
src/logic/map_objects/immovable.cc (+3/-0)
src/logic/map_objects/map_object.cc (+6/-3)
src/logic/map_objects/map_object.h (+7/-1)
src/logic/map_objects/tribes/battle.h (+1/-1)
src/logic/map_objects/tribes/building.cc (+5/-4)
src/logic/map_objects/tribes/building.h (+0/-4)
src/logic/map_objects/tribes/tribe_descr.cc (+4/-3)
src/logic/map_objects/tribes/tribe_descr.h (+1/-0)
src/logic/map_objects/tribes/ware_descr.cc (+5/-5)
src/logic/map_objects/tribes/ware_descr.h (+0/-6)
src/logic/map_objects/tribes/worker.cc (+31/-40)
src/logic/map_objects/tribes/worker_descr.cc (+4/-3)
src/logic/map_objects/tribes/worker_descr.h (+0/-5)
src/logic/map_objects/tribes/worker_program.cc (+25/-31)
src/scripting/lua_map.cc (+47/-43)
src/scripting/lua_map.h (+4/-5)
test/maps/lua_testsuite.wmf/scripting/immovables_descriptions.lua (+12/-12)
Revision history for this message
| GunChleoc (gunchleoc) wrote | #1 |
| tags: | added: lua tribes world |
| Changed in widelands: | |
| status: | New → Confirmed |
| milestone: | none → build20-rc1 |
| assignee: | nobody → GunChleoc (gunchleoc) |
Revision history for this message
| GunChleoc (gunchleoc) wrote | #2 |
| Changed in widelands: | |
| status: | Confirmed → In Progress |
| Changed in widelands: | |
| status: | In Progress → Fix Committed |
| assignee: | GunChleoc (gunchleoc) → nobody |
Revision history for this message
| GunChleoc (gunchleoc) wrote | #3 |
| Changed in widelands: | |
| status: | Fix Committed → Fix Released |
To post a comment you must log in.
I have just had a look at the data, I think we should rename "attrib" to "world" and turn "tribe" into an attribute search as well.