Changeset 25239

Timestamp:

Apr 12, 2021, 1:30:38 PM (3 years ago)

Author:

wraitii

Message:

Mixins: deduplicate Athen-specific data.

Puts the athen-specific data in the mixin civ/athen. Deduplicates.

Differential Revision: ​https://code.wildfiregames.com/D3831

Location:

ps/trunk/binaries/data/mods/public/simulation/templates

Files:

• mixins/civ (added)
• mixins/civ/athen.xml (added)
• units/athen/catafalque.xml (modified) (2 diffs)
• units/athen/cavalry_javelineer_b.xml (modified) (1 diff)
• units/athen/cavalry_swordsman_b.xml (modified) (2 diffs)
• units/athen/champion_infantry.xml (modified) (1 diff)
• units/athen/champion_marine.xml (modified) (1 diff)
• units/athen/champion_ranged.xml (modified) (1 diff)
• units/athen/hero_iphicrates.xml (modified) (2 diffs)
• units/athen/hero_pericles.xml (modified) (2 diffs)
• units/athen/hero_themistocles.xml (modified) (2 diffs)
• units/athen/hero_xenophon.xml (modified) (1 diff)
• units/athen/infantry_javelineer_b.xml (modified) (1 diff)
• units/athen/infantry_marine_archer_b.xml (modified) (1 diff)
• units/athen/infantry_slinger_b.xml (modified) (1 diff)
• units/athen/infantry_spearman_b.xml (modified) (1 diff)
• units/athen/ship_bireme.xml (modified) (2 diffs)
• units/athen/ship_fishing.xml (modified) (2 diffs)
• units/athen/ship_merchant.xml (modified) (2 diffs)
• units/athen/ship_trireme.xml (modified) (2 diffs)
• units/athen/siege_lithobolos_packed.xml (modified) (1 diff)
• units/athen/siege_oxybeles_packed.xml (modified) (1 diff)
• units/athen/siege_ram.xml (modified) (2 diffs)
• units/athen/support_female_citizen.xml (modified) (1 diff)
• units/athen/support_healer_b.xml (modified) (1 diff)
• units/athen/support_slave.xml (modified) (1 diff)
• units/athen/support_trader.xml (modified) (2 diffs)

ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/catafalque.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_catafalque">
+<Entity parent="template_unit_catafalque">
   <Auras datatype="tokens">
     units/catafalques/athen_catafalque_1
@@ -6 +6 @@
   </Auras>
   <Identity>
-    <Civ>athen</Civ>
     <SpecificName>Solon</SpecificName>
   </Identity>

ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/cavalry_javelineer_b.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_ranged_javelineer">
+<Entity parent="template_unit_cavalry_ranged_javelineer">
   <Identity>
-    <Civ>athen</Civ>
-    <Lang>greek</Lang>
     <SelectionGroupName>units/athen/cavalry_javelineer_b</SelectionGroupName>
     <SpecificName>Pródromos</SpecificName>

ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/cavalry_swordsman_b.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee_swordsman">
+<Entity parent="template_unit_cavalry_melee_swordsman">
   <Attack>
     <Melee>
@@ -7 +7 @@
   </Attack>
   <Identity>
-    <Civ>athen</Civ>
-    <Lang>greek</Lang>
     <SelectionGroupName>units/athen/cavalry_swordsman_b</SelectionGroupName>
     <GenericName>Greek Cavalry</GenericName>

ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/champion_infantry.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="hoplite|template_unit_champion_infantry_spearman">
+<Entity parent="hoplite|template_unit_champion_infantry_spearman">
   <Identity>
-    <Civ>athen</Civ>
-    <Lang>greek</Lang>
     <GenericName>City Guard</GenericName>
     <SpecificName>Epílektos</SpecificName>

ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/champion_marine.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_swordsman">
+<Entity parent="template_unit_champion_infantry_swordsman">
   <Identity>
-    <Civ>athen</Civ>
-    <Lang>greek</Lang>
     <GenericName>Athenian Marine</GenericName>
     <SpecificName>Epibátēs Athēnaîos</SpecificName>

ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/champion_ranged.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_archer">
+<Entity parent="template_unit_champion_infantry_archer">
   <Identity>
