A bunch more garrison flag stuff.

This was SVN commit r10737.

binaries/data/mods/public/art/actors/structures/celts/barracks_new.xml

@@ -17,7 +17,7 @@
     <variant frequency="100" name="Idle"/>
     <variant name="garrisoned">
       <props>
-        <prop actor="props/special/common/waypoint_flag_0ad.xml" attachpoint="garrisoned"/>
+        <prop actor="props/special/common/garrison_flag_celt.xml" attachpoint="garrisoned"/>
       </props>
     </variant>
   </group>

binaries/data/mods/public/art/actors/structures/celts/civic_centre.xml

@@ -22,7 +22,7 @@
     <variant frequency="100" name="Idle"/>
     <variant name="garrisoned">
       <props>
-        <prop actor="props/special/common/waypoint_flag_0ad.xml" attachpoint="garrisoned"/>
+        <prop actor="props/special/common/garrison_flag_celt.xml" attachpoint="garrisoned"/>
       </props>
     </variant>
   </group>

binaries/data/mods/public/art/actors/structures/celts/fortress_briton.xml

@@ -22,7 +22,7 @@
     <variant frequency="100" name="Idle"/>
     <variant name="garrisoned">
       <props>
-        <prop actor="props/special/common/waypoint_flag_0ad.xml" attachpoint="garrisoned"/>
+        <prop actor="props/special/common/garrison_flag_celt.xml" attachpoint="garrisoned"/>
       </props>
     </variant>
   </group>

binaries/data/mods/public/art/actors/structures/celts/fortress_gallic.xml

@@ -25,7 +25,7 @@
     <variant frequency="100" name="Idle"/>
     <variant name="garrisoned">
       <props>
-        <prop actor="props/special/common/waypoint_flag_0ad.xml" attachpoint="garrisoned"/>
+        <prop actor="props/special/common/garrison_flag_celt.xml" attachpoint="garrisoned"/>
       </props>
     </variant>
   </group>

binaries/data/mods/public/art/actors/structures/celts/outpost.xml

@@ -39,7 +39,7 @@
     <variant frequency="100" name="Idle"/>
     <variant name="garrisoned">
       <props>
-        <prop actor="props/special/common/waypoint_flag_0ad.xml" attachpoint="garrisoned"/>
+        <prop actor="props/special/common/garrison_flag_celt.xml" attachpoint="garrisoned"/>
       </props>
     </variant>
   </group>

binaries/data/mods/public/art/actors/structures/celts/temple.xml

@@ -21,7 +21,7 @@
     <variant frequency="100" name="Idle"/>
     <variant name="garrisoned">
       <props>
-        <prop actor="props/special/common/waypoint_flag_0ad.xml" attachpoint="garrisoned"/>
+        <prop actor="props/special/common/garrison_flag_celt.xml" attachpoint="garrisoned"/>
       </props>
     </variant>
   </group>

binaries/data/mods/public/art/actors/structures/iberians/barracks.xml

@@ -15,7 +15,7 @@
     <variant frequency="100" name="Idle"/>
     <variant name="garrisoned">
       <props>
-        <prop actor="props/special/common/waypoint_flag_0ad.xml" attachpoint="garrisoned"/>
+        <prop actor="props/special/common/garrison_flag_iber.xml" attachpoint="garrisoned"/>
       </props>
     </variant>
   </group>

binaries/data/mods/public/art/actors/structures/iberians/civil_centre.xml

@@ -20,7 +20,7 @@
     <variant frequency="100" name="Idle"/>
     <variant name="garrisoned">
       <props>
-        <prop actor="props/special/common/waypoint_flag_0ad.xml" attachpoint="garrisoned"/>
+        <prop actor="props/special/common/garrison_flag_iber.xml" attachpoint="garrisoned"/>
       </props>
     </variant>
   </group>

binaries/data/mods/public/art/actors/structures/iberians/fortress.xml

@@ -20,7 +20,7 @@
     <variant frequency="100" name="Idle"/>
     <variant name="garrisoned">
       <props>
-        <prop actor="props/special/common/waypoint_flag_0ad.xml" attachpoint="garrisoned"/>
+        <prop actor="props/special/common/garrison_flag_iber.xml" attachpoint="garrisoned"/>
       </props>
     </variant>
   </group>

binaries/data/mods/public/art/actors/structures/iberians/scout_tower.xml

