From d4fa905cb124c476a93b962e306e43fdfce1cbdb Mon Sep 17 00:00:00 2001
From: sanderd17 <sanderd17@wildfiregames.com>
Date: Thu, 2 Jun 2016 19:35:59 +0000
Subject: [PATCH] Fix garrison flags on Athenian structures + clean up the
 Athenian structure actors

This was SVN commit r18291.
---
 .../actors/structures/athenians/barracks.xml  | 13 ++--
 .../structures/athenians/civic_centre_new.xml |  5 +-
 .../actors/structures/athenians/corral.xml    |  2 +-
 .../structures/athenians/farmstead_new.xml    |  2 +-
 .../actors/structures/athenians/fortress.xml  |  5 +-
 .../structures/athenians/fortress_up.xml      |  5 +-
 .../actors/structures/athenians/gymnasion.xml |  2 +-
 .../art/actors/structures/athenians/house.xml | 64 +++++++++----------
 .../actors/structures/athenians/market.xml    |  3 +-
 .../actors/structures/athenians/outpost.xml   |  5 +-
 .../actors/structures/athenians/propylaea.xml |  2 +-
 .../structures/athenians/prytaneion.xml       |  5 +-
 .../structures/athenians/scout_tower.xml      |  5 +-
 .../structures/athenians/storehouse.xml       | 12 ++--
 .../actors/structures/athenians/temple.xml    |  3 +-
 .../actors/structures/athenians/temple_b.xml  |  5 +-
 .../actors/structures/athenians/temple_c.xml  |  5 +-
 .../structures/athenians/temple_epic.xml      |  5 +-
 .../art/actors/structures/athenians/wall.xml  |  4 +-
 .../actors/structures/athenians/wall_gate.xml |  2 +-
 .../actors/structures/athenians/wall_long.xml |  2 +-
 .../structures/athenians/wall_medium.xml      |  2 +-
 .../structures/athenians/wall_short.xml       |  2 +-
 .../structures/athenians/wall_tower.xml       |  5 +-
 24 files changed, 95 insertions(+), 70 deletions(-)

diff --git a/binaries/data/mods/public/art/actors/structures/athenians/barracks.xml b/binaries/data/mods/public/art/actors/structures/athenians/barracks.xml
index 8c28974ee8..c996f97d64 100644
--- a/binaries/data/mods/public/art/actors/structures/athenians/barracks.xml
+++ b/binaries/data/mods/public/art/actors/structures/athenians/barracks.xml
@@ -13,19 +13,22 @@
         <prop actor="props/structures/decals/dirt_4x4.xml" attachpoint="root"/>
       </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_barracks.png" name="aoTex"/></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_barracks.png" name="aoTex"/></textures>
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <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"/>
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
index 39e6761c91..e43f2b3766 100644
--- 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
@@ -27,12 +27,15 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <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"/>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/corral.xml b/binaries/data/mods/public/art/actors/structures/athenians/corral.xml
index 5b43e28025..bf79bcb957 100644
--- a/binaries/data/mods/public/art/actors/structures/athenians/corral.xml
+++ b/binaries/data/mods/public/art/actors/structures/athenians/corral.xml
@@ -21,7 +21,7 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
         <prop actor="particle/destruction_smoke_small.xml" attachpoint="root"/>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/farmstead_new.xml b/binaries/data/mods/public/art/actors/structures/athenians/farmstead_new.xml
index ff0d276d2a..d3e40610ba 100644
--- a/binaries/data/mods/public/art/actors/structures/athenians/farmstead_new.xml
+++ b/binaries/data/mods/public/art/actors/structures/athenians/farmstead_new.xml
@@ -19,7 +19,7 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
         <prop actor="particle/destruction_smoke_small.xml" attachpoint="root"/>
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 484496c919..c79d0309fb 100644
--- a/binaries/data/mods/public/art/actors/structures/athenians/fortress.xml
+++ b/binaries/data/mods/public/art/actors/structures/athenians/fortress.xml
@@ -15,12 +15,15 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <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"/>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/fortress_up.xml b/binaries/data/mods/public/art/actors/structures/athenians/fortress_up.xml
index b26e389554..5a615f0170 100644
--- a/binaries/data/mods/public/art/actors/structures/athenians/fortress_up.xml
+++ b/binaries/data/mods/public/art/actors/structures/athenians/fortress_up.xml
@@ -21,12 +21,15 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <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"/>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/gymnasion.xml b/binaries/data/mods/public/art/actors/structures/athenians/gymnasion.xml
index 72388aeb92..c895c3f68d 100644
--- a/binaries/data/mods/public/art/actors/structures/athenians/gymnasion.xml
+++ b/binaries/data/mods/public/art/actors/structures/athenians/gymnasion.xml
@@ -21,7 +21,7 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
         <prop actor="particle/destruction_smoke_large.xml" attachpoint="root"/>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/house.xml b/binaries/data/mods/public/art/actors/structures/athenians/house.xml
