[Gameplay] - Move infantry from fortress to barracks only.

Having some civs able to train their champions at the barracks, others at (not too expensive) specific structures and some only at the (still expensive) fortress is neither consistent nor balanced. Patch by: @Nescio Differential revision: D3384 Reviewed by: @borg- Idea approved by: @wraitii This was SVN commit r24657.
2026-06-21 21:23:40 +00:00 · 2021-01-17 09:36:00 +00:00
parent 6ea368d236
commit 8ee6774d12
49 changed files with 72 additions and 129 deletions
@@ -86,7 +86,7 @@ const oPalisadeGate = "structures/palisades_gate";
 const oPalisadeTower = "structures/palisades_tower";
 const oKushCitizenArcher = "units/kush/infantry_archer_b";
 const oKushHealer = "units/kush/support_healer_b";
-const oKushChampionArcher = "units/kush/champion_infantry";
+const oKushChampionArcher = "units/kush/champion_infantry_archer";
 const oKushChampions = [
 	oKushChampionArcher,
 	"units/kush/champion_infantry_amun",
@@ -147,7 +147,7 @@ var mercenaryCampGuards = {
 		{ "Template" : "units/mace/infantry_javelineer_b", "Count" : 4 },
 		{ "Template" : "units/mace/cavalry_spearman_e", "Count" : 3 },
 		{ "Template" : "units/mace/infantry_archer_a", "Count" : 4 },
-		{ "Template" : "units/mace/champion_infantry_a", "Count" : 3 }
+		{ "Template" : "units/mace/champion_infantry_spearman", "Count" : 3 }
 	],
 	"generic/snowy": [
 		{ "Template" : "structures/ptol/mercenary_camp" },
@@ -11,7 +11,8 @@
 				"any": [
 					{ "civ": "brit" },
 					{ "civ": "maur" },
-					{ "civ": "pers" }
+					{ "civ": "pers" },
+					{ "civ": "sele" }
 				]
 			}
 		]
