From c0f0f6fb53437fe8ea5a32451ef5edaa6b46ff31 Mon Sep 17 00:00:00 2001
From: sanderd17 <sanderd17@wildfiregames.com>
Date: Sat, 4 Jun 2016 11:31:21 +0000
Subject: [PATCH] Fix garrison flags on Ptolemaeic buildings + clean up some
 actors

This was SVN commit r18319.
---
 .../actors/structures/ptolemies/barracks.xml  |  5 ++-
 .../structures/ptolemies/blacksmith.xml       |  5 ++-
 .../structures/ptolemies/civic_centre.xml     |  5 ++-
 .../actors/structures/ptolemies/corral.xml    |  2 +-
 .../structures/ptolemies/defense_tower.xml    |  5 ++-
 .../art/actors/structures/ptolemies/dock.xml  |  5 ++-
 .../actors/structures/ptolemies/farmstead.xml |  2 +-
 .../actors/structures/ptolemies/fortress.xml  |  5 ++-
 .../art/actors/structures/ptolemies/house.xml | 42 ++++---------------
 .../structures/ptolemies/lighthouse.xml       |  5 ++-
 .../actors/structures/ptolemies/market.xml    |  2 +-
 .../structures/ptolemies/settlement.xml       | 14 +++----
 .../actors/structures/ptolemies/stall_big.xml |  4 +-
 .../actors/structures/ptolemies/stall_med.xml |  4 +-
 .../structures/ptolemies/stall_small_a.xml    |  4 +-
 .../structures/ptolemies/stall_small_b.xml    |  4 +-
 .../structures/ptolemies/storehouse.xml       |  2 +-
 .../actors/structures/ptolemies/temple.xml    |  7 +++-
 .../art/actors/structures/ptolemies/wall.xml  |  2 +-
 .../actors/structures/ptolemies/wall_gate.xml |  2 +-
 .../actors/structures/ptolemies/wall_long.xml |  2 +-
 .../structures/ptolemies/wall_medium.xml      |  2 +-
 .../structures/ptolemies/wall_short.xml       |  2 +-
 .../structures/ptolemies/wall_tower.xml       |  5 ++-
 .../actors/structures/ptolemies/wonder.xml    |  7 +++-
 .../structures/ptolemies/wooden_tower.xml     |  2 +-
 26 files changed, 75 insertions(+), 71 deletions(-)

diff --git a/binaries/data/mods/public/art/actors/structures/ptolemies/barracks.xml b/binaries/data/mods/public/art/actors/structures/ptolemies/barracks.xml
index 0b22c957b1..a4536e7c79 100644
--- a/binaries/data/mods/public/art/actors/structures/ptolemies/barracks.xml
+++ b/binaries/data/mods/public/art/actors/structures/ptolemies/barracks.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_ptol.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/ptolemies/blacksmith.xml b/binaries/data/mods/public/art/actors/structures/ptolemies/blacksmith.xml
index 33265bbeba..ca66c790d0 100644
--- a/binaries/data/mods/public/art/actors/structures/ptolemies/blacksmith.xml
+++ b/binaries/data/mods/public/art/actors/structures/ptolemies/blacksmith.xml
@@ -18,12 +18,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_ptol.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/ptolemies/civic_centre.xml b/binaries/data/mods/public/art/actors/structures/ptolemies/civic_centre.xml
index a878513863..44a676a37b 100644
--- a/binaries/data/mods/public/art/actors/structures/ptolemies/civic_centre.xml
+++ b/binaries/data/mods/public/art/actors/structures/ptolemies/civic_centre.xml
@@ -30,13 +30,16 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant name="ungarrisoned" frequency="1"/>
     <variant name="garrisoned">
       <props>
         <prop actor="props/special/common/garrison_flag_ptol.xml" attachpoint="garrisoned"/>
         <prop actor="props/special/common/garrison_flag_ptol.xml" attachpoint="garrisoned2"/>
       </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/ptolemies/corral.xml b/binaries/data/mods/public/art/actors/structures/ptolemies/corral.xml
index 09d90a0e7a..c7d482adf1 100644
--- a/binaries/data/mods/public/art/actors/structures/ptolemies/corral.xml
+++ b/binaries/data/mods/public/art/actors/structures/ptolemies/corral.xml
@@ -16,7 +16,7 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
         <prop attachpoint="garrisoned"/>
