From 4048c0e03cf2bce905e35a3ee1aee7e1d920f866 Mon Sep 17 00:00:00 2001
From: sanderd17 <sanderd17@wildfiregames.com>
Date: Fri, 3 Jun 2016 14:21:07 +0000
Subject: [PATCH] Fix garrison flags on Mauryan buildings + clean up some
 actors

This was SVN commit r18310.
---
 .../actors/structures/mauryans/barracks.xml   |  5 +++-
 .../structures/mauryans/civil_centre.xml      | 21 +++++++-------
 .../art/actors/structures/mauryans/corral.xml |  2 +-
 .../actors/structures/mauryans/farmstead.xml  |  2 +-
 .../actors/structures/mauryans/fortress.xml   |  7 +++--
 .../art/actors/structures/mauryans/house.xml  | 29 ++++++-------------
 .../art/actors/structures/mauryans/market.xml |  7 +++--
 .../structures/mauryans/misc_structure_01.xml |  5 +++-
 .../actors/structures/mauryans/outpost.xml    |  5 +++-
 .../structures/mauryans/scout_tower.xml       |  5 +++-
 .../actors/structures/mauryans/stables.xml    |  5 +++-
 .../actors/structures/mauryans/storehouse.xml |  2 +-
 .../art/actors/structures/mauryans/temple.xml |  5 +++-
 .../art/actors/structures/mauryans/wall.xml   |  2 +-
 .../actors/structures/mauryans/wall_gate.xml  |  2 +-
 .../actors/structures/mauryans/wall_long.xml  |  2 +-
 .../structures/mauryans/wall_medium.xml       |  2 +-
 .../actors/structures/mauryans/wall_short.xml |  2 +-
 .../actors/structures/mauryans/wall_tower.xml |  5 +++-
 .../structures/mauryans/wooden_tower.xml      |  2 +-
 20 files changed, 65 insertions(+), 52 deletions(-)

diff --git a/binaries/data/mods/public/art/actors/structures/mauryans/barracks.xml b/binaries/data/mods/public/art/actors/structures/mauryans/barracks.xml
index 8f62a766c1..f330334e9b 100644
--- a/binaries/data/mods/public/art/actors/structures/mauryans/barracks.xml
+++ b/binaries/data/mods/public/art/actors/structures/mauryans/barracks.xml
@@ -42,12 +42,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_mauryans.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/mauryans/civil_centre.xml b/binaries/data/mods/public/art/actors/structures/mauryans/civil_centre.xml
index 728b59d20c..cd6339a74b 100644
--- a/binaries/data/mods/public/art/actors/structures/mauryans/civil_centre.xml
+++ b/binaries/data/mods/public/art/actors/structures/mauryans/civil_centre.xml
@@ -9,28 +9,27 @@
       <mesh>structural/maur_cc_struct.dae</mesh>
       <props>
         <prop actor="props/structures/mauryans/cc_lions.xml" attachpoint="root"/>
-		<prop actor="props/structures/mauryans/cc_pillars.xml" attachpoint="root"/>
+        <prop actor="props/structures/mauryans/cc_pillars.xml" attachpoint="root"/>
         <prop actor="props/structures/mauryans/cc_plants.xml" attachpoint="root"/>
-		<prop actor="props/structures/mauryans/cc_struct_b.xml" attachpoint="root"/>
-		<prop actor="props/units/weapons/arrow_front.xml" attachpoint="loaded-projectile"/>
+        <prop actor="props/structures/mauryans/cc_struct_b.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/maur_struct.png" name="baseTex"/>
-	  <texture file="structural/maur_struct_spec.png" name="specTex"/>
-	  <texture file="structural/maur_struct_norm.png" name="normTex"/>
-      <texture file="structural/ao/maur_civic_ao.png" name="aoTex"/>
-    </textures>
+      <textures>
+        <texture file="structural/maur_struct.png" name="baseTex"/>
+        <texture file="structural/maur_struct_spec.png" name="specTex"/>
+        <texture file="structural/maur_struct_norm.png" name="normTex"/>
+        <texture file="structural/ao/maur_civic_ao.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_mauryans.xml" attachpoint="garrisoned"/>
       </props>
     </variant>
   </group>
-  
   <material>player_trans_ao_parallax_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/structures/mauryans/corral.xml b/binaries/data/mods/public/art/actors/structures/mauryans/corral.xml
index 6265c3eaa8..07a7ab7e96 100644
--- a/binaries/data/mods/public/art/actors/structures/mauryans/corral.xml
+++ b/binaries/data/mods/public/art/actors/structures/mauryans/corral.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/mauryans/farmstead.xml b/binaries/data/mods/public/art/actors/structures/mauryans/farmstead.xml
index ac4a2898a9..2beafd680e 100644
--- a/binaries/data/mods/public/art/actors/structures/mauryans/farmstead.xml
+++ b/binaries/data/mods/public/art/actors/structures/mauryans/farmstead.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/mauryans/fortress.xml b/binaries/data/mods/public/art/actors/structures/mauryans/fortress.xml
index 7164099eb1..e919ca7bf8 100644
--- a/binaries/data/mods/public/art/actors/structures/mauryans/fortress.xml
+++ b/binaries/data/mods/public/art/actors/structures/mauryans/fortress.xml
@@ -29,12 +29,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_mauryans.xml" attachpoint="garrisoned"/>
       </props>
     </variant>
