Add garrison flags to all the merchant ships.

Refs: #4581

This was SVN commit r23792.

binaries/data/mods/public/art/actors/structures/carthaginians/merchant_ship.xml

@@ -9,8 +9,18 @@
         <prop actor="props/structures/carthaginians/merchant_ship_sail.xml" attachpoint="root"/>
         <prop actor="props/structures/carthaginians/merchantship_cargo.xml" attachpoint="root"/>
       </props>
-      <textures><texture file="structural/kart_merchant_ship.png" name="baseTex"/></textures>
+      <textures>
+        <texture file="structural/kart_merchant_ship.png" name="baseTex"/>
+      </textures>
     </variant>
   </group>
+  <group>
+    <variant frequency="0" name="garrisoned">
+      <props>
+        <prop actor="props/special/common/garrison_flag_kart.xml" attachpoint="garrisoned"/>
+      </props>
+    </variant>
+    <variant frequency="1" name="ungarrisoned"/>
+  </group>
   <material>player_trans.xml</material>
 </actor>

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

@@ -12,6 +12,14 @@
         <texture file="structural/celt_ship.png" name="baseTex"/>
       </textures>
     </variant>
+  </group>
+    <group>
+    <variant frequency="0" name="garrisoned">
+      <props>
+        <prop actor="props/special/common/garrison_flag_celt.xml" attachpoint="garrisoned"/>
+      </props>
+    </variant>
+    <variant frequency="1" name="ungarrisoned"/>
   </group>
   <group>
     <variant frequency="1" name="ship mesh a">

binaries/data/mods/public/art/actors/structures/hellenes/merchant.xml

@@ -6,17 +6,22 @@
       <mesh>structural/hele_kyrenia.dae</mesh>
       <props>
         <prop actor="props/structures/hellenes/merchantship_sail.xml" attachpoint="root"/>
-      </props>
-      <textures><texture file="structural/kyrenia.dds" name="baseTex"/></textures>
-    </variant>
-  </group>
-  <group>
-    <variant name="cargo">
-      <props>
         <prop actor="props/structures/hellenes/merchantship_cargo.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/merchantship_shield.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/merchantship_sail.xml" attachpoint="root"/>
       </props>
+      <textures>
+        <texture file="structural/kyrenia.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
+  <group>
+    <variant frequency="0" name="garrisoned">
+      <props>
+        <prop actor="props/special/common/garrison_flag_hele.xml" attachpoint="garrisoned"/>
+      </props>
+    </variant>
+    <variant frequency="1" name="ungarrisoned"/>
+  </group>
+  <material>default.xml</material>
 </actor>

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

@@ -7,8 +7,18 @@
       <props>
         <prop actor="props/structures/iberians/merch_sail.xml" attachpoint="root"/>
       </props>
-      <textures><texture file="structural/iber_ship.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="structural/iber_ship.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
+  <group>
+    <variant frequency="0" name="garrisoned">
+      <props>
+        <prop actor="props/special/common/garrison_flag_iber.xml" attachpoint="garrisoned"/>
+      </props>
+    </variant>
+    <variant frequency="1" name="ungarrisoned"/>
+  </group>
   <material>player_trans.xml</material>
 </actor>

binaries/data/mods/public/art/actors/structures/mauryas/merchant_ship.xml

@@ -1,27 +1,36 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="Mauryan Merchant">
-      <animations>
-      </animations>
-      <mesh>structural/maur_merch_ship.dae</mesh>
-      <props>
-        <prop actor="props/special/eyecandy/barrel_a.xml" attachpoint="wrld_barrel_a1"/>
-<prop actor="props/special/eyecandy/barrel_a.xml" attachpoint="wrld_barrel_a2"/>
-<prop actor="props/special/eyecandy/barrel_a.xml" attachpoint="wrld_barrel_a3"/>
-<prop actor="props/special/eyecandy/barrel_a.xml" attachpoint="wrld_barrel_a4"/>
-<prop actor="props/special/eyecandy/barrel_a.xml" attachpoint="wrld_barrel_a5"/>
-<prop actor="props/special/eyecandy/barrel_a.xml" attachpoint="wrld_barrel_a6"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="Blue Eye">
-      <textures>
-	  <texture file="structural/maur_merch_ship.png" name="baseTex"/>
-	 </textures>
-    </variant>
-  </group>
-  <material>player_trans.xml</material>
-</actor>
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="Mauryan Merchant">
+      <animations>
+      </animations>
+      <mesh>structural/maur_merch_ship.dae</mesh>
+      <props>
+        <prop actor="props/special/eyecandy/barrel_a.xml" attachpoint="wrld_barrel_a1"/>
+        <prop actor="props/special/eyecandy/barrel_a.xml" attachpoint="wrld_barrel_a2"/>
+        <prop actor="props/special/eyecandy/barrel_a.xml" attachpoint="wrld_barrel_a3"/>
+        <prop actor="props/special/eyecandy/barrel_a.xml" attachpoint="wrld_barrel_a4"/>
+        <prop actor="props/special/eyecandy/barrel_a.xml" attachpoint="wrld_barrel_a5"/>
+        <prop actor="props/special/eyecandy/barrel_a.xml" attachpoint="wrld_barrel_a6"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="Blue Eye">
+      <textures>
+        <texture file="structural/maur_merch_ship.png" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="0" name="garrisoned">
+      <props>
+        <prop actor="props/special/common/garrison_flag_maur.xml" attachpoint="garrisoned_01"/>
+        <prop actor="props/special/common/garrison_flag_maur.xml" attachpoint="garrisoned_02"/>
+      </props>
+    </variant>
+    <variant frequency="1" name="ungarrisoned"/>
+  </group>
+  <material>player_trans.xml</material>
+</actor>

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

@@ -14,5 +14,13 @@
       </textures>
     </variant>
   </group>
+  <group>
+    <variant frequency="0" name="garrisoned">
+      <props>
+        <prop actor="props/special/common/garrison_flag_persians.xml" attachpoint="garrisoned"/>
+      </props>
+    </variant>
+    <variant frequency="1" name="ungarrisoned"/>
+  </group>
   <material>default.xml</material>
 </actor>

binaries/data/mods/public/art/actors/structures/ptolemies/merchant_ship.xml

@@ -11,10 +11,18 @@
       </props>
       <textures>
         <texture file="structural/ptol_merch_ship.png" name="baseTex"/>
-       <texture file="structural/ptol_merch_ship_norm.png" name="normTex"/>
-       <texture file="structural/ptol_merch_ship_spec.png" name="specTex"/>
+        <texture file="structural/ptol_merch_ship_norm.png" name="normTex"/>
+        <texture file="structural/ptol_merch_ship_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
+  <group>
+    <variant frequency="0" name="garrisoned">
+      <props>
+        <prop actor="props/special/common/garrison_flag_ptol.xml" attachpoint="garrisoned"/>
+      </props>
+    </variant>
+    <variant frequency="1" name="ungarrisoned"/>
+  </group>
   <material>player_trans_parallax_spec.xml</material>
 </actor>

binaries/data/mods/public/art/actors/structures/romans/merchantman.xml

@@ -8,7 +8,18 @@
         <prop actor="props/structures/romans/merchant_shrouds.xml" attachpoint="root"/>
         <prop actor="props/structures/romans/merchant_sail.xml" attachpoint="root"/>
       </props>
-      <textures><texture file="structural/rome_merch_ship.png" name="baseTex"/></textures>
+      <textures>
+        <texture file="structural/rome_merch_ship.png" name="baseTex"/>
+      </textures>
     </variant>
   </group>
+  <group>
+    <variant frequency="0" name="garrisoned">
+      <props>
+        <prop actor="props/special/common/garrison_flag_rome.xml" attachpoint="garrisoned"/>
+      </props>
+    </variant>
+    <variant frequency="1" name="ungarrisoned"/>
+  </group>
+  <material>default.xml</material>
 </actor>