From 536d5e3af4155e6cdb286a3ba0f8b0aab63969fa Mon Sep 17 00:00:00 2001 From: bb Date: Mon, 15 Apr 2019 21:39:21 +0000 Subject: [PATCH] unparent the range from the barracks, and reduce the duplication in the civs' range templates while at it, make the classes consistent and remove the cav from the range Patch By: Nescio Differential Revision: https://code.wildfiregames.com/D1791 This was SVN commit r22190. --- .../templates/structures/athen_range.xml | 7 +-- .../templates/structures/brit_range.xml | 13 +--- .../templates/structures/cart_range.xml | 13 +--- .../templates/structures/gaul_range.xml | 7 +-- .../templates/structures/iber_range.xml | 7 +-- .../templates/structures/kush_range.xml | 3 +- .../templates/structures/mace_range.xml | 7 +-- .../templates/structures/maur_range.xml | 13 +--- .../templates/structures/pers_range.xml | 13 +--- .../templates/structures/ptol_range.xml | 7 +-- .../templates/structures/rome_range.xml | 7 +-- .../templates/structures/sele_range.xml | 7 +-- .../templates/structures/spart_range.xml | 13 +--- ...late_structure_military_barracks_range.xml | 28 --------- .../template_structure_military_range.xml | 59 +++++++++++++++++++ 15 files changed, 72 insertions(+), 132 deletions(-) delete mode 100644 binaries/data/mods/public/simulation/templates/template_structure_military_barracks_range.xml create mode 100644 binaries/data/mods/public/simulation/templates/template_structure_military_range.xml diff --git a/binaries/data/mods/public/simulation/templates/structures/athen_range.xml b/binaries/data/mods/public/simulation/templates/structures/athen_range.xml index 76f1dbd49b..53d529cbfe 100644 --- a/binaries/data/mods/public/simulation/templates/structures/athen_range.xml +++ b/binaries/data/mods/public/simulation/templates/structures/athen_range.xml @@ -1,12 +1,8 @@ - + - 12.0 - - decay|rubble/rubble_stone_5x5 - athen @@ -15,6 +11,5 @@ structures/hellenes/range.xml - structures/fndn_5x5.xml diff --git a/binaries/data/mods/public/simulation/templates/structures/brit_range.xml b/binaries/data/mods/public/simulation/templates/structures/brit_range.xml index d2fe25d7f3..0693acb3a2 100644 --- a/binaries/data/mods/public/simulation/templates/structures/brit_range.xml +++ b/binaries/data/mods/public/simulation/templates/structures/brit_range.xml @@ -1,21 +1,10 @@ - - - - 12.0 - - - decay|rubble/rubble_stone_5x5 - + brit Budinadon - - - structures/britons/range.xml - structures/fndn_5x5.xml diff --git a/binaries/data/mods/public/simulation/templates/structures/cart_range.xml b/binaries/data/mods/public/simulation/templates/structures/cart_range.xml index 4a20175f88..e49a68016c 100644 --- a/binaries/data/mods/public/simulation/templates/structures/cart_range.xml +++ b/binaries/data/mods/public/simulation/templates/structures/cart_range.xml @@ -1,20 +1,9 @@ - - - - 12.0 - - - decay|rubble/rubble_stone_5x5 - + cart - - - structures/carthaginians/range.xml - structures/fndn_5x5.xml diff --git a/binaries/data/mods/public/simulation/templates/structures/gaul_range.xml b/binaries/data/mods/public/simulation/templates/structures/gaul_range.xml index 6dc2b04311..03508293c5 100644 --- a/binaries/data/mods/public/simulation/templates/structures/gaul_range.xml +++ b/binaries/data/mods/public/simulation/templates/structures/gaul_range.xml @@ -1,12 +1,8 @@ - + - 12.0 - - decay|rubble/rubble_stone_5x5 - gaul Budinadon @@ -16,6 +12,5 @@ structures/gauls/range.xml - structures/fndn_5x5.xml diff --git a/binaries/data/mods/public/simulation/templates/structures/iber_range.xml b/binaries/data/mods/public/simulation/templates/structures/iber_range.xml index eae908bcd3..f8f1bb4cdd 100644 --- a/binaries/data/mods/public/simulation/templates/structures/iber_range.xml +++ b/binaries/data/mods/public/simulation/templates/structures/iber_range.xml @@ -1,12 +1,8 @@ - + - 12.0 - - decay|rubble/rubble_stone_5x5 - iber @@ -15,6 +11,5 @@ structures/iberians/range.xml - structures/fndn_5x5.xml diff --git a/binaries/data/mods/public/simulation/templates/structures/kush_range.xml b/binaries/data/mods/public/simulation/templates/structures/kush_range.xml index a37b0338e5..a9a95b05df 100644 --- a/binaries/data/mods/public/simulation/templates/structures/kush_range.xml +++ b/binaries/data/mods/public/simulation/templates/structures/kush_range.xml @@ -1,8 +1,7 @@ - + - 12.0 kush diff --git a/binaries/data/mods/public/simulation/templates/structures/mace_range.xml b/binaries/data/mods/public/simulation/templates/structures/mace_range.xml index 276312d013..91356a07cc 100644 --- a/binaries/data/mods/public/simulation/templates/structures/mace_range.xml +++ b/binaries/data/mods/public/simulation/templates/structures/mace_range.xml @@ -1,12 +1,8 @@ - + - 12.0 - - decay|rubble/rubble_stone_5x5 - mace @@ -15,6 +11,5 @@ structures/hellenes/range.xml - structures/fndn_5x5.xml diff --git a/binaries/data/mods/public/simulation/templates/structures/maur_range.xml b/binaries/data/mods/public/simulation/templates/structures/maur_range.xml index 9b8c839648..47e351aba8 100644 --- a/binaries/data/mods/public/simulation/templates/structures/maur_range.xml +++ b/binaries/data/mods/public/simulation/templates/structures/maur_range.xml @@ -1,20 +1,9 @@ - - - - 12.0 - - - decay|rubble/rubble_stone_5x5 - + maur - - - structures/mauryas/range.xml - structures/fndn_5x5.xml diff --git a/binaries/data/mods/public/simulation/templates/structures/pers_range.xml b/binaries/data/mods/public/simulation/templates/structures/pers_range.xml index ae7956a4b5..d4b2ef78d8 100644 --- a/binaries/data/mods/public/simulation/templates/structures/pers_range.xml +++ b/binaries/data/mods/public/simulation/templates/structures/pers_range.xml @@ -1,20 +1,9 @@ - - - - 12.0 - - - decay|rubble/rubble_stone_5x5 - + pers - - - structures/persians/range.xml - structures/fndn_5x5.xml diff --git a/binaries/data/mods/public/simulation/templates/structures/ptol_range.xml b/binaries/data/mods/public/simulation/templates/structures/ptol_range.xml index 96b1f31ec6..96079cdd71 100644 --- a/binaries/data/mods/public/simulation/templates/structures/ptol_range.xml +++ b/binaries/data/mods/public/simulation/templates/structures/ptol_range.xml @@ -1,12 +1,8 @@ - + - 12.0 - - decay|rubble/rubble_stone_5x5 - ptol @@ -15,6 +11,5 @@ structures/ptolemies/range.xml - structures/fndn_5x5.xml diff --git a/binaries/data/mods/public/simulation/templates/structures/rome_range.xml b/binaries/data/mods/public/simulation/templates/structures/rome_range.xml index 80860953ac..ec605cc214 100644 --- a/binaries/data/mods/public/simulation/templates/structures/rome_range.xml +++ b/binaries/data/mods/public/simulation/templates/structures/rome_range.xml @@ -1,12 +1,8 @@ - + - 12.0 - - decay|rubble/rubble_stone_5x5 - rome @@ -15,6 +11,5 @@ structures/romans/range.xml - structures/fndn_5x5.xml diff --git a/binaries/data/mods/public/simulation/templates/structures/sele_range.xml b/binaries/data/mods/public/simulation/templates/structures/sele_range.xml index ccc700e0b4..4454f46beb 100644 --- a/binaries/data/mods/public/simulation/templates/structures/sele_range.xml +++ b/binaries/data/mods/public/simulation/templates/structures/sele_range.xml @@ -1,12 +1,8 @@ - + - 12.0 - - decay|rubble/rubble_stone_5x5 - sele @@ -15,6 +11,5 @@ structures/seleucids/range.xml - structures/fndn_5x5.xml diff --git a/binaries/data/mods/public/simulation/templates/structures/spart_range.xml b/binaries/data/mods/public/simulation/templates/structures/spart_range.xml index 6ec15344d3..cdd81cff1a 100644 --- a/binaries/data/mods/public/simulation/templates/structures/spart_range.xml +++ b/binaries/data/mods/public/simulation/templates/structures/spart_range.xml @@ -1,21 +1,10 @@ - - - - 12.0 - - - decay|rubble/rubble_stone_5x5 - + spart Stratēgeîon - - - structures/spartans/range.xml - structures/fndn_5x5.xml 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 deleted file mode 100644 index e90e1a1b56..0000000000 --- a/binaries/data/mods/public/simulation/templates/template_structure_military_barracks_range.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - -Cavalry - - - Archery - Archery Range - structures/range.png - Train citizen-soldier ranged infantry. Research training improvements. - - - 0.8 - - -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 - - - - - interface/complete/building/complete_range.xml - - - 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 new file mode 100644 index 0000000000..4c9ec10b75 --- /dev/null +++ b/binaries/data/mods/public/simulation/templates/template_structure_military_range.xml @@ -0,0 +1,59 @@ + + + + 150 + + 300 + + + + + 12.0 + + + 10 + Infantry + + + 2000 + decay|rubble/rubble_stone_5x5 + + + Practice Range + Train citizen-soldier ranged infantry. Research training improvements. + Village Range + structures/range.png + phase_village + + + 30 + 10 + + + + + + 0.8 + + units/{civ}_infantry_javelinist_b + units/{civ}_infantry_slinger_b + units/{civ}_infantry_archer_b + + + heal_barracks + training_conscription + + + + + interface/complete/building/complete_range.xml + + + + + 32 + + + structures/fndn_5x5.xml + +