From 5f78bb731836fd8bfe9a062166aa133fb1fc78a5 Mon Sep 17 00:00:00 2001 From: Mythos_Ruler Date: Fri, 21 Jun 2013 00:14:00 +0000 Subject: [PATCH] For most civs, made it so that Champions are unlocked by default in the Fortress at City Phase, but then also available for training at the Barracks, but after they are unlocked with a tech. Removed the minrange for all ranged units until minimum range bugs are fixed. To fix it will require a multi-pronged approach that will need discussed and Trac tickets created. This was SVN commit r13494. --- .../templates/structures/brit_barracks.xml | 4 ++-- .../templates/structures/cart_barracks.xml | 3 +++ .../templates/structures/gaul_barracks.xml | 4 ++-- .../templates/structures/hele_barracks.xml | 15 +++++++++------ .../templates/structures/iber_barracks.xml | 4 ++-- .../templates/structures/mace_barracks.xml | 4 ++-- .../templates/structures/maur_barracks.xml | 6 +++--- .../templates/structures/rome_barracks.xml | 4 ++-- .../templates/template_unit_cavalry_ranged.xml | 2 +- .../template_unit_cavalry_ranged_archer.xml | 2 +- .../template_unit_cavalry_ranged_javelinist.xml | 2 +- .../templates/template_unit_champion.xml | 2 +- .../template_unit_champion_cavalry_archer.xml | 2 +- .../template_unit_champion_cavalry_javelinist.xml | 2 +- .../template_unit_champion_infantry_archer.xml | 2 +- ...template_unit_champion_infantry_javelinist.xml | 2 +- .../template_unit_infantry_ranged_archer.xml | 2 +- .../template_unit_infantry_ranged_javelinist.xml | 2 +- .../template_unit_infantry_ranged_slinger.xml | 2 +- .../units/brit_champion_cavalry_barracks.xml | 7 +++++++ .../units/brit_champion_infantry_barracks.xml | 7 +++++++ .../units/gaul_champion_cavalry_barracks.xml | 7 +++++++ .../units/gaul_champion_infantry_barracks.xml | 7 +++++++ .../units/iber_champion_cavalry_barracks.xml | 7 +++++++ .../units/iber_champion_infantry_barracks.xml | 7 +++++++ .../units/mace_champion_cavalry_barracks.xml | 7 +++++++ .../units/mace_champion_infantry_a_barracks.xml | 2 +- .../units/maur_champion_chariot_barracks.xml | 7 +++++++ .../units/maur_champion_infantry_barracks.xml | 7 +++++++ .../units/maur_champion_maiden_barracks.xml | 7 +++++++ .../units/maur_support_female_citizen_topless.xml | 12 ++++++++++++ .../units/rome_champion_cavalry_barracks.xml | 7 +++++++ .../units/rome_champion_infantry_barracks.xml | 7 +++++++ 33 files changed, 133 insertions(+), 31 deletions(-) create mode 100644 binaries/data/mods/public/simulation/templates/units/brit_champion_cavalry_barracks.xml create mode 100644 binaries/data/mods/public/simulation/templates/units/brit_champion_infantry_barracks.xml create mode 100644 binaries/data/mods/public/simulation/templates/units/gaul_champion_cavalry_barracks.xml create mode 100644 binaries/data/mods/public/simulation/templates/units/gaul_champion_infantry_barracks.xml create mode 100644 binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry_barracks.xml create mode 100644 binaries/data/mods/public/simulation/templates/units/iber_champion_infantry_barracks.xml create mode 100644 binaries/data/mods/public/simulation/templates/units/mace_champion_cavalry_barracks.xml create mode 100644 binaries/data/mods/public/simulation/templates/units/maur_champion_chariot_barracks.xml create mode 100644 binaries/data/mods/public/simulation/templates/units/maur_champion_infantry_barracks.xml create mode 100644 binaries/data/mods/public/simulation/templates/units/maur_champion_maiden_barracks.xml create mode 100644 binaries/data/mods/public/simulation/templates/units/maur_support_female_citizen_topless.xml create mode 100644 binaries/data/mods/public/simulation/templates/units/rome_champion_cavalry_barracks.xml create mode 100644 binaries/data/mods/public/simulation/templates/units/rome_champion_infantry_barracks.xml diff --git a/binaries/data/mods/public/simulation/templates/structures/brit_barracks.xml b/binaries/data/mods/public/simulation/templates/structures/brit_barracks.xml index a6904fb4b1..369b22ccc0 100644 --- a/binaries/data/mods/public/simulation/templates/structures/brit_barracks.xml +++ b/binaries/data/mods/public/simulation/templates/structures/brit_barracks.xml @@ -22,10 +22,10 @@ units/brit_infantry_spearman_b units/brit_infantry_javelinist_b units/brit_infantry_slinger_b + units/brit_champion_infantry_barracks units/brit_cavalry_swordsman_b units/brit_cavalry_javelinist_b - units/brit_champion_infantry - units/brit_champion_cavalry + units/brit_champion_cavalry_barracks diff --git a/binaries/data/mods/public/simulation/templates/structures/cart_barracks.xml b/binaries/data/mods/public/simulation/templates/structures/cart_barracks.xml index 67eb78d7c3..70dd8b637e 100644 --- a/binaries/data/mods/public/simulation/templates/structures/cart_barracks.xml +++ b/binaries/data/mods/public/simulation/templates/structures/cart_barracks.xml @@ -28,6 +28,9 @@ units/cart_infantry_archer_b units/cart_cavalry_javelinist_b + + -unlock_champion_units + structures/carthaginians/barracks.xml diff --git a/binaries/data/mods/public/simulation/templates/structures/gaul_barracks.xml b/binaries/data/mods/public/simulation/templates/structures/gaul_barracks.xml index bd7b76858f..11f2c2b29c 100644 --- a/binaries/data/mods/public/simulation/templates/structures/gaul_barracks.xml +++ b/binaries/data/mods/public/simulation/templates/structures/gaul_barracks.xml @@ -22,10 +22,10 @@ units/gaul_infantry_spearman_b units/gaul_infantry_javelinist_b units/gaul_infantry_slinger_b + units/gaul_champion_infantry_barracks units/gaul_cavalry_swordsman_b units/gaul_cavalry_javelinist_b - units/gaul_champion_infantry - units/gaul_champion_cavalry + units/gaul_champion_cavalry_barracks diff --git a/binaries/data/mods/public/simulation/templates/structures/hele_barracks.xml b/binaries/data/mods/public/simulation/templates/structures/hele_barracks.xml index 349e2420a9..7e5861bde4 100644 --- a/binaries/data/mods/public/simulation/templates/structures/hele_barracks.xml +++ b/binaries/data/mods/public/simulation/templates/structures/hele_barracks.xml @@ -25,13 +25,16 @@ - units/hele_infantry_spearman_b - units/hele_infantry_javelinist_b - units/hele_infantry_archer_b - units/hele_infantry_slinger_b - units/hele_cavalry_swordsman_b - units/hele_cavalry_javelinist_b + units/hele_infantry_spearman_b + units/hele_infantry_javelinist_b + units/hele_infantry_archer_b + units/hele_infantry_slinger_b + units/hele_cavalry_swordsman_b + units/hele_cavalry_javelinist_b + + -unlock_champion_units + structures/hellenes/barracks_new.xml diff --git a/binaries/data/mods/public/simulation/templates/structures/iber_barracks.xml b/binaries/data/mods/public/simulation/templates/structures/iber_barracks.xml index 3ee4bcdfb3..4b3c088bbb 100644 --- a/binaries/data/mods/public/simulation/templates/structures/iber_barracks.xml +++ b/binaries/data/mods/public/simulation/templates/structures/iber_barracks.xml @@ -17,10 +17,10 @@ units/iber_infantry_swordsman_b units/iber_infantry_javelinist_b units/iber_infantry_slinger_b + units/iber_champion_infantry_barracks units/iber_cavalry_spearman_b units/iber_cavalry_javelinist_b - units/iber_champion_infantry - units/iber_champion_cavalry + units/iber_champion_cavalry_barracks diff --git a/binaries/data/mods/public/simulation/templates/structures/mace_barracks.xml b/binaries/data/mods/public/simulation/templates/structures/mace_barracks.xml index d979579887..f15af84afb 100644 --- a/binaries/data/mods/public/simulation/templates/structures/mace_barracks.xml +++ b/binaries/data/mods/public/simulation/templates/structures/mace_barracks.xml @@ -29,10 +29,10 @@ units/mace_infantry_javelinist_b units/mace_infantry_archer_b units/mace_infantry_slinger_b + units/mace_champion_infantry_a_barracks units/mace_cavalry_spearman_b units/mace_cavalry_javelinist_b - units/mace_champion_infantry_a_barracks - units/mace_champion_cavalry + units/mace_champion_cavalry_barracks diff --git a/binaries/data/mods/public/simulation/templates/structures/maur_barracks.xml b/binaries/data/mods/public/simulation/templates/structures/maur_barracks.xml index 32a1310414..5a082a0548 100644 --- a/binaries/data/mods/public/simulation/templates/structures/maur_barracks.xml +++ b/binaries/data/mods/public/simulation/templates/structures/maur_barracks.xml @@ -17,11 +17,11 @@ units/maur_infantry_spearman_b units/maur_infantry_swordsman_b units/maur_infantry_archer_b + units/maur_champion_infantry_barracks + units/maur_champion_maiden_barracks units/maur_cavalry_swordsman_b units/maur_cavalry_javelinist_b - units/maur_champion_infantry - units/maur_champion_maiden - units/maur_champion_chariot + units/maur_champion_chariot_barracks diff --git a/binaries/data/mods/public/simulation/templates/structures/rome_barracks.xml b/binaries/data/mods/public/simulation/templates/structures/rome_barracks.xml index 2adb1db119..1a5c89d632 100644 --- a/binaries/data/mods/public/simulation/templates/structures/rome_barracks.xml +++ b/binaries/data/mods/public/simulation/templates/structures/rome_barracks.xml @@ -26,9 +26,9 @@ units/rome_infantry_swordsman_b units/rome_infantry_spearman_a units/rome_infantry_javelinist_b + units/rome_champion_infantry_barracks units/rome_cavalry_spearman_b - units/rome_champion_infantry - units/rome_champion_cavalry + units/rome_champion_cavalry_barracks diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml index b535abf5c8..9246efb6b2 100644 --- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml +++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml @@ -11,7 +11,7 @@ 10.0 0.0 16.0 - 10.0 + 0.0 25.0 900 1500 diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml index b648f6229e..69556a1fe6 100644 --- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml +++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml @@ -6,7 +6,7 @@ 20.0 0.0 56.0 - 20.0 + 0.0 75.0 1200 2000 diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml index c4c7c25fbf..90a160e7bf 100644 --- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml +++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml @@ -6,7 +6,7 @@ 25.0 0.0 44 - 16.0 + 0.0 50.0 1200 2000 diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion.xml index 55091f0aab..6649980e07 100644 --- a/binaries/data/mods/public/simulation/templates/template_unit_champion.xml +++ b/binaries/data/mods/public/simulation/templates/template_unit_champion.xml @@ -6,7 +6,7 @@ Champion Unit Champion Organic - unlock_champion_units + phase_city 150 diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml index 4eb8759c5f..790accafc2 100644 --- a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml +++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml @@ -11,7 +11,7 @@ 30.0 0.0 58 - 10.0 + 0.0 75.0 1200 2000 diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml index 4cdce1f03a..872593e9fa 100644 --- a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml +++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml @@ -11,7 +11,7 @@ 30.0 0.0 56 - 16.0 + 0.0 50.0 1200 2000 diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml index 8e8373e8c1..f3f7db2c7f 100644 --- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml +++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml @@ -11,7 +11,7 @@ 15.0 0.0 58 - 10.0 + 0.0 75.0 1200 2000 diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml index b0d404c849..4d4102bf55 100644 --- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml +++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml @@ -11,7 +11,7 @@ 25.0 0.0 48 - 12.0 + 0.0 50.0 1200 2000 diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml index a52b45fa54..f4564c416a 100644 --- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml +++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml @@ -11,7 +11,7 @@ 15.0 0.0 50.0 - 10.0 + 0.0 75.0 1200 2000 diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml index 6021bb9de4..6bdf019578 100644 --- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml +++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml @@ -11,7 +11,7 @@ 20.0 0.0 36 - 10.0 + 0.0 50.0 1200 2000 diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml index ebb4f5e7dc..8ae1e09032 100644 --- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml +++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml @@ -11,7 +11,7 @@ 10.0 0.0 48.0 - 16.0 + 0.0 60.0 900 1500 diff --git a/binaries/data/mods/public/simulation/templates/units/brit_champion_cavalry_barracks.xml b/binaries/data/mods/public/simulation/templates/units/brit_champion_cavalry_barracks.xml new file mode 100644 index 0000000000..aaf5817cd6 --- /dev/null +++ b/binaries/data/mods/public/simulation/templates/units/brit_champion_cavalry_barracks.xml @@ -0,0 +1,7 @@ + + + + unlock_champion_units + units/brit_champion_cavalry + + diff --git a/binaries/data/mods/public/simulation/templates/units/brit_champion_infantry_barracks.xml b/binaries/data/mods/public/simulation/templates/units/brit_champion_infantry_barracks.xml new file mode 100644 index 0000000000..013d39cd06 --- /dev/null +++ b/binaries/data/mods/public/simulation/templates/units/brit_champion_infantry_barracks.xml @@ -0,0 +1,7 @@ + + + + unlock_champion_units + units/brit_champion_infantry + + \ No newline at end of file diff --git a/binaries/data/mods/public/simulation/templates/units/gaul_champion_cavalry_barracks.xml b/binaries/data/mods/public/simulation/templates/units/gaul_champion_cavalry_barracks.xml new file mode 100644 index 0000000000..8f42c3dfe4 --- /dev/null +++ b/binaries/data/mods/public/simulation/templates/units/gaul_champion_cavalry_barracks.xml @@ -0,0 +1,7 @@ + + + + unlock_champion_units + units/gaul_champion_cavalry + + \ No newline at end of file diff --git a/binaries/data/mods/public/simulation/templates/units/gaul_champion_infantry_barracks.xml b/binaries/data/mods/public/simulation/templates/units/gaul_champion_infantry_barracks.xml new file mode 100644 index 0000000000..519ffa9364 --- /dev/null +++ b/binaries/data/mods/public/simulation/templates/units/gaul_champion_infantry_barracks.xml @@ -0,0 +1,7 @@ + + + + unlock_champion_units + units/gaul_champion_infantry + + \ No newline at end of file diff --git a/binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry_barracks.xml b/binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry_barracks.xml new file mode 100644 index 0000000000..cecc67a54c --- /dev/null +++ b/binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry_barracks.xml @@ -0,0 +1,7 @@ + + + + unlock_champion_units + units/iber_champion_cavalry + + \ No newline at end of file diff --git a/binaries/data/mods/public/simulation/templates/units/iber_champion_infantry_barracks.xml b/binaries/data/mods/public/simulation/templates/units/iber_champion_infantry_barracks.xml new file mode 100644 index 0000000000..301f502d3f --- /dev/null +++ b/binaries/data/mods/public/simulation/templates/units/iber_champion_infantry_barracks.xml @@ -0,0 +1,7 @@ + + + + unlock_champion_units + units/iber_champion_infantry + + \ No newline at end of file diff --git a/binaries/data/mods/public/simulation/templates/units/mace_champion_cavalry_barracks.xml b/binaries/data/mods/public/simulation/templates/units/mace_champion_cavalry_barracks.xml new file mode 100644 index 0000000000..eb40471b97 --- /dev/null +++ b/binaries/data/mods/public/simulation/templates/units/mace_champion_cavalry_barracks.xml @@ -0,0 +1,7 @@ + + + + unlock_champion_units + units/mace_champion_cavalry + + diff --git a/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a_barracks.xml b/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a_barracks.xml index 5d2888eeb3..26ff3a950f 100644 --- a/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a_barracks.xml +++ b/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a_barracks.xml @@ -1,7 +1,7 @@ - units/mace_champion_infantry_a + unlock_champion_units units/mace_champion_infantry_e diff --git a/binaries/data/mods/public/simulation/templates/units/maur_champion_chariot_barracks.xml b/binaries/data/mods/public/simulation/templates/units/maur_champion_chariot_barracks.xml new file mode 100644 index 0000000000..583ff55813 --- /dev/null +++ b/binaries/data/mods/public/simulation/templates/units/maur_champion_chariot_barracks.xml @@ -0,0 +1,7 @@ + + + + unlock_champion_units + units/maur_champion_chariot + + \ No newline at end of file diff --git a/binaries/data/mods/public/simulation/templates/units/maur_champion_infantry_barracks.xml b/binaries/data/mods/public/simulation/templates/units/maur_champion_infantry_barracks.xml new file mode 100644 index 0000000000..46daa8cc9a --- /dev/null +++ b/binaries/data/mods/public/simulation/templates/units/maur_champion_infantry_barracks.xml @@ -0,0 +1,7 @@ + + + + unlock_champion_units + units/maur_champion_infantry + + \ No newline at end of file diff --git a/binaries/data/mods/public/simulation/templates/units/maur_champion_maiden_barracks.xml b/binaries/data/mods/public/simulation/templates/units/maur_champion_maiden_barracks.xml new file mode 100644 index 0000000000..beb42e1041 --- /dev/null +++ b/binaries/data/mods/public/simulation/templates/units/maur_champion_maiden_barracks.xml @@ -0,0 +1,7 @@ + + + + unlock_champion_units + units/maur_champion_maiden + + \ No newline at end of file diff --git a/binaries/data/mods/public/simulation/templates/units/maur_support_female_citizen_topless.xml b/binaries/data/mods/public/simulation/templates/units/maur_support_female_citizen_topless.xml new file mode 100644 index 0000000000..54b9f7c8e5 --- /dev/null +++ b/binaries/data/mods/public/simulation/templates/units/maur_support_female_citizen_topless.xml @@ -0,0 +1,12 @@ + + + + maur + Naari + Mauryan Female Citizen + units/maur_support_female_citizen.png + + + units/mauryans/female_citizen_topless.xml + + diff --git a/binaries/data/mods/public/simulation/templates/units/rome_champion_cavalry_barracks.xml b/binaries/data/mods/public/simulation/templates/units/rome_champion_cavalry_barracks.xml new file mode 100644 index 0000000000..ed0aaa59f0 --- /dev/null +++ b/binaries/data/mods/public/simulation/templates/units/rome_champion_cavalry_barracks.xml @@ -0,0 +1,7 @@ + + + + unlock_champion_units + units/rome_champion_cavalry + + \ No newline at end of file diff --git a/binaries/data/mods/public/simulation/templates/units/rome_champion_infantry_barracks.xml b/binaries/data/mods/public/simulation/templates/units/rome_champion_infantry_barracks.xml new file mode 100644 index 0000000000..6667c14d57 --- /dev/null +++ b/binaries/data/mods/public/simulation/templates/units/rome_champion_infantry_barracks.xml @@ -0,0 +1,7 @@ + + + + unlock_champion_units + units/rome_champion_infantry + + \ No newline at end of file