Fixing numerous warnings and errors in manaplus

closes #121
closes #108
closes #100
closes #93

1 files changed, 27 insertions, 28 deletions

diff --git a/monsters.xml b/monsters.xml
index 1e874c2f..a267f5cc 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -3,11 +3,10 @@
   See here for documentation: http://manaplus.org/monsters.xml
 -->
 <monsters offset="0">
-    <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-        <its:translateRule selector="//monster/@name" translate="yes"/>
-        <its:translateRule selector="//*" translate="no"/>
-    </its:rules>
-
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule selector="//monster/@name" translate="yes"/>
+    <its:translateRule selector="//*" translate="no"/>
+  </its:rules>
   <monster id="1002" name="Maggot" targetCursor="small">
     <sprite>monsters/maggot.xml</sprite>
     <sound event="hit">monsters/maggot/maggot-hit1.ogg</sound>
@@ -215,7 +214,7 @@
     <particlefx>graphics/particles/wisp.particle.xml</particlefx>
   </monster>
   <monster id="1041" name="Snail">
-    <sprite>monsters/snail.xml</sprite>
+    <sprite>monsters/snail.xml|#FDC689;#E0A6E3;#E0A6E3;#F06EAA;#C69C6D;#A9FF02</sprite>
     <particlefx>graphics/particles/monster-snail-trail.particle.xml</particlefx>
     <sound event="hit">monsters/slime/slime-hit1.ogg</sound>
   </monster>
@@ -321,11 +320,11 @@
   </monster>
   <monster id="1064" name="Bandit">
     <sprite>monsters/bandit.xml</sprite>
-    <sprite>equipment/weapons/dagger-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;</sprite>
+    <sprite>equipment/weapons/dagger-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
   </monster>
   <monster id="1065" name="Bandit Lord">
     <sprite>monsters/bandit-lord.xml</sprite>
-    <sprite>equipment/weapons/bow-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d;</sprite>
+    <sprite>equipment/weapons/bow-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
     <attack id="1" missile-particle="graphics/particles/arrow.particle.xml" action="attack"/>
   </monster>
   <monster id="1066" name="Vampire Bat">
@@ -485,7 +484,7 @@
     <sprite>monsters/skeleton.xml|#D9BFFF</sprite>
     <sprite>equipment/chest/tanktop-male.xml|#333333,555555,444444</sprite>
     <sprite>equipment/legs/shorts-male.xml|#333333,555555,444444</sprite>
-    <sprite>hairstyles/hairstyle05.xml|#333333</sprite>
+    <sprite>hairstyles/hairstyle05-male.xml|#333333</sprite>
     <particlefx>graphics/particles/monster-souleater.particle.xml</particlefx>
   </monster>
   <monster id="1098" name="Copper Slime">
@@ -495,7 +494,7 @@
   </monster>
   <monster id="1099" name="Sleeping Bandit">
     <sprite>monsters/sleeping-bandit.xml</sprite>
-    <sprite>equipment/weapons/dagger-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;</sprite>
+    <sprite>equipment/weapons/dagger-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
   </monster>
   <monster id="1100" name="Azul Slime">
     <sprite>monsters/slime-littleslime.xml|#3080e4,d2f4ff</sprite>
@@ -505,7 +504,7 @@
     <sprite>monsters/spirit-demonic.xml|#444444,9933ff</sprite>
   </monster>
   <monster id="1102" name="Luvia">
-    <sprite>races/talponian-female.xml</sprite>
+    <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/feet/assassin-boots-female.xml</sprite>
     <sprite>equipment/legs/shorts-female.xml|#121212,343434</sprite>
     <sprite>equipment/chest/sorcerer-robe-female.xml|#121212,343434;#8F47D6</sprite>
@@ -521,7 +520,7 @@
     <sprite>equipment/chest/demonwarlordplate-male.xml|#444444,979797</sprite>
     <sprite>equipment/head/bull-male.xml</sprite>
     <particlefx>graphics/particles/monster-witchguard.particle.xml</particlefx>
-    <sprite>equipment/weapons/dagger-male.xml|#1c1b00,1b1a31,5b5660,827e85,9596e0;</sprite>
+    <sprite>equipment/weapons/dagger-male.xml|#1c1b00,1b1a31,5b5660,827e85,9596e0</sprite>
   </monster>
   <monster id="1104" name="Demonic Mouboo">
     <sprite>monsters/mouboo-demonic.xml</sprite>
@@ -587,16 +586,16 @@
   </monster>
   <monster id="1115" name="Sea Slime Mother">
     <sprite>monsters/slime-mother.xml|#4ca1a0,ffffff</sprite>
-    <sprite>equipment/weapons/bow-slimecovered-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d;|#4Ca16e,ffffff</sprite>
+    <sprite>monsters/accessories/slime-covered-bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d;#4Ca16e,ffffff</sprite>
     <sound event="hit">monsters/slime/slime-hit1.ogg</sound>
-    <attack id="1" missile-particle="graphics/particles/arrowh-sea-slime.particle.xml" action="attack"/>
+    <attack id="1" missile-particle="graphics/particles/arrowh-sea-slime.particle.xml|#4Ca16e,ffffff" action="attack"/>
   </monster>
   <monster id="1116" name="Undead Witch">
     <sprite>monsters/skeleton.xml|#ffe8bf</sprite>
     <sprite>hairstyles/hairstyle08-male.xml</sprite>
     <sprite>equipment/head/witch-hat-male.xml</sprite>
     <sprite>equipment/chest/sorcerer-robe-female.xml|#111111,222222,333333,444444,555555,aaaaaa;#EFEFEF</sprite>
