From 69daefeb2bd6c2f66c0a6dbe4151a8f827c7345a Mon Sep 17 00:00:00 2001
From: wowgetoffyourcellphone <wowgetoffyourcellphone@wildfiregames.com>
Date: Sun, 6 Mar 2022 07:17:32 +0000
Subject: [PATCH] [art] Move the prop points for the Roman tents to fit the
 newer Roman Scutum models.

This was SVN commit r26562.
---
 .../props/structures/romans/rome_tent.xml     | 48 ++++++++++++++++---
 .../public/art/meshes/props/rome_tent_a.dae   |  4 +-
 .../public/art/meshes/props/rome_tent_b.dae   |  4 +-
 .../public/art/meshes/props/rome_tent_c.dae   |  4 +-
 4 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/binaries/data/mods/public/art/actors/props/structures/romans/rome_tent.xml b/binaries/data/mods/public/art/actors/props/structures/romans/rome_tent.xml
index c5345519a7..150a607b4c 100644
--- a/binaries/data/mods/public/art/actors/props/structures/romans/rome_tent.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/romans/rome_tent.xml
@@ -6,32 +6,68 @@
       <mesh>props/rome_tent_a.dae</mesh>
       <props>
         <prop actor="props/structures/romans/rome_tent_a_props.xml" attachpoint="root"/>
-        <prop actor="props/units/shields/rome_scutum_a.xml" attachpoint="shieldtower"/>
+        <prop actor="props/units/shields/scutum_rome_isp_14.xml" attachpoint="shieldtower"/>
         <prop actor="props/units/shields/rome_parma_a.xml" attachpoint="shieldround"/>
         <prop actor="props/structures/romans/rome_tent_a_flaps.xml" attachpoint="root"/>
       </props>
-      <textures><texture file="props/rome_sb_tent.png" name="baseTex"/></textures>
     </variant>
     <variant frequency="2" name="Tent B">
       <mesh>props/rome_tent_b.dae</mesh>
       <props>
         <prop actor="props/structures/romans/rome_tent_b_props.xml" attachpoint="root"/>
-        <prop actor="props/units/shields/rome_scutum_e.xml" attachpoint="shieldtower"/>
+        <prop actor="props/units/shields/scutum_rome_isp_06.xml" attachpoint="shieldtower"/>
         <prop actor="props/units/shields/rome_parma_b.xml" attachpoint="shieldround"/>
         <prop actor="props/structures/romans/rome_tent_b_flaps.xml" attachpoint="root"/>
       </props>
-      <textures><texture file="props/rome_sb_tent.png" name="baseTex"/></textures>
     </variant>
     <variant frequency="1" name="Tent C (fire)">
       <mesh>props/rome_tent_c.dae</mesh>
       <props>
         <prop actor="props/structures/romans/rome_tent_c_props.xml" attachpoint="root"/>
         <prop actor="props/structures/romans/rome_tent_c_flaps.xml" attachpoint="root"/>
-        <prop actor="props/units/shields/rome_scutum_su.xml" attachpoint="shieldtower"/>
+        <prop actor="props/units/shields/scutum_rome_isw_05.xml" attachpoint="shieldtower"/>
         <prop actor="props/units/shields/rome_parma_e.xml" attachpoint="shieldround"/>
         <prop actor="props/special/eyecandy/campfire_prop.xml" attachpoint="fire"/>
       </props>
-      <textures><texture file="props/rome_sb_tent.png" name="baseTex"/></textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="Texture">
+      <textures>
+        <texture file="props/rome_sb_tent.png" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="2" name="Shield 14">
+      <props>
+        <prop actor="props/units/shields/scutum_rome_isp_14.xml" attachpoint="shieldtower"/>
+      </props>
+    </variant>
+    <variant frequency="2" name="Shield 06">
+      <props>
+        <prop actor="props/units/shields/scutum_rome_isp_06.xml" attachpoint="shieldtower"/>
+      </props>
+    </variant>
+    <variant frequency="1" name="Shield 05">
+      <props>
+        <prop actor="props/units/shields/scutum_rome_isw_05.xml" attachpoint="shieldtower"/>
+      </props>
+    </variant>
+    <variant frequency="2" name="Shield 10">
+      <props>
+        <prop actor="props/units/shields/scutum_rome_isp_10.xml" attachpoint="shieldtower"/>
+      </props>
+    </variant>
+    <variant frequency="2" name="Shield 12">
+      <props>
+        <prop actor="props/units/shields/scutum_rome_isw_12.xml" attachpoint="shieldtower"/>
+      </props>
+    </variant>
+    <variant frequency="1" name="Shield 02">
+      <props>
+        <prop actor="props/units/shields/scutum_rome_isw_02.xml" attachpoint="shieldtower"/>
+      </props>
     </variant>
   </group>
   <material>player_trans.xml</material>
diff --git a/binaries/data/mods/public/art/meshes/props/rome_tent_a.dae b/binaries/data/mods/public/art/meshes/props/rome_tent_a.dae
index 03f70c68d1..3fd7817315 100644
--- a/binaries/data/mods/public/art/meshes/props/rome_tent_a.dae
+++ b/binaries/data/mods/public/art/meshes/props/rome_tent_a.dae
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:583a25b4bfb19140723bba09d69b4edb7f1104b37772c0d2a2dc19cfbc336d85
-size 225789
+oid sha256:6df2523559da9a44192c40fe30b8257ed1ea0192f38585d91accd93a2e9f9cc8
+size 69346
diff --git a/binaries/data/mods/public/art/meshes/props/rome_tent_b.dae b/binaries/data/mods/public/art/meshes/props/rome_tent_b.dae
index 72d4cd63d8..48a867a34a 100644
--- a/binaries/data/mods/public/art/meshes/props/rome_tent_b.dae
+++ b/binaries/data/mods/public/art/meshes/props/rome_tent_b.dae
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d030a00180c5d352f179310236eedd9c3860b5ea9433ae8d2413243ccea8c379
-size 114729
+oid sha256:076aa80cb73213819b450716188776c8e9de20b8d0a833c3017a38c4f847a00f
+size 71143
diff --git a/binaries/data/mods/public/art/meshes/props/rome_tent_c.dae b/binaries/data/mods/public/art/meshes/props/rome_tent_c.dae
index 2dfcfa5fc0..5f5012337a 100644
--- a/binaries/data/mods/public/art/meshes/props/rome_tent_c.dae
+++ b/binaries/data/mods/public/art/meshes/props/rome_tent_c.dae
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aae50b772fc4eb2fbb359569f2ad8cf4897a90990df32560513dff060815d233
-size 93957
+oid sha256:3e7aa9798154686e358da3d4ebce32dde113767f73762b8f3f121517eff52f95
+size 50668