From b881c4e327c13032db39893eff30cf7c9062d04e Mon Sep 17 00:00:00 2001
From: sanderd17 <sanderd17@wildfiregames.com>
Date: Fri, 3 Jun 2016 10:09:03 +0000
Subject: [PATCH] Move old athenian actors to separate directory + rename the
 not-so-new actors to regular names

This was SVN commit r18303.
---
 .../special/old/athenian_civil_centre.xml     | 18 ++++
 .../old/athenian_fortress.xml}                | 88 +++++++++----------
 .../old/athenian_market.xml}                  |  0
 .../structures/athenians/civic_centre_new.xml | 55 ------------
 .../structures/athenians/civil_centre.xml     | 57 +++++++++---
 .../{farmstead_new.xml => farmstead.xml}      | 10 +--
 .../actors/structures/athenians/fortress.xml  | 88 ++++++++++---------
 .../structures/athen_civil_centre.xml         |  2 +-
 .../templates/structures/athen_farmstead.xml  |  2 +-
 .../templates/structures/athen_fortress.xml   |  2 +-
 10 files changed, 161 insertions(+), 161 deletions(-)
 create mode 100644 binaries/data/mods/public/art/actors/special/old/athenian_civil_centre.xml
 rename binaries/data/mods/public/art/actors/{structures/athenians/fortress_up.xml => special/old/athenian_fortress.xml} (60%)
 rename binaries/data/mods/public/art/actors/{structures/athenians/market.xml => special/old/athenian_market.xml} (100%)
 delete mode 100644 binaries/data/mods/public/art/actors/structures/athenians/civic_centre_new.xml
 rename binaries/data/mods/public/art/actors/structures/athenians/{farmstead_new.xml => farmstead.xml} (80%)