-    <Civ>athen</Civ>
-    <Lang>greek</Lang>
     <GenericName>Scythian Archer</GenericName>
     <SpecificName>Toxótēs Skythikós</SpecificName>

ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/hero_iphicrates.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry_javelineer">
+<Entity parent="template_unit_hero_infantry_javelineer">
   <Auras datatype="tokens">
     units/heroes/athen_hero_iphicrates_1
@@ -6 +6 @@
   </Auras>
   <Identity>
-    <Civ>athen</Civ>
-    <Lang>greek</Lang>
     <GenericName>Iphicrates</GenericName>
     <SpecificName>Iphikratēs</SpecificName>

ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/hero_pericles.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="hoplite|template_unit_hero_infantry_spearman">
+<Entity parent="hoplite|template_unit_hero_infantry_spearman">
   <Auras datatype="tokens">
     units/heroes/athen_hero_pericles_1
@@ -6 +6 @@
   </Auras>
   <Identity>
-    <Civ>athen</Civ>
-    <Lang>greek</Lang>
     <GenericName>Pericles</GenericName>
     <SpecificName>Periklēs</SpecificName>

ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/hero_themistocles.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry_swordsman">
+<Entity parent="template_unit_hero_infantry_swordsman">
   <Auras datatype="tokens">
     units/heroes/athen_hero_themistocles_1
@@ -6 +6 @@
   </Auras>
   <Identity>
-    <Civ>athen</Civ>
-    <Lang>greek</Lang>
     <GenericName>Themistocles</GenericName>
     <SpecificName>Themistoklēs</SpecificName>

ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/hero_xenophon.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_infantry_javelineer">
+<Entity parent="template_unit_hero_infantry_javelineer">
   <Identity>
-    <Civ>athen</Civ>
-    <Lang>greek</Lang>
     <GenericName>Xenophon</GenericName>
     <SpecificName>Xenophōn</SpecificName>

ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_javelineer_b.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="merc_inf|template_unit_infantry_ranged_javelineer">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/athen/gymnasium
-      structures/athen/prytaneion
-    </Entities>
-  </Builder>
+<Entity parent="civ/athen|merc_inf|template_unit_infantry_ranged_javelineer">
   <Identity>
-    <Civ>athen</Civ>
-    <Lang>greek</Lang>
     <SelectionGroupName>units/athen/infantry_javelineer_b</SelectionGroupName>
     <GenericName>Thracian Peltast</GenericName>

ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_marine_archer_b.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="merc_inf|template_unit_infantry_ranged_archer">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/athen/gymnasium
-      structures/athen/prytaneion
-    </Entities>
-  </Builder>
+<Entity parent="civ/athen|merc_inf|template_unit_infantry_ranged_archer">
   <Identity>
-    <Civ>athen</Civ>
-    <Lang>greek</Lang>
     <SelectionGroupName>units/athen/infantry_marine_archer_b</SelectionGroupName>
     <GenericName>Cretan Mercenary Archer</GenericName>

ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_slinger_b.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_ranged_slinger">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/athen/gymnasium
-      structures/athen/prytaneion
-    </Entities>
-  </Builder>
+<Entity parent="civ/athen|template_unit_infantry_ranged_slinger">
   <Identity>
-    <Civ>athen</Civ>
-    <Lang>greek</Lang>
     <SelectionGroupName>units/athen/infantry_slinger_b</SelectionGroupName>
     <GenericName>Athenian Slinger Militia</GenericName>

ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_spearman_b.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="hoplite|template_unit_infantry_melee_spearman">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/athen/gymnasium
-      structures/athen/prytaneion
-    </Entities>
-  </Builder>
+<Entity parent="civ/athen|hoplite|template_unit_infantry_melee_spearman">
   <Identity>