diff --git a/binaries/data/mods/public/art/actors/structures/ptolemies/defense_tower.xml b/binaries/data/mods/public/art/actors/structures/ptolemies/defense_tower.xml
index 4b095aa9e0..4b0bb35484 100644
--- a/binaries/data/mods/public/art/actors/structures/ptolemies/defense_tower.xml
+++ b/binaries/data/mods/public/art/actors/structures/ptolemies/defense_tower.xml
@@ -18,12 +18,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="particle/destruction_smoke_small.xml" attachpoint="root"/>
diff --git a/binaries/data/mods/public/art/actors/structures/ptolemies/dock.xml b/binaries/data/mods/public/art/actors/structures/ptolemies/dock.xml
index caec759494..5e52141628 100644
--- a/binaries/data/mods/public/art/actors/structures/ptolemies/dock.xml
+++ b/binaries/data/mods/public/art/actors/structures/ptolemies/dock.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_ptol.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/ptolemies/farmstead.xml b/binaries/data/mods/public/art/actors/structures/ptolemies/farmstead.xml
index 663bf4a914..e8d99cb30b 100644
--- a/binaries/data/mods/public/art/actors/structures/ptolemies/farmstead.xml
+++ b/binaries/data/mods/public/art/actors/structures/ptolemies/farmstead.xml
@@ -17,7 +17,7 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant name="ungarrisoned" frequency="1"/>
     <variant name="death">
       <props>
 	  <prop actor="props/structures/ptolemies/farmstead_cart.xml" attachpoint="cart"/>
diff --git a/binaries/data/mods/public/art/actors/structures/ptolemies/fortress.xml b/binaries/data/mods/public/art/actors/structures/ptolemies/fortress.xml
index 503b0bc929..ac1dd2dfb2 100644
--- a/binaries/data/mods/public/art/actors/structures/ptolemies/fortress.xml
+++ b/binaries/data/mods/public/art/actors/structures/ptolemies/fortress.xml
@@ -18,12 +18,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/ptolemies/house.xml b/binaries/data/mods/public/art/actors/structures/ptolemies/house.xml
index 5146a6c22d..4879024286 100644
--- a/binaries/data/mods/public/art/actors/structures/ptolemies/house.xml
+++ b/binaries/data/mods/public/art/actors/structures/ptolemies/house.xml
@@ -2,8 +2,7 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="1" name="House A">
-      <mesh>structural/ptol_house_a.dae</mesh>
+    <variant name="base" frequency="1">
       <props>
         <prop actor="props/structures/decals/dirt_2x2.xml" attachpoint="root"/>
       </props>
@@ -11,72 +10,49 @@
 		<texture file="structural/ptol_struct.png" name="baseTex"/>
 		<texture file="structural/ptol_struct_norm.png" name="normTex"/>
         <texture file="structural/ptol_struct_spec.png" name="specTex"/>
+	  </textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="House A">
+      <mesh>structural/ptol_house_a.dae</mesh>
+      <textures>
 		<texture file="structural/ao/ptol_house_a.png" name="aoTex"/>
 	  </textures>
     </variant>
     <variant frequency="1" name="House B">
       <mesh>structural/ptol_house_b.dae</mesh>
-      <props>
-        <prop actor="props/structures/decals/dirt_2x2.xml" attachpoint="root"/>
-      </props>
       <textures>
-		<texture file="structural/ptol_struct.png" name="baseTex"/>
-		<texture file="structural/ptol_struct_norm.png" name="normTex"/>
-        <texture file="structural/ptol_struct_spec.png" name="specTex"/>
 		<texture file="structural/ao/ptol_house_b.png" name="aoTex"/>
 	  </textures>
     </variant>
     <variant frequency="1" name="House C">
       <mesh>structural/ptol_house_c.dae</mesh>
-      <props>
-        <prop actor="props/structures/decals/dirt_2x2.xml" attachpoint="root"/>
-      </props>
       <textures>
-		<texture file="structural/ptol_struct.png" name="baseTex"/>
-		<texture file="structural/ptol_struct_norm.png" name="normTex"/>
-        <texture file="structural/ptol_struct_spec.png" name="specTex"/>
 		<texture file="structural/ao/ptol_house_c.png" name="aoTex"/>
 	  </textures>
     </variant>
     <variant frequency="1" name="House D">
       <mesh>structural/ptol_house_d.dae</mesh>
-      <props>
-        <prop actor="props/structures/decals/dirt_2x2.xml" attachpoint="root"/>
-      </props>
       <textures>
