[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.
2022-07-17 09:20:52 +00:00 · 2022-07-17 09:20:52 +00:00 · 08156e73fc
commit 08156e73fc
parent fd08ab051f
23 changed files with 133 additions and 104 deletions
--- 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
@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant file="biped/base_archer_gastraphetes_relax.xml">
+      <mesh>skeletal/new/m_armor_tunic_long.dae</mesh>
+      <props>
+        <prop actor="props/units/heads/head_china.xml" attachpoint="head"/>
+        <prop actor="props/units/helmets/han_heavy_helmet_b.xml" attachpoint="helmet"/>
+        <prop actor="props/units/helmets/han_advanced_melee_helmet.xml" attachpoint="helmet"/>
+        <prop actor="props/units/weapons/gastraphetes.xml" attachpoint="weapon_L"/>
+        <prop actor="props/units/quiver_back_bamboo.xml" attachpoint="back"/>
+      </props>
+      <textures>
+        <texture file="skeletal/han/lamellar_02_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant name="Han-Officer-01">
+      <textures>
+        <texture file="skeletal/han/officer_01.png" name="baseTex"/>
+        <texture file="skeletal/han/officer_01_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+    <variant name="Han-Officer-02">
+      <textures>
+        <texture file="skeletal/han/officer_02.png" name="baseTex"/>
+        <texture file="skeletal/han/officer_02_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+    <variant name="Han-Officer-03">
+      <textures>
+        <texture file="skeletal/han/officer_03.png" name="baseTex"/>
+        <texture file="skeletal/han/officer_03_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+    <variant name="Han-Officer-04">
+      <textures>
+        <texture file="skeletal/han/officer_04.png" name="baseTex"/>
+        <texture file="skeletal/han/officer_04_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+    <variant name="Han-Officer-05">
+      <textures>
+        <texture file="skeletal/han/officer_05.png" name="baseTex"/>
+        <texture file="skeletal/han/officer_05_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+    <variant name="Han-Officer-06">
+      <textures>
+        <texture file="skeletal/han/officer_06.png" name="baseTex"/>
+        <texture file="skeletal/han/officer_06_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="Idle"/>
+    <variant file="biped/attack_ranged_gastraphetes_fire.xml"/>
+    <variant file="biped/attack_slaughter.xml"/>
+    <variant file="biped/attack_capture.xml"/>
+    <variant file="biped/gather_praise.xml"/>
+    <variant file="biped/death_infantry.xml"/>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
--- 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
--- 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" }
 		]
--- 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" }
--- 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 @@
  </Sound>
  <Trainer>
    <BatchTimeModifier>0.8</BatchTimeModifier>
-    <Entities datatype="tokens">
-      -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
+    <Entities replace="" datatype="tokens">
      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
    </Entities>
  </Trainer>
  <VisualActor>
--- 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 @@
  <Trainer>
    <Entities datatype="tokens">
      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
--- 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 @@
  <Trainer>
    <Entities datatype="tokens">
      units/{civ}/infantry_spearman_b
-      units/{civ}/infantry_archer_b
+      units/{civ}/infantry_crossbowman_b
      units/{civ}/cavalry_swordsman_b
    </Entities>
  </Trainer>
--- 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 @@
  <Trainer>
    <BatchTimeModifier>0.8</BatchTimeModifier>
    <Entities datatype="tokens">
+      -units/{civ}/cavalry_crossbowman_b
      -units/{civ}/champion_cavalry
      -units/{civ}/champion_cavalry_spearman
      -units/{civ}/champion_cavalry_archer
--- 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 @@
      <Damage>
        <Pierce>40</Pierce>
      </Damage>
-      <MaxRange>50</MaxRange>
-      <PrepareTime>600</PrepareTime>
+      <MaxRange>60</MaxRange>
+      <PrepareTime>200</PrepareTime>
      <RepeatTime>3000</RepeatTime>
      <Projectile>
-        <Speed>80</Speed>
-        <Spread>3</Spread>
+        <Speed>120</Speed>
+        <Spread>0.8</Spread>
        <Gravity>30</Gravity>
        <FriendlyFire>false</FriendlyFire>
        <LaunchPoint y="3"/>
