From cc1a3d4e95e890999cc19dd47b732cd0c1b7e7ce Mon Sep 17 00:00:00 2001
From: wowgetoffyourcellphone
 <wowgetoffyourcellphone@3db68df2-c116-0410-a063-a993310a9797>
Date: Wed, 14 Jun 2023 00:36:05 +0000
Subject: [PATCH] Art | Fix the ostrich feather actors for Nubian units

git-svn-id: https://svn.wildfiregames.com/public/ps/trunk@27681 3db68df2-c116-0410-a063-a993310a9797
---
 .../art/actors/props/units/heads/kush_nubian_ostrich_feathers_a.xml   | 2 +-
 .../art/actors/props/units/heads/kush_nubian_ostrich_feathers_b.xml   | 2 +-
 .../art/actors/props/units/heads/kush_nubian_ostrich_feathers_e.xml   | 2 +-
 .../mods/public/art/actors/units/kushites/infantry_javelinist_a.xml   | 2 +-
 .../mods/public/art/actors/units/kushites/infantry_javelinist_b.xml   | 2 +-
 .../mods/public/art/actors/units/kushites/infantry_spearman_a.xml     | 3 ++-
 .../mods/public/art/actors/units/kushites/infantry_spearman_b.xml     | 4 +++-
 .../mods/public/art/actors/units/kushites/infantry_spearman_e.xml     | 3 ++-
 8 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/binaries/data/mods/public/art/actors/props/units/heads/kush_nubian_ostrich_feathers_a.xml b/binaries/data/mods/public/art/actors/props/units/heads/kush_nubian_ostrich_feathers_a.xml
index 44b13a55c1..9c80df9fe6 100644
--- a/binaries/data/mods/public/art/actors/props/units/heads/kush_nubian_ostrich_feathers_a.xml
+++ b/binaries/data/mods/public/art/actors/props/units/heads/kush_nubian_ostrich_feathers_a.xml
@@ -11,5 +11,5 @@
       </textures>
     </variant>
   </group>
-  <material>no_trans_norm_spec.xml</material>
+  <material>basic_trans_norm_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/heads/kush_nubian_ostrich_feathers_b.xml b/binaries/data/mods/public/art/actors/props/units/heads/kush_nubian_ostrich_feathers_b.xml
index 3ccb0babf5..461dedc2e5 100644
--- a/binaries/data/mods/public/art/actors/props/units/heads/kush_nubian_ostrich_feathers_b.xml
+++ b/binaries/data/mods/public/art/actors/props/units/heads/kush_nubian_ostrich_feathers_b.xml
@@ -11,5 +11,5 @@
       </textures>
     </variant>
   </group>
-  <material>no_trans_norm_spec.xml</material>
+  <material>basic_trans_norm_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/heads/kush_nubian_ostrich_feathers_e.xml b/binaries/data/mods/public/art/actors/props/units/heads/kush_nubian_ostrich_feathers_e.xml
index 51c3e1cfb2..2cc6202e71 100644
--- a/binaries/data/mods/public/art/actors/props/units/heads/kush_nubian_ostrich_feathers_e.xml
+++ b/binaries/data/mods/public/art/actors/props/units/heads/kush_nubian_ostrich_feathers_e.xml
@@ -14,5 +14,5 @@
       </textures>
     </variant>
   </group>
-  <material>no_trans_norm_spec.xml</material>
+  <material>basic_trans_norm_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/kushites/infantry_javelinist_a.xml b/binaries/data/mods/public/art/actors/units/kushites/infantry_javelinist_a.xml
index 4a929b645b..46148c1ce0 100644
--- a/binaries/data/mods/public/art/actors/units/kushites/infantry_javelinist_a.xml
+++ b/binaries/data/mods/public/art/actors/units/kushites/infantry_javelinist_a.xml
@@ -6,7 +6,7 @@
       <mesh>skeletal/new/m_naked.dae</mesh>
       <props>
         <prop actor="props/units/heads/head_kush_nuba_painted.xml" attachpoint="head"/>
-        <prop actor="props/units/shields/kush_shield_02.xml" attachpoint="shield"/>
+        <prop actor="props/units/shields/kush_shield_01.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/jav_loaded.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/weapons/jav_ammo.xml" attachpoint="ammo"/>
       </props>
