Han Chinese civilization restructure.

Deep discussion here: https://wildfiregames.com/forum/topic/71582-fixing-chinese-han/ Participants: @Yakaterina @BreakfastBurrito_007 @Lionkanzen @chrstgtr Changes: - New Starting units (Spearman, Crossbowman, Cavalry Swordsman) - Farms 60 wood, 30 seconds - Practice Range disabled (may be re-enabled in a future alpha) - Infantry and Cavalry Crossbowmen rebalance - New technology for the Han at the Forge: "Repeating Crossbows"; "Crossbow Training" at barracks tweaked to allow crossbows to fire faster This was SVN commit r26469.
2022-02-23 02:37:50 +00:00 · 2022-02-23 02:37:50 +00:00 · 9411d8c98e
commit 9411d8c98e
parent db713e6ba9
23 changed files with 88 additions and 74 deletions
--- a/binaries/data/mods/public/simulation/data/civs/han.json
+++ b/binaries/data/mods/public/simulation/data/civs/han.json
@ -22,18 +22,17 @@
 			"Count": 2
 		},
 		{
-			"Template": "units/han/infantry_archer_b",
+			"Template": "units/han/infantry_crossbowman_b",
 			"Count": 2
 		},
 		{
-			"Template": "units/han/cavalry_archer_b"
+			"Template": "units/han/cavalry_swordsman_b"
 		},
 		{
 			"Template": "units/han/support_minister"
 		}
 	],
 	"AINames": [
-		"Liu Bang",
 		"Liu Ying",
 		"Liu Gong",
 		"Liu Hong",
@ -65,8 +64,8 @@
 	],
 	"SkirmishReplacements": {
 		"skirmish/units/special_starting_unit": "units/han/support_minister",
-		"skirmish/units/default_infantry_ranged_b": "units/han/infantry_archer_b",
-		"skirmish/units/default_cavalry": "units/han/cavalry_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/special_crossbow_tradition.json
+++ b/binaries/data/mods/public/simulation/data/technologies/special_crossbow_tradition.json
@ -1,11 +1,9 @@
 {
-	"genericName": "Crossbow Tradition",
+	"genericName": "Crossbow Training",
 	"description": "The Chinese had a tradition of fine archery and a penchant for using massed crossbowmen in battle.",
 	"cost": {
-		"food": 500,
-		"wood": 500,
-		"stone": 0,
-		"metal": 250
+		"food": 400,
+		"wood": 400
 	},
 	"requirements": {
 		"all": [
@ -16,11 +14,10 @@
 	"requirementsTooltip": "Unlocked in Town Phase.",
 	"icon": "armor_plates_ranged.png",
 	"researchTime": 40,
-	"tooltip": "Range +10 meters, −10% ranged attack spread for crossbow-wielding units.",
+	"tooltip": "Crossbow Infantry and Cavalry −1 second firing time −20% train time.",
 	"modifications": [
-		{ "value": "Attack/Ranged/MaxRange", "add": 10.0 },
-		{ "value": "Attack/Ranged/Spread", "multiply": 0.9 },
-		{ "value": "Vision/Range", "add": 10.0 }
+		{ "value": "Attack/Ranged/RepeatTime", "add": -1000.0 },
+		{ "value": "Cost/BuildTime", "multiply": 0.8 }
 	],
 	"affects": ["Crossbowman"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
--- a/binaries/data/mods/public/simulation/data/technologies/repeating_crossbows.json
+++ b/binaries/data/mods/public/simulation/data/technologies/repeating_crossbows.json
@ -0,0 +1,24 @@
+{
+	"genericName": "Repeating Crossbows",
+	"description": "Crossbows equiped with a repeating mechanism and dart magazine increase firing rate.",
+	"cost": {
+		"wood": 500,
+		"metal": 500
+	},
+	"requirements": {
+		"all": [
+			{ "tech": "phase_city" },
+			{ "civ": "han" }
+		]
+	},
+	"requirementsTooltip": "Unlocked in Town Phase.",
+	"icon": "arrow_accuracy.png",
+	"researchTime": 40,
+	"tooltip": "Crossbow Infantry and Cavalry −1 second firing time, but +20 metal cost.",
+	"modifications": [
+		{ "value": "Attack/Ranged/RepeatTime", "add": -1000 },
+		{ "value": "Cost/Resources/metal", "add": 20 }
+	],
+	"affects": ["Crossbowman"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}
--- a/binaries/data/mods/public/simulation/templates/mixins/builder.xml
+++ b/binaries/data/mods/public/simulation/templates/mixins/builder.xml
@ -16,7 +16,6 @@
      structures/{civ}/dock
      structures/{civ}/barracks
      structures/{civ}/stable
-      structures/{civ}/practice_range
      structures/{civ}/elephant_stable
      structures/{civ}/forge
      structures/{civ}/temple
--- a/binaries/data/mods/public/simulation/templates/structures/han/academy.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/han/academy.xml
@ -3,6 +3,9 @@
  <BuildRestrictions>
    <Category>Academy</Category>
  </BuildRestrictions>
+  <Capturable>
+    <CapturePoints op="mul">3.0</CapturePoints>
+  </Capturable>
  <Cost>
    <BuildTime>200</BuildTime>
    <Resources>
@ -18,7 +21,7 @@
    <List datatype="tokens">Minister</List>
  </GarrisonHolder>
  <Health>
-    <Max>2000</Max>
+    <Max>2500</Max>
    <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
  </Health>
  <Identity>
@ -71,7 +74,6 @@
      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
    </Entities>
--- a/binaries/data/mods/public/simulation/templates/structures/han/barracks.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/han/barracks.xml
@ -17,13 +17,13 @@
  <Researcher>
    <Technologies datatype="tokens">
      -unlock_champion_infantry
+      archer_attack_spread
+      crossbow_training
    </Technologies>
  </Researcher>
  <Trainer>
    <Entities datatype="tokens">
-      -units/{civ}/infantry_javelineer_b
-      -units/{civ}/infantry_slinger_b
-      -units/{civ}/infantry_archer_b
+      units/{civ}/infantry_crossbowman_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,8 +23,8 @@
  <Trainer>
    <Entities datatype="tokens">
      units/{civ}/infantry_spearman_b
-      units/{civ}/infantry_archer_b
-      units/{civ}/cavalry_archer_b
+      units/{civ}/infantry_crossbowman_b
+      units/{civ}/cavalry_swordsman_b
    </Entities>
  </Trainer>
  <Upgrade>
--- a/binaries/data/mods/public/simulation/templates/structures/han/civil_centre_court.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/han/civil_centre_court.xml
@ -42,8 +42,8 @@
      units/{civ}/hero_liu_bang_horse
      units/{civ}/hero_wei_qing_chariot
      -units/{civ}/infantry_spearman_b
-      -units/{civ}/infantry_archer_b
-      -units/{civ}/cavalry_archer_b
+      -units/{civ}/infantry_crossbowman_b
+      -units/{civ}/cavalry_swordsman_b
    </Entities>
  </Trainer>
  <Upgrade disable=""/>
--- a/binaries/data/mods/public/simulation/templates/structures/han/field.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/han/field.xml
@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_resource_field">
+  <Cost>
+    <BuildTime>30</BuildTime>
+    <Resources>
+      <wood>60</wood>
+    </Resources>
+  </Cost>
  <Footprint>
    <Square depth="22.0" width="22.0"/>
    <Height>2.0</Height>
--- a/binaries/data/mods/public/simulation/templates/structures/han/fortress_old.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/han/fortress_old.xml
@ -14,19 +14,6 @@
  <Obstruction>
    <Static depth="34.0" width="34.0"/>
  </Obstruction>
-  <Researcher>
-    <Technologies datatype="tokens">
-      poison_blades
-      pair_unlock_arrows_type
-    </Technologies>
-  </Researcher>
-  <Trainer>
-    <Entities datatype="tokens">
-      units/{civ}/champion_infantry_swordsman
-      units/{civ}/champion_infantry_archer
-      units/{civ}/champion_cavalry_crossbowman
-    </Entities>
-  </Trainer>
  <VisualActor>
    <Actor>structures/han/fortress_old.xml</Actor>
  </VisualActor>
--- a/binaries/data/mods/public/simulation/templates/structures/han/practice_range.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/han/practice_range.xml
@ -10,8 +10,6 @@
  <Identity>
    <Civ>han</Civ>
    <SpecificName>Bǎ Chǎng</SpecificName>
-    <VisibleClasses datatype="tokens">-Village Town</VisibleClasses>
-    <RequiredTechnology>phase_town</RequiredTechnology>
  </Identity>
  <Obstruction>
    <Static depth="22.0" width="26.0"/>
--- a/binaries/data/mods/public/simulation/templates/template_structure_military_forge.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_military_forge.xml
@ -49,7 +49,8 @@
      soldier_resistance_pierce_01
      soldier_resistance_pierce_02
      soldier_resistance_pierce_03
-      archer_attack_spread
+      repeating_crossbows
+	  archer_attack_spread
    </Technologies>
  </Researcher>
  <Sound>
--- a/binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml
@ -27,7 +27,7 @@
    <SelectionGroupName>template_structure_military_stable</SelectionGroupName>
    <Tooltip>Train Cavalry and research Cavalry technologies.</Tooltip>
    <VisibleClasses datatype="tokens">Village Stable</VisibleClasses>
-    <Icon>structures/stable.png</Icon>
+    <Icon>structures/stable_01.png</Icon>
    <RequiredTechnology>phase_village</RequiredTechnology>
  </Identity>
  <Loot>
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_crossbowman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_crossbowman.xml
@ -4,14 +4,14 @@
    <Ranged>
      <AttackName>Crossbow</AttackName>
      <Damage>
-        <Pierce>20</Pierce>
+        <Pierce>24</Pierce>
      </Damage>
-      <MaxRange>60</MaxRange>
-      <PrepareTime>200</PrepareTime>
+      <MaxRange>50</MaxRange>
+      <PrepareTime>600</PrepareTime>
      <RepeatTime>3000</RepeatTime>
      <Projectile>
-        <Speed>120</Speed>
-        <Spread>2</Spread>
+        <Speed>80</Speed>
+        <Spread>3</Spread>
        <Gravity>30</Gravity>
        <FriendlyFire>false</FriendlyFire>
        <LaunchPoint y="5"/>
@ -21,8 +21,7 @@
  </Attack>
  <Cost>
    <Resources>
-      <wood>30</wood>
-      <metal>20</metal>
+      <wood>40</wood>
    </Resources>
  </Cost>
  <Identity>
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_crossbowman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_crossbowman.xml
@ -6,15 +6,15 @@
      <Damage>
        <Pierce>40</Pierce>
      </Damage>
-      <MaxRange>60</MaxRange>
-      <PrepareTime>200</PrepareTime>
+      <MaxRange>55</MaxRange>
+      <PrepareTime>600</PrepareTime>
      <RepeatTime>3000</RepeatTime>
      <Projectile>
-        <Speed>120</Speed>
-        <Spread>0.8</Spread>
+        <Speed>80</Speed>
+        <Spread>3</Spread>
        <Gravity>30</Gravity>
        <FriendlyFire>false</FriendlyFire>
-        <LaunchPoint y="5"/>
+        <LaunchPoint y="3"/>
      </Projectile>
      <PreferredClasses datatype="tokens">Human</PreferredClasses>
    </Ranged>
--- 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>60</MaxRange>
-      <PrepareTime>200</PrepareTime>
+      <MaxRange>50</MaxRange>
+      <PrepareTime>600</PrepareTime>
      <RepeatTime>3000</RepeatTime>
      <Projectile>
-        <Speed>120</Speed>
-        <Spread>0.8</Spread>
+        <Speed>80</Speed>
+        <Spread>3</Spread>
        <Gravity>30</Gravity>
        <FriendlyFire>false</FriendlyFire>
        <LaunchPoint y="3"/>
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_crossbowman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_crossbowman.xml
@ -6,15 +6,15 @@
      <Damage>
        <Pierce>80</Pierce>
      </Damage>
-      <MaxRange>60</MaxRange>
-      <PrepareTime>200</PrepareTime>
+      <MaxRange>65</MaxRange>
+      <PrepareTime>600</PrepareTime>
      <RepeatTime>3000</RepeatTime>
      <Projectile>
-        <Speed>120</Speed>
-        <Spread>0.4</Spread>
+        <Speed>80</Speed>
+        <Spread>2</Spread>
        <Gravity>30</Gravity>
        <FriendlyFire>false</FriendlyFire>
-        <LaunchPoint y="5"/>
+        <LaunchPoint y="3"/>
      </Projectile>
      <PreferredClasses datatype="tokens">Human</PreferredClasses>
    </Ranged>
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_crossbowman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_crossbowman.xml
@ -7,11 +7,11 @@
        <Pierce>80</Pierce>
      </Damage>
      <MaxRange>60</MaxRange>
-      <PrepareTime>200</PrepareTime>
+      <PrepareTime>600</PrepareTime>
      <RepeatTime>3000</RepeatTime>
      <Projectile>
-        <Speed>120</Speed>
-        <Spread>0.4</Spread>
+        <Speed>80</Speed>
+        <Spread>2</Spread>
        <Gravity>30</Gravity>
        <FriendlyFire>false</FriendlyFire>
        <LaunchPoint y="3"/>
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_crossbowman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_crossbowman.xml
@ -4,14 +4,14 @@
    <Ranged>
      <AttackName>Crossbow</AttackName>
      <Damage>
-        <Pierce>20</Pierce>
+        <Pierce>21</Pierce>
      </Damage>
-      <MaxRange>60</MaxRange>
-      <PrepareTime>200</PrepareTime>
+      <MaxRange>45</MaxRange>
+      <PrepareTime>600</PrepareTime>
      <RepeatTime>3000</RepeatTime>
      <Projectile>
-        <Speed>120</Speed>
-        <Spread>2</Spread>
+        <Speed>80</Speed>
+        <Spread>3</Spread>
        <Gravity>30</Gravity>
        <FriendlyFire>false</FriendlyFire>
        <LaunchPoint y="3"/>
@ -21,10 +21,12 @@
  </Attack>
  <Cost>
    <Resources>
-      <wood>30</wood>
-      <metal>20</metal>
+      <wood>40</wood>
    </Resources>
  </Cost>
+  <Health>
+    <Max op="add">-10</Max>
+  </Health>
  <Identity>
    <GenericName>Infantry Crossbowman</GenericName>
    <VisibleClasses datatype="tokens">Crossbowman</VisibleClasses>
--- a/binaries/data/mods/public/simulation/templates/units/han/cavalry_archer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/han/cavalry_archer_b.xml
@ -5,6 +5,7 @@
    <SelectionGroupName>units/han/cavalry_archer_b</SelectionGroupName>
    <SpecificName>Gōng Qíbīng</SpecificName>
    <Icon>units/han/cavalry_archer.png</Icon>
+    <RequiredTechnology>phase_town</RequiredTechnology>
  </Identity>
  <Promotion>
    <Entity>units/han/cavalry_archer_a</Entity>
--- a/binaries/data/mods/public/simulation/templates/units/han/cavalry_swordsman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/han/cavalry_swordsman_b.xml
@ -5,7 +5,6 @@
    <SelectionGroupName>units/han/cavalry_swordsman_b</SelectionGroupName>
    <SpecificName>Dāo Qíbīng</SpecificName>
    <Icon>units/han/cavalry_swordsman.png</Icon>
-    <RequiredTechnology>phase_town</RequiredTechnology>
  </Identity>
  <Promotion>
    <Entity>units/han/cavalry_swordsman_a</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
@ -17,7 +17,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>