index d5b10a0906..ee4e18cf2a 100644
--- a/binaries/data/mods/public/art/actors/structures/athenians/house.xml
+++ b/binaries/data/mods/public/art/actors/structures/athenians/house.xml
@@ -1,38 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
   <castshadow/>
+  <group>
+    <variant name="base" frequency="1">
+      <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"/>
+      </textures>
+    </variant>
+  </group>
   <group>
     <variant frequency="3" name="Hellenes House A">
       <mesh>structural/hele_house_a.dae</mesh>
       <props>
         <prop actor="props/structures/hellenes/house_a_shields.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/house_a_nature.xml" attachpoint="root"/>
-<prop actor="props/structures/hellenes/house_a_struct.xml" attachpoint="root"/>
-<prop actor="props/structures/hellenes/house_a_props_a.xml" attachpoint="root"/>
-<prop actor="props/structures/hellenes/house_a_decor.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/house_a_struct.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/house_a_props_a.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/house_a_decor.xml" attachpoint="root"/>
         <prop actor="props/structures/decals/dirt_small.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_house_a.png" name="aoTex"/>
-</textures>
+      </textures>
     </variant>
     <variant frequency="2" name="Hellenes House B">
       <mesh>structural/hele_house_b.dae</mesh>
       <props>
         <prop actor="props/structures/hellenes/house_b_shields.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/house_b_nature.xml" attachpoint="root"/>
-<prop actor="props/structures/hellenes/house_b_struct.xml" attachpoint="root"/>
-<prop actor="props/structures/hellenes/house_b_props_a.xml" attachpoint="root"/>
-<prop actor="props/structures/hellenes/house_b_decor.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/house_b_struct.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/house_b_props_a.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/house_b_decor.xml" attachpoint="root"/>
         <prop actor="props/structures/decals/dirt_small.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_house_b.png" name="aoTex"/></textures>
     </variant>
     <variant frequency="2" name="Hellenes House C">
@@ -40,52 +43,43 @@
       <props>
         <prop actor="props/structures/hellenes/house_c_shields.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/house_c_nature.xml" attachpoint="root"/>
-<prop actor="props/structures/hellenes/house_c_struct.xml" attachpoint="root"/>
-<prop actor="props/structures/hellenes/house_c_props_a.xml" attachpoint="root"/>
-<prop actor="props/structures/hellenes/house_c_decor.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/house_c_struct.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/house_c_props_a.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/house_c_decor.xml" attachpoint="root"/>
         <prop actor="props/structures/decals/dirt_small.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_house_c.png" name="aoTex"/></textures>
     </variant>
-    <variant frequency="4" name="Hellenes House d">
+    <variant frequency="4" name="Hellenes House D">
       <mesh>structural/hele_house_d.dae</mesh>
       <props>
         <prop actor="props/structures/hellenes/house_d_shields.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/house_d_nature.xml" attachpoint="root"/>
-<prop actor="props/structures/hellenes/house_d_struct.xml" attachpoint="root"/>
-<prop actor="props/structures/hellenes/house_d_props_a.xml" attachpoint="root"/>
-<prop actor="props/structures/hellenes/house_d_decor.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/house_d_struct.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/house_d_props_a.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/house_d_decor.xml" attachpoint="root"/>
         <prop actor="props/structures/decals/dirt_small.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_house_d.png" name="aoTex"/>
-</textures>
+      </textures>
     </variant>
