From 8d80a2186e5ef3cbdf5e9593c361572e4cebebb3 Mon Sep 17 00:00:00 2001 From: Freagarach Date: Fri, 26 Nov 2021 17:12:26 +0000 Subject: [PATCH] Some fixes after the ProductionQueue split. 0c4f59d0a7 / 8475c16c31 introduced a serialisation error (#6391). Also the templates and the code could be improved. Differential revision: https://code.wildfiregames.com/D4352 Comments by: @Silier, @Stan Fixes: #6391 This was SVN commit r26015. --- .../simulation/components/ProductionQueue.js | 80 +++++++++++-------- .../simulation/components/Researcher.js | 3 +- .../public/simulation/components/Trainer.js | 2 + .../templates/structures/athen/gymnasium.xml | 1 + .../templates/structures/athen/prytaneion.xml | 1 + .../templates/structures/gaul/assembly.xml | 1 + .../templates/structures/pers/apadana.xml | 1 + .../templates/structures/rome/army_camp.xml | 1 + .../templates/structures/spart/gerousia.xml | 1 + .../templates/structures/spart/syssiton.xml | 1 + .../templates/template_structure.xml | 13 --- .../template_structure_civic_civil_centre.xml | 1 + .../template_structure_civic_house.xml | 1 + .../template_structure_civic_temple.xml | 1 + .../template_structure_defensive_outpost.xml | 1 + .../template_structure_defensive_palisade.xml | 3 - ...te_structure_defensive_tower_artillery.xml | 1 + ...emplate_structure_defensive_tower_bolt.xml | 1 + ...plate_structure_defensive_tower_sentry.xml | 1 + ...mplate_structure_defensive_tower_stone.xml | 1 + .../template_structure_defensive_wall.xml | 3 - .../template_structure_economic_farmstead.xml | 1 + .../template_structure_economic_market.xml | 1 + ...template_structure_economic_storehouse.xml | 1 + .../template_structure_military_arsenal.xml | 1 + .../template_structure_military_barracks.xml | 1 + .../template_structure_military_dock.xml | 1 + ...ate_structure_military_elephant_stable.xml | 1 + .../template_structure_military_embassy.xml | 1 + .../template_structure_military_forge.xml | 1 + .../template_structure_military_fortress.xml | 1 + .../template_structure_military_range.xml | 1 + .../template_structure_military_stable.xml | 1 + .../template_structure_resource_corral.xml | 1 + .../template_structure_resource_field.xml | 3 - ...emplate_structure_special_amphitheater.xml | 1 + .../template_structure_special_library.xml | 3 - .../template_structure_special_rotarymill.xml | 3 - .../template_structure_special_theater.xml | 3 - .../templates/template_structure_wonder.xml | 1 + 40 files changed, 78 insertions(+), 68 deletions(-) diff --git a/binaries/data/mods/public/simulation/components/ProductionQueue.js b/binaries/data/mods/public/simulation/components/ProductionQueue.js index 43b0610d6a..1ded67a66f 100644 --- a/binaries/data/mods/public/simulation/components/ProductionQueue.js +++ b/binaries/data/mods/public/simulation/components/ProductionQueue.js @@ -20,9 +20,32 @@ ProductionQueue.prototype.Item.prototype.Init = function(producer, metadata) { this.producer = producer; this.metadata = metadata; - }; +/** + * @param {string} type - The type of queue to use. + * @param {string} templateName - The template to queue. + * @param {number} count - The amount of template to queue. Only applicable for type == "unit". + * + * @return {boolean} - Whether the item could be queued. + */ +ProductionQueue.prototype.Item.prototype.Queue = function(type, templateName, count) +{ + if (type == "unit") + return this.QueueEntity(templateName, count); + + if (type == "technology") + return this.QueueTechnology(templateName); + + warn("Tried to add invalid item of type \"" + type + "\" and template \"" + templateName + "\" to a production queue (entity: " + this.producer + ")."); + return false; +}; + +/** + * @param {string} templateName - The name of the entity to queue. + * @param {number} count - The number of entities that should be produced. + * @return {boolean} - Whether the batch was successfully created. + */ ProductionQueue.prototype.Item.prototype.QueueEntity = function(templateName, count) { const cmpTrainer = Engine.QueryInterface(this.producer, IID_Trainer); @@ -40,20 +63,21 @@ ProductionQueue.prototype.Item.prototype.QueueEntity = function(templateName, co return true; }; +/** + * @param {string} templateName - The name of the technology to queue. + * @return {boolean} - Whether the technology was successfully queued. + */ ProductionQueue.prototype.Item.prototype.QueueTechnology = function(templateName) { const cmpResearcher = Engine.QueryInterface(this.producer, IID_Researcher); if (!cmpResearcher) return false; this.technology = cmpResearcher.QueueTechnology(templateName, this.metadata); - if (this.technology == -1) - return false; - - return true; + return this.technology != -1; }; /** - * @param {number} id - The id of this item. + * @param {number} id - The id this item needs to get. */ ProductionQueue.prototype.Item.prototype.SetID = function(id) { @@ -62,19 +86,11 @@ ProductionQueue.prototype.Item.prototype.SetID = function(id) ProductionQueue.prototype.Item.prototype.Stop = function() { - if (this.entity) - { - const cmpTrainer = Engine.QueryInterface(this.producer, IID_Trainer); - if (cmpTrainer) - cmpTrainer.StopBatch(this.entity); - } + if (this.entity > 0) + Engine.QueryInterface(this.producer, IID_Trainer)?.StopBatch(this.entity); - if (this.technology) - { - const cmpResearcher = Engine.QueryInterface(this.producer, IID_Researcher); - if (cmpResearcher) - cmpResearcher.StopResearching(this.technology); - } + if (this.technology > 0) + Engine.QueryInterface(this.producer, IID_Researcher)?.StopResearching(this.technology); }; /** @@ -85,6 +101,9 @@ ProductionQueue.prototype.Item.prototype.Start = function() this.started = true; }; +/** + * @return {boolean} - Whether there is work done on the item. + */ ProductionQueue.prototype.Item.prototype.IsStarted = function() { return !!this.started; @@ -142,6 +161,9 @@ ProductionQueue.prototype.Item.prototype.Unpause = function() Engine.QueryInterface(this.producer, IID_Researcher).UnpauseTechnology(this.technology); }; +/** + * @return {boolean} - Whether the item is currently paused. + */ ProductionQueue.prototype.Item.prototype.IsPaused = function() { return !!this.paused; @@ -199,7 +221,6 @@ ProductionQueue.prototype.Item.prototype.Deserialize = function(data) ProductionQueue.prototype.Init = function() { this.nextID = 1; - this.queue = []; }; @@ -309,21 +330,8 @@ ProductionQueue.prototype.AddItem = function(templateName, type, count, metadata const item = new this.Item(); item.Init(this.entity, metadata); - if (type == "unit") - { - if (!item.QueueEntity(templateName, count)) - return false; - } - else if (type == "technology") - { - if (!item.QueueTechnology(templateName)) - return false; - } - else - { - warn("Tried to add invalid item of type \"" + type + "\" and template \"" + templateName + "\" to a production queue"); + if (!item.Queue(type, templateName, count)) return false; - } item.SetID(this.nextID++); if (pushFront) @@ -342,7 +350,7 @@ ProductionQueue.prototype.AddItem = function(templateName, type, count, metadata }; /* - * Removes an item from the queue. + * @param {number} - The ID of the item to remove from the queue. */ ProductionQueue.prototype.RemoveItem = function(id) { @@ -457,7 +465,6 @@ ProductionQueue.prototype.PauseProduction = function() this.StopTimer(); this.paused = true; this.queue[0]?.Pause(); - this.StopTimer(); }; ProductionQueue.prototype.UnpauseProduction = function() @@ -492,6 +499,9 @@ ProductionQueue.prototype.StopTimer = function() delete this.timer; }; +/** + * @return {boolean} - Whether this entity is currently producing. + */ ProductionQueue.prototype.HasQueuedProduction = function() { return this.queue.length > 0; diff --git a/binaries/data/mods/public/simulation/components/Researcher.js b/binaries/data/mods/public/simulation/components/Researcher.js index e9317b7d19..94b6ed0131 100644 --- a/binaries/data/mods/public/simulation/components/Researcher.js +++ b/binaries/data/mods/public/simulation/components/Researcher.js @@ -221,8 +221,7 @@ Researcher.prototype.GetTechnologiesList = function() if (!this.template.Technologies) return []; - let string = this.template.Technologies._string; - string = ApplyValueModificationsToEntity("Researcher/Technologies/_string", string, this.entity); + const string = ApplyValueModificationsToEntity("Researcher/Technologies/_string", this.template.Technologies._string, this.entity); if (!string) return []; diff --git a/binaries/data/mods/public/simulation/components/Trainer.js b/binaries/data/mods/public/simulation/components/Trainer.js index 83aac3fc78..4d7ad215a2 100644 --- a/binaries/data/mods/public/simulation/components/Trainer.js +++ b/binaries/data/mods/public/simulation/components/Trainer.js @@ -386,6 +386,7 @@ Trainer.prototype.Item.prototype.Serialize = function(id) "missingPopSpace": this.missingPopSpace, "paused": this.paused, "player": this.player, + "population": this.population, "trainer": this.trainer, "resource": this.resources, "started": this.started, @@ -403,6 +404,7 @@ Trainer.prototype.Item.prototype.Deserialize = function(data) this.missingPopSpace = data.missingPopSpace; this.paused = data.paused; this.player = data.player; + this.population = data.population; this.trainer = data.trainer; this.resources = data.resources; this.started = data.started; diff --git a/binaries/data/mods/public/simulation/templates/structures/athen/gymnasium.xml b/binaries/data/mods/public/simulation/templates/structures/athen/gymnasium.xml index 51bcfc6759..acf74d3116 100644 --- a/binaries/data/mods/public/simulation/templates/structures/athen/gymnasium.xml +++ b/binaries/data/mods/public/simulation/templates/structures/athen/gymnasium.xml @@ -33,6 +33,7 @@ + diff --git a/binaries/data/mods/public/simulation/templates/structures/athen/prytaneion.xml b/binaries/data/mods/public/simulation/templates/structures/athen/prytaneion.xml index 3831aeeb93..41e436e7cd 100644 --- a/binaries/data/mods/public/simulation/templates/structures/athen/prytaneion.xml +++ b/binaries/data/mods/public/simulation/templates/structures/athen/prytaneion.xml @@ -33,6 +33,7 @@ + long_walls diff --git a/binaries/data/mods/public/simulation/templates/structures/gaul/assembly.xml b/binaries/data/mods/public/simulation/templates/structures/gaul/assembly.xml index ce2665f6a3..4c0b9ca429 100644 --- a/binaries/data/mods/public/simulation/templates/structures/gaul/assembly.xml +++ b/binaries/data/mods/public/simulation/templates/structures/gaul/assembly.xml @@ -38,6 +38,7 @@ + diff --git a/binaries/data/mods/public/simulation/templates/structures/pers/apadana.xml b/binaries/data/mods/public/simulation/templates/structures/pers/apadana.xml index 3f3f654fa4..c1acfbaffb 100644 --- a/binaries/data/mods/public/simulation/templates/structures/pers/apadana.xml +++ b/binaries/data/mods/public/simulation/templates/structures/pers/apadana.xml @@ -37,6 +37,7 @@ + immortals diff --git a/binaries/data/mods/public/simulation/templates/structures/rome/army_camp.xml b/binaries/data/mods/public/simulation/templates/structures/rome/army_camp.xml index aad21c9bbd..14d8d0e9f7 100644 --- a/binaries/data/mods/public/simulation/templates/structures/rome/army_camp.xml +++ b/binaries/data/mods/public/simulation/templates/structures/rome/army_camp.xml @@ -83,6 +83,7 @@ + diff --git a/binaries/data/mods/public/simulation/templates/structures/spart/gerousia.xml b/binaries/data/mods/public/simulation/templates/structures/spart/gerousia.xml index bed04e4ced..8d795357e0 100644 --- a/binaries/data/mods/public/simulation/templates/structures/spart/gerousia.xml +++ b/binaries/data/mods/public/simulation/templates/structures/spart/gerousia.xml @@ -33,6 +33,7 @@ + diff --git a/binaries/data/mods/public/simulation/templates/structures/spart/syssiton.xml b/binaries/data/mods/public/simulation/templates/structures/spart/syssiton.xml index 1822f32f04..96a495e2cb 100644 --- a/binaries/data/mods/public/simulation/templates/structures/spart/syssiton.xml +++ b/binaries/data/mods/public/simulation/templates/structures/spart/syssiton.xml @@ -34,6 +34,7 @@ + agoge diff --git a/binaries/data/mods/public/simulation/templates/template_structure.xml b/binaries/data/mods/public/simulation/templates/template_structure.xml index c8eef7ff74..24f71517c4 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure.xml @@ -77,7 +77,6 @@ 0 6 - special/rallypoint @@ -94,15 +93,6 @@ 2.0 - - - 1.0 - 1.0 - 1.0 - 1.0 - - - @@ -161,9 +151,6 @@ 20 neutral enemy - - 1.0 - true false diff --git a/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml b/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml index c5447e06c6..6a50b3e5cd 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml @@ -90,6 +90,7 @@ 20 + phase_town_{civ} diff --git a/binaries/data/mods/public/simulation/templates/template_structure_civic_house.xml b/binaries/data/mods/public/simulation/templates/template_structure_civic_house.xml index 8d10fa20d1..e4ca0bcaf6 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_civic_house.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_civic_house.xml @@ -38,6 +38,7 @@ 5 + health_females_01 diff --git a/binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml b/binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml index 7f9743b4c3..e6a1cf41db 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml @@ -39,6 +39,7 @@ + heal_range diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defensive_outpost.xml b/binaries/data/mods/public/simulation/templates/template_structure_defensive_outpost.xml index 9f66224f06..76076b5c61 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_defensive_outpost.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_defensive_outpost.xml @@ -37,6 +37,7 @@ + outpost_vision diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defensive_palisade.xml b/binaries/data/mods/public/simulation/templates/template_structure_defensive_palisade.xml index c9747b5384..e78946d4ea 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_defensive_palisade.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_defensive_palisade.xml @@ -16,9 +16,7 @@ Palisade gaia/special_palisade.png - - @@ -34,5 +32,4 @@ interface/complete/building/complete_wall.xml - diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_artillery.xml b/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_artillery.xml index 6b3222d191..8a4b46f494 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_artillery.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_artillery.xml @@ -60,6 +60,7 @@ + tower_health diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_bolt.xml b/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_bolt.xml index f927d99598..695b73e9e4 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_bolt.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_bolt.xml @@ -57,6 +57,7 @@ + tower_health diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_sentry.xml b/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_sentry.xml index ca658b6389..22265a32a3 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_sentry.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_sentry.xml @@ -38,6 +38,7 @@ + tower_watch diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_stone.xml b/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_stone.xml index cb451f23d0..bbbe16d370 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_stone.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_stone.xml @@ -37,6 +37,7 @@ + tower_watch diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall.xml b/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall.xml index c1c3f16c9f..0b3e718f56 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall.xml @@ -19,11 +19,9 @@ - 4.5 - @@ -35,5 +33,4 @@ 20 65535 - diff --git a/binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml b/binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml index a9faaef44d..88b945bc7f 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml @@ -34,6 +34,7 @@ 20 + diff --git a/binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml b/binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml index e688686fad..b140ce08d4 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml @@ -39,6 +39,7 @@ + trader_health diff --git a/binaries/data/mods/public/simulation/templates/template_structure_economic_storehouse.xml b/binaries/data/mods/public/simulation/templates/template_structure_economic_storehouse.xml index 0a89dbb49d..59277b1fb8 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_economic_storehouse.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_economic_storehouse.xml @@ -35,6 +35,7 @@ + diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_arsenal.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_arsenal.xml index b16d37de0c..d105cf575a 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_military_arsenal.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_military_arsenal.xml @@ -35,6 +35,7 @@ + siege_attack diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml index 6ee50cce3e..04a8e31587 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml @@ -37,6 +37,7 @@ + barracks_batch_training diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_dock.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_dock.xml index f58d249237..e543620dba 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_military_dock.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_military_dock.xml @@ -41,6 +41,7 @@ true 0.0 + ship diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stable.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stable.xml index da2c4f4a7f..6889c61916 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stable.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stable.xml @@ -37,6 +37,7 @@ + interface/complete/building/complete_elephant_stable.xml diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml index 0e07289095..794a90fe85 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml @@ -27,6 +27,7 @@ + diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_forge.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_forge.xml index 01b3716ea3..f7ec78bc03 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_military_forge.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_military_forge.xml @@ -33,6 +33,7 @@ + soldier_attack_melee_01 diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml index d76c68592b..8d3e8f0c99 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml @@ -77,6 +77,7 @@ + attack_soldiers_will diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_range.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_range.xml index 3076928ca8..64d9adddc0 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_military_range.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_military_range.xml @@ -32,6 +32,7 @@ + interface/complete/building/complete_range.xml diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml index 3c662d03e5..f837a26c0b 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml @@ -37,6 +37,7 @@ + stable_batch_training diff --git a/binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml b/binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml index 5ad677b0a4..08dd3fca7d 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml @@ -28,6 +28,7 @@ + gather_animals_stockbreeding diff --git a/binaries/data/mods/public/simulation/templates/template_structure_resource_field.xml b/binaries/data/mods/public/simulation/templates/template_structure_resource_field.xml index 4ee802c462..7a3b4e2c50 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_resource_field.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_resource_field.xml @@ -32,9 +32,7 @@ false false - - @@ -60,7 +58,6 @@ 8.0 - 0 diff --git a/binaries/data/mods/public/simulation/templates/template_structure_special_amphitheater.xml b/binaries/data/mods/public/simulation/templates/template_structure_special_amphitheater.xml index 71c1191fd9..9535f8010a 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_special_amphitheater.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_special_amphitheater.xml @@ -27,6 +27,7 @@ + diff --git a/binaries/data/mods/public/simulation/templates/template_structure_special_library.xml b/binaries/data/mods/public/simulation/templates/template_structure_special_library.xml index 7667e37671..c0616a4223 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_special_library.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_special_library.xml @@ -34,8 +34,6 @@ - - @@ -47,7 +45,6 @@ 50 40000 - 40 diff --git a/binaries/data/mods/public/simulation/templates/template_structure_special_rotarymill.xml b/binaries/data/mods/public/simulation/templates/template_structure_special_rotarymill.xml index 71f214005e..f0faf2cd61 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_special_rotarymill.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_special_rotarymill.xml @@ -28,9 +28,7 @@ - - food true @@ -49,7 +47,6 @@ 32 40000 - 40 diff --git a/binaries/data/mods/public/simulation/templates/template_structure_special_theater.xml b/binaries/data/mods/public/simulation/templates/template_structure_special_theater.xml index b34e1a2b47..cbcea83aad 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_special_theater.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_special_theater.xml @@ -35,8 +35,6 @@ - - @@ -48,7 +46,6 @@ 100 40000 - 40 diff --git a/binaries/data/mods/public/simulation/templates/template_structure_wonder.xml b/binaries/data/mods/public/simulation/templates/template_structure_wonder.xml index 2b788b6a4d..82db68fe8a 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_wonder.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_wonder.xml @@ -50,6 +50,7 @@ + wonder_population_cap