From 75136d84d2a1cda4f1e1c40c1bc7762a2de1ca36 Mon Sep 17 00:00:00 2001
From: EmjeR <matthijs@wildfiregames.com>
Date: Mon, 3 Jan 2011 03:10:29 +0000
Subject: [PATCH] This was SVN commit r8853.

---
 .../structures/iberians/fishship_sail.xml     | 11 ++++++++++
 .../props/structures/iberians/merch_sail.xml  | 11 ++++++++++
 .../structures/iberians/fishing_ship.xml      | 22 +++++++++++++++++++
 .../actors/structures/iberians/merchant.xml   | 22 +++++++++++++++++++
 .../templates/units/iber_ship_fishing.xml     |  2 +-
 .../templates/units/iber_ship_merchant.xml    | 19 ++++++++++++++++
 .../art/meshes/props/iber_fishship_sail.dae   |  3 +++
 .../art/meshes/props/iber_merch_sail.dae      |  3 +++
 .../art/meshes/structural/iber_fishship.dae   |  3 +++
 .../art/meshes/structural/iber_merch.dae      |  3 +++
 .../art/textures/skins/props/iber_sail_b.dds  |  3 +++
 .../art/textures/skins/props/iber_sail_b.png  |  3 +++
 12 files changed, 104 insertions(+), 1 deletion(-)
 create mode 100644 binaries/data/mods/internal/art/actors/props/structures/iberians/fishship_sail.xml
 create mode 100644 binaries/data/mods/internal/art/actors/props/structures/iberians/merch_sail.xml
 create mode 100644 binaries/data/mods/internal/art/actors/structures/iberians/fishing_ship.xml
 create mode 100644 binaries/data/mods/internal/art/actors/structures/iberians/merchant.xml
 create mode 100644 binaries/data/mods/internal/simulation/templates/units/iber_ship_merchant.xml
 create mode 100644 binaries/data/mods/public/art/meshes/props/iber_fishship_sail.dae
 create mode 100644 binaries/data/mods/public/art/meshes/props/iber_merch_sail.dae
 create mode 100644 binaries/data/mods/public/art/meshes/structural/iber_fishship.dae
 create mode 100644 binaries/data/mods/public/art/meshes/structural/iber_merch.dae
 create mode 100644 binaries/data/mods/public/art/textures/skins/props/iber_sail_b.dds
 create mode 100644 binaries/data/mods/public/art/textures/skins/props/iber_sail_b.png

diff --git a/binaries/data/mods/internal/art/actors/props/structures/iberians/fishship_sail.xml b/binaries/data/mods/internal/art/actors/props/structures/iberians/fishship_sail.xml
new file mode 100644
index 0000000000..1ed2703f0c
--- /dev/null
+++ b/binaries/data/mods/internal/art/actors/props/structures/iberians/fishship_sail.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="mesh">
+      <mesh>props/iber_fishship_sail.dae</mesh>
+      <texture>props/iber_sail_b.dds</texture>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
diff --git a/binaries/data/mods/internal/art/actors/props/structures/iberians/merch_sail.xml b/binaries/data/mods/internal/art/actors/props/structures/iberians/merch_sail.xml
new file mode 100644
index 0000000000..3591c6a91d
--- /dev/null
+++ b/binaries/data/mods/internal/art/actors/props/structures/iberians/merch_sail.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="mesh">
+      <mesh>props/iber_merch_sail.dae</mesh>
+      <texture>props/iber_sail_a.dds</texture>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
diff --git a/binaries/data/mods/internal/art/actors/structures/iberians/fishing_ship.xml b/binaries/data/mods/internal/art/actors/structures/iberians/fishing_ship.xml
new file mode 100644
index 0000000000..5be026b778
--- /dev/null
+++ b/binaries/data/mods/internal/art/actors/structures/iberians/fishing_ship.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>structural/iber_fishship.dae</mesh>
+      <props>
+        <prop actor="props/structures/iberians/fishship_sail.xml" attachpoint="root"/>
+      </props>
+      <texture>structural/iber_ship.dds</texture>
+    </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>
+    </variant>
+  </group>-->
+</actor>
diff --git a/binaries/data/mods/internal/art/actors/structures/iberians/merchant.xml b/binaries/data/mods/internal/art/actors/structures/iberians/merchant.xml
new file mode 100644
index 0000000000..3dd01b506c
--- /dev/null
+++ b/binaries/data/mods/internal/art/actors/structures/iberians/merchant.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>structural/iber_merch.dae</mesh>
+      <props>
+        <prop actor="props/structures/iberians/merch_sail.xml" attachpoint="root"/>
+      </props>
+      <texture>structural/iber_ship.dds</texture>
+    </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>
+    </variant>
+  </group>-->
+</actor>
diff --git a/binaries/data/mods/internal/simulation/templates/units/iber_ship_fishing.xml b/binaries/data/mods/internal/simulation/templates/units/iber_ship_fishing.xml
index f09f5fa085..f6cff92ff4 100644
--- a/binaries/data/mods/internal/simulation/templates/units/iber_ship_fishing.xml
+++ b/binaries/data/mods/internal/simulation/templates/units/iber_ship_fishing.xml
@@ -7,6 +7,6 @@
     <Icon>units/celt_ship_fishing.png</Icon>
   </Identity>
   <VisualActor>
