Merge branch 'golem' into 'master'

Update Golem as per HoraK request

See merge request themanaworld/evolved/clientdata!35

9 files changed, 13 insertions, 459 deletions

diff --git a/graphics/items/equipment/head/assassin-mask.png b/graphics/items/equipment/head/assassin-mask.png
index e2ed73b2..d2a46259 100644
--- a/graphics/items/equipment/head/assassin-mask.png
+++ b/graphics/items/equipment/head/assassin-mask.png
diff --git a/graphics/sprites/equipment/head/assassin-mask-female.xml b/graphics/sprites/equipment/head/assassin-mask-female.xml
deleted file mode 100644
index fe2ddc52..00000000
--- a/graphics/sprites/equipment/head/assassin-mask-female.xml
+++ /dev/null
@@ -1,229 +0,0 @@
-<?xml version="1.0"?>
-<sprite>
-  <imageset height="40" name="base" src="graphics/sprites/equipment/head/assassin-mask.png" width="40"/>
-  <action imageset="base" name="stand">
-    <animation direction="down">
-      <frame index="0" offsetX="0" offsetY="-29"/>
-    </animation>
-    <animation direction="left">
-      <frame index="1" offsetX="0" offsetY="-29"/>
-    </animation>
-    <animation direction="up">
-      <frame index="2" offsetX="-1" offsetY="-25"/>
-    </animation>
-    <animation direction="right">
-      <frame index="3" offsetX="0" offsetY="-29"/>
-    </animation>
-  </action>
-  <action imageset="base" name="walk">
-    <animation direction="down">
-      <frame delay="75" index="0" offsetX="0" offsetY="-28"/>
-      <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
-      <frame delay="75" index="0" offsetX="0" offsetY="-28"/>
-      <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
-    </animation>
-    <animation direction="left">
-      <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
-      <frame delay="75" index="1" offsetX="0" offsetY="-28"/>
-      <frame delay="150" index="1" offsetX="0" offsetY="-29"/>
-      <frame delay="75" index="1" offsetX="0" offsetY="-28"/>
-      <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
-    </animation>
-    <animation direction="up">
-      <frame delay="75" index="2" offsetX="-1" offsetY="-25"/>
-      <frame delay="150" index="2" offsetX="-1" offsetY="-26"/>
-      <frame delay="75" index="2" offsetX="-1" offsetY="-25"/>
-      <frame delay="150" index="2" offsetX="-1" offsetY="-26"/>
-    </animation>
-    <animation direction="right">
-      <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
-      <frame delay="75" index="3" offsetX="0" offsetY="-28"/>
-      <frame delay="150" index="3" offsetX="0" offsetY="-29"/>
-      <frame delay="75" index="3" offsetX="0" offsetY="-28"/>
-      <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
-    </animation>
-  </action>
-  <action imageset="base" name="attack">
-    <animation direction="down">
-      <frame delay="75" index="0" offsetX="0" offsetY="-27"/>
-      <frame delay="75" index="0" offsetX="0" offsetY="-28"/>
-      <frame delay="75" index="0" offsetX="0" offsetY="-25"/>
-      <frame delay="75" index="0" offsetX="0" offsetY="-24"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <frame delay="75" index="1" offsetX="4" offsetY="-30"/>
-      <frame delay="75" index="1" offsetX="4" offsetY="-31"/>
-      <frame delay="75" index="1" offsetX="0" offsetY="-28"/>
-      <frame delay="75" index="1" offsetX="-1" offsetY="-27"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <frame delay="225" index="2" offsetX="-2" offsetY="-25"/>
-      <frame delay="75" index="2" offsetX="-2" offsetY="-23"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <frame delay="75" index="3" offsetX="-3" offsetY="-30"/>
-      <frame delay="75" index="3" offsetX="-3" offsetY="-31"/>
-      <frame delay="75" index="3" offsetX="0" offsetY="-28"/>
-      <frame delay="75" index="3" offsetX="1" offsetY="-27"/>
-      <end/>
-    </animation>
-  </action>
-  <action imageset="base" name="attack_bow">
-    <animation direction="down">
-      <frame delay="225" index="0" offsetX="0" offsetY="-28"/>
-      <frame delay="75" index="0" offsetX="0" offsetY="-27"/>
-      <frame delay="75" index="0" offsetX="0" offsetY="-28"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <frame delay="225" index="1" offsetX="3" offsetY="-29"/>
-      <frame delay="150" index="1" offsetX="5" offsetY="-30"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <frame delay="225" index="2" offsetX="-1" offsetY="-25"/>
-      <frame delay="75" index="2" offsetX="-2" offsetY="-24"/>
-      <frame delay="75" index="2" offsetX="-2" offsetY="-25"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <frame delay="225" index="3" offsetX="-3" offsetY="-29"/>
-      <frame delay="150" index="3" offsetX="-5" offsetY="-30"/>
-      <end/>
-    </animation>
-  </action>
-  <action imageset="base" name="sit">
-    <animation direction="down">
-      <frame index="0" offsetX="0" offsetY="-17"/>
-    </animation>
-    <animation direction="left">
-      <frame index="1" offsetX="4" offsetY="-20"/>
-    </animation>
-    <animation direction="up">
-      <frame index="2" offsetX="0" offsetY="-17"/>
-    </animation>
-    <animation direction="right">
-      <frame index="3" offsetX="-6" offsetY="-20"/>
-    </animation>
-  </action>
-  <action imageset="base" name="dead">
-    <animation direction="default">
-      <frame index="4" offsetX="21" offsetY="-4"/>
-    </animation>
-  </action>
-  <action name="attack_2hand" imageset="base">
-    <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-23" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-28" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-22" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <frame index="1" offsetX="-1" offsetY="-26" delay="140"/>
-      <frame index="1" offsetX="2" offsetY="-29" delay="140"/>
-      <frame index="1" offsetX="4" offsetY="-29" delay="140"/>
-      <frame index="1" offsetX="-3" offsetY="-25" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-24" delay="280"/>
-      <frame index="2" offsetX="-3" offsetY="-22" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <frame index="3" offsetX="2" offsetY="-26" delay="140"/>
-      <frame index="3" offsetX="-1" offsetY="-29" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-29" delay="140"/>
-      <frame index="3" offsetX="3" offsetY="-25" delay="140"/>
-      <end/>
-    </animation>
-  </action>
-  <action name="attack_sword_stab" imageset="base">
-    <animation direction="down">
-      <frame index="0" offsetX="0" offsetY="-27" delay="100"/>
-      <frame index="0" offsetX="0" offsetY="-28" delay="100"/>
-      <frame index="0" offsetX="0" offsetY="-25" delay="100"/>
-      <frame index="0" offsetX="0" offsetY="-24" delay="100"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <frame index="1" offsetX="4" offsetY="-30" delay="100"/>
-      <frame index="1" offsetX="4" offsetY="-31" delay="100"/>
-      <frame index="1" offsetX="0" offsetY="-28" delay="100"/>
-      <frame index="1" offsetX="-1" offsetY="-27" delay="100"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="300"/>
-      <frame index="2" offsetX="-2" offsetY="-23" delay="100"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <frame index="3" offsetX="-3" offsetY="-30" delay="100"/>
-      <frame index="3" offsetX="-3" offsetY="-31" delay="100"/>
-      <frame index="3" offsetX="0" offsetY="-28" delay="100"/>
-      <frame index="3" offsetX="1" offsetY="-27" delay="100"/>
-      <end/>
-    </animation>
-  </action>
-  <action name="attack_spear" imageset="base">
-    <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-29" delay="280"/>
-      <frame index="0" offsetX="-2" offsetY="-30" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-24" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <frame index="1" offsetX="4" offsetY="-30" delay="140"/>
-      <frame index="1" offsetX="7" offsetY="-28" delay="140"/>
-      <frame index="1" offsetX="0" offsetY="-30" delay="140"/>
-      <frame index="1" offsetX="0" offsetY="-27" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <frame index="2" offsetX="-4" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
-      <frame index="2" offsetX="-4" offsetY="-29" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <frame index="3" offsetX="-3" offsetY="-30" delay="140"/>
-      <frame index="3" offsetX="-5" offsetY="-28" delay="140"/>
-      <frame index="3" offsetX="1" offsetY="-30" delay="140"/>
-      <frame index="3" offsetX="2" offsetY="-27" delay="140"/>
-      <end/>
-    </animation>
-  </action>
-  <action name="attack_chop" imageset="base">
-    <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-26" delay="280"/>
-      <frame index="0" offsetX="-1" offsetY="-28" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-22" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <frame index="1" offsetX="3" offsetY="-30" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="280"/>
-      <frame index="1" offsetX="-2" offsetY="-27" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="280"/>
-      <frame index="2" offsetX="-3" offsetY="-22" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <frame index="3" offsetX="-3" offsetY="-30" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="280"/>
-      <frame index="3" offsetX="3" offsetY="-27" delay="140"/>
-      <end/>
-    </animation>
-  </action>
-</sprite>
diff --git a/graphics/sprites/equipment/head/assassin-mask.png b/graphics/sprites/equipment/head/assassin-mask.png
index a0c92b7a..002ad305 100644
--- a/graphics/sprites/equipment/head/assassin-mask.png
+++ b/graphics/sprites/equipment/head/assassin-mask.png
diff --git a/graphics/sprites/equipment/head/assassin-mask.xml b/graphics/sprites/equipment/head/assassin-mask.xml
index 9757cec3..b28f0895 100644
--- a/graphics/sprites/equipment/head/assassin-mask.xml
+++ b/graphics/sprites/equipment/head/assassin-mask.xml
@@ -1,229 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Author: Micksha
+Copyright (C) 2021 The Mana World -->
+
 <sprite>
