widelands

Merge lp:~widelands-dev/widelands/militarysites into lp:widelands

  1. militarysites
  2. Merge into trunk
Proposed by GunChleoc
Status: Merged
Merged at revision: 7678
Proposed branch: lp:~widelands-dev/widelands/militarysites
Merge into: lp:widelands
Diff against target: 578 lines (+45/-115)
24 files modified
src/logic/militarysite.cc (+18/-13)
src/logic/militarysite.h (+4/-3)
src/map_io/map_buildingdata_packet.cc (+7/-11)
src/scripting/lua_map.cc (+0/-1)
src/scripting/lua_map.h (+5/-5)
tribes/buildings/militarysites/atlanteans/castle/init.lua (+0/-4)
tribes/buildings/militarysites/atlanteans/guardhall/init.lua (+0/-4)
tribes/buildings/militarysites/atlanteans/guardhouse/init.lua (+0/-5)
tribes/buildings/militarysites/atlanteans/tower/init.lua (+0/-4)
tribes/buildings/militarysites/atlanteans/tower_high/init.lua (+0/-4)
tribes/buildings/militarysites/atlanteans/tower_small/init.lua (+0/-4)
tribes/buildings/militarysites/barbarians/barrier/init.lua (+0/-4)
tribes/buildings/militarysites/barbarians/citadel/init.lua (+0/-4)
tribes/buildings/militarysites/barbarians/fortress/init.lua (+0/-4)
tribes/buildings/militarysites/barbarians/sentry/init.lua (+0/-4)
tribes/buildings/militarysites/barbarians/tower/init.lua (+0/-4)
tribes/buildings/militarysites/empire/barrier/init.lua (+0/-4)
tribes/buildings/militarysites/empire/blockhouse/init.lua (+0/-4)
tribes/buildings/militarysites/empire/castle/init.lua (+0/-4)
tribes/buildings/militarysites/empire/fortress/init.lua (+0/-4)
tribes/buildings/militarysites/empire/outpost/init.lua (+0/-4)
tribes/buildings/militarysites/empire/sentry/init.lua (+0/-4)
tribes/buildings/militarysites/empire/tower/init.lua (+0/-4)
tribes/scripting/help/building_help.lua (+11/-9)
To merge this branch: bzr merge lp:~widelands-dev/widelands/militarysites
Reviewer Review Type Date Requested Status
TiborB Approve
Review via email: mp+280069@code.launchpad.net

Description of the change

Cleaning up some more historical baggage: Militarysites no longer inherit from productionsites.

To post a comment you must log in.
Revision history for this message
TiborB (tiborb95) wrote :

Code looks good, just one small question in diff

Revision history for this message
GunChleoc (gunchleoc) wrote :

Added a comment to your comment :)

Revision history for this message
TiborB (tiborb95) wrote :

