From edb063dbc87a43623db690db742eed9b543605cb Mon Sep 17 00:00:00 2001
From: Mythos_Ruler <michael@wildfiregames.com>
Date: Mon, 18 Jul 2011 03:48:24 +0000
Subject: [PATCH] Temporary fishing boat (Greek) and merchant ship (Iberian)
 for Carthage.

Touched up maps.

This was SVN commit r9868.
---
 .../public/maps/scenarios/Gallic Fields.xml   |  4 ++--
 .../maps/scenarios/Mediterranean_Cove.xml     |  4 ++--
 .../public/maps/scenarios/Peloponnese.xml     |  4 ++--
 .../templates/units/cart_ship_fishing.xml     | 12 ++++++++++++
 .../templates/units/cart_ship_merchant.xml    | 19 +++++++++++++++++++
 5 files changed, 37 insertions(+), 6 deletions(-)
 create mode 100644 binaries/data/mods/public/simulation/templates/units/cart_ship_fishing.xml
 create mode 100644 binaries/data/mods/public/simulation/templates/units/cart_ship_merchant.xml

diff --git a/binaries/data/mods/public/maps/scenarios/Gallic Fields.xml b/binaries/data/mods/public/maps/scenarios/Gallic Fields.xml
index e2348e9f16..64b1d50475 100644
--- a/binaries/data/mods/public/maps/scenarios/Gallic Fields.xml	
+++ b/binaries/data/mods/public/maps/scenarios/Gallic Fields.xml	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:42221255a0a5585929e3162d91ff0ba813eea51bb1289045ef51944fdc3cd396
-size 494702
+oid sha256:4d8ad6ff7cf7e1c45e403340ccefd1933e8aa6e6d76b124e3e900ba01881246d
+size 494528
diff --git a/binaries/data/mods/public/maps/scenarios/Mediterranean_Cove.xml b/binaries/data/mods/public/maps/scenarios/Mediterranean_Cove.xml
index 8d551fb240..4380e11964 100644
--- a/binaries/data/mods/public/maps/scenarios/Mediterranean_Cove.xml
+++ b/binaries/data/mods/public/maps/scenarios/Mediterranean_Cove.xml
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aa24a37c678f042c9d8bfe534f33f36eea710f409f8b5e5b2fac6430ed5c44f6
-size 412768
+oid sha256:dc46b312e3f6b1cf7a7b220f30c12ddabf4f86744214c530ff3b8519ad7c5f0d
+size 420198
diff --git a/binaries/data/mods/public/maps/scenarios/Peloponnese.xml b/binaries/data/mods/public/maps/scenarios/Peloponnese.xml
index f5cce341fc..bf07e639be 100644
--- a/binaries/data/mods/public/maps/scenarios/Peloponnese.xml
+++ b/binaries/data/mods/public/maps/scenarios/Peloponnese.xml
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f34c134cd8dccb42e913c726aa5c844a4c560d77c324e4bd9707cf21754bac76
-size 1042979
+oid sha256:03ecd67b5b105962dd43590ddb841001b04f340c4ca514ea33fcdfa7075174d2
+size 1065683
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_ship_fishing.xml b/binaries/data/mods/public/simulation/templates/units/cart_ship_fishing.xml
new file mode 100644
index 0000000000..b4010e1626
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/cart_ship_fishing.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_ship_fishing">
+  <Identity>
+    <Civ>cart</Civ>
+    <SpecificName>Fishing Boat</SpecificName>
+    <History>Need History</History>
+    <Icon>units/hele_ship_fishing.png</Icon>
+  </Identity>
+  <VisualActor>
+    <Actor>structures/hellenes/fishing_boat.xml</Actor>
+  </VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_ship_merchant.xml b/binaries/data/mods/public/simulation/templates/units/cart_ship_merchant.xml
new file mode 100644
index 0000000000..4900594728
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/cart_ship_merchant.xml
@@ -0,0 +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>