From 5ecacc60f01aac074c72aef49d0ed25d176b210b Mon Sep 17 00:00:00 2001
From: Stan <stan@wildfiregames.com>
Date: Fri, 31 May 2019 13:21:58 +0000
Subject: [PATCH] Fix the smoothing group issue reported by @vladislavbelov on
 the chat today, that is made more visible by
 https://code.wildfiregames.com/D1925.

- Rename civil_centre to civic_center
- Rename the shield prop object to a more explicit name.
- The template and the rubble template should be renamed in another
commit to make sure that do not affect the AI.

This was SVN commit r22327.
---
 .../structures/iberians/civic_center_shields.xml  | 13 +++++++++++++
 .../props/structures/iberians/civil_centre.xml    | 15 ---------------
 .../{civil_centre.xml => civic_center.xml}        | 14 +++++++-------
 ...c_centre.dae => iber_civic_center_shields.dae} |  0
 .../art/meshes/structural/iber_civic_center.dae   |  3 +++
 .../art/meshes/structural/iber_civic_centre.dae   |  3 ---
 ...ber_civic_centre.png => iber_civic_center.png} |  0
 .../templates/structures/iber_civil_centre.xml    |  2 +-
 8 files changed, 24 insertions(+), 26 deletions(-)
 create mode 100644 binaries/data/mods/public/art/actors/props/structures/iberians/civic_center_shields.xml
 delete mode 100644 binaries/data/mods/public/art/actors/props/structures/iberians/civil_centre.xml
 rename binaries/data/mods/public/art/actors/structures/iberians/{civil_centre.xml => civic_center.xml} (75%)
 rename binaries/data/mods/public/art/meshes/props/{iber_civic_centre.dae => iber_civic_center_shields.dae} (100%)
 create mode 100644 binaries/data/mods/public/art/meshes/structural/iber_civic_center.dae
 delete mode 100644 binaries/data/mods/public/art/meshes/structural/iber_civic_centre.dae
 rename binaries/data/mods/public/art/textures/skins/structural/ao/{iber_civic_centre.png => iber_civic_center.png} (100%)

diff --git a/binaries/data/mods/public/art/actors/props/structures/iberians/civic_center_shields.xml b/binaries/data/mods/public/art/actors/props/structures/iberians/civic_center_shields.xml
new file mode 100644
index 0000000000..710eaf89fa
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/structures/iberians/civic_center_shields.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="Civic Center Shields">
+      <mesh>props/iber_civic_center_shields.dae</mesh>
+      <textures>
+        <texture file="props/iber_prop_shields.dds" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/iberians/civil_centre.xml b/binaries/data/mods/public/art/actors/props/structures/iberians/civil_centre.xml
deleted file mode 100644
index 04608158a3..0000000000
--- a/binaries/data/mods/public/art/actors/props/structures/iberians/civil_centre.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="1" name="shields-a">
-      <mesh>props/iber_civic_centre.dae</mesh>
-      <textures><texture file="props/iber_prop_shields.dds" name="baseTex"/></textures>
-    </variant>
-  </group>
-
-  <material>player_trans.xml</material>
-
-</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/iberians/civil_centre.xml b/binaries/data/mods/public/art/actors/structures/iberians/civic_center.xml
similarity index 75%
rename from binaries/data/mods/public/art/actors/structures/iberians/civil_centre.xml
rename to binaries/data/mods/public/art/actors/structures/iberians/civic_center.xml
index d2f36c1977..685172e501 100644
--- a/binaries/data/mods/public/art/actors/structures/iberians/civil_centre.xml
+++ b/binaries/data/mods/public/art/actors/structures/iberians/civic_center.xml
@@ -2,14 +2,14 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="100" name="Base">
+    <variant frequency="100" name="Civic Center">
       <animations>
         <animation event="0.5" load="0.0" name="attack_ranged" speed="100"/>
       </animations>