--- 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
@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_cavalry_crossbowman">
-  <Identity>
-    <Civ>han</Civ>
-    <SpecificName>Sun Wu Trouble Freeing Forces</SpecificName>
-    <SelectionGroupName>units/han/cavalry_crossbowman</SelectionGroupName>
-    <Icon>units/han/champion_cavalry_crossbowman.png</Icon>
-    <RequiredTechnology>unlock_champion_cavalry</RequiredTechnology>
-  </Identity>
-  <VisualActor>
-    <Actor>units/han/cavalry_crossbowman_c_m.xml</Actor>
-  </VisualActor>
-</Entity>
--- 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
@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/han/champion_cavalry_crossbowman">
-  <Identity>
-    <RequiredTechnology>phase_city</RequiredTechnology>
-  </Identity>
-</Entity>
--- 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
@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_cavalry_spearman">
-  <Identity>
-    <Civ>han</Civ>
-    <SpecificName>Wu Wei Yin Cao Cao Guard</SpecificName>
-    <SelectionGroupName>units/han/champion_cavalry</SelectionGroupName>
-    <Icon>units/han/champion_cavalry_spearman.png</Icon>
-    <RequiredTechnology>unlock_champion_cavalry</RequiredTechnology>
-  </Identity>
-  <VisualActor>
-    <Actor>units/han/cavalry_spearman_c_m.xml</Actor>
-  </VisualActor>
-</Entity>
--- 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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/han/champion_cavalry_spearman">
+<Entity parent="template_unit_champion_cavalry_spearman">
  <Identity>
+    <Civ>han</Civ>
+    <SpecificName>Wu Wei Yin Cao Cao Guard</SpecificName>
+    <SelectionGroupName>units/han/champion_cavalry</SelectionGroupName>
+    <Icon>units/han/champion_cavalry_spearman.png</Icon>
    <RequiredTechnology>phase_city</RequiredTechnology>
  </Identity>
+  <VisualActor>
+    <Actor>units/han/cavalry_spearman_c_m.xml</Actor>
+  </VisualActor>
 </Entity>
--- a/binaries/data/mods/public/simulation/templates/units/han/champion_chariot.xml
+++ b/binaries/data/mods/public/simulation/templates/units/han/champion_chariot.xml
@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_cavalry_archer">
-  <Footprint replace="">
-    <Square depth="10.0" width="10.0"/>
-    <Height>5.0</Height>
-  </Footprint>
-  <Identity>
-    <Civ>han</Civ>
-    <GenericName>Han War Chariot</GenericName>
-    <SpecificName>Zhanche</SpecificName>
-    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
-    <RequiredTechnology>unlock_champion_chariots</RequiredTechnology>
-    <Icon>units/han/chariot.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/han/chariot_archer_m.xml</Actor>
-  </VisualActor>
-</Entity>
--- 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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/han/champion_chariot">
+<Entity parent="template_unit_champion_cavalry_archer">
+  <Footprint replace="">
+    <Square depth="10.0" width="10.0"/>
+    <Height>5.0</Height>
+  </Footprint>
  <Identity>
+    <Civ>han</Civ>
+    <GenericName>Han War Chariot</GenericName>
+    <SpecificName>Zhanche</SpecificName>
+    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
    <RequiredTechnology>phase_city</RequiredTechnology>
+    <Icon>units/han/chariot.png</Icon>
  </Identity>
+  <VisualActor>
+    <Actor>units/han/chariot_archer_m.xml</Actor>
+  </VisualActor>
 </Entity>
--- 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
@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_archer">
-  <Identity>
-    <Civ>han</Civ>
-    <GenericName>Palace Guard Archer</GenericName>
-    <SpecificName>Yǔ Lín</SpecificName>
-    <SelectionGroupName>units/han/champion_infantry_archer</SelectionGroupName>
-    <Icon>units/han/champion_infantry_archer.png</Icon>
-    <RequiredTechnology>unlock_champion_infantry</RequiredTechnology>
-  </Identity>
-  <VisualActor>
-    <Actor>units/han/infantry_archer_c.xml</Actor>
-  </VisualActor>
-</Entity>
--- 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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/han/champion_infantry_archer">
+<Entity parent="template_unit_champion_infantry_archer">
  <Identity>
