From c4bdbe4dd90c64f40d4954ac642c646351f2a2cd Mon Sep 17 00:00:00 2001 From: wowgetoffyourcellphone Date: Sun, 13 Mar 2022 04:34:03 +0000 Subject: [PATCH] [Han Chinese - Alpha 26] Champions trainable in captured Barracks and Stables now require Unlocking Techs Discussion: https://wildfiregames.com/forum/topic/71582-fixing-chinese-han/ Previously, one could capture an enemy Barracks or Stable and train Han champions there without researching the champion unlocking techs. This rectifies this (in an admittedly hacky way) by creating duplicate Han champion templates with suffix "_academy" and putting those in the Han Academy with the RequiredTechnology of City Phase. The original Han champion templates, which are what can be trained in captured Barracks and Stables, are given the unlocking RequiredTechnology respective to their class (as most of civs' champions). Both Templates have the same SelectionGroupName, so should be selectable together with a double-click with no problem. Please report problems in the above linked thread. This was SVN commit r26632. --- .../templates/structures/han/academy.xml | 28 ++++++------------- .../templates/structures/han/stable.xml | 4 ++- .../template_structure_military_stable.xml | 6 ++++ .../han/champion_cavalry_crossbowman.xml | 2 +- .../champion_cavalry_crossbowman_academy.xml | 6 ++++ .../units/han/champion_cavalry_spearman.xml | 2 +- .../han/champion_cavalry_spearman_academy.xml | 6 ++++ .../templates/units/han/champion_chariot.xml | 2 +- .../units/han/champion_chariot_academy.xml | 6 ++++ .../units/han/champion_infantry_archer.xml | 1 + .../han/champion_infantry_archer_academy.xml | 6 ++++ .../units/han/champion_infantry_spearman.xml | 1 + .../champion_infantry_spearman_academy.xml | 6 ++++ 13 files changed, 53 insertions(+), 23 deletions(-) create mode 100644 binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_crossbowman_academy.xml create mode 100644 binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_spearman_academy.xml create mode 100644 binaries/data/mods/public/simulation/templates/units/han/champion_chariot_academy.xml create mode 100644 binaries/data/mods/public/simulation/templates/units/han/champion_infantry_archer_academy.xml create mode 100644 binaries/data/mods/public/simulation/templates/units/han/champion_infantry_spearman_academy.xml diff --git a/binaries/data/mods/public/simulation/templates/structures/han/academy.xml b/binaries/data/mods/public/simulation/templates/structures/han/academy.xml index aae0669961..98c1444505 100644 --- a/binaries/data/mods/public/simulation/templates/structures/han/academy.xml +++ b/binaries/data/mods/public/simulation/templates/structures/han/academy.xml @@ -3,9 +3,7 @@ Academy - - 3.0 - + 200 @@ -22,7 +20,7 @@ Minister - 2500 + 2000 decay|rubble/rubble_stone_5x5 @@ -62,21 +60,13 @@ -units/{civ}/infantry_javelineer_b -units/{civ}/infantry_slinger_b -units/{civ}/infantry_archer_b - units/{civ}/champion_infantry_spearman - units/{civ}/champion_infantry_pikeman - units/{civ}/champion_infantry_maceman - units/{civ}/champion_infantry_axeman - units/{civ}/champion_infantry_swordsman - units/{civ}/champion_infantry_javelineer - units/{civ}/champion_infantry_slinger - units/{civ}/champion_infantry_archer - units/{civ}/champion_cavalry - units/{civ}/champion_cavalry_spearman - units/{civ}/champion_cavalry_swordsman - units/{civ}/champion_cavalry_javelineer - units/{civ}/champion_cavalry_archer - units/{civ}/champion_chariot - units/{civ}/war_dog + units/{civ}/champion_infantry_spearman_academy + units/{civ}/champion_infantry_archer_academy + units/{civ}/champion_cavalry_spearman_academy + units/{civ}/champion_cavalry_crossbowman_academy + units/{civ}/champion_chariot_academy + -units/{civ}/champion_infantry_spearman + -units/{civ}/champion_infantry_archer diff --git a/binaries/data/mods/public/simulation/templates/structures/han/stable.xml b/binaries/data/mods/public/simulation/templates/structures/han/stable.xml index 7cb47ee1fa..c6a3ae1edb 100644 --- a/binaries/data/mods/public/simulation/templates/structures/han/stable.xml +++ b/binaries/data/mods/public/simulation/templates/structures/han/stable.xml @@ -22,8 +22,10 @@ 0.8 - units/{civ}/cavalry_crossbowman_b -units/{civ}/champion_cavalry + -units/{civ}/champion_cavalry_spearman + -units/{civ}/champion_cavalry_archer + -units/{civ}/champion_cavalry_crossbowman -units/{civ}/champion_chariot -units/{civ}/war_dog 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 d0b1e36ced..ef13211134 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 @@ -63,7 +63,13 @@ units/{civ}/cavalry_spearman_b units/{civ}/cavalry_javelineer_b units/{civ}/cavalry_archer_b + units/{civ}/cavalry_crossbowman_b units/{civ}/champion_cavalry + units/{civ}/champion_cavalry_spearman + units/{civ}/champion_cavalry_swordsman + units/{civ}/champion_cavalry_javelineer + units/{civ}/champion_cavalry_archer + units/{civ}/champion_cavalry_crossbowman units/{civ}/champion_chariot units/{civ}/war_dog diff --git a/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_crossbowman.xml b/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_crossbowman.xml index e17d8d503e..ec66a91051 100644 --- a/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_crossbowman.xml +++ b/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_crossbowman.xml @@ -5,7 +5,7 @@ Sun Wu Trouble Freeing Forces units/han/cavalry_crossbowman units/han/champion_cavalry_crossbowman.png - phase_city + unlock_champion_cavalry units/han/cavalry_crossbowman_c_m.xml diff --git a/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_crossbowman_academy.xml b/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_crossbowman_academy.xml new file mode 100644 index 0000000000..a04408a7f2 --- /dev/null +++ b/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_crossbowman_academy.xml @@ -0,0 +1,6 @@ + + + + phase_city + + diff --git a/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_spearman.xml b/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_spearman.xml index 437eb001bf..58a257cd92 100644 --- a/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_spearman.xml +++ b/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_spearman.xml @@ -5,7 +5,7 @@ Wu Wei Yin Cao Cao Guard units/han/champion_cavalry units/han/champion_cavalry_spearman.png - phase_city + unlock_champion_cavalry units/han/cavalry_spearman_c_m.xml diff --git a/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_spearman_academy.xml b/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_spearman_academy.xml new file mode 100644 index 0000000000..28a792df0f --- /dev/null +++ b/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_spearman_academy.xml @@ -0,0 +1,6 @@ + + + + phase_city + + diff --git a/binaries/data/mods/public/simulation/templates/units/han/champion_chariot.xml b/binaries/data/mods/public/simulation/templates/units/han/champion_chariot.xml index f246cbf2cf..03f95ed5ec 100644 --- a/binaries/data/mods/public/simulation/templates/units/han/champion_chariot.xml +++ b/binaries/data/mods/public/simulation/templates/units/han/champion_chariot.xml @@ -9,7 +9,7 @@ Chinese War Chariot Zhanche Chariot - phase_city + unlock_champion_chariots units/han/chariot.png diff --git a/binaries/data/mods/public/simulation/templates/units/han/champion_chariot_academy.xml b/binaries/data/mods/public/simulation/templates/units/han/champion_chariot_academy.xml new file mode 100644 index 0000000000..8be388388f --- /dev/null +++ b/binaries/data/mods/public/simulation/templates/units/han/champion_chariot_academy.xml @@ -0,0 +1,6 @@ + + + + phase_city + + diff --git a/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_archer.xml b/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_archer.xml index 111bcefecf..bda6bbe8d9 100644 --- a/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_archer.xml +++ b/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_archer.xml @@ -6,6 +6,7 @@ Yǔ Lín units/han/champion_infantry_archer units/han/champion_infantry_archer.png + unlock_champion_infantry units/han/infantry_archer_c.xml diff --git a/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_archer_academy.xml b/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_archer_academy.xml new file mode 100644 index 0000000000..602929ee3d --- /dev/null +++ b/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_archer_academy.xml @@ -0,0 +1,6 @@ + + + + phase_city + + diff --git a/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_spearman.xml b/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_spearman.xml index 858c981bb1..26ed5ccf8d 100644 --- a/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_spearman.xml +++ b/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_spearman.xml @@ -5,6 +5,7 @@ Palace Guard Spearman Hǔ Bēn units/han/champion_infantry_spearman + unlock_champion_infantry units/han/champion_infantry_swordsman.png diff --git a/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_spearman_academy.xml b/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_spearman_academy.xml new file mode 100644 index 0000000000..858ea35b63 --- /dev/null +++ b/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_spearman_academy.xml @@ -0,0 +1,6 @@ + + + + phase_city + +