From 5dc553bf91dd8119c5e4574c4c3003dd71acb174 Mon Sep 17 00:00:00 2001
From: Mythos_Ruler <michael@wildfiregames.com>
Date: Sun, 3 Nov 2013 14:01:45 +0000
Subject: [PATCH] More shield changes.

Tweaked number of 5-pop houses on Sicilia skirmish map.

New "Sahel" Skirmish map.

This was SVN commit r14077.
---
 .../props/units/shields/mace_pez_adv.xml      | 19 +++++++++++++++++--
 .../props/units/shields/mace_pez_basic.xml    |  6 ++++--
 .../props/units/shields/mace_pez_elite.xml    |  8 +++++++-
 .../mods/public/maps/skirmishes/Sahel (2).pmp |  3 +++
 .../mods/public/maps/skirmishes/Sahel (2).xml |  3 +++
 .../public/maps/skirmishes/Sicilia (2).xml    |  4 ++--
 6 files changed, 36 insertions(+), 7 deletions(-)
 create mode 100644 binaries/data/mods/public/maps/skirmishes/Sahel (2).pmp
 create mode 100644 binaries/data/mods/public/maps/skirmishes/Sahel (2).xml

diff --git a/binaries/data/mods/public/art/actors/props/units/shields/mace_pez_adv.xml b/binaries/data/mods/public/art/actors/props/units/shields/mace_pez_adv.xml
index f4aab42810..d68561189b 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/mace_pez_adv.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/mace_pez_adv.xml
@@ -7,8 +7,23 @@
       <props>
         <prop actor="props/units/shields/mace_pez_back.xml" attachpoint="back"/>
       </props>
-      <textures><texture file="props/shield/mace_round_e.png" name="baseTex"/></textures>
     </variant>
   </group>
-  <material>playercolor_spec.xml</material>
+  <group>
+    <variant frequency="1" name="Shield Bronze D2">
+      <textures>
+        <texture file="props/shield/mace_bronze_d_player2.png" name="baseTex"/>
+        <texture file="props/shield/mace_silver_c_norm.png" name="normTex"/>
+        <texture file="props/shield/mace_silver_c_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="Shield">
+      <textures>
+        <texture file="props/shield/mace_round_c_bronze.png" name="baseTex"/>
+        <texture file="props/shield/mace_round_c_norm.png" name="normTex"/>
+        <texture file="props/shield/mace_round_c_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>player_trans_parallax_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/mace_pez_basic.xml b/binaries/data/mods/public/art/actors/props/units/shields/mace_pez_basic.xml
index a28cc26010..bebb0eb5de 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/mace_pez_basic.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/mace_pez_basic.xml
@@ -7,8 +7,10 @@
       <props>
         <prop actor="props/units/shields/mace_pez_back.xml" attachpoint="back"/>
       </props>
-      <textures><texture file="props/shield/mace_round_f.png" name="baseTex"/></textures>
+      <textures>
+        <texture file="props/shield/pelte_round_bronze.png" name="baseTex"/>
+      </textures>
     </variant>
   </group>
-  <material>playercolor_spec.xml</material>
+  <material>basic_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/mace_pez_elite.xml b/binaries/data/mods/public/art/actors/props/units/shields/mace_pez_elite.xml
index cd03fe7c85..31d2dd08dd 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/mace_pez_elite.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/mace_pez_elite.xml
@@ -13,18 +13,24 @@
     <variant frequency="1" name="Shield Bronze B">
       <textures>
         <texture file="props/shield/mace_bronze_b_player.png" name="baseTex"/>
+        <texture file="props/shield/mace_bronze_b_norm.png" name="normTex"/>
+        <texture file="props/shield/mace_bronze_b_spec.png" name="specTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="Shield Bronze C">
       <textures>
         <texture file="props/shield/mace_bronze_c_player.png" name="baseTex"/>
+        <texture file="props/shield/mace_silver_b_norm.png" name="normTex"/>
+        <texture file="props/shield/mace_silver_b_spec.png" name="specTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="Shield Bronze D">
       <textures>
         <texture file="props/shield/mace_bronze_d_player.png" name="baseTex"/>
+        <texture file="props/shield/mace_silver_c_norm.png" name="normTex"/>
+        <texture file="props/shield/mace_silver_c_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
-  <material>playercolor_spec.xml</material>
+  <material>player_trans_parallax_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/maps/skirmishes/Sahel (2).pmp b/binaries/data/mods/public/maps/skirmishes/Sahel (2).pmp
new file mode 100644
index 0000000000..e6006e665f
--- /dev/null
+++ b/binaries/data/mods/public/maps/skirmishes/Sahel (2).pmp	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:846bb2a77810bc31b9165f9ed6afd8b852946d8fdd64b5821c0965b6f21080e0
+size 1025804
diff --git a/binaries/data/mods/public/maps/skirmishes/Sahel (2).xml b/binaries/data/mods/public/maps/skirmishes/Sahel (2).xml
new file mode 100644
index 0000000000..d1f188c193
--- /dev/null
+++ b/binaries/data/mods/public/maps/skirmishes/Sahel (2).xml	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d7610f22754620f7dc32b2e6728e2ed4cfc60f733619c6ae110d5f1b9ccb7734
+size 631494
diff --git a/binaries/data/mods/public/maps/skirmishes/Sicilia (2).xml b/binaries/data/mods/public/maps/skirmishes/Sicilia (2).xml
index 50a25b1468..fd41c58a7f 100644
--- a/binaries/data/mods/public/maps/skirmishes/Sicilia (2).xml	
+++ b/binaries/data/mods/public/maps/skirmishes/Sicilia (2).xml	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dd3039b36f267714999178b82a086c30736bb58d443ea69021f13e1d333c1f25
-size 518919
+oid sha256:6f708f9f3076485718b5dc183cbad62e5ee20fee81ab67e50d27e72151f3d884
+size 519775