-		<texture file="structural/ptol_struct.png" name="baseTex"/>
-		<texture file="structural/ptol_struct_norm.png" name="normTex"/>
-        <texture file="structural/ptol_struct_spec.png" name="specTex"/>
 		<texture file="structural/ao/ptol_house_d.png" name="aoTex"/>
 	  </textures>
     </variant>
     <variant frequency="1" name="House E">
       <mesh>structural/ptol_house_e.dae</mesh>
-      <props>
-        <prop actor="props/structures/decals/dirt_2x2.xml" attachpoint="root"/>
-      </props>
       <textures>
-		<texture file="structural/ptol_struct.png" name="baseTex"/>
-		<texture file="structural/ptol_struct_norm.png" name="normTex"/>
-        <texture file="structural/ptol_struct_spec.png" name="specTex"/>
 		<texture file="structural/ao/ptol_house_e.png" name="aoTex"/>
 	  </textures>
     </variant>
     <variant frequency="1" name="House F">
       <mesh>structural/ptol_house_f.dae</mesh>
-      <props>
-        <prop actor="props/structures/decals/dirt_2x2.xml" attachpoint="root"/>
-      </props>
       <textures>
-		<texture file="structural/ptol_struct.png" name="baseTex"/>
-		<texture file="structural/ptol_struct_norm.png" name="normTex"/>
-        <texture file="structural/ptol_struct_spec.png" name="specTex"/>
 		<texture file="structural/ao/ptol_house_f.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/ptolemies/lighthouse.xml b/binaries/data/mods/public/art/actors/structures/ptolemies/lighthouse.xml
index 6951618c2f..35ae460562 100644
--- a/binaries/data/mods/public/art/actors/structures/ptolemies/lighthouse.xml
+++ b/binaries/data/mods/public/art/actors/structures/ptolemies/lighthouse.xml
@@ -20,12 +20,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_ptol.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/ptolemies/market.xml b/binaries/data/mods/public/art/actors/structures/ptolemies/market.xml
index 9d96bd9a46..eb7fe4190f 100644
--- a/binaries/data/mods/public/art/actors/structures/ptolemies/market.xml
+++ b/binaries/data/mods/public/art/actors/structures/ptolemies/market.xml
@@ -25,7 +25,7 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
         <prop attachpoint="garrisoned"/>
diff --git a/binaries/data/mods/public/art/actors/structures/ptolemies/settlement.xml b/binaries/data/mods/public/art/actors/structures/ptolemies/settlement.xml
index 221f43cd49..d48fb74d8d 100644
--- a/binaries/data/mods/public/art/actors/structures/ptolemies/settlement.xml
+++ b/binaries/data/mods/public/art/actors/structures/ptolemies/settlement.xml
@@ -2,7 +2,7 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="100" name="Roman Army Camp">
+    <variant frequency="100" name="Settlement">
       <animations>
         <animation event="0.5" load="0.0" name="attack_ranged" speed="100"/>
       </animations>
@@ -29,24 +29,22 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant name="ungarrisoned" frequency="1"/>
     <variant name="garrisoned">
       <props>
         <prop actor="props/special/common/garrison_flag_ptol.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/ptolemies/settlement_campfire.xml" attachpoint="campfire" minheight="-20" maxheight="20"/>        
-        <prop actor="props/structures/ptolemies/settlement_outpost.xml" attachpoint="outpost" minheight="-20" maxheight="20"/>
-        <prop actor="props/structures/ptolemies/settlement_greektent.xml" attachpoint="greektent" minheight="-20" maxheight="20"/>
-        <prop actor="props/structures/ptolemies/settlement_arabtent.xml" attachpoint="arabtent" minheight="-20" maxheight="20"/>
-        <prop actor="props/structures/ptolemies/settlement_bigtent.xml" attachpoint="bigtent" minheight="-20" maxheight="20"/>
-        <prop actor="props/structures/ptolemies/settlement_entrance.xml" attachpoint="root" minheight="-20" maxheight="20"/>
+        <prop actor="props/structures/ptolemies/settlement_entrance.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/ptolemies/stall_big.xml b/binaries/data/mods/public/art/actors/structures/ptolemies/stall_big.xml
index 9d4988b695..844a15db15 100644
--- a/binaries/data/mods/public/art/actors/structures/ptolemies/stall_big.xml
+++ b/binaries/data/mods/public/art/actors/structures/ptolemies/stall_big.xml
@@ -18,10 +18,10 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
-	  <prop actor="props/structures/ptolemies/farmstead_cart.xml" attachpoint="cart"/>
+	    <prop actor="props/structures/ptolemies/farmstead_cart.xml" attachpoint="cart"/>
         <prop actor="particle/destruction_smoke_small.xml" attachpoint="root"/>
         <prop actor="particle/destruction_dust_small.xml" attachpoint="root"/>
         <prop actor="particle/destruction_dust_small_gray.xml" attachpoint="root"/>
