Merge lp:~widelands-dev/widelands/tribe-immovable-file-structure into lp:widelands

Proposed by GunChleoc
Status: Merged
Merged at revision: 9119
Proposed branch: lp:~widelands-dev/widelands/tribe-immovable-file-structure
Merge into: lp:widelands
Diff against target: 2763 lines (+301/-553)
128 files modified
data/campaigns/bar01.wmf/scripting/starting_conditions.lua (+1/-1)
data/campaigns/bar01.wmf/scripting/texts.lua (+1/-1)
data/campaigns/bar02.wmf/scripting/starting_conditions.lua (+1/-1)
data/campaigns/emp02.wmf/scripting/starting_conditions.lua (+1/-1)
data/campaigns/emp03.wmf/scripting/starting_conditions.lua (+1/-1)
data/campaigns/emp04.wmf/scripting/starting_conditions.lua (+1/-1)
data/campaigns/fri01.wmf/scripting/mission_thread.lua (+2/-2)
data/campaigns/fri01.wmf/scripting/starting_conditions.lua (+2/-2)
data/campaigns/fri01.wmf/scripting/texts.lua (+3/-3)
data/campaigns/fri02.wmf/scripting/starting_conditions.lua (+2/-2)
data/campaigns/tutorial02_warfare.wmf/scripting/starting_conditions.lua (+1/-1)
data/maps/MP_Scenarios/Smugglers.wmf/scripting/starting_conditions.lua (+2/-2)
data/maps/The_Green_Plateau.wmf/scripting/initial_conditions.lua (+2/-2)
data/maps/Trident_of_Fire.wmf/scripting/initial_conditions.lua (+1/-1)
data/tribes/barbarians.lua (+10/-10)
data/tribes/buildings/militarysites/frisians/fortress/init.lua (+2/-2)
data/tribes/buildings/militarysites/frisians/outpost/init.lua (+2/-2)
data/tribes/buildings/militarysites/frisians/sentinel/init.lua (+1/-1)
data/tribes/buildings/militarysites/frisians/tower/init.lua (+2/-2)
data/tribes/buildings/militarysites/frisians/wooden_tower/init.lua (+1/-1)
data/tribes/buildings/militarysites/frisians/wooden_tower_high/init.lua (+1/-1)
data/tribes/buildings/productionsites/barbarians/ax_workshop/init.lua (+1/-1)
data/tribes/buildings/productionsites/barbarians/bakery/init.lua (+1/-1)
data/tribes/buildings/productionsites/barbarians/barracks/init.lua (+1/-1)
data/tribes/buildings/productionsites/barbarians/big_inn/init.lua (+1/-1)
data/tribes/buildings/productionsites/barbarians/brewery/init.lua (+1/-1)
data/tribes/buildings/productionsites/barbarians/charcoal_kiln/init.lua (+1/-1)
data/tribes/buildings/productionsites/barbarians/helmsmithy/init.lua (+2/-2)
data/tribes/buildings/productionsites/barbarians/inn/init.lua (+1/-1)
data/tribes/buildings/productionsites/barbarians/metal_workshop/init.lua (+1/-1)
data/tribes/buildings/productionsites/barbarians/micro_brewery/init.lua (+1/-1)
data/tribes/buildings/productionsites/barbarians/reed_yard/helptexts.lua (+2/-2)
data/tribes/buildings/productionsites/barbarians/reed_yard/init.lua (+1/-1)
data/tribes/buildings/productionsites/barbarians/smelting_works/init.lua (+1/-1)
data/tribes/buildings/productionsites/barbarians/tavern/init.lua (+1/-1)
data/tribes/buildings/productionsites/barbarians/warmill/init.lua (+1/-1)
data/tribes/buildings/productionsites/barbarians/weaving_mill/helptexts.lua (+1/-1)
data/tribes/buildings/productionsites/barbarians/weaving_mill/init.lua (+3/-3)
data/tribes/buildings/productionsites/frisians/aqua_farm/init.lua (+1/-1)
data/tribes/buildings/productionsites/frisians/armor_smithy_large/init.lua (+1/-1)
data/tribes/buildings/productionsites/frisians/armor_smithy_small/init.lua (+2/-2)
data/tribes/buildings/productionsites/frisians/bakery/init.lua (+2/-2)
data/tribes/buildings/productionsites/frisians/barracks/init.lua (+2/-2)
data/tribes/buildings/productionsites/frisians/beekeepers_house/helptexts.lua (+1/-1)
data/tribes/buildings/productionsites/frisians/beekeepers_house/init.lua (+2/-2)
data/tribes/buildings/productionsites/frisians/berry_farm/init.lua (+1/-1)
data/tribes/buildings/productionsites/frisians/blacksmithy/init.lua (+5/-5)
data/tribes/buildings/productionsites/frisians/brewery/init.lua (+2/-2)
data/tribes/buildings/productionsites/frisians/brick_kiln/init.lua (+2/-2)
data/tribes/buildings/productionsites/frisians/charcoal_kiln/init.lua (+2/-2)
data/tribes/buildings/productionsites/frisians/clay_pit/init.lua (+1/-1)
data/tribes/buildings/productionsites/frisians/coalmine/init.lua (+1/-1)
data/tribes/buildings/productionsites/frisians/coalmine_deep/init.lua (+2/-2)
data/tribes/buildings/productionsites/frisians/collectors_house/init.lua (+1/-1)
data/tribes/buildings/productionsites/frisians/drinking_hall/init.lua (+2/-2)
data/tribes/buildings/productionsites/frisians/farm/init.lua (+2/-2)
data/tribes/buildings/productionsites/frisians/fishers_house/init.lua (+1/-1)
data/tribes/buildings/productionsites/frisians/foresters_house/init.lua (+1/-1)
data/tribes/buildings/productionsites/frisians/furnace/init.lua (+2/-2)
data/tribes/buildings/productionsites/frisians/goldmine/init.lua (+1/-1)
data/tribes/buildings/productionsites/frisians/goldmine_deep/init.lua (+2/-2)
data/tribes/buildings/productionsites/frisians/honey_bread_bakery/init.lua (+2/-2)
data/tribes/buildings/productionsites/frisians/hunters_house/init.lua (+1/-1)
data/tribes/buildings/productionsites/frisians/ironmine/init.lua (+1/-1)
data/tribes/buildings/productionsites/frisians/ironmine_deep/init.lua (+2/-2)
data/tribes/buildings/productionsites/frisians/mead_brewery/init.lua (+1/-1)
data/tribes/buildings/productionsites/frisians/quarry/init.lua (+1/-1)
data/tribes/buildings/productionsites/frisians/recycling_center/init.lua (+2/-2)
data/tribes/buildings/productionsites/frisians/reed_farm/init.lua (+2/-2)
data/tribes/buildings/productionsites/frisians/reindeer_farm/init.lua (+2/-2)
data/tribes/buildings/productionsites/frisians/rockmine/init.lua (+1/-1)
data/tribes/buildings/productionsites/frisians/rockmine_deep/init.lua (+2/-2)
data/tribes/buildings/productionsites/frisians/scouts_house/init.lua (+1/-1)
data/tribes/buildings/productionsites/frisians/sewing_room/init.lua (+1/-1)
data/tribes/buildings/productionsites/frisians/shipyard/init.lua (+2/-2)
data/tribes/buildings/productionsites/frisians/smokery/init.lua (+2/-2)
data/tribes/buildings/productionsites/frisians/tailors_shop/init.lua (+1/-1)
data/tribes/buildings/productionsites/frisians/tavern/init.lua (+2/-2)
data/tribes/buildings/productionsites/frisians/weaving_mill/init.lua (+4/-4)
data/tribes/buildings/productionsites/frisians/woodcutters_house/init.lua (+1/-1)
data/tribes/buildings/trainingsites/barbarians/battlearena/init.lua (+2/-2)
data/tribes/buildings/trainingsites/barbarians/trainingcamp/init.lua (+1/-1)
data/tribes/buildings/trainingsites/frisians/training_arena/init.lua (+2/-2)
data/tribes/buildings/trainingsites/frisians/training_camp/init.lua (+2/-2)
data/tribes/buildings/warehouses/barbarians/port/init.lua (+2/-2)
data/tribes/buildings/warehouses/barbarians/warehouse/init.lua (+1/-1)
data/tribes/buildings/warehouses/frisians/port/init.lua (+2/-2)
data/tribes/buildings/warehouses/frisians/warehouse/init.lua (+2/-2)
data/tribes/empire.lua (+5/-5)
data/tribes/frisians.lua (+6/-6)
data/tribes/immovables/reedfield/medium/init.lua (+3/-3)
data/tribes/immovables/reedfield/ripe/init.lua (+2/-2)
data/tribes/immovables/reedfield/small/init.lua (+3/-3)
data/tribes/immovables/reedfield/tiny/init.lua (+3/-3)
data/tribes/immovables/wheatfield/harvested/init.lua (+2/-2)
data/tribes/immovables/wheatfield/medium/init.lua (+3/-3)
data/tribes/immovables/wheatfield/ripe/init.lua (+3/-3)
data/tribes/immovables/wheatfield/small/init.lua (+3/-3)
data/tribes/immovables/wheatfield/tiny/init.lua (+3/-3)
data/tribes/init.lua (+32/-32)
data/tribes/scripting/starting_conditions/barbarians/fortified_village.lua (+1/-1)
data/tribes/scripting/starting_conditions/barbarians/headquarters.lua (+1/-1)
data/tribes/scripting/starting_conditions/barbarians/trading_outpost.lua (+1/-1)
data/tribes/scripting/starting_conditions/barbarians/village.lua (+1/-1)
data/tribes/scripting/starting_conditions/frisians/fortified_village.lua (+2/-2)
data/tribes/scripting/starting_conditions/frisians/headquarters.lua (+1/-1)
data/tribes/scripting/starting_conditions/frisians/trading_outpost.lua (+2/-2)
data/tribes/scripting/starting_conditions/frisians/village.lua (+2/-2)
data/tribes/wares/cloth/helptexts.lua (+1/-1)
data/tribes/wares/reed/helptexts.lua (+4/-4)
data/tribes/wares/reed/init.lua (+3/-3)
data/tribes/workers/barbarians/gardener/helptexts.lua (+1/-1)
data/tribes/workers/barbarians/gardener/init.lua (+1/-1)
data/tribes/workers/frisians/reed_farmer/helptexts.lua (+1/-1)
data/tribes/workers/frisians/reed_farmer/init.lua (+1/-1)
src/economy/ware_instance.cc (+2/-2)
src/game_io/game_player_info_packet.cc (+5/-1)
src/logic/map_objects/immovable.cc (+2/-6)
src/logic/map_objects/tribes/worker.cc (+2/-5)
src/logic/player.cc (+4/-4)
src/logic/player.h (+1/-1)
src/map_io/tribes_legacy_lookup_table.cc (+31/-281)
src/map_io/tribes_legacy_lookup_table.h (+8/-7)
test/maps/expedition.wmf/scripting/init.lua (+2/-2)
test/maps/lua_testsuite.wmf/scripting/baseimmovables.lua (+2/-2)
test/maps/lua_testsuite.wmf/scripting/immovables_descriptions.lua (+2/-2)
test/maps/market_trading.wmf/scripting/tribes/market/init.lua (+2/-2)
test/maps/port_space.wmf/scripting/init.lua (+2/-2)
To merge this branch: bzr merge lp:~widelands-dev/widelands/tribe-immovable-file-structure
Reviewer Review Type Date Requested Status
Toni Förster Approve
Review via email: mp+367611@code.launchpad.net

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

To post a comment you must log in.
9117. By GunChleoc

Code cleanup.

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 5018. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/534441385.
Appveyor build 4799. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_tribe_immovable_file_structure-4799.

Revision history for this message
Toni Förster (stonerl) wrote :

LGTM :)

review: Approve
Revision history for this message
GunChleoc (gunchleoc) wrote :

Thanks for the review :)