-  <imageset name="base" src="graphics/sprites/equipment/head/assassin-mask.png" width="40" height="40"/>
-  <action name="stand" imageset="base">
-    <animation direction="down">
-      <frame index="0" offsetX="0" offsetY="-29"/>
-    </animation>
-    <animation direction="left">
-      <frame index="1" offsetX="0" offsetY="-29"/>
-    </animation>
-    <animation direction="up">
-      <frame index="2" offsetX="-1" offsetY="-25"/>
-    </animation>
-    <animation direction="right">
-      <frame index="3" offsetX="0" offsetY="-29"/>
-    </animation>
-  </action>
-  <action name="walk" imageset="base">
-    <animation direction="down">
-      <frame index="0" offsetX="0" offsetY="-28" delay="75"/>
-      <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
-      <frame index="0" offsetX="0" offsetY="-28" delay="75"/>
-      <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
-    </animation>
-    <animation direction="left">
-      <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
-      <frame index="1" offsetX="0" offsetY="-28" delay="75"/>
-      <frame index="1" offsetX="0" offsetY="-29" delay="150"/>
-      <frame index="1" offsetX="0" offsetY="-28" delay="75"/>
-      <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
-    </animation>
-    <animation direction="up">
-      <frame index="2" offsetX="-1" offsetY="-25" delay="75"/>
-      <frame index="2" offsetX="-1" offsetY="-26" delay="150"/>
-      <frame index="2" offsetX="-1" offsetY="-25" delay="75"/>
-      <frame index="2" offsetX="-1" offsetY="-26" delay="150"/>
-    </animation>
-    <animation direction="right">
-      <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
-      <frame index="3" offsetX="0" offsetY="-28" delay="75"/>
-      <frame index="3" offsetX="0" offsetY="-29" delay="150"/>
-      <frame index="3" offsetX="0" offsetY="-28" delay="75"/>
-      <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
-    </animation>
-  </action>
-  <action name="attack" imageset="base">
-    <animation direction="down">
-      <frame index="0" offsetX="0" offsetY="-27" delay="75"/>
-      <frame index="0" offsetX="0" offsetY="-28" delay="75"/>
-      <frame index="0" offsetX="0" offsetY="-25" delay="75"/>
-      <frame index="0" offsetX="0" offsetY="-24" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <frame index="1" offsetX="4" offsetY="-30" delay="75"/>
-      <frame index="1" offsetX="4" offsetY="-31" delay="75"/>
-      <frame index="1" offsetX="0" offsetY="-28" delay="75"/>
-      <frame index="1" offsetX="-1" offsetY="-27" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="225"/>
-      <frame index="2" offsetX="-2" offsetY="-23" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <frame index="3" offsetX="-3" offsetY="-30" delay="75"/>
-      <frame index="3" offsetX="-3" offsetY="-31" delay="75"/>
-      <frame index="3" offsetX="0" offsetY="-28" delay="75"/>
-      <frame index="3" offsetX="1" offsetY="-27" delay="75"/>
-      <end/>
-    </animation>
-  </action>
-  <action name="attack_bow" imageset="base">
-    <animation direction="down">
-      <frame index="0" offsetX="0" offsetY="-28" delay="225"/>
-      <frame index="0" offsetX="0" offsetY="-27" delay="75"/>
-      <frame index="0" offsetX="0" offsetY="-28" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <frame index="1" offsetX="3" offsetY="-29" delay="225"/>
-      <frame index="1" offsetX="5" offsetY="-30" delay="150"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <frame index="2" offsetX="-1" offsetY="-25" delay="225"/>
-      <frame index="2" offsetX="-2" offsetY="-24" delay="75"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <frame index="3" offsetX="-3" offsetY="-29" delay="225"/>
-      <frame index="3" offsetX="-5" offsetY="-30" delay="150"/>
-      <end/>
-    </animation>
-  </action>
-  <action name="sit" imageset="base">
-    <animation direction="down">
-      <frame index="0" offsetX="0" offsetY="-17"/>
-    </animation>
-    <animation direction="left">
-      <frame index="1" offsetX="4" offsetY="-20"/>
-    </animation>
-    <animation direction="up">
-      <frame index="2" offsetX="0" offsetY="-17"/>
-    </animation>
-    <animation direction="right">
-      <frame index="3" offsetX="-6" offsetY="-20"/>
-    </animation>
-  </action>
-  <action name="dead" imageset="base">
-    <animation direction="default">
-      <frame index="4" offsetX="21" offsetY="-4"/>
-    </animation>
-  </action>
-  <action name="attack_2hand" imageset="base">
-    <animation direction="down">
-      <frame index="0" offsetX="0" offsetY="-28" delay="140"/>
-      <frame index="0" offsetX="0" offsetY="-24" delay="140"/>
-      <frame index="0" offsetX="0" offsetY="-29" delay="140"/>
-      <frame index="0" offsetX="0" offsetY="-24" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <frame index="1" offsetX="0" offsetY="-28" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
-      <frame index="1" offsetX="5" offsetY="-31" delay="140"/>
-      <frame index="1" offsetX="-2" offsetY="-27" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="280"/>
-      <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
-      <frame index="2" offsetX="-1" offsetY="-26" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <frame index="3" offsetX="2" offsetY="-28" delay="140"/>
-      <frame index="3" offsetX="-1" offsetY="-31" delay="140"/>
-      <frame index="3" offsetX="-3" offsetY="-31" delay="140"/>
-      <frame index="3" offsetX="2" offsetY="-27" delay="140"/>
-      <end/>
-    </animation>
-  </action>
-  <action name="attack_sword_stab" imageset="base">
-    <animation direction="down">
-      <frame index="0" offsetX="0" offsetY="-27" delay="100"/>
-      <frame index="0" offsetX="0" offsetY="-28" delay="100"/>
-      <frame index="0" offsetX="0" offsetY="-25" delay="100"/>
-      <frame index="0" offsetX="0" offsetY="-24" delay="100"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <frame index="1" offsetX="4" offsetY="-30" delay="100"/>
-      <frame index="1" offsetX="4" offsetY="-31" delay="100"/>
-      <frame index="1" offsetX="0" offsetY="-28" delay="100"/>
-      <frame index="1" offsetX="-1" offsetY="-27" delay="100"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="300"/>
-      <frame index="2" offsetX="-2" offsetY="-23" delay="100"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <frame index="3" offsetX="-3" offsetY="-30" delay="100"/>
-      <frame index="3" offsetX="-3" offsetY="-31" delay="100"/>
-      <frame index="3" offsetX="0" offsetY="-28" delay="100"/>
-      <frame index="3" offsetX="1" offsetY="-27" delay="100"/>
-      <end/>
-    </animation>
-  </action>
-  <action name="attack_spear" imageset="base">
-    <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-30" delay="280"/>
-      <frame index="0" offsetX="-1" offsetY="-31" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-24" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <frame index="1" offsetX="5" offsetY="-30" delay="140"/>
-      <frame index="1" offsetX="6" offsetY="-31" delay="140"/>
-      <frame index="1" offsetX="1" offsetY="-32" delay="140"/>
-      <frame index="1" offsetX="-1" offsetY="-27" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="420"/>
-      <frame index="2" offsetX="-3" offsetY="-28" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <frame index="3" offsetX="-3" offsetY="-30" delay="140"/>
-      <frame index="3" offsetX="-4" offsetY="-31" delay="140"/>
-      <frame index="3" offsetX="1" offsetY="-32" delay="140"/>
-      <frame index="3" offsetX="3" offsetY="-27" delay="140"/>
-      <end/>
-    </animation>
-  </action>
-  <action name="attack_chop" imageset="base">
-    <animation direction="down">
-      <frame index="0" offsetX="0" offsetY="-27" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-28" delay="140"/>
-      <frame index="0" offsetX="0" offsetY="-30" delay="140"/>
-      <frame index="0" offsetX="0" offsetY="-25" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <frame index="1" offsetX="4" offsetY="-32" delay="140"/>
-      <frame index="1" offsetX="4" offsetY="-31" delay="140"/>
-      <frame index="1" offsetX="4" offsetY="-32" delay="140"/>
-      <frame index="1" offsetX="-1" offsetY="-28" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="280"/>
-      <frame index="2" offsetX="-2" offsetY="-23" delay="280"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <frame index="3" offsetX="-2" offsetY="-32" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
-      <frame index="3" offsetX="-1" offsetY="-32" delay="140"/>
-      <frame index="3" offsetX="3" offsetY="-28" delay="140"/>
-      <end/>
-    </animation>
-  </action>
+    <imageset name="base"
+              src="graphics/sprites/equipment/head/assassin-mask.png"
+              width="40"
+              height="64"/>
+
+    <include file="model/headmodel.xml"/>
 </sprite>
diff --git a/graphics/sprites/monsters/golem-red.png b/graphics/sprites/monsters/golem-red.png
index 7b22a51d..551908b8 100644
--- a/graphics/sprites/monsters/golem-red.png
+++ b/graphics/sprites/monsters/golem-red.png
diff --git a/graphics/sprites/monsters/golem.png b/graphics/sprites/monsters/golem.png
index 81287408..ad027032 100644
--- a/graphics/sprites/monsters/golem.png
+++ b/graphics/sprites/monsters/golem.png
diff --git a/graphics/sprites/monsters/golem.xml b/graphics/sprites/monsters/golem.xml
index 03f9b740..055c367d 100644
--- a/graphics/sprites/monsters/golem.xml
+++ b/graphics/sprites/monsters/golem.xml
@@ -6,7 +6,7 @@ Copyright (C) 2011-2020 Evol Online -->
               src="graphics/sprites/monsters/golem.png"
               width="128"
               height="128"
-              offsetY="-4"/>
+              offsetY="-11"/>
 
     <action name="spawn" imageset="mob">
 
diff --git a/itemcolors.xml b/itemcolors.xml
index 684bf7b2..48883fe9 100644
--- a/itemcolors.xml
+++ b/itemcolors.xml
@@ -17,7 +17,7 @@
     <color id="11" value="#5e0034,a30059,fe7fc4,febfe1,ffffff" name="pink"/>
     <color id="12" value="#130912,3e1C33,602749" name="dark"/> <!-- Tritan dark -->
     <color id="13" value="#831f2d,be4f2d,f8cc8b" name="light red"/> <!-- Ifriton light red -->
-    <color id="14" name="Metal Red" />
+    <color id="14" value="#500000,a00000,da0000,ff0000" name="Metal Red"/>
     <!--color id="15" />
     <color id="16" />
     <color id="17" />
diff --git a/items/equip-head.xml b/items/equip-head.xml
index fb124735..90c3cab3 100644
--- a/items/equip-head.xml
+++ b/items/equip-head.xml
@@ -3106,7 +3106,6 @@
         weight="10"
         sellProtected="true">
     <sprite gender="unisex">equipment/head/assassin-mask.xml</sprite>
-    <sprite gender="female">equipment/head/assassin-mask-female.xml</sprite>
     <replace sprite="hair" />
   </item>
 </items>