diff --git a/binaries/data/mods/public/art/actors/structures/ptolemies/stall_med.xml b/binaries/data/mods/public/art/actors/structures/ptolemies/stall_med.xml
index 51aba20698..c88d343dee 100644
--- a/binaries/data/mods/public/art/actors/structures/ptolemies/stall_med.xml
+++ b/binaries/data/mods/public/art/actors/structures/ptolemies/stall_med.xml
@@ -18,10 +18,10 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
-	  <prop actor="props/structures/ptolemies/farmstead_cart.xml" attachpoint="cart"/>
+	    <prop actor="props/structures/ptolemies/farmstead_cart.xml" attachpoint="cart"/>
         <prop actor="particle/destruction_smoke_small.xml" attachpoint="root"/>
         <prop actor="particle/destruction_dust_small.xml" attachpoint="root"/>
         <prop actor="particle/destruction_dust_small_gray.xml" attachpoint="root"/>
diff --git a/binaries/data/mods/public/art/actors/structures/ptolemies/stall_small_a.xml b/binaries/data/mods/public/art/actors/structures/ptolemies/stall_small_a.xml
index a62c134942..ae9eb99d6f 100644
--- a/binaries/data/mods/public/art/actors/structures/ptolemies/stall_small_a.xml
+++ b/binaries/data/mods/public/art/actors/structures/ptolemies/stall_small_a.xml
@@ -18,10 +18,10 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
-	  <prop actor="props/structures/ptolemies/farmstead_cart.xml" attachpoint="cart"/>
+	    <prop actor="props/structures/ptolemies/farmstead_cart.xml" attachpoint="cart"/>
         <prop actor="particle/destruction_smoke_small.xml" attachpoint="root"/>
         <prop actor="particle/destruction_dust_small.xml" attachpoint="root"/>
         <prop actor="particle/destruction_dust_small_gray.xml" attachpoint="root"/>
diff --git a/binaries/data/mods/public/art/actors/structures/ptolemies/stall_small_b.xml b/binaries/data/mods/public/art/actors/structures/ptolemies/stall_small_b.xml
index c9be922498..fb4ed6a0a9 100644
--- a/binaries/data/mods/public/art/actors/structures/ptolemies/stall_small_b.xml
+++ b/binaries/data/mods/public/art/actors/structures/ptolemies/stall_small_b.xml
@@ -18,10 +18,10 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
-	  <prop actor="props/structures/ptolemies/farmstead_cart.xml" attachpoint="cart"/>
+	    <prop actor="props/structures/ptolemies/farmstead_cart.xml" attachpoint="cart"/>
         <prop actor="particle/destruction_smoke_small.xml" attachpoint="root"/>
         <prop actor="particle/destruction_dust_small.xml" attachpoint="root"/>
         <prop actor="particle/destruction_dust_small_gray.xml" attachpoint="root"/>
diff --git a/binaries/data/mods/public/art/actors/structures/ptolemies/storehouse.xml b/binaries/data/mods/public/art/actors/structures/ptolemies/storehouse.xml
index ad690eb9f1..28accc605e 100644
--- a/binaries/data/mods/public/art/actors/structures/ptolemies/storehouse.xml
+++ b/binaries/data/mods/public/art/actors/structures/ptolemies/storehouse.xml
@@ -16,7 +16,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/ptolemies/temple.xml b/binaries/data/mods/public/art/actors/structures/ptolemies/temple.xml
index 34de66174a..92f2511e57 100644
--- a/binaries/data/mods/public/art/actors/structures/ptolemies/temple.xml
+++ b/binaries/data/mods/public/art/actors/structures/ptolemies/temple.xml
@@ -2,7 +2,7 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="100" name="Ptolemaic Fortress">
+    <variant frequency="100" name="Ptolemaic Temple">
       <mesh>structural/ptol_temple.dae</mesh>
       <props>
         <prop actor="props/structures/ptolemies/temple_paintings.xml" attachpoint="root"/>