-    <Civ>athen</Civ>
-    <Lang>greek</Lang>
     <SelectionGroupName>units/athen/infantry_spearman_b</SelectionGroupName>
     <GenericName>Athenian Hoplite</GenericName>

ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/ship_bireme.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_ship_bireme">
+<Entity parent="template_unit_ship_bireme">
   <Footprint>
     <Square width="8.0" depth="33.0"/>
@@ -6 +6 @@
   </Footprint>
   <Identity>
-    <Civ>athen</Civ>
     <GenericName>Penteconter</GenericName>
     <SpecificName>Pentēkóntoros</SpecificName>

ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/ship_fishing.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_ship_fishing">
+<Entity parent="template_unit_ship_fishing">
   <Footprint>
     <Square width="4.0" depth="10.0"/>
@@ -6 +6 @@
   </Footprint>
   <Identity>
-    <Civ>athen</Civ>
     <SpecificName>Ploîon Halieutikón</SpecificName>
     <Icon>units/hele_ship_fishing.png</Icon>

ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/ship_merchant.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_ship_merchant">
+<Entity parent="template_unit_ship_merchant">
   <Footprint>
     <Square width="8.0" depth="24.0"/>
@@ -6 +6 @@
   </Footprint>
   <Identity>
-    <Civ>athen</Civ>
     <SpecificName>Ploîon Phortēgikón</SpecificName>
     <Icon>units/hele_ship_merchant.png</Icon>

ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/ship_trireme.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_ship_trireme">
+<Entity parent="template_unit_ship_trireme">
   <Footprint>
     <Square width="10.0" depth="40.0"/>
@@ -6 +6 @@
   </Footprint>
   <Identity>
-    <Civ>athen</Civ>
     <SpecificName>Triḗrēs Athēnaía</SpecificName>
     <GenericName>Athenian Trireme</GenericName>

ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/siege_lithobolos_packed.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_siege_stonethrower">
+<Entity parent="template_unit_siege_stonethrower">
   <Identity>
-    <Civ>athen</Civ>
     <SpecificName>Lithobólos</SpecificName>
     <Icon>units/hele_siege_lithobolos_packed.png</Icon>

ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/siege_oxybeles_packed.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_siege_boltshooter">
+<Entity parent="template_unit_siege_boltshooter">
   <Identity>
-    <Civ>athen</Civ>
     <SpecificName>Oxybelḗs</SpecificName>
     <Icon>units/hele_siege_oxybeles_packed.png</Icon>

ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/siege_ram.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_siege_ram">
+<Entity parent="template_unit_siege_ram">
   <Footprint replace="">
     <Square width="8.0" depth="10.0"/>
@@ -6 +6 @@
   </Footprint>
   <Identity>
-    <Civ>athen</Civ>
     <SpecificName>Krios</SpecificName>
     <Icon>units/spart_siege_ram.png</Icon>

ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/support_female_citizen.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_support_female_citizen">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/athen/gymnasium
-      structures/athen/prytaneion
-    </Entities>
-  </Builder>
+<Entity parent="civ/athen|template_unit_support_female_citizen">
   <Identity>
-    <Civ>athen</Civ>
     <SpecificName>Gýnē Athēnaía</SpecificName>
     <GenericName>Athenian Woman</GenericName>

ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/support_healer_b.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_support_healer">
+<Entity parent="template_unit_support_healer">
   <Identity>
-    <Civ>athen</Civ>
-    <Lang>greek</Lang>
     <GenericName>Surgeon</GenericName>
     <SpecificName>Iatros</SpecificName>

ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/support_slave.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_support_slave">
+<Entity parent="template_unit_support_slave">
   <Identity>
-    <Civ>athen</Civ>
     <SpecificName>Doûlos</SpecificName>
     <Icon>units/global_slave.png</Icon>

ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/support_trader.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_support_trader">
+<Entity parent="template_unit_support_trader">
   <Footprint replace="">
     <Square width="5" depth="10"/>
@@ -6 +6 @@
   </Footprint>
   <Identity>
-    <Civ>athen</Civ>
-    <Lang>greek</Lang>
     <SpecificName>Émporos</SpecificName>
     <Icon>units/hele_support_trader.png</Icon>