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

This was SVN commit r18309.
---
 .../structures/macedonians/barracks.xml       | 23 +++++++++++--------
 .../structures/macedonians/civic_centre.xml   |  5 +++-
 .../structures/macedonians/fortress_up.xml    | 11 +++++----
 .../actors/structures/macedonians/library.xml | 13 +++++++----
 .../actors/structures/macedonians/temple.xml  |  5 +++-
 .../structures/macedonians/theatron.xml       |  8 +++----
 6 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/binaries/data/mods/public/art/actors/structures/macedonians/barracks.xml b/binaries/data/mods/public/art/actors/structures/macedonians/barracks.xml
index 9d5b3d3ba6..42270c836d 100644
--- a/binaries/data/mods/public/art/actors/structures/macedonians/barracks.xml
+++ b/binaries/data/mods/public/art/actors/structures/macedonians/barracks.xml
@@ -13,30 +13,33 @@
         <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/mace_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/mace_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"/>
         <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"/>
-<prop actor="props/structures/macedonians/barracks_struct_b.xml" attachpoint="root"/>
-<prop actor="props/structures/macedonians/barracks_props_a.xml" attachpoint="root"/>
-<prop actor="props/structures/macedonians/barracks_props_shields.xml" attachpoint="root"/>
-<prop actor="props/structures/macedonians/barracks_tile_c.xml" attachpoint="root"/>
-<prop actor="props/structures/macedonians/barracks_decor.xml" attachpoint="root"/>
+        <prop actor="props/structures/macedonians/barracks_struct_b.xml" attachpoint="root"/>
+        <prop actor="props/structures/macedonians/barracks_props_a.xml" attachpoint="root"/>
+        <prop actor="props/structures/macedonians/barracks_props_shields.xml" attachpoint="root"/>
+        <prop actor="props/structures/macedonians/barracks_tile_c.xml" attachpoint="root"/>
+        <prop actor="props/structures/macedonians/barracks_decor.xml" attachpoint="root"/>
         <prop actor="props/structures/decals/dirt_4x4.xml" attachpoint="root"/>
       </props>
     </variant>
diff --git a/binaries/data/mods/public/art/actors/structures/macedonians/civic_centre.xml b/binaries/data/mods/public/art/actors/structures/macedonians/civic_centre.xml
index ccd68769d2..634c7dd509 100644
--- a/binaries/data/mods/public/art/actors/structures/macedonians/civic_centre.xml
+++ b/binaries/data/mods/public/art/actors/structures/macedonians/civic_centre.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/macedonians/fortress_up.xml b/binaries/data/mods/public/art/actors/structures/macedonians/fortress_up.xml
index 35cf9fe7a1..4d51446988 100644
--- a/binaries/data/mods/public/art/actors/structures/macedonians/fortress_up.xml
+++ b/binaries/data/mods/public/art/actors/structures/macedonians/fortress_up.xml
@@ -14,19 +14,22 @@
       </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"/>
+        <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 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/macedonians/library.xml b/binaries/data/mods/public/art/actors/structures/macedonians/library.xml
index 41d3cc7f2e..002caae755 100644
--- a/binaries/data/mods/public/art/actors/structures/macedonians/library.xml
+++ b/binaries/data/mods/public/art/actors/structures/macedonians/library.xml
@@ -18,20 +18,23 @@
         <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/mace_library.png" name="aoTex"/>
+        <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/mace_library.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/macedonians/temple.xml b/binaries/data/mods/public/art/actors/structures/macedonians/temple.xml
index a20fc7ce21..5add603d86 100644
--- a/binaries/data/mods/public/art/actors/structures/macedonians/temple.xml
+++ b/binaries/data/mods/public/art/actors/structures/macedonians/temple.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/macedonians/theatron.xml b/binaries/data/mods/public/art/actors/structures/macedonians/theatron.xml
index 6558041c72..b3258530f8 100644
--- a/binaries/data/mods/public/art/actors/structures/macedonians/theatron.xml
+++ b/binaries/data/mods/public/art/actors/structures/macedonians/theatron.xml
@@ -13,10 +13,10 @@
         <prop actor="props/structures/decals/dirt_6x6.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/mace_theatron.png" name="aoTex"/>
+        <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/mace_theatron.png" name="aoTex"/>
       </textures>
     </variant>
   </group>