Prevents training of unexpected units in buildings introduced in 60a2af2988, lets mace trains 2 mercs in captured stoa or in their own stoa for scenario map, fixes #4011.

This was SVN commit r18562.
2026-07-28 01:52:16 +00:00 · 2016-07-25 18:54:28 +00:00
parent 20b4e039be
commit f3d35d8a8a
18 changed files with 107 additions and 68 deletions
@@ -36,7 +36,7 @@
  <TerritoryDecay disable=""/>
  <ProductionQueue>
    <Entities datatype="tokens">
-	  units/cart_champion_cavalry
+	  units/{civ}_champion_cavalry
    </Entities>
  </ProductionQueue>
  <Vision>
@@ -19,10 +19,10 @@
    <BatchTimeModifier>0.7</BatchTimeModifier>
    <Entities datatype="tokens">
      units/{civ}_support_female_citizen
-      units/maur_champion_maiden_archer
+      units/{civ}_champion_maiden_archer
-      units/maur_hero_chanakya
+      units/{civ}_hero_chanakya
-      units/maur_hero_maurya
+      units/{civ}_hero_maurya
-      units/maur_hero_ashoka
+      units/{civ}_hero_ashoka
    </Entities>
  </ProductionQueue>
  <TerritoryInfluence>
@@ -18,8 +18,8 @@
  <ProductionQueue>
    <BatchTimeModifier>0.7</BatchTimeModifier>
    <Entities datatype="tokens">
-      units/athen_infantry_marine_archer_b
+      units/{civ}_infantry_marine_archer_b
-      units/athen_champion_marine
+      units/{civ}_champion_marine
    </Entities>
  </ProductionQueue>
  <VisualActor>
@@ -3,9 +3,4 @@
  <Identity>
    <Civ>athen</Civ>
  </Identity>
  <ProductionQueue>
    <Entities datatype="tokens">
      -units/mace_thorakites
    </Entities>
  </ProductionQueue>
 </Entity>
@@ -34,12 +34,12 @@
  </Position>
  <ProductionQueue>
    <Entities datatype="tokens">
-      units/brit_infantry_spearman_b
+      units/{civ}_infantry_spearman_b
-      units/brit_infantry_slinger_b
+      units/{civ}_infantry_slinger_b
-      units/brit_cavalry_javelinist_b
+      units/{civ}_cavalry_javelinist_b
      units/{civ}_ship_fishing
      units/{civ}_ship_merchant
-      units/brit_ship_trireme
+      units/{civ}_ship_trireme
    </Entities>
  </ProductionQueue>
  <RallyPointRenderer>
@@ -39,10 +39,10 @@
  </Obstruction>
  <ProductionQueue>
    <Entities datatype="tokens">
-      units/ptol_infantry_spearman_merc_b
+      units/{civ}_infantry_spearman_merc_b
-	  units/ptol_infantry_swordsman_merc_b
+      units/{civ}_infantry_swordsman_merc_b
-      units/ptol_cavalry_spearman_merc_b
+      units/{civ}_cavalry_spearman_merc_b
-      units/ptol_cavalry_javelinist_merc_b
+      units/{civ}_cavalry_javelinist_merc_b
    </Entities>
    <Technologies datatype="tokens">
 	  upgrade_rank_advanced_infantry
@@ -41,10 +41,10 @@
  </Obstruction>
  <ProductionQueue>
    <Entities datatype="tokens">
-      units/ptol_infantry_spearman_merc_b
+      units/{civ}_infantry_spearman_merc_b
-	  units/ptol_infantry_swordsman_merc_b
+      units/{civ}_infantry_swordsman_merc_b
-      units/ptol_cavalry_spearman_merc_b
+      units/{civ}_cavalry_spearman_merc_b
-      units/ptol_cavalry_javelinist_merc_b
+      units/{civ}_cavalry_javelinist_merc_b
    </Entities>
    <Technologies datatype="tokens">
 	  upgrade_rank_advanced_infantry
@@ -47,9 +47,9 @@
  <ProductionQueue>
    <BatchTimeModifier>0.7</BatchTimeModifier>
    <Entities datatype="tokens">