@@ -3,8 +3,7 @@
 	"specificName": {
 		"mace": "Agēma",
 		"ptol": "Agēma",
-		"rome": "Regio Cohors",
-		"sele": "Agēma"
+		"rome": "Regio Cohors"
 	},
 	"description": "Guard units (Champions) are professionals who wield the best weapons and have the best training.",
 	"cost": {
@@ -13,15 +12,11 @@
 	"requirements": {
 		"all": [
 			{ "tech": "phase_city" },
-			{
-				"any": [
-					{ "civ": "brit" },
-					{ "civ": "gaul" },
-					{ "civ": "iber" },
-					{ "civ": "mace" },
-					{ "civ": "rome" }
-				]
-			}
+			{ "notciv": "athen" },
+			{ "notciv": "cart" },
+			{ "notciv": "pers" },
+			{ "notciv": "sele" },
+			{ "notciv": "spart" }
 		]
 	},
 	"requirementsTooltip": "Unlocked in City Phase.",
@@ -10,14 +10,13 @@
  <Identity>
    <Civ>brit</Civ>
    <SpecificName>Dunon</SpecificName>
-    <Tooltip>Territory root. Train Champion Infantry and Heroes. Garrison Soldiers for additional arrows.</Tooltip>
+    <Tooltip>Territory root. Train Heroes. Garrison Soldiers for additional arrows.</Tooltip>
  </Identity>
  <Obstruction>
    <Static width="29.0" depth="29.0"/>
  </Obstruction>
  <ProductionQueue>
    <Entities datatype="tokens">
-      units/{civ}/champion_infantry
      units/{civ}/hero_boudicca
      units/{civ}/hero_caratacos
      units/{civ}/hero_cunobelin
@@ -3,13 +3,7 @@
  <Identity>
    <Civ>gaul</Civ>
    <SpecificName>Dunon</SpecificName>
-    <Tooltip>Territory root. Train Champion Infantry. Garrison Soldiers for additional arrows.</Tooltip>
  </Identity>
-  <ProductionQueue>
-    <Entities datatype="tokens">
-      units/{civ}/champion_infantry
-    </Entities>
-  </ProductionQueue>
  <Sound>
    <SoundGroups>
      <select>interface/select/building/sel_fortress.xml</select>
@@ -3,14 +3,13 @@
  <Identity>
    <Civ>iber</Civ>
    <SpecificName>Castro</SpecificName>
-    <Tooltip>Territory root. Train Champion Infantry and Heroes. Garrison Soldiers for additional arrows.</Tooltip>
+    <Tooltip>Territory root. Train Heroes. Garrison Soldiers for additional arrows.</Tooltip>
  </Identity>
  <Obstruction>
    <Static width="27.0" depth="27.0"/>
  </Obstruction>
  <ProductionQueue>
    <Entities datatype="tokens">
-      units/{civ}/champion_infantry
      units/{civ}/hero_caros
      units/{civ}/hero_indibil
      units/{civ}/hero_viriato
@@ -7,14 +7,13 @@
  <Identity>
    <Civ>kush</Civ>
    <SpecificName>Htm</SpecificName>
-    <Tooltip>Territory root. Train Champion Infantry and Heroes. Garrison Soldiers for additional arrows.</Tooltip>
+    <Tooltip>Territory root. Train Heroes. Garrison Soldiers for additional arrows.</Tooltip>
  </Identity>
  <Obstruction>
    <Static width="28.0" depth="28.0"/>
  </Obstruction>
  <ProductionQueue>
    <Entities datatype="tokens">
-      units/{civ}/champion_infantry
      units/{civ}/hero_nastasen
      units/{civ}/hero_amanirenas
      units/{civ}/hero_arakamani
@@ -7,15 +7,13 @@
  <Identity>
    <Civ>mace</Civ>
    <SpecificName>Phrourion</SpecificName>
-    <Tooltip>Territory root. Train Champion Infantry and Heroes. Garrison Soldiers for additional arrows.</Tooltip>
+    <Tooltip>Territory root. Train Heroes. Garrison Soldiers for additional arrows.</Tooltip>
  </Identity>
  <Obstruction>
    <Static width="24.0" depth="26.0"/>
  </Obstruction>
  <ProductionQueue>
    <Entities datatype="tokens">
-      units/{civ}/champion_infantry_a
-      units/{civ}/champion_infantry_swordsman
      units/{civ}/hero_philip_ii
      units/{civ}/hero_alexander_iii
      units/{civ}/hero_demetrius_i
@@ -7,16 +7,10 @@
  <Identity>
    <Civ>ptol</Civ>
    <SpecificName>Phrourion</SpecificName>
-    <Tooltip>Territory root. Train Champion Infantry Pikemen. Garrison Soldiers for additional arrows.</Tooltip>
  </Identity>
  <Obstruction>
    <Static width="24.0" depth="26.0"/>
  </Obstruction>
-  <ProductionQueue>
-    <Entities datatype="tokens">
-      units/{civ}/champion_infantry_pikeman
-    </Entities>
-  </ProductionQueue>
  <VisualActor>
    <Actor>structures/ptolemies/fortress.xml</Actor>
  </VisualActor>
@@ -3,11 +3,10 @@
  <Identity>
    <Civ>rome</Civ>
    <SpecificName>Castellum</SpecificName>
-    <Tooltip>Territory root. Train Champion Infantry and Heroes. Garrison Soldiers for additional arrows.</Tooltip>
+    <Tooltip>Territory root. Train Heroes. Garrison Soldiers for additional arrows.</Tooltip>
  </Identity>
  <ProductionQueue>
    <Entities datatype="tokens">
-      units/{civ}/champion_infantry
      units/{civ}/hero_marcellus
      units/{civ}/hero_maximus
      units/{civ}/hero_scipio
@@ -7,18 +7,12 @@
  <Identity>
    <Civ>sele</Civ>
    <SpecificName>Phrourion</SpecificName>
-    <Tooltip>Territory root. Train Champion Infantry. Garrison Soldiers for additional arrows.</Tooltip>
  </Identity>
  <Obstruction>
    <Static width="24.0" depth="26.0"/>
  </Obstruction>
  <ProductionQueue>
-    <Entities datatype="tokens">
-      units/{civ}/champion_infantry_pikeman
-      units/{civ}/champion_infantry_swordsman
-    </Entities>
    <Technologies datatype="tokens">
-      pair_unlock_champions_sele
      parade_of_daphne
    </Technologies>
  </ProductionQueue>
@@ -14,11 +14,6 @@
  <Obstruction>
    <Static width="20.0" depth="20.0"/>
  </Obstruction>
-  <ProductionQueue>
-    <Entities datatype="tokens">
-      units/{civ}/champion_infantry_sword
-    </Entities>
-  </ProductionQueue>
  <VisualActor>
    <Actor>structures/spartans/barracks.xml</Actor>
    <FoundationActor>structures/fndn_7x7.xml</FoundationActor>
@@ -42,19 +42,26 @@
    <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
-      units/{civ}/champion_infantry_barracks
-      units/{civ}/champion_infantry_swordsman_barracks
+      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
    </Entities>
    <Technologies datatype="tokens">
      barracks_batch_training
      infantry_cost_time
-      unlock_champion_units
+      unlock_champion_infantry
+      pair_unlock_champions_sele
    </Technologies>
  </ProductionQueue>
  <Sound>
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/brit/champion_infantry">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>
@@ -4,8 +4,8 @@
    <Civ>brit</Civ>
    <GenericName>Brythonic Champion</GenericName>
    <SpecificName>Argos</SpecificName>
-    <SelectionGroupName>units/brit/champion_infantry</SelectionGroupName>
    <Icon>units/brit_champion_infantry.png</Icon>
+    <RequiredTechnology>unlock_champion_infantry</RequiredTechnology>
  </Identity>
  <VisualActor>
    <Actor>units/britons/infantry_swordsman_c.xml</Actor>
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/gaul/champion_infantry">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>
@@ -2,10 +2,9 @@
 <Entity parent="template_unit_champion_infantry_swordsman">
  <Identity>
    <Civ>gaul</Civ>
-    <GenericName>Gallic Champion</GenericName>
    <SpecificName>Soliduros</SpecificName>
-    <SelectionGroupName>units/gaul/champion_infantry</SelectionGroupName>
    <Icon>units/gaul_champion_infantry.png</Icon>
+    <RequiredTechnology>unlock_champion_infantry</RequiredTechnology>
  </Identity>
  <VisualActor>
    <Actor>units/gauls/infantry_swordsman_c.xml</Actor>
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/iber/champion_infantry">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>
@@ -9,7 +9,7 @@
    <Civ>iber</Civ>
    <SpecificName>Leial Ezpatari</SpecificName>
    <Icon>units/iber_champion_infantry.png</Icon>
-    <SelectionGroupName>units/iber/champion_infantry</SelectionGroupName>
+    <RequiredTechnology>unlock_champion_infantry</RequiredTechnology>
  </Identity>
  <VisualActor>
    <Actor>units/iberians/infantry_swordsman_c.xml</Actor>
@@ -6,6 +6,7 @@
    <GenericName>Noble Archer</GenericName>
    <SpecificName>Hry pdty</SpecificName>
    <Icon>units/kush_champion_archer.png</Icon>
+    <RequiredTechnology>unlock_champion_infantry</RequiredTechnology>
  </Identity>
  <VisualActor>
    <Actor>units/kushites/infantry_archer_c.xml</Actor>
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/mace/champion_infantry_a">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>
@@ -5,11 +5,12 @@
    <Lang>greek</Lang>
    <GenericName>Macedonian Shield Bearer</GenericName>
    <SpecificName>Hypaspistḗs</SpecificName>
+    <SelectionGroupName>units/mace/champion_infantry_spearman</SelectionGroupName>
    <Icon>units/mace_hypaspist.png</Icon>
-    <SelectionGroupName>units/mace/champion_infantry_a</SelectionGroupName>
+    <RequiredTechnology>unlock_champion_infantry</RequiredTechnology>
  </Identity>
  <Promotion>
-    <Entity>units/mace/champion_infantry_e</Entity>
+    <Entity>units/mace/champion_infantry_spearman_02</Entity>
    <RequiredXp>2000</RequiredXp>
  </Promotion>
  <VisualActor>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/mace/champion_infantry_a">
+<Entity parent="units/mace/champion_infantry_spearman">
  <Attack>
    <Melee>
      <Damage>
@@ -10,8 +10,8 @@
    <Lang>greek</Lang>
    <GenericName>Thracian Black Cloak</GenericName>
    <SpecificName>Rhomphaiaphoros</SpecificName>
-    <SelectionGroupName>units/mace/champion_infantry_swordsman</SelectionGroupName>
    <Icon>units/sele_infantry_swordsman.png</Icon>
+    <RequiredTechnology>unlock_champion_infantry</RequiredTechnology>
  </Identity>
  <VisualActor>
    <Actor>units/hellenes/infantry_swordsman_c_thracian_blackcloak.xml</Actor>
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/mace/champion_infantry_swordsman">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>
@@ -6,6 +6,7 @@
    <SpecificName>Yōddha</SpecificName>
    <SelectionGroupName>units/maur/champion_infantry</SelectionGroupName>
    <Icon>units/maur_champion_maceman.png</Icon>
+    <RequiredTechnology>unlock_champion_infantry</RequiredTechnology>
  </Identity>
  <VisualActor>
    <Actor>units/mauryas/infantry_maceman_c.xml</Actor>
@@ -6,6 +6,7 @@
    <GenericName>Royal Guard Infantry</GenericName>
    <SpecificName>Phalangitès Agema</SpecificName>
    <Icon>units/ptol_champion_infantry.png</Icon>
+    <RequiredTechnology>unlock_champion_infantry</RequiredTechnology>
  </Identity>
  <VisualActor>
    <Actor>units/ptolemies/infantry_pikeman_c.xml</Actor>
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/rome/champion_infantry">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>
@@ -11,8 +11,9 @@
    <Lang>latin</Lang>
    <GenericName>Italic Heavy Infantry</GenericName>
    <SpecificName>Extrāōrdinārius</SpecificName>
-    <SelectionGroupName>units/rome/champion_infantry</SelectionGroupName>
+    <SelectionGroupName>units/rome/champion_infantry_swordsman</SelectionGroupName>
    <Icon>units/rome_champion_infantry.png</Icon>
+    <RequiredTechnology>unlock_champion_infantry</RequiredTechnology>
  </Identity>
  <VisualActor>
    <Actor>units/romans/infantry_swordsman_c.xml</Actor>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/rome/champion_infantry">
+<Entity parent="units/rome/champion_infantry_swordsman">
  <Identity>
    <GenericName>Marian Legionary</GenericName>
    <SpecificName>Legiōnārius</SpecificName>
@@ -11,6 +11,7 @@
    <SpecificName>Drepanèphoros</SpecificName>
    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
    <Icon>units/sele_champion_chariot.png</Icon>
+    <RequiredTechnology>unlock_champion_chariots</RequiredTechnology>
  </Identity>
  <VisualActor>
    <Actor>units/seleucids/chariot_archer_c_m.xml</Actor>