@bunnybot merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/campaigns/bar01.wmf/scripting/starting_conditions.lua'
2--- data/campaigns/bar01.wmf/scripting/starting_conditions.lua 2016-10-22 10:37:11 +0000
3+++ data/campaigns/bar01.wmf/scripting/starting_conditions.lua 2019-05-19 12:37:52 +0000
4@@ -34,7 +34,7 @@
5 scythe = 6,
6 shovel = 4,
7 snack = 3,
8- thatch_reed = 24,
9+ reed = 24,
10 }
11 hq:set_workers{
12 barbarians_blacksmith = 2,
13
14=== modified file 'data/campaigns/bar01.wmf/scripting/texts.lua'
15--- data/campaigns/bar01.wmf/scripting/texts.lua 2018-09-29 12:45:54 +0000
16+++ data/campaigns/bar01.wmf/scripting/texts.lua 2019-05-19 12:37:52 +0000
17@@ -120,7 +120,7 @@
18 title = _"Build a reed yard",
19 number = 1,
20 body = objective_text(_"Build a reed yard",
21- 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.]])) ..
22+ 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.]])) ..
23 li(_"Build a reed yard"))
24 }
25
26
27=== modified file 'data/campaigns/bar02.wmf/scripting/starting_conditions.lua'
28--- data/campaigns/bar02.wmf/scripting/starting_conditions.lua 2018-02-10 14:23:19 +0000
29+++ data/campaigns/bar02.wmf/scripting/starting_conditions.lua 2019-05-19 12:37:52 +0000
30@@ -37,7 +37,7 @@
31 scythe = 6,
32 shovel = 4,
33 snack = 3,
34- thatch_reed = 24,
35+ reed = 24,
36 }
37 hq:set_workers{
38 barbarians_blacksmith = 2,
39
40=== modified file 'data/campaigns/emp02.wmf/scripting/starting_conditions.lua'
41--- data/campaigns/emp02.wmf/scripting/starting_conditions.lua 2017-01-06 14:17:42 +0000
42+++ data/campaigns/emp02.wmf/scripting/starting_conditions.lua 2019-05-19 12:37:52 +0000
43@@ -116,7 +116,7 @@
44 scythe = 6,
45 shovel = 4,
46 snack = 3,
47- thatch_reed = 24,
48+ reed = 24,
49 },
50 workers = {
51 barbarians_blacksmith = 2,
52
53=== modified file 'data/campaigns/emp03.wmf/scripting/starting_conditions.lua'
54--- data/campaigns/emp03.wmf/scripting/starting_conditions.lua 2017-03-16 21:54:07 +0000
55+++ data/campaigns/emp03.wmf/scripting/starting_conditions.lua 2019-05-19 12:37:52 +0000
56@@ -120,7 +120,7 @@
57 scythe = 6,
58 shovel = 4,
59 snack = 3,
60- thatch_reed = 24,
61+ reed = 24,
62 },
63 workers = {
64 barbarians_blacksmith = 2,
65
66=== modified file 'data/campaigns/emp04.wmf/scripting/starting_conditions.lua'
67--- data/campaigns/emp04.wmf/scripting/starting_conditions.lua 2018-08-09 20:54:08 +0000
68+++ data/campaigns/emp04.wmf/scripting/starting_conditions.lua 2019-05-19 12:37:52 +0000
69@@ -224,7 +224,7 @@
70 scythe = 6,
71 shovel = 4,
72 snack = 3,
73- thatch_reed = 24,
74+ reed = 24,
75 },
76 workers = {
77 barbarians_blacksmith = 2,
78
79=== modified file 'data/campaigns/fri01.wmf/scripting/mission_thread.lua'
80--- data/campaigns/fri01.wmf/scripting/mission_thread.lua 2018-09-14 08:57:44 +0000
81+++ data/campaigns/fri01.wmf/scripting/mission_thread.lua 2019-05-19 12:37:52 +0000
82@@ -16,7 +16,7 @@
83 count("coal") < 20 or
84 count("brick") < 40 or
85 count("clay") < 10 or
86- count("thatch_reed") < 30
87+ count("reed") < 30
88 ) do sleep(8731) end
89 set_objective_done(o)
90 done_gather_materials = true
91@@ -59,7 +59,7 @@
92 local ready = 0
93 while show_warning_reed do
94 sleep(10000)
95- if count("thatch_reed") < 4 then
96+ if count("reed") < 4 then
97 if ready > 8 then
98 if #p1:get_buildings("frisians_reed_farm") < 3 then
99 campaign_message_box(warning_no_reed)
100
101=== modified file 'data/campaigns/fri01.wmf/scripting/starting_conditions.lua'
102--- data/campaigns/fri01.wmf/scripting/starting_conditions.lua 2018-05-23 05:13:49 +0000
103+++ data/campaigns/fri01.wmf/scripting/starting_conditions.lua 2019-05-19 12:37:52 +0000
104@@ -12,7 +12,7 @@
105 granite = 40,
106 water = 40,
107 coal = 20,
108- thatch_reed = 20,
109+ reed = 20,
110 fruit = 10,
111 fish = 10,
112 meat = 10,
113@@ -90,7 +90,7 @@
114 brick = 200,
115 clay = 30,
116 granite = 200,
117- thatch_reed = 200,
118+ reed = 200,
119 water = 20,
120 coal = 100,
121 iron = 50,
122
123=== modified file 'data/campaigns/fri01.wmf/scripting/texts.lua'
124--- data/campaigns/fri01.wmf/scripting/texts.lua 2019-05-12 16:31:38 +0000
125+++ data/campaigns/fri01.wmf/scripting/texts.lua 2019-05-19 12:37:52 +0000
126@@ -49,7 +49,7 @@
127 li(_"10 × Clay") ..
128 li(_"40 × Brick") ..
129 li(_"20 × Coal") ..
130- li(_"30 × Thatch Reed") ..
131+ li(_"30 × Reed") ..
132 p(_([[Remember that you can set target quantities for most of these wares in your economy settings.]]))
133 ),
134 }
135@@ -154,7 +154,7 @@
136 _([[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.]])
137 .. paragraphdivider() ..
138 -- TRANSLATORS: Hauke – Introduction 3
139- _([[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.]]))
140+ _([[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.]]))
141 .. new_objectives(obj_build_wood_economy),
142 }
143 intro_4 = {
144@@ -186,7 +186,7 @@
145 body=hauke(_"Build another reed farm",
146 -- TRANSLATORS: Hauke – no reed
147 _([[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.]]))
148- .. li_arrow (_([[You should assign the new reed farm the highest priority for thatch reed in the construction site window.]])),
149+ .. li_arrow (_([[You should assign the new reed farm the highest priority for reed in the construction site window.]])),
150 }
151 warning_no_clay = {
152 title =_ "Clay Shortages",
153
154=== modified file 'data/campaigns/fri02.wmf/scripting/starting_conditions.lua'
155--- data/campaigns/fri02.wmf/scripting/starting_conditions.lua 2018-09-28 09:38:02 +0000
156+++ data/campaigns/fri02.wmf/scripting/starting_conditions.lua 2019-05-19 12:37:52 +0000
157@@ -23,7 +23,7 @@
158 log = 40,
159 brick = 50,
160 granite = 40,
161- thatch_reed = 20,
162+ reed = 20,
163 clay = 10,
164 water = 5,
165 coal = 30,
166@@ -247,7 +247,7 @@
167 hq3:set_wares {
168 log = 100,
169 granite = 50,
170- thatch_reed = 50,
171+ reed = 50,
172 blackwood = 10, -- To delay expansion
173 grout = 20,
174 coal = 20,
175
176=== modified file 'data/campaigns/tutorial02_warfare.wmf/scripting/starting_conditions.lua'
177--- data/campaigns/tutorial02_warfare.wmf/scripting/starting_conditions.lua 2017-02-12 09:10:57 +0000
178+++ data/campaigns/tutorial02_warfare.wmf/scripting/starting_conditions.lua 2019-05-19 12:37:52 +0000
179@@ -35,7 +35,7 @@
180 gold = 10,
181 grout = 30,
182 granite = 30,
183- thatch_reed = 40,
184+ reed = 40,
185
186 -- wares for training
187 ax_sharp = 20,
188
189=== modified file 'data/maps/MP_Scenarios/Smugglers.wmf/scripting/starting_conditions.lua'
190--- data/maps/MP_Scenarios/Smugglers.wmf/scripting/starting_conditions.lua 2018-09-08 09:36:36 +0000
191+++ data/maps/MP_Scenarios/Smugglers.wmf/scripting/starting_conditions.lua 2019-05-19 12:37:52 +0000
192@@ -27,7 +27,7 @@
193 scythe = 6,
194 shovel = 4,
195 snack = 3,
196- thatch_reed = 24,
197+ reed = 24,
198 log = 80,
199 },
200 workers = {
201@@ -184,7 +184,7 @@
202 wares = {
203 log = 40,
204 granite = 50,
205- thatch_reed = 50,
206+ reed = 50,
207 brick = 80,
208 clay = 30,
209 water = 10,
210
211=== modified file 'data/maps/The_Green_Plateau.wmf/scripting/initial_conditions.lua'
212--- data/maps/The_Green_Plateau.wmf/scripting/initial_conditions.lua 2016-03-21 19:29:24 +0000
213+++ data/maps/The_Green_Plateau.wmf/scripting/initial_conditions.lua 2019-05-19 12:37:52 +0000
214@@ -26,7 +26,7 @@
215 scythe = 6,
216 shovel = 4,
217 snack = 3,
218- thatch_reed = 24,
219+ reed = 24,
220 ax = 6,
221 },
222 workers = {
223@@ -159,7 +159,7 @@
224 pick = 14,
225 scythe = 6,
226 shovel = 4,
227- thatch_reed = 24,
228+ reed = 24,
229 log = 200,
230 },
231 workers = {
232
233=== modified file 'data/maps/Trident_of_Fire.wmf/scripting/initial_conditions.lua'
234--- data/maps/Trident_of_Fire.wmf/scripting/initial_conditions.lua 2016-11-01 13:58:24 +0000
235+++ data/maps/Trident_of_Fire.wmf/scripting/initial_conditions.lua 2019-05-19 12:37:52 +0000
236@@ -128,7 +128,7 @@
237 scythe = 6,
238 shovel = 4,
239 snack = 3,
240- thatch_reed = 24,
241+ reed = 24,
242 log = 150,
243 },
244 workers = {
245
246=== modified file 'data/tribes/barbarians.lua'
247--- data/tribes/barbarians.lua 2018-07-29 13:49:09 +0000
248+++ data/tribes/barbarians.lua 2019-05-19 12:37:52 +0000
249@@ -61,7 +61,7 @@
250 "log",
251 "blackwood",
252 "grout",
253- "thatch_reed",
254+ "reed",
255 "cloth"
256 },
257 {
258@@ -171,15 +171,15 @@
259 immovables = {
260 "ashes",
261 "destroyed_building",
262- "field_tiny",
263- "field_small",
264- "field_medium",
265- "field_ripe",
266- "field_harvested",
267- "reed_tiny",
268- "reed_small",
269- "reed_medium",
270- "reed_ripe",
271+ "wheatfield_tiny",
272+ "wheatfield_small",
273+ "wheatfield_medium",
274+ "wheatfield_ripe",
275+ "wheatfield_harvested",
276+ "reedfield_tiny",
277+ "reedfield_small",
278+ "reedfield_medium",
279+ "reedfield_ripe",
280 "barbarians_resi_none",
281 "barbarians_resi_water",
282 "barbarians_resi_coal_1",
283
284=== modified file 'data/tribes/buildings/militarysites/frisians/fortress/init.lua'
285--- data/tribes/buildings/militarysites/frisians/fortress/init.lua 2018-09-01 13:24:52 +0000
286+++ data/tribes/buildings/militarysites/frisians/fortress/init.lua 2019-05-19 12:37:52 +0000
287@@ -13,13 +13,13 @@
288 brick = 10,
289 granite = 4,
290 log = 3,
291- thatch_reed = 5
292+ reed = 5
293 },
294 return_on_dismantle = {
295 brick = 5,
296 granite = 2,
297 log = 2,
298- thatch_reed = 2
299+ reed = 2
300 },
301
302 animations = {
303
304=== modified file 'data/tribes/buildings/militarysites/frisians/outpost/init.lua'
305--- data/tribes/buildings/militarysites/frisians/outpost/init.lua 2018-07-12 19:37:48 +0000
306+++ data/tribes/buildings/militarysites/frisians/outpost/init.lua 2019-05-19 12:37:52 +0000
307@@ -13,12 +13,12 @@
308 brick = 5,
309 granite = 1,
310 log = 1,
311- thatch_reed = 2
312+ reed = 2
313 },
314 return_on_dismantle = {
315 brick = 2,
316 log = 1,
317- thatch_reed = 1
318+ reed = 1
319 },
320
321 animations = {
322
323=== modified file 'data/tribes/buildings/militarysites/frisians/sentinel/init.lua'
324--- data/tribes/buildings/militarysites/frisians/sentinel/init.lua 2018-10-18 09:09:06 +0000
325+++ data/tribes/buildings/militarysites/frisians/sentinel/init.lua 2019-05-19 12:37:52 +0000
326@@ -13,7 +13,7 @@
327 buildcost = {
328 brick = 1,
329 log = 1,
330- thatch_reed = 1
331+ reed = 1
332 },
333 return_on_dismantle = {
334 brick = 1,
335
336=== modified file 'data/tribes/buildings/militarysites/frisians/tower/init.lua'
337--- data/tribes/buildings/militarysites/frisians/tower/init.lua 2018-09-01 13:24:52 +0000
338+++ data/tribes/buildings/militarysites/frisians/tower/init.lua 2019-05-19 12:37:52 +0000
339@@ -14,13 +14,13 @@
340 brick = 6,
341 granite = 2,
342 log = 4,
343- thatch_reed = 3
344+ reed = 3
345 },
346 return_on_dismantle = {
347 brick = 3,
348 granite = 1,
349 log = 2,
350- thatch_reed = 1
351+ reed = 1
352
353 },
354 animations = {
355
356=== modified file 'data/tribes/buildings/militarysites/frisians/wooden_tower/init.lua'
357--- data/tribes/buildings/militarysites/frisians/wooden_tower/init.lua 2018-07-15 10:41:10 +0000
358+++ data/tribes/buildings/militarysites/frisians/wooden_tower/init.lua 2019-05-19 12:37:52 +0000
359@@ -13,7 +13,7 @@
360
361 buildcost = {
362 log = 3,
363- thatch_reed = 1
364+ reed = 1
365 },
366 return_on_dismantle = {
367 log = 2
368
369=== modified file 'data/tribes/buildings/militarysites/frisians/wooden_tower_high/init.lua'
370--- data/tribes/buildings/militarysites/frisians/wooden_tower_high/init.lua 2018-07-15 10:41:10 +0000
371+++ data/tribes/buildings/militarysites/frisians/wooden_tower_high/init.lua 2019-05-19 12:37:52 +0000
372@@ -12,7 +12,7 @@
373
374 enhancement_cost = {
375 log = 2,
376- thatch_reed = 1
377+ reed = 1
378 },
379 return_on_dismantle_on_enhanced = {
380 log = 1,
381
382=== modified file 'data/tribes/buildings/productionsites/barbarians/ax_workshop/init.lua'
383--- data/tribes/buildings/productionsites/barbarians/ax_workshop/init.lua 2019-03-17 07:20:58 +0000
384+++ data/tribes/buildings/productionsites/barbarians/ax_workshop/init.lua 2019-05-19 12:37:52 +0000
385@@ -15,7 +15,7 @@
386 blackwood = 1,
387 granite = 2,
388 grout = 1,
389- thatch_reed = 1
390+ reed = 1
391 },
392 return_on_dismantle_on_enhanced = {
393 blackwood = 1,
394
395=== modified file 'data/tribes/buildings/productionsites/barbarians/bakery/init.lua'
396--- data/tribes/buildings/productionsites/barbarians/bakery/init.lua 2017-09-03 07:59:51 +0000
397+++ data/tribes/buildings/productionsites/barbarians/bakery/init.lua 2019-05-19 12:37:52 +0000
398@@ -13,7 +13,7 @@
399 log = 2,
400 blackwood = 2,
401 granite = 2,
402- thatch_reed = 2
403+ reed = 2
404 },
405 return_on_dismantle = {
406 log = 1,
407
408=== modified file 'data/tribes/buildings/productionsites/barbarians/barracks/init.lua'
409--- data/tribes/buildings/productionsites/barbarians/barracks/init.lua 2019-05-04 23:13:31 +0000
410+++ data/tribes/buildings/productionsites/barbarians/barracks/init.lua 2019-05-19 12:37:52 +0000
411@@ -13,7 +13,7 @@
412 log = 4,
413 granite = 2,
414 grout = 4,
415- thatch_reed = 1
416+ reed = 1
417 },
418 return_on_dismantle = {
419 log = 2,
420
421=== modified file 'data/tribes/buildings/productionsites/barbarians/big_inn/init.lua'
422--- data/tribes/buildings/productionsites/barbarians/big_inn/init.lua 2019-03-17 07:20:58 +0000
423+++ data/tribes/buildings/productionsites/barbarians/big_inn/init.lua 2019-05-19 12:37:52 +0000
424@@ -12,7 +12,7 @@
425 enhancement_cost = {
426 log = 1,
427 grout = 3,
428- thatch_reed = 2
429+ reed = 2
430 },
431 return_on_dismantle_on_enhanced = {
432 grout = 2
433
434=== modified file 'data/tribes/buildings/productionsites/barbarians/brewery/init.lua'
435--- data/tribes/buildings/productionsites/barbarians/brewery/init.lua 2017-09-03 07:59:51 +0000
436+++ data/tribes/buildings/productionsites/barbarians/brewery/init.lua 2019-05-19 12:37:52 +0000
437@@ -12,7 +12,7 @@
438 enhancement_cost = {
439 log = 3,
440 granite = 1,
441- thatch_reed = 1
442+ reed = 1
443 },
444 return_on_dismantle_on_enhanced = {
445 log = 1,
446
447=== modified file 'data/tribes/buildings/productionsites/barbarians/charcoal_kiln/init.lua'
448--- data/tribes/buildings/productionsites/barbarians/charcoal_kiln/init.lua 2017-09-03 07:59:51 +0000
449+++ data/tribes/buildings/productionsites/barbarians/charcoal_kiln/init.lua 2019-05-19 12:37:52 +0000
450@@ -12,7 +12,7 @@
451 buildcost = {
452 log = 3,
453 grout = 2,
454- thatch_reed = 2
455+ reed = 2
456 },
457 return_on_dismantle = {
458 log = 2,
459
460=== modified file 'data/tribes/buildings/productionsites/barbarians/helmsmithy/init.lua'
461--- data/tribes/buildings/productionsites/barbarians/helmsmithy/init.lua 2018-09-10 12:32:56 +0000
462+++ data/tribes/buildings/productionsites/barbarians/helmsmithy/init.lua 2019-05-19 12:37:52 +0000
463@@ -14,13 +14,13 @@
464 blackwood = 1,
465 granite = 2,
466 grout = 2,
467- thatch_reed = 3
468+ reed = 3
469 },
470 return_on_dismantle = {
471 log = 1,
472 granite = 2,
473 grout = 1,
474- thatch_reed = 1
475+ reed = 1
476 },
477
478 animations = {
479
480=== modified file 'data/tribes/buildings/productionsites/barbarians/inn/init.lua'
481--- data/tribes/buildings/productionsites/barbarians/inn/init.lua 2019-03-17 07:20:58 +0000
482+++ data/tribes/buildings/productionsites/barbarians/inn/init.lua 2019-05-19 12:37:52 +0000
483@@ -13,7 +13,7 @@
484 enhancement_cost = {
485 log = 2,
486 grout = 2,
487- thatch_reed = 1
488+ reed = 1
489 },
490 return_on_dismantle_on_enhanced = {
491 log = 1,
492
493=== modified file 'data/tribes/buildings/productionsites/barbarians/metal_workshop/init.lua'
494--- data/tribes/buildings/productionsites/barbarians/metal_workshop/init.lua 2019-03-17 07:20:58 +0000
495+++ data/tribes/buildings/productionsites/barbarians/metal_workshop/init.lua 2019-05-19 12:37:52 +0000
496@@ -15,7 +15,7 @@
497 blackwood = 1,
498 granite = 2,
499 grout = 1,
500- thatch_reed = 1
501+ reed = 1
502 },
503 return_on_dismantle = {
504 blackwood = 1,
505
506=== modified file 'data/tribes/buildings/productionsites/barbarians/micro_brewery/init.lua'
507--- data/tribes/buildings/productionsites/barbarians/micro_brewery/init.lua 2017-09-03 07:59:51 +0000
508+++ data/tribes/buildings/productionsites/barbarians/micro_brewery/init.lua 2019-05-19 12:37:52 +0000
509@@ -14,7 +14,7 @@
510 log = 3,
511 blackwood = 2,
512 granite = 3,
513- thatch_reed = 2
514+ reed = 2
515 },
516 return_on_dismantle = {
517 log = 1,
518
519=== modified file 'data/tribes/buildings/productionsites/barbarians/reed_yard/helptexts.lua'
520--- data/tribes/buildings/productionsites/barbarians/reed_yard/helptexts.lua 2015-11-07 08:45:50 +0000
521+++ data/tribes/buildings/productionsites/barbarians/reed_yard/helptexts.lua 2019-05-19 12:37:52 +0000
522@@ -15,10 +15,10 @@
523
524 function building_helptext_note()
525 -- TRANSLATORS: Note helptext for a building
526- 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.")
527+ 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.")
528 end
529
530 function building_helptext_performance()
531 -- TRANSLATORS: Performance helptext for a building
532- 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))
533+ 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))
534 end
535
536=== modified file 'data/tribes/buildings/productionsites/barbarians/reed_yard/init.lua'
537--- data/tribes/buildings/productionsites/barbarians/reed_yard/init.lua 2018-09-06 08:21:35 +0000
538+++ data/tribes/buildings/productionsites/barbarians/reed_yard/init.lua 2019-05-19 12:37:52 +0000
539@@ -35,7 +35,7 @@
540 },
541
542 outputs = {
543- "thatch_reed"
544+ "reed"
545 },
546
547 programs = {
548
549=== modified file 'data/tribes/buildings/productionsites/barbarians/smelting_works/init.lua'
550--- data/tribes/buildings/productionsites/barbarians/smelting_works/init.lua 2019-03-17 07:20:58 +0000
551+++ data/tribes/buildings/productionsites/barbarians/smelting_works/init.lua 2019-05-19 12:37:52 +0000
552@@ -14,7 +14,7 @@
553 blackwood = 1,
554 granite = 1,
555 grout = 1,
556- thatch_reed = 2
557+ reed = 2
558 },
559 return_on_dismantle = {
560 log = 1,
561
562=== modified file 'data/tribes/buildings/productionsites/barbarians/tavern/init.lua'
563--- data/tribes/buildings/productionsites/barbarians/tavern/init.lua 2019-03-17 07:20:58 +0000
564+++ data/tribes/buildings/productionsites/barbarians/tavern/init.lua 2019-05-19 12:37:52 +0000
565@@ -14,7 +14,7 @@
566 log = 3,
567 blackwood = 2,
568 granite = 1,
569- thatch_reed = 1
570+ reed = 1
571 },
572 return_on_dismantle = {
573 log = 1,
574
575=== modified file 'data/tribes/buildings/productionsites/barbarians/warmill/init.lua'
576--- data/tribes/buildings/productionsites/barbarians/warmill/init.lua 2019-03-17 07:20:58 +0000
577+++ data/tribes/buildings/productionsites/barbarians/warmill/init.lua 2019-05-19 12:37:52 +0000
578@@ -14,7 +14,7 @@
579 blackwood = 1,
580 granite = 2,
581 grout = 1,
582- thatch_reed = 1
583+ reed = 1
584 },
585 return_on_dismantle_on_enhanced = {
586 blackwood = 1,
587
588=== modified file 'data/tribes/buildings/productionsites/barbarians/weaving_mill/helptexts.lua'
589--- data/tribes/buildings/productionsites/barbarians/weaving_mill/helptexts.lua 2019-04-19 09:05:17 +0000
590+++ data/tribes/buildings/productionsites/barbarians/weaving_mill/helptexts.lua 2019-05-19 12:37:52 +0000
591@@ -14,7 +14,7 @@
592
593 function building_helptext_purpose()
594 -- TRANSLATORS: Purpose helptext for a building
595- return pgettext("barbarians_building", "Weaves cloth out of thatch reed.")
596+ return pgettext("barbarians_building", "Weaves cloth out of reed.")
597 end
598
599 function building_helptext_note()
600
601=== modified file 'data/tribes/buildings/productionsites/barbarians/weaving_mill/init.lua'
602--- data/tribes/buildings/productionsites/barbarians/weaving_mill/init.lua 2019-03-17 07:20:58 +0000
603+++ data/tribes/buildings/productionsites/barbarians/weaving_mill/init.lua 2019-05-19 12:37:52 +0000
604@@ -13,7 +13,7 @@
605 buildcost = {
606 log = 5,
607 granite = 2,
608- thatch_reed = 2
609+ reed = 2
610 },
611 return_on_dismantle = {
612 log = 2,
613@@ -44,7 +44,7 @@
614 },
615
616 inputs = {
617- { name = "thatch_reed", amount = 8 }
618+ { name = "reed", amount = 8 }
619 },
620 outputs = {
621 "cloth"
622@@ -58,7 +58,7 @@
623 "sleep=25000",
624 "checkmap=seafaring",
625 "return=skipped unless economy needs cloth",
626- "consume=thatch_reed",
627+ "consume=reed",
628 "playsound=sound/barbarians/weaver 120",
629 "animate=working 20000",
630 "produce=cloth"
631
632=== modified file 'data/tribes/buildings/productionsites/frisians/aqua_farm/init.lua'
633--- data/tribes/buildings/productionsites/frisians/aqua_farm/init.lua 2018-10-04 07:14:23 +0000
634+++ data/tribes/buildings/productionsites/frisians/aqua_farm/init.lua 2019-05-19 12:37:52 +0000
635@@ -12,7 +12,7 @@
636 buildcost = {
637 brick = 2,
638 log = 1,
639- thatch_reed = 1
640+ reed = 1
641 },
642 return_on_dismantle = {
643 brick = 1,
644
645=== modified file 'data/tribes/buildings/productionsites/frisians/armor_smithy_large/init.lua'
646--- data/tribes/buildings/productionsites/frisians/armor_smithy_large/init.lua 2019-03-17 07:20:58 +0000
647+++ data/tribes/buildings/productionsites/frisians/armor_smithy_large/init.lua 2019-05-19 12:37:52 +0000
648@@ -13,7 +13,7 @@
649 brick = 4,
650 granite = 2,
651 log = 1,
652- thatch_reed = 1
653+ reed = 1
654 },
655 return_on_dismantle_on_enhanced = {
656 brick = 2,
657
658=== modified file 'data/tribes/buildings/productionsites/frisians/armor_smithy_small/init.lua'
659--- data/tribes/buildings/productionsites/frisians/armor_smithy_small/init.lua 2019-03-17 07:20:58 +0000
660+++ data/tribes/buildings/productionsites/frisians/armor_smithy_small/init.lua 2019-05-19 12:37:52 +0000
661@@ -14,12 +14,12 @@
662 brick = 3,
663 granite = 1,
664 log = 2,
665- thatch_reed = 2
666+ reed = 2
667 },
668 return_on_dismantle = {
669 brick = 2,
670 log = 1,
671- thatch_reed = 1
672+ reed = 1
673 },
674
675 animations = {
676
677=== modified file 'data/tribes/buildings/productionsites/frisians/bakery/init.lua'
678--- data/tribes/buildings/productionsites/frisians/bakery/init.lua 2018-07-08 17:54:33 +0000
679+++ data/tribes/buildings/productionsites/frisians/bakery/init.lua 2019-05-19 12:37:52 +0000
680@@ -14,12 +14,12 @@
681 brick = 3,
682 granite = 1,
683 log = 2,
684- thatch_reed = 2
685+ reed = 2
686 },
687 return_on_dismantle = {
688 brick = 2,
689 log = 1,
690- thatch_reed = 1
691+ reed = 1
692 },
693
694 animations = {
695
696=== modified file 'data/tribes/buildings/productionsites/frisians/barracks/init.lua'
697--- data/tribes/buildings/productionsites/frisians/barracks/init.lua 2018-07-13 11:25:10 +0000
698+++ data/tribes/buildings/productionsites/frisians/barracks/init.lua 2019-05-19 12:37:52 +0000
699@@ -13,13 +13,13 @@
700 brick = 4,
701 granite = 2,
702 log = 3,
703- thatch_reed = 2
704+ reed = 2
705 },
706 return_on_dismantle = {
707 brick = 2,
708 granite = 1,
709 log = 1,
710- thatch_reed = 1
711+ reed = 1
712 },
713
714 animations = {
715
716=== modified file 'data/tribes/buildings/productionsites/frisians/beekeepers_house/helptexts.lua'
717--- data/tribes/buildings/productionsites/frisians/beekeepers_house/helptexts.lua 2018-02-17 15:41:29 +0000
718+++ data/tribes/buildings/productionsites/frisians/beekeepers_house/helptexts.lua 2019-05-19 12:37:52 +0000
719@@ -15,7 +15,7 @@
720
721 function building_helptext_note()
722 -- TRANSLATORS: Note helptext for a building
723- return "Needs medium-sized fields (barley, wheat, corn or blackroot) or bushes (berry bushes, thatch reed or grapevines) nearby."
724+ return "Needs medium-sized fields (barley, wheat, reed, corn or blackroot) or bushes (berry bushes or grapevines) nearby."
725 end
726
727 function building_helptext_performance()
728
729=== modified file 'data/tribes/buildings/productionsites/frisians/beekeepers_house/init.lua'
730--- data/tribes/buildings/productionsites/frisians/beekeepers_house/init.lua 2018-07-17 10:13:49 +0000
731+++ data/tribes/buildings/productionsites/frisians/beekeepers_house/init.lua 2019-05-19 12:37:52 +0000
732@@ -12,11 +12,11 @@
733 buildcost = {
734 brick = 1,
735 log = 1,
736- thatch_reed = 3
737+ reed = 3
738 },
739 return_on_dismantle = {
740 brick = 1,
741- thatch_reed = 1
742+ reed = 1
743 },
744
745 animations = {
746
747=== modified file 'data/tribes/buildings/productionsites/frisians/berry_farm/init.lua'
748--- data/tribes/buildings/productionsites/frisians/berry_farm/init.lua 2018-07-17 10:13:49 +0000
749+++ data/tribes/buildings/productionsites/frisians/berry_farm/init.lua 2019-05-19 12:37:52 +0000
750@@ -12,7 +12,7 @@
751 buildcost = {
752 brick = 1,
753 log = 2,
754- thatch_reed = 1
755+ reed = 1
756 },
757 return_on_dismantle = {
758 brick = 1,
759
760=== modified file 'data/tribes/buildings/productionsites/frisians/blacksmithy/init.lua'
761--- data/tribes/buildings/productionsites/frisians/blacksmithy/init.lua 2018-09-10 12:32:56 +0000
762+++ data/tribes/buildings/productionsites/frisians/blacksmithy/init.lua 2019-05-19 12:37:52 +0000
763@@ -13,12 +13,12 @@
764 brick = 2,
765 granite = 1,
766 log = 1,
767- thatch_reed = 2
768+ reed = 2
769 },
770 return_on_dismantle = {
771 brick = 1,
772 granite = 1,
773- thatch_reed = 1
774+ reed = 1
775 },
776
777 animations = {
778@@ -52,7 +52,7 @@
779 inputs = {
780 { name = "iron", amount = 7 },
781 { name = "log", amount = 7 },
782- { name = "thatch_reed", amount = 7 }
783+ { name = "reed", amount = 7 }
784 },
785 outputs = {
786 "felling_ax",
787@@ -138,7 +138,7 @@
788 descname = _"making a basket",
789 actions = {
790 "return=skipped unless economy needs basket",
791- "consume=thatch_reed log",
792+ "consume=reed log",
793 "sleep=32000",
794 "animate=working 35000",
795 "produce=basket"
796@@ -160,7 +160,7 @@
797 descname = _"making a fishing net",
798 actions = {
799 "return=skipped unless economy needs fishing_net",
800- "consume=thatch_reed:2",
801+ "consume=reed:2",
802 "sleep=32000",
803 "animate=working 35000",
804 "produce=fishing_net"
805
806=== modified file 'data/tribes/buildings/productionsites/frisians/brewery/init.lua'
807--- data/tribes/buildings/productionsites/frisians/brewery/init.lua 2018-07-08 17:54:33 +0000
808+++ data/tribes/buildings/productionsites/frisians/brewery/init.lua 2019-05-19 12:37:52 +0000
809@@ -13,12 +13,12 @@
810 buildcost = {
811 brick = 3,
812 log = 2,
813- thatch_reed = 2
814+ reed = 2
815 },
816 return_on_dismantle = {
817 brick = 2,
818 log = 1,
819- thatch_reed = 1
820+ reed = 1
821 },
822
823 animations = {
824
825=== modified file 'data/tribes/buildings/productionsites/frisians/brick_kiln/init.lua'
826--- data/tribes/buildings/productionsites/frisians/brick_kiln/init.lua 2018-07-08 17:54:33 +0000
827+++ data/tribes/buildings/productionsites/frisians/brick_kiln/init.lua 2019-05-19 12:37:52 +0000
828@@ -13,12 +13,12 @@
829 brick = 3,
830 granite = 1,
831 log = 1,
832- thatch_reed = 2
833+ reed = 2
834 },
835 return_on_dismantle = {
836 brick = 2,
837 granite = 1,
838- thatch_reed = 1
839+ reed = 1
840 },
841
842 animations = {
843
844=== modified file 'data/tribes/buildings/productionsites/frisians/charcoal_kiln/init.lua'
845--- data/tribes/buildings/productionsites/frisians/charcoal_kiln/init.lua 2018-07-08 17:54:33 +0000
846+++ data/tribes/buildings/productionsites/frisians/charcoal_kiln/init.lua 2019-05-19 12:37:52 +0000
847@@ -13,12 +13,12 @@
848 brick = 3,
849 granite = 1,
850 log = 1,
851- thatch_reed = 2
852+ reed = 2
853 },
854 return_on_dismantle = {
855 brick = 2,
856 log = 1,
857- thatch_reed = 1
858+ reed = 1
859 },
860
861 animations = {
862
863=== modified file 'data/tribes/buildings/productionsites/frisians/clay_pit/init.lua'
864--- data/tribes/buildings/productionsites/frisians/clay_pit/init.lua 2018-09-19 19:40:08 +0000
865+++ data/tribes/buildings/productionsites/frisians/clay_pit/init.lua 2019-05-19 12:37:52 +0000
866@@ -12,7 +12,7 @@
867 buildcost = {
868 brick = 1,
869 log = 1,
870- thatch_reed = 1
871+ reed = 1
872 },
873 return_on_dismantle = {
874 brick = 1
875
876=== modified file 'data/tribes/buildings/productionsites/frisians/coalmine/init.lua'
877--- data/tribes/buildings/productionsites/frisians/coalmine/init.lua 2018-09-10 12:38:30 +0000
878+++ data/tribes/buildings/productionsites/frisians/coalmine/init.lua 2019-05-19 12:37:52 +0000
879@@ -14,7 +14,7 @@
880 brick = 1,
881 granite = 2,
882 log = 2,
883- thatch_reed = 1
884+ reed = 1
885 },
886 return_on_dismantle = {
887 brick = 1,
888
889=== modified file 'data/tribes/buildings/productionsites/frisians/coalmine_deep/init.lua'
890--- data/tribes/buildings/productionsites/frisians/coalmine_deep/init.lua 2018-09-10 12:38:30 +0000
891+++ data/tribes/buildings/productionsites/frisians/coalmine_deep/init.lua 2019-05-19 12:37:52 +0000
892@@ -13,12 +13,12 @@
893 brick = 2,
894 granite = 1,
895 log = 1,
896- thatch_reed = 2
897+ reed = 2
898 },
899 return_on_dismantle_on_enhanced = {
900 brick = 1,
901 log = 1,
902- thatch_reed = 1
903+ reed = 1
904 },
905
906 animations = {
907
908=== modified file 'data/tribes/buildings/productionsites/frisians/collectors_house/init.lua'
909--- data/tribes/buildings/productionsites/frisians/collectors_house/init.lua 2018-07-17 10:13:49 +0000
910+++ data/tribes/buildings/productionsites/frisians/collectors_house/init.lua 2019-05-19 12:37:52 +0000
911@@ -12,7 +12,7 @@
912 buildcost = {
913 brick = 1,
914 log = 2,
915- thatch_reed = 1
916+ reed = 1
917 },
918 return_on_dismantle = {
919 brick = 1,
920
921=== modified file 'data/tribes/buildings/productionsites/frisians/drinking_hall/init.lua'
922--- data/tribes/buildings/productionsites/frisians/drinking_hall/init.lua 2018-09-10 12:32:56 +0000
923+++ data/tribes/buildings/productionsites/frisians/drinking_hall/init.lua 2019-05-19 12:37:52 +0000
924@@ -13,12 +13,12 @@
925 brick = 2,
926 granite = 2,
927 log = 1,
928- thatch_reed = 1
929+ reed = 1
930 },
931 return_on_dismantle_on_enhanced = {
932 brick = 1,
933 granite = 1,
934- thatch_reed = 1
935+ reed = 1
936 },
937
938 animations = {
939
940=== modified file 'data/tribes/buildings/productionsites/frisians/farm/init.lua'
941--- data/tribes/buildings/productionsites/frisians/farm/init.lua 2018-09-06 08:21:35 +0000
942+++ data/tribes/buildings/productionsites/frisians/farm/init.lua 2019-05-19 12:37:52 +0000
943@@ -13,13 +13,13 @@
944 brick = 3,
945 granite = 1,
946 log = 2,
947- thatch_reed = 3
948+ reed = 3
949 },
950 return_on_dismantle = {
951 brick = 2,
952 granite = 1,
953 log = 1,
954- thatch_reed = 1
955+ reed = 1
956 },
957
958 animations = {
959
960=== modified file 'data/tribes/buildings/productionsites/frisians/fishers_house/init.lua'
961--- data/tribes/buildings/productionsites/frisians/fishers_house/init.lua 2018-07-17 10:13:49 +0000
962+++ data/tribes/buildings/productionsites/frisians/fishers_house/init.lua 2019-05-19 12:37:52 +0000
963@@ -12,7 +12,7 @@
964 buildcost = {
965 brick = 1,
966 log = 1,
967- thatch_reed = 1
968+ reed = 1
969 },
970 return_on_dismantle = {
971 brick = 1,
972
973=== modified file 'data/tribes/buildings/productionsites/frisians/foresters_house/init.lua'
974--- data/tribes/buildings/productionsites/frisians/foresters_house/init.lua 2018-07-17 10:13:49 +0000
975+++ data/tribes/buildings/productionsites/frisians/foresters_house/init.lua 2019-05-19 12:37:52 +0000
976@@ -12,7 +12,7 @@
977 buildcost = {
978 brick = 1,
979 log = 1,
980- thatch_reed = 1
981+ reed = 1
982 },
983 return_on_dismantle = {
984 brick = 1,
985
986=== modified file 'data/tribes/buildings/productionsites/frisians/furnace/init.lua'
987--- data/tribes/buildings/productionsites/frisians/furnace/init.lua 2018-09-10 12:32:56 +0000
988+++ data/tribes/buildings/productionsites/frisians/furnace/init.lua 2019-05-19 12:37:52 +0000
989@@ -13,12 +13,12 @@
990 brick = 4,
991 granite = 2,
992 log = 1,
993- thatch_reed = 2
994+ reed = 2
995 },
996 return_on_dismantle = {
997 brick = 2,
998 log = 1,
999- thatch_reed = 1
1000+ reed = 1
1001 },
1002
1003 animations = {
1004
1005=== modified file 'data/tribes/buildings/productionsites/frisians/goldmine/init.lua'
1006--- data/tribes/buildings/productionsites/frisians/goldmine/init.lua 2018-08-20 20:24:38 +0000
1007+++ data/tribes/buildings/productionsites/frisians/goldmine/init.lua 2019-05-19 12:37:52 +0000
1008@@ -14,7 +14,7 @@
1009 brick = 1,
1010 granite = 2,
1011 log = 2,
1012- thatch_reed = 1
1013+ reed = 1
1014 },
1015 return_on_dismantle = {
1016 brick = 1,
1017
1018=== modified file 'data/tribes/buildings/productionsites/frisians/goldmine_deep/init.lua'
1019--- data/tribes/buildings/productionsites/frisians/goldmine_deep/init.lua 2018-09-10 12:38:30 +0000
1020+++ data/tribes/buildings/productionsites/frisians/goldmine_deep/init.lua 2019-05-19 12:37:52 +0000
1021@@ -13,12 +13,12 @@
1022 brick = 2,
1023 granite = 1,
1024 log = 1,
1025- thatch_reed = 2
1026+ reed = 2
1027 },
1028 return_on_dismantle_on_enhanced = {
1029 brick = 1,
1030 log = 1,
1031- thatch_reed = 1
1032+ reed = 1
1033 },
1034
1035 animations = {
1036
1037=== modified file 'data/tribes/buildings/productionsites/frisians/honey_bread_bakery/init.lua'
1038--- data/tribes/buildings/productionsites/frisians/honey_bread_bakery/init.lua 2018-09-10 12:32:56 +0000
1039+++ data/tribes/buildings/productionsites/frisians/honey_bread_bakery/init.lua 2019-05-19 12:37:52 +0000
1040@@ -13,13 +13,13 @@
1041 brick = 3,
1042 log = 3,
1043 granite = 1,
1044- thatch_reed = 1
1045+ reed = 1
1046 },
1047 return_on_dismantle_on_enhanced = {
1048 brick = 2,
1049 granite = 1,
1050 log = 1,
1051- thatch_reed = 2
1052+ reed = 2
1053 },
1054
1055 animations = {
1056
1057=== modified file 'data/tribes/buildings/productionsites/frisians/hunters_house/init.lua'
1058--- data/tribes/buildings/productionsites/frisians/hunters_house/init.lua 2018-09-16 13:19:53 +0000
1059+++ data/tribes/buildings/productionsites/frisians/hunters_house/init.lua 2019-05-19 12:37:52 +0000
1060@@ -12,7 +12,7 @@
1061 buildcost = {
1062 brick = 1,
1063 log = 1,
1064- thatch_reed = 1
1065+ reed = 1
1066 },
1067 return_on_dismantle = {
1068 brick = 1,
1069
1070=== modified file 'data/tribes/buildings/productionsites/frisians/ironmine/init.lua'
1071--- data/tribes/buildings/productionsites/frisians/ironmine/init.lua 2018-08-20 20:24:38 +0000
1072+++ data/tribes/buildings/productionsites/frisians/ironmine/init.lua 2019-05-19 12:37:52 +0000
1073@@ -14,7 +14,7 @@
1074 brick = 1,
1075 granite = 2,
1076 log = 2,
1077- thatch_reed = 1
1078+ reed = 1
1079 },
1080 return_on_dismantle = {
1081 brick = 1,
1082
1083=== modified file 'data/tribes/buildings/productionsites/frisians/ironmine_deep/init.lua'
1084--- data/tribes/buildings/productionsites/frisians/ironmine_deep/init.lua 2018-09-10 12:38:30 +0000
1085+++ data/tribes/buildings/productionsites/frisians/ironmine_deep/init.lua 2019-05-19 12:37:52 +0000
1086@@ -13,12 +13,12 @@
1087 brick = 2,
1088 granite = 1,
1089 log = 1,
1090- thatch_reed = 2
1091+ reed = 2
1092 },
1093 return_on_dismantle_on_enhanced = {
1094 brick = 1,
1095 log = 1,
1096- thatch_reed = 1
1097+ reed = 1
1098 },
1099
1100 animations = {
1101
1102=== modified file 'data/tribes/buildings/productionsites/frisians/mead_brewery/init.lua'
1103--- data/tribes/buildings/productionsites/frisians/mead_brewery/init.lua 2018-09-10 12:32:56 +0000
1104+++ data/tribes/buildings/productionsites/frisians/mead_brewery/init.lua 2019-05-19 12:37:52 +0000
1105@@ -13,7 +13,7 @@
1106 brick = 3,
1107 granite = 2,
1108 log = 1,
1109- thatch_reed = 1
1110+ reed = 1
1111 },
1112 return_on_dismantle_on_enhanced = {
1113 brick = 2,
1114
1115=== modified file 'data/tribes/buildings/productionsites/frisians/quarry/init.lua'
1116--- data/tribes/buildings/productionsites/frisians/quarry/init.lua 2018-09-06 08:21:35 +0000
1117+++ data/tribes/buildings/productionsites/frisians/quarry/init.lua 2019-05-19 12:37:52 +0000
1118@@ -12,7 +12,7 @@
1119 buildcost = {
1120 brick = 1,
1121 log = 1,
1122- thatch_reed = 1
1123+ reed = 1
1124 },
1125 return_on_dismantle = {
1126 brick = 1,
1127
1128=== modified file 'data/tribes/buildings/productionsites/frisians/recycling_center/init.lua'
1129--- data/tribes/buildings/productionsites/frisians/recycling_center/init.lua 2018-09-19 19:40:08 +0000
1130+++ data/tribes/buildings/productionsites/frisians/recycling_center/init.lua 2019-05-19 12:37:52 +0000
1131@@ -13,13 +13,13 @@
1132 brick = 4,
1133 granite = 2,
1134 log = 2,
1135- thatch_reed = 2
1136+ reed = 2
1137 },
1138 return_on_dismantle = {
1139 brick = 2,
1140 granite = 1,
1141 log = 1,
1142- thatch_reed = 1
1143+ reed = 1
1144 },
1145
1146 animations = {
1147
1148=== modified file 'data/tribes/buildings/productionsites/frisians/reed_farm/init.lua'
1149--- data/tribes/buildings/productionsites/frisians/reed_farm/init.lua 2018-09-06 08:21:35 +0000
1150+++ data/tribes/buildings/productionsites/frisians/reed_farm/init.lua 2019-05-19 12:37:52 +0000
1151@@ -13,7 +13,7 @@
1152 brick = 2,
1153 --granite = 1,
1154 log = 1,
1155- thatch_reed = 1
1156+ reed = 1
1157 },
1158 return_on_dismantle = {
1159 brick = 1,
1160@@ -44,7 +44,7 @@
1161 },
1162
1163 outputs = {
1164- "thatch_reed"
1165+ "reed"
1166 },
1167
1168 programs = {
1169
1170=== modified file 'data/tribes/buildings/productionsites/frisians/reindeer_farm/init.lua'
1171--- data/tribes/buildings/productionsites/frisians/reindeer_farm/init.lua 2018-09-06 08:24:16 +0000
1172+++ data/tribes/buildings/productionsites/frisians/reindeer_farm/init.lua 2019-05-19 12:37:52 +0000
1173@@ -13,13 +13,13 @@
1174 brick = 2,
1175 granite = 1,
1176 log = 3,
1177- thatch_reed = 2
1178+ reed = 2
1179 },
1180 return_on_dismantle = {
1181 brick = 1,
1182 granite = 1,
1183 log = 1,
1184- thatch_reed = 1
1185+ reed = 1
1186 },
1187
1188 animations = {
1189
1190=== modified file 'data/tribes/buildings/productionsites/frisians/rockmine/init.lua'
1191--- data/tribes/buildings/productionsites/frisians/rockmine/init.lua 2018-09-10 12:38:30 +0000
1192+++ data/tribes/buildings/productionsites/frisians/rockmine/init.lua 2019-05-19 12:37:52 +0000
1193@@ -14,7 +14,7 @@
1194 brick = 1,
1195 granite = 2,
1196 log = 2,
1197- thatch_reed = 1
1198+ reed = 1
1199 },
1200 return_on_dismantle = {
1201 brick = 1,
1202
1203=== modified file 'data/tribes/buildings/productionsites/frisians/rockmine_deep/init.lua'
1204--- data/tribes/buildings/productionsites/frisians/rockmine_deep/init.lua 2018-09-10 12:38:30 +0000
1205+++ data/tribes/buildings/productionsites/frisians/rockmine_deep/init.lua 2019-05-19 12:37:52 +0000
1206@@ -13,12 +13,12 @@
1207 brick = 2,
1208 granite = 1,
1209 log = 1,
1210- thatch_reed = 2
1211+ reed = 2
1212 },
1213 return_on_dismantle_on_enhanced = {
1214 brick = 1,
1215 log = 1,
1216- thatch_reed = 1
1217+ reed = 1
1218 },
1219
1220 animations = {
1221
1222=== modified file 'data/tribes/buildings/productionsites/frisians/scouts_house/init.lua'
1223--- data/tribes/buildings/productionsites/frisians/scouts_house/init.lua 2018-07-17 10:13:49 +0000
1224+++ data/tribes/buildings/productionsites/frisians/scouts_house/init.lua 2019-05-19 12:37:52 +0000
1225@@ -12,7 +12,7 @@
1226 buildcost = {
1227 granite = 1,
1228 log = 1,
1229- thatch_reed = 1
1230+ reed = 1
1231 },
1232 return_on_dismantle = {
1233 granite = 1,
1234
1235=== modified file 'data/tribes/buildings/productionsites/frisians/sewing_room/init.lua'
1236--- data/tribes/buildings/productionsites/frisians/sewing_room/init.lua 2018-07-25 19:54:53 +0000
1237+++ data/tribes/buildings/productionsites/frisians/sewing_room/init.lua 2019-05-19 12:37:52 +0000
1238@@ -14,7 +14,7 @@
1239 brick = 3,
1240 granite = 1,
1241 log = 1,
1242- thatch_reed = 1
1243+ reed = 1
1244 },
1245 return_on_dismantle = {
1246 brick = 2,
1247
1248=== modified file 'data/tribes/buildings/productionsites/frisians/shipyard/init.lua'
1249--- data/tribes/buildings/productionsites/frisians/shipyard/init.lua 2018-09-06 09:33:03 +0000
1250+++ data/tribes/buildings/productionsites/frisians/shipyard/init.lua 2019-05-19 12:37:52 +0000
1251@@ -14,13 +14,13 @@
1252 brick = 3,
1253 granite = 1,
1254 log = 3,
1255- thatch_reed = 2,
1256+ reed = 2,
1257 cloth = 1
1258 },
1259 return_on_dismantle = {
1260 brick = 2,
1261 log = 2,
1262- thatch_reed = 1
1263+ reed = 1
1264 },
1265
1266 animations = {
1267
1268=== modified file 'data/tribes/buildings/productionsites/frisians/smokery/init.lua'
1269--- data/tribes/buildings/productionsites/frisians/smokery/init.lua 2018-09-10 12:32:56 +0000
1270+++ data/tribes/buildings/productionsites/frisians/smokery/init.lua 2019-05-19 12:37:52 +0000
1271@@ -12,12 +12,12 @@
1272 buildcost = {
1273 brick = 4,
1274 log = 1,
1275- thatch_reed = 2
1276+ reed = 2
1277 },
1278 return_on_dismantle = {
1279 brick = 2,
1280 log = 1,
1281- thatch_reed = 1
1282+ reed = 1
1283 },
1284
1285 animations = {
1286
1287=== modified file 'data/tribes/buildings/productionsites/frisians/tailors_shop/init.lua'
1288--- data/tribes/buildings/productionsites/frisians/tailors_shop/init.lua 2018-09-10 12:32:56 +0000
1289+++ data/tribes/buildings/productionsites/frisians/tailors_shop/init.lua 2019-05-19 12:37:52 +0000
1290@@ -13,7 +13,7 @@
1291 brick = 1,
1292 granite = 2,
1293 log = 2,
1294- thatch_reed = 1
1295+ reed = 1
1296 },
1297 return_on_dismantle_on_enhanced = {
1298 granite = 1,
1299
1300=== modified file 'data/tribes/buildings/productionsites/frisians/tavern/init.lua'
1301--- data/tribes/buildings/productionsites/frisians/tavern/init.lua 2018-10-01 09:15:22 +0000
1302+++ data/tribes/buildings/productionsites/frisians/tavern/init.lua 2019-05-19 12:37:52 +0000
1303@@ -13,12 +13,12 @@
1304 buildcost = {
1305 brick = 3,
1306 log = 2,
1307- thatch_reed = 2
1308+ reed = 2
1309 },
1310 return_on_dismantle = {
1311 brick = 2,
1312 log = 1,
1313- thatch_reed = 1
1314+ reed = 1
1315 },
1316
1317 animations = {
1318
1319=== modified file 'data/tribes/buildings/productionsites/frisians/weaving_mill/init.lua'
1320--- data/tribes/buildings/productionsites/frisians/weaving_mill/init.lua 2018-07-08 17:54:33 +0000
1321+++ data/tribes/buildings/productionsites/frisians/weaving_mill/init.lua 2019-05-19 12:37:52 +0000
1322@@ -14,13 +14,13 @@
1323 brick = 4,
1324 granite = 2,
1325 log = 3,
1326- thatch_reed = 2
1327+ reed = 2
1328 },
1329 return_on_dismantle = {
1330 brick = 2,
1331 granite = 1,
1332 log = 1,
1333- thatch_reed = 1
1334+ reed = 1
1335 },
1336
1337 animations = {
1338@@ -50,7 +50,7 @@
1339
1340 inputs = {
1341 { name = "fur", amount = 6 },
1342- { name = "thatch_reed", amount = 6 },
1343+ { name = "reed", amount = 6 },
1344 },
1345 outputs = {
1346 "cloth",
1347@@ -63,7 +63,7 @@
1348 actions = {
1349 "sleep=25000",
1350 "return=skipped unless economy needs cloth",
1351- "consume=fur thatch_reed",
1352+ "consume=fur reed",
1353 "animate=working 20000",
1354 "produce=cloth"
1355 },
1356
1357=== modified file 'data/tribes/buildings/productionsites/frisians/woodcutters_house/init.lua'
1358--- data/tribes/buildings/productionsites/frisians/woodcutters_house/init.lua 2018-07-17 10:13:49 +0000
1359+++ data/tribes/buildings/productionsites/frisians/woodcutters_house/init.lua 2019-05-19 12:37:52 +0000
1360@@ -12,7 +12,7 @@
1361 buildcost = {
1362 brick = 1,
1363 log = 1,
1364- thatch_reed = 1
1365+ reed = 1
1366 },
1367 return_on_dismantle = {
1368 log = 1,
1369
1370=== modified file 'data/tribes/buildings/trainingsites/barbarians/battlearena/init.lua'
1371--- data/tribes/buildings/trainingsites/barbarians/battlearena/init.lua 2018-07-25 19:54:53 +0000
1372+++ data/tribes/buildings/trainingsites/barbarians/battlearena/init.lua 2019-05-19 12:37:52 +0000
1373@@ -14,14 +14,14 @@
1374 granite = 4,
1375 grout = 6,
1376 gold = 4,
1377- thatch_reed = 3
1378+ reed = 3
1379 },
1380 return_on_dismantle = {
1381 log = 3,
1382 granite = 3,
1383 grout = 3,
1384 gold = 2,
1385- thatch_reed = 1
1386+ reed = 1
1387 },
1388
1389 animations = {
1390
1391=== modified file 'data/tribes/buildings/trainingsites/barbarians/trainingcamp/init.lua'
1392--- data/tribes/buildings/trainingsites/barbarians/trainingcamp/init.lua 2017-11-18 21:23:09 +0000
1393+++ data/tribes/buildings/trainingsites/barbarians/trainingcamp/init.lua 2019-05-19 12:37:52 +0000
1394@@ -14,7 +14,7 @@
1395 granite = 4,
1396 grout = 6,
1397 gold = 4,
1398- thatch_reed = 3
1399+ reed = 3
1400 },
1401 return_on_dismantle = {
1402 log = 3,
1403
1404=== modified file 'data/tribes/buildings/trainingsites/frisians/training_arena/init.lua'
1405--- data/tribes/buildings/trainingsites/frisians/training_arena/init.lua 2018-10-04 07:14:23 +0000
1406+++ data/tribes/buildings/trainingsites/frisians/training_arena/init.lua 2019-05-19 12:37:52 +0000
1407@@ -14,14 +14,14 @@
1408 granite = 3,
1409 log = 4,
1410 gold = 3,
1411- thatch_reed = 4
1412+ reed = 4
1413 },
1414 return_on_dismantle = {
1415 brick = 3,
1416 granite = 2,
1417 log = 2,
1418 gold = 1,
1419- thatch_reed = 1
1420+ reed = 1
1421 },
1422
1423 animations = {
1424
1425=== modified file 'data/tribes/buildings/trainingsites/frisians/training_camp/init.lua'
1426--- data/tribes/buildings/trainingsites/frisians/training_camp/init.lua 2018-10-01 09:15:22 +0000
1427+++ data/tribes/buildings/trainingsites/frisians/training_camp/init.lua 2019-05-19 12:37:52 +0000
1428@@ -14,14 +14,14 @@
1429 granite = 3,
1430 log = 3,
1431 gold = 1,
1432- thatch_reed = 3
1433+ reed = 3
1434 },
1435 return_on_dismantle = {
1436 brick = 3,
1437 granite = 1,
1438 log = 1,
1439 gold = 1,
1440- thatch_reed = 1
1441+ reed = 1
1442 },
1443
1444 animations = {
1445
1446=== modified file 'data/tribes/buildings/warehouses/barbarians/port/init.lua'
1447--- data/tribes/buildings/warehouses/barbarians/port/init.lua 2018-04-07 08:53:42 +0000
1448+++ data/tribes/buildings/warehouses/barbarians/port/init.lua 2019-05-19 12:37:52 +0000
1449@@ -16,7 +16,7 @@
1450 granite = 5,
1451 grout = 2,
1452 iron = 2,
1453- thatch_reed = 4,
1454+ reed = 4,
1455 gold = 2
1456 },
1457 return_on_dismantle = {
1458@@ -25,7 +25,7 @@
1459 granite = 3,
1460 grout = 1,
1461 iron = 1,
1462- thatch_reed = 1,
1463+ reed = 1,
1464 gold = 1
1465 },
1466
1467
1468=== modified file 'data/tribes/buildings/warehouses/barbarians/warehouse/init.lua'
1469--- data/tribes/buildings/warehouses/barbarians/warehouse/init.lua 2018-07-08 16:00:20 +0000
1470+++ data/tribes/buildings/warehouses/barbarians/warehouse/init.lua 2019-05-19 12:37:52 +0000
1471@@ -18,7 +18,7 @@
1472 blackwood = 2,
1473 granite = 2,
1474 grout = 3,
1475- thatch_reed = 1
1476+ reed = 1
1477 },
1478 return_on_dismantle = {
1479 log = 1,
1480
1481=== modified file 'data/tribes/buildings/warehouses/frisians/port/init.lua'
1482--- data/tribes/buildings/warehouses/frisians/port/init.lua 2018-09-01 13:24:52 +0000
1483+++ data/tribes/buildings/warehouses/frisians/port/init.lua 2019-05-19 12:37:52 +0000
1484@@ -16,7 +16,7 @@
1485 log = 6,
1486 cloth = 2,
1487 gold = 2,
1488- thatch_reed = 4
1489+ reed = 4
1490 },
1491 return_on_dismantle = {
1492 brick = 3,
1493@@ -24,7 +24,7 @@
1494 log = 3,
1495 gold = 1,
1496 cloth = 1,
1497- thatch_reed = 2
1498+ reed = 2
1499 },
1500
1501 animations = {
1502
1503=== modified file 'data/tribes/buildings/warehouses/frisians/warehouse/init.lua'
1504--- data/tribes/buildings/warehouses/frisians/warehouse/init.lua 2018-07-14 13:46:55 +0000
1505+++ data/tribes/buildings/warehouses/frisians/warehouse/init.lua 2019-05-19 12:37:52 +0000
1506@@ -13,13 +13,13 @@
1507 brick = 5,
1508 granite = 2,
1509 log = 2,
1510- thatch_reed = 3
1511+ reed = 3
1512 },
1513 return_on_dismantle = {
1514 brick = 3,
1515 granite = 1,
1516 log = 1,
1517- thatch_reed = 1
1518+ reed = 1
1519 },
1520
1521 animations = {
1522
1523=== modified file 'data/tribes/empire.lua'
1524--- data/tribes/empire.lua 2018-07-29 13:49:09 +0000
1525+++ data/tribes/empire.lua 2019-05-19 12:37:52 +0000
1526@@ -179,11 +179,11 @@
1527 immovables = {
1528 "ashes",
1529 "destroyed_building",
1530- "field_tiny",
1531- "field_small",
1532- "field_medium",
1533- "field_ripe",
1534- "field_harvested",
1535+ "wheatfield_tiny",
1536+ "wheatfield_small",
1537+ "wheatfield_medium",
1538+ "wheatfield_ripe",
1539+ "wheatfield_harvested",
1540 "grapevine_tiny",
1541 "grapevine_small",
1542 "grapevine_medium",
1543
1544=== modified file 'data/tribes/frisians.lua'
1545--- data/tribes/frisians.lua 2019-02-28 11:03:51 +0000
1546+++ data/tribes/frisians.lua 2019-05-19 12:37:52 +0000
1547@@ -61,7 +61,7 @@
1548 "granite",
1549 "clay",
1550 "brick",
1551- "thatch_reed",
1552+ "reed",
1553 "fur",
1554 "cloth"
1555 },
1556@@ -221,10 +221,10 @@
1557 "pond_dry",
1558 "pond_growing",
1559 "pond_mature",
1560- "reed_tiny",
1561- "reed_small",
1562- "reed_medium",
1563- "reed_ripe",
1564+ "reedfield_tiny",
1565+ "reedfield_small",
1566+ "reedfield_medium",
1567+ "reedfield_ripe",
1568 "frisians_resi_none",
1569 "frisians_resi_water",
1570 "frisians_resi_coal_1",
1571@@ -237,7 +237,7 @@
1572 "frisians_resi_stones_2",
1573 "frisians_shipconstruction",
1574 -- These non-frisian immovables can be used by bee-keepers
1575- "field_medium",
1576+ "wheatfield_medium",
1577 "cornfield_medium",
1578 "blackrootfield_medium",
1579 "grapevine_medium",
1580
1581=== added directory 'data/tribes/immovables/barleyfield'
1582=== renamed directory 'data/tribes/immovables/barleyfield_harvested' => 'data/tribes/immovables/barleyfield/harvested'
1583=== renamed directory 'data/tribes/immovables/barleyfield_medium' => 'data/tribes/immovables/barleyfield/medium'
1584=== renamed directory 'data/tribes/immovables/barleyfield_ripe' => 'data/tribes/immovables/barleyfield/ripe'
1585=== renamed directory 'data/tribes/immovables/barleyfield_small' => 'data/tribes/immovables/barleyfield/small'
1586=== renamed directory 'data/tribes/immovables/barleyfield_tiny' => 'data/tribes/immovables/barleyfield/tiny'
1587=== added directory 'data/tribes/immovables/blackrootfield'
1588=== renamed directory 'data/tribes/immovables/blackrootfield_harvested' => 'data/tribes/immovables/blackrootfield/harvested'
1589=== renamed directory 'data/tribes/immovables/blackrootfield_medium' => 'data/tribes/immovables/blackrootfield/medium'
1590=== renamed directory 'data/tribes/immovables/blackrootfield_ripe' => 'data/tribes/immovables/blackrootfield/ripe'
1591=== renamed directory 'data/tribes/immovables/blackrootfield_small' => 'data/tribes/immovables/blackrootfield/small'
1592=== renamed directory 'data/tribes/immovables/blackrootfield_tiny' => 'data/tribes/immovables/blackrootfield/tiny'
1593=== added directory 'data/tribes/immovables/cornfield'
1594=== renamed directory 'data/tribes/immovables/cornfield_harvested' => 'data/tribes/immovables/cornfield/harvested'
1595=== renamed directory 'data/tribes/immovables/cornfield_medium' => 'data/tribes/immovables/cornfield/medium'
1596=== renamed directory 'data/tribes/immovables/cornfield_ripe' => 'data/tribes/immovables/cornfield/ripe'
1597=== renamed directory 'data/tribes/immovables/cornfield_small' => 'data/tribes/immovables/cornfield/small'
1598=== renamed directory 'data/tribes/immovables/cornfield_tiny' => 'data/tribes/immovables/cornfield/tiny'
1599=== added directory 'data/tribes/immovables/grapevine'
1600=== renamed directory 'data/tribes/immovables/grapevine_medium' => 'data/tribes/immovables/grapevine/medium'
1601=== renamed directory 'data/tribes/immovables/grapevine_ripe' => 'data/tribes/immovables/grapevine/ripe'
1602=== renamed directory 'data/tribes/immovables/grapevine_small' => 'data/tribes/immovables/grapevine/small'
1603=== renamed directory 'data/tribes/immovables/grapevine_tiny' => 'data/tribes/immovables/grapevine/tiny'
1604=== added directory 'data/tribes/immovables/pond'
1605=== renamed directory 'data/tribes/immovables/pond_dry' => 'data/tribes/immovables/pond/dry'
1606=== renamed directory 'data/tribes/immovables/pond_growing' => 'data/tribes/immovables/pond/growing'
1607=== renamed directory 'data/tribes/immovables/pond_mature' => 'data/tribes/immovables/pond/mature'
1608=== added directory 'data/tribes/immovables/reedfield'
1609=== renamed directory 'data/tribes/immovables/reed_medium' => 'data/tribes/immovables/reedfield/medium'
1610=== modified file 'data/tribes/immovables/reedfield/medium/init.lua'
1611--- data/tribes/immovables/reed_medium/init.lua 2017-11-12 19:37:34 +0000
1612+++ data/tribes/immovables/reedfield/medium/init.lua 2019-05-19 12:37:52 +0000
1613@@ -2,16 +2,16 @@
1614
1615 tribes:new_immovable_type {
1616 msgctxt = "immovable",
1617- name = "reed_medium",
1618+ name = "reedfield_medium",
1619 -- TRANSLATORS: This is an immovable name used in lists of immovables
1620- descname = pgettext("immovable", "Reed (medium)"),
1621+ descname = pgettext("immovable", "Reed Field (medium)"),
1622 helptext_script = dirname .. "helptexts.lua",
1623 size = "small",
1624 attributes = { "field", "flowering" },
1625 programs = {
1626 program = {
1627 "animate=idle 40000",
1628- "transform=reed_ripe",
1629+ "transform=reedfield_ripe",
1630 }
1631 },
1632
1633
1634=== renamed directory 'data/tribes/immovables/reed_ripe' => 'data/tribes/immovables/reedfield/ripe'
1635=== modified file 'data/tribes/immovables/reedfield/ripe/init.lua'
1636--- data/tribes/immovables/reed_ripe/init.lua 2017-11-12 16:21:28 +0000
1637+++ data/tribes/immovables/reedfield/ripe/init.lua 2019-05-19 12:37:52 +0000
1638@@ -2,9 +2,9 @@
1639
1640 tribes:new_immovable_type {
1641 msgctxt = "immovable",
1642- name = "reed_ripe",
1643+ name = "reedfield_ripe",
1644 -- TRANSLATORS: This is an immovable name used in lists of immovables
1645- descname = pgettext("immovable", "Reed (ripe)"),
1646+ descname = pgettext("immovable", "Reed Field (ripe)"),
1647 helptext_script = dirname .. "helptexts.lua",
1648 size = "small",
1649 attributes = { "ripe_reed", "field" },
1650
1651=== renamed directory 'data/tribes/immovables/reed_small' => 'data/tribes/immovables/reedfield/small'
1652=== modified file 'data/tribes/immovables/reedfield/small/init.lua'
1653--- data/tribes/immovables/reed_small/init.lua 2017-11-12 16:21:28 +0000
1654+++ data/tribes/immovables/reedfield/small/init.lua 2019-05-19 12:37:52 +0000
1655@@ -2,16 +2,16 @@
1656
1657 tribes:new_immovable_type {
1658 msgctxt = "immovable",
1659- name = "reed_small",
1660+ name = "reedfield_small",
1661 -- TRANSLATORS: This is an immovable name used in lists of immovables
1662- descname = pgettext("immovable", "Reed (small)"),
1663+ descname = pgettext("immovable", "Reed Field (small)"),
1664 helptext_script = dirname .. "helptexts.lua",
1665 size = "small",
1666 attributes = { "field" },
1667 programs = {
1668 program = {
1669 "animate=idle 28000",
1670- "transform=reed_medium",
1671+ "transform=reedfield_medium",
1672 }
1673 },
1674
1675
1676=== renamed directory 'data/tribes/immovables/reed_tiny' => 'data/tribes/immovables/reedfield/tiny'
1677=== modified file 'data/tribes/immovables/reedfield/tiny/init.lua'
1678--- data/tribes/immovables/reed_tiny/init.lua 2017-11-12 16:21:28 +0000
1679+++ data/tribes/immovables/reedfield/tiny/init.lua 2019-05-19 12:37:52 +0000
1680@@ -2,16 +2,16 @@
1681
1682 tribes:new_immovable_type {
1683 msgctxt = "immovable",
1684- name = "reed_tiny",
1685+ name = "reedfield_tiny",
1686 -- TRANSLATORS: This is an immovable name used in lists of immovables
1687- descname = pgettext("immovable", "Reed (tiny)"),
1688+ descname = pgettext("immovable", "Reed Field (tiny)"),
1689 helptext_script = dirname .. "helptexts.lua",
1690 size = "small",
1691 attributes = { "field", "seed_reed" },
1692 programs = {
1693 program = {
1694 "animate=idle 22000",
1695- "transform=reed_small",
1696+ "transform=reedfield_small",
1697 }
1698 },
1699
1700
1701=== added directory 'data/tribes/immovables/wheatfield'
1702=== renamed directory 'data/tribes/immovables/field_harvested' => 'data/tribes/immovables/wheatfield/harvested'
1703=== modified file 'data/tribes/immovables/wheatfield/harvested/init.lua'
1704--- data/tribes/immovables/field_harvested/init.lua 2018-11-15 08:52:08 +0000
1705+++ data/tribes/immovables/wheatfield/harvested/init.lua 2019-05-19 12:37:52 +0000
1706@@ -2,9 +2,9 @@
1707
1708 tribes:new_immovable_type {
1709 msgctxt = "immovable",
1710- name = "field_harvested",
1711+ name = "wheatfield_harvested",
1712 -- TRANSLATORS: This is an immovable name used in lists of immovables
1713- descname = pgettext("immovable", "Field (harvested)"),
1714+ descname = pgettext("immovable", "Wheat Field (harvested)"),
1715 helptext_script = dirname .. "helptexts.lua",
1716 attributes = { "field" },
1717 programs = {
1718
1719=== renamed directory 'data/tribes/immovables/field_medium' => 'data/tribes/immovables/wheatfield/medium'
1720=== modified file 'data/tribes/immovables/wheatfield/medium/init.lua'
1721--- data/tribes/immovables/field_medium/init.lua 2018-11-15 08:52:08 +0000
1722+++ data/tribes/immovables/wheatfield/medium/init.lua 2019-05-19 12:37:52 +0000
1723@@ -2,16 +2,16 @@
1724
1725 tribes:new_immovable_type {
1726 msgctxt = "immovable",
1727- name = "field_medium",
1728+ name = "wheatfield_medium",
1729 -- TRANSLATORS: This is an immovable name used in lists of immovables
1730- descname = pgettext("immovable", "Field (medium)"),
1731+ descname = pgettext("immovable", "Wheat Field (medium)"),
1732 helptext_script = dirname .. "helptexts.lua",
1733 size = "small",
1734 attributes = { "field", "flowering" },
1735 programs = {
1736 program = {
1737 "animate=idle 50000",
1738- "transform=field_ripe",
1739+ "transform=wheatfield_ripe",
1740 }
1741 },
1742
1743
1744=== renamed directory 'data/tribes/immovables/field_ripe' => 'data/tribes/immovables/wheatfield/ripe'
1745=== modified file 'data/tribes/immovables/wheatfield/ripe/init.lua'
1746--- data/tribes/immovables/field_ripe/init.lua 2018-11-15 08:52:08 +0000
1747+++ data/tribes/immovables/wheatfield/ripe/init.lua 2019-05-19 12:37:52 +0000
1748@@ -2,9 +2,9 @@
1749
1750 tribes:new_immovable_type {
1751 msgctxt = "immovable",
1752- name = "field_ripe",
1753+ name = "wheatfield_ripe",
1754 -- TRANSLATORS: This is an immovable name used in lists of immovables
1755- descname = pgettext("immovable", "Field (ripe)"),
1756+ descname = pgettext("immovable", "Wheat Field (ripe)"),
1757 helptext_script = dirname .. "helptexts.lua",
1758 size = "small",
1759 attributes = { "ripe_wheat", "field" },
1760@@ -14,7 +14,7 @@
1761 "remove=",
1762 },
1763 harvest = {
1764- "transform=field_harvested"
1765+ "transform=wheatfield_harvested"
1766 }
1767 },
1768
1769
1770=== renamed directory 'data/tribes/immovables/field_small' => 'data/tribes/immovables/wheatfield/small'
1771=== modified file 'data/tribes/immovables/wheatfield/small/init.lua'
1772--- data/tribes/immovables/field_small/init.lua 2018-11-15 08:52:08 +0000
1773+++ data/tribes/immovables/wheatfield/small/init.lua 2019-05-19 12:37:52 +0000
1774@@ -2,16 +2,16 @@
1775
1776 tribes:new_immovable_type {
1777 msgctxt = "immovable",
1778- name = "field_small",
1779+ name = "wheatfield_small",
1780 -- TRANSLATORS: This is an immovable name used in lists of immovables
1781- descname = pgettext("immovable", "Field (small)"),
1782+ descname = pgettext("immovable", "Wheat Field (small)"),
1783 helptext_script = dirname .. "helptexts.lua",
1784 size = "small",
1785 attributes = { "field" },
1786 programs = {
1787 program = {
1788 "animate=idle 45000",
1789- "transform=field_medium",
1790+ "transform=wheatfield_medium",
1791 }
1792 },
1793
1794
1795=== renamed directory 'data/tribes/immovables/field_tiny' => 'data/tribes/immovables/wheatfield/tiny'
1796=== modified file 'data/tribes/immovables/wheatfield/tiny/init.lua'
1797--- data/tribes/immovables/field_tiny/init.lua 2018-11-15 08:52:08 +0000
1798+++ data/tribes/immovables/wheatfield/tiny/init.lua 2019-05-19 12:37:52 +0000
1799@@ -2,9 +2,9 @@
1800
1801 tribes:new_immovable_type {
1802 msgctxt = "immovable",
1803- name = "field_tiny",
1804+ name = "wheatfield_tiny",
1805 -- TRANSLATORS: This is an immovable name used in lists of immovables
1806- descname = pgettext("immovable", "Field (tiny)"),
1807+ descname = pgettext("immovable", "Wheat Field (tiny)"),
1808 helptext_script = dirname .. "helptexts.lua",
1809 size = "small",
1810 attributes = { "field", "seed_wheat" },
1811@@ -12,7 +12,7 @@
1812 programs = {
1813 program = {
1814 "animate=idle 30000",
1815- "transform=field_small",
1816+ "transform=wheatfield_small",
1817 }
1818 },
1819
1820
1821=== modified file 'data/tribes/init.lua'
1822--- data/tribes/init.lua 2018-07-31 17:12:46 +0000
1823+++ data/tribes/init.lua 2019-05-19 12:37:52 +0000
1824@@ -133,7 +133,7 @@
1825 include "tribes/wares/spider_silk/init.lua"
1826 include "tribes/wares/tabard/init.lua"
1827 include "tribes/wares/tabard_golden/init.lua"
1828- include "tribes/wares/thatch_reed/init.lua"
1829+ include "tribes/wares/reed/init.lua"
1830 include "tribes/wares/trident_double/init.lua"
1831 include "tribes/wares/trident_heavy_double/init.lua"
1832 include "tribes/wares/trident_light/init.lua"
1833@@ -152,33 +152,33 @@
1834
1835 print_loading_message("┃ Immovables", function()
1836 include "tribes/immovables/ashes/init.lua"
1837- include "tribes/immovables/blackrootfield_harvested/init.lua"
1838- include "tribes/immovables/blackrootfield_medium/init.lua"
1839- include "tribes/immovables/blackrootfield_ripe/init.lua"
1840- include "tribes/immovables/blackrootfield_small/init.lua"
1841- include "tribes/immovables/blackrootfield_tiny/init.lua"
1842- include "tribes/immovables/cornfield_harvested/init.lua"
1843- include "tribes/immovables/cornfield_medium/init.lua"
1844- include "tribes/immovables/cornfield_ripe/init.lua"
1845- include "tribes/immovables/cornfield_small/init.lua"
1846- include "tribes/immovables/cornfield_tiny/init.lua"
1847+ include "tribes/immovables/blackrootfield/harvested/init.lua"
1848+ include "tribes/immovables/blackrootfield/medium/init.lua"
1849+ include "tribes/immovables/blackrootfield/ripe/init.lua"
1850+ include "tribes/immovables/blackrootfield/small/init.lua"
1851+ include "tribes/immovables/blackrootfield/tiny/init.lua"
1852+ include "tribes/immovables/cornfield/harvested/init.lua"
1853+ include "tribes/immovables/cornfield/medium/init.lua"
1854+ include "tribes/immovables/cornfield/ripe/init.lua"
1855+ include "tribes/immovables/cornfield/small/init.lua"
1856+ include "tribes/immovables/cornfield/tiny/init.lua"
1857 include "tribes/immovables/destroyed_building/init.lua"
1858- include "tribes/immovables/field_harvested/init.lua"
1859- include "tribes/immovables/field_medium/init.lua"
1860- include "tribes/immovables/field_ripe/init.lua"
1861- include "tribes/immovables/field_small/init.lua"
1862- include "tribes/immovables/field_tiny/init.lua"
1863- include "tribes/immovables/grapevine_medium/init.lua"
1864- include "tribes/immovables/grapevine_ripe/init.lua"
1865- include "tribes/immovables/grapevine_small/init.lua"
1866- include "tribes/immovables/grapevine_tiny/init.lua"
1867- include "tribes/immovables/pond_growing/init.lua"
1868- include "tribes/immovables/pond_mature/init.lua"
1869- include "tribes/immovables/pond_dry/init.lua"
1870- include "tribes/immovables/reed_medium/init.lua"
1871- include "tribes/immovables/reed_ripe/init.lua"
1872- include "tribes/immovables/reed_small/init.lua"
1873- include "tribes/immovables/reed_tiny/init.lua"
1874+ include "tribes/immovables/wheatfield/harvested/init.lua"
1875+ include "tribes/immovables/wheatfield/medium/init.lua"
1876+ include "tribes/immovables/wheatfield/ripe/init.lua"
1877+ include "tribes/immovables/wheatfield/small/init.lua"
1878+ include "tribes/immovables/wheatfield/tiny/init.lua"
1879+ include "tribes/immovables/grapevine/medium/init.lua"
1880+ include "tribes/immovables/grapevine/ripe/init.lua"
1881+ include "tribes/immovables/grapevine/small/init.lua"
1882+ include "tribes/immovables/grapevine/tiny/init.lua"
1883+ include "tribes/immovables/pond/growing/init.lua"
1884+ include "tribes/immovables/pond/mature/init.lua"
1885+ include "tribes/immovables/pond/dry/init.lua"
1886+ include "tribes/immovables/reedfield/medium/init.lua"
1887+ include "tribes/immovables/reedfield/ripe/init.lua"
1888+ include "tribes/immovables/reedfield/small/init.lua"
1889+ include "tribes/immovables/reedfield/tiny/init.lua"
1890 include "tribes/immovables/resi/atlanteans/init.lua"
1891 include "tribes/immovables/resi/barbarians/init.lua"
1892 include "tribes/immovables/resi/empire/init.lua"
1893@@ -195,11 +195,11 @@
1894 include "tribes/immovables/berry_bushes/sea_buckthorn/init.lua"
1895 include "tribes/immovables/berry_bushes/desert_hackberry/init.lua"
1896 include "tribes/immovables/berry_bushes/juniper/init.lua"
1897- include "tribes/immovables/barleyfield_tiny/init.lua"
1898- include "tribes/immovables/barleyfield_small/init.lua"
1899- include "tribes/immovables/barleyfield_medium/init.lua"
1900- include "tribes/immovables/barleyfield_ripe/init.lua"
1901- include "tribes/immovables/barleyfield_harvested/init.lua"
1902+ include "tribes/immovables/barleyfield/tiny/init.lua"
1903+ include "tribes/immovables/barleyfield/small/init.lua"
1904+ include "tribes/immovables/barleyfield/medium/init.lua"
1905+ include "tribes/immovables/barleyfield/ripe/init.lua"
1906+ include "tribes/immovables/barleyfield/harvested/init.lua"
1907 end)
1908
1909 -- ===================================
1910
1911=== modified file 'data/tribes/scripting/starting_conditions/barbarians/fortified_village.lua'
1912--- data/tribes/scripting/starting_conditions/barbarians/fortified_village.lua 2018-09-19 19:40:08 +0000
1913+++ data/tribes/scripting/starting_conditions/barbarians/fortified_village.lua 2019-05-19 12:37:52 +0000
1914@@ -46,7 +46,7 @@
1915 scythe = 6,
1916 shovel = 4,
1917 snack = 3,
1918- thatch_reed = 24,
1919+ reed = 24,
1920 log = 79,
1921 },
1922 workers = {
1923
1924=== modified file 'data/tribes/scripting/starting_conditions/barbarians/headquarters.lua'
1925--- data/tribes/scripting/starting_conditions/barbarians/headquarters.lua 2018-07-15 10:32:12 +0000
1926+++ data/tribes/scripting/starting_conditions/barbarians/headquarters.lua 2019-05-19 12:37:52 +0000
1927@@ -47,7 +47,7 @@
1928 scythe = 6,
1929 shovel = 4,
1930 snack = 3,
1931- thatch_reed = 24,
1932+ reed = 24,
1933 log = 80,
1934 },
1935 workers = {
1936
1937=== modified file 'data/tribes/scripting/starting_conditions/barbarians/trading_outpost.lua'
1938--- data/tribes/scripting/starting_conditions/barbarians/trading_outpost.lua 2018-09-19 19:40:08 +0000
1939+++ data/tribes/scripting/starting_conditions/barbarians/trading_outpost.lua 2019-05-19 12:37:52 +0000
1940@@ -47,7 +47,7 @@
1941 scythe = 6,
1942 shovel = 4,
1943 snack = 3,
1944- thatch_reed = 24,
1945+ reed = 24,
1946 log = 80,
1947 },
1948 workers = {
1949
1950=== modified file 'data/tribes/scripting/starting_conditions/barbarians/village.lua'
1951--- data/tribes/scripting/starting_conditions/barbarians/village.lua 2018-09-27 18:30:18 +0000
1952+++ data/tribes/scripting/starting_conditions/barbarians/village.lua 2019-05-19 12:37:52 +0000
1953@@ -48,7 +48,7 @@
1954 scythe = 6,
1955 shovel = 4,
1956 snack = 3,
1957- thatch_reed = 24,
1958+ reed = 24,
1959 log = 80,
1960 },
1961 workers = {
1962
1963=== modified file 'data/tribes/scripting/starting_conditions/frisians/fortified_village.lua'
1964--- data/tribes/scripting/starting_conditions/frisians/fortified_village.lua 2018-09-16 13:19:53 +0000
1965+++ data/tribes/scripting/starting_conditions/frisians/fortified_village.lua 2019-05-19 12:37:52 +0000
1966@@ -28,7 +28,7 @@
1967 wares = {
1968 log = 25,
1969 granite = 35,
1970- thatch_reed = 20,
1971+ reed = 20,
1972 brick = 50,
1973 clay = 30,
1974 water = 10,
1975@@ -135,7 +135,7 @@
1976 inputs = {
1977 iron = 6,
1978 log = 6,
1979- thatch_reed = 4,
1980+ reed = 4,
1981 }
1982 })
1983
1984
1985=== modified file 'data/tribes/scripting/starting_conditions/frisians/headquarters.lua'
1986--- data/tribes/scripting/starting_conditions/frisians/headquarters.lua 2018-09-16 13:19:53 +0000
1987+++ data/tribes/scripting/starting_conditions/frisians/headquarters.lua 2019-05-19 12:37:52 +0000
1988@@ -24,7 +24,7 @@
1989 wares = {
1990 log = 40,
1991 granite = 50,
1992- thatch_reed = 50,
1993+ reed = 50,
1994 brick = 80,
1995 clay = 30,
1996 water = 10,
1997
1998=== modified file 'data/tribes/scripting/starting_conditions/frisians/trading_outpost.lua'
1999--- data/tribes/scripting/starting_conditions/frisians/trading_outpost.lua 2018-09-16 13:19:53 +0000
2000+++ data/tribes/scripting/starting_conditions/frisians/trading_outpost.lua 2019-05-19 12:37:52 +0000
2001@@ -25,7 +25,7 @@
2002 wares = {
2003 log = 30,
2004 granite = 45,
2005- thatch_reed = 35,
2006+ reed = 35,
2007 brick = 70,
2008 clay = 20,
2009 water = 5,
2010@@ -99,7 +99,7 @@
2011 inputs = {
2012 iron = 7,
2013 log = 7,
2014- thatch_reed = 7,
2015+ reed = 7,
2016 }
2017 })
2018
2019
2020=== modified file 'data/tribes/scripting/starting_conditions/frisians/village.lua'
2021--- data/tribes/scripting/starting_conditions/frisians/village.lua 2018-09-28 18:41:33 +0000
2022+++ data/tribes/scripting/starting_conditions/frisians/village.lua 2019-05-19 12:37:52 +0000
2023@@ -24,7 +24,7 @@
2024 wares = {
2025 log = 60,
2026 granite = 60,
2027- thatch_reed = 50,
2028+ reed = 50,
2029 brick = 50,
2030 clay = 20,
2031 water = 10,
2032@@ -92,7 +92,7 @@
2033 inputs = {
2034 iron = 7,
2035 log = 7,
2036- thatch_reed = 7
2037+ reed = 7
2038 },
2039 })
2040
2041
2042=== modified file 'data/tribes/wares/cloth/helptexts.lua'
2043--- data/tribes/wares/cloth/helptexts.lua 2017-07-07 16:51:39 +0000
2044+++ data/tribes/wares/cloth/helptexts.lua 2019-05-19 12:37:52 +0000
2045@@ -1,7 +1,7 @@
2046 function ware_helptext(tribe)
2047 local helptext = {
2048 -- TRANSLATORS: Helptext for a ware: Cloth
2049- barbarians = pgettext("barbarians_ware", "Cloth is needed for Barbarian ships. It is produced out of thatch reed."),
2050+ barbarians = pgettext("barbarians_ware", "Cloth is needed for Barbarian ships. It is produced out of reed."),
2051 -- TRANSLATORS: Helptext for a ware: Cloth
2052 frisians = pgettext("frisians_ware", "Cloth is needed for ships. It is produced out of reindeer fur and reed."),
2053 -- TRANSLATORS: Helptext for a ware: Cloth
2054
2055=== renamed directory 'data/tribes/wares/thatch_reed' => 'data/tribes/wares/reed'
2056=== modified file 'data/tribes/wares/reed/helptexts.lua'
2057--- data/tribes/wares/thatch_reed/helptexts.lua 2017-11-20 19:48:43 +0000
2058+++ data/tribes/wares/reed/helptexts.lua 2019-05-19 12:37:52 +0000
2059@@ -1,9 +1,9 @@
2060 function ware_helptext(tribe)
2061 local helptext = {
2062- -- TRANSLATORS: Helptext for a ware: Thatch Reed
2063- barbarians = pgettext("barbarians_ware", "Thatch reed is produced in a reed yard and used to make the roofs of buildings waterproof."),
2064- -- TRANSLATORS: Helptext for a ware: Thatch Reed
2065- 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." );
2066+ -- TRANSLATORS: Helptext for a ware: Reed
2067+ barbarians = pgettext("barbarians_ware", "Reed is produced in a reed yard and used to make the roofs of buildings waterproof."),
2068+ -- TRANSLATORS: Helptext for a ware: Reed
2069+ 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." );
2070 }
2071 local result = ""
2072 if tribe then
2073
2074=== modified file 'data/tribes/wares/reed/init.lua'
2075--- data/tribes/wares/thatch_reed/init.lua 2018-03-06 09:50:54 +0000
2076+++ data/tribes/wares/reed/init.lua 2019-05-19 12:37:52 +0000
2077@@ -2,9 +2,9 @@
2078
2079 tribes:new_ware_type {
2080 msgctxt = "ware",
2081- name = "thatch_reed",
2082- -- TRANSLATORS: This is a ware name used in lists of wares
2083- descname = pgettext("ware", "Thatch Reed"),
2084+ name = "reed",
2085+ -- 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.
2086+ descname = pgettext("ware", "Reed"),
2087 helptext_script = dirname .. "helptexts.lua",
2088 icon = dirname .. "menu.png",
2089 default_target_quantity = {},
2090
2091=== modified file 'data/tribes/workers/barbarians/gardener/helptexts.lua'
2092--- data/tribes/workers/barbarians/gardener/helptexts.lua 2015-10-31 12:11:44 +0000
2093+++ data/tribes/workers/barbarians/gardener/helptexts.lua 2019-05-19 12:37:52 +0000
2094@@ -1,4 +1,4 @@
2095 function worker_helptext()
2096 -- TRANSLATORS: Helptext for a worker: Gardener
2097- return pgettext("barbarians_worker", "Grows thatch reed.")
2098+ return pgettext("barbarians_worker", "Plants and harvests reed fields.")
2099 end
2100
2101=== modified file 'data/tribes/workers/barbarians/gardener/init.lua'
2102--- data/tribes/workers/barbarians/gardener/init.lua 2018-02-28 09:38:13 +0000
2103+++ data/tribes/workers/barbarians/gardener/init.lua 2019-05-19 12:37:52 +0000
2104@@ -49,7 +49,7 @@
2105 "animate=harvesting 12000",
2106 "callobject=harvest",
2107 "animate=harvesting 1",
2108- "createware=thatch_reed",
2109+ "createware=reed",
2110 "return"
2111 },
2112 },
2113
2114=== modified file 'data/tribes/workers/frisians/reed_farmer/helptexts.lua'
2115--- data/tribes/workers/frisians/reed_farmer/helptexts.lua 2017-07-07 16:51:39 +0000
2116+++ data/tribes/workers/frisians/reed_farmer/helptexts.lua 2019-05-19 12:37:52 +0000
2117@@ -1,4 +1,4 @@
2118 function worker_helptext()
2119 -- TRANSLATORS: Helptext for a worker: Gardener
2120- return pgettext("frisians_worker", "Grows thatch reed.")
2121+ return pgettext("frisians_worker", "Plants and harvests reed fields.")
2122 end
2123
2124=== modified file 'data/tribes/workers/frisians/reed_farmer/init.lua'
2125--- data/tribes/workers/frisians/reed_farmer/init.lua 2018-11-30 10:27:21 +0000
2126+++ data/tribes/workers/frisians/reed_farmer/init.lua 2019-05-19 12:37:52 +0000
2127@@ -53,7 +53,7 @@
2128 "animate=harvesting 12000",
2129 "callobject=harvest",
2130 "animate=harvesting 1",
2131- "createware=thatch_reed",
2132+ "createware=reed",
2133 "return"
2134 },
2135 },
2136
2137=== modified file 'src/economy/ware_instance.cc'
2138--- src/economy/ware_instance.cc 2019-04-09 16:43:49 +0000
2139+++ src/economy/ware_instance.cc 2019-05-19 12:37:52 +0000
2140@@ -584,10 +584,10 @@
2141
2142 // Some maps may contain ware info, so we need compatibility here.
2143 if (1 <= packet_version && packet_version <= kCurrentPacketVersion) {
2144- std::string warename = fr.c_string();
2145 if (packet_version == 1) {
2146- warename = lookup_table.lookup_ware(warename, fr.c_string());
2147+ fr.c_string(); // Consume tribe name
2148 }
2149+ const std::string warename = lookup_table.lookup_ware(fr.c_string());
2150
2151 DescriptionIndex wareindex = egbase.tribes().ware_index(warename);
2152 const WareDescr* descr = egbase.tribes().get_ware_descr(wareindex);
2153
2154=== modified file 'src/game_io/game_player_info_packet.cc'
2155--- src/game_io/game_player_info_packet.cc 2019-03-15 15:11:57 +0000
2156+++ src/game_io/game_player_info_packet.cc 2019-05-19 12:37:52 +0000
2157@@ -19,6 +19,8 @@
2158
2159 #include "game_io/game_player_info_packet.h"
2160
2161+#include <memory>
2162+
2163 #include "io/fileread.h"
2164 #include "io/filewrite.h"
2165 #include "logic/game.h"
2166@@ -26,6 +28,7 @@
2167 #include "logic/map_objects/tribes/tribe_descr.h"
2168 #include "logic/player.h"
2169 #include "logic/playersmanager.h"
2170+#include "map_io/tribes_legacy_lookup_table.h"
2171 #include "wui/interactive_player.h"
2172
2173 namespace Widelands {
2174@@ -34,6 +37,7 @@
2175
2176 void GamePlayerInfoPacket::read(FileSystem& fs, Game& game, MapObjectLoader*) {
2177 try {
2178+ std::unique_ptr<TribesLegacyLookupTable> tribe_lookup_table(new TribesLegacyLookupTable());
2179 FileRead fr;
2180 fr.open(fs, "binary/player_info");
2181 uint16_t const packet_version = fr.unsigned_16();
2182@@ -68,7 +72,7 @@
2183 }
2184 }
2185
2186- player->read_statistics(fr, packet_version);
2187+ player->read_statistics(fr, packet_version, *tribe_lookup_table.get());
2188 player->read_remaining_shipnames(fr);
2189
2190 player->casualties_ = fr.unsigned_32();
2191
2192=== modified file 'src/logic/map_objects/immovable.cc'
2193--- src/logic/map_objects/immovable.cc 2019-05-11 13:48:12 +0000
2194+++ src/logic/map_objects/immovable.cc 2019-05-19 12:37:52 +0000
2195@@ -730,14 +730,10 @@
2196 if (1 <= packet_version && packet_version <= kCurrentPacketVersionImmovable) {
2197
2198 const std::string owner_type = fr.c_string();
2199- std::string name = fr.c_string();
2200 Immovable* imm = nullptr;
2201
2202 if (owner_type != "world") { // It is a tribe immovable.
2203- // Needed for map compatibility
2204- if (packet_version < 7) {
2205- name = tribes_lookup_table.lookup_immovable(owner_type, name);
2206- }
2207+ const std::string name = tribes_lookup_table.lookup_immovable(fr.c_string());
2208 const DescriptionIndex idx = egbase.tribes().immovable_index(name);
2209 if (idx != Widelands::INVALID_INDEX) {
2210 imm = new Immovable(*egbase.tribes().get_immovable_descr(idx));
2211@@ -746,7 +742,7 @@
2212 }
2213 } else { // world immovable
2214 const World& world = egbase.world();
2215- name = world_lookup_table.lookup_immovable(name);
2216+ const std::string name = world_lookup_table.lookup_immovable(fr.c_string());
2217 const DescriptionIndex idx = world.get_immovable_index(name.c_str());
2218 if (idx == Widelands::INVALID_INDEX) {
2219 throw GameDataError("world does not define immovable type \"%s\"", name.c_str());
2220
2221=== modified file 'src/logic/map_objects/tribes/worker.cc'
2222--- src/logic/map_objects/tribes/worker.cc 2019-05-18 20:43:25 +0000
2223+++ src/logic/map_objects/tribes/worker.cc 2019-05-19 12:37:52 +0000
2224@@ -3168,14 +3168,11 @@
2225 uint8_t packet_version) {
2226 try {
2227 // header has already been read by caller
2228- std::string name = fr.c_string();
2229 // Some maps contain worker info, so we need compatibility here.
2230 if (packet_version == 1) {
2231- if (!Widelands::tribe_exists(name)) {
2232- throw GameDataError("unknown tribe '%s'", name.c_str());
2233- }
2234- name = lookup_table.lookup_worker(name, fr.c_string());
2235+ fr.c_string(); // Consume tribe name
2236 }
2237+ const std::string name = lookup_table.lookup_worker(fr.c_string());
2238
2239 const WorkerDescr* descr =
2240 egbase.tribes().get_worker_descr(egbase.tribes().safe_worker_index(name));
2241
2242=== modified file 'src/logic/player.cc'
2243--- src/logic/player.cc 2019-05-11 18:19:20 +0000
2244+++ src/logic/player.cc 2019-05-19 12:37:52 +0000
2245@@ -1387,7 +1387,7 @@
2246 *
2247 * \param fr source stream
2248 */
2249-void Player::read_statistics(FileRead& fr, const uint16_t packet_version) {
2250+void Player::read_statistics(FileRead& fr, const uint16_t packet_version, const TribesLegacyLookupTable& lookup_table) {
2251 uint16_t nr_wares = fr.unsigned_16();
2252 size_t nr_entries = fr.unsigned_16();
2253
2254@@ -1417,7 +1417,7 @@
2255 ware_productions_[i].resize(nr_entries);
2256
2257 for (uint16_t i = 0; i < nr_wares; ++i) {
2258- const std::string name = fr.c_string();
2259+ const std::string name = lookup_table.lookup_ware(fr.c_string());
2260 const DescriptionIndex idx = egbase().tribes().ware_index(name);
2261 if (!egbase().tribes().ware_exists(idx)) {
2262 log("Player %u statistics: unknown ware name %s", player_number(), name.c_str());
2263@@ -1442,7 +1442,7 @@
2264 ware_consumptions_[i].resize(nr_entries);
2265
2266 for (uint16_t i = 0; i < nr_wares; ++i) {
2267- const std::string name = fr.c_string();
2268+ const std::string name = lookup_table.lookup_ware(fr.c_string());
2269 const DescriptionIndex idx = egbase().tribes().ware_index(name);
2270 if (!egbase().tribes().ware_exists(idx)) {
2271 log("Player %u consumption statistics: unknown ware name %s", player_number(),
2272@@ -1469,7 +1469,7 @@
2273 ware_stocks_[i].resize(nr_entries);
2274
2275 for (uint16_t i = 0; i < nr_wares; ++i) {
2276- const std::string name = fr.c_string();
2277+ const std::string name = lookup_table.lookup_ware(fr.c_string());
2278 const DescriptionIndex idx = egbase().tribes().ware_index(name);
2279 if (!egbase().tribes().ware_exists(idx)) {
2280 log("Player %u stock statistics: unknown ware name %s", player_number(), name.c_str());
2281
2282=== modified file 'src/logic/player.h'
2283--- src/logic/player.h 2019-05-07 12:14:02 +0000
2284+++ src/logic/player.h 2019-05-19 12:37:52 +0000
2285@@ -585,7 +585,7 @@
2286
2287 std::vector<uint32_t> const* get_ware_stock_statistics(DescriptionIndex const) const;
2288
2289- void read_statistics(FileRead&, uint16_t packet_version);
2290+ void read_statistics(FileRead&, uint16_t packet_version, const TribesLegacyLookupTable& lookup_table);
2291 void write_statistics(FileWrite&) const;
2292 void read_remaining_shipnames(FileRead&);
2293 void write_remaining_shipnames(FileWrite&) const;
2294
2295=== modified file 'src/map_io/tribes_legacy_lookup_table.cc'
2296--- src/map_io/tribes_legacy_lookup_table.cc 2019-02-23 11:00:49 +0000
2297+++ src/map_io/tribes_legacy_lookup_table.cc 2019-05-19 12:37:52 +0000
2298@@ -18,294 +18,44 @@
2299 */
2300
2301 #include "map_io/tribes_legacy_lookup_table.h"
2302-
2303+// Whenever we break savegame compatibility, we can empty these maps
2304 TribesLegacyLookupTable::TribesLegacyLookupTable()
2305 : // Workers
2306- workers_{
2307- std::make_pair("atlanteans",
2308- std::map<std::string, std::string>{
2309- {"armorsmith", "atlanteans_armorsmith"},
2310- {"baker", "atlanteans_baker"},
2311- {"blackroot_farmer", "atlanteans_blackroot_farmer"},
2312- {"builder", "atlanteans_builder"},
2313- {"carrier", "atlanteans_carrier"},
2314- {"charcoal_burner", "atlanteans_charcoal_burner"},
2315- {"farmer", "atlanteans_farmer"},
2316- {"fish_breeder", "atlanteans_fishbreeder"},
2317- {"fisher", "atlanteans_fisher"},
2318- {"forester", "atlanteans_forester"},
2319- {"geologist", "atlanteans_geologist"},
2320- {"horse", "atlanteans_horse"},
2321- {"horsebreeder", "atlanteans_horsebreeder"},
2322- {"hunter", "atlanteans_hunter"},
2323- {"miller", "atlanteans_miller"},
2324- {"miner", "atlanteans_miner"},
2325- {"sawyer", "atlanteans_sawyer"},
2326- {"scout", "atlanteans_scout"},
2327- {"shipwright", "atlanteans_shipwright"},
2328- {"smelter", "atlanteans_smelter"},
2329- {"smoker", "atlanteans_smoker"},
2330- {"soldier", "atlanteans_soldier"},
2331- {"spiderbreeder", "atlanteans_spiderbreeder"},
2332- {"stonecutter", "atlanteans_stonecutter"},
2333- {"toolsmith", "atlanteans_toolsmith"},
2334- {"trainer", "atlanteans_trainer"},
2335- {"weaponsmith", "atlanteans_weaponsmith"},
2336- {"weaver", "atlanteans_weaver"},
2337- {"woodcutter", "atlanteans_woodcutter"},
2338- }),
2339- std::make_pair("barbarians",
2340- std::map<std::string, std::string>{
2341- {"baker", "barbarians_baker"},
2342- {"blacksmith", "barbarians_blacksmith"},
2343- {"brewer", "barbarians_brewer"},
2344- {"builder", "barbarians_builder"},
2345- {"carrier", "barbarians_carrier"},
2346- {"cattlebreeder", "barbarians_cattlebreeder"},
2347- {"charcoal_burner", "barbarians_charcoal_burner"},
2348- {"chief-miner", "barbarians_miner_chief"},
2349- {"farmer", "barbarians_farmer"},
2350- {"fisher", "barbarians_fisher"},
2351- {"gamekeeper", "barbarians_gamekeeper"},
2352- {"gardener", "barbarians_gardener"},
2353- {"geologist", "barbarians_geologist"},
2354- {"helmsmith", "barbarians_helmsmith"},
2355- {"hunter", "barbarians_hunter"},
2356- {"innkeeper", "barbarians_innkeeper"},
2357- {"lime-burner", "barbarians_lime_burner"},
2358- {"lumberjack", "barbarians_lumberjack"},
2359- {"master-blacksmith", "barbarians_blacksmith_master"},
2360- {"master-brewer", "barbarians_brewer_master"},
2361- {"master-miner", "barbarians_miner_master"},
2362- {"miner", "barbarians_miner"},
2363- {"ox", "barbarians_ox"},
2364- {"ranger", "barbarians_ranger"},
2365- {"scout", "barbarians_scout"},
2366- {"shipwright", "barbarians_shipwright"},
2367- {"smelter", "barbarians_smelter"},
2368- {"soldier", "barbarians_soldier"},
2369- {"stonemason", "barbarians_stonemason"},
2370- {"trainer", "barbarians_trainer"},
2371- {"weaver", "barbarians_weaver"},
2372- }),
2373- std::make_pair("empire",
2374- std::map<std::string, std::string>{
2375- {"armorsmith", "empire_armorsmith"},
2376- {"baker", "empire_baker"},
2377- {"brewer", "empire_brewer"},
2378- {"builder", "empire_builder"},
2379- {"carpenter", "empire_carpenter"},
2380- {"carrier", "empire_carrier"},
2381- {"charcoal_burner", "empire_charcoal_burner"},
2382- {"donkey", "empire_donkey"},
2383- {"donkeybreeder", "empire_donkeybreeder"},
2384- {"farmer", "empire_farmer"},
2385- {"fisher", "empire_fisher"},
2386- {"forester", "empire_forester"},
2387- {"geologist", "empire_geologist"},
2388- {"hunter", "empire_hunter"},
2389- {"innkeeper", "empire_innkeeper"},
2390- {"lumberjack", "empire_lumberjack"},
2391- {"master-miner", "empire_miner_master"},
2392- {"miller", "empire_miller"},
2393- {"miner", "empire_miner"},
2394- {"pig-breeder", "empire_pigbreeder"},
2395- {"scout", "empire_scout"},
2396- {"shepherd", "empire_shepherd"},
2397- {"shipwright", "empire_shipwright"},
2398- {"smelter", "empire_smelter"},
2399- {"soldier", "empire_soldier"},
2400- {"stonemason", "empire_stonemason"},
2401- {"toolsmith", "empire_toolsmith"},
2402- {"trainer", "empire_trainer"},
2403- {"vinefarmer", "empire_vinefarmer"},
2404- {"weaponsmith", "empire_weaponsmith"},
2405- {"weaver", "empire_weaver"},
2406- }),
2407- },
2408+ workers_{},
2409 // Wares
2410 wares_{
2411- std::make_pair("atlanteans",
2412- std::map<std::string, std::string>{
2413- {"advanced_shield", "shield_advanced"},
2414- {"blackrootflour", "blackroot_flour"},
2415- {"bread", "atlanteans_bread"},
2416- {"bucket", "buckets"},
2417- {"cornflour", "cornmeal"},
2418- {"double_trident", "trident_double"},
2419- {"golden_tabard", "tabard_golden"},
2420- {"goldore", "gold_ore"},
2421- {"goldyarn", "gold_thread"},
2422- {"heavy_double_trident", "trident_heavy_double"},
2423- {"ironore", "iron_ore"},
2424- {"light_trident", "trident_light"},
2425- {"long_trident", "trident_long"},
2426- {"spideryarn", "spider_silk"},
2427- {"steel_shield", "shield_steel"},
2428- {"steel_trident", "trident_steel"},
2429- {"stone", "granite"},
2430- }),
2431- std::make_pair("barbarians",
2432- std::map<std::string, std::string>{
2433- {"battleax", "ax_battle"},
2434- {"broadax", "ax_broad"},
2435- {"bronzeax", "ax_bronze"},
2436- {"felling_ax", "felling_ax"},
2437- {"goldore", "gold_ore"},
2438- {"helm", "helmet"},
2439- {"ironore", "iron_ore"},
2440- {"mask", "helmet_mask"},
2441- {"pittabread", "barbarians_bread"},
2442- {"raw_stone", "granite"},
2443- {"sharpax", "ax_sharp"},
2444- {"strongbeer", "beer_strong"},
2445- {"thatchreed", "thatch_reed"},
2446- {"warhelm", "helmet_warhelm"},
2447- {"warriorsax", "ax_warriors"},
2448- }),
2449- std::make_pair("empire",
2450- std::map<std::string, std::string>{
2451- {"advanced_lance", "spear_advanced"},
2452- {"ax", "felling_ax"},
2453- {"bread", "empire_bread"},
2454- {"chain_armor", "armor_chain"},
2455- {"goldore", "gold_ore"},
2456- {"heavy_lance", "spear_heavy"},
2457- {"helm", "armor_helmet"},
2458- {"ironore", "iron_ore"},
2459- {"lance", "spear"},
2460- {"marblecolumn", "marble_column"},
2461- {"plate_armor", "armor_gilded"},
2462- {"stone", "granite"},
2463- {"war_lance", "spear_war"},
2464- {"wood_lance", "spear_wooden"},
2465- {"wood", "planks"},
2466- }),
2467- },
2468+ {"thatch_reed", "reed"},
2469+ },
2470 // Immovables
2471 immovables_{
2472- std::make_pair("atlanteans",
2473- std::map<std::string, std::string>{
2474- {"blackrootfield_b", "blackrootfield_ripe"},
2475- {"blackrootfield_m", "blackrootfield_medium"},
2476- {"blackrootfield_s", "blackrootfield_small"},
2477- {"blackrootfield_t", "blackrootfield_tiny"},
2478- {"cornfield_b", "cornfield_ripe"},
2479- {"cornfield_m", "cornfield_medium"},
2480- {"cornfield_s", "cornfield_small"},
2481- {"cornfield_t", "cornfield_tiny"},
2482- {"resi_granite1", "atlanteans_resi_stones_1"},
2483- {"resi_granite2", "atlanteans_resi_stones_2"},
2484- {"shipconstruction", "atlanteans_shipconstruction"},
2485- {"resi_coal1", "atlanteans_resi_coal_1"},
2486- {"resi_iron1", "atlanteans_resi_iron_1"},
2487- {"resi_gold1", "atlanteans_resi_gold_1"},
2488- {"resi_stones1", "atlanteans_resi_stones_1"},
2489- {"resi_coal2", "atlanteans_resi_coal_2"},
2490- {"resi_iron2", "atlanteans_resi_iron_2"},
2491- {"resi_gold2", "atlanteans_resi_gold_2"},
2492- {"resi_stones2", "atlanteans_resi_stones_2"},
2493- {"resi_none", "atlanteans_resi_none"},
2494- {"resi_water1", "atlanteans_resi_water"},
2495- }),
2496- std::make_pair("barbarians",
2497- std::map<std::string, std::string>{
2498- {"field0", "field_medium"},
2499- {"field0s", "field_small"},
2500- {"field0t", "field_tiny"},
2501- {"field1", "field_ripe"},
2502- {"field2", "field_harvested"},
2503- {"reed0", "reed_medium"},
2504- {"reed0s", "reed_small"},
2505- {"reed0t", "reed_tiny"},
2506- {"reed1", "reed_ripe"},
2507- {"resi_granite1", "barbarians_resi_stones_1"},
2508- {"resi_granite2", "barbarians_resi_stones_2"},
2509- {"shipconstruction", "barbarians_shipconstruction"},
2510- {"resi_coal1", "barbarians_resi_coal_1"},
2511- {"resi_iron1", "barbarians_resi_iron_1"},
2512- {"resi_gold1", "barbarians_resi_gold_1"},
2513- {"resi_stones1", "barbarians_resi_stones_1"},
2514- {"resi_coal2", "barbarians_resi_coal_2"},
2515- {"resi_iron2", "barbarians_resi_iron_2"},
2516- {"resi_gold2", "barbarians_resi_gold_2"},
2517- {"resi_stones2", "barbarians_resi_stones_2"},
2518- {"resi_none", "barbarians_resi_none"},
2519- {"resi_water1", "barbarians_resi_water"},
2520- }),
2521- std::make_pair("empire",
2522- std::map<std::string, std::string>{
2523- {"field0", "field_medium"},
2524- {"field0s", "field_small"},
2525- {"field0t", "field_tiny"},
2526- {"field1", "field_ripe"},
2527- {"field2", "field_harvested"},
2528- {"wine0", "grapevine_medium"},
2529- {"wine0s", "grapevine_small"},
2530- {"wine0t", "grapevine_tiny"},
2531- {"wine1", "grapevine_ripe"},
2532- {"resi_granite1", "empire_resi_stones_1"},
2533- {"resi_granite2", "empire_resi_stones_2"},
2534- {"shipconstruction", "empire_shipconstruction"},
2535- {"resi_coal1", "empire_resi_coal_1"},
2536- {"resi_iron1", "empire_resi_iron_1"},
2537- {"resi_gold1", "empire_resi_gold_1"},
2538- {"resi_stones1", "empire_resi_stones_1"},
2539- {"resi_coal2", "empire_resi_coal_2"},
2540- {"resi_iron2", "empire_resi_iron_2"},
2541- {"resi_gold2", "empire_resi_gold_2"},
2542- {"resi_stones2", "empire_resi_stones_2"},
2543- {"resi_none", "empire_resi_none"},
2544- {"resi_water1", "empire_resi_water"},
2545- }),
2546- std::make_pair("frisians",
2547- std::map<std::string, std::string>{
2548- {"resi_coal1", "frisians_resi_coal_1"},
2549- {"resi_iron1", "frisians_resi_iron_1"},
2550- {"resi_gold1", "frisians_resi_gold_1"},
2551- {"resi_stones1", "frisians_resi_stones_1"},
2552- {"resi_coal2", "frisians_resi_coal_2"},
2553- {"resi_iron2", "frisians_resi_iron_2"},
2554- {"resi_gold2", "frisians_resi_gold_2"},
2555- {"resi_stones2", "frisians_resi_stones_2"},
2556- {"resi_none", "frisians_resi_none"},
2557- {"resi_water1", "frisians_resi_water"},
2558- }),
2559+ {"field_medium", "wheatfield_medium"},
2560+ {"field_small", "wheatfield_small"},
2561+ {"field_tiny", "wheatfield_tiny"},
2562+ {"field_ripe", "wheatfield_ripe"},
2563+ {"field_harvested", "wheatfield_harvested"},
2564+ {"reed_medium", "reedfield_medium"},
2565+ {"reed_small", "reedfield_small"},
2566+ {"reed_tiny", "reedfield_tiny"},
2567+ {"reed_tiny", "reedfield_ripe"},
2568 } {
2569 }
2570
2571-const std::string& TribesLegacyLookupTable::lookup_worker(const std::string& tribe,
2572- const std::string& worker) const {
2573- if (workers_.count(tribe)) {
2574- const std::map<std::string, std::string>& tribe_workers = workers_.at(tribe);
2575- const auto& i = tribe_workers.find(worker);
2576- if (i != tribe_workers.end()) {
2577- return i->second;
2578- }
2579- }
2580- return worker;
2581-}
2582-
2583-const std::string& TribesLegacyLookupTable::lookup_ware(const std::string& tribe,
2584- const std::string& ware) const {
2585- if (wares_.count(tribe)) {
2586- const std::map<std::string, std::string>& tribe_wares = wares_.at(tribe);
2587- const auto& i = tribe_wares.find(ware);
2588- if (i != tribe_wares.end()) {
2589- return i->second;
2590- }
2591- }
2592- return ware;
2593-}
2594-
2595-const std::string& TribesLegacyLookupTable::lookup_immovable(const std::string& tribe,
2596- const std::string& immovable) const {
2597- if (immovables_.count(tribe)) {
2598- const std::map<std::string, std::string>& tribe_immovables = immovables_.at(tribe);
2599- const auto& i = tribe_immovables.find(immovable);
2600- if (i != tribe_immovables.end()) {
2601- return i->second;
2602- }
2603- }
2604- return immovable;
2605+const std::string& TribesLegacyLookupTable::lookup_worker(const std::string& worker) const {
2606+ return lookup_entry(worker, workers_);
2607+}
2608+
2609+const std::string& TribesLegacyLookupTable::lookup_ware(const std::string& ware) const {
2610+ return lookup_entry(ware, wares_);
2611+}
2612+
2613+const std::string& TribesLegacyLookupTable::lookup_immovable(const std::string& immovable) const {
2614+ return lookup_entry(immovable, immovables_);
2615+}
2616+
2617+const std::string& TribesLegacyLookupTable::lookup_entry(const std::string& entry, const std::map<std::string, std::string>& table) const {
2618+ const auto& i = table.find(entry);
2619+ if (i != table.end()) {
2620+ return i->second;
2621+ }
2622+ return entry;
2623 }
2624
2625=== modified file 'src/map_io/tribes_legacy_lookup_table.h'
2626--- src/map_io/tribes_legacy_lookup_table.h 2019-02-23 11:00:49 +0000
2627+++ src/map_io/tribes_legacy_lookup_table.h 2019-05-19 12:37:52 +0000
2628@@ -30,20 +30,21 @@
2629 TribesLegacyLookupTable();
2630
2631 /// Looks up the new name for the 'worker'.
2632- const std::string& lookup_worker(const std::string& tribe, const std::string& worker) const;
2633+ const std::string& lookup_worker(const std::string& worker) const;
2634
2635 /// Looks up the new name for the 'ware'.
2636- const std::string& lookup_ware(const std::string& tribe, const std::string& ware) const;
2637+ const std::string& lookup_ware(const std::string& ware) const;
2638
2639 /// Looks up the new name for the 'immovable'.
2640- const std::string& lookup_immovable(const std::string& tribe,
2641- const std::string& immovable) const;
2642+ const std::string& lookup_immovable(const std::string& immovable) const;
2643
2644 private:
2645+ const std::string& lookup_entry(const std::string& entry, const std::map<std::string, std::string>& table) const;
2646+
2647 /// {tribe name, {old name, new name}}
2648- const std::map<std::string, std::map<std::string, std::string>> workers_;
2649- const std::map<std::string, std::map<std::string, std::string>> wares_;
2650- const std::map<std::string, std::map<std::string, std::string>> immovables_;
2651+ const std::map<std::string, std::string> workers_;
2652+ const std::map<std::string, std::string> wares_;
2653+ const std::map<std::string, std::string> immovables_;
2654
2655 DISALLOW_COPY_AND_ASSIGN(TribesLegacyLookupTable);
2656 };
2657
2658=== modified file 'test/maps/expedition.wmf/scripting/init.lua'
2659--- test/maps/expedition.wmf/scripting/init.lua 2018-09-30 09:50:43 +0000
2660+++ test/maps/expedition.wmf/scripting/init.lua 2019-05-19 12:37:52 +0000
2661@@ -23,7 +23,7 @@
2662 grout = 2,
2663 iron = 2,
2664 granite = 5,
2665- thatch_reed = 4,
2666+ reed = 4,
2667 log = 3,
2668 },
2669 workers = {
2670@@ -80,7 +80,7 @@
2671 assert_equal(2, wares.grout)
2672 assert_equal(2, wares.iron)
2673 assert_equal(5, wares.granite)
2674- assert_equal(4, wares.thatch_reed)
2675+ assert_equal(4, wares.reed)
2676 -- We do not check for logs here as they might be carried out of the
2677 -- warehouse already when we check (because they might get requested by the
2678 -- hardener).
2679
2680=== modified file 'test/maps/lua_testsuite.wmf/scripting/baseimmovables.lua'
2681--- test/maps/lua_testsuite.wmf/scripting/baseimmovables.lua 2016-02-14 16:31:07 +0000
2682+++ test/maps/lua_testsuite.wmf/scripting/baseimmovables.lua 2019-05-19 12:37:52 +0000
2683@@ -21,7 +21,7 @@
2684 imm2:remove()
2685 end
2686 function immovable_creation_tests:test_create_tribe_immovables()
2687- imm = map:place_immovable("field_harvested", map:get_field(10,10), "tribes")
2688+ imm = map:place_immovable("wheatfield_harvested", map:get_field(10,10), "tribes")
2689 imm:remove()
2690 end
2691 function immovable_creation_tests:test_create_world_immovables()
2692@@ -35,7 +35,7 @@
2693 end
2694 function immovable_creation_tests:test_create_tribe_immovables_ill_tribe()
2695 assert_error("Immovables are for world or tribes!", function()
2696- imm = map:place_immovable("field_harvested", map:get_field(10,10), "blablub")
2697+ imm = map:place_immovable("wheatfield_harvested", map:get_field(10,10), "blablub")
2698 end)
2699 end
2700 function immovable_creation_tests:test_create_tribe_immovables_ill_immovable()
2701
2702=== modified file 'test/maps/lua_testsuite.wmf/scripting/immovables_descriptions.lua'
2703--- test/maps/lua_testsuite.wmf/scripting/immovables_descriptions.lua 2019-04-07 05:46:13 +0000
2704+++ test/maps/lua_testsuite.wmf/scripting/immovables_descriptions.lua 2019-05-19 12:37:52 +0000
2705@@ -452,12 +452,12 @@
2706
2707 -- This is actually a property of MapOjectDescription
2708 function test_descr:test_descname()
2709- assert_equal("Thatch Reed", egbase:get_ware_description("thatch_reed").descname)
2710+ assert_equal("Thatch Reed", egbase:get_ware_description("reed").descname)
2711 end
2712
2713 -- This is actually a property of MapOjectDescription
2714 function test_descr:test_name()
2715- assert_equal("thatch_reed", egbase:get_ware_description("thatch_reed").name)
2716+ assert_equal("reed", egbase:get_ware_description("reed").name)
2717 end
2718
2719 function test_descr:test_consumers()
2720
2721=== modified file 'test/maps/market_trading.wmf/scripting/tribes/market/init.lua'
2722--- test/maps/market_trading.wmf/scripting/tribes/market/init.lua 2018-07-15 10:32:12 +0000
2723+++ test/maps/market_trading.wmf/scripting/tribes/market/init.lua 2019-05-19 12:37:52 +0000
2724@@ -22,7 +22,7 @@
2725 granite = 4,
2726 grout = 3,
2727 iron = 1,
2728- thatch_reed = 4,
2729+ reed = 4,
2730 gold = 2,
2731 },
2732 return_on_dismantle = {
2733@@ -31,7 +31,7 @@
2734 granite = 3,
2735 grout = 1,
2736 iron = 1,
2737- thatch_reed = 2,
2738+ reed = 2,
2739 gold = 1,
2740 },
2741
2742
2743=== modified file 'test/maps/port_space.wmf/scripting/init.lua'
2744--- test/maps/port_space.wmf/scripting/init.lua 2016-02-08 20:44:17 +0000
2745+++ test/maps/port_space.wmf/scripting/init.lua 2019-05-19 12:37:52 +0000
2746@@ -52,7 +52,7 @@
2747 grout = 100,
2748 iron = 100,
2749 granite = 100,
2750- thatch_reed = 100,
2751+ reed = 100,
2752 log = 100,
2753 },
2754 workers = {
2755@@ -65,7 +65,7 @@
2756 grout = 100,
2757 iron = 100,
2758 granite = 100,
2759- thatch_reed = 100,
2760+ reed = 100,
2761 log = 100,
2762 gold = 100,
2763 },

Subscribers

People subscribed via source and target branches

to status/vote changes: