widelands-dev team mailing list archive
-
widelands-dev team
-
Mailing list archive
-
Message #17245
[Merge] lp:~widelands-dev/widelands/tribe-immovable-file-structure into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/tribe-immovable-file-structure into lp:widelands.
Commit message:
Immovables naming cleanup
- Rename "thatch reed" to "reed" and "reed" to "reed field"
- Rename "field" to "wheat field"
- Group tribes immovables into subdirectories
- Remove old entries from tribes legacy table and simplify its structure
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/tribe-immovable-file-structure/+merge/367611
--
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/tribe-immovable-file-structure into lp:widelands.
=== modified file 'data/campaigns/bar01.wmf/scripting/starting_conditions.lua'
--- data/campaigns/bar01.wmf/scripting/starting_conditions.lua 2016-10-22 10:37:11 +0000
+++ data/campaigns/bar01.wmf/scripting/starting_conditions.lua 2019-05-19 12:28:15 +0000
@@ -34,7 +34,7 @@
scythe = 6,
shovel = 4,
snack = 3,
- thatch_reed = 24,
+ reed = 24,
}
hq:set_workers{
barbarians_blacksmith = 2,
=== modified file 'data/campaigns/bar01.wmf/scripting/texts.lua'
--- data/campaigns/bar01.wmf/scripting/texts.lua 2018-09-29 12:45:54 +0000
+++ data/campaigns/bar01.wmf/scripting/texts.lua 2019-05-19 12:28:15 +0000
@@ -120,7 +120,7 @@
title = _"Build a reed yard",
number = 1,
body = objective_text(_"Build a reed yard",
- p(_([[The third material necessary for improved buildings is thatch reed, used to cover roofs. Thatch reed is planted by a gardener around his building, the reed yard.]])) ..
+ p(_([[The third material necessary for improved buildings is reed, used to cover roofs. Reed fields are planted by a gardener around his building, the reed yard.]])) ..
li(_"Build a reed yard"))
}
=== modified file 'data/campaigns/bar02.wmf/scripting/starting_conditions.lua'
--- data/campaigns/bar02.wmf/scripting/starting_conditions.lua 2018-02-10 14:23:19 +0000
+++ data/campaigns/bar02.wmf/scripting/starting_conditions.lua 2019-05-19 12:28:15 +0000
@@ -37,7 +37,7 @@
scythe = 6,
shovel = 4,
snack = 3,
- thatch_reed = 24,
+ reed = 24,
}
hq:set_workers{
barbarians_blacksmith = 2,
=== modified file 'data/campaigns/emp02.wmf/scripting/starting_conditions.lua'
--- data/campaigns/emp02.wmf/scripting/starting_conditions.lua 2017-01-06 14:17:42 +0000
+++ data/campaigns/emp02.wmf/scripting/starting_conditions.lua 2019-05-19 12:28:15 +0000
@@ -116,7 +116,7 @@
scythe = 6,
shovel = 4,
snack = 3,
- thatch_reed = 24,
+ reed = 24,
},
workers = {
barbarians_blacksmith = 2,
=== modified file 'data/campaigns/emp03.wmf/scripting/starting_conditions.lua'
--- data/campaigns/emp03.wmf/scripting/starting_conditions.lua 2017-03-16 21:54:07 +0000
+++ data/campaigns/emp03.wmf/scripting/starting_conditions.lua 2019-05-19 12:28:15 +0000
@@ -120,7 +120,7 @@
scythe = 6,
shovel = 4,
snack = 3,
- thatch_reed = 24,
+ reed = 24,
},
workers = {
barbarians_blacksmith = 2,
=== modified file 'data/campaigns/emp04.wmf/scripting/starting_conditions.lua'
--- data/campaigns/emp04.wmf/scripting/starting_conditions.lua 2018-08-09 20:54:08 +0000
+++ data/campaigns/emp04.wmf/scripting/starting_conditions.lua 2019-05-19 12:28:15 +0000
@@ -224,7 +224,7 @@
scythe = 6,
shovel = 4,
snack = 3,
- thatch_reed = 24,
+ reed = 24,
},
workers = {
barbarians_blacksmith = 2,
=== modified file 'data/campaigns/fri01.wmf/scripting/mission_thread.lua'
--- data/campaigns/fri01.wmf/scripting/mission_thread.lua 2018-09-14 08:57:44 +0000
+++ data/campaigns/fri01.wmf/scripting/mission_thread.lua 2019-05-19 12:28:15 +0000
@@ -16,7 +16,7 @@
count("coal") < 20 or
count("brick") < 40 or
count("clay") < 10 or
- count("thatch_reed") < 30
+ count("reed") < 30
) do sleep(8731) end
set_objective_done(o)
done_gather_materials = true
@@ -59,7 +59,7 @@
local ready = 0
while show_warning_reed do
sleep(10000)
- if count("thatch_reed") < 4 then
+ if count("reed") < 4 then
if ready > 8 then
if #p1:get_buildings("frisians_reed_farm") < 3 then
campaign_message_box(warning_no_reed)
=== modified file 'data/campaigns/fri01.wmf/scripting/starting_conditions.lua'
--- data/campaigns/fri01.wmf/scripting/starting_conditions.lua 2018-05-23 05:13:49 +0000
+++ data/campaigns/fri01.wmf/scripting/starting_conditions.lua 2019-05-19 12:28:15 +0000
@@ -12,7 +12,7 @@
granite = 40,
water = 40,
coal = 20,
- thatch_reed = 20,
+ reed = 20,
fruit = 10,
fish = 10,
meat = 10,
@@ -90,7 +90,7 @@
brick = 200,
clay = 30,
granite = 200,
- thatch_reed = 200,
+ reed = 200,
water = 20,
coal = 100,
iron = 50,
=== modified file 'data/campaigns/fri01.wmf/scripting/texts.lua'
--- data/campaigns/fri01.wmf/scripting/texts.lua 2019-05-12 16:31:38 +0000
+++ data/campaigns/fri01.wmf/scripting/texts.lua 2019-05-19 12:28:15 +0000
@@ -49,7 +49,7 @@
li(_"10 × Clay") ..
li(_"40 × Brick") ..
li(_"20 × Coal") ..
- li(_"30 × Thatch Reed") ..
+ li(_"30 × Reed") ..
p(_([[Remember that you can set target quantities for most of these wares in your economy settings.]]))
),
}
@@ -154,7 +154,7 @@
_([[We should start by taking care of our wood production. Trees don’t seem to grow well on this island; better build at least two houses for foresters and one for a woodcutter.]])
.. paragraphdivider() ..
-- TRANSLATORS: Hauke – Introduction 3
- _([[Also, we had better build a reed farm soon. Even reed farms need reed to be built, so we must take care not to run short before we can grow our own. Reed is easily cultivated, so the reed farmer doesn’t need anything more to start growing thatch reed.]]))
+ _([[Also, we had better build a reed farm soon. Even reed farms need reed to be built, so we must take care not to run short before we can grow our own. Reed is easily cultivated, so the reed farmer doesn’t need anything more to start growing reed fields.]]))
.. new_objectives(obj_build_wood_economy),
}
intro_4 = {
@@ -186,7 +186,7 @@
body=hauke(_"Build another reed farm",
-- TRANSLATORS: Hauke – no reed
_([[I noticed we have been short of reed for a while now. Our buildings seem to need quite a lot of it. We should build another reed farm or two. Reed is also used for making fishing nets and other tools; therefore, resolving this shortage should be a priority.]]))
- .. li_arrow (_([[You should assign the new reed farm the highest priority for thatch reed in the construction site window.]])),
+ .. li_arrow (_([[You should assign the new reed farm the highest priority for reed in the construction site window.]])),
}
warning_no_clay = {
title =_ "Clay Shortages",
=== modified file 'data/campaigns/fri02.wmf/scripting/starting_conditions.lua'
--- data/campaigns/fri02.wmf/scripting/starting_conditions.lua 2018-09-28 09:38:02 +0000
+++ data/campaigns/fri02.wmf/scripting/starting_conditions.lua 2019-05-19 12:28:15 +0000
@@ -23,7 +23,7 @@
log = 40,
brick = 50,
granite = 40,
- thatch_reed = 20,
+ reed = 20,
clay = 10,
water = 5,
coal = 30,
@@ -247,7 +247,7 @@
hq3:set_wares {
log = 100,
granite = 50,
- thatch_reed = 50,
+ reed = 50,
blackwood = 10, -- To delay expansion
grout = 20,
coal = 20,
=== modified file 'data/campaigns/tutorial02_warfare.wmf/scripting/starting_conditions.lua'
--- data/campaigns/tutorial02_warfare.wmf/scripting/starting_conditions.lua 2017-02-12 09:10:57 +0000
+++ data/campaigns/tutorial02_warfare.wmf/scripting/starting_conditions.lua 2019-05-19 12:28:15 +0000
@@ -35,7 +35,7 @@
gold = 10,
grout = 30,
granite = 30,
- thatch_reed = 40,
+ reed = 40,
-- wares for training
ax_sharp = 20,
=== modified file 'data/maps/MP_Scenarios/Smugglers.wmf/scripting/starting_conditions.lua'
--- data/maps/MP_Scenarios/Smugglers.wmf/scripting/starting_conditions.lua 2018-09-08 09:36:36 +0000
+++ data/maps/MP_Scenarios/Smugglers.wmf/scripting/starting_conditions.lua 2019-05-19 12:28:15 +0000
@@ -27,7 +27,7 @@
scythe = 6,
shovel = 4,
snack = 3,
- thatch_reed = 24,
+ reed = 24,
log = 80,
},
workers = {
@@ -184,7 +184,7 @@
wares = {
log = 40,
granite = 50,
- thatch_reed = 50,
+ reed = 50,
brick = 80,
clay = 30,
water = 10,
=== modified file 'data/maps/The_Green_Plateau.wmf/scripting/initial_conditions.lua'
--- data/maps/The_Green_Plateau.wmf/scripting/initial_conditions.lua 2016-03-21 19:29:24 +0000
+++ data/maps/The_Green_Plateau.wmf/scripting/initial_conditions.lua 2019-05-19 12:28:15 +0000
@@ -26,7 +26,7 @@
scythe = 6,
shovel = 4,
snack = 3,
- thatch_reed = 24,
+ reed = 24,
ax = 6,
},
workers = {
@@ -159,7 +159,7 @@
pick = 14,
scythe = 6,
shovel = 4,
- thatch_reed = 24,
+ reed = 24,
log = 200,
},
workers = {
=== modified file 'data/maps/Trident_of_Fire.wmf/scripting/initial_conditions.lua'
--- data/maps/Trident_of_Fire.wmf/scripting/initial_conditions.lua 2016-11-01 13:58:24 +0000
+++ data/maps/Trident_of_Fire.wmf/scripting/initial_conditions.lua 2019-05-19 12:28:15 +0000
@@ -128,7 +128,7 @@
scythe = 6,
shovel = 4,
snack = 3,
- thatch_reed = 24,
+ reed = 24,
log = 150,
},
workers = {
=== modified file 'data/tribes/barbarians.lua'
--- data/tribes/barbarians.lua 2018-07-29 13:49:09 +0000
+++ data/tribes/barbarians.lua 2019-05-19 12:28:15 +0000
@@ -61,7 +61,7 @@
"log",
"blackwood",
"grout",
- "thatch_reed",
+ "reed",
"cloth"
},
{
@@ -171,15 +171,15 @@
immovables = {
"ashes",
"destroyed_building",
- "field_tiny",
- "field_small",
- "field_medium",
- "field_ripe",
- "field_harvested",
- "reed_tiny",
- "reed_small",
- "reed_medium",
- "reed_ripe",
+ "wheatfield_tiny",
+ "wheatfield_small",
+ "wheatfield_medium",
+ "wheatfield_ripe",
+ "wheatfield_harvested",
+ "reedfield_tiny",
+ "reedfield_small",
+ "reedfield_medium",
+ "reedfield_ripe",
"barbarians_resi_none",
"barbarians_resi_water",
"barbarians_resi_coal_1",
=== modified file 'data/tribes/buildings/militarysites/frisians/fortress/init.lua'
--- data/tribes/buildings/militarysites/frisians/fortress/init.lua 2018-09-01 13:24:52 +0000
+++ data/tribes/buildings/militarysites/frisians/fortress/init.lua 2019-05-19 12:28:15 +0000
@@ -13,13 +13,13 @@
brick = 10,
granite = 4,
log = 3,
- thatch_reed = 5
+ reed = 5
},
return_on_dismantle = {
brick = 5,
granite = 2,
log = 2,
- thatch_reed = 2
+ reed = 2
},
animations = {
=== modified file 'data/tribes/buildings/militarysites/frisians/outpost/init.lua'
--- data/tribes/buildings/militarysites/frisians/outpost/init.lua 2018-07-12 19:37:48 +0000
+++ data/tribes/buildings/militarysites/frisians/outpost/init.lua 2019-05-19 12:28:15 +0000
@@ -13,12 +13,12 @@
brick = 5,
granite = 1,
log = 1,
- thatch_reed = 2
+ reed = 2
},
return_on_dismantle = {
brick = 2,
log = 1,
- thatch_reed = 1
+ reed = 1
},
animations = {
=== modified file 'data/tribes/buildings/militarysites/frisians/sentinel/init.lua'
--- data/tribes/buildings/militarysites/frisians/sentinel/init.lua 2018-10-18 09:09:06 +0000
+++ data/tribes/buildings/militarysites/frisians/sentinel/init.lua 2019-05-19 12:28:15 +0000
@@ -13,7 +13,7 @@
buildcost = {
brick = 1,
log = 1,
- thatch_reed = 1
+ reed = 1
},
return_on_dismantle = {
brick = 1,
=== modified file 'data/tribes/buildings/militarysites/frisians/tower/init.lua'
--- data/tribes/buildings/militarysites/frisians/tower/init.lua 2018-09-01 13:24:52 +0000
+++ data/tribes/buildings/militarysites/frisians/tower/init.lua 2019-05-19 12:28:15 +0000
@@ -14,13 +14,13 @@
brick = 6,
granite = 2,
log = 4,
- thatch_reed = 3
+ reed = 3
},
return_on_dismantle = {
brick = 3,
granite = 1,
log = 2,
- thatch_reed = 1
+ reed = 1
},
animations = {
=== modified file 'data/tribes/buildings/militarysites/frisians/wooden_tower/init.lua'
--- data/tribes/buildings/militarysites/frisians/wooden_tower/init.lua 2018-07-15 10:41:10 +0000
+++ data/tribes/buildings/militarysites/frisians/wooden_tower/init.lua 2019-05-19 12:28:15 +0000
@@ -13,7 +13,7 @@
buildcost = {
log = 3,
- thatch_reed = 1
+ reed = 1
},
return_on_dismantle = {
log = 2
=== modified file 'data/tribes/buildings/militarysites/frisians/wooden_tower_high/init.lua'
--- data/tribes/buildings/militarysites/frisians/wooden_tower_high/init.lua 2018-07-15 10:41:10 +0000
+++ data/tribes/buildings/militarysites/frisians/wooden_tower_high/init.lua 2019-05-19 12:28:15 +0000
@@ -12,7 +12,7 @@
enhancement_cost = {
log = 2,
- thatch_reed = 1
+ reed = 1
},
return_on_dismantle_on_enhanced = {
log = 1,
=== modified file 'data/tribes/buildings/productionsites/barbarians/ax_workshop/init.lua'
--- data/tribes/buildings/productionsites/barbarians/ax_workshop/init.lua 2019-03-17 07:20:58 +0000
+++ data/tribes/buildings/productionsites/barbarians/ax_workshop/init.lua 2019-05-19 12:28:15 +0000
@@ -15,7 +15,7 @@
blackwood = 1,
granite = 2,
grout = 1,
- thatch_reed = 1
+ reed = 1
},
return_on_dismantle_on_enhanced = {
blackwood = 1,
=== modified file 'data/tribes/buildings/productionsites/barbarians/bakery/init.lua'
--- data/tribes/buildings/productionsites/barbarians/bakery/init.lua 2017-09-03 07:59:51 +0000
+++ data/tribes/buildings/productionsites/barbarians/bakery/init.lua 2019-05-19 12:28:15 +0000
@@ -13,7 +13,7 @@
log = 2,
blackwood = 2,
granite = 2,
- thatch_reed = 2
+ reed = 2
},
return_on_dismantle = {
log = 1,
=== modified file 'data/tribes/buildings/productionsites/barbarians/barracks/init.lua'
--- data/tribes/buildings/productionsites/barbarians/barracks/init.lua 2019-05-04 23:13:31 +0000
+++ data/tribes/buildings/productionsites/barbarians/barracks/init.lua 2019-05-19 12:28:15 +0000
@@ -13,7 +13,7 @@
log = 4,
granite = 2,
grout = 4,
- thatch_reed = 1
+ reed = 1
},
return_on_dismantle = {
log = 2,
=== modified file 'data/tribes/buildings/productionsites/barbarians/big_inn/init.lua'
--- data/tribes/buildings/productionsites/barbarians/big_inn/init.lua 2019-03-17 07:20:58 +0000
+++ data/tribes/buildings/productionsites/barbarians/big_inn/init.lua 2019-05-19 12:28:15 +0000
@@ -12,7 +12,7 @@
enhancement_cost = {
log = 1,
grout = 3,
- thatch_reed = 2
+ reed = 2
},
return_on_dismantle_on_enhanced = {
grout = 2
=== modified file 'data/tribes/buildings/productionsites/barbarians/brewery/init.lua'
--- data/tribes/buildings/productionsites/barbarians/brewery/init.lua 2017-09-03 07:59:51 +0000
+++ data/tribes/buildings/productionsites/barbarians/brewery/init.lua 2019-05-19 12:28:15 +0000
@@ -12,7 +12,7 @@
enhancement_cost = {
log = 3,
granite = 1,
- thatch_reed = 1
+ reed = 1
},
return_on_dismantle_on_enhanced = {
log = 1,
=== modified file 'data/tribes/buildings/productionsites/barbarians/charcoal_kiln/init.lua'
--- data/tribes/buildings/productionsites/barbarians/charcoal_kiln/init.lua 2017-09-03 07:59:51 +0000
+++ data/tribes/buildings/productionsites/barbarians/charcoal_kiln/init.lua 2019-05-19 12:28:15 +0000
@@ -12,7 +12,7 @@
buildcost = {
log = 3,
grout = 2,
- thatch_reed = 2
+ reed = 2
},
return_on_dismantle = {
log = 2,
=== modified file 'data/tribes/buildings/productionsites/barbarians/helmsmithy/init.lua'
--- data/tribes/buildings/productionsites/barbarians/helmsmithy/init.lua 2018-09-10 12:32:56 +0000
+++ data/tribes/buildings/productionsites/barbarians/helmsmithy/init.lua 2019-05-19 12:28:15 +0000
@@ -14,13 +14,13 @@
blackwood = 1,
granite = 2,
grout = 2,
- thatch_reed = 3
+ reed = 3
},
return_on_dismantle = {
log = 1,
granite = 2,
grout = 1,
- thatch_reed = 1
+ reed = 1
},
animations = {
=== modified file 'data/tribes/buildings/productionsites/barbarians/inn/init.lua'
--- data/tribes/buildings/productionsites/barbarians/inn/init.lua 2019-03-17 07:20:58 +0000
+++ data/tribes/buildings/productionsites/barbarians/inn/init.lua 2019-05-19 12:28:15 +0000
@@ -13,7 +13,7 @@
enhancement_cost = {
log = 2,
grout = 2,
- thatch_reed = 1
+ reed = 1
},
return_on_dismantle_on_enhanced = {
log = 1,
=== modified file 'data/tribes/buildings/productionsites/barbarians/metal_workshop/init.lua'
--- data/tribes/buildings/productionsites/barbarians/metal_workshop/init.lua 2019-03-17 07:20:58 +0000
+++ data/tribes/buildings/productionsites/barbarians/metal_workshop/init.lua 2019-05-19 12:28:15 +0000
@@ -15,7 +15,7 @@
blackwood = 1,
granite = 2,
grout = 1,
- thatch_reed = 1
+ reed = 1
},
return_on_dismantle = {
blackwood = 1,
=== modified file 'data/tribes/buildings/productionsites/barbarians/micro_brewery/init.lua'
--- data/tribes/buildings/productionsites/barbarians/micro_brewery/init.lua 2017-09-03 07:59:51 +0000
+++ data/tribes/buildings/productionsites/barbarians/micro_brewery/init.lua 2019-05-19 12:28:15 +0000
@@ -14,7 +14,7 @@
log = 3,
blackwood = 2,
granite = 3,
- thatch_reed = 2
+ reed = 2
},
return_on_dismantle = {
log = 1,
=== modified file 'data/tribes/buildings/productionsites/barbarians/reed_yard/helptexts.lua'
--- data/tribes/buildings/productionsites/barbarians/reed_yard/helptexts.lua 2015-11-07 08:45:50 +0000
+++ data/tribes/buildings/productionsites/barbarians/reed_yard/helptexts.lua 2019-05-19 12:28:15 +0000
@@ -15,10 +15,10 @@
function building_helptext_note()
-- TRANSLATORS: Note helptext for a building
- return pgettext("barbarians_building", "Thatch reed is the traditional material for roofing, and it is woven into the extremely durable cloth that they use for their ships’ sails.")
+ return pgettext("barbarians_building", "Reed is the traditional material for roofing, and it is woven into the extremely durable cloth that they use for their ships’ sails.")
end
function building_helptext_performance()
-- TRANSLATORS: Performance helptext for a building
- return pgettext("barbarians_building", "A reed yard can produce a sheaf of thatch reed in about %s on average."):bformat(ngettext("%d second", "%d seconds", 65):bformat(65))
+ return pgettext("barbarians_building", "A reed yard can produce a sheaf of reed in about %s on average."):bformat(ngettext("%d second", "%d seconds", 65):bformat(65))
end
=== modified file 'data/tribes/buildings/productionsites/barbarians/reed_yard/init.lua'
--- data/tribes/buildings/productionsites/barbarians/reed_yard/init.lua 2018-09-06 08:21:35 +0000
+++ data/tribes/buildings/productionsites/barbarians/reed_yard/init.lua 2019-05-19 12:28:15 +0000
@@ -35,7 +35,7 @@
},
outputs = {
- "thatch_reed"
+ "reed"
},
programs = {
=== modified file 'data/tribes/buildings/productionsites/barbarians/smelting_works/init.lua'
--- data/tribes/buildings/productionsites/barbarians/smelting_works/init.lua 2019-03-17 07:20:58 +0000
+++ data/tribes/buildings/productionsites/barbarians/smelting_works/init.lua 2019-05-19 12:28:15 +0000
@@ -14,7 +14,7 @@
blackwood = 1,
granite = 1,
grout = 1,
- thatch_reed = 2
+ reed = 2
},
return_on_dismantle = {
log = 1,
=== modified file 'data/tribes/buildings/productionsites/barbarians/tavern/init.lua'
--- data/tribes/buildings/productionsites/barbarians/tavern/init.lua 2019-03-17 07:20:58 +0000
+++ data/tribes/buildings/productionsites/barbarians/tavern/init.lua 2019-05-19 12:28:15 +0000
@@ -14,7 +14,7 @@
log = 3,
blackwood = 2,
granite = 1,
- thatch_reed = 1
+ reed = 1
},
return_on_dismantle = {
log = 1,
=== modified file 'data/tribes/buildings/productionsites/barbarians/warmill/init.lua'
--- data/tribes/buildings/productionsites/barbarians/warmill/init.lua 2019-03-17 07:20:58 +0000
+++ data/tribes/buildings/productionsites/barbarians/warmill/init.lua 2019-05-19 12:28:15 +0000
@@ -14,7 +14,7 @@
blackwood = 1,
granite = 2,
grout = 1,
- thatch_reed = 1
+ reed = 1
},
return_on_dismantle_on_enhanced = {
blackwood = 1,
=== modified file 'data/tribes/buildings/productionsites/barbarians/weaving_mill/helptexts.lua'
--- data/tribes/buildings/productionsites/barbarians/weaving_mill/helptexts.lua 2019-04-19 09:05:17 +0000
+++ data/tribes/buildings/productionsites/barbarians/weaving_mill/helptexts.lua 2019-05-19 12:28:15 +0000
@@ -14,7 +14,7 @@
function building_helptext_purpose()
-- TRANSLATORS: Purpose helptext for a building
- return pgettext("barbarians_building", "Weaves cloth out of thatch reed.")
+ return pgettext("barbarians_building", "Weaves cloth out of reed.")
end
function building_helptext_note()
=== modified file 'data/tribes/buildings/productionsites/barbarians/weaving_mill/init.lua'
--- data/tribes/buildings/productionsites/barbarians/weaving_mill/init.lua 2019-03-17 07:20:58 +0000
+++ data/tribes/buildings/productionsites/barbarians/weaving_mill/init.lua 2019-05-19 12:28:15 +0000
@@ -13,7 +13,7 @@
buildcost = {
log = 5,
granite = 2,
- thatch_reed = 2
+ reed = 2
},
return_on_dismantle = {
log = 2,
@@ -44,7 +44,7 @@
},
inputs = {
- { name = "thatch_reed", amount = 8 }
+ { name = "reed", amount = 8 }
},
outputs = {
"cloth"
@@ -58,7 +58,7 @@
"sleep=25000",
"checkmap=seafaring",
"return=skipped unless economy needs cloth",
- "consume=thatch_reed",
+ "consume=reed",
"playsound=sound/barbarians/weaver 120",
"animate=working 20000",
"produce=cloth"
=== modified file 'data/tribes/buildings/productionsites/frisians/aqua_farm/init.lua'
--- data/tribes/buildings/productionsites/frisians/aqua_farm/init.lua 2018-10-04 07:14:23 +0000
+++ data/tribes/buildings/productionsites/frisians/aqua_farm/init.lua 2019-05-19 12:28:15 +0000
@@ -12,7 +12,7 @@
buildcost = {
brick = 2,
log = 1,
- thatch_reed = 1
+ reed = 1
},
return_on_dismantle = {
brick = 1,
=== modified file 'data/tribes/buildings/productionsites/frisians/armor_smithy_large/init.lua'
--- data/tribes/buildings/productionsites/frisians/armor_smithy_large/init.lua 2019-03-17 07:20:58 +0000
+++ data/tribes/buildings/productionsites/frisians/armor_smithy_large/init.lua 2019-05-19 12:28:15 +0000
@@ -13,7 +13,7 @@
brick = 4,
granite = 2,
log = 1,
- thatch_reed = 1
+ reed = 1
},
return_on_dismantle_on_enhanced = {
brick = 2,
=== modified file 'data/tribes/buildings/productionsites/frisians/armor_smithy_small/init.lua'
--- data/tribes/buildings/productionsites/frisians/armor_smithy_small/init.lua 2019-03-17 07:20:58 +0000
+++ data/tribes/buildings/productionsites/frisians/armor_smithy_small/init.lua 2019-05-19 12:28:15 +0000
@@ -14,12 +14,12 @@
brick = 3,
granite = 1,
log = 2,
- thatch_reed = 2
+ reed = 2
},
return_on_dismantle = {
brick = 2,
log = 1,
- thatch_reed = 1
+ reed = 1
},
animations = {
=== modified file 'data/tribes/buildings/productionsites/frisians/bakery/init.lua'
--- data/tribes/buildings/productionsites/frisians/bakery/init.lua 2018-07-08 17:54:33 +0000
+++ data/tribes/buildings/productionsites/frisians/bakery/init.lua 2019-05-19 12:28:15 +0000
@@ -14,12 +14,12 @@
brick = 3,
granite = 1,
log = 2,
- thatch_reed = 2
+ reed = 2
},
return_on_dismantle = {
brick = 2,
log = 1,
- thatch_reed = 1
+ reed = 1
},
animations = {
=== modified file 'data/tribes/buildings/productionsites/frisians/barracks/init.lua'
--- data/tribes/buildings/productionsites/frisians/barracks/init.lua 2018-07-13 11:25:10 +0000
+++ data/tribes/buildings/productionsites/frisians/barracks/init.lua 2019-05-19 12:28:15 +0000
@@ -13,13 +13,13 @@
brick = 4,
granite = 2,
log = 3,
- thatch_reed = 2
+ reed = 2
},
return_on_dismantle = {
brick = 2,
granite = 1,
log = 1,
- thatch_reed = 1
+ reed = 1
},
animations = {
=== modified file 'data/tribes/buildings/productionsites/frisians/beekeepers_house/helptexts.lua'
--- data/tribes/buildings/productionsites/frisians/beekeepers_house/helptexts.lua 2018-02-17 15:41:29 +0000
+++ data/tribes/buildings/productionsites/frisians/beekeepers_house/helptexts.lua 2019-05-19 12:28:15 +0000
@@ -15,7 +15,7 @@
function building_helptext_note()
-- TRANSLATORS: Note helptext for a building
- return "Needs medium-sized fields (barley, wheat, corn or blackroot) or bushes (berry bushes, thatch reed or grapevines) nearby."
+ return "Needs medium-sized fields (barley, wheat, reed, corn or blackroot) or bushes (berry bushes or grapevines) nearby."
end
function building_helptext_performance()
=== modified file 'data/tribes/buildings/productionsites/frisians/beekeepers_house/init.lua'
--- data/tribes/buildings/productionsites/frisians/beekeepers_house/init.lua 2018-07-17 10:13:49 +0000
+++ data/tribes/buildings/productionsites/frisians/beekeepers_house/init.lua 2019-05-19 12:28:15 +0000
@@ -12,11 +12,11 @@
buildcost = {
brick = 1,
log = 1,
- thatch_reed = 3
+ reed = 3
},
return_on_dismantle = {
brick = 1,
- thatch_reed = 1
+ reed = 1
},
animations = {
=== modified file 'data/tribes/buildings/productionsites/frisians/berry_farm/init.lua'
--- data/tribes/buildings/productionsites/frisians/berry_farm/init.lua 2018-07-17 10:13:49 +0000
+++ data/tribes/buildings/productionsites/frisians/berry_farm/init.lua 2019-05-19 12:28:15 +0000
@@ -12,7 +12,7 @@
buildcost = {
brick = 1,
log = 2,
- thatch_reed = 1
+ reed = 1
},
return_on_dismantle = {
brick = 1,
=== modified file 'data/tribes/buildings/productionsites/frisians/blacksmithy/init.lua'
--- data/tribes/buildings/productionsites/frisians/blacksmithy/init.lua 2018-09-10 12:32:56 +0000
+++ data/tribes/buildings/productionsites/frisians/blacksmithy/init.lua 2019-05-19 12:28:15 +0000
@@ -13,12 +13,12 @@
brick = 2,
granite = 1,
log = 1,
- thatch_reed = 2
+ reed = 2
},
return_on_dismantle = {
brick = 1,
granite = 1,
- thatch_reed = 1
+ reed = 1
},
animations = {
@@ -52,7 +52,7 @@
inputs = {
{ name = "iron", amount = 7 },
{ name = "log", amount = 7 },
- { name = "thatch_reed", amount = 7 }
+ { name = "reed", amount = 7 }
},
outputs = {
"felling_ax",
@@ -138,7 +138,7 @@
descname = _"making a basket",
actions = {
"return=skipped unless economy needs basket",
- "consume=thatch_reed log",
+ "consume=reed log",
"sleep=32000",
"animate=working 35000",
"produce=basket"
@@ -160,7 +160,7 @@
descname = _"making a fishing net",
actions = {
"return=skipped unless economy needs fishing_net",
- "consume=thatch_reed:2",
+ "consume=reed:2",
"sleep=32000",
"animate=working 35000",
"produce=fishing_net"
=== modified file 'data/tribes/buildings/productionsites/frisians/brewery/init.lua'
--- data/tribes/buildings/productionsites/frisians/brewery/init.lua 2018-07-08 17:54:33 +0000
+++ data/tribes/buildings/productionsites/frisians/brewery/init.lua 2019-05-19 12:28:15 +0000
@@ -13,12 +13,12 @@
buildcost = {
brick = 3,
log = 2,
- thatch_reed = 2
+ reed = 2
},
return_on_dismantle = {
brick = 2,
log = 1,
- thatch_reed = 1
+ reed = 1
},
animations = {
=== modified file 'data/tribes/buildings/productionsites/frisians/brick_kiln/init.lua'
--- data/tribes/buildings/productionsites/frisians/brick_kiln/init.lua 2018-07-08 17:54:33 +0000
+++ data/tribes/buildings/productionsites/frisians/brick_kiln/init.lua 2019-05-19 12:28:15 +0000
@@ -13,12 +13,12 @@
brick = 3,
granite = 1,
log = 1,
- thatch_reed = 2
+ reed = 2
},
return_on_dismantle = {
brick = 2,
granite = 1,
- thatch_reed = 1
+ reed = 1
},
animations = {
=== modified file 'data/tribes/buildings/productionsites/frisians/charcoal_kiln/init.lua'
--- data/tribes/buildings/productionsites/frisians/charcoal_kiln/init.lua 2018-07-08 17:54:33 +0000
+++ data/tribes/buildings/productionsites/frisians/charcoal_kiln/init.lua 2019-05-19 12:28:15 +0000
@@ -13,12 +13,12 @@
brick = 3,
granite = 1,
log = 1,
- thatch_reed = 2
+ reed = 2
},
return_on_dismantle = {
brick = 2,
log = 1,
- thatch_reed = 1
+ reed = 1
},
animations = {
=== modified file 'data/tribes/buildings/productionsites/frisians/clay_pit/init.lua'
--- data/tribes/buildings/productionsites/frisians/clay_pit/init.lua 2018-09-19 19:40:08 +0000
+++ data/tribes/buildings/productionsites/frisians/clay_pit/init.lua 2019-05-19 12:28:15 +0000
@@ -12,7 +12,7 @@
buildcost = {
brick = 1,
log = 1,
- thatch_reed = 1
+ reed = 1
},
return_on_dismantle = {
brick = 1
=== modified file 'data/tribes/buildings/productionsites/frisians/coalmine/init.lua'
--- data/tribes/buildings/productionsites/frisians/coalmine/init.lua 2018-09-10 12:38:30 +0000
+++ data/tribes/buildings/productionsites/frisians/coalmine/init.lua 2019-05-19 12:28:15 +0000
@@ -14,7 +14,7 @@
brick = 1,
granite = 2,
log = 2,
- thatch_reed = 1
+ reed = 1
},
return_on_dismantle = {
brick = 1,
=== modified file 'data/tribes/buildings/productionsites/frisians/coalmine_deep/init.lua'
--- data/tribes/buildings/productionsites/frisians/coalmine_deep/init.lua 2018-09-10 12:38:30 +0000
+++ data/tribes/buildings/productionsites/frisians/coalmine_deep/init.lua 2019-05-19 12:28:15 +0000
@@ -13,12 +13,12 @@
brick = 2,
granite = 1,
log = 1,
- thatch_reed = 2
+ reed = 2
},
return_on_dismantle_on_enhanced = {
brick = 1,
log = 1,
- thatch_reed = 1
+ reed = 1
},
animations = {
=== modified file 'data/tribes/buildings/productionsites/frisians/collectors_house/init.lua'
--- data/tribes/buildings/productionsites/frisians/collectors_house/init.lua 2018-07-17 10:13:49 +0000
+++ data/tribes/buildings/productionsites/frisians/collectors_house/init.lua 2019-05-19 12:28:15 +0000
@@ -12,7 +12,7 @@
buildcost = {
brick = 1,
log = 2,
- thatch_reed = 1
+ reed = 1
},
return_on_dismantle = {
brick = 1,
=== modified file 'data/tribes/buildings/productionsites/frisians/drinking_hall/init.lua'
--- data/tribes/buildings/productionsites/frisians/drinking_hall/init.lua 2018-09-10 12:32:56 +0000
+++ data/tribes/buildings/productionsites/frisians/drinking_hall/init.lua 2019-05-19 12:28:15 +0000
@@ -13,12 +13,12 @@
brick = 2,
granite = 2,
log = 1,
- thatch_reed = 1
+ reed = 1
},
return_on_dismantle_on_enhanced = {
brick = 1,
granite = 1,
- thatch_reed = 1
+ reed = 1
},
animations = {
=== modified file 'data/tribes/buildings/productionsites/frisians/farm/init.lua'
--- data/tribes/buildings/productionsites/frisians/farm/init.lua 2018-09-06 08:21:35 +0000
+++ data/tribes/buildings/productionsites/frisians/farm/init.lua 2019-05-19 12:28:15 +0000
@@ -13,13 +13,13 @@
brick = 3,
granite = 1,
log = 2,
- thatch_reed = 3
+ reed = 3
},
return_on_dismantle = {
brick = 2,
granite = 1,
log = 1,
- thatch_reed = 1
+ reed = 1
},
animations = {
=== modified file 'data/tribes/buildings/productionsites/frisians/fishers_house/init.lua'
--- data/tribes/buildings/productionsites/frisians/fishers_house/init.lua 2018-07-17 10:13:49 +0000
+++ data/tribes/buildings/productionsites/frisians/fishers_house/init.lua 2019-05-19 12:28:15 +0000
@@ -12,7 +12,7 @@
buildcost = {
brick = 1,
log = 1,
- thatch_reed = 1
+ reed = 1
},
return_on_dismantle = {
brick = 1,
=== modified file 'data/tribes/buildings/productionsites/frisians/foresters_house/init.lua'
--- data/tribes/buildings/productionsites/frisians/foresters_house/init.lua 2018-07-17 10:13:49 +0000
+++ data/tribes/buildings/productionsites/frisians/foresters_house/init.lua 2019-05-19 12:28:15 +0000
@@ -12,7 +12,7 @@
buildcost = {
brick = 1,
log = 1,
- thatch_reed = 1
+ reed = 1
},
return_on_dismantle = {
brick = 1,
=== modified file 'data/tribes/buildings/productionsites/frisians/furnace/init.lua'
--- data/tribes/buildings/productionsites/frisians/furnace/init.lua 2018-09-10 12:32:56 +0000
+++ data/tribes/buildings/productionsites/frisians/furnace/init.lua 2019-05-19 12:28:15 +0000
@@ -13,12 +13,12 @@
brick = 4,
granite = 2,
log = 1,
- thatch_reed = 2
+ reed = 2
},
return_on_dismantle = {
brick = 2,
log = 1,
- thatch_reed = 1
+ reed = 1
},
animations = {
=== modified file 'data/tribes/buildings/productionsites/frisians/goldmine/init.lua'
--- data/tribes/buildings/productionsites/frisians/goldmine/init.lua 2018-08-20 20:24:38 +0000
+++ data/tribes/buildings/productionsites/frisians/goldmine/init.lua 2019-05-19 12:28:15 +0000
@@ -14,7 +14,7 @@
brick = 1,
granite = 2,
log = 2,
- thatch_reed = 1
+ reed = 1
},
return_on_dismantle = {
brick = 1,
=== modified file 'data/tribes/buildings/productionsites/frisians/goldmine_deep/init.lua'
--- data/tribes/buildings/productionsites/frisians/goldmine_deep/init.lua 2018-09-10 12:38:30 +0000
+++ data/tribes/buildings/productionsites/frisians/goldmine_deep/init.lua 2019-05-19 12:28:15 +0000
@@ -13,12 +13,12 @@
brick = 2,
granite = 1,
log = 1,
- thatch_reed = 2
+ reed = 2
},
return_on_dismantle_on_enhanced = {
brick = 1,
log = 1,
- thatch_reed = 1
+ reed = 1
},
animations = {
=== modified file 'data/tribes/buildings/productionsites/frisians/honey_bread_bakery/init.lua'
--- data/tribes/buildings/productionsites/frisians/honey_bread_bakery/init.lua 2018-09-10 12:32:56 +0000
+++ data/tribes/buildings/productionsites/frisians/honey_bread_bakery/init.lua 2019-05-19 12:28:15 +0000
@@ -13,13 +13,13 @@
brick = 3,
log = 3,
granite = 1,
- thatch_reed = 1
+ reed = 1
},
return_on_dismantle_on_enhanced = {
brick = 2,
granite = 1,
log = 1,
- thatch_reed = 2
+ reed = 2
},
animations = {
=== modified file 'data/tribes/buildings/productionsites/frisians/hunters_house/init.lua'
--- data/tribes/buildings/productionsites/frisians/hunters_house/init.lua 2018-09-16 13:19:53 +0000
+++ data/tribes/buildings/productionsites/frisians/hunters_house/init.lua 2019-05-19 12:28:15 +0000
@@ -12,7 +12,7 @@
buildcost = {
brick = 1,
log = 1,
- thatch_reed = 1
+ reed = 1
},
return_on_dismantle = {
brick = 1,
=== modified file 'data/tribes/buildings/productionsites/frisians/ironmine/init.lua'
--- data/tribes/buildings/productionsites/frisians/ironmine/init.lua 2018-08-20 20:24:38 +0000
+++ data/tribes/buildings/productionsites/frisians/ironmine/init.lua 2019-05-19 12:28:15 +0000
@@ -14,7 +14,7 @@
brick = 1,
granite = 2,
log = 2,
- thatch_reed = 1
+ reed = 1
},
return_on_dismantle = {
brick = 1,
=== modified file 'data/tribes/buildings/productionsites/frisians/ironmine_deep/init.lua'
--- data/tribes/buildings/productionsites/frisians/ironmine_deep/init.lua 2018-09-10 12:38:30 +0000
+++ data/tribes/buildings/productionsites/frisians/ironmine_deep/init.lua 2019-05-19 12:28:15 +0000
@@ -13,12 +13,12 @@
brick = 2,
granite = 1,
log = 1,
- thatch_reed = 2
+ reed = 2
},
return_on_dismantle_on_enhanced = {
brick = 1,
log = 1,
- thatch_reed = 1
+ reed = 1
},
animations = {
=== modified file 'data/tribes/buildings/productionsites/frisians/mead_brewery/init.lua'
--- data/tribes/buildings/productionsites/frisians/mead_brewery/init.lua 2018-09-10 12:32:56 +0000
+++ data/tribes/buildings/productionsites/frisians/mead_brewery/init.lua 2019-05-19 12:28:15 +0000
@@ -13,7 +13,7 @@
brick = 3,
granite = 2,
log = 1,
- thatch_reed = 1
+ reed = 1
},
return_on_dismantle_on_enhanced = {
brick = 2,
=== modified file 'data/tribes/buildings/productionsites/frisians/quarry/init.lua'
--- data/tribes/buildings/productionsites/frisians/quarry/init.lua 2018-09-06 08:21:35 +0000
+++ data/tribes/buildings/productionsites/frisians/quarry/init.lua 2019-05-19 12:28:15 +0000
@@ -12,7 +12,7 @@
buildcost = {
brick = 1,
log = 1,
- thatch_reed = 1
+ reed = 1
},
return_on_dismantle = {
brick = 1,
=== modified file 'data/tribes/buildings/productionsites/frisians/recycling_center/init.lua'
--- data/tribes/buildings/productionsites/frisians/recycling_center/init.lua 2018-09-19 19:40:08 +0000
+++ data/tribes/buildings/productionsites/frisians/recycling_center/init.lua 2019-05-19 12:28:15 +0000
@@ -13,13 +13,13 @@
brick = 4,
granite = 2,
log = 2,
- thatch_reed = 2
+ reed = 2
},
return_on_dismantle = {
brick = 2,
granite = 1,
log = 1,
- thatch_reed = 1
+ reed = 1
},
animations = {
=== modified file 'data/tribes/buildings/productionsites/frisians/reed_farm/init.lua'
--- data/tribes/buildings/productionsites/frisians/reed_farm/init.lua 2018-09-06 08:21:35 +0000
+++ data/tribes/buildings/productionsites/frisians/reed_farm/init.lua 2019-05-19 12:28:15 +0000
@@ -13,7 +13,7 @@
brick = 2,
--granite = 1,
log = 1,
- thatch_reed = 1
+ reed = 1
},
return_on_dismantle = {
brick = 1,
@@ -44,7 +44,7 @@
},
outputs = {
- "thatch_reed"
+ "reed"
},
programs = {
=== modified file 'data/tribes/buildings/productionsites/frisians/reindeer_farm/init.lua'
--- data/tribes/buildings/productionsites/frisians/reindeer_farm/init.lua 2018-09-06 08:24:16 +0000
+++ data/tribes/buildings/productionsites/frisians/reindeer_farm/init.lua 2019-05-19 12:28:15 +0000
@@ -13,13 +13,13 @@
brick = 2,
granite = 1,
log = 3,
- thatch_reed = 2
+ reed = 2
},
return_on_dismantle = {
brick = 1,
granite = 1,
log = 1,
- thatch_reed = 1
+ reed = 1
},
animations = {
=== modified file 'data/tribes/buildings/productionsites/frisians/rockmine/init.lua'
--- data/tribes/buildings/productionsites/frisians/rockmine/init.lua 2018-09-10 12:38:30 +0000
+++ data/tribes/buildings/productionsites/frisians/rockmine/init.lua 2019-05-19 12:28:15 +0000
@@ -14,7 +14,7 @@
brick = 1,
granite = 2,
log = 2,
- thatch_reed = 1
+ reed = 1
},
return_on_dismantle = {
brick = 1,
=== modified file 'data/tribes/buildings/productionsites/frisians/rockmine_deep/init.lua'
--- data/tribes/buildings/productionsites/frisians/rockmine_deep/init.lua 2018-09-10 12:38:30 +0000
+++ data/tribes/buildings/productionsites/frisians/rockmine_deep/init.lua 2019-05-19 12:28:15 +0000
@@ -13,12 +13,12 @@
brick = 2,
granite = 1,
log = 1,
- thatch_reed = 2
+ reed = 2
},
return_on_dismantle_on_enhanced = {
brick = 1,
log = 1,
- thatch_reed = 1
+ reed = 1
},
animations = {
=== modified file 'data/tribes/buildings/productionsites/frisians/scouts_house/init.lua'
--- data/tribes/buildings/productionsites/frisians/scouts_house/init.lua 2018-07-17 10:13:49 +0000
+++ data/tribes/buildings/productionsites/frisians/scouts_house/init.lua 2019-05-19 12:28:15 +0000
@@ -12,7 +12,7 @@
buildcost = {
granite = 1,
log = 1,
- thatch_reed = 1
+ reed = 1
},
return_on_dismantle = {
granite = 1,
=== modified file 'data/tribes/buildings/productionsites/frisians/sewing_room/init.lua'
--- data/tribes/buildings/productionsites/frisians/sewing_room/init.lua 2018-07-25 19:54:53 +0000
+++ data/tribes/buildings/productionsites/frisians/sewing_room/init.lua 2019-05-19 12:28:15 +0000
@@ -14,7 +14,7 @@
brick = 3,
granite = 1,
log = 1,
- thatch_reed = 1
+ reed = 1
},
return_on_dismantle = {
brick = 2,
=== modified file 'data/tribes/buildings/productionsites/frisians/shipyard/init.lua'
--- data/tribes/buildings/productionsites/frisians/shipyard/init.lua 2018-09-06 09:33:03 +0000
+++ data/tribes/buildings/productionsites/frisians/shipyard/init.lua 2019-05-19 12:28:15 +0000
@@ -14,13 +14,13 @@
brick = 3,
granite = 1,
log = 3,
- thatch_reed = 2,
+ reed = 2,
cloth = 1
},
return_on_dismantle = {
brick = 2,
log = 2,
- thatch_reed = 1
+ reed = 1
},
animations = {
=== modified file 'data/tribes/buildings/productionsites/frisians/smokery/init.lua'
--- data/tribes/buildings/productionsites/frisians/smokery/init.lua 2018-09-10 12:32:56 +0000
+++ data/tribes/buildings/productionsites/frisians/smokery/init.lua 2019-05-19 12:28:15 +0000
@@ -12,12 +12,12 @@
buildcost = {
brick = 4,
log = 1,
- thatch_reed = 2
+ reed = 2
},
return_on_dismantle = {
brick = 2,
log = 1,
- thatch_reed = 1
+ reed = 1
},
animations = {
=== modified file 'data/tribes/buildings/productionsites/frisians/tailors_shop/init.lua'
--- data/tribes/buildings/productionsites/frisians/tailors_shop/init.lua 2018-09-10 12:32:56 +0000
+++ data/tribes/buildings/productionsites/frisians/tailors_shop/init.lua 2019-05-19 12:28:15 +0000
@@ -13,7 +13,7 @@
brick = 1,
granite = 2,
log = 2,
- thatch_reed = 1
+ reed = 1
},
return_on_dismantle_on_enhanced = {
granite = 1,
=== modified file 'data/tribes/buildings/productionsites/frisians/tavern/init.lua'
--- data/tribes/buildings/productionsites/frisians/tavern/init.lua 2018-10-01 09:15:22 +0000
+++ data/tribes/buildings/productionsites/frisians/tavern/init.lua 2019-05-19 12:28:15 +0000
@@ -13,12 +13,12 @@
buildcost = {
brick = 3,
log = 2,
- thatch_reed = 2
+ reed = 2
},
return_on_dismantle = {
brick = 2,
log = 1,
- thatch_reed = 1
+ reed = 1
},
animations = {
=== modified file 'data/tribes/buildings/productionsites/frisians/weaving_mill/init.lua'
--- data/tribes/buildings/productionsites/frisians/weaving_mill/init.lua 2018-07-08 17:54:33 +0000
+++ data/tribes/buildings/productionsites/frisians/weaving_mill/init.lua 2019-05-19 12:28:15 +0000
@@ -14,13 +14,13 @@
brick = 4,
granite = 2,
log = 3,
- thatch_reed = 2
+ reed = 2
},
return_on_dismantle = {
brick = 2,
granite = 1,
log = 1,
- thatch_reed = 1
+ reed = 1
},
animations = {
@@ -50,7 +50,7 @@
inputs = {
{ name = "fur", amount = 6 },
- { name = "thatch_reed", amount = 6 },
+ { name = "reed", amount = 6 },
},
outputs = {
"cloth",
@@ -63,7 +63,7 @@
actions = {
"sleep=25000",
"return=skipped unless economy needs cloth",
- "consume=fur thatch_reed",
+ "consume=fur reed",
"animate=working 20000",
"produce=cloth"
},
=== modified file 'data/tribes/buildings/productionsites/frisians/woodcutters_house/init.lua'
--- data/tribes/buildings/productionsites/frisians/woodcutters_house/init.lua 2018-07-17 10:13:49 +0000
+++ data/tribes/buildings/productionsites/frisians/woodcutters_house/init.lua 2019-05-19 12:28:15 +0000
@@ -12,7 +12,7 @@
buildcost = {
brick = 1,
log = 1,
- thatch_reed = 1
+ reed = 1
},
return_on_dismantle = {
log = 1,
=== modified file 'data/tribes/buildings/trainingsites/barbarians/battlearena/init.lua'
--- data/tribes/buildings/trainingsites/barbarians/battlearena/init.lua 2018-07-25 19:54:53 +0000
+++ data/tribes/buildings/trainingsites/barbarians/battlearena/init.lua 2019-05-19 12:28:15 +0000
@@ -14,14 +14,14 @@
granite = 4,
grout = 6,
gold = 4,
- thatch_reed = 3
+ reed = 3
},
return_on_dismantle = {
log = 3,
granite = 3,
grout = 3,
gold = 2,
- thatch_reed = 1
+ reed = 1
},
animations = {
=== modified file 'data/tribes/buildings/trainingsites/barbarians/trainingcamp/init.lua'
--- data/tribes/buildings/trainingsites/barbarians/trainingcamp/init.lua 2017-11-18 21:23:09 +0000
+++ data/tribes/buildings/trainingsites/barbarians/trainingcamp/init.lua 2019-05-19 12:28:15 +0000
@@ -14,7 +14,7 @@
granite = 4,
grout = 6,
gold = 4,
- thatch_reed = 3
+ reed = 3
},
return_on_dismantle = {
log = 3,
=== modified file 'data/tribes/buildings/trainingsites/frisians/training_arena/init.lua'
--- data/tribes/buildings/trainingsites/frisians/training_arena/init.lua 2018-10-04 07:14:23 +0000
+++ data/tribes/buildings/trainingsites/frisians/training_arena/init.lua 2019-05-19 12:28:15 +0000
@@ -14,14 +14,14 @@
granite = 3,
log = 4,
gold = 3,
- thatch_reed = 4
+ reed = 4
},
return_on_dismantle = {
brick = 3,
granite = 2,
log = 2,
gold = 1,
- thatch_reed = 1
+ reed = 1
},
animations = {
=== modified file 'data/tribes/buildings/trainingsites/frisians/training_camp/init.lua'
--- data/tribes/buildings/trainingsites/frisians/training_camp/init.lua 2018-10-01 09:15:22 +0000
+++ data/tribes/buildings/trainingsites/frisians/training_camp/init.lua 2019-05-19 12:28:15 +0000
@@ -14,14 +14,14 @@
granite = 3,
log = 3,
gold = 1,
- thatch_reed = 3
+ reed = 3
},
return_on_dismantle = {
brick = 3,
granite = 1,
log = 1,
gold = 1,
- thatch_reed = 1
+ reed = 1
},
animations = {
=== modified file 'data/tribes/buildings/warehouses/barbarians/port/init.lua'
--- data/tribes/buildings/warehouses/barbarians/port/init.lua 2018-04-07 08:53:42 +0000
+++ data/tribes/buildings/warehouses/barbarians/port/init.lua 2019-05-19 12:28:15 +0000
@@ -16,7 +16,7 @@
granite = 5,
grout = 2,
iron = 2,
- thatch_reed = 4,
+ reed = 4,
gold = 2
},
return_on_dismantle = {
@@ -25,7 +25,7 @@
granite = 3,
grout = 1,
iron = 1,
- thatch_reed = 1,
+ reed = 1,
gold = 1
},
=== modified file 'data/tribes/buildings/warehouses/barbarians/warehouse/init.lua'
--- data/tribes/buildings/warehouses/barbarians/warehouse/init.lua 2018-07-08 16:00:20 +0000
+++ data/tribes/buildings/warehouses/barbarians/warehouse/init.lua 2019-05-19 12:28:15 +0000
@@ -18,7 +18,7 @@
blackwood = 2,
granite = 2,
grout = 3,
- thatch_reed = 1
+ reed = 1
},
return_on_dismantle = {
log = 1,
=== modified file 'data/tribes/buildings/warehouses/frisians/port/init.lua'
--- data/tribes/buildings/warehouses/frisians/port/init.lua 2018-09-01 13:24:52 +0000
+++ data/tribes/buildings/warehouses/frisians/port/init.lua 2019-05-19 12:28:15 +0000
@@ -16,7 +16,7 @@
log = 6,
cloth = 2,
gold = 2,
- thatch_reed = 4
+ reed = 4
},
return_on_dismantle = {
brick = 3,
@@ -24,7 +24,7 @@
log = 3,
gold = 1,
cloth = 1,
- thatch_reed = 2
+ reed = 2
},
animations = {
=== modified file 'data/tribes/buildings/warehouses/frisians/warehouse/init.lua'
--- data/tribes/buildings/warehouses/frisians/warehouse/init.lua 2018-07-14 13:46:55 +0000
+++ data/tribes/buildings/warehouses/frisians/warehouse/init.lua 2019-05-19 12:28:15 +0000
@@ -13,13 +13,13 @@
brick = 5,
granite = 2,
log = 2,
- thatch_reed = 3
+ reed = 3
},
return_on_dismantle = {
brick = 3,
granite = 1,
log = 1,
- thatch_reed = 1
+ reed = 1
},
animations = {
=== modified file 'data/tribes/empire.lua'
--- data/tribes/empire.lua 2018-07-29 13:49:09 +0000
+++ data/tribes/empire.lua 2019-05-19 12:28:15 +0000
@@ -179,11 +179,11 @@
immovables = {
"ashes",
"destroyed_building",
- "field_tiny",
- "field_small",
- "field_medium",
- "field_ripe",
- "field_harvested",
+ "wheatfield_tiny",
+ "wheatfield_small",
+ "wheatfield_medium",
+ "wheatfield_ripe",
+ "wheatfield_harvested",
"grapevine_tiny",
"grapevine_small",
"grapevine_medium",
=== modified file 'data/tribes/frisians.lua'
--- data/tribes/frisians.lua 2019-02-28 11:03:51 +0000
+++ data/tribes/frisians.lua 2019-05-19 12:28:15 +0000
@@ -61,7 +61,7 @@
"granite",
"clay",
"brick",
- "thatch_reed",
+ "reed",
"fur",
"cloth"
},
@@ -221,10 +221,10 @@
"pond_dry",
"pond_growing",
"pond_mature",
- "reed_tiny",
- "reed_small",
- "reed_medium",
- "reed_ripe",
+ "reedfield_tiny",
+ "reedfield_small",
+ "reedfield_medium",
+ "reedfield_ripe",
"frisians_resi_none",
"frisians_resi_water",
"frisians_resi_coal_1",
@@ -237,7 +237,7 @@
"frisians_resi_stones_2",
"frisians_shipconstruction",
-- These non-frisian immovables can be used by bee-keepers
- "field_medium",
+ "wheatfield_medium",
"cornfield_medium",
"blackrootfield_medium",
"grapevine_medium",
=== added directory 'data/tribes/immovables/barleyfield'
=== renamed directory 'data/tribes/immovables/barleyfield_harvested' => 'data/tribes/immovables/barleyfield/harvested'
=== renamed directory 'data/tribes/immovables/barleyfield_medium' => 'data/tribes/immovables/barleyfield/medium'
=== renamed directory 'data/tribes/immovables/barleyfield_ripe' => 'data/tribes/immovables/barleyfield/ripe'
=== renamed directory 'data/tribes/immovables/barleyfield_small' => 'data/tribes/immovables/barleyfield/small'
=== renamed directory 'data/tribes/immovables/barleyfield_tiny' => 'data/tribes/immovables/barleyfield/tiny'
=== added directory 'data/tribes/immovables/blackrootfield'
=== renamed directory 'data/tribes/immovables/blackrootfield_harvested' => 'data/tribes/immovables/blackrootfield/harvested'
=== renamed directory 'data/tribes/immovables/blackrootfield_medium' => 'data/tribes/immovables/blackrootfield/medium'
=== renamed directory 'data/tribes/immovables/blackrootfield_ripe' => 'data/tribes/immovables/blackrootfield/ripe'
=== renamed directory 'data/tribes/immovables/blackrootfield_small' => 'data/tribes/immovables/blackrootfield/small'
=== renamed directory 'data/tribes/immovables/blackrootfield_tiny' => 'data/tribes/immovables/blackrootfield/tiny'
=== added directory 'data/tribes/immovables/cornfield'
=== renamed directory 'data/tribes/immovables/cornfield_harvested' => 'data/tribes/immovables/cornfield/harvested'
=== renamed directory 'data/tribes/immovables/cornfield_medium' => 'data/tribes/immovables/cornfield/medium'
=== renamed directory 'data/tribes/immovables/cornfield_ripe' => 'data/tribes/immovables/cornfield/ripe'
=== renamed directory 'data/tribes/immovables/cornfield_small' => 'data/tribes/immovables/cornfield/small'
=== renamed directory 'data/tribes/immovables/cornfield_tiny' => 'data/tribes/immovables/cornfield/tiny'
=== added directory 'data/tribes/immovables/grapevine'
=== renamed directory 'data/tribes/immovables/grapevine_medium' => 'data/tribes/immovables/grapevine/medium'
=== renamed directory 'data/tribes/immovables/grapevine_ripe' => 'data/tribes/immovables/grapevine/ripe'
=== renamed directory 'data/tribes/immovables/grapevine_small' => 'data/tribes/immovables/grapevine/small'
=== renamed directory 'data/tribes/immovables/grapevine_tiny' => 'data/tribes/immovables/grapevine/tiny'
=== added directory 'data/tribes/immovables/pond'
=== renamed directory 'data/tribes/immovables/pond_dry' => 'data/tribes/immovables/pond/dry'
=== renamed directory 'data/tribes/immovables/pond_growing' => 'data/tribes/immovables/pond/growing'
=== renamed directory 'data/tribes/immovables/pond_mature' => 'data/tribes/immovables/pond/mature'
=== added directory 'data/tribes/immovables/reedfield'
=== renamed directory 'data/tribes/immovables/reed_medium' => 'data/tribes/immovables/reedfield/medium'
=== modified file 'data/tribes/immovables/reedfield/medium/init.lua'
--- data/tribes/immovables/reed_medium/init.lua 2017-11-12 19:37:34 +0000
+++ data/tribes/immovables/reedfield/medium/init.lua 2019-05-19 12:28:15 +0000
@@ -2,16 +2,16 @@
tribes:new_immovable_type {
msgctxt = "immovable",
- name = "reed_medium",
+ name = "reedfield_medium",
-- TRANSLATORS: This is an immovable name used in lists of immovables
- descname = pgettext("immovable", "Reed (medium)"),
+ descname = pgettext("immovable", "Reed Field (medium)"),
helptext_script = dirname .. "helptexts.lua",
size = "small",
attributes = { "field", "flowering" },
programs = {
program = {
"animate=idle 40000",
- "transform=reed_ripe",
+ "transform=reedfield_ripe",
}
},
=== renamed directory 'data/tribes/immovables/reed_ripe' => 'data/tribes/immovables/reedfield/ripe'
=== modified file 'data/tribes/immovables/reedfield/ripe/init.lua'
--- data/tribes/immovables/reed_ripe/init.lua 2017-11-12 16:21:28 +0000
+++ data/tribes/immovables/reedfield/ripe/init.lua 2019-05-19 12:28:15 +0000
@@ -2,9 +2,9 @@
tribes:new_immovable_type {
msgctxt = "immovable",
- name = "reed_ripe",
+ name = "reedfield_ripe",
-- TRANSLATORS: This is an immovable name used in lists of immovables
- descname = pgettext("immovable", "Reed (ripe)"),
+ descname = pgettext("immovable", "Reed Field (ripe)"),
helptext_script = dirname .. "helptexts.lua",
size = "small",
attributes = { "ripe_reed", "field" },
=== renamed directory 'data/tribes/immovables/reed_small' => 'data/tribes/immovables/reedfield/small'
=== modified file 'data/tribes/immovables/reedfield/small/init.lua'
--- data/tribes/immovables/reed_small/init.lua 2017-11-12 16:21:28 +0000
+++ data/tribes/immovables/reedfield/small/init.lua 2019-05-19 12:28:15 +0000
@@ -2,16 +2,16 @@
tribes:new_immovable_type {
msgctxt = "immovable",
- name = "reed_small",
+ name = "reedfield_small",
-- TRANSLATORS: This is an immovable name used in lists of immovables
- descname = pgettext("immovable", "Reed (small)"),
+ descname = pgettext("immovable", "Reed Field (small)"),
helptext_script = dirname .. "helptexts.lua",
size = "small",
attributes = { "field" },
programs = {
program = {
"animate=idle 28000",
- "transform=reed_medium",
+ "transform=reedfield_medium",
}
},
=== renamed directory 'data/tribes/immovables/reed_tiny' => 'data/tribes/immovables/reedfield/tiny'
=== modified file 'data/tribes/immovables/reedfield/tiny/init.lua'
--- data/tribes/immovables/reed_tiny/init.lua 2017-11-12 16:21:28 +0000
+++ data/tribes/immovables/reedfield/tiny/init.lua 2019-05-19 12:28:15 +0000
@@ -2,16 +2,16 @@
tribes:new_immovable_type {
msgctxt = "immovable",
- name = "reed_tiny",
+ name = "reedfield_tiny",
-- TRANSLATORS: This is an immovable name used in lists of immovables
- descname = pgettext("immovable", "Reed (tiny)"),
+ descname = pgettext("immovable", "Reed Field (tiny)"),
helptext_script = dirname .. "helptexts.lua",
size = "small",
attributes = { "field", "seed_reed" },
programs = {
program = {
"animate=idle 22000",
- "transform=reed_small",
+ "transform=reedfield_small",
}
},
=== added directory 'data/tribes/immovables/wheatfield'
=== renamed directory 'data/tribes/immovables/field_harvested' => 'data/tribes/immovables/wheatfield/harvested'
=== modified file 'data/tribes/immovables/wheatfield/harvested/init.lua'
--- data/tribes/immovables/field_harvested/init.lua 2018-11-15 08:52:08 +0000
+++ data/tribes/immovables/wheatfield/harvested/init.lua 2019-05-19 12:28:15 +0000
@@ -2,9 +2,9 @@
tribes:new_immovable_type {
msgctxt = "immovable",
- name = "field_harvested",
+ name = "wheatfield_harvested",
-- TRANSLATORS: This is an immovable name used in lists of immovables
- descname = pgettext("immovable", "Field (harvested)"),
+ descname = pgettext("immovable", "Wheat Field (harvested)"),
helptext_script = dirname .. "helptexts.lua",
attributes = { "field" },
programs = {
=== renamed directory 'data/tribes/immovables/field_medium' => 'data/tribes/immovables/wheatfield/medium'
=== modified file 'data/tribes/immovables/wheatfield/medium/init.lua'
--- data/tribes/immovables/field_medium/init.lua 2018-11-15 08:52:08 +0000
+++ data/tribes/immovables/wheatfield/medium/init.lua 2019-05-19 12:28:15 +0000
@@ -2,16 +2,16 @@
tribes:new_immovable_type {
msgctxt = "immovable",
- name = "field_medium",
+ name = "wheatfield_medium",
-- TRANSLATORS: This is an immovable name used in lists of immovables
- descname = pgettext("immovable", "Field (medium)"),
+ descname = pgettext("immovable", "Wheat Field (medium)"),
helptext_script = dirname .. "helptexts.lua",
size = "small",
attributes = { "field", "flowering" },
programs = {
program = {
"animate=idle 50000",
- "transform=field_ripe",
+ "transform=wheatfield_ripe",
}
},
=== renamed directory 'data/tribes/immovables/field_ripe' => 'data/tribes/immovables/wheatfield/ripe'
=== modified file 'data/tribes/immovables/wheatfield/ripe/init.lua'
--- data/tribes/immovables/field_ripe/init.lua 2018-11-15 08:52:08 +0000
+++ data/tribes/immovables/wheatfield/ripe/init.lua 2019-05-19 12:28:15 +0000
@@ -2,9 +2,9 @@
tribes:new_immovable_type {
msgctxt = "immovable",
- name = "field_ripe",
+ name = "wheatfield_ripe",
-- TRANSLATORS: This is an immovable name used in lists of immovables
- descname = pgettext("immovable", "Field (ripe)"),
+ descname = pgettext("immovable", "Wheat Field (ripe)"),
helptext_script = dirname .. "helptexts.lua",
size = "small",
attributes = { "ripe_wheat", "field" },
@@ -14,7 +14,7 @@
"remove=",
},
harvest = {
- "transform=field_harvested"
+ "transform=wheatfield_harvested"
}
},
=== renamed directory 'data/tribes/immovables/field_small' => 'data/tribes/immovables/wheatfield/small'
=== modified file 'data/tribes/immovables/wheatfield/small/init.lua'
--- data/tribes/immovables/field_small/init.lua 2018-11-15 08:52:08 +0000
+++ data/tribes/immovables/wheatfield/small/init.lua 2019-05-19 12:28:15 +0000
@@ -2,16 +2,16 @@
tribes:new_immovable_type {
msgctxt = "immovable",
- name = "field_small",
+ name = "wheatfield_small",
-- TRANSLATORS: This is an immovable name used in lists of immovables
- descname = pgettext("immovable", "Field (small)"),
+ descname = pgettext("immovable", "Wheat Field (small)"),
helptext_script = dirname .. "helptexts.lua",
size = "small",
attributes = { "field" },
programs = {
program = {
"animate=idle 45000",
- "transform=field_medium",
+ "transform=wheatfield_medium",
}
},
=== renamed directory 'data/tribes/immovables/field_tiny' => 'data/tribes/immovables/wheatfield/tiny'
=== modified file 'data/tribes/immovables/wheatfield/tiny/init.lua'
--- data/tribes/immovables/field_tiny/init.lua 2018-11-15 08:52:08 +0000
+++ data/tribes/immovables/wheatfield/tiny/init.lua 2019-05-19 12:28:15 +0000
@@ -2,9 +2,9 @@
tribes:new_immovable_type {
msgctxt = "immovable",
- name = "field_tiny",
+ name = "wheatfield_tiny",
-- TRANSLATORS: This is an immovable name used in lists of immovables
- descname = pgettext("immovable", "Field (tiny)"),
+ descname = pgettext("immovable", "Wheat Field (tiny)"),
helptext_script = dirname .. "helptexts.lua",
size = "small",
attributes = { "field", "seed_wheat" },
@@ -12,7 +12,7 @@
programs = {
program = {
"animate=idle 30000",
- "transform=field_small",
+ "transform=wheatfield_small",
}
},
=== modified file 'data/tribes/init.lua'
--- data/tribes/init.lua 2018-07-31 17:12:46 +0000
+++ data/tribes/init.lua 2019-05-19 12:28:15 +0000
@@ -133,7 +133,7 @@
include "tribes/wares/spider_silk/init.lua"
include "tribes/wares/tabard/init.lua"
include "tribes/wares/tabard_golden/init.lua"
- include "tribes/wares/thatch_reed/init.lua"
+ include "tribes/wares/reed/init.lua"
include "tribes/wares/trident_double/init.lua"
include "tribes/wares/trident_heavy_double/init.lua"
include "tribes/wares/trident_light/init.lua"
@@ -152,33 +152,33 @@
print_loading_message("┃ Immovables", function()
include "tribes/immovables/ashes/init.lua"
- include "tribes/immovables/blackrootfield_harvested/init.lua"
- include "tribes/immovables/blackrootfield_medium/init.lua"
- include "tribes/immovables/blackrootfield_ripe/init.lua"
- include "tribes/immovables/blackrootfield_small/init.lua"
- include "tribes/immovables/blackrootfield_tiny/init.lua"
- include "tribes/immovables/cornfield_harvested/init.lua"
- include "tribes/immovables/cornfield_medium/init.lua"
- include "tribes/immovables/cornfield_ripe/init.lua"
- include "tribes/immovables/cornfield_small/init.lua"
- include "tribes/immovables/cornfield_tiny/init.lua"
+ include "tribes/immovables/blackrootfield/harvested/init.lua"
+ include "tribes/immovables/blackrootfield/medium/init.lua"
+ include "tribes/immovables/blackrootfield/ripe/init.lua"
+ include "tribes/immovables/blackrootfield/small/init.lua"
+ include "tribes/immovables/blackrootfield/tiny/init.lua"
+ include "tribes/immovables/cornfield/harvested/init.lua"
+ include "tribes/immovables/cornfield/medium/init.lua"
+ include "tribes/immovables/cornfield/ripe/init.lua"
+ include "tribes/immovables/cornfield/small/init.lua"
+ include "tribes/immovables/cornfield/tiny/init.lua"
include "tribes/immovables/destroyed_building/init.lua"
- include "tribes/immovables/field_harvested/init.lua"
- include "tribes/immovables/field_medium/init.lua"
- include "tribes/immovables/field_ripe/init.lua"
- include "tribes/immovables/field_small/init.lua"
- include "tribes/immovables/field_tiny/init.lua"
- include "tribes/immovables/grapevine_medium/init.lua"
- include "tribes/immovables/grapevine_ripe/init.lua"
- include "tribes/immovables/grapevine_small/init.lua"
- include "tribes/immovables/grapevine_tiny/init.lua"
- include "tribes/immovables/pond_growing/init.lua"
- include "tribes/immovables/pond_mature/init.lua"
- include "tribes/immovables/pond_dry/init.lua"
- include "tribes/immovables/reed_medium/init.lua"
- include "tribes/immovables/reed_ripe/init.lua"
- include "tribes/immovables/reed_small/init.lua"
- include "tribes/immovables/reed_tiny/init.lua"
+ include "tribes/immovables/wheatfield/harvested/init.lua"
+ include "tribes/immovables/wheatfield/medium/init.lua"
+ include "tribes/immovables/wheatfield/ripe/init.lua"
+ include "tribes/immovables/wheatfield/small/init.lua"
+ include "tribes/immovables/wheatfield/tiny/init.lua"
+ include "tribes/immovables/grapevine/medium/init.lua"
+ include "tribes/immovables/grapevine/ripe/init.lua"
+ include "tribes/immovables/grapevine/small/init.lua"
+ include "tribes/immovables/grapevine/tiny/init.lua"
+ include "tribes/immovables/pond/growing/init.lua"
+ include "tribes/immovables/pond/mature/init.lua"
+ include "tribes/immovables/pond/dry/init.lua"
+ include "tribes/immovables/reedfield/medium/init.lua"
+ include "tribes/immovables/reedfield/ripe/init.lua"
+ include "tribes/immovables/reedfield/small/init.lua"
+ include "tribes/immovables/reedfield/tiny/init.lua"
include "tribes/immovables/resi/atlanteans/init.lua"
include "tribes/immovables/resi/barbarians/init.lua"
include "tribes/immovables/resi/empire/init.lua"
@@ -195,11 +195,11 @@
include "tribes/immovables/berry_bushes/sea_buckthorn/init.lua"
include "tribes/immovables/berry_bushes/desert_hackberry/init.lua"
include "tribes/immovables/berry_bushes/juniper/init.lua"
- include "tribes/immovables/barleyfield_tiny/init.lua"
- include "tribes/immovables/barleyfield_small/init.lua"
- include "tribes/immovables/barleyfield_medium/init.lua"
- include "tribes/immovables/barleyfield_ripe/init.lua"
- include "tribes/immovables/barleyfield_harvested/init.lua"
+ include "tribes/immovables/barleyfield/tiny/init.lua"
+ include "tribes/immovables/barleyfield/small/init.lua"
+ include "tribes/immovables/barleyfield/medium/init.lua"
+ include "tribes/immovables/barleyfield/ripe/init.lua"
+ include "tribes/immovables/barleyfield/harvested/init.lua"
end)
-- ===================================
=== modified file 'data/tribes/scripting/starting_conditions/barbarians/fortified_village.lua'
--- data/tribes/scripting/starting_conditions/barbarians/fortified_village.lua 2018-09-19 19:40:08 +0000
+++ data/tribes/scripting/starting_conditions/barbarians/fortified_village.lua 2019-05-19 12:28:15 +0000
@@ -46,7 +46,7 @@
scythe = 6,
shovel = 4,
snack = 3,
- thatch_reed = 24,
+ reed = 24,
log = 79,
},
workers = {
=== modified file 'data/tribes/scripting/starting_conditions/barbarians/headquarters.lua'
--- data/tribes/scripting/starting_conditions/barbarians/headquarters.lua 2018-07-15 10:32:12 +0000
+++ data/tribes/scripting/starting_conditions/barbarians/headquarters.lua 2019-05-19 12:28:15 +0000
@@ -47,7 +47,7 @@
scythe = 6,
shovel = 4,
snack = 3,
- thatch_reed = 24,
+ reed = 24,
log = 80,
},
workers = {
=== modified file 'data/tribes/scripting/starting_conditions/barbarians/trading_outpost.lua'
--- data/tribes/scripting/starting_conditions/barbarians/trading_outpost.lua 2018-09-19 19:40:08 +0000
+++ data/tribes/scripting/starting_conditions/barbarians/trading_outpost.lua 2019-05-19 12:28:15 +0000
@@ -47,7 +47,7 @@
scythe = 6,
shovel = 4,
snack = 3,
- thatch_reed = 24,
+ reed = 24,
log = 80,
},
workers = {
=== modified file 'data/tribes/scripting/starting_conditions/barbarians/village.lua'
--- data/tribes/scripting/starting_conditions/barbarians/village.lua 2018-09-27 18:30:18 +0000
+++ data/tribes/scripting/starting_conditions/barbarians/village.lua 2019-05-19 12:28:15 +0000
@@ -48,7 +48,7 @@
scythe = 6,
shovel = 4,
snack = 3,
- thatch_reed = 24,
+ reed = 24,
log = 80,
},
workers = {
=== modified file 'data/tribes/scripting/starting_conditions/frisians/fortified_village.lua'
--- data/tribes/scripting/starting_conditions/frisians/fortified_village.lua 2018-09-16 13:19:53 +0000
+++ data/tribes/scripting/starting_conditions/frisians/fortified_village.lua 2019-05-19 12:28:15 +0000
@@ -28,7 +28,7 @@
wares = {
log = 25,
granite = 35,
- thatch_reed = 20,
+ reed = 20,
brick = 50,
clay = 30,
water = 10,
@@ -135,7 +135,7 @@
inputs = {
iron = 6,
log = 6,
- thatch_reed = 4,
+ reed = 4,
}
})
=== modified file 'data/tribes/scripting/starting_conditions/frisians/headquarters.lua'
--- data/tribes/scripting/starting_conditions/frisians/headquarters.lua 2018-09-16 13:19:53 +0000
+++ data/tribes/scripting/starting_conditions/frisians/headquarters.lua 2019-05-19 12:28:15 +0000
@@ -24,7 +24,7 @@
wares = {
log = 40,
granite = 50,
- thatch_reed = 50,
+ reed = 50,
brick = 80,
clay = 30,
water = 10,
=== modified file 'data/tribes/scripting/starting_conditions/frisians/trading_outpost.lua'
--- data/tribes/scripting/starting_conditions/frisians/trading_outpost.lua 2018-09-16 13:19:53 +0000
+++ data/tribes/scripting/starting_conditions/frisians/trading_outpost.lua 2019-05-19 12:28:15 +0000
@@ -25,7 +25,7 @@
wares = {
log = 30,
granite = 45,
- thatch_reed = 35,
+ reed = 35,
brick = 70,
clay = 20,
water = 5,
@@ -99,7 +99,7 @@
inputs = {
iron = 7,
log = 7,
- thatch_reed = 7,
+ reed = 7,
}
})
=== modified file 'data/tribes/scripting/starting_conditions/frisians/village.lua'
--- data/tribes/scripting/starting_conditions/frisians/village.lua 2018-09-28 18:41:33 +0000
+++ data/tribes/scripting/starting_conditions/frisians/village.lua 2019-05-19 12:28:15 +0000
@@ -24,7 +24,7 @@
wares = {
log = 60,
granite = 60,
- thatch_reed = 50,
+ reed = 50,
brick = 50,
clay = 20,
water = 10,
@@ -92,7 +92,7 @@
inputs = {
iron = 7,
log = 7,
- thatch_reed = 7
+ reed = 7
},
})
=== modified file 'data/tribes/wares/cloth/helptexts.lua'
--- data/tribes/wares/cloth/helptexts.lua 2017-07-07 16:51:39 +0000
+++ data/tribes/wares/cloth/helptexts.lua 2019-05-19 12:28:15 +0000
@@ -1,7 +1,7 @@
function ware_helptext(tribe)
local helptext = {
-- TRANSLATORS: Helptext for a ware: Cloth
- barbarians = pgettext("barbarians_ware", "Cloth is needed for Barbarian ships. It is produced out of thatch reed."),
+ barbarians = pgettext("barbarians_ware", "Cloth is needed for Barbarian ships. It is produced out of reed."),
-- TRANSLATORS: Helptext for a ware: Cloth
frisians = pgettext("frisians_ware", "Cloth is needed for ships. It is produced out of reindeer fur and reed."),
-- TRANSLATORS: Helptext for a ware: Cloth
=== renamed directory 'data/tribes/wares/thatch_reed' => 'data/tribes/wares/reed'
=== modified file 'data/tribes/wares/reed/helptexts.lua'
--- data/tribes/wares/thatch_reed/helptexts.lua 2017-11-20 19:48:43 +0000
+++ data/tribes/wares/reed/helptexts.lua 2019-05-19 12:28:15 +0000
@@ -1,9 +1,9 @@
function ware_helptext(tribe)
local helptext = {
- -- TRANSLATORS: Helptext for a ware: Thatch Reed
- barbarians = pgettext("barbarians_ware", "Thatch reed is produced in a reed yard and used to make the roofs of buildings waterproof."),
- -- TRANSLATORS: Helptext for a ware: Thatch Reed
- frisians = pgettext("frisians_ware", "Thatch reed is a special kind of reed that is grown in a reed farm. Nothing is better suited to make roofs waterproof. It is also used to make buckets and fishing nets as well as cloth." );
+ -- TRANSLATORS: Helptext for a ware: Reed
+ barbarians = pgettext("barbarians_ware", "Reed is produced in a reed yard and used to make the roofs of buildings waterproof."),
+ -- TRANSLATORS: Helptext for a ware: Reed
+ frisians = pgettext("frisians_ware", "Reed is grown in a reed farm. Nothing is better suited to make roofs waterproof. It is also used to make buckets and fishing nets as well as cloth." );
}
local result = ""
if tribe then
=== modified file 'data/tribes/wares/reed/init.lua'
--- data/tribes/wares/thatch_reed/init.lua 2018-03-06 09:50:54 +0000
+++ data/tribes/wares/reed/init.lua 2019-05-19 12:28:15 +0000
@@ -2,9 +2,9 @@
tribes:new_ware_type {
msgctxt = "ware",
- name = "thatch_reed",
- -- TRANSLATORS: This is a ware name used in lists of wares
- descname = pgettext("ware", "Thatch Reed"),
+ name = "reed",
+ -- TRANSLATORS: This is a ware name used in lists of wares. Used for thatching roofs and as a fiber for weaving cloth, fishing nets etc.
+ descname = pgettext("ware", "Reed"),
helptext_script = dirname .. "helptexts.lua",
icon = dirname .. "menu.png",
default_target_quantity = {},
=== modified file 'data/tribes/workers/barbarians/gardener/helptexts.lua'
--- data/tribes/workers/barbarians/gardener/helptexts.lua 2015-10-31 12:11:44 +0000
+++ data/tribes/workers/barbarians/gardener/helptexts.lua 2019-05-19 12:28:15 +0000
@@ -1,4 +1,4 @@
function worker_helptext()
-- TRANSLATORS: Helptext for a worker: Gardener
- return pgettext("barbarians_worker", "Grows thatch reed.")
+ return pgettext("barbarians_worker", "Plants and harvests reed fields.")
end
=== modified file 'data/tribes/workers/barbarians/gardener/init.lua'
--- data/tribes/workers/barbarians/gardener/init.lua 2018-02-28 09:38:13 +0000
+++ data/tribes/workers/barbarians/gardener/init.lua 2019-05-19 12:28:15 +0000
@@ -49,7 +49,7 @@
"animate=harvesting 12000",
"callobject=harvest",
"animate=harvesting 1",
- "createware=thatch_reed",
+ "createware=reed",
"return"
},
},
=== modified file 'data/tribes/workers/frisians/reed_farmer/helptexts.lua'
--- data/tribes/workers/frisians/reed_farmer/helptexts.lua 2017-07-07 16:51:39 +0000
+++ data/tribes/workers/frisians/reed_farmer/helptexts.lua 2019-05-19 12:28:15 +0000
@@ -1,4 +1,4 @@
function worker_helptext()
-- TRANSLATORS: Helptext for a worker: Gardener
- return pgettext("frisians_worker", "Grows thatch reed.")
+ return pgettext("frisians_worker", "Plants and harvests reed fields.")
end
=== modified file 'data/tribes/workers/frisians/reed_farmer/init.lua'
--- data/tribes/workers/frisians/reed_farmer/init.lua 2018-11-30 10:27:21 +0000
+++ data/tribes/workers/frisians/reed_farmer/init.lua 2019-05-19 12:28:15 +0000
@@ -53,7 +53,7 @@
"animate=harvesting 12000",
"callobject=harvest",
"animate=harvesting 1",
- "createware=thatch_reed",
+ "createware=reed",
"return"
},
},
=== modified file 'src/economy/ware_instance.cc'
--- src/economy/ware_instance.cc 2019-04-09 16:43:49 +0000
+++ src/economy/ware_instance.cc 2019-05-19 12:28:15 +0000
@@ -586,8 +586,9 @@
if (1 <= packet_version && packet_version <= kCurrentPacketVersion) {
std::string warename = fr.c_string();
if (packet_version == 1) {
- warename = lookup_table.lookup_ware(warename, fr.c_string());
+ warename = fr.c_string();
}
+ warename = lookup_table.lookup_ware(warename);
DescriptionIndex wareindex = egbase.tribes().ware_index(warename);
const WareDescr* descr = egbase.tribes().get_ware_descr(wareindex);
=== modified file 'src/game_io/game_player_info_packet.cc'
--- src/game_io/game_player_info_packet.cc 2019-03-15 15:11:57 +0000
+++ src/game_io/game_player_info_packet.cc 2019-05-19 12:28:15 +0000
@@ -19,6 +19,8 @@
#include "game_io/game_player_info_packet.h"
+#include <memory>
+
#include "io/fileread.h"
#include "io/filewrite.h"
#include "logic/game.h"
@@ -26,6 +28,7 @@
#include "logic/map_objects/tribes/tribe_descr.h"
#include "logic/player.h"
#include "logic/playersmanager.h"
+#include "map_io/tribes_legacy_lookup_table.h"
#include "wui/interactive_player.h"
namespace Widelands {
@@ -34,6 +37,7 @@
void GamePlayerInfoPacket::read(FileSystem& fs, Game& game, MapObjectLoader*) {
try {
+ std::unique_ptr<TribesLegacyLookupTable> tribe_lookup_table(new TribesLegacyLookupTable());
FileRead fr;
fr.open(fs, "binary/player_info");
uint16_t const packet_version = fr.unsigned_16();
@@ -68,7 +72,7 @@
}
}
- player->read_statistics(fr, packet_version);
+ player->read_statistics(fr, packet_version, *tribe_lookup_table.get());
player->read_remaining_shipnames(fr);
player->casualties_ = fr.unsigned_32();
=== modified file 'src/logic/map_objects/immovable.cc'
--- src/logic/map_objects/immovable.cc 2019-05-11 13:48:12 +0000
+++ src/logic/map_objects/immovable.cc 2019-05-19 12:28:15 +0000
@@ -730,14 +730,10 @@
if (1 <= packet_version && packet_version <= kCurrentPacketVersionImmovable) {
const std::string owner_type = fr.c_string();
- std::string name = fr.c_string();
Immovable* imm = nullptr;
if (owner_type != "world") { // It is a tribe immovable.
- // Needed for map compatibility
- if (packet_version < 7) {
- name = tribes_lookup_table.lookup_immovable(owner_type, name);
- }
+ const std::string name = tribes_lookup_table.lookup_immovable(fr.c_string());
const DescriptionIndex idx = egbase.tribes().immovable_index(name);
if (idx != Widelands::INVALID_INDEX) {
imm = new Immovable(*egbase.tribes().get_immovable_descr(idx));
@@ -746,7 +742,7 @@
}
} else { // world immovable
const World& world = egbase.world();
- name = world_lookup_table.lookup_immovable(name);
+ const std::string name = world_lookup_table.lookup_immovable(fr.c_string());
const DescriptionIndex idx = world.get_immovable_index(name.c_str());
if (idx == Widelands::INVALID_INDEX) {
throw GameDataError("world does not define immovable type \"%s\"", name.c_str());
=== modified file 'src/logic/map_objects/tribes/worker.cc'
--- src/logic/map_objects/tribes/worker.cc 2019-05-18 20:43:25 +0000
+++ src/logic/map_objects/tribes/worker.cc 2019-05-19 12:28:15 +0000
@@ -3174,8 +3174,9 @@
if (!Widelands::tribe_exists(name)) {
throw GameDataError("unknown tribe '%s'", name.c_str());
}
- name = lookup_table.lookup_worker(name, fr.c_string());
+ name = fr.c_string();
}
+ name = lookup_table.lookup_worker(name);
const WorkerDescr* descr =
egbase.tribes().get_worker_descr(egbase.tribes().safe_worker_index(name));
=== modified file 'src/logic/player.cc'
--- src/logic/player.cc 2019-05-11 18:19:20 +0000
+++ src/logic/player.cc 2019-05-19 12:28:15 +0000
@@ -1387,7 +1387,7 @@
*
* \param fr source stream
*/
-void Player::read_statistics(FileRead& fr, const uint16_t packet_version) {
+void Player::read_statistics(FileRead& fr, const uint16_t packet_version, const TribesLegacyLookupTable& lookup_table) {
uint16_t nr_wares = fr.unsigned_16();
size_t nr_entries = fr.unsigned_16();
@@ -1417,7 +1417,7 @@
ware_productions_[i].resize(nr_entries);
for (uint16_t i = 0; i < nr_wares; ++i) {
- const std::string name = fr.c_string();
+ const std::string name = lookup_table.lookup_ware(fr.c_string());
const DescriptionIndex idx = egbase().tribes().ware_index(name);
if (!egbase().tribes().ware_exists(idx)) {
log("Player %u statistics: unknown ware name %s", player_number(), name.c_str());
@@ -1442,7 +1442,7 @@
ware_consumptions_[i].resize(nr_entries);
for (uint16_t i = 0; i < nr_wares; ++i) {
- const std::string name = fr.c_string();
+ const std::string name = lookup_table.lookup_ware(fr.c_string());
const DescriptionIndex idx = egbase().tribes().ware_index(name);
if (!egbase().tribes().ware_exists(idx)) {
log("Player %u consumption statistics: unknown ware name %s", player_number(),
@@ -1469,7 +1469,7 @@
ware_stocks_[i].resize(nr_entries);
for (uint16_t i = 0; i < nr_wares; ++i) {
- const std::string name = fr.c_string();
+ const std::string name = lookup_table.lookup_ware(fr.c_string());
const DescriptionIndex idx = egbase().tribes().ware_index(name);
if (!egbase().tribes().ware_exists(idx)) {
log("Player %u stock statistics: unknown ware name %s", player_number(), name.c_str());
=== modified file 'src/logic/player.h'
--- src/logic/player.h 2019-05-07 12:14:02 +0000
+++ src/logic/player.h 2019-05-19 12:28:15 +0000
@@ -585,7 +585,7 @@
std::vector<uint32_t> const* get_ware_stock_statistics(DescriptionIndex const) const;
- void read_statistics(FileRead&, uint16_t packet_version);
+ void read_statistics(FileRead&, uint16_t packet_version, const TribesLegacyLookupTable& lookup_table);
void write_statistics(FileWrite&) const;
void read_remaining_shipnames(FileRead&);
void write_remaining_shipnames(FileWrite&) const;
=== modified file 'src/map_io/tribes_legacy_lookup_table.cc'
--- src/map_io/tribes_legacy_lookup_table.cc 2019-02-23 11:00:49 +0000
+++ src/map_io/tribes_legacy_lookup_table.cc 2019-05-19 12:28:15 +0000
@@ -18,294 +18,44 @@
*/
#include "map_io/tribes_legacy_lookup_table.h"
-
+// Whenever we break savegame compatibility, we can empty these maps
TribesLegacyLookupTable::TribesLegacyLookupTable()
: // Workers
- workers_{
- std::make_pair("atlanteans",
- std::map<std::string, std::string>{
- {"armorsmith", "atlanteans_armorsmith"},
- {"baker", "atlanteans_baker"},
- {"blackroot_farmer", "atlanteans_blackroot_farmer"},
- {"builder", "atlanteans_builder"},
- {"carrier", "atlanteans_carrier"},
- {"charcoal_burner", "atlanteans_charcoal_burner"},
- {"farmer", "atlanteans_farmer"},
- {"fish_breeder", "atlanteans_fishbreeder"},
- {"fisher", "atlanteans_fisher"},
- {"forester", "atlanteans_forester"},
- {"geologist", "atlanteans_geologist"},
- {"horse", "atlanteans_horse"},
- {"horsebreeder", "atlanteans_horsebreeder"},
- {"hunter", "atlanteans_hunter"},
- {"miller", "atlanteans_miller"},
- {"miner", "atlanteans_miner"},
- {"sawyer", "atlanteans_sawyer"},
- {"scout", "atlanteans_scout"},
- {"shipwright", "atlanteans_shipwright"},
- {"smelter", "atlanteans_smelter"},
- {"smoker", "atlanteans_smoker"},
- {"soldier", "atlanteans_soldier"},
- {"spiderbreeder", "atlanteans_spiderbreeder"},
- {"stonecutter", "atlanteans_stonecutter"},
- {"toolsmith", "atlanteans_toolsmith"},
- {"trainer", "atlanteans_trainer"},
- {"weaponsmith", "atlanteans_weaponsmith"},
- {"weaver", "atlanteans_weaver"},
- {"woodcutter", "atlanteans_woodcutter"},
- }),
- std::make_pair("barbarians",
- std::map<std::string, std::string>{
- {"baker", "barbarians_baker"},
- {"blacksmith", "barbarians_blacksmith"},
- {"brewer", "barbarians_brewer"},
- {"builder", "barbarians_builder"},
- {"carrier", "barbarians_carrier"},
- {"cattlebreeder", "barbarians_cattlebreeder"},
- {"charcoal_burner", "barbarians_charcoal_burner"},
- {"chief-miner", "barbarians_miner_chief"},
- {"farmer", "barbarians_farmer"},
- {"fisher", "barbarians_fisher"},
- {"gamekeeper", "barbarians_gamekeeper"},
- {"gardener", "barbarians_gardener"},
- {"geologist", "barbarians_geologist"},
- {"helmsmith", "barbarians_helmsmith"},
- {"hunter", "barbarians_hunter"},
- {"innkeeper", "barbarians_innkeeper"},
- {"lime-burner", "barbarians_lime_burner"},
- {"lumberjack", "barbarians_lumberjack"},
- {"master-blacksmith", "barbarians_blacksmith_master"},
- {"master-brewer", "barbarians_brewer_master"},
- {"master-miner", "barbarians_miner_master"},
- {"miner", "barbarians_miner"},
- {"ox", "barbarians_ox"},
- {"ranger", "barbarians_ranger"},
- {"scout", "barbarians_scout"},
- {"shipwright", "barbarians_shipwright"},
- {"smelter", "barbarians_smelter"},
- {"soldier", "barbarians_soldier"},
- {"stonemason", "barbarians_stonemason"},
- {"trainer", "barbarians_trainer"},
- {"weaver", "barbarians_weaver"},
- }),
- std::make_pair("empire",
- std::map<std::string, std::string>{
- {"armorsmith", "empire_armorsmith"},
- {"baker", "empire_baker"},
- {"brewer", "empire_brewer"},
- {"builder", "empire_builder"},
- {"carpenter", "empire_carpenter"},
- {"carrier", "empire_carrier"},
- {"charcoal_burner", "empire_charcoal_burner"},
- {"donkey", "empire_donkey"},
- {"donkeybreeder", "empire_donkeybreeder"},
- {"farmer", "empire_farmer"},
- {"fisher", "empire_fisher"},
- {"forester", "empire_forester"},
- {"geologist", "empire_geologist"},
- {"hunter", "empire_hunter"},
- {"innkeeper", "empire_innkeeper"},
- {"lumberjack", "empire_lumberjack"},
- {"master-miner", "empire_miner_master"},
- {"miller", "empire_miller"},
- {"miner", "empire_miner"},
- {"pig-breeder", "empire_pigbreeder"},
- {"scout", "empire_scout"},
- {"shepherd", "empire_shepherd"},
- {"shipwright", "empire_shipwright"},
- {"smelter", "empire_smelter"},
- {"soldier", "empire_soldier"},
- {"stonemason", "empire_stonemason"},
- {"toolsmith", "empire_toolsmith"},
- {"trainer", "empire_trainer"},
- {"vinefarmer", "empire_vinefarmer"},
- {"weaponsmith", "empire_weaponsmith"},
- {"weaver", "empire_weaver"},
- }),
- },
+ workers_{},
// Wares
wares_{
- std::make_pair("atlanteans",
- std::map<std::string, std::string>{
- {"advanced_shield", "shield_advanced"},
- {"blackrootflour", "blackroot_flour"},
- {"bread", "atlanteans_bread"},
- {"bucket", "buckets"},
- {"cornflour", "cornmeal"},
- {"double_trident", "trident_double"},
- {"golden_tabard", "tabard_golden"},
- {"goldore", "gold_ore"},
- {"goldyarn", "gold_thread"},
- {"heavy_double_trident", "trident_heavy_double"},
- {"ironore", "iron_ore"},
- {"light_trident", "trident_light"},
- {"long_trident", "trident_long"},
- {"spideryarn", "spider_silk"},
- {"steel_shield", "shield_steel"},
- {"steel_trident", "trident_steel"},
- {"stone", "granite"},
- }),
- std::make_pair("barbarians",
- std::map<std::string, std::string>{
- {"battleax", "ax_battle"},
- {"broadax", "ax_broad"},
- {"bronzeax", "ax_bronze"},
- {"felling_ax", "felling_ax"},
- {"goldore", "gold_ore"},
- {"helm", "helmet"},
- {"ironore", "iron_ore"},
- {"mask", "helmet_mask"},
- {"pittabread", "barbarians_bread"},
- {"raw_stone", "granite"},
- {"sharpax", "ax_sharp"},
- {"strongbeer", "beer_strong"},
- {"thatchreed", "thatch_reed"},
- {"warhelm", "helmet_warhelm"},
- {"warriorsax", "ax_warriors"},
- }),
- std::make_pair("empire",
- std::map<std::string, std::string>{
- {"advanced_lance", "spear_advanced"},
- {"ax", "felling_ax"},
- {"bread", "empire_bread"},
- {"chain_armor", "armor_chain"},
- {"goldore", "gold_ore"},
- {"heavy_lance", "spear_heavy"},
- {"helm", "armor_helmet"},
- {"ironore", "iron_ore"},
- {"lance", "spear"},
- {"marblecolumn", "marble_column"},
- {"plate_armor", "armor_gilded"},
- {"stone", "granite"},
- {"war_lance", "spear_war"},
- {"wood_lance", "spear_wooden"},
- {"wood", "planks"},
- }),
- },
+ {"thatch_reed", "reed"},
+ },
// Immovables
immovables_{
- std::make_pair("atlanteans",
- std::map<std::string, std::string>{
- {"blackrootfield_b", "blackrootfield_ripe"},
- {"blackrootfield_m", "blackrootfield_medium"},
- {"blackrootfield_s", "blackrootfield_small"},
- {"blackrootfield_t", "blackrootfield_tiny"},
- {"cornfield_b", "cornfield_ripe"},
- {"cornfield_m", "cornfield_medium"},
- {"cornfield_s", "cornfield_small"},
- {"cornfield_t", "cornfield_tiny"},
- {"resi_granite1", "atlanteans_resi_stones_1"},
- {"resi_granite2", "atlanteans_resi_stones_2"},
- {"shipconstruction", "atlanteans_shipconstruction"},
- {"resi_coal1", "atlanteans_resi_coal_1"},
- {"resi_iron1", "atlanteans_resi_iron_1"},
- {"resi_gold1", "atlanteans_resi_gold_1"},
- {"resi_stones1", "atlanteans_resi_stones_1"},
- {"resi_coal2", "atlanteans_resi_coal_2"},
- {"resi_iron2", "atlanteans_resi_iron_2"},
- {"resi_gold2", "atlanteans_resi_gold_2"},
- {"resi_stones2", "atlanteans_resi_stones_2"},
- {"resi_none", "atlanteans_resi_none"},
- {"resi_water1", "atlanteans_resi_water"},
- }),
- std::make_pair("barbarians",
- std::map<std::string, std::string>{
- {"field0", "field_medium"},
- {"field0s", "field_small"},
- {"field0t", "field_tiny"},
- {"field1", "field_ripe"},
- {"field2", "field_harvested"},
- {"reed0", "reed_medium"},
- {"reed0s", "reed_small"},
- {"reed0t", "reed_tiny"},
- {"reed1", "reed_ripe"},
- {"resi_granite1", "barbarians_resi_stones_1"},
- {"resi_granite2", "barbarians_resi_stones_2"},
- {"shipconstruction", "barbarians_shipconstruction"},
- {"resi_coal1", "barbarians_resi_coal_1"},
- {"resi_iron1", "barbarians_resi_iron_1"},
- {"resi_gold1", "barbarians_resi_gold_1"},
- {"resi_stones1", "barbarians_resi_stones_1"},
- {"resi_coal2", "barbarians_resi_coal_2"},
- {"resi_iron2", "barbarians_resi_iron_2"},
- {"resi_gold2", "barbarians_resi_gold_2"},
- {"resi_stones2", "barbarians_resi_stones_2"},
- {"resi_none", "barbarians_resi_none"},
- {"resi_water1", "barbarians_resi_water"},
- }),
- std::make_pair("empire",
- std::map<std::string, std::string>{
- {"field0", "field_medium"},
- {"field0s", "field_small"},
- {"field0t", "field_tiny"},
- {"field1", "field_ripe"},
- {"field2", "field_harvested"},
- {"wine0", "grapevine_medium"},
- {"wine0s", "grapevine_small"},
- {"wine0t", "grapevine_tiny"},
- {"wine1", "grapevine_ripe"},
- {"resi_granite1", "empire_resi_stones_1"},
- {"resi_granite2", "empire_resi_stones_2"},
- {"shipconstruction", "empire_shipconstruction"},
- {"resi_coal1", "empire_resi_coal_1"},
- {"resi_iron1", "empire_resi_iron_1"},
- {"resi_gold1", "empire_resi_gold_1"},
- {"resi_stones1", "empire_resi_stones_1"},
- {"resi_coal2", "empire_resi_coal_2"},
- {"resi_iron2", "empire_resi_iron_2"},
- {"resi_gold2", "empire_resi_gold_2"},
- {"resi_stones2", "empire_resi_stones_2"},
- {"resi_none", "empire_resi_none"},
- {"resi_water1", "empire_resi_water"},
- }),
- std::make_pair("frisians",
- std::map<std::string, std::string>{
- {"resi_coal1", "frisians_resi_coal_1"},
- {"resi_iron1", "frisians_resi_iron_1"},
- {"resi_gold1", "frisians_resi_gold_1"},
- {"resi_stones1", "frisians_resi_stones_1"},
- {"resi_coal2", "frisians_resi_coal_2"},
- {"resi_iron2", "frisians_resi_iron_2"},
- {"resi_gold2", "frisians_resi_gold_2"},
- {"resi_stones2", "frisians_resi_stones_2"},
- {"resi_none", "frisians_resi_none"},
- {"resi_water1", "frisians_resi_water"},
- }),
+ {"field_medium", "wheatfield_medium"},
+ {"field_small", "wheatfield_small"},
+ {"field_tiny", "wheatfield_tiny"},
+ {"field_ripe", "wheatfield_ripe"},
+ {"field_harvested", "wheatfield_harvested"},
+ {"reed_medium", "reedfield_medium"},
+ {"reed_small", "reedfield_small"},
+ {"reed_tiny", "reedfield_tiny"},
+ {"reed_tiny", "reedfield_ripe"},
} {
}
-const std::string& TribesLegacyLookupTable::lookup_worker(const std::string& tribe,
- const std::string& worker) const {
- if (workers_.count(tribe)) {
- const std::map<std::string, std::string>& tribe_workers = workers_.at(tribe);
- const auto& i = tribe_workers.find(worker);
- if (i != tribe_workers.end()) {
- return i->second;
- }
- }
- return worker;
-}
-
-const std::string& TribesLegacyLookupTable::lookup_ware(const std::string& tribe,
- const std::string& ware) const {
- if (wares_.count(tribe)) {
- const std::map<std::string, std::string>& tribe_wares = wares_.at(tribe);
- const auto& i = tribe_wares.find(ware);
- if (i != tribe_wares.end()) {
- return i->second;
- }
- }
- return ware;
-}
-
-const std::string& TribesLegacyLookupTable::lookup_immovable(const std::string& tribe,
- const std::string& immovable) const {
- if (immovables_.count(tribe)) {
- const std::map<std::string, std::string>& tribe_immovables = immovables_.at(tribe);
- const auto& i = tribe_immovables.find(immovable);
- if (i != tribe_immovables.end()) {
- return i->second;
- }
- }
- return immovable;
+const std::string& TribesLegacyLookupTable::lookup_worker(const std::string& worker) const {
+ return lookup_entry(worker, workers_);
+}
+
+const std::string& TribesLegacyLookupTable::lookup_ware(const std::string& ware) const {
+ return lookup_entry(ware, wares_);
+}
+
+const std::string& TribesLegacyLookupTable::lookup_immovable(const std::string& immovable) const {
+ return lookup_entry(immovable, immovables_);
+}
+
+const std::string& TribesLegacyLookupTable::lookup_entry(const std::string& entry, const std::map<std::string, std::string>& table) const {
+ const auto& i = table.find(entry);
+ if (i != table.end()) {
+ return i->second;
+ }
+ return entry;
}
=== modified file 'src/map_io/tribes_legacy_lookup_table.h'
--- src/map_io/tribes_legacy_lookup_table.h 2019-02-23 11:00:49 +0000
+++ src/map_io/tribes_legacy_lookup_table.h 2019-05-19 12:28:15 +0000
@@ -30,20 +30,21 @@
TribesLegacyLookupTable();
/// Looks up the new name for the 'worker'.
- const std::string& lookup_worker(const std::string& tribe, const std::string& worker) const;
+ const std::string& lookup_worker(const std::string& worker) const;
/// Looks up the new name for the 'ware'.
- const std::string& lookup_ware(const std::string& tribe, const std::string& ware) const;
+ const std::string& lookup_ware(const std::string& ware) const;
/// Looks up the new name for the 'immovable'.
- const std::string& lookup_immovable(const std::string& tribe,
- const std::string& immovable) const;
+ const std::string& lookup_immovable(const std::string& immovable) const;
private:
+ const std::string& lookup_entry(const std::string& entry, const std::map<std::string, std::string>& table) const;
+
/// {tribe name, {old name, new name}}
- const std::map<std::string, std::map<std::string, std::string>> workers_;
- const std::map<std::string, std::map<std::string, std::string>> wares_;
- const std::map<std::string, std::map<std::string, std::string>> immovables_;
+ const std::map<std::string, std::string> workers_;
+ const std::map<std::string, std::string> wares_;
+ const std::map<std::string, std::string> immovables_;
DISALLOW_COPY_AND_ASSIGN(TribesLegacyLookupTable);
};
=== modified file 'test/maps/expedition.wmf/scripting/init.lua'
--- test/maps/expedition.wmf/scripting/init.lua 2018-09-30 09:50:43 +0000
+++ test/maps/expedition.wmf/scripting/init.lua 2019-05-19 12:28:15 +0000
@@ -23,7 +23,7 @@
grout = 2,
iron = 2,
granite = 5,
- thatch_reed = 4,
+ reed = 4,
log = 3,
},
workers = {
@@ -80,7 +80,7 @@
assert_equal(2, wares.grout)
assert_equal(2, wares.iron)
assert_equal(5, wares.granite)
- assert_equal(4, wares.thatch_reed)
+ assert_equal(4, wares.reed)
-- We do not check for logs here as they might be carried out of the
-- warehouse already when we check (because they might get requested by the
-- hardener).
=== modified file 'test/maps/lua_testsuite.wmf/scripting/baseimmovables.lua'
--- test/maps/lua_testsuite.wmf/scripting/baseimmovables.lua 2016-02-14 16:31:07 +0000
+++ test/maps/lua_testsuite.wmf/scripting/baseimmovables.lua 2019-05-19 12:28:15 +0000
@@ -21,7 +21,7 @@
imm2:remove()
end
function immovable_creation_tests:test_create_tribe_immovables()
- imm = map:place_immovable("field_harvested", map:get_field(10,10), "tribes")
+ imm = map:place_immovable("wheatfield_harvested", map:get_field(10,10), "tribes")
imm:remove()
end
function immovable_creation_tests:test_create_world_immovables()
@@ -35,7 +35,7 @@
end
function immovable_creation_tests:test_create_tribe_immovables_ill_tribe()
assert_error("Immovables are for world or tribes!", function()
- imm = map:place_immovable("field_harvested", map:get_field(10,10), "blablub")
+ imm = map:place_immovable("wheatfield_harvested", map:get_field(10,10), "blablub")
end)
end
function immovable_creation_tests:test_create_tribe_immovables_ill_immovable()
=== modified file 'test/maps/lua_testsuite.wmf/scripting/immovables_descriptions.lua'
--- test/maps/lua_testsuite.wmf/scripting/immovables_descriptions.lua 2019-04-07 05:46:13 +0000
+++ test/maps/lua_testsuite.wmf/scripting/immovables_descriptions.lua 2019-05-19 12:28:15 +0000
@@ -452,12 +452,12 @@
-- This is actually a property of MapOjectDescription
function test_descr:test_descname()
- assert_equal("Thatch Reed", egbase:get_ware_description("thatch_reed").descname)
+ assert_equal("Thatch Reed", egbase:get_ware_description("reed").descname)
end
-- This is actually a property of MapOjectDescription
function test_descr:test_name()
- assert_equal("thatch_reed", egbase:get_ware_description("thatch_reed").name)
+ assert_equal("reed", egbase:get_ware_description("reed").name)
end
function test_descr:test_consumers()
=== modified file 'test/maps/market_trading.wmf/scripting/tribes/market/init.lua'
--- test/maps/market_trading.wmf/scripting/tribes/market/init.lua 2018-07-15 10:32:12 +0000
+++ test/maps/market_trading.wmf/scripting/tribes/market/init.lua 2019-05-19 12:28:15 +0000
@@ -22,7 +22,7 @@
granite = 4,
grout = 3,
iron = 1,
- thatch_reed = 4,
+ reed = 4,
gold = 2,
},
return_on_dismantle = {
@@ -31,7 +31,7 @@
granite = 3,
grout = 1,
iron = 1,
- thatch_reed = 2,
+ reed = 2,
gold = 1,
},
=== modified file 'test/maps/port_space.wmf/scripting/init.lua'
--- test/maps/port_space.wmf/scripting/init.lua 2016-02-08 20:44:17 +0000
+++ test/maps/port_space.wmf/scripting/init.lua 2019-05-19 12:28:15 +0000
@@ -52,7 +52,7 @@
grout = 100,
iron = 100,
granite = 100,
- thatch_reed = 100,
+ reed = 100,
log = 100,
},
workers = {
@@ -65,7 +65,7 @@
grout = 100,
iron = 100,
granite = 100,
- thatch_reed = 100,
+ reed = 100,
log = 100,
gold = 100,
},
Follow ups