@@ -18,12 +18,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_ptol.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/ptolemies/wall.xml b/binaries/data/mods/public/art/actors/structures/ptolemies/wall.xml
index 61c20a70d4..43e0d78a0a 100644
--- a/binaries/data/mods/public/art/actors/structures/ptolemies/wall.xml
+++ b/binaries/data/mods/public/art/actors/structures/ptolemies/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_dust_small.xml" attachpoint="root"/>
diff --git a/binaries/data/mods/public/art/actors/structures/ptolemies/wall_gate.xml b/binaries/data/mods/public/art/actors/structures/ptolemies/wall_gate.xml
index 6f4e0dc37f..1ffa6c86ad 100644
--- a/binaries/data/mods/public/art/actors/structures/ptolemies/wall_gate.xml
+++ b/binaries/data/mods/public/art/actors/structures/ptolemies/wall_gate.xml
@@ -11,7 +11,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/ptolemies/wall_long.xml b/binaries/data/mods/public/art/actors/structures/ptolemies/wall_long.xml
index 840d99d8d8..42324eef6e 100644
--- a/binaries/data/mods/public/art/actors/structures/ptolemies/wall_long.xml
+++ b/binaries/data/mods/public/art/actors/structures/ptolemies/wall_long.xml
@@ -13,7 +13,7 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
         <prop actor="particle/destruction_dust_small.xml" attachpoint="root"/>
diff --git a/binaries/data/mods/public/art/actors/structures/ptolemies/wall_medium.xml b/binaries/data/mods/public/art/actors/structures/ptolemies/wall_medium.xml
index 2d22f4b151..769e6faabd 100644
--- a/binaries/data/mods/public/art/actors/structures/ptolemies/wall_medium.xml
+++ b/binaries/data/mods/public/art/actors/structures/ptolemies/wall_medium.xml
@@ -13,7 +13,7 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
         <prop actor="particle/destruction_dust_small.xml" attachpoint="root"/>
diff --git a/binaries/data/mods/public/art/actors/structures/ptolemies/wall_short.xml b/binaries/data/mods/public/art/actors/structures/ptolemies/wall_short.xml
index 206022f018..bd73c91b82 100644
--- a/binaries/data/mods/public/art/actors/structures/ptolemies/wall_short.xml
+++ b/binaries/data/mods/public/art/actors/structures/ptolemies/wall_short.xml
@@ -13,7 +13,7 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
         <prop actor="particle/destruction_dust_small.xml" attachpoint="root"/>
diff --git a/binaries/data/mods/public/art/actors/structures/ptolemies/wall_tower.xml b/binaries/data/mods/public/art/actors/structures/ptolemies/wall_tower.xml
index afb267dfc3..a47818d94a 100644
--- a/binaries/data/mods/public/art/actors/structures/ptolemies/wall_tower.xml
+++ b/binaries/data/mods/public/art/actors/structures/ptolemies/wall_tower.xml
@@ -17,12 +17,15 @@
     </variant>
   </group>
   <group>
-    <variant name="Idle"/>
+    <variant name="ungarrisoned" frequency="1"/>
     <variant name="garrisoned">
       <props>
         <prop actor="props/special/common/garrison_flag_ptol.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/ptolemies/wonder.xml b/binaries/data/mods/public/art/actors/structures/ptolemies/wonder.xml
index cf5edee57d..55a84f42bb 100644
--- a/binaries/data/mods/public/art/actors/structures/ptolemies/wonder.xml
+++ b/binaries/data/mods/public/art/actors/structures/ptolemies/wonder.xml
@@ -2,7 +2,7 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="100" name="Ptolemaic Fortress">
+    <variant frequency="100" name="Edfu">
       <mesh>structural/ptol_edfu_struct.dae</mesh>
       <props>
         <prop actor="props/structures/ptolemies/edfu_paintings.xml" attachpoint="root"/>
@@ -19,7 +19,7 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant name="ungarrisoned" frequency="1"/>
     <variant name="garrisoned">
       <props>
         <prop actor="props/special/common/garrison_flag_ptol.xml" attachpoint="garrisoned"/>
@@ -28,6 +28,9 @@
 		<prop actor="props/special/common/garrison_flag_ptol.xml" attachpoint="garrisoned4"/>
       </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/ptolemies/wooden_tower.xml b/binaries/data/mods/public/art/actors/structures/ptolemies/wooden_tower.xml
index 8ba81b182d..ee56564782 100644
--- a/binaries/data/mods/public/art/actors/structures/ptolemies/wooden_tower.xml
+++ b/binaries/data/mods/public/art/actors/structures/ptolemies/wooden_tower.xml
@@ -20,7 +20,7 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant name="ungarrisoned" frequency="1"/>
     <variant name="garrisoned">
       <props>
         <prop actor="props/special/common/garrison_flag_ptol.xml" attachpoint="garrisoned"/>