-    <Actor>structures/iberians/fishing_boat.xml</Actor>
+    <Actor>structures/iberians/fishing_ship.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/internal/simulation/templates/units/iber_ship_merchant.xml b/binaries/data/mods/internal/simulation/templates/units/iber_ship_merchant.xml
new file mode 100644
index 0000000000..c0d1f99b81
--- /dev/null
+++ b/binaries/data/mods/internal/simulation/templates/units/iber_ship_merchant.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_ship_merchant">
+  <Identity>
+    <Civ>iber</Civ>
+    <SpecificName>Emporiko Plio</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>
diff --git a/binaries/data/mods/public/art/meshes/props/iber_fishship_sail.dae b/binaries/data/mods/public/art/meshes/props/iber_fishship_sail.dae
new file mode 100644
index 0000000000..c7cda02add
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/props/iber_fishship_sail.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:10a58dce4768cf306b7d33ae21a25559f6cdcfe0388f2532c8cd23f39513a438
+size 38016
diff --git a/binaries/data/mods/public/art/meshes/props/iber_merch_sail.dae b/binaries/data/mods/public/art/meshes/props/iber_merch_sail.dae
new file mode 100644
index 0000000000..4c090e33f2
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/props/iber_merch_sail.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0a8d142a36a38c54c3c73385310a91b5d3938026cd0e6aa127b1c1eaa8e410a6
+size 43710
diff --git a/binaries/data/mods/public/art/meshes/structural/iber_fishship.dae b/binaries/data/mods/public/art/meshes/structural/iber_fishship.dae
new file mode 100644
index 0000000000..a2124fc055
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/structural/iber_fishship.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8873d68af595845118b6e41f24974d25eda143cf93e45b27e3b70bdbde6eda50
+size 73652
diff --git a/binaries/data/mods/public/art/meshes/structural/iber_merch.dae b/binaries/data/mods/public/art/meshes/structural/iber_merch.dae
new file mode 100644
index 0000000000..a45f73a6af
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/structural/iber_merch.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4873e5f3c7ec282001442c22dbfe8dcf201d3705ed0e458b871c002e2afc647e
+size 54710
diff --git a/binaries/data/mods/public/art/textures/skins/props/iber_sail_b.dds b/binaries/data/mods/public/art/textures/skins/props/iber_sail_b.dds
new file mode 100644
index 0000000000..7198df570c
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/props/iber_sail_b.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f52da7c6337ae35395b1dd06c7e11eb1cc845eac0ec255fb1879145986fa4b49
+size 349680
diff --git a/binaries/data/mods/public/art/textures/skins/props/iber_sail_b.png b/binaries/data/mods/public/art/textures/skins/props/iber_sail_b.png
new file mode 100644
index 0000000000..3625f13bb2
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/props/iber_sail_b.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2a18c1cc3ff3a79ae6ffb79029f68085eb1c8adab33144278ef7032f7b73fcb5
+size 439379