-    <variant frequency="4" name="Hellenes House 3">
+    <variant frequency="4" name="Hellenes House E">
       <mesh>structural/hele_house_e.dae</mesh>
       <props>
         <prop actor="props/structures/hellenes/house_e_shields.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/house_e_nature.xml" attachpoint="root"/>
-<prop actor="props/structures/hellenes/house_e_struct.xml" attachpoint="root"/>
-<prop actor="props/structures/hellenes/house_e_props_a.xml" attachpoint="root"/>
-<prop actor="props/structures/decals/dirt_small.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/house_e_struct.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/house_e_props_a.xml" attachpoint="root"/>
+        <prop actor="props/structures/decals/dirt_small.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_house_e.png" name="aoTex"/></textures>
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
         <prop actor="particle/destruction_smoke_small.xml" attachpoint="dust"/>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/market.xml b/binaries/data/mods/public/art/actors/structures/athenians/market.xml
index d386112cec..2544b4021e 100644
--- a/binaries/data/mods/public/art/actors/structures/athenians/market.xml
+++ b/binaries/data/mods/public/art/actors/structures/athenians/market.xml
@@ -12,10 +12,9 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
-        <prop attachpoint="garrisoned"/>
         <prop actor="particle/destruction_smoke_med.xml" attachpoint="root"/>
         <prop actor="particle/destruction_dust_med.xml" attachpoint="root"/>
         <prop actor="particle/destruction_dust_med_gray.xml" attachpoint="root"/>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/outpost.xml b/binaries/data/mods/public/art/actors/structures/athenians/outpost.xml
index a293b1750b..02cc49eacf 100644
--- a/binaries/data/mods/public/art/actors/structures/athenians/outpost.xml
+++ b/binaries/data/mods/public/art/actors/structures/athenians/outpost.xml
@@ -16,12 +16,15 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <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"/>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/propylaea.xml b/binaries/data/mods/public/art/actors/structures/athenians/propylaea.xml
index f9596e39a9..08a432a76e 100644
--- a/binaries/data/mods/public/art/actors/structures/athenians/propylaea.xml
+++ b/binaries/data/mods/public/art/actors/structures/athenians/propylaea.xml
@@ -14,7 +14,7 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
         <prop actor="particle/destruction_smoke_med.xml" attachpoint="root"/>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/prytaneion.xml b/binaries/data/mods/public/art/actors/structures/athenians/prytaneion.xml
index 9c53a4f997..d9b685e3e5 100644
--- a/binaries/data/mods/public/art/actors/structures/athenians/prytaneion.xml
+++ b/binaries/data/mods/public/art/actors/structures/athenians/prytaneion.xml
@@ -19,12 +19,15 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <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 actor="" attachpoint="garrisoned"/>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/scout_tower.xml b/binaries/data/mods/public/art/actors/structures/athenians/scout_tower.xml
index efb4b01b5a..8eb8282224 100644
--- a/binaries/data/mods/public/art/actors/structures/athenians/scout_tower.xml
+++ b/binaries/data/mods/public/art/actors/structures/athenians/scout_tower.xml
@@ -22,12 +22,15 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <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"/>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/storehouse.xml b/binaries/data/mods/public/art/actors/structures/athenians/storehouse.xml
index 51c9a68ebb..171d9742d3 100644
--- a/binaries/data/mods/public/art/actors/structures/athenians/storehouse.xml
+++ b/binaries/data/mods/public/art/actors/structures/athenians/storehouse.xml
@@ -12,15 +12,15 @@
         <prop actor="props/structures/decals/celt_sb1_mud.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_storehouse.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_storehouse.png" name="aoTex"/>
+      </textures>
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
         <prop actor="particle/destruction_smoke_small.xml" attachpoint="root"/>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/temple.xml b/binaries/data/mods/public/art/actors/structures/athenians/temple.xml
index 5c0fb1d292..02ab95b229 100644
--- a/binaries/data/mods/public/art/actors/structures/athenians/temple.xml
+++ b/binaries/data/mods/public/art/actors/structures/athenians/temple.xml
@@ -18,10 +18,9 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
-        <prop attachpoint="garrisoned"/>
         <prop actor="particle/destruction_smoke_med.xml" attachpoint="smoke"/>
         <prop actor="particle/destruction_dust_med.xml" attachpoint="smoke"/>
         <prop actor="particle/destruction_dust_med_gray.xml" attachpoint="smoke"/>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/temple_b.xml b/binaries/data/mods/public/art/actors/structures/athenians/temple_b.xml