diff --git a/binaries/data/mods/public/art/actors/units/kushites/infantry_javelinist_b.xml b/binaries/data/mods/public/art/actors/units/kushites/infantry_javelinist_b.xml
index ad96d23a27..4d071bc09b 100644
--- a/binaries/data/mods/public/art/actors/units/kushites/infantry_javelinist_b.xml
+++ b/binaries/data/mods/public/art/actors/units/kushites/infantry_javelinist_b.xml
@@ -6,7 +6,7 @@
       <mesh>skeletal/new/m_naked.dae</mesh>
       <props>
         <prop actor="props/units/heads/head_kush_meroitic.xml" attachpoint="head"/>
-        <prop actor="props/units/shields/kush_shield_01.xml" attachpoint="shield"/>
+        <prop actor="props/units/shields/kush_shield_02.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/jav_loaded.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/weapons/jav_ammo.xml" attachpoint="ammo"/>
       </props>
diff --git a/binaries/data/mods/public/art/actors/units/kushites/infantry_spearman_a.xml b/binaries/data/mods/public/art/actors/units/kushites/infantry_spearman_a.xml
index bc095e75fb..da3019091a 100644
--- a/binaries/data/mods/public/art/actors/units/kushites/infantry_spearman_a.xml
+++ b/binaries/data/mods/public/art/actors/units/kushites/infantry_spearman_a.xml
@@ -7,8 +7,9 @@
       <props>
         <prop actor="props/units/heads/head_kush_nubian.xml" attachpoint="head"/>
         <prop actor="props/units/heads/kush_dread_hair.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/kush_nubian_ostrich_feathers_a.xml" attachpoint="head"/>
         <prop actor="props/units/shields/kush_nubian_thureos.xml" attachpoint="shield"/>
-        <prop actor="props/units/weapons/spear.xml" attachpoint="weapon_R"/>
+        <prop actor="props/units/weapons/kush_spear.xml" attachpoint="weapon_R"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/kushites/infantry_spearman_b.xml b/binaries/data/mods/public/art/actors/units/kushites/infantry_spearman_b.xml
index f6d3ff8a75..df2783b6c2 100644
--- a/binaries/data/mods/public/art/actors/units/kushites/infantry_spearman_b.xml
+++ b/binaries/data/mods/public/art/actors/units/kushites/infantry_spearman_b.xml
@@ -7,7 +7,7 @@
       <props>
         <prop actor="props/units/heads/head_kush_nubian_red.xml" attachpoint="head"/>
         <prop actor="props/units/shields/kush_nubian_thureos.xml" attachpoint="shield"/>
-        <prop actor="props/units/weapons/spear.xml" attachpoint="weapon_R"/>
+        <prop actor="props/units/weapons/kush_spear.xml" attachpoint="weapon_R"/>
       </props>
     </variant>
   </group>
@@ -59,11 +59,13 @@
     <variant frequency="1" name="head-nubian">
       <props>
         <prop actor="props/units/heads/head_kush_nubian.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/kush_nubian_ostrich_feathers_b.xml" attachpoint="head"/>
       </props>
     </variant>
     <variant frequency="1" name="head-nubian-red">
       <props>
         <prop actor="props/units/heads/head_kush_nubian_red.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/kush_nubian_ostrich_feathers_b.xml" attachpoint="head"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/kushites/infantry_spearman_e.xml b/binaries/data/mods/public/art/actors/units/kushites/infantry_spearman_e.xml
index 6b3ad912e3..64aaa9a1c4 100644
--- a/binaries/data/mods/public/art/actors/units/kushites/infantry_spearman_e.xml
+++ b/binaries/data/mods/public/art/actors/units/kushites/infantry_spearman_e.xml
@@ -7,9 +7,10 @@
       <props>
         <prop actor="props/units/heads/head_kush_nubian.xml" attachpoint="head"/>
         <prop actor="props/units/heads/kush_dread_hair.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/kush_nubian_ostrich_feathers_e.xml" attachpoint="head"/>
         <prop actor="props/units/heads/maur_earrings_1.xml" attachpoint="helmet"/>
         <prop actor="props/units/shields/kush_nubian_thureos.xml" attachpoint="shield"/>
-        <prop actor="props/units/weapons/spear.xml" attachpoint="weapon_R"/>
+        <prop actor="props/units/weapons/kush_spear.xml" attachpoint="weapon_R"/>
       </props>
     </variant>
   </group>
-- 
2.11.4.GIT