-      <mesh>structural/iber_civic_centre.dae</mesh>
+      <mesh>structural/iber_civic_center.dae</mesh>
       <props>
-        <prop actor="props/structures/iberians/civil_centre.xml" attachpoint="root"/>
-        <prop actor="props/structures/decals/dirt_6x6.xml" attachpoint="root"/>
+        <prop actor="props/structures/iberians/civic_center_shields.xml" attachpoint="root"/>
+        <prop actor="props/structures/decals/dirt_8x8.xml" attachpoint="root"/>
         <prop actor="props/units/weapons/arrow_front.xml" attachpoint="loaded-projectile"/>
         <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
         <prop actor="particle/smoke_jav.xml" attachpoint="smoke"/>
@@ -18,7 +18,7 @@
         <texture file="structural/iber_struct.dds" name="baseTex"/>
         <texture file="structural/iber_struct_norm.png" name="normTex"/>
         <texture file="structural/iber_struct_spec.png" name="specTex"/>
-        <texture file="structural/ao/iber_civic_centre.png" name="aoTex"/>
+        <texture file="structural/ao/iber_civic_center.png" name="aoTex"/>
       </textures>
     </variant>
   </group>
@@ -38,8 +38,8 @@
         <prop actor="particle/destruction_smoke_large.xml" attachpoint="root"/>
         <prop actor="particle/destruction_dust_large.xml" attachpoint="root"/>
         <prop actor="particle/destruction_dust_large_gray.xml" attachpoint="root"/>
-        <prop actor="props/structures/iberians/civil_centre.xml" attachpoint="root"/>
-        <prop actor="props/structures/decals/dirt_5x5.xml" attachpoint="root"/>
+        <prop actor="props/structures/iberians/civic_center_shields.xml" attachpoint="root"/>
+        <prop actor="props/structures/decals/dirt_8x8.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/meshes/props/iber_civic_centre.dae b/binaries/data/mods/public/art/meshes/props/iber_civic_center_shields.dae
similarity index 100%
rename from binaries/data/mods/public/art/meshes/props/iber_civic_centre.dae
rename to binaries/data/mods/public/art/meshes/props/iber_civic_center_shields.dae
diff --git a/binaries/data/mods/public/art/meshes/structural/iber_civic_center.dae b/binaries/data/mods/public/art/meshes/structural/iber_civic_center.dae
new file mode 100644
index 0000000000..48d9300996
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/structural/iber_civic_center.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:110450c0575f232d713e82591d70b3697588166a546dd03cdbec0f174e59d1b7
+size 1188865
diff --git a/binaries/data/mods/public/art/meshes/structural/iber_civic_centre.dae b/binaries/data/mods/public/art/meshes/structural/iber_civic_centre.dae
deleted file mode 100644
index 7b18c969d3..0000000000
--- a/binaries/data/mods/public/art/meshes/structural/iber_civic_centre.dae
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1d62daeaeca7d90317a22a26cf8331575598e5bb8207db1fbc1d54e0bab4bd76
-size 1241344
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/iber_civic_centre.png b/binaries/data/mods/public/art/textures/skins/structural/ao/iber_civic_center.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/ao/iber_civic_centre.png
rename to binaries/data/mods/public/art/textures/skins/structural/ao/iber_civic_center.png
diff --git a/binaries/data/mods/public/simulation/templates/structures/iber_civil_centre.xml b/binaries/data/mods/public/simulation/templates/structures/iber_civil_centre.xml
index f99c30703c..fd1130b5fc 100644
--- a/binaries/data/mods/public/simulation/templates/structures/iber_civil_centre.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/iber_civil_centre.xml
@@ -15,6 +15,6 @@
     </Entities>
   </ProductionQueue>
   <VisualActor>
-    <Actor>structures/iberians/civil_centre.xml</Actor>
+    <Actor>structures/iberians/civic_center.xml</Actor>
   </VisualActor>
 </Entity>