Carthaginians can now only build 1 embassy at a time.

Each embassy comes with new technology pairs. Metal Costs vs. Training
Time.

Structure pierce armor adjusted upward.

This was SVN commit r13509.

binaries/data/mods/public/art/actors/props/units/shields/kart_round_isp_basic.xml

@@ -11,16 +11,29 @@
   </group>
   <group>
     <variant frequency="1" name="kart-shield-d">
-      <textures><texture file="props/shield/kart_round_d.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="props/shield/kart_round_d.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="kart-shield-i">
-      <textures><texture file="props/shield/kart_round_i.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="props/shield/kart_round_i.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="kart-shield-j">
-      <textures><texture file="props/shield/kart_round_j.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="props/shield/kart_round_j.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="kart-shield-p">
-      <textures><texture file="props/shield/kart_round_p.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="props/shield/kart_round_p.dds" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="aspis-plain">
+      <textures>
+        <texture file="props/shield/aspis_player_plain.png" name="baseTex"/>
+      </textures>
     </variant>
   </group>
   <material>playercolor_spec.xml</material>

binaries/data/mods/public/art/actors/structures/carthaginians/tophet.xml

@@ -5,10 +5,14 @@
     <variant frequency="100" name="Carthage Tophet">
       <mesh>structural/kart_tophet.dae</mesh>
       <props>
-        <prop actor="particle/flame.xml" attachpoint="fire1"/>
-        <prop actor="particle/flame.xml" attachpoint="fire2"/>
-        <prop actor="particle/smoke.xml" attachpoint="fire1"/>
-        <prop actor="particle/smoke.xml" attachpoint="fire2"/>
+        <prop actor="particle/sparks.xml" attachpoint="fire1"/>
+        <prop actor="particle/flame_firepit_1.xml" attachpoint="fire1"/>
+        <prop actor="particle/flame_firepit_2.xml" attachpoint="fire1"/>
+        <prop actor="particle/smoke_small_light.xml" attachpoint="fire1"/>
+        <prop actor="particle/sparks.xml" attachpoint="fire2"/>
+        <prop actor="particle/flame_firepit_1.xml" attachpoint="fire2"/>
+        <prop actor="particle/flame_firepit_2.xml" attachpoint="fire2"/>
+        <prop actor="particle/smoke_small_light.xml" attachpoint="fire2"/>
         <prop actor="props/structures/carthaginians/tophet_palms.xml" attachpoint="root"/>
         <prop actor="props/structures/decals/dirt_5x5.xml" attachpoint="root"/>
       </props>
@@ -29,6 +33,8 @@
         <prop actor="particle/destruction_dust_med_gray.xml" attachpoint="root"/>
         <prop actor="props/structures/carthaginians/tophet_palms.xml" attachpoint="root"/>
         <prop actor="props/structures/decals/dirt_5x5.xml" attachpoint="root"/>
+        <prop actor="" attachpoint="fire1"/>
+        <prop actor="" attachpoint="fire2"/>
       </props>
     </variant>
   </group>

binaries/data/mods/public/simulation/components/BuildRestrictions.js

@@ -51,6 +51,7 @@ BuildRestrictions.prototype.Schema =
 			"<value>Special</value>" +
 			"<value>Wonder</value>" +
 			"<value>Apadana</value>" +
+			"<value>Embassy</value>" +
 		"</choice>" +
 	"</element>" +
 	"<optional>" +

binaries/data/mods/public/simulation/data/technologies/carthaginians/cost_celt_mercs.json

@@ -1,12 +1,13 @@
 {
-	"genericName": "Gallic Mercenary Captain",
+	"pair": "carthaginians/pair_celt_mercs_1",
+	"genericName": "Celtic Mercenary Captain",
 	"description": "Celtic mercenaries have their metal cost decreased.",
-	"cost": {"food": 200, "wood": 0, "stone": 0, "metal": 200},
+	"cost": {"food": 100, "wood": 0, "stone": 0, "metal": 100},
 	"requirements": {"tech": "phase_town"},
 	"requirementsTooltip": "Unlocked in Town Phase.",
-	"icon": "helmet_corinthian_gold.png",
+	"icon": "helmet_corinthian_silver.png",
 	"researchTime": 30,
-	"tooltip": "Hire a Gallic mercenary captain to reduce metal cost -50% for Celtic mercenaries.",
-	"modifications": [{"value": "Cost/Resources/metal", "multiplier": 0.5}],
+	"tooltip": "Hire a Celtic mercenary captain to reduce metal cost -25% for Celtic mercenaries.",
+	"modifications": [{"value": "Cost/Resources/metal", "multiplier": 0.75}],
 	"affects": ["Celt Mercenary"]
 }