-    <sprite>equipment/weapons/polearm-blunt-male.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d;</sprite>
+    <sprite>equipment/weapons/polearm-blunt-male.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
     <attack id="1" missile-particle="graphics/particles/undead-witch-attack.particle.xml" action="attack"/>
   </monster>
   <monster id="1117" name="Undead Troll">
@@ -605,12 +604,12 @@
   </monster>
   <monster id="1118" name="Green Slime Mother">
     <sprite>monsters/slime-mother.xml|#72982c,ffffff</sprite>
-    <sprite>equipment/weapons/bow-slimecovered-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d;|#72982c,ffffff</sprite>
+    <sprite>monsters/accessories/slime-covered-bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d;#72982c,ffffff</sprite>
     <sound event="hit">monsters/slime/slime-hit1.ogg</sound>
-    <attack id="1" missile-particle="graphics/particles/arrowh-green-slime.particle.xml" action="attack"/>
+    <attack id="1" missile-particle="graphics/particles/arrowh-green-slime.particle.xml|#72982c,ffffff" action="attack"/>
   </monster>
   <monster id="1119" name="Thug">
-    <sprite>races/talponian-pirate.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#36e2fc,0ba8bf,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/head/sailor-hat-male.xml</sprite>
     <sprite>equipment/feet/boots-male.xml</sprite>
     <sprite>equipment/chest/tanktop-male.xml</sprite>
@@ -618,16 +617,16 @@
     <attack id="1" type="direct"/>
   </monster>
   <monster id="1120" name="Swashbuckler">
-    <sprite>races/talponian-pirate.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#36e2fc,0ba8bf,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/chest/vnecksweater-male.xml</sprite>
     <sprite>equipment/legs/pants-male.xml|#212121,555555</sprite>
     <sprite>equipment/head/bandana-male.xml|#212121,555555</sprite>
     <sprite>equipment/feet/boots-male.xml|#212121,555555</sprite>
-    <sprite>equipment/weapons/dagger-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;</sprite>
+    <sprite>equipment/weapons/dagger-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <attack id="1" type="direct"/>
   </monster>
   <monster id="1121" name="Grenadier">
-    <sprite>races/talponian-pirate.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#36e2fc,0ba8bf,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/chest/sorcerer-robe-male.xml|#5178a0,1a294c;#d5b02c</sprite>
     <sprite>equipment/legs/pants-male.xml|#5178a0,1a294c</sprite>
     <sprite>equipment/head/piratehat-male.xml</sprite>
@@ -636,21 +635,21 @@
     <attack id="1" critical-hit-effect-id="31" hit-effect-id="402" missile-particle="graphics/particles/lobbed-object.xml" action="attack"/>
   </monster>
   <monster id="1122" name="The Dread Pirate Marley">
-    <sprite>races/talponian-pirate.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#36e2fc,0ba8bf,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/chest/assassin-male.xml</sprite>
     <sprite>equipment/legs/assassin-male.xml</sprite>
-    <sprite>equipment/head/eyepatch.xml</sprite>
+    <sprite>equipment/head/eyepatch-male.xml</sprite>
     <sprite>equipment/feet/assassin-boots-male.xml</sprite>
-    <sprite>equipment/weapons/bow-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d;</sprite>
+    <sprite>equipment/weapons/bow-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
     <attack id="1" missile-particle="graphics/particles/arrow.particle.xml" action="attack"/>
   </monster>
   <monster id="1123" name="The Dread Pirate Marley">
-    <sprite>races/talponian-pirate.xml</sprite>
+    <sprite>model/male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#36e2fc,0ba8bf,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>equipment/chest/assassin-male.xml</sprite>
     <sprite>equipment/legs/assassin-male.xml</sprite>
-    <sprite>equipment/head/eyepatch.xml</sprite>
+    <sprite>equipment/head/eyepatch-male.xml</sprite>
     <sprite>equipment/feet/assassin-boots-male.xml</sprite>
-    <sprite>equipment/weapons/bow-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d;</sprite>
+    <sprite>equipment/weapons/bow-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
     <attack id="1" missile-particle="graphics/particles/arrow.particle.xml" action="attack"/>
   </monster>
   <monster id="1124" name="Wight">
@@ -675,7 +674,7 @@
     <sprite>monsters/demon.xml|#444444,979797</sprite>
     <sprite>equipment/feet/warlordboots-male.xml|#333333,878787</sprite>
     <sprite>equipment/hands/generic-male.xml|#242424,626262</sprite>
-    <sprite>equipment/chest/demonwarlordplate-male.xml|#ea0000979797</sprite>
+    <sprite>equipment/chest/demonwarlordplate-male.xml|#ea0000,979797</sprite>
     <sprite>equipment/head/bull-male.xml</sprite>
     <particlefx>graphics/particles/monster-witchguard.particle.xml</particlefx>
     <sprite>equipment/weapons/dagger-male.xml|#181619,1c1b00,1b1a31,54438a,5b5660,827e85,9596e0</sprite>