-      units/thrace_black_cloak
+      units/{civ}_black_cloak
-      units/mace_thureophoros
+      units/{civ}_thureophoros
-      units/mace_thorakites
+      units/{civ}_thorakites
    </Entities>
  </ProductionQueue>
  <Vision>
@@ -0,0 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/merc_black_cloak">
  <Identity>
    <Civ>athen</Civ>
  </Identity>
 </Entity>
@@ -0,0 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/merc_thureophoros">
  <Identity>
    <Civ>athen</Civ>
  </Identity>
 </Entity>
@@ -1,30 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_swordsman">
+<Entity parent="units/merc_thorakites">
  <Armour>
    <Hack op="add">2</Hack>
    <Pierce op="add">2</Pierce>
  </Armour>
  <Attack>
    <Melee>
      <Hack op="add">-2</Hack>
    </Melee>
  </Attack>
  <Cost>
    <Resources>
      <food>0</food>
      <metal op="mul">2</metal>
    </Resources>
  </Cost>
  <Identity>
    <Civ>mace</Civ>
    <Lang>greek</Lang>
 	<GenericName>Armored Swordsman</GenericName>
    <SpecificName>Thōrakitēs</SpecificName>
    <History>Thōrakitai were soldiers similar to Thyreophóroi. The literal translation of the term is curassiers, which suggests that they may have worn a short Celtic mail shirt or possibly a thorax. Thorakitai were used in armies of the Hellenistic Period in a variety of tactical situations. They were a type of armored but mobile infantry who did not require a rigid formation to be effective in combat. From their name we can deduce that most wore armor and helmet. They bore a thureos (or thyreos), an oblong shield, and were armed with sword, javelins and spear, which were used according to their tactical use. It seems that the thorakitai were heavily armored thureophoroi, able to bear spears and do battle in a phalanx as well as irregularly attack the enemy in situations when such an action was required for tactical reasons, like to exploit or challenge rough terrain. Thorakitai are mentioned in the army of the Achaian League and in the army of the Seleucids. The Seleucid Thorakitai were used in the storming of the Elburz Range in 210 BC under Antiochus III. They were used with the lighter troops to climb the cliffs and fight hand to hand with the enemy who might have not been dislodged by the lighter troops in the assault. There is a tomb illustration from Sidon showing what could well be a thorakites. The fragmentary inscription indicates that he was an Anatolian.</History>
    <Icon>units/mace_thorakites.png</Icon>
 	<RequiredTechnology>phase_city</RequiredTechnology>
  </Identity>
  <VisualActor>
    <Actor>units/macedonians/thorakites.xml</Actor>
  </VisualActor>
 </Entity>
@@ -1,21 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_javelinist">
+<Entity parent="units/merc_thureophoros">
  <Cost>
    <Resources>
      <food>0</food>
      <metal op="mul">2</metal>
    </Resources>
  </Cost>
  <Identity>
    <Civ>mace</Civ>
    <Lang>greek</Lang>
    <GenericName>Heavy Skirmisher</GenericName>
    <SpecificName>Thyreophóros</SpecificName>
    <History>Thyreophóroi were a type of infantry soldier, common in the 3rd to 1st century BCE, who carried a large oval shield called a thureos which had a type of metal strip boss and a central spine. They were armed with a long thrusting spear, javelins and a sword. They also usually wore an iron or bronze Macedonian helmet. The thureos was probably originally an adapted form of a Celtic shield. Thracian and Illyrian infantry probably adopted the shield before the Greeks. However it has been suggested that the thureos was brought to Greece after Pyrrhus of Epirus' campaigns in Italy, as his Oscan allies and Roman enemies used the scutum. Thureophoroi were a 3rd century development on the Peltast and wore no body armor, but did wear sturdy leather boots for quick movement. Thureophoroi could skirmish, as well as fight in a phalanx when necessary. They were often stationed on the flanks of the traditional pike phalanx as a link between the heavier pikemen and the cavalry wings.</History>
    <Icon>units/mace_thureophoros.png</Icon>
 	<RequiredTechnology>phase_city</RequiredTechnology>
  </Identity>
  <VisualActor>
    <Actor>units/macedonians/thureophoros.xml</Actor>
  </VisualActor>
 </Entity>