binaries/data/mods/public/simulation/data/technologies/carthaginians/cost_celt_mercs_2.json

@@ -0,0 +1,13 @@
+{
+	"pair": "carthaginians/pair_celt_mercs_2",
+	"genericName": "Gallic Mercenary General",
+	"description": "Celtic mercenaries have their metal cost decreased.",
+	"cost": {"food": 200, "wood": 0, "stone": 0, "metal": 200},
+	"requirements": {"tech": "phase_city"},
+	"requirementsTooltip": "Unlocked in City Phase.",
+	"icon": "helmet_corinthian_gold.png",
+	"researchTime": 30,
+	"tooltip": "Hire a Gallic mercenary general to reduce metal cost -25% for Celtic mercenaries.",
+	"modifications": [{"value": "Cost/Resources/metal", "multiplier": 0.75}],
+	"affects": ["Celt Mercenary"]
+}

binaries/data/mods/public/simulation/data/technologies/carthaginians/cost_iberian_mercs.json

@@ -1,12 +1,13 @@
 {
-	"genericName": "Iberian Mercenary Captain",
+	"pair": "carthaginians/pair_iberian_mercs_1",
+	"genericName": "Lusitanian Mercenary Captain",
 	"description": "Iberian mercenaries have their metal cost decreased.",
-	"cost": {"food": 200, "wood": 0, "stone": 0, "metal": 200},
+	"cost": {"food": 100, "wood": 0, "stone": 0, "metal": 100},
 	"requirements": {"tech": "phase_town"},
 	"requirementsTooltip": "Unlocked in Town Phase.",
-	"icon": "helmet_corinthian_gold.png",
+	"icon": "helmet_corinthian_silver.png",
 	"researchTime": 30,
-	"tooltip": "Hire an Iberian mercenary captain to reduce metal cost -50% for Iberian mercenaries.",
-	"modifications": [{"value": "Cost/Resources/metal", "multiplier": 0.5}],
+	"tooltip": "Hire a Lusitanian mercenary captain to reduce metal cost -25% for Iberian mercenaries.",
+	"modifications": [{"value": "Cost/Resources/metal", "multiplier": 0.75}],
 	"affects": ["Iberian Mercenary"]
 }

binaries/data/mods/public/simulation/data/technologies/carthaginians/cost_iberian_mercs_2.json

@@ -0,0 +1,13 @@
+{
+	"pair": "carthaginians/pair_iberian_mercs_2",
+	"genericName": "Celtiberian Mercenary General",
+	"description": "Iberian mercenaries have their metal cost decreased.",
+	"cost": {"food": 200, "wood": 0, "stone": 0, "metal": 200},
+	"requirements": {"tech": "phase_city"},
+	"requirementsTooltip": "Unlocked in City Phase.",
+	"icon": "helmet_corinthian_gold.png",
+	"researchTime": 30,
+	"tooltip": "Hire a Celtiberian mercenary general to reduce metal cost -25% for Iberian mercenaries.",
+	"modifications": [{"value": "Cost/Resources/metal", "multiplier": 0.75}],
+	"affects": ["Iberian Mercenary"]
+}

binaries/data/mods/public/simulation/data/technologies/carthaginians/cost_italian_mercs.json

@@ -1,12 +1,13 @@
 {
+	"pair": "carthaginians/pair_italian_mercs_1",
 	"genericName": "Italiote Mercenary Captain",
 	"description": "Italian mercenaries have their metal cost decreased.",
-	"cost": {"food": 200, "wood": 0, "stone": 0, "metal": 200},
+	"cost": {"food": 100, "wood": 0, "stone": 0, "metal": 100},
 	"requirements": {"tech": "phase_town"},
 	"requirementsTooltip": "Unlocked in Town Phase.",
-	"icon": "helmet_corinthian_gold.png",
+	"icon": "helmet_corinthian_silver.png",
 	"researchTime": 30,
-	"tooltip": "Hire an Italiote mercenary captain to reduce metal cost -50% for Italian mercenaries.",
-	"modifications": [{"value": "Cost/Resources/metal", "multiplier": 0.5}],
+	"tooltip": "Hire an Italiote mercenary captain to reduce metal cost -25% for Italian mercenaries.",
+	"modifications": [{"value": "Cost/Resources/metal", "multiplier": 0.75}],
 	"affects": ["Italian Mercenary"]
 }

binaries/data/mods/public/simulation/data/technologies/carthaginians/cost_italian_mercs_2.json