diff --git a/binaries/data/mods/public/art/actors/special/old/athenian_civil_centre.xml b/binaries/data/mods/public/art/actors/special/old/athenian_civil_centre.xml
new file mode 100644
index 0000000000..b945b8dcbd
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/special/old/athenian_civil_centre.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="100" name="Base">
+      <mesh>structural/hele_cc.dae</mesh>
+      <props>
+        <prop actor="props/structures/hellenes/civil_centre.xml" attachpoint="props_main"/>
+      </props>
+      <textures><texture file="structural/hele_struct_2.dds" name="baseTex"/></textures>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/fortress_up.xml b/binaries/data/mods/public/art/actors/special/old/athenian_fortress.xml
similarity index 60%
rename from binaries/data/mods/public/art/actors/structures/athenians/fortress_up.xml
rename to binaries/data/mods/public/art/actors/special/old/athenian_fortress.xml
index 5a615f0170..4ee0ac52ef 100644
--- a/binaries/data/mods/public/art/actors/structures/athenians/fortress_up.xml
+++ b/binaries/data/mods/public/art/actors/special/old/athenian_fortress.xml
@@ -1,48 +1,40 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="100" name="Hellenes Fortress">
-      <mesh>structural/hele_fortress_up.dae</mesh>
-      <props>
-        <prop actor="props/structures/athenians/fortress_shields.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/fortress_gate_up.xml" attachpoint="root"/>
-<prop actor="props/structures/hellenes/fortress_tile_b.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/fortress_props_up.xml" attachpoint="root"/>
-        <prop actor="props/structures/decals/dirt_5x5.xml" attachpoint="root"/>
-        <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
-      </props>
-      <textures>
-        <texture file="structural/hele_struct_b.dds" name="baseTex"/>
-<texture file="structural/hele_struct_b_norm.png" name="normTex"/>
-<texture file="structural/hele_struct_b_spec.png" name="specTex"/>
-<texture file="structural/ao/hele_fortress.png" name="aoTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant name="ungarrisoned" frequency="1"/>
-    <variant name="garrisoned">
-      <props>
-        <prop actor="props/special/common/garrison_flag_hele.xml" attachpoint="garrisoned"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant name="alive" frequency="1"/>
-    <variant name="death">
-      <props>
-        <prop attachpoint="garrisoned"/>
-        <prop actor="particle/destruction_smoke_large.xml" attachpoint="root"/>
-        <prop actor="particle/destruction_dust_large.xml" attachpoint="root"/>
-        <prop actor="particle/destruction_dust_large_gray.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/fortress_shields.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/fortress_gate.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/fortress_props.xml" attachpoint="root"/>
-<prop actor="props/structures/hellenes/fortress_tile_b.xml" attachpoint="root"/>
-        <prop actor="props/structures/decals/dirt_5x5.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <material>player_trans_ao_parallax_spec.xml</material>
-</actor>
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="Hellenes Fortress">
+      <mesh>structural/hele_fortress_up.dae</mesh>
+      <props>
+        <prop actor="props/structures/athenians/fortress_shields.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/fortress_gate.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/fortress_props.xml" attachpoint="root"/>
+        <prop actor="props/structures/decals/dirt_5x5.xml" attachpoint="root"/>
+        <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
+      </props>
+      <textures><texture file="structural/hele_struct_b.dds" name="baseTex"/></textures>
+    </variant>
+  </group>
+  <group>
+    <variant name="ungarrisoned" frequency="1"/>
+    <variant name="garrisoned">
+      <props>
+        <prop actor="props/special/common/garrison_flag_hele.xml" attachpoint="garrisoned"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant name="alive" frequency="1"/>
+    <variant name="death">
+      <props>
+        <prop attachpoint="garrisoned"/>
+        <prop actor="particle/destruction_smoke_large.xml" attachpoint="root"/>
+        <prop actor="particle/destruction_dust_large.xml" attachpoint="root"/>
+        <prop actor="particle/destruction_dust_large_gray.xml" attachpoint="root"/>
+        <prop actor="props/structures/athenians/fortress_shields.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/fortress_gate.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/fortress_props.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/market.xml b/binaries/data/mods/public/art/actors/special/old/athenian_market.xml
similarity index 100%
rename from binaries/data/mods/public/art/actors/structures/athenians/market.xml
rename to binaries/data/mods/public/art/actors/special/old/athenian_market.xml
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/civic_centre_new.xml b/binaries/data/mods/public/art/actors/structures/athenians/civic_centre_new.xml
deleted file mode 100644
index e43f2b3766..0000000000
--- a/binaries/data/mods/public/art/actors/structures/athenians/civic_centre_new.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="Hellenes_Civic_Centre">
-      <animations>
-        <animation event="0.5" load="0.0" name="attack_ranged" speed="100"/>
-      </animations>
-      <mesh>structural/athen_cc_struct.dae</mesh>
-      <props>
-        <prop actor="props/structures/athenians/civic_centre_decor.xml" attachpoint="root"/>
-        <prop actor="props/structures/athenians/civic_centre_nature.xml" attachpoint="root"/>
-        <prop actor="props/structures/athenians/civic_centre_trees.xml" attachpoint="root"/>
-        <prop actor="props/structures/athenians/civic_centre_props_a.xml" attachpoint="root"/>
-        <prop actor="props/structures/athenians/civic_centre_roundroof.xml" attachpoint="root"/>
-        <prop actor="props/structures/athenians/civic_centre_shields.xml" attachpoint="root"/>
-        <prop actor="props/structures/athenians/civic_centre_tiles.xml" attachpoint="root"/>
-        <prop actor="props/units/weapons/arrow_front.xml" attachpoint="loaded-projectile"/>
-        <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
-      </props>
-      <textures>
-        <texture file="structural/hele_struct.dds" name="baseTex"/>
-        <texture file="structural/hele_struct_norm.png" name="normTex"/>
-        <texture file="structural/hele_struct_spec.png" name="specTex"/>
-        <texture file="structural/ao/athen_civic_centre.png" name="aoTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant name="ungarrisoned" frequency="1"/>
-    <variant name="garrisoned">
-      <props>
-        <prop actor="props/special/common/garrison_flag_hele.xml" attachpoint="garrisoned"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant name="alive" frequency="1"/>
-    <variant name="death">
-      <props>
-        <prop attachpoint="garrisoned"/>
-        <prop actor="particle/destruction_smoke_large.xml" attachpoint="root"/>
-        <prop actor="particle/destruction_dust_large.xml" attachpoint="root"/>
-        <prop actor="particle/destruction_dust_large_gray.xml" attachpoint="root"/>
-        <prop actor="props/structures/athenians/civic_centre_decor.xml" attachpoint="root"/>
-        <prop actor="props/structures/athenians/civic_centre_props_a.xml" attachpoint="root"/>
-        <prop actor="props/structures/athenians/civic_centre_trees.xml" attachpoint="root"/>
-        <prop actor="props/structures/athenians/civic_centre_roundroof.xml" attachpoint="root"/>
-        <prop actor="props/structures/athenians/civic_centre_tiles.xml" attachpoint="root"/>
-        <prop actor="props/structures/athenians/civic_centre_shields.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <material>player_trans_ao_parallax_spec.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/civil_centre.xml b/binaries/data/mods/public/art/actors/structures/athenians/civil_centre.xml
index b945b8dcbd..e43f2b3766 100644
--- a/binaries/data/mods/public/art/actors/structures/athenians/civil_centre.xml
+++ b/binaries/data/mods/public/art/actors/structures/athenians/civil_centre.xml
@@ -1,18 +1,55 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
   <castshadow/>
-
   <group>
