From 4495467e657d68235f6c22440dd95f64f011dd6c Mon Sep 17 00:00:00 2001 From: bb Date: Thu, 30 May 2019 21:00:18 +0000 Subject: [PATCH] Seperate stable from barracks Including: moves template_structure_military_barracks_stables.xml to template_structure_military_stable.xml updates all its children accordingly merges values from pers_stable.xml into the new generic template changes generic name Stable (singular, without s) standardizes rubble sizes to 5x5 (pers had 4x4) corrects specific name for Greek factions adds foundation actor to kush_stable.xml Patch By: Nescio Comments By: Angen Differential Revision: https://code.wildfiregames.com/D1790 This was SVN commit r22322. --- .../templates/structures/athen_stable.xml | 7 +-- .../templates/structures/brit_stable.xml | 5 +- .../templates/structures/cart_stable.xml | 5 +- .../templates/structures/gaul_stable.xml | 5 +- .../templates/structures/iber_stable.xml | 5 +- .../templates/structures/kush_stable.xml | 14 +---- .../templates/structures/mace_stable.xml | 7 +-- .../templates/structures/maur_stable.xml | 5 +- .../templates/structures/pers_stable.xml | 31 +--------- .../templates/structures/ptol_stable.xml | 6 +- .../templates/structures/rome_stable.xml | 5 +- .../templates/structures/sele_stable.xml | 6 +- .../templates/structures/spart_stable.xml | 7 +-- ...te_structure_military_barracks_stables.xml | 24 -------- .../template_structure_military_stable.xml | 59 +++++++++++++++++++ 15 files changed, 78 insertions(+), 113 deletions(-) delete mode 100644 binaries/data/mods/public/simulation/templates/template_structure_military_barracks_stables.xml create mode 100644 binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml diff --git a/binaries/data/mods/public/simulation/templates/structures/athen_stable.xml b/binaries/data/mods/public/simulation/templates/structures/athen_stable.xml index b50c6ea98a..cc550e5e15 100644 --- a/binaries/data/mods/public/simulation/templates/structures/athen_stable.xml +++ b/binaries/data/mods/public/simulation/templates/structures/athen_stable.xml @@ -1,15 +1,12 @@ - + 12.0 - - decay|rubble/rubble_stone_5x5 - athen - Stratēgeîon + Hippṓn diff --git a/binaries/data/mods/public/simulation/templates/structures/brit_stable.xml b/binaries/data/mods/public/simulation/templates/structures/brit_stable.xml index 3860b96db4..f5d24da613 100644 --- a/binaries/data/mods/public/simulation/templates/structures/brit_stable.xml +++ b/binaries/data/mods/public/simulation/templates/structures/brit_stable.xml @@ -1,12 +1,9 @@ - + 12.0 - - decay|rubble/rubble_stone_5x5 - brit Eposton diff --git a/binaries/data/mods/public/simulation/templates/structures/cart_stable.xml b/binaries/data/mods/public/simulation/templates/structures/cart_stable.xml index e68fe66fa0..aa39a6fc72 100644 --- a/binaries/data/mods/public/simulation/templates/structures/cart_stable.xml +++ b/binaries/data/mods/public/simulation/templates/structures/cart_stable.xml @@ -1,12 +1,9 @@ - + 12.0 - - decay|rubble/rubble_stone_5x5 - cart diff --git a/binaries/data/mods/public/simulation/templates/structures/gaul_stable.xml b/binaries/data/mods/public/simulation/templates/structures/gaul_stable.xml index 4f2703090e..acdb9938d8 100644 --- a/binaries/data/mods/public/simulation/templates/structures/gaul_stable.xml +++ b/binaries/data/mods/public/simulation/templates/structures/gaul_stable.xml @@ -1,12 +1,9 @@ - + 12.0 - - decay|rubble/rubble_stone_5x5 - gaul Eposton diff --git a/binaries/data/mods/public/simulation/templates/structures/iber_stable.xml b/binaries/data/mods/public/simulation/templates/structures/iber_stable.xml index 52341430c3..36d845862a 100644 --- a/binaries/data/mods/public/simulation/templates/structures/iber_stable.xml +++ b/binaries/data/mods/public/simulation/templates/structures/iber_stable.xml @@ -1,12 +1,9 @@ - + 12.0 - - decay|rubble/rubble_stone_5x5 - iber diff --git a/binaries/data/mods/public/simulation/templates/structures/kush_stable.xml b/binaries/data/mods/public/simulation/templates/structures/kush_stable.xml index ad2cc205ed..16b2feeb2f 100644 --- a/binaries/data/mods/public/simulation/templates/structures/kush_stable.xml +++ b/binaries/data/mods/public/simulation/templates/structures/kush_stable.xml @@ -1,5 +1,5 @@ - + 10.0 @@ -7,22 +7,12 @@ kush Ỉḥ Ssmt - structures/pers_stable.png - - - units/{civ}_cavalry_javelinist_b - -units/{civ}_infantry_javelinist_b - -units/{civ}_infantry_slinger_b - -units/{civ}_infantry_archer_b - - - - structures/kushites/stable.xml + structures/fndn_6x7.xml diff --git a/binaries/data/mods/public/simulation/templates/structures/mace_stable.xml b/binaries/data/mods/public/simulation/templates/structures/mace_stable.xml index b720489fa5..9e01ae20b9 100644 --- a/binaries/data/mods/public/simulation/templates/structures/mace_stable.xml +++ b/binaries/data/mods/public/simulation/templates/structures/mace_stable.xml @@ -1,15 +1,12 @@ - + 12.0 - - decay|rubble/rubble_stone_5x5 - mace - Stratēgeîon + Hippṓn diff --git a/binaries/data/mods/public/simulation/templates/structures/maur_stable.xml b/binaries/data/mods/public/simulation/templates/structures/maur_stable.xml index 54fc7c6303..2b2cbba000 100644 --- a/binaries/data/mods/public/simulation/templates/structures/maur_stable.xml +++ b/binaries/data/mods/public/simulation/templates/structures/maur_stable.xml @@ -1,12 +1,9 @@ - + 12.0 - - decay|rubble/rubble_stone_5x5 - maur diff --git a/binaries/data/mods/public/simulation/templates/structures/pers_stable.xml b/binaries/data/mods/public/simulation/templates/structures/pers_stable.xml index 1839593294..f0d2efa8fe 100644 --- a/binaries/data/mods/public/simulation/templates/structures/pers_stable.xml +++ b/binaries/data/mods/public/simulation/templates/structures/pers_stable.xml @@ -1,5 +1,5 @@ - + 0 @@ -10,42 +10,13 @@ 5.0 - - decay|rubble/rubble_stone_4x4 - pers - Cavalry Stables Paraspa - -Barracks Stables - Train citizen-cavalry units. - structures/pers_stable.png - - - -units/{civ}_infantry_spearman_b - -units/{civ}_infantry_pikeman_b - -units/{civ}_infantry_swordsman_b - -units/{civ}_infantry_javelinist_b - -units/{civ}_infantry_slinger_b - -units/{civ}_infantry_archer_b - - - -training_conscription - persians/training_levy_cavalry - persians/training_conscription_cavalry - successors/special_war_horses - - - - - - interface/complete/building/complete_cavalry_stables.xml - - structures/persians/stable.xml structures/fndn_6x5.xml diff --git a/binaries/data/mods/public/simulation/templates/structures/ptol_stable.xml b/binaries/data/mods/public/simulation/templates/structures/ptol_stable.xml index 4717e976bc..c71e6fe00f 100644 --- a/binaries/data/mods/public/simulation/templates/structures/ptol_stable.xml +++ b/binaries/data/mods/public/simulation/templates/structures/ptol_stable.xml @@ -1,14 +1,12 @@ - + 12.0 - - decay|rubble/rubble_stone_5x5 - ptol + Hippṓn diff --git a/binaries/data/mods/public/simulation/templates/structures/rome_stable.xml b/binaries/data/mods/public/simulation/templates/structures/rome_stable.xml index d5f2fab94a..8fb021ef13 100644 --- a/binaries/data/mods/public/simulation/templates/structures/rome_stable.xml +++ b/binaries/data/mods/public/simulation/templates/structures/rome_stable.xml @@ -1,12 +1,9 @@ - + 12.0 - - decay|rubble/rubble_stone_5x5 - rome diff --git a/binaries/data/mods/public/simulation/templates/structures/sele_stable.xml b/binaries/data/mods/public/simulation/templates/structures/sele_stable.xml index 9e56caa5ee..0eafd8ddc8 100644 --- a/binaries/data/mods/public/simulation/templates/structures/sele_stable.xml +++ b/binaries/data/mods/public/simulation/templates/structures/sele_stable.xml @@ -1,14 +1,12 @@ - + 12.0 - - decay|rubble/rubble_stone_5x5 - sele + Hippṓn diff --git a/binaries/data/mods/public/simulation/templates/structures/spart_stable.xml b/binaries/data/mods/public/simulation/templates/structures/spart_stable.xml index e7b250deef..5d174764c0 100644 --- a/binaries/data/mods/public/simulation/templates/structures/spart_stable.xml +++ b/binaries/data/mods/public/simulation/templates/structures/spart_stable.xml @@ -1,15 +1,12 @@ - + 12.0 - - decay|rubble/rubble_stone_5x5 - spart - Stratēgeîon + Hippṓn 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 deleted file mode 100644 index 3bfe6bb24d..0000000000 --- a/binaries/data/mods/public/simulation/templates/template_structure_military_barracks_stables.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - -Infantry - - - Stables - Train citizen-soldier cavalry. Research training improvements. - structures/barracks.png - Stables - - - 0.8 - - -units/{civ}_infantry_spearman_b - -units/{civ}_infantry_pikeman_b - -units/{civ}_infantry_swordsman_b - units/{civ}_cavalry_swordsman_b - units/{civ}_cavalry_spearman_b - units/{civ}_cavalry_javelinist_b - units/{civ}_cavalry_archer_b - - - 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 new file mode 100644 index 0000000000..dc1b120b9f --- /dev/null +++ b/binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml @@ -0,0 +1,59 @@ + + + + 150 + + 300 + + + + + 12.0 + + + 10 + Cavalry + + + 2000 + decay|rubble/rubble_stone_5x5 + + + Stable + structures/pers_stable.png + phase_village + Train citizen-soldier cavalry. Research training improvements. + Village Stables + + + 30 + 0 + + + + + + 0.8 + + units/{civ}_cavalry_swordsman_b + units/{civ}_cavalry_spearman_b + units/{civ}_cavalry_javelinist_b + units/{civ}_cavalry_archer_b + + + heal_barracks + persians/training_levy_cavalry + persians/training_conscription_cavalry + successors/special_war_horses + + + + + + interface/complete/building/complete_cavalry_stables.xml + + + + 32 + +