+    <Civ>han</Civ>
+    <GenericName>Palace Guard Archer</GenericName>
+    <SpecificName>Yǔ Lín</SpecificName>
+    <SelectionGroupName>units/han/champion_infantry_archer</SelectionGroupName>
+    <Icon>units/han/champion_infantry_archer.png</Icon>
    <RequiredTechnology>phase_city</RequiredTechnology>
  </Identity>
+  <VisualActor>
+    <Actor>units/han/infantry_archer_c.xml</Actor>
+  </VisualActor>
 </Entity>
--- 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
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_infantry_crossbowman">
+  <Identity>
+    <Civ>han</Civ>
+    <SpecificName>Juezhang</SpecificName>
+    <Icon>units/mace_champion_infantry_crossbowman.png</Icon>
+    <RequiredTechnology>phase_city</RequiredTechnology>
+  </Identity>
+  <VisualActor>
+    <Actor>units/han/infantry_crossbowman_c.xml</Actor>
+  </VisualActor>
+</Entity>
--- 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
@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_spearman">
-  <Identity>
-    <Civ>han</Civ>
-    <GenericName>Palace Guard Spearman</GenericName>
-    <SpecificName>Hǔ Bēn</SpecificName>
-    <SelectionGroupName>units/han/champion_infantry_spearman</SelectionGroupName>
-    <RequiredTechnology>unlock_champion_infantry</RequiredTechnology>
-    <Icon>units/han/champion_infantry_swordsman.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/han/infantry_spearman_c.xml</Actor>
-  </VisualActor>
-</Entity>
--- 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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/han/champion_infantry_spearman">
+<Entity parent="template_unit_champion_infantry_spearman">
  <Identity>
+    <Civ>han</Civ>
+    <GenericName>Palace Guard Spearman</GenericName>
+    <SpecificName>Hǔ Bēn</SpecificName>
+    <SelectionGroupName>units/han/champion_infantry_spearman</SelectionGroupName>
    <RequiredTechnology>phase_city</RequiredTechnology>
+    <Icon>units/han/champion_infantry_swordsman.png</Icon>
  </Identity>
+  <VisualActor>
+    <Actor>units/han/infantry_spearman_c.xml</Actor>
+  </VisualActor>
 </Entity>
--- 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 @@
    <SelectionGroupName>units/han/infantry_archer_b</SelectionGroupName>
    <SpecificName>Shè Shǒu</SpecificName>
    <Icon>units/han/infantry_archer.png</Icon>
+    <RequiredTechnology>phase_town</RequiredTechnology>
  </Identity>
  <Promotion>
    <Entity>units/han/infantry_archer_a</Entity>
--- 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 @@
    <SelectionGroupName>units/han/infantry_crossbowman_b</SelectionGroupName>
    <SpecificName>Nǔ Shǒu</SpecificName>
    <Icon>units/han/infantry_crossbowman.png</Icon>
-    <RequiredTechnology>phase_town</RequiredTechnology>
  </Identity>
  <Promotion>
    <Entity>units/han/infantry_crossbowman_a</Entity>
--- 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 @@
 <Entity parent="template_unit_infantry_melee_pikeman">
  <Attack>
    <Melee>
-      <AttackName>Halberdier</AttackName>
+      <AttackName>Ji</AttackName>
      <Damage>
        <Hack op="add">1</Hack>
        <Pierce op="add">1</Pierce>
@ -17,6 +17,7 @@
  <Identity>
    <Civ>han</Civ>
    <SelectionGroupName>units/han/infantry_pikeman_b</SelectionGroupName>
+    <GenericName>Halberdier</GenericName>
    <SpecificName>Jǐ Bīng</SpecificName>
    <Icon>units/han/infantry_halberdman.png</Icon>
    <RequiredTechnology>phase_town</RequiredTechnology>