Merge branch 'spritefix' into 'master'

Spritefix

Closes #4, #3, and #11

See merge request themanaworld/evolved/clientdata!14

1 files changed, 21 insertions, 21 deletions

diff --git a/monsters.xml b/monsters.xml
index 6106b84d..66a95f64 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -549,8 +549,8 @@
     <sprite>monsters/spirit-demonic.xml|#444444,9933ff</sprite>
   </monster>
   <monster id="1102" name="Luvia">
-    <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
-    <sprite>hairstyles/hairstyle11-female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#8c6625,dab425,ffffff</sprite>
+    <sprite>model/talpan-female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
+    <sprite>hairstyles/hairstyle11.xml|#8c6625,dab425,ffffff</sprite>
     <sprite>equipment/feet/assassin-boots.xml</sprite>
     <sprite>equipment/legs/shorts.xml|#121212,343434</sprite>
     <sprite>equipment/chest/sorcerer-robe-female.xml|#121212,343434;#8F47D6</sprite>
@@ -641,7 +641,7 @@
     <sprite>monsters/accessories/hairstyle08.xml</sprite>
     <sprite>equipment/head/witch-hat.xml</sprite>
     <sprite>equipment/chest/sorcerer-robe.xml|#111111,222222,333333,444444,555555,aaaaaa;#EFEFEF</sprite>
-    <sprite>equipment/weapons/polearm-blunt.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite>equipment/weapons/staff.xml</sprite>
     <attack id="1" missile-particle="graphics/particles/undead-witch-attack.particle.xml" action="attack"/>
   </monster>
   <monster id="1117" name="Undead Troll">
@@ -656,7 +656,7 @@
   </monster>
   <monster id="1119" name="Thug">
     <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#36e2fc,0ba8bf,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
-    <sprite>hairstyles/hairstyle00.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000</sprite>
+    <sprite>hairstyles/hairstyle00.xml</sprite>
     <sprite>equipment/head/sailor-hat.xml</sprite>
     <sprite>equipment/feet/boots.xml</sprite>
     <sprite>equipment/chest/tanktop.xml</sprite>
@@ -664,7 +664,7 @@
   </monster>
   <monster id="1120" name="Swashbuckler">
     <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#36e2fc,0ba8bf,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
-    <sprite>hairstyles/hairstyle00.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000</sprite>
+    <sprite>hairstyles/hairstyle00.xml</sprite>
     <sprite>equipment/chest/vnecksweater.xml</sprite>
     <sprite>equipment/legs/pants.xml|#212121,555555</sprite>
     <sprite>equipment/head/bandana.xml|#212121,555555</sprite>
@@ -673,7 +673,7 @@
   </monster>
   <monster id="1121" name="Grenadier">
     <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#36e2fc,0ba8bf,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
-    <sprite>hairstyles/hairstyle00.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000</sprite>
+    <sprite>hairstyles/hairstyle00.xml</sprite>
     <sprite>equipment/chest/sorcerer-robe.xml|#5178a0,1a294c;#d5b02c</sprite>
     <sprite>equipment/legs/pants.xml|#5178a0,1a294c</sprite>
     <sprite>equipment/head/piratehat.xml</sprite>
@@ -683,7 +683,7 @@
   </monster>
   <monster id="1122" name="The Dread Pirate Marley">
     <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#36e2fc,0ba8bf,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
-    <sprite>hairstyles/hairstyle00.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000</sprite>
+    <sprite>hairstyles/hairstyle00.xml</sprite>
     <sprite>equipment/chest/assassin.xml</sprite>
     <sprite>equipment/legs/assassin.xml</sprite>
     <sprite>equipment/head/eyepatch.xml</sprite>
@@ -693,7 +693,7 @@
   </monster>
   <monster id="1123" name="The Dread Pirate Marley">
     <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#36e2fc,0ba8bf,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
-    <sprite>hairstyles/hairstyle00.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000</sprite>
+    <sprite>hairstyles/hairstyle00.xml</sprite>
     <sprite>equipment/chest/assassin.xml</sprite>
     <sprite>equipment/legs/assassin.xml</sprite>
     <sprite>equipment/head/eyepatch.xml</sprite>
@@ -757,7 +757,7 @@
     <sound event="hit">monsters/wolvern/wolvern-hit1.ogg</sound>
   </monster>
   <monster id="1134" name="SUSAN" targetCursor="large">
-    <sprite>monsters/SUSAN.xml|R:#ff00e4</sprite>
+    <sprite>monsters/SUSAN.xml|#ff00e4</sprite>
     <particlefx>graphics/particles/heartnecklace.particle.xml</particlefx>
     <sound event="hit">monsters/maggot/maggot-hit1.ogg</sound>
     <sound event="hit">monsters/maggot/maggot-hit2.ogg</sound>
@@ -765,7 +765,7 @@
     <sound event="die">monsters/maggot/maggot-dying1.ogg</sound>
   </monster>
   <monster id="1135" name="Lovely Maggot" targetCursor="small">
-    <sprite>monsters/lovely-maggot.xml|S:#524b51,8463a0,6f706f,af006d</sprite>
+    <sprite>monsters/lovely-maggot.xml|#524b51,8463a0,6f706f,af006d</sprite>
     <sound event="hit">monsters/maggot/maggot-hit1.ogg</sound>
     <sound event="hit">monsters/maggot/maggot-hit2.ogg</sound>
     <sound event="miss">monsters/maggot/maggot-miss1.ogg</sound>