-    <variant frequency="100" name="Base">
-      <mesh>structural/hele_cc.dae</mesh>
+    <variant frequency="1" name="Hellenes_Civic_Centre">
+      <animations>
+        <animation event="0.5" load="0.0" name="attack_ranged" speed="100"/>
+      </animations>
+      <mesh>structural/athen_cc_struct.dae</mesh>
       <props>
-        <prop actor="props/structures/hellenes/civil_centre.xml" attachpoint="props_main"/>
+        <prop actor="props/structures/athenians/civic_centre_decor.xml" attachpoint="root"/>
+        <prop actor="props/structures/athenians/civic_centre_nature.xml" attachpoint="root"/>
+        <prop actor="props/structures/athenians/civic_centre_trees.xml" attachpoint="root"/>
+        <prop actor="props/structures/athenians/civic_centre_props_a.xml" attachpoint="root"/>
+        <prop actor="props/structures/athenians/civic_centre_roundroof.xml" attachpoint="root"/>
+        <prop actor="props/structures/athenians/civic_centre_shields.xml" attachpoint="root"/>
+        <prop actor="props/structures/athenians/civic_centre_tiles.xml" attachpoint="root"/>
+        <prop actor="props/units/weapons/arrow_front.xml" attachpoint="loaded-projectile"/>
+        <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
       </props>
-      <textures><texture file="structural/hele_struct_2.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="structural/hele_struct.dds" name="baseTex"/>
+        <texture file="structural/hele_struct_norm.png" name="normTex"/>
+        <texture file="structural/hele_struct_spec.png" name="specTex"/>
+        <texture file="structural/ao/athen_civic_centre.png" name="aoTex"/>
+      </textures>
     </variant>
   </group>
-
-  <material>player_trans.xml</material>
-
+  <group>
+    <variant name="ungarrisoned" frequency="1"/>
+    <variant name="garrisoned">
+      <props>
+        <prop actor="props/special/common/garrison_flag_hele.xml" attachpoint="garrisoned"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant name="alive" frequency="1"/>
+    <variant name="death">
+      <props>
+        <prop attachpoint="garrisoned"/>
+        <prop actor="particle/destruction_smoke_large.xml" attachpoint="root"/>
+        <prop actor="particle/destruction_dust_large.xml" attachpoint="root"/>
+        <prop actor="particle/destruction_dust_large_gray.xml" attachpoint="root"/>
+        <prop actor="props/structures/athenians/civic_centre_decor.xml" attachpoint="root"/>
+        <prop actor="props/structures/athenians/civic_centre_props_a.xml" attachpoint="root"/>
+        <prop actor="props/structures/athenians/civic_centre_trees.xml" attachpoint="root"/>
+        <prop actor="props/structures/athenians/civic_centre_roundroof.xml" attachpoint="root"/>
+        <prop actor="props/structures/athenians/civic_centre_tiles.xml" attachpoint="root"/>
+        <prop actor="props/structures/athenians/civic_centre_shields.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <material>player_trans_ao_parallax_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/farmstead_new.xml b/binaries/data/mods/public/art/actors/structures/athenians/farmstead.xml
similarity index 80%
rename from binaries/data/mods/public/art/actors/structures/athenians/farmstead_new.xml
rename to binaries/data/mods/public/art/actors/structures/athenians/farmstead.xml
index d3e40610ba..5e068836a9 100644
--- a/binaries/data/mods/public/art/actors/structures/athenians/farmstead_new.xml
+++ b/binaries/data/mods/public/art/actors/structures/athenians/farmstead.xml
@@ -11,11 +11,11 @@
         <prop actor="props/structures/hellenes/farmstead_plants.xml" attachpoint="root"/>
       </props>
       <textures>
-<texture file="structural/hele_struct_b.dds" name="baseTex"/>
-<texture file="structural/hele_struct_b_norm.png" name="normTex"/>
-<texture file="structural/hele_struct_b_spec.png" name="specTex"/>
-<texture file="structural/ao/hele_farmstead.png" name="aoTex"/>
-</textures>
+        <texture file="structural/hele_struct_b.dds" name="baseTex"/>
+        <texture file="structural/hele_struct_b_norm.png" name="normTex"/>
+        <texture file="structural/hele_struct_b_spec.png" name="specTex"/>
+        <texture file="structural/ao/hele_farmstead.png" name="aoTex"/>
+      </textures>
     </variant>
   </group>
   <group>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/fortress.xml b/binaries/data/mods/public/art/actors/structures/athenians/fortress.xml