@@ -0,0 +1,13 @@
+{
+	"pair": "carthaginians/pair_italian_mercs_2",
+	"genericName": "Italiote Mercenary General",
+	"description": "Italian mercenaries have their metal cost decreased.",
+	"cost": {"food": 200, "wood": 0, "stone": 0, "metal": 200},
+	"requirements": {"tech": "phase_city"},
+	"requirementsTooltip": "Unlocked in City Phase.",
+	"icon": "helmet_corinthian_gold.png",
+	"researchTime": 30,
+	"tooltip": "Hire an Italiote mercenary general to reduce metal cost -25% for Italian mercenaries.",
+	"modifications": [{"value": "Cost/Resources/metal", "multiplier": 0.75}],
+	"affects": ["Italian Mercenary"]
+}

binaries/data/mods/public/simulation/data/technologies/carthaginians/pair_celt_mercs_1.json

@@ -0,0 +1,5 @@
+{
+	"genericName": "Celtic merc cost vs. recruit time #1",
+	"top": "carthaginians/cost_celt_mercs",
+	"bottom": "carthaginians/traintime_celt_mercs"
+}

binaries/data/mods/public/simulation/data/technologies/carthaginians/pair_celt_mercs_2.json

@@ -0,0 +1,6 @@
+{
+	"genericName": "Celtic merc cost vs. recruit time #2",
+	"top": "carthaginians/cost_celt_mercs_2",
+	"bottom": "carthaginians/traintime_celt_mercs_2",
+    "supersedes": "carthaginians/pair_celt_mercs_1"
+}

binaries/data/mods/public/simulation/data/technologies/carthaginians/pair_iberian_mercs_1.json

@@ -0,0 +1,5 @@
+{
+	"genericName": "Iberian merc cost vs. recruit time #1",
+	"top": "carthaginians/cost_iberian_mercs",
+	"bottom": "carthaginians/traintime_iberian_mercs"
+}

binaries/data/mods/public/simulation/data/technologies/carthaginians/pair_iberian_mercs_2.json

@@ -0,0 +1,6 @@
+{
+	"genericName": "Iberian merc cost vs. recruit time #2",
+	"top": "carthaginians/cost_iberian_mercs_2",
+	"bottom": "carthaginians/traintime_iberian_mercs_2",
+    "supersedes": "carthaginians/pair_iberian_mercs_1"
+}

binaries/data/mods/public/simulation/data/technologies/carthaginians/pair_italian_mercs_1.json

@@ -0,0 +1,5 @@
+{
+	"genericName": "Italian merc cost vs. recruit time #1",
+	"top": "carthaginians/cost_italian_mercs",
+	"bottom": "carthaginians/traintime_italian_mercs"
+}

binaries/data/mods/public/simulation/data/technologies/carthaginians/pair_italian_mercs_2.json

@@ -0,0 +1,6 @@
+{
+	"genericName": "Italian merc cost vs. recruit time #2",
+	"top": "carthaginians/cost_italian_mercs_2",
+	"bottom": "carthaginians/traintime_italian_mercs_2",
+    "supersedes": "carthaginians/pair_italian_mercs_1"
+}

binaries/data/mods/public/simulation/data/technologies/carthaginians/traintime_celt_mercs.json

@@ -0,0 +1,13 @@
+{
+	"pair": "carthaginians/pair_celt_mercs_1",
+	"genericName": "Celtic Alliance",
+	"description": "Celtic mercenaries have their train time decreased.",
+	"cost": {"food": 0, "wood": 100, "stone": 0, "metal": 100},
+	"requirements": {"tech": "phase_town"},
+	"requirementsTooltip": "Unlocked in Town Phase.",
+	"icon": "clenched_fist.png",
+	"researchTime": 30,
+	"tooltip": "Ally with Celtic towns to reduce recruit time -20% for Celtic mercenaries.",
+	"modifications": [{"value": "Cost/BuildTime", "multiplier": 0.8}],
+	"affects": ["Celt Mercenary"]
+}

binaries/data/mods/public/simulation/data/technologies/carthaginians/traintime_celt_mercs_2.json

@@ -0,0 +1,13 @@
+{
+	"pair": "carthaginians/pair_celt_mercs_2",
+	"genericName": "Gallic Hegemony",
+	"description": "Celtic mercenaries have their train time decreased.",
+	"cost": {"food": 0, "wood": 0, "stone": 200, "metal": 200},
+	"requirements": {"tech": "phase_city"},
+	"requirementsTooltip": "Unlocked in City Phase.",
+	"icon": "fist_spear.png",
+	"researchTime": 30,
+	"tooltip": "Subjugate Gallic tribes to reduce recruit time -20% for Celtic mercenaries.",
+	"modifications": [{"value": "Cost/BuildTime", "multiplier": 0.8}],
+	"affects": ["Celt Mercenary"]
+}