@@ -776,7 +776,7 @@
   </monster>
   <monster id="1137" name="Tormenta">
     <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
-    <sprite>hairstyles/hairstyle13-female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000,202020,404040,dddddd</sprite>
+    <sprite>hairstyles/hairstyle13.xml|#000000,202020,404040,dddddd</sprite>
     <sprite>equipment/feet/assassin-boots.xml</sprite>
     <sprite>equipment/legs/shorts.xml|#121212,343434</sprite>
     <sprite>equipment/chest/sorcerer-robe.xml|#121212,343434;#8F47D6</sprite>
@@ -868,25 +868,25 @@
     <sound event="miss">monsters/golem/miss1.ogg</sound>
   </monster>
   <monster id="1146" name="Flashmob">
-    <sprite>model/base.xml|#413e22,6c5d31,baa06e,b2b05f;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d55</sprite>
+    <sprite>model/base.xml|#413e22,6c5d31,baa06e,b2b05f;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>hairstyles/hairstyle15.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000,202020,404040,dddddd</sprite>
     <sprite>equipment/feet/assassin-boots.xml</sprite>
     <sprite>equipment/legs/assassin.xml</sprite>
     <sprite>equipment/chest/bromenalchest.xml</sprite>
     <!-- No folder for this -->
     <sprite>equipment/angel-wings.xml</sprite>
-    <sprite>equipment/weapons/polearm-chop.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
-    <attack id="1" critical-hit-effect-id="16" missile-particle="graphics/particles/fire-burst.xml" action="attack_2hand"/>
+    <sprite>equipment/weapons/axe.xml</sprite>
+    <attack id="1" critical-hit-effect-id="16" missile-particle="graphics/particles/fire-burst.xml" action="attack_chop"/>
   </monster>
   <monster id="1147" name="Koyntety">
-    <sprite>model/female.xml|#413e22,6c5d31,baa06e,b2b05f;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
-    <sprite>hairstyles/hairstyle09-female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000,202020,404040,dddddd</sprite>
+    <sprite>model/talpan-female.xml|#413e22,6c5d31,baa06e,b2b05f;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
+    <sprite>hairstyles/hairstyle09.xml|#000000,202020,404040,dddddd</sprite>
     <sprite>equipment/feet/assassin-boots-female.xml</sprite>
     <sprite>equipment/legs/assassin-female.xml</sprite>
     <sprite>equipment/chest/bromenalchest-female.xml</sprite>
     <!-- No folder for this -->
     <sprite>equipment/angel-wings.xml</sprite>
-    <sprite>equipment/weapons/bow-female.xml</sprite>
+    <sprite>equipment/weapons/bow.xml</sprite>
     <attack id="1" critical-hit-effect-id="16" missile-particle="graphics/particles/fire-burst.xml" action="attack_bow"/>
     <sound event="hit">weapons/bows/forest/forest-hit1.ogg</sound>
     <sound event="miss">weapons/bows/forest/forest-miss1.ogg</sound>
@@ -899,13 +899,13 @@
     <sound event="miss">monsters/golem/miss1.ogg</sound>
   </monster>
   <monster id="1149" name="The Enchanter">
-    <sprite>model/female.xml|#413e22,6c5d31,baa06e,b2b05f;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
-    <sprite>hairstyles/hairstyle09-female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000,202020,404040,dddddd</sprite>
+    <sprite>model/talpan-female.xml|#413e22,6c5d31,baa06e,b2b05f;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
+    <sprite>hairstyles/hairstyle09.xml|#000000,202020,404040,dddddd</sprite>
     <sprite>equipment/feet/assassin-boots-female.xml</sprite>
     <sprite>equipment/legs/assassin-female.xml</sprite>
     <sprite>equipment/chest/sorcerer-robe-female.xml|#000000;#2554c7</sprite>
     <!-- No folder for this -->
-    <sprite>equipment/weapons/bow-female.xml</sprite>
+    <sprite>equipment/weapons/bow.xml</sprite>
     <particlefx>graphics/particles/doom.particle.xml</particlefx>
     <attack id="1" critical-hit-effect-id="16" missile-particle="graphics/particles/fire-burst.xml" action="attack_bow"/>
     <sound event="hit">weapons/bows/forest/forest-hit1.ogg</sound>
@@ -961,7 +961,7 @@
     <sound event="die">monsters/maggot/maggot-dying1.ogg</sound>
   </monster>
   <monster id="1157" name="V0id Soldier">
-    <sprite>model/male.xml|#166876,32992e,23a988,70cd87,a7f1b2;#0e0036,4c264b,a04f62,d2a391,e6d7b8;#3a3a3a,d5d5d5</sprite>
+    <sprite>model/talpan-male.xml|#166876,32992e,23a988,70cd87,a7f1b2;#0e0036,4c264b,a04f62,d2a391,e6d7b8;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/feet/warlordboots.xml|#333333,878787</sprite>
     <sprite>equipment/hands/generic.xml|#242424,626262</sprite>
     <sprite>equipment/chest/warlordplate.xml|#444444,979797</sprite>