From 993dd3a958f3993870aac97a15a4981dd4b762d0 Mon Sep 17 00:00:00 2001
From: Stan <stan@wildfiregames.com>
Date: Sun, 26 Jan 2020 16:56:39 +0000
Subject: [PATCH] Update persian merchant ship mesh to reduce the amount of
 transparency.

This was SVN commit r23440.
---
 .../props/structures/persians/merchant_rail.xml | 17 +++++++++++++++++
 .../art/actors/structures/persians/merchant.xml |  7 +++++--
 .../public/art/meshes/structural/pers_merc.dae  |  4 ++--
 .../art/meshes/structural/pers_merc_rail.dae    |  3 +++
 4 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 binaries/data/mods/public/art/actors/props/structures/persians/merchant_rail.xml
 create mode 100644 binaries/data/mods/public/art/meshes/structural/pers_merc_rail.dae

diff --git a/binaries/data/mods/public/art/actors/props/structures/persians/merchant_rail.xml b/binaries/data/mods/public/art/actors/props/structures/persians/merchant_rail.xml
new file mode 100644
index 0000000000..4a2bc17967
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/structures/persians/merchant_rail.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <float/>
+  <group>
+    <variant frequency="100" name="Base">
+      <mesh>structural/pers_merc_rail.dae.dae</mesh>
+      <props>
+        <prop actor="props/structures/persians/merchant_sail.xml" attachpoint="root"/>
+      </props>
+      <textures>
+        <texture file="structural/pers_merc.dds" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/persians/merchant.xml b/binaries/data/mods/public/art/actors/structures/persians/merchant.xml
index 6ee0824693..fd1cfcfe76 100644
--- a/binaries/data/mods/public/art/actors/structures/persians/merchant.xml
+++ b/binaries/data/mods/public/art/actors/structures/persians/merchant.xml
@@ -7,9 +7,12 @@
       <mesh>structural/pers_merc.dae</mesh>
       <props>
         <prop actor="props/structures/persians/merchant_sail.xml" attachpoint="root"/>
+        <prop actor="props/structures/persians/merchant_rail.xml" attachpoint="root"/>
       </props>
-      <textures><texture file="structural/pers_merc.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="structural/pers_merc.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
-  <material>basic_trans.xml</material>
+  <material>default.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_merc.dae b/binaries/data/mods/public/art/meshes/structural/pers_merc.dae
index d4203a4941..1c5c113161 100644
--- a/binaries/data/mods/public/art/meshes/structural/pers_merc.dae
+++ b/binaries/data/mods/public/art/meshes/structural/pers_merc.dae
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:04d61e4ede2f439d01002245753d0e7c8454693b8d1bca1c8d981f084754a9b0
-size 176628
+oid sha256:f13df7c83c36fcac52d03ab18a7644b1271161450b6836b6750b37e4c9a97942
+size 169077
diff --git a/binaries/data/mods/public/art/meshes/structural/pers_merc_rail.dae b/binaries/data/mods/public/art/meshes/structural/pers_merc_rail.dae
new file mode 100644
index 0000000000..18a8ce85e4
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/structural/pers_merc_rail.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a10cefb6946e9662bd4b494b67e36e1eb236e8971ec2c62ffa064303f3d33d47
+size 12220