From 204d6ac444c917bcc4022bf9d3cbb8b7bfa877cb Mon Sep 17 00:00:00 2001
From: wowgetoffyourcellphone
 <wowgetoffyourcellphone@3db68df2-c116-0410-a063-a993310a9797>
Date: Sat, 7 Jan 2023 01:33:50 +0000
Subject: [PATCH] git-svn-id:
 https://svn.wildfiregames.com/public/ps/trunk@27381
 3db68df2-c116-0410-a063-a993310a9797

---
 .../structures/macedonians/trireme_shields.xml     | 12 ++--
 .../props/structures/seleucids/quinq_sail.xml      | 14 +----
 .../props/structures/seleucids/quinq_shields.xml   | 15 +++++
 .../{quinq_sail.xml => trireme_main_sail.xml}      | 68 ++++++++++------------
 .../props/structures/seleucids/trireme_shields.xml | 16 +++++
 5 files changed, 71 insertions(+), 54 deletions(-)
 create mode 100644 binaries/data/mods/public/art/actors/props/structures/seleucids/quinq_shields.xml
 copy binaries/data/mods/public/art/actors/props/structures/seleucids/{quinq_sail.xml => trireme_main_sail.xml} (74%)
 create mode 100644 binaries/data/mods/public/art/actors/props/structures/seleucids/trireme_shields.xml

diff --git a/binaries/data/mods/public/art/actors/props/structures/macedonians/trireme_shields.xml b/binaries/data/mods/public/art/actors/props/structures/macedonians/trireme_shields.xml
index ead5ad2730..a4ab25b556 100644
--- a/binaries/data/mods/public/art/actors/props/structures/macedonians/trireme_shields.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/macedonians/trireme_shields.xml
@@ -5,12 +5,12 @@
   <group>
     <variant name="Trireme Shields">
       <mesh>props/mace_trireme_shields.dae</mesh>
-      <textures>
-        <texture file="props/athen_prop_shields.png" name="baseTex"/>
-        <texture file="default_norm.png" name="normTex"/>
-        <texture file="null_black.dds" name="specTex"/>
-      </textures>
+	    <textures>
+	  	  <texture file="props/mace_prop_shields.png" name="baseTex"/>
+	  	  <texture file="props/mace_prop_shields_norm.png" name="normTex"/>
+	  	  <texture file="props/mace_prop_shields_spec.png" name="specTex"/>
+	    </textures>
     </variant>
   </group>
-  <material>player_trans_norm_spec.xml</material>
+  <material>player_trans_parallax_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/seleucids/quinq_sail.xml b/binaries/data/mods/public/art/actors/props/structures/seleucids/quinq_sail.xml
index 3c23253d7e..b8f9fc00e5 100644
--- a/binaries/data/mods/public/art/actors/props/structures/seleucids/quinq_sail.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/seleucids/quinq_sail.xml
@@ -13,22 +13,12 @@
   <group>
     <variant frequency="1" name="anchor wreath">
       <textures>
-        <texture file="props/sele_sail_01.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="anchor 1">
-      <textures>
         <texture file="props/sele_sail_02.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant frequency="1" name="apollo lyre">
-      <textures>
-        <texture file="props/sele_sail_03.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="asian elephant">
+    <variant frequency="1" name="horned horse">
       <textures>
-        <texture file="props/sele_sail_04.png" name="baseTex"/>
+        <texture file="props/sele_sail_05.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/props/structures/seleucids/quinq_shields.xml b/binaries/data/mods/public/art/actors/props/structures/seleucids/quinq_shields.xml
new file mode 100644
index 0000000000..2db4cac90f
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/structures/seleucids/quinq_shields.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="Quinq Shields">
+      <mesh>structural/ptol_ship_quinquereme_shields.dae</mesh>
+      <textures>
+       <texture file="props/shield/sele_round_a_bronze_player.png" name="baseTex"/>
+       <texture file="props/shield/sele_round_a_norm.png" name="normTex"/>
+       <texture file="props/shield/sele_round_a_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>player_trans_norm_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/seleucids/quinq_sail.xml b/binaries/data/mods/public/art/actors/props/structures/seleucids/trireme_main_sail.xml
similarity index 74%
copy from binaries/data/mods/public/art/actors/props/structures/seleucids/quinq_sail.xml
copy to binaries/data/mods/public/art/actors/props/structures/seleucids/trireme_main_sail.xml
index 3c23253d7e..b42c24121c 100644
--- a/binaries/data/mods/public/art/actors/props/structures/seleucids/quinq_sail.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/seleucids/trireme_main_sail.xml
@@ -1,36 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="Sele Quinquereme Sail">
-      <mesh>structural/ptol_ship_quinquereme_sails.dae</mesh>
-      <textures>
-       <texture file="props/ptol_sail_norm.png" name="normTex"/>
-       <texture file="props/sail_spec_1.png" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="anchor wreath">
-      <textures>
-        <texture file="props/sele_sail_01.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="anchor 1">
-      <textures>
-        <texture file="props/sele_sail_02.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="apollo lyre">
-      <textures>
-        <texture file="props/sele_sail_03.png" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="asian elephant">
-      <textures>
-        <texture file="props/sele_sail_04.png" name="baseTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>player_trans_parallax_spec.xml</material>
-</actor>
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <float/>
+  <group>
+    <variant file="others/ships/main_sail_base.xml" name="Trireme Sail">
+      <mesh>props/mace_trireme_main_sail.dae</mesh>
+      <textures>
+       <texture file="props/ptol_sail_norm.png" name="normTex"/>
+       <texture file="props/sail_spec_1.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="anchor 1">
+      <textures>
+        <texture file="props/sele_sail_01.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="apollo lyre">
+      <textures>
+        <texture file="props/sele_sail_03.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="asian elephant">
+      <textures>
+        <texture file="props/sele_sail_04.png" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>player_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/seleucids/trireme_shields.xml b/binaries/data/mods/public/art/actors/props/structures/seleucids/trireme_shields.xml
new file mode 100644
index 0000000000..a4ab25b556
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/structures/seleucids/trireme_shields.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <float/>
+  <group>
+    <variant name="Trireme Shields">
+      <mesh>props/mace_trireme_shields.dae</mesh>
+	    <textures>
+	  	  <texture file="props/mace_prop_shields.png" name="baseTex"/>
+	  	  <texture file="props/mace_prop_shields_norm.png" name="normTex"/>
+	  	  <texture file="props/mace_prop_shields_spec.png" name="specTex"/>
+	    </textures>
+    </variant>
+  </group>
+  <material>player_trans_parallax_spec.xml</material>
+</actor>
-- 
2.11.4.GIT