binaries/data/mods/public/simulation/data/technologies/carthaginians/traintime_iberian_mercs.json

@@ -0,0 +1,13 @@
+{
+	"pair": "carthaginians/pair_iberian_mercs_1",
+	"genericName": "Iberian Alliance",
+	"description": "Iberian mercenaries have their train time decreased.",
+	"cost": {"food": 0, "wood": 100, "stone": 0, "metal": 100},
+	"requirements": {"tech": "phase_town"},
+	"requirementsTooltip": "Unlocked in Town Phase.",
+	"icon": "clenched_fist.png",
+	"researchTime": 30,
+	"tooltip": "Ally with Iberian towns to reduce recruit time -20% for Iberian mercenaries.",
+	"modifications": [{"value": "Cost/BuildTime", "multiplier": 0.8}],
+	"affects": ["Iberian Mercenary"]
+}

binaries/data/mods/public/simulation/data/technologies/carthaginians/traintime_iberian_mercs_2.json

@@ -0,0 +1,13 @@
+{
+	"pair": "carthaginians/pair_celt_mercs_2",
+	"genericName": "Spanish Hegemony",
+	"description": "Iberian mercenaries have their train time decreased.",
+	"cost": {"food": 0, "wood": 0, "stone": 200, "metal": 200},
+	"requirements": {"tech": "phase_city"},
+	"requirementsTooltip": "Unlocked in City Phase.",
+	"icon": "fist_spear.png",
+	"researchTime": 30,
+	"tooltip": "Subjugate Spain to reduce recruit time -20% for Iberian mercenaries.",
+	"modifications": [{"value": "Cost/BuildTime", "multiplier": 0.8}],
+	"affects": ["Iberian Mercenary"]
+}

binaries/data/mods/public/simulation/data/technologies/carthaginians/traintime_italian_mercs.json

@@ -0,0 +1,13 @@
+{
+	"pair": "carthaginians/pair_italian_mercs_1",
+	"genericName": "Italiote Alliance",
+	"description": "Italian mercenaries have their train time decreased.",
+	"cost": {"food": 0, "wood": 100, "stone": 0, "metal": 100},
+	"requirements": {"tech": "phase_town"},
+	"requirementsTooltip": "Unlocked in Town Phase.",
+	"icon": "clenched_fist.png",
+	"researchTime": 30,
+	"tooltip": "Ally with Italiote towns to reduce recruit time -20% for Italian mercenaries.",
+	"modifications": [{"value": "Cost/BuildTime", "multiplier": 0.8}],
+	"affects": ["Italian Mercenary"]
+}

binaries/data/mods/public/simulation/data/technologies/carthaginians/traintime_italian_mercs_2.json

@@ -0,0 +1,13 @@
+{
+	"pair": "carthaginians/pair_italian_mercs_2",
+	"genericName": "Italiote Hegemony",
+	"description": "Italian mercenaries have their train time decreased.",
+	"cost": {"food": 0, "wood": 0, "stone": 200, "metal": 200},
+	"requirements": {"tech": "phase_city"},
+	"requirementsTooltip": "Unlocked in City Phase.",
+	"icon": "fist_spear.png",
+	"researchTime": 30,
+	"tooltip": "Subjugate Italiote towns to reduce recruit time -20% for Italian mercenaries.",
+	"modifications": [{"value": "Cost/BuildTime", "multiplier": 0.8}],
+	"affects": ["Italian Mercenary"]
+}

binaries/data/mods/public/simulation/templates/special/player.xml

@@ -9,6 +9,7 @@
       <Wonder>1</Wonder>
       <Hero>1</Hero>
       <Apadana>1</Apadana>
+      <Embassy>1</Embassy>
     </Limits>
   </EntityLimits>
   <Player/>

binaries/data/mods/public/simulation/templates/structures/cart_embassy_celtic.xml

@@ -31,7 +31,8 @@
       units/cart_cavalry_swordsman_2_b
     </Entities>
     <Technologies datatype="tokens">
-      carthaginians/cost_celt_mercs
+      carthaginians/pair_celt_mercs_1
+      carthaginians/pair_celt_mercs_2
     </Technologies>
   </ProductionQueue>
   <VisualActor>

binaries/data/mods/public/simulation/templates/structures/cart_embassy_iberian.xml