index c79d0309fb..363eb5edf3 100644
--- a/binaries/data/mods/public/art/actors/structures/athenians/fortress.xml
+++ b/binaries/data/mods/public/art/actors/structures/athenians/fortress.xml
@@ -1,40 +1,48 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="100" name="Hellenes Fortress">
-      <mesh>structural/hele_fortress.dae</mesh>
-      <props>
-        <prop actor="props/structures/athenians/fortress_shields.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/fortress_gate.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/fortress_props.xml" attachpoint="root"/>
-        <prop actor="props/structures/decals/dirt_5x5.xml" attachpoint="root"/>
-        <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
-      </props>
-      <textures><texture file="structural/hele_struct_b.dds" name="baseTex"/></textures>
-    </variant>
-  </group>
-  <group>
-    <variant name="ungarrisoned" frequency="1"/>
-    <variant name="garrisoned">
-      <props>
-        <prop actor="props/special/common/garrison_flag_hele.xml" attachpoint="garrisoned"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant name="alive" frequency="1"/>
-    <variant name="death">
-      <props>
-        <prop attachpoint="garrisoned"/>
-        <prop actor="particle/destruction_smoke_large.xml" attachpoint="root"/>
-        <prop actor="particle/destruction_dust_large.xml" attachpoint="root"/>
-        <prop actor="particle/destruction_dust_large_gray.xml" attachpoint="root"/>
-        <prop actor="props/structures/athenians/fortress_shields.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/fortress_gate.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/fortress_props.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <material>player_trans.xml</material>
-</actor>
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="Hellenes Fortress">
+      <mesh>structural/hele_fortress_up.dae</mesh>
+      <props>
+        <prop actor="props/structures/athenians/fortress_shields.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/fortress_gate_up.xml" attachpoint="root"/>
+<prop actor="props/structures/hellenes/fortress_tile_b.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/fortress_props_up.xml" attachpoint="root"/>
+        <prop actor="props/structures/decals/dirt_5x5.xml" attachpoint="root"/>
+        <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
+      </props>
+      <textures>
+        <texture file="structural/hele_struct_b.dds" name="baseTex"/>
+        <texture file="structural/hele_struct_b_norm.png" name="normTex"/>
+        <texture file="structural/hele_struct_b_spec.png" name="specTex"/>
+        <texture file="structural/ao/hele_fortress.png" name="aoTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant name="ungarrisoned" frequency="1"/>
+    <variant name="garrisoned">
+      <props>
+        <prop actor="props/special/common/garrison_flag_hele.xml" attachpoint="garrisoned"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant name="alive" frequency="1"/>
+    <variant name="death">
+      <props>
+        <prop attachpoint="garrisoned"/>
+        <prop actor="particle/destruction_smoke_large.xml" attachpoint="root"/>
+        <prop actor="particle/destruction_dust_large.xml" attachpoint="root"/>
+        <prop actor="particle/destruction_dust_large_gray.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/fortress_shields.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/fortress_gate.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/fortress_props.xml" attachpoint="root"/>
+<prop actor="props/structures/hellenes/fortress_tile_b.xml" attachpoint="root"/>
+        <prop actor="props/structures/decals/dirt_5x5.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <material>player_trans_ao_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/athen_civil_centre.xml b/binaries/data/mods/public/simulation/templates/structures/athen_civil_centre.xml
index c3dd1e3bb5..e331f86cd6 100644
--- a/binaries/data/mods/public/simulation/templates/structures/athen_civil_centre.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/athen_civil_centre.xml
@@ -22,6 +22,6 @@
     </Technologies>
   </ProductionQueue>
   <VisualActor>
-    <Actor>structures/athenians/civic_centre_new.xml</Actor>
+    <Actor>structures/athenians/civil_centre.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/athen_farmstead.xml b/binaries/data/mods/public/simulation/templates/structures/athen_farmstead.xml
index 840f6df007..256a164930 100644
--- a/binaries/data/mods/public/simulation/templates/structures/athen_farmstead.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/athen_farmstead.xml
@@ -16,7 +16,7 @@
     <Static width="18.0" depth="16.0"/>
   </Obstruction>
   <VisualActor>
-    <Actor>structures/athenians/farmstead_new.xml</Actor>
+    <Actor>structures/athenians/farmstead.xml</Actor>
     <FoundationActor>structures/fndn_4x2.xml</FoundationActor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/athen_fortress.xml b/binaries/data/mods/public/simulation/templates/structures/athen_fortress.xml
index 51e5d79b35..14bb119c12 100644
--- a/binaries/data/mods/public/simulation/templates/structures/athen_fortress.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/athen_fortress.xml
@@ -23,6 +23,6 @@
     </Technologies>
   </ProductionQueue>
   <VisualActor>
-    <Actor>structures/athenians/fortress_up.xml</Actor>
+    <Actor>structures/athenians/fortress.xml</Actor>
   </VisualActor>
 </Entity>