From 1a6f155780371a1798b8fa999e83138569d5e499 Mon Sep 17 00:00:00 2001
From: wraitii <wraitii@wildfiregames.com>
Date: Sat, 25 Jul 2020 07:54:46 +0000
Subject: [PATCH] Disable Persian Hall & Ishtar gate as buildable structures.

The Kardakes mercenaries, trainable at the Persian Hall, are
historically problematic. Few sources exist on Kardakes troops, but they
seem to have been rather heavy infantry, and likely not mercenaries. As
such, they would be rather redundant with the Immortal.
The elephants are attested, and might be reintroduced later.

Further, the Ishtar Gate is Neo-Babylonian and predates the 0 A.D.
timeline. As such, given its limited use, it is removed as a buildable
structure.

Patch by: Nescio
Accepted by: borg-, wraitii
Differential Revision: https://code.wildfiregames.com/D2742
This was SVN commit r23888.
---
 .../templates/special/player/player.xml         |  2 --
 .../templates/structures/pers_hall.xml          | 17 -----------------
 .../templates/structures/pers_ishtar_gate.xml   |  2 --
 .../templates/units/pers_infantry_archer_b.xml  |  2 --
 .../units/pers_infantry_javelinist_b.xml        |  2 --
 .../units/pers_infantry_spearman_b.xml          |  2 --
 6 files changed, 27 deletions(-)

diff --git a/binaries/data/mods/public/simulation/templates/special/player/player.xml b/binaries/data/mods/public/simulation/templates/special/player/player.xml
index 37034f67e5..afa9d76474 100644
--- a/binaries/data/mods/public/simulation/templates/special/player/player.xml
+++ b/binaries/data/mods/public/simulation/templates/special/player/player.xml
@@ -29,8 +29,6 @@
       <Library>1</Library>
       <Lighthouse>1</Lighthouse>
       <Juggernaut>1</Juggernaut>
-      <IshtarGate>1</IshtarGate>
-      <Hall>2</Hall>
       <Stoa>2</Stoa>
       <PyramidSmall>4</PyramidSmall>
       <PyramidLarge>2</PyramidLarge>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers_hall.xml b/binaries/data/mods/public/simulation/templates/structures/pers_hall.xml
index 37e48033d8..aa4bc0d137 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers_hall.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/pers_hall.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
-  <BuildRestrictions>
-    <Category>Hall</Category>
-  </BuildRestrictions>
   <Cost>
     <BuildTime>300</BuildTime>
     <Resources>
@@ -25,10 +22,8 @@
     <Civ>pers</Civ>
     <GenericName>Gate of All Nations</GenericName>
     <SpecificName>Duvarθi Visadahyu</SpecificName>
-    <Classes datatype="tokens">ConquestCritical</Classes>
     <VisibleClasses datatype="tokens">Hall</VisibleClasses>
     <Icon>structures/pers_hall.png</Icon>
-    <Tooltip>Train Champions.</Tooltip>
   </Identity>
   <Loot>
     <stone>50</stone>
@@ -37,14 +32,6 @@
   <Obstruction>
     <Static width="25.0" depth="25.0"/>
   </Obstruction>
-  <ProductionQueue>
-    <BatchTimeModifier>0.7</BatchTimeModifier>
-    <Entities datatype="tokens">
-      units/{civ}_kardakes_hoplite
-      units/{civ}_kardakes_skirmisher
-      units/{civ}_champion_elephant
-    </Entities>
-  </ProductionQueue>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_broch.xml</select>
@@ -52,10 +39,6 @@
     </SoundGroups>
   </Sound>
   <TerritoryDecay disable=""/>
-  <TerritoryInfluence>
-    <Root>false</Root>
-    <Radius>38</Radius>
-  </TerritoryInfluence>
   <VisualActor>
     <Actor>structures/persians/hall.xml</Actor>
     <FoundationActor>structures/fndn_7x7.xml</FoundationActor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers_ishtar_gate.xml b/binaries/data/mods/public/simulation/templates/structures/pers_ishtar_gate.xml
index d3b17dc5e1..6c06b2a9ef 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers_ishtar_gate.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/pers_ishtar_gate.xml
@@ -27,8 +27,6 @@
   <Identity>
     <Civ>pers</Civ>
     <GenericName>Ishtar Gate of Babylon</GenericName>
-    <Tooltip>Territory root.</Tooltip>
-    <Classes datatype="tokens">ConquestCritical</Classes>
     <VisibleClasses datatype="tokens">IshtarGate</VisibleClasses>
     <Icon>structures/pers_gate.png</Icon>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_infantry_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/pers_infantry_archer_b.xml
index eee37af7a3..322bc391d8 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_infantry_archer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_infantry_archer_b.xml
@@ -4,8 +4,6 @@
     <Entities datatype="tokens">
       structures/pers_stable
       structures/pers_apadana
-      structures/pers_ishtar_gate
-      structures/pers_hall
     </Entities>
   </Builder>
   <Identity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_infantry_javelinist_b.xml b/binaries/data/mods/public/simulation/templates/units/pers_infantry_javelinist_b.xml
index 96087293b2..b7c15db6ae 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_infantry_javelinist_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_infantry_javelinist_b.xml
@@ -4,8 +4,6 @@
     <Entities datatype="tokens">
       structures/pers_stable
       structures/pers_apadana
-      structures/pers_ishtar_gate
-      structures/pers_hall
     </Entities>
   </Builder>
   <Identity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_infantry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/pers_infantry_spearman_b.xml
index 3e104e213f..88960bf5be 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_infantry_spearman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_infantry_spearman_b.xml
@@ -4,8 +4,6 @@
     <Entities datatype="tokens">
       structures/pers_stable
       structures/pers_apadana
-      structures/pers_ishtar_gate
-      structures/pers_hall
     </Entities>
   </Builder>
   <Identity>