index 8798bc410a..371a9b381f 100644
--- a/binaries/data/mods/public/art/actors/structures/athenians/temple_b.xml
+++ b/binaries/data/mods/public/art/actors/structures/athenians/temple_b.xml
@@ -12,12 +12,15 @@
     </variant>
   </group>
   <group>
-    <variant name="Idle"/>
+    <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"/>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/temple_c.xml b/binaries/data/mods/public/art/actors/structures/athenians/temple_c.xml
index 987f5cafc8..b6f5c60ab2 100644
--- a/binaries/data/mods/public/art/actors/structures/athenians/temple_c.xml
+++ b/binaries/data/mods/public/art/actors/structures/athenians/temple_c.xml
@@ -12,12 +12,15 @@
     </variant>
   </group>
   <group>
-    <variant name="Idle"/>
+    <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"/>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/temple_epic.xml b/binaries/data/mods/public/art/actors/structures/athenians/temple_epic.xml
index 89d62ffa02..d040469708 100644
--- a/binaries/data/mods/public/art/actors/structures/athenians/temple_epic.xml
+++ b/binaries/data/mods/public/art/actors/structures/athenians/temple_epic.xml
@@ -15,12 +15,15 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <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"/>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/wall.xml b/binaries/data/mods/public/art/actors/structures/athenians/wall.xml
index 5798db46c5..682e83601a 100644
--- a/binaries/data/mods/public/art/actors/structures/athenians/wall.xml
+++ b/binaries/data/mods/public/art/actors/structures/athenians/wall.xml
@@ -8,7 +8,7 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
         <prop actor="particle/destruction_smoke_small.xml" attachpoint="root"/>
@@ -18,4 +18,4 @@
     </variant>
   </group>
   <material>player_trans.xml</material>
-</actor>
\ No newline at end of file
+</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/wall_gate.xml b/binaries/data/mods/public/art/actors/structures/athenians/wall_gate.xml
index c47d901553..26d581c1a0 100644
--- a/binaries/data/mods/public/art/actors/structures/athenians/wall_gate.xml
+++ b/binaries/data/mods/public/art/actors/structures/athenians/wall_gate.xml
@@ -17,7 +17,7 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
         <prop actor="particle/destruction_smoke_med.xml" attachpoint="root"/>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/wall_long.xml b/binaries/data/mods/public/art/actors/structures/athenians/wall_long.xml
index 177cca3a5a..20b318c09b 100644
--- a/binaries/data/mods/public/art/actors/structures/athenians/wall_long.xml
+++ b/binaries/data/mods/public/art/actors/structures/athenians/wall_long.xml
@@ -8,7 +8,7 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
         <prop actor="particle/destruction_smoke_small.xml" attachpoint="root"/>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/wall_medium.xml b/binaries/data/mods/public/art/actors/structures/athenians/wall_medium.xml
index 638c19a99f..2dd7932638 100644
--- a/binaries/data/mods/public/art/actors/structures/athenians/wall_medium.xml
+++ b/binaries/data/mods/public/art/actors/structures/athenians/wall_medium.xml
@@ -8,7 +8,7 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
         <prop actor="particle/destruction_smoke_small.xml" attachpoint="root"/>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/wall_short.xml b/binaries/data/mods/public/art/actors/structures/athenians/wall_short.xml
index ac64f77d0f..db09b9b90c 100644
--- a/binaries/data/mods/public/art/actors/structures/athenians/wall_short.xml
+++ b/binaries/data/mods/public/art/actors/structures/athenians/wall_short.xml
@@ -8,7 +8,7 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
         <prop actor="particle/destruction_smoke_small.xml" attachpoint="root"/>
diff --git a/binaries/data/mods/public/art/actors/structures/athenians/wall_tower.xml b/binaries/data/mods/public/art/actors/structures/athenians/wall_tower.xml
index da43a11773..d16297ebe8 100644
--- a/binaries/data/mods/public/art/actors/structures/athenians/wall_tower.xml
+++ b/binaries/data/mods/public/art/actors/structures/athenians/wall_tower.xml
@@ -17,12 +17,15 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <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"/>