From 08156e73fcd0ebe4a10ea3f590f8481b1ba35864 Mon Sep 17 00:00:00 2001 From: marder Date: Sun, 17 Jul 2022 09:20:52 +0000 Subject: [PATCH] [Gameplay] Han unit roster restructure and other balancing adjustments After feedback on the first RC's : https://wildfiregames.com/forum/topic/83323-balancing-the-han/ This version of the roster seems to have a minimal concensus. This removes some units from the very big roster of the Han, restructures it and changes the cavalry crossbow champion for an infantry one due to histrorical issues. It furthermore reverts the changes to the champion infantry crossbow template introduced in 9411d8c98e as that nerf wasn't necesarry. This means that the Han and the Macedonians now have a champion crossbow unit with the same stats. Also: Fixes #6560 by only keeping the "academy" templates, so that the Han can now only train champions from the academy. Therefore, this reverts parts of c4bdbe4dd9 and all of 2c9a6704e0. Discussion with : @borg- @real_tabasco_sauce @wowgetoffyourcellphone AIEND @Stan and other people on the forums and the Diff. Differential revision: https://code.wildfiregames.com/D4713 This was SVN commit r27009. --- .../units/han/infantry_crossbowman_c.xml | 66 +++++++++++++++++++ .../mods/public/simulation/data/civs/han.json | 4 +- .../technologies/unlock_champion_cavalry.json | 1 + .../unlock_champion_infantry.json | 1 + .../templates/structures/han/academy.xml | 15 +---- .../templates/structures/han/barracks.xml | 1 + .../templates/structures/han/civil_centre.xml | 2 +- .../templates/structures/han/stable.xml | 1 + ...ate_unit_champion_infantry_crossbowman.xml | 8 +-- .../han/champion_cavalry_crossbowman.xml | 13 ---- .../champion_cavalry_crossbowman_academy.xml | 6 -- .../units/han/champion_cavalry_spearman.xml | 13 ---- .../han/champion_cavalry_spearman_academy.xml | 9 ++- .../templates/units/han/champion_chariot.xml | 18 ----- .../units/han/champion_chariot_academy.xml | 14 +++- .../units/han/champion_infantry_archer.xml | 14 ---- .../han/champion_infantry_archer_academy.xml | 10 ++- .../champion_infantry_crossbowman_academy.xml | 12 ++++ .../units/han/champion_infantry_spearman.xml | 14 ---- .../champion_infantry_spearman_academy.xml | 10 ++- .../templates/units/han/infantry_archer_b.xml | 1 + .../units/han/infantry_crossbowman_b.xml | 1 - .../units/han/infantry_pikeman_b.xml | 3 +- 23 files changed, 133 insertions(+), 104 deletions(-) create mode 100644 binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_c.xml delete mode 100644 binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_crossbowman.xml delete mode 100644 binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_crossbowman_academy.xml delete mode 100644 binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_spearman.xml delete mode 100644 binaries/data/mods/public/simulation/templates/units/han/champion_chariot.xml delete mode 100644 binaries/data/mods/public/simulation/templates/units/han/champion_infantry_archer.xml create mode 100644 binaries/data/mods/public/simulation/templates/units/han/champion_infantry_crossbowman_academy.xml delete mode 100644 binaries/data/mods/public/simulation/templates/units/han/champion_infantry_spearman.xml diff --git a/binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_c.xml b/binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_c.xml new file mode 100644 index 0000000000..b70f6f6c83 --- /dev/null +++ b/binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_c.xml @@ -0,0 +1,66 @@ + + + + + + skeletal/new/m_armor_tunic_long.dae + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + player_trans.xml + diff --git a/binaries/data/mods/public/simulation/data/civs/han.json b/binaries/data/mods/public/simulation/data/civs/han.json index f58fabc8e0..a6866eb0f1 100644 --- a/binaries/data/mods/public/simulation/data/civs/han.json +++ b/binaries/data/mods/public/simulation/data/civs/han.json @@ -28,7 +28,7 @@ "Count": 2 }, { - "Template": "units/han/infantry_archer_b", + "Template": "units/han/infantry_crossbowman_b", "Count": 2 }, { @@ -70,7 +70,7 @@ ], "SkirmishReplacements": { "skirmish/units/special_starting_unit": "units/han/support_minister", - "skirmish/units/default_infantry_ranged_b": "units/han/infantry_archer_b", + "skirmish/units/default_infantry_ranged_b": "units/han/infantry_crossbowman_b", "skirmish/units/default_cavalry": "units/han/cavalry_swordsman_b" }, "SelectableInGameSetup": true diff --git a/binaries/data/mods/public/simulation/data/technologies/unlock_champion_cavalry.json b/binaries/data/mods/public/simulation/data/technologies/unlock_champion_cavalry.json index d8e4c3aa5f..918d522415 100644 --- a/binaries/data/mods/public/simulation/data/technologies/unlock_champion_cavalry.json +++ b/binaries/data/mods/public/simulation/data/technologies/unlock_champion_cavalry.json @@ -9,6 +9,7 @@ { "tech": "phase_city" }, { "notciv": "athen" }, { "notciv": "brit" }, + { "notciv": "han" }, { "notciv": "maur" }, { "notciv": "spart" } ] diff --git a/binaries/data/mods/public/simulation/data/technologies/unlock_champion_infantry.json b/binaries/data/mods/public/simulation/data/technologies/unlock_champion_infantry.json index 0e6372fd8e..da8b6a7ac7 100644 --- a/binaries/data/mods/public/simulation/data/technologies/unlock_champion_infantry.json +++ b/binaries/data/mods/public/simulation/data/technologies/unlock_champion_infantry.json @@ -14,6 +14,7 @@ { "tech": "phase_city" }, { "notciv": "athen" }, { "notciv": "cart" }, + { "notciv": "han" }, { "notciv": "pers" }, { "notciv": "sele" }, { "notciv": "spart" } 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 d17a693cd2..3e489b421a 100644 --- a/binaries/data/mods/public/simulation/templates/structures/han/academy.xml +++ b/binaries/data/mods/public/simulation/templates/structures/han/academy.xml @@ -50,22 +50,11 @@ 0.8 - - -units/{civ}/infantry_spearman_b - -units/{civ}/infantry_pikeman_b - -units/{civ}/infantry_maceman_b - -units/{civ}/infantry_axeman_b - -units/{civ}/infantry_swordsman_b - -units/{civ}/infantry_javelineer_b - -units/{civ}/infantry_slinger_b - -units/{civ}/infantry_archer_b + units/{civ}/champion_infantry_spearman_academy - units/{civ}/champion_infantry_archer_academy + units/{civ}/champion_infantry_crossbowman_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/barracks.xml b/binaries/data/mods/public/simulation/templates/structures/han/barracks.xml index 2bc96232cc..4584bfc6e4 100644 --- a/binaries/data/mods/public/simulation/templates/structures/han/barracks.xml +++ b/binaries/data/mods/public/simulation/templates/structures/han/barracks.xml @@ -24,6 +24,7 @@ units/{civ}/infantry_crossbowman_b + -units/{civ}/infantry_swordsman_b -units/{civ}/champion_infantry_spearman -units/{civ}/champion_infantry_pikeman -units/{civ}/champion_infantry_maceman diff --git a/binaries/data/mods/public/simulation/templates/structures/han/civil_centre.xml b/binaries/data/mods/public/simulation/templates/structures/han/civil_centre.xml index c3f34afcc7..d67319bd5a 100644 --- a/binaries/data/mods/public/simulation/templates/structures/han/civil_centre.xml +++ b/binaries/data/mods/public/simulation/templates/structures/han/civil_centre.xml @@ -23,7 +23,7 @@ units/{civ}/infantry_spearman_b - units/{civ}/infantry_archer_b + units/{civ}/infantry_crossbowman_b units/{civ}/cavalry_swordsman_b 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 6a0a4aceb3..274347aa6d 100644 --- a/binaries/data/mods/public/simulation/templates/structures/han/stable.xml +++ b/binaries/data/mods/public/simulation/templates/structures/han/stable.xml @@ -24,6 +24,7 @@ 0.8 + -units/{civ}/cavalry_crossbowman_b -units/{civ}/champion_cavalry -units/{civ}/champion_cavalry_spearman -units/{civ}/champion_cavalry_archer diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_crossbowman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_crossbowman.xml index 5e7861767d..05f3626771 100644 --- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_crossbowman.xml +++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_crossbowman.xml @@ -6,12 +6,12 @@ 40 - 50 - 600 + 60 + 200 3000 - 80 - 3 + 120 + 0.8 30 false 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 deleted file mode 100644 index ec66a91051..0000000000 --- a/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_crossbowman.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - han - Sun Wu Trouble Freeing Forces - units/han/cavalry_crossbowman - units/han/champion_cavalry_crossbowman.png - 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 deleted file mode 100644 index a04408a7f2..0000000000 --- a/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_crossbowman_academy.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - 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 deleted file mode 100644 index 58a257cd92..0000000000 --- a/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_spearman.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - han - Wu Wei Yin Cao Cao Guard - units/han/champion_cavalry - units/han/champion_cavalry_spearman.png - 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 index 28a792df0f..437eb001bf 100644 --- 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 @@ -1,6 +1,13 @@ - + + han + Wu Wei Yin Cao Cao Guard + units/han/champion_cavalry + units/han/champion_cavalry_spearman.png phase_city + + units/han/cavalry_spearman_c_m.xml + 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 deleted file mode 100644 index ca5370b8bd..0000000000 --- a/binaries/data/mods/public/simulation/templates/units/han/champion_chariot.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - 5.0 - - - han - Han War Chariot - Zhanche - Chariot - unlock_champion_chariots - units/han/chariot.png - - - units/han/chariot_archer_m.xml - - 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 index 8be388388f..be7dde87d8 100644 --- 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 @@ -1,6 +1,18 @@ - + + + + 5.0 + + han + Han War Chariot + Zhanche + Chariot phase_city + units/han/chariot.png + + units/han/chariot_archer_m.xml + 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 deleted file mode 100644 index bda6bbe8d9..0000000000 --- a/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_archer.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - han - Palace Guard Archer - 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 index 602929ee3d..116d6506e4 100644 --- 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 @@ -1,6 +1,14 @@ - + + han + Palace Guard Archer + Yǔ Lín + units/han/champion_infantry_archer + units/han/champion_infantry_archer.png phase_city + + units/han/infantry_archer_c.xml + diff --git a/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_crossbowman_academy.xml b/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_crossbowman_academy.xml new file mode 100644 index 0000000000..b2e04a9ce3 --- /dev/null +++ b/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_crossbowman_academy.xml @@ -0,0 +1,12 @@ + + + + han + Juezhang + units/mace_champion_infantry_crossbowman.png + phase_city + + + units/han/infantry_crossbowman_c.xml + + 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 deleted file mode 100644 index 26ed5ccf8d..0000000000 --- a/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_spearman.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - han - Palace Guard Spearman - Hǔ Bēn - units/han/champion_infantry_spearman - unlock_champion_infantry - units/han/champion_infantry_swordsman.png - - - units/han/infantry_spearman_c.xml - - 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 index 858ea35b63..6413bbf02b 100644 --- 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 @@ -1,6 +1,14 @@ - + + han + Palace Guard Spearman + Hǔ Bēn + units/han/champion_infantry_spearman phase_city + units/han/champion_infantry_swordsman.png + + units/han/infantry_spearman_c.xml + diff --git a/binaries/data/mods/public/simulation/templates/units/han/infantry_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/han/infantry_archer_b.xml index 760d09eaf7..4affa81692 100644 --- a/binaries/data/mods/public/simulation/templates/units/han/infantry_archer_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/han/infantry_archer_b.xml @@ -10,6 +10,7 @@ units/han/infantry_archer_b Shè Shǒu units/han/infantry_archer.png + phase_town units/han/infantry_archer_a diff --git a/binaries/data/mods/public/simulation/templates/units/han/infantry_crossbowman_b.xml b/binaries/data/mods/public/simulation/templates/units/han/infantry_crossbowman_b.xml index 8b338ec5bb..a55054a053 100644 --- a/binaries/data/mods/public/simulation/templates/units/han/infantry_crossbowman_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/han/infantry_crossbowman_b.xml @@ -10,7 +10,6 @@ units/han/infantry_crossbowman_b Nǔ Shǒu units/han/infantry_crossbowman.png - phase_town units/han/infantry_crossbowman_a diff --git a/binaries/data/mods/public/simulation/templates/units/han/infantry_pikeman_b.xml b/binaries/data/mods/public/simulation/templates/units/han/infantry_pikeman_b.xml index c65f6ccd35..52e99a53f6 100644 --- a/binaries/data/mods/public/simulation/templates/units/han/infantry_pikeman_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/han/infantry_pikeman_b.xml @@ -2,7 +2,7 @@ - Halberdier + Ji 1 1 @@ -17,6 +17,7 @@ han units/han/infantry_pikeman_b + Halberdier Jǐ Bīng units/han/infantry_halberdman.png phase_town