+  </group>
+  <group>
+    <variant name="alive" frequency="1"/>
     <variant name="death">
       <props>
         <prop attachpoint="garrisoned"/>
@@ -46,4 +49,4 @@
     </variant>
   </group>
   <material>player_trans_ao_parallax_spec.xml</material>
-</actor>
\ No newline at end of file
+</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/mauryans/house.xml b/binaries/data/mods/public/art/actors/structures/mauryans/house.xml
index 18c6e66021..00a726e10b 100644
--- a/binaries/data/mods/public/art/actors/structures/mauryans/house.xml
+++ b/binaries/data/mods/public/art/actors/structures/mauryans/house.xml
@@ -2,49 +2,38 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="1" name="House A">
-      <mesh>structural/maur_house_a.dae</mesh>
-      <props>
-        <prop actor="props/structures/mauryans/house_a_struct_b.xml" attachpoint="root"/>
-      </props>
+    <variant name="base" frequency="1">
       <textures>
 	  	<texture file="structural/maur_struct.png" name="baseTex"/>
 	  	<texture file="structural/maur_struct_spec.png" name="specTex"/>
 		<texture file="structural/maur_struct_norm.png" name="normTex"/>
 	  </textures>
     </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="House A">
+      <mesh>structural/maur_house_a.dae</mesh>
+      <props>
+        <prop actor="props/structures/mauryans/house_a_struct_b.xml" attachpoint="root"/>
+      </props>
+    </variant>
     <variant frequency="1" name="House B">
       <mesh>structural/maur_house_b.dae</mesh>
       <props>
         <prop actor="props/structures/mauryans/house_b_struct_b.xml" attachpoint="root"/>
       </props>
-      <textures>
-		<texture file="structural/maur_struct.png" name="baseTex"/>
-		<texture file="structural/maur_struct_spec.png" name="specTex"/>
-		<texture file="structural/maur_struct_norm.png" name="normTex"/>
-	  </textures>
     </variant>
     <variant frequency="1" name="House C">
       <mesh>structural/maur_house_c.dae</mesh>
       <props>
         <prop actor="props/structures/mauryans/house_c_struct_b.xml" attachpoint="root"/>
       </props>
-      <textures>
-		<texture file="structural/maur_struct.png" name="baseTex"/>
-		<texture file="structural/maur_struct_spec.png" name="specTex"/>
-		<texture file="structural/maur_struct_norm.png" name="normTex"/>
-	  </textures>
     </variant>
     <variant frequency="1" name="House D">
       <mesh>structural/maur_house_d.dae</mesh>
       <props>
         <prop actor="props/structures/mauryans/house_d_struct_b.xml" attachpoint="root"/>
       </props>
-      <textures>
-		<texture file="structural/maur_struct.png" name="baseTex"/>
-		<texture file="structural/maur_struct_spec.png" name="specTex"/>
-		<texture file="structural/maur_struct_norm.png" name="normTex"/>
-	  </textures>
     </variant>
   </group>
   <material>player_trans_parallax_spec.xml</material>
diff --git a/binaries/data/mods/public/art/actors/structures/mauryans/market.xml b/binaries/data/mods/public/art/actors/structures/mauryans/market.xml
index 00750a762c..b62976c71a 100644
--- a/binaries/data/mods/public/art/actors/structures/mauryans/market.xml
+++ b/binaries/data/mods/public/art/actors/structures/mauryans/market.xml
@@ -10,9 +10,10 @@
 		<prop actor="props/structures/mauryans/market_struct_b.xml" attachpoint="root"/>
 		<prop actor="props/structures/decals/dirt_5x5.xml" attachpoint="root"/>
 	  </props>
-      <textures><texture file="structural/maur_struct.png" name="baseTex"/>
-	  	<texture file="structural/maur_struct_spec.png" name="specTex"/>
-	    <texture file="structural/maur_struct_norm.png" name="normTex"/>
+      <textures>
+        <texture file="structural/maur_struct.png" name="baseTex"/>
+        <texture file="structural/maur_struct_spec.png" name="specTex"/>
+        <texture file="structural/maur_struct_norm.png" name="normTex"/>
         <texture file="structural/ao/maur_market_ao.png" name="aoTex"/>
 	  </textures>
     </variant>
diff --git a/binaries/data/mods/public/art/actors/structures/mauryans/misc_structure_01.xml b/binaries/data/mods/public/art/actors/structures/mauryans/misc_structure_01.xml
index 5a3e65e088..241d39ad51 100644
--- a/binaries/data/mods/public/art/actors/structures/mauryans/misc_structure_01.xml
+++ b/binaries/data/mods/public/art/actors/structures/mauryans/misc_structure_01.xml
@@ -15,12 +15,15 @@
     </variant>
   </group>
   <group>