@@ -20,7 +20,7 @@
     <variant frequency="100" name="Idle"/>
     <variant name="garrisoned">
       <props>
-        <prop actor="props/special/common/waypoint_flag_0ad.xml" attachpoint="garrisoned"/>
+        <prop actor="props/special/common/garrison_flag_iber.xml" attachpoint="garrisoned"/>
       </props>
     </variant>
   </group>

binaries/data/mods/public/art/actors/structures/iberians/wall_tower.xml

@@ -14,7 +14,7 @@
     <variant frequency="100" name="Idle"/>
     <variant name="garrisoned">
       <props>
-        <prop actor="props/special/common/waypoint_flag_0ad.xml" attachpoint="garrisoned"/>
+        <prop actor="props/special/common/garrison_flag_iber.xml" attachpoint="garrisoned"/>
       </props>
     </variant>
   </group>

binaries/data/mods/public/art/actors/structures/persians/sb1_new.xml

@@ -10,5 +10,13 @@
       <texture>structural/pers_struct.dds</texture>
     </variant>
   </group>
+  <group>
+    <variant frequency="100" name="Idle"/>
+    <variant name="garrisoned">
+      <props>
+        <prop actor="props/special/common/garrison_flag_persians.xml" attachpoint="garrisoned"/>
+      </props>
+    </variant>
+  </group>
   <material>player_trans.xml</material>
 </actor>

binaries/data/mods/public/art/actors/structures/persians/temple.xml

@@ -1,8 +1,6 @@
-<?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/pers_temple_1.dae</mesh>
@@ -12,7 +10,13 @@
       <texture>structural/pers_struct.dds</texture>
     </variant>
   </group>
-
+  <group>
+    <variant frequency="100" name="Idle"/>
+    <variant name="garrisoned">
+      <props>
+        <prop actor="props/special/common/garrison_flag_persians.xml" attachpoint="garrisoned"/>
+      </props>
+    </variant>
+  </group>
   <material>player_trans.xml</material>
-
 </actor>

binaries/data/mods/public/simulation/templates/structures/celt_sb1.xml

@@ -14,6 +14,7 @@
     <Circle radius="9.0"/>
     <Height>6.0</Height>
   </Footprint>
+  <GarrisonHolder disable=""/>
   <Identity>
     <Civ>celt</Civ>
     <GenericName>Rotary Mill</GenericName>
@@ -25,6 +26,7 @@
   <Obstruction>
     <Static width="16.0" depth="16.0"/>
   </Obstruction>
+  <RallyPoint disable=""/>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_ffactri.xml</select>

binaries/data/mods/public/simulation/templates/structures/iber_sb1.xml

@@ -13,6 +13,7 @@
     <Square width="10.0" depth="10.0"/>
     <Height>8.0</Height>
   </Footprint>
+  <GarrisonHolder disable=""/>
   <Health>
     <Max>1200</Max>
   </Health>
@@ -26,6 +27,7 @@
   <Obstruction>
     <Static width="10.0" depth="10.0"/>
   </Obstruction>
+  <RallyPoint disable=""/>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_iber_monument.xml</select>

binaries/data/mods/public/simulation/templates/structures/pers_apadana.xml

@@ -10,7 +10,7 @@
     </Resources>
   </Cost>
   <Footprint>
-    <Square width="28.0" depth="32.0"/>
+    <Square width="32.0" depth="32.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Health>
@@ -25,7 +25,7 @@
 	<Tooltip>"Satrapy Tribute": Gain a trickle of Food, Wood, Stone, and Metal resources. Train Persian Heroes and their "Immortals" bodyguards. Build Limit: 1.</Tooltip>
   </Identity>
   <Obstruction>
-    <Static width="28.0" depth="32.0"/>
+    <Static width="30.0" depth="30.0"/>
   </Obstruction>
   <TerritoryInfluence>
     <Root>true</Root>

binaries/data/mods/public/simulation/templates/template_structure_special.xml

@@ -16,6 +16,12 @@
     <Square width="24.0" depth="24.0"/>
     <Height>8.0</Height>
   </Footprint>
+  <GarrisonHolder>
+    <Max>5</Max>
+	<EjectHealth>0.1</EjectHealth>
+	<List datatype="tokens">Support Infantry Cavalry</List>
+	<BuffHeal>1</BuffHeal>
+  </GarrisonHolder>
   <Health>
     <Max>2000</Max>
   </Health>