From c66962a2aa8ee9dedb2448c93f61e79f7177faac Mon Sep 17 00:00:00 2001 From: bb Date: Fri, 12 Apr 2019 14:12:16 +0000 Subject: [PATCH] Reduce duplication in template_structure_military* Patch By: Nescio Differential Revision: https://code.wildfiregames.com/D1793 This was SVN commit r22181. --- .../templates/template_structure_military.xml | 14 ++++++++++++++ .../template_structure_military_barracks.xml | 12 ------------ .../template_structure_military_barracks_range.xml | 2 +- ...emplate_structure_military_barracks_stables.xml | 2 +- .../template_structure_military_blacksmith.xml | 8 -------- .../templates/template_structure_military_dock.xml | 2 ++ ...emplate_structure_military_elephant_stables.xml | 8 -------- .../template_structure_military_embassy.xml | 5 ----- .../template_structure_military_fortress.xml | 4 ---- .../template_structure_military_kennel.xml | 4 ---- .../template_structure_military_workshop.xml | 9 --------- 11 files changed, 18 insertions(+), 52 deletions(-) diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military.xml b/binaries/data/mods/public/simulation/templates/template_structure_military.xml index 43f614f463..ab1e73e75d 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_military.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_military.xml @@ -10,8 +10,22 @@ 1 + + Military + + + 0.1 + Unit + 0 + 2 + Military Structure Military + + false + 50 + 40000 + 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 ca29079503..c4ba9e13bd 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 @@ -1,8 +1,5 @@ - - Barracks - 150 @@ -15,11 +12,7 @@ 10 - 0.1 - Unit Infantry Cavalry - 0 - 2 2000 @@ -64,11 +57,6 @@ interface/complete/building/complete_barracks.xml - - false - 50 - 40000 - 32 diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_barracks_range.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_barracks_range.xml index aadc9dabc6..e90e1a1b56 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_military_barracks_range.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_military_barracks_range.xml @@ -1,7 +1,7 @@ - Infantry -Cavalry + -Cavalry Archery diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_barracks_stables.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_barracks_stables.xml index a59ab162dd..3bfe6bb24d 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_military_barracks_stables.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_military_barracks_stables.xml @@ -1,7 +1,7 @@ - Cavalry -Infantry + -Infantry Stables diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_blacksmith.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_blacksmith.xml index 718fad78b9..643e7f48d3 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_military_blacksmith.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_military_blacksmith.xml @@ -1,8 +1,5 @@ - - Barracks - 200 @@ -15,11 +12,7 @@ 1 - 0.1 - Unit Infantry Healer - 0 - 2 2000 @@ -65,7 +58,6 @@ - false 38 30000 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 104abcdbc2..18e293bca0 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 @@ -16,6 +16,7 @@ 8.0 + 2500 decay|rubble/rubble_stone_4x4 @@ -73,6 +74,7 @@ + 40 diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stables.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stables.xml index a107519cf2..3176e80cfe 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stables.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stables.xml @@ -1,8 +1,5 @@ - - Barracks - 300 @@ -18,11 +15,8 @@ 5 - 0.1 - Unit Elephant 1 - 2 3000 @@ -58,9 +52,7 @@ - false 38 - 40000 structures/fndn_5x5.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 5d4667eddd..9a69a1d261 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,11 +27,8 @@ 6 - 0.1 - Unit Support Infantry Cavalry 1 - 2 2000 @@ -61,9 +58,7 @@ - false 25 - 40000 24 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 3de385479f..d09b9d5844 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 @@ -56,9 +56,7 @@ 20 0.075 - Unit Support Infantry Cavalry Siege - 0 6 @@ -103,9 +101,7 @@ - false 100 - 40000 80 diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_kennel.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_kennel.xml index 41f4cb88a9..f6f096cc37 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_military_kennel.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_military_kennel.xml @@ -27,11 +27,8 @@ 5 - 0.1 - Unit Dog 1 - 2 500 @@ -67,7 +64,6 @@ 8.0 - false 20 30000 diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_workshop.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_workshop.xml index d183484513..4bef6386ca 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_military_workshop.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_military_workshop.xml @@ -3,9 +3,6 @@ structures/workshop_repair - - Barracks - 200 @@ -18,11 +15,7 @@ 2 - 0.1 - Unit Siege - 0 - 2 2000 @@ -67,9 +60,7 @@ - false 38 - 40000 structures/fndn_5x5.xml