I tested it, I noticed no issues so it can go

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/logic/militarysite.cc'
2--- src/logic/militarysite.cc 2015-11-21 11:34:10 +0000
3+++ src/logic/militarysite.cc 2015-12-28 22:03:06 +0000
4@@ -46,8 +46,8 @@
5 const LuaTable& table,
6 const EditorGameBase& egbase)
7 :
8- ProductionSiteDescr
9- (init_descname, "", MapObjectType::MILITARYSITE, table, egbase),
10+ BuildingDescr
11+ (init_descname, MapObjectType::MILITARYSITE, table, egbase),
12 m_conquer_radius (0),
13 m_num_soldiers (0),
14 m_heal_per_second (0)
15@@ -89,7 +89,7 @@
16 */
17
18 MilitarySite::MilitarySite(const MilitarySiteDescr & ms_descr) :
19-ProductionSite(ms_descr),
20+Building(ms_descr),
21 m_didconquer (false),
22 m_capacity (ms_descr.get_max_number_of_soldiers()),
23 m_nexthealtime(0),
24@@ -151,7 +151,7 @@
25
26 void MilitarySite::init(EditorGameBase & egbase)
27 {
28- ProductionSite::init(egbase);
29+ Building::init(egbase);
30
31 upcast(Game, game, &egbase);
32
33@@ -180,7 +180,7 @@
34 */
35 void MilitarySite::set_economy(Economy * const e)
36 {
37- ProductionSite::set_economy(e);
38+ Building::set_economy(e);
39
40 if (m_normal_soldier_request && e)
41 m_normal_soldier_request->set_economy(e);
42@@ -204,10 +204,15 @@
43 (egbase.map().get_fcoords(get_position()), descr().get_conquers())),
44 m_defeating_player);
45
46- ProductionSite::cleanup(egbase);
47-
48- // Note that removing workers during ProductionSite::cleanup can generate
49- // new requests; that's why we delete it at the end of this function.
50+ Building::cleanup(egbase);
51+
52+ // Evict soldiers to get rid of requests
53+ while (m_capacity > 0) {
54+ update_soldier_request();
55+ --m_capacity;
56+ }
57+ update_soldier_request();
58+
59 m_normal_soldier_request.reset();
60 m_upgrade_soldier_request.reset();
61 }
62@@ -558,12 +563,12 @@
63 void MilitarySite::act(Game & game, uint32_t const data)
64 {
65 // TODO(unknown): do all kinds of stuff, but if you do nothing, let
66- // ProductionSite::act() handle all this. Also note, that some ProductionSite
67- // commands rely, that ProductionSite::act() is not called for a certain
68+ // Building::act() handle all this. Also note, that some Building
69+ // commands rely, that Building::act() is not called for a certain
70 // period (like cmdAnimation). This should be reworked.
71 // Maybe a new queueing system like MilitaryAct could be introduced.
72
73- ProductionSite::act(game, data);
74+ Building::act(game, data);
75
76 const int32_t timeofgame = game.get_gametime();
77 if (m_normal_soldier_request && m_upgrade_soldier_request)
78@@ -624,7 +629,7 @@
79 */
80 void MilitarySite::remove_worker(Worker & w)
81 {
82- ProductionSite::remove_worker(w);
83+ Building::remove_worker(w);
84
85 if (upcast(Soldier, soldier, &w))
86 pop_soldier_job(soldier, nullptr);
87
88=== modified file 'src/logic/militarysite.h'
89--- src/logic/militarysite.h 2015-11-11 09:52:55 +0000
90+++ src/logic/militarysite.h 2015-12-28 22:03:06 +0000
91@@ -23,8 +23,9 @@
92 #include <memory>
93
94 #include "base/macros.h"
95+#include "economy/request.h"
96 #include "logic/attackable.h"
97-#include "logic/productionsite.h"
98+#include "logic/building.h"
99 #include "logic/requirements.h"
100 #include "logic/soldiercontrol.h"
101 #include "scripting/lua_table.h"
102@@ -34,7 +35,7 @@
103 class Soldier;
104 class World;
105
106-class MilitarySiteDescr : public ProductionSiteDescr {
107+class MilitarySiteDescr : public BuildingDescr {
108 public:
109 MilitarySiteDescr(const std::string& init_descname, const LuaTable& t, const EditorGameBase& egbase);
110 ~MilitarySiteDescr() override {}
111@@ -65,7 +66,7 @@
112 };
113
114 class MilitarySite :
115- public ProductionSite, public SoldierControl, public Attackable
116+ public Building, public SoldierControl, public Attackable
117 {
118 friend class MapBuildingdataPacket;
119 MO_DESCR(MilitarySiteDescr)
120
121=== modified file 'src/map_io/map_buildingdata_packet.cc'
122--- src/map_io/map_buildingdata_packet.cc 2015-11-11 09:53:54 +0000
123+++ src/map_io/map_buildingdata_packet.cc 2015-12-28 22:03:06 +0000
124@@ -59,7 +59,7 @@
125 constexpr uint16_t kCurrentPacketVersionConstructionsite = 3;
126 constexpr uint16_t kCurrentPacketPFBuilding = 1;
127 constexpr uint16_t kCurrentPacketVersionWarehouse = 6;
128-constexpr uint16_t kCurrentPacketVersionMilitarysite = 4;
129+constexpr uint16_t kCurrentPacketVersionMilitarysite = 5;
130 constexpr uint16_t kCurrentPacketVersionProductionsite = 5;
131 constexpr uint16_t kCurrentPacketVersionTrainingsite = 4;
132
133@@ -187,12 +187,12 @@
134 read_constructionsite(*constructionsite, fr, game, mol);
135 } else if (upcast(DismantleSite, dms, &building)) {
136 read_dismantlesite(*dms, fr, game, mol);
137+ } else if (upcast(MilitarySite, militarysite, &building)) {
138+ read_militarysite(*militarysite, fr, game, mol);
139 } else if (upcast(Warehouse, warehouse, &building)) {
140 read_warehouse(*warehouse, fr, game, mol);
141 } else if (upcast(ProductionSite, productionsite, &building)) {
142- if (upcast(MilitarySite, militarysite, productionsite)) {
143- read_militarysite(*militarysite, fr, game, mol);
144- } else if (upcast(TrainingSite, trainingsite, productionsite)) {
145+ if (upcast(TrainingSite, trainingsite, productionsite)) {
146 read_trainingsite(*trainingsite, fr, game, mol);
147 } else {
148 read_productionsite(*productionsite, fr, game, mol);
149@@ -509,8 +509,6 @@
150 try {
151 uint16_t const packet_version = fr.unsigned_16();
152 if (packet_version == kCurrentPacketVersionMilitarysite) {
153- read_productionsite(militarysite, fr, game, mol);
154-
155 militarysite.m_normal_soldier_request.reset();
156
157 if (fr.unsigned_8()) {
158@@ -946,13 +944,12 @@
159 write_constructionsite(*constructionsite, fw, game, mos);
160 } else if (upcast(DismantleSite const, dms, building)) {
161 write_dismantlesite(*dms, fw, game, mos);
162+ } else if (upcast(MilitarySite const, militarysite, building)) {
163+ write_militarysite(*militarysite, fw, game, mos);
164 } else if (upcast(Warehouse const, warehouse, building)) {
165 write_warehouse (*warehouse, fw, game, mos);
166 } else if (upcast(ProductionSite const, productionsite, building)) {
167- if (upcast(MilitarySite const, militarysite, productionsite)) {
168- write_militarysite(*militarysite, fw, game, mos);
169- }
170- else if (upcast(TrainingSite const, trainingsite, productionsite)) {
171+ if (upcast(TrainingSite const, trainingsite, productionsite)) {
172 write_trainingsite(*trainingsite, fw, game, mos);
173 }
174 else {
175@@ -1135,7 +1132,6 @@
176 MapObjectSaver & mos)
177 {
178 fw.unsigned_16(kCurrentPacketVersionMilitarysite);
179- write_productionsite(militarysite, fw, game, mos);
180
181 if (militarysite.m_normal_soldier_request) {
182 fw.unsigned_8(1);
183
184=== modified file 'src/scripting/lua_map.cc'
185--- src/scripting/lua_map.cc 2015-11-21 11:47:05 +0000
186+++ src/scripting/lua_map.cc 2015-12-28 22:03:06 +0000
187@@ -4938,7 +4938,6 @@
188 lua_pop(L, 1); // Pop the meta table
189
190 register_class<LuaMilitarySiteDescription>(L, "map", true);
191- add_parent<LuaMilitarySiteDescription, LuaProductionSiteDescription>(L);
192 add_parent<LuaMilitarySiteDescription, LuaBuildingDescription>(L);
193 add_parent<LuaMilitarySiteDescription, LuaMapObjectDescription>(L);
194 lua_pop(L, 1); // Pop the meta table
195
196=== modified file 'src/scripting/lua_map.h'
197--- src/scripting/lua_map.h 2015-11-03 12:12:02 +0000
198+++ src/scripting/lua_map.h 2015-12-28 22:03:06 +0000
199@@ -328,17 +328,17 @@
200 };
201
202
203-class LuaMilitarySiteDescription : public LuaProductionSiteDescription {
204+class LuaMilitarySiteDescription : public LuaBuildingDescription {
205 public:
206 LUNA_CLASS_HEAD(LuaMilitarySiteDescription);
207
208 virtual ~LuaMilitarySiteDescription() {}
209
210 LuaMilitarySiteDescription() {}
211- LuaMilitarySiteDescription(const Widelands::ProductionSiteDescr* const militarysitedescr)
212- : LuaProductionSiteDescription(militarysitedescr) {
213+ LuaMilitarySiteDescription(const Widelands::MilitarySiteDescr* const militarysitedescr)
214+ : LuaBuildingDescription(militarysitedescr) {
215 }
216- LuaMilitarySiteDescription(lua_State* L) : LuaProductionSiteDescription(L) {
217+ LuaMilitarySiteDescription(lua_State* L) : LuaBuildingDescription(L) {
218 }
219
220 /*
221@@ -367,7 +367,7 @@
222 virtual ~LuaTrainingSiteDescription() {}
223
224 LuaTrainingSiteDescription() {}
225- LuaTrainingSiteDescription(const Widelands::ProductionSiteDescr* const trainingsitedescr)
226+ LuaTrainingSiteDescription(const Widelands::TrainingSiteDescr* const trainingsitedescr)
227 : LuaProductionSiteDescription(trainingsitedescr) {
228 }
229 LuaTrainingSiteDescription(lua_State* L) : LuaProductionSiteDescription(L) {
230
231=== modified file 'tribes/buildings/militarysites/atlanteans/castle/init.lua'
232--- tribes/buildings/militarysites/atlanteans/castle/init.lua 2015-12-11 16:54:00 +0000
233+++ tribes/buildings/militarysites/atlanteans/castle/init.lua 2015-12-28 22:03:06 +0000
234@@ -37,10 +37,6 @@
235 prohibited_till = 1500
236 },
237
238- outputs = {
239- "atlanteans_soldier",
240- },
241-
242 max_soldiers = 12,
243 heal_per_second = 200,
244 conquers = 12,
245
246=== modified file 'tribes/buildings/militarysites/atlanteans/guardhall/init.lua'
247--- tribes/buildings/militarysites/atlanteans/guardhall/init.lua 2015-12-11 16:54:00 +0000
248+++ tribes/buildings/militarysites/atlanteans/guardhall/init.lua 2015-12-28 22:03:06 +0000
249@@ -32,10 +32,6 @@
250 }
251 },
252
253- outputs = {
254- "atlanteans_soldier",
255- },
256-
257 max_soldiers = 7,
258 heal_per_second = 140,
259 conquers = 7,
260
261=== modified file 'tribes/buildings/militarysites/atlanteans/guardhouse/init.lua'
262--- tribes/buildings/militarysites/atlanteans/guardhouse/init.lua 2015-12-11 16:54:00 +0000
263+++ tribes/buildings/militarysites/atlanteans/guardhouse/init.lua 2015-12-28 22:03:06 +0000
264@@ -30,11 +30,6 @@
265 }
266 },
267
268- -- TODO(GunChleoc): Get rid of this when we inherit from BuildingDescr directly.
269- outputs = {
270- "atlanteans_soldier",
271- },
272-
273 max_soldiers = 2,
274 heal_per_second = 75,
275 conquers = 6,
276
277=== modified file 'tribes/buildings/militarysites/atlanteans/tower/init.lua'
278--- tribes/buildings/militarysites/atlanteans/tower/init.lua 2015-12-11 16:54:00 +0000
279+++ tribes/buildings/militarysites/atlanteans/tower/init.lua 2015-12-28 22:03:06 +0000
280@@ -36,10 +36,6 @@
281 }
282 },
283
284- outputs = {
285- "atlanteans_soldier",
286- },
287-
288 max_soldiers = 4,
289 heal_per_second = 120,
290 conquers = 9,
291
292=== modified file 'tribes/buildings/militarysites/atlanteans/tower_high/init.lua'
293--- tribes/buildings/militarysites/atlanteans/tower_high/init.lua 2015-12-11 16:54:00 +0000
294+++ tribes/buildings/militarysites/atlanteans/tower_high/init.lua 2015-12-28 22:03:06 +0000
295@@ -28,10 +28,6 @@
296
297 aihints = {},
298
299- outputs = {
300- "atlanteans_soldier",
301- },
302-
303 max_soldiers = 5,
304 heal_per_second = 170,
305 conquers = 9,
306
307=== modified file 'tribes/buildings/militarysites/atlanteans/tower_small/init.lua'
308--- tribes/buildings/militarysites/atlanteans/tower_small/init.lua 2015-12-11 16:54:00 +0000
309+++ tribes/buildings/militarysites/atlanteans/tower_small/init.lua 2015-12-28 22:03:06 +0000
310@@ -31,10 +31,6 @@
311 fighting = true
312 },
313
314- outputs = {
315- "atlanteans_soldier",
316- },
317-
318 max_soldiers = 3,
319 heal_per_second = 100,
320 conquers = 5,
321
322=== modified file 'tribes/buildings/militarysites/barbarians/barrier/init.lua'
323--- tribes/buildings/militarysites/barbarians/barrier/init.lua 2015-12-11 16:54:00 +0000
324+++ tribes/buildings/militarysites/barbarians/barrier/init.lua 2015-12-28 22:03:06 +0000
325@@ -34,10 +34,6 @@
326 }
327 },
328
329- outputs = {
330- "barbarians_soldier",
331- },
332-
333 aihints = {},
334
335 max_soldiers = 5,
336
337=== modified file 'tribes/buildings/militarysites/barbarians/citadel/init.lua'
338--- tribes/buildings/militarysites/barbarians/citadel/init.lua 2015-12-11 16:54:00 +0000
339+++ tribes/buildings/militarysites/barbarians/citadel/init.lua 2015-12-28 22:03:06 +0000
340@@ -40,10 +40,6 @@
341
342 aihints = {},
343
344- outputs = {
345- "barbarians_soldier",
346- },
347-
348 max_soldiers = 12,
349 heal_per_second = 220,
350 conquers = 12,
351
352=== modified file 'tribes/buildings/militarysites/barbarians/fortress/init.lua'
353--- tribes/buildings/militarysites/barbarians/fortress/init.lua 2015-12-11 16:54:00 +0000
354+++ tribes/buildings/militarysites/barbarians/fortress/init.lua 2015-12-28 22:03:06 +0000
355@@ -46,10 +46,6 @@
356 prohibited_till=1500
357 },
358
359- outputs = {
360- "barbarians_soldier",
361- },
362-
363 max_soldiers = 8,
364 heal_per_second = 170,
365 conquers = 11,
366
367=== modified file 'tribes/buildings/militarysites/barbarians/sentry/init.lua'
368--- tribes/buildings/militarysites/barbarians/sentry/init.lua 2015-12-11 16:54:00 +0000
369+++ tribes/buildings/militarysites/barbarians/sentry/init.lua 2015-12-28 22:03:06 +0000
370@@ -38,10 +38,6 @@
371 mountain_conqueror = true
372 },
373
374- outputs = {
375- "barbarians_soldier",
376- },
377-
378 max_soldiers = 2,
379 heal_per_second = 80,
380 conquers = 6,
381
382=== modified file 'tribes/buildings/militarysites/barbarians/tower/init.lua'
383--- tribes/buildings/militarysites/barbarians/tower/init.lua 2015-12-11 16:54:00 +0000
384+++ tribes/buildings/militarysites/barbarians/tower/init.lua 2015-12-28 22:03:06 +0000
385@@ -43,10 +43,6 @@
386 prohibited_till = 1200
387 },
388
389- outputs = {
390- "barbarians_soldier",
391- },
392-
393 max_soldiers = 5,
394 heal_per_second = 150,
395 conquers = 8,
396
397=== modified file 'tribes/buildings/militarysites/empire/barrier/init.lua'
398--- tribes/buildings/militarysites/empire/barrier/init.lua 2015-12-11 16:54:00 +0000
399+++ tribes/buildings/militarysites/empire/barrier/init.lua 2015-12-28 22:03:06 +0000
400@@ -42,10 +42,6 @@
401 fighting = true
402 },
403
404- outputs = {
405- "empire_soldier",
406- },
407-
408 max_soldiers = 5,
409 heal_per_second = 130,
410 conquers = 8,
411
412=== modified file 'tribes/buildings/militarysites/empire/blockhouse/init.lua'
413--- tribes/buildings/militarysites/empire/blockhouse/init.lua 2015-12-11 16:54:00 +0000
414+++ tribes/buildings/militarysites/empire/blockhouse/init.lua 2015-12-28 22:03:06 +0000
415@@ -27,10 +27,6 @@
416
417 aihints = {},
418
419- outputs = {
420- "empire_soldier",
421- },
422-
423 max_soldiers = 1,
424 heal_per_second = 60, -- very low -> smallest building
425 conquers = 6,
426
427=== modified file 'tribes/buildings/militarysites/empire/castle/init.lua'
428--- tribes/buildings/militarysites/empire/castle/init.lua 2015-12-11 16:54:00 +0000
429+++ tribes/buildings/militarysites/empire/castle/init.lua 2015-12-28 22:03:06 +0000
430@@ -31,10 +31,6 @@
431
432 aihints = {},
433
434- outputs = {
435- "empire_soldier",
436- },
437-
438 max_soldiers = 12,
439 heal_per_second = 220,
440 conquers = 12,
441
442=== modified file 'tribes/buildings/militarysites/empire/fortress/init.lua'
443--- tribes/buildings/militarysites/empire/fortress/init.lua 2015-12-11 16:54:00 +0000
444+++ tribes/buildings/militarysites/empire/fortress/init.lua 2015-12-28 22:03:06 +0000
445@@ -36,10 +36,6 @@
446 }
447 },
448
449- outputs = {
450- "empire_soldier",
451- },
452-
453 aihints = {
454 expansion = true,
455 fighting = true,
456
457=== modified file 'tribes/buildings/militarysites/empire/outpost/init.lua'
458--- tribes/buildings/militarysites/empire/outpost/init.lua 2015-12-11 16:54:00 +0000
459+++ tribes/buildings/militarysites/empire/outpost/init.lua 2015-12-28 22:03:06 +0000
460@@ -33,10 +33,6 @@
461 prohibited_till=600
462 },
463
464- outputs = {
465- "empire_soldier",
466- },
467-
468 max_soldiers = 3,
469 heal_per_second = 100,
470 conquers = 7,
471
472=== modified file 'tribes/buildings/militarysites/empire/sentry/init.lua'
473--- tribes/buildings/militarysites/empire/sentry/init.lua 2015-12-11 16:54:00 +0000
474+++ tribes/buildings/militarysites/empire/sentry/init.lua 2015-12-28 22:03:06 +0000
475@@ -39,10 +39,6 @@
476 mountain_conqueror = true
477 },
478
479- outputs = {
480- "empire_soldier",
481- },
482-
483 max_soldiers = 2,
484 heal_per_second = 80,
485 conquers = 6,
486
487=== modified file 'tribes/buildings/militarysites/empire/tower/init.lua'
488--- tribes/buildings/militarysites/empire/tower/init.lua 2015-12-11 16:54:00 +0000
489+++ tribes/buildings/militarysites/empire/tower/init.lua 2015-12-28 22:03:06 +0000
490@@ -38,10 +38,6 @@
491 prohibited_till = 300
492 },
493
494- outputs = {
495- "empire_soldier",
496- },
497-
498 max_soldiers = 5,
499 heal_per_second = 150,
500 conquers = 9,
501
502=== modified file 'tribes/scripting/help/building_help.lua'
503--- tribes/scripting/help/building_help.lua 2015-12-03 21:12:12 +0000
504+++ tribes/scripting/help/building_help.lua 2015-12-28 22:03:06 +0000
505@@ -174,15 +174,16 @@
506
507
508 -- RST
509--- .. function building_help_general_string(building_description)
510+-- .. function building_help_general_string(tribe, building_description)
511 --
512 -- Creates the string for the general section in building help
513 --
514+-- :arg tribe: The :class:`LuaTribeDescription` for the tribe that has this building.
515 -- :arg building_description: The :class:`LuaBuildingDescription` for the building
516 -- that we are displaying this help for.
517 -- :returns: rt of the formatted text
518 --
519-function building_help_general_string(building_description)
520+function building_help_general_string(tribe, building_description)
521 -- TRANSLATORS: Heading for a flavour text in the building help.
522 local result = rt(h2(_"Lore")) ..
523 rt("image=" .. building_description.representative_image, p(building_helptext_lore()))
524@@ -199,12 +200,13 @@
525 -- TODO(GunChleoc) use aihints for gamekeeper, forester?
526 local representative_resource = nil
527 if (building_description.type_name == "productionsite" or
528- building_description.type_name == "militarysite" or
529 building_description.type_name == "trainingsite") then
530 representative_resource = building_description.output_ware_types[1]
531 if(not representative_resource) then
532 representative_resource = building_description.output_worker_types[1]
533 end
534+ elseif (building_description.type_name == "militarysite") then
535+ representative_resource = wl.Game():get_worker_description(tribe.soldier)
536 -- TODO(GunChleoc) need a bob_descr for the ship -> port and shipyard
537 -- TODO(GunChleoc) create descr objects for flag, portdock, ...
538 elseif (building_description.is_port or building_description.name == "shipyard") then
539@@ -720,33 +722,33 @@
540 include(building_description.helptext_script)
541
542 if (building_description.type_name == "productionsite") then
543- return building_help_general_string(building_description) ..
544+ return building_help_general_string(tribe, building_description) ..
545 building_help_dependencies_production(tribe, building_description) ..
546 building_help_crew_string(tribe, building_description) ..
547 building_help_building_section(building_description) ..
548 building_help_production_section()
549 elseif (building_description.type_name == "militarysite") then
550- return building_help_general_string(building_description) ..
551+ return building_help_general_string(tribe, building_description) ..
552 building_help_building_section(building_description)
553 elseif (building_description.type_name == "warehouse") then
554 if (building_description.is_port) then
555- return building_help_general_string(building_description) ..
556+ return building_help_general_string(tribe, building_description) ..
557 -- TODO(GunChleoc) expedition costs here?
558 building_help_building_section(building_description) ..
559 building_help_production_section()
560 else
561- return building_help_general_string(building_description) ..
562+ return building_help_general_string(tribe, building_description) ..
563 building_help_building_section(building_description)
564 end
565 elseif (building_description.type_name == "trainingsite") then
566- return building_help_general_string(building_description) ..
567+ return building_help_general_string(tribe, building_description) ..
568 building_help_dependencies_training(tribe, building_description) ..
569 building_help_crew_string(tribe, building_description) ..
570 building_help_building_section(building_description) ..building_help_production_section()
571 elseif (building_description.type_name == "constructionsite" or
572 building_description.type_name == "dismantlesite") then
573 -- TODO(GunChleoc) Get them a crew string for the builder
574- return building_help_general_string(building_description)
575+ return building_help_general_string(tribe, building_description)
576 else
577 return ""
578 end

Subscribers

People subscribed via source and target branches

to status/vote changes: