#New Carthaginian Merchant Ship

This was SVN commit r9927.

binaries/data/mods/public/art/actors/props/structures/carthaginians/merchant_ship_sail.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <float/>
+  <group>
+    <variant>
+      <mesh>props/kart_merchant_ship_sail.dae</mesh>
+      <texture>props/kart_merchant_sail_a.png</texture>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>

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

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <float/>
+  <group>
+    <variant>
+      <mesh>structural/kart_merchant_ship.dae</mesh>
+      <props>
+        <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
+        <prop actor="props/structures/carthaginians/merchant_ship_sail.xml" attachpoint="root"/>
+      </props>
+      <texture>structural/kart_merchant_ship.png</texture>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>

binaries/data/mods/public/simulation/templates/units/cart_ship_merchant.xml

@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_merchant">
-  <Identity>
-    <Civ>cart</Civ>
-    <SpecificName>Merchant Ship</SpecificName>
-    <History>Need History</History>
-    <Icon>units/iber_ship_merchant.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/iberians/merchant.xml</Actor>
-  </VisualActor>
-  <Footprint replace="">
-    <Square width="8.0" depth="24.0"/>
-    <Height>8.0</Height>
-  </Footprint>
-  <Obstruction>
-    <Unit radius="6.0"/>
-  </Obstruction>
-</Entity>
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_ship_merchant">
+  <Identity>
+    <Civ>cart</Civ>
+    <SpecificName>Merchant Ship</SpecificName>
+    <History>Need History</History>
+    <Icon>units/iber_ship_merchant.png</Icon>
+  </Identity>
+  <VisualActor>
+    <Actor>structures/carthaginians/merchant_ship.xml</Actor>
+  </VisualActor>
+  <Footprint replace="">
+    <Square width="8.0" depth="24.0"/>
+    <Height>8.0</Height>
+  </Footprint>
+  <Obstruction>
+    <Unit radius="6.0"/>
+  </Obstruction>
+</Entity>