-    <variant name="Idle"/>
+    <variant name="ungarrisoned" frequency="1"/>
     <variant name="garrisoned">
       <props>
         <prop actor="props/special/common/garrison_flag_mauryans.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/mauryans/outpost.xml b/binaries/data/mods/public/art/actors/structures/mauryans/outpost.xml
index 376bdc9da8..1ba1277812 100644
--- a/binaries/data/mods/public/art/actors/structures/mauryans/outpost.xml
+++ b/binaries/data/mods/public/art/actors/structures/mauryans/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_persians.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/mauryans/scout_tower.xml b/binaries/data/mods/public/art/actors/structures/mauryans/scout_tower.xml
index a938a1b061..a3ff627cba 100644
--- a/binaries/data/mods/public/art/actors/structures/mauryans/scout_tower.xml
+++ b/binaries/data/mods/public/art/actors/structures/mauryans/scout_tower.xml
@@ -26,12 +26,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_mauryans.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/mauryans/stables.xml b/binaries/data/mods/public/art/actors/structures/mauryans/stables.xml
index 1f89920b6e..24bb012a9f 100644
--- a/binaries/data/mods/public/art/actors/structures/mauryans/stables.xml
+++ b/binaries/data/mods/public/art/actors/structures/mauryans/stables.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_mauryans.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/mauryans/storehouse.xml b/binaries/data/mods/public/art/actors/structures/mauryans/storehouse.xml
index 7ce2447203..38677ffea9 100644
--- a/binaries/data/mods/public/art/actors/structures/mauryans/storehouse.xml
+++ b/binaries/data/mods/public/art/actors/structures/mauryans/storehouse.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_small.xml" attachpoint="root"/>
diff --git a/binaries/data/mods/public/art/actors/structures/mauryans/temple.xml b/binaries/data/mods/public/art/actors/structures/mauryans/temple.xml
index 3dac1259cc..5857952683 100644
--- a/binaries/data/mods/public/art/actors/structures/mauryans/temple.xml
+++ b/binaries/data/mods/public/art/actors/structures/mauryans/temple.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_mauryans.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/mauryans/wall.xml b/binaries/data/mods/public/art/actors/structures/mauryans/wall.xml
index cf8f77cf8f..2e01d70348 100644
--- a/binaries/data/mods/public/art/actors/structures/mauryans/wall.xml
+++ b/binaries/data/mods/public/art/actors/structures/mauryans/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/mauryans/wall_gate.xml b/binaries/data/mods/public/art/actors/structures/mauryans/wall_gate.xml
index a5b1e77302..c331d642ee 100644
--- a/binaries/data/mods/public/art/actors/structures/mauryans/wall_gate.xml
+++ b/binaries/data/mods/public/art/actors/structures/mauryans/wall_gate.xml
@@ -22,7 +22,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/mauryans/wall_long.xml b/binaries/data/mods/public/art/actors/structures/mauryans/wall_long.xml
index a53a25b84b..1e77580e18 100644
--- a/binaries/data/mods/public/art/actors/structures/mauryans/wall_long.xml
+++ b/binaries/data/mods/public/art/actors/structures/mauryans/wall_long.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_dust_small.xml" attachpoint="root"/>
diff --git a/binaries/data/mods/public/art/actors/structures/mauryans/wall_medium.xml b/binaries/data/mods/public/art/actors/structures/mauryans/wall_medium.xml
index 14bfbf54e5..e9245b6a65 100644
--- a/binaries/data/mods/public/art/actors/structures/mauryans/wall_medium.xml
+++ b/binaries/data/mods/public/art/actors/structures/mauryans/wall_medium.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_dust_small.xml" attachpoint="root"/>
diff --git a/binaries/data/mods/public/art/actors/structures/mauryans/wall_short.xml b/binaries/data/mods/public/art/actors/structures/mauryans/wall_short.xml
index b9da31c432..0a5138fc94 100644
--- a/binaries/data/mods/public/art/actors/structures/mauryans/wall_short.xml
+++ b/binaries/data/mods/public/art/actors/structures/mauryans/wall_short.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_dust_small.xml" attachpoint="root"/>
diff --git a/binaries/data/mods/public/art/actors/structures/mauryans/wall_tower.xml b/binaries/data/mods/public/art/actors/structures/mauryans/wall_tower.xml
index 942b774fbe..eb4dc89e4e 100644
--- a/binaries/data/mods/public/art/actors/structures/mauryans/wall_tower.xml
+++ b/binaries/data/mods/public/art/actors/structures/mauryans/wall_tower.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_mauryans.xml" attachpoint="garrisoned"/>
       </props>
     </variant>
+  </group>
+  <group>
+    <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/mauryans/wooden_tower.xml b/binaries/data/mods/public/art/actors/structures/mauryans/wooden_tower.xml
index aebe10d0c9..fbae37dbed 100644
--- a/binaries/data/mods/public/art/actors/structures/mauryans/wooden_tower.xml
+++ b/binaries/data/mods/public/art/actors/structures/mauryans/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_mauryans.xml" attachpoint="garrisoned"/>