@@ -0,0 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_swordsman">
  <Armour>
    <Hack op="add">2</Hack>
    <Pierce op="add">2</Pierce>
  </Armour>
  <Attack>
    <Melee>
      <Hack op="add">-2</Hack>
    </Melee>
  </Attack>
  <Cost>
    <Resources>
      <food>0</food>
      <metal op="mul">2</metal>
    </Resources>
  </Cost>
  <Identity>
    <Civ>gaia</Civ>
    <Lang>greek</Lang>
    <GenericName>Armored Swordsman</GenericName>
    <SpecificName>Thōrakitēs</SpecificName>
    <History>Thōrakitai were soldiers similar to Thyreophóroi. The literal translation of the term is curassiers, which suggests that they may have worn a short Celtic mail shirt or possibly a thorax. Thorakitai were used in armies of the Hellenistic Period in a variety of tactical situations. They were a type of armored but mobile infantry who did not require a rigid formation to be effective in combat. From their name we can deduce that most wore armor and helmet. They bore a thureos (or thyreos), an oblong shield, and were armed with sword, javelins and spear, which were used according to their tactical use. It seems that the thorakitai were heavily armored thureophoroi, able to bear spears and do battle in a phalanx as well as irregularly attack the enemy in situations when such an action was required for tactical reasons, like to exploit or challenge rough terrain. Thorakitai are mentioned in the army of the Achaian League and in the army of the Seleucids. The Seleucid Thorakitai were used in the storming of the Elburz Range in 210 BC under Antiochus III. They were used with the lighter troops to climb the cliffs and fight hand to hand with the enemy who might have not been dislodged by the lighter troops in the assault. There is a tomb illustration from Sidon showing what could well be a thorakites. The fragmentary inscription indicates that he was an Anatolian.</History>
    <Icon>units/mace_thorakites.png</Icon>
    <RequiredTechnology>phase_city</RequiredTechnology>
    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
  </Identity>
  <VisualActor>
    <Actor>units/macedonians/thorakites.xml</Actor>
  </VisualActor>
 </Entity>
@@ -0,0 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_javelinist">
  <Cost>
    <Resources>
      <food>0</food>
      <metal op="mul">2</metal>
    </Resources>
  </Cost>
  <Identity>
    <Civ>gaia</Civ>
    <Lang>greek</Lang>
    <GenericName>Heavy Skirmisher</GenericName>
    <SpecificName>Thyreophóros</SpecificName>
    <History>Thyreophóroi were a type of infantry soldier, common in the 3rd to 1st century BCE, who carried a large oval shield called a thureos which had a type of metal strip boss and a central spine. They were armed with a long thrusting spear, javelins and a sword. They also usually wore an iron or bronze Macedonian helmet. The thureos was probably originally an adapted form of a Celtic shield. Thracian and Illyrian infantry probably adopted the shield before the Greeks. However it has been suggested that the thureos was brought to Greece after Pyrrhus of Epirus' campaigns in Italy, as his Oscan allies and Roman enemies used the scutum. Thureophoroi were a 3rd century development on the Peltast and wore no body armor, but did wear sturdy leather boots for quick movement. Thureophoroi could skirmish, as well as fight in a phalanx when necessary. They were often stationed on the flanks of the traditional pike phalanx as a link between the heavier pikemen and the cavalry wings.</History>
    <Icon>units/mace_thureophoros.png</Icon>
    <RequiredTechnology>phase_city</RequiredTechnology>
    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
  </Identity>
  <VisualActor>
    <Actor>units/macedonians/thureophoros.xml</Actor>
  </VisualActor>
 </Entity>
@@ -0,0 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/merc_black_cloak">
  <Identity>
    <Civ>spart</Civ>
  </Identity>
 </Entity>
@@ -0,0 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/merc_thorakites">
  <Identity>
    <Civ>spart</Civ>
  </Identity>
 </Entity>
@@ -0,0 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/merc_thureophoros">
  <Identity>
    <Civ>spart</Civ>
  </Identity>
 </Entity>