@@ -25,7 +25,8 @@
       units/cart_cavalry_swordsman_b
     </Entities>
     <Technologies datatype="tokens">
-      carthaginians/cost_iberian_mercs
+      carthaginians/pair_iberian_mercs_1
+      carthaginians/pair_iberian_mercs_2
     </Technologies>
   </ProductionQueue>
   <VisualActor>

binaries/data/mods/public/simulation/templates/structures/cart_embassy_italiote.xml

@@ -31,7 +31,8 @@
       units/cart_cavalry_spearman_b
     </Entities>
     <Technologies datatype="tokens">
-      carthaginians/cost_italian_mercs
+      carthaginians/pair_italian_mercs_1
+      carthaginians/pair_italian_mercs_2
     </Technologies>
   </ProductionQueue>
   <VisualActor>

binaries/data/mods/public/simulation/templates/template_structure_civic.xml

@@ -2,7 +2,7 @@
 <Entity parent="template_structure">
   <Armour>
     <Hack>5</Hack>
-    <Pierce>20</Pierce>
+    <Pierce>25</Pierce>
     <Crush>5</Crush>
     <Foundation>
       <Hack>3</Hack>

binaries/data/mods/public/simulation/templates/template_structure_defense_outpost.xml

@@ -2,7 +2,7 @@
 <Entity parent="template_structure_defense">
   <Armour>
     <Hack>5</Hack>
-    <Pierce>10</Pierce>
+    <Pierce>20</Pierce>
     <Crush>1</Crush>
     <Foundation>
       <Hack>3</Hack>

binaries/data/mods/public/simulation/templates/template_structure_military.xml

@@ -2,7 +2,7 @@
 <Entity parent="template_structure">
   <Armour>
     <Hack>10</Hack>
-    <Pierce>25</Pierce>
+    <Pierce>30</Pierce>
     <Crush>5</Crush>
     <Foundation>
       <Hack>5</Hack>

binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
+  <BuildRestrictions>
+    <Category>Embassy</Category>
+  </BuildRestrictions>
   <Cost>
     <PopulationBonus>0</PopulationBonus>
     <Resources>
@@ -38,6 +41,13 @@
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
   </ProductionQueue>
+  <Sound>
+    <SoundGroups>
+      <select>interface/select/building/sel_gymnasium.xml</select>
+      <constructed>interface/complete/building/complete_gymnasium.xml</constructed>
+      <death>attack/destruction/building_collapse_large.xml</death>
+    </SoundGroups>
+  </Sound>
   <TerritoryInfluence>
     <Radius>25</Radius>
   </TerritoryInfluence>

binaries/data/mods/public/simulation/templates/template_structure_special.xml

@@ -2,7 +2,7 @@
 <Entity parent="template_structure">
   <Armour>
     <Hack>5</Hack>
-    <Pierce>20</Pierce>
+    <Pierce>25</Pierce>
     <Crush>5</Crush>
     <Foundation>
       <Hack>3</Hack>

binaries/data/mods/public/simulation/templates/template_structure_wonder.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
   <Armour>
-    <Hack>3</Hack>
-    <Pierce>20</Pierce>
-    <Crush>3</Crush>
+    <Hack>5</Hack>
+    <Pierce>25</Pierce>
+    <Crush>5</Crush>
     <Foundation>
       <Hack>2</Hack>
       <Pierce>10</Pierce>

binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml

@@ -32,6 +32,15 @@
 Good sieging capability. "Stench" Aura vs. Horses. Can run amok. Countered by Swordsmen and Skirmishers.</Tooltip>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
+  <Selectable>
+    <Overlay>
+      <AlwaysVisible/>
+      <Texture>
+        <MainTexture>star/256x256.png</MainTexture>
+        <MainTextureMask>star/256x256_mask.png</MainTextureMask>
+      </Texture>
+    </Overlay>
+  </Selectable>
   <TrainingRestrictions>
     <Category>Hero</Category>
   </TrainingRestrictions>

binaries/data/mods/public/simulation/templates/units/maur_hero_chanakya.xml

@@ -30,7 +30,7 @@
 	<GenericName>Acharya Chanakya</GenericName>
     <SpecificName>Acharya Chanakya</SpecificName>
     <Icon>units/maur_hero_chanakya.png</Icon>
-	<Tooltip>Hero Archer.
+	<Tooltip>Hero Healer.
 Hero Special: "Teacher." TBD.</Tooltip>
     <History>TBD.</History>
     <RequiredTechnology>phase_city</RequiredTechnology>