prepare for new races, fix random things

update colors

fix race ids and names

add new tritan styles

various fixes

add female equipment

equip-head

equip-1hand

equip-2hand

equip-arms

equip-feet

equip-legs

equip-torso

add female model once again

manaplus being dumb (no fallback support)

make Rouge use the bra item

use male model as base model

otherwise the neutral tank top shows on some npcs

fix pirates

fix hairstyles for char creation (class 0)

Fix F hairstyle 8 and 12

Fix Errant reds in N back

FIX more headstyles

14 files changed, 14 insertions, 565 deletions

diff --git a/graphics/sprites/model/Gispaan.png b/graphics/sprites/model/Gispaan.png
deleted file mode 100644
index f85d1fc8..00000000
--- a/graphics/sprites/model/Gispaan.png
+++ /dev/null
diff --git a/graphics/sprites/model/Sparron.png b/graphics/sprites/model/Sparron.png
deleted file mode 100644
index 9f6f5bc3..00000000
--- a/graphics/sprites/model/Sparron.png
+++ /dev/null
diff --git a/graphics/sprites/model/Sparron.xml b/graphics/sprites/model/Sparron.xml
deleted file mode 100644
index ab945f40..00000000
--- a/graphics/sprites/model/Sparron.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0"?>
-<sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/model/Sparron.png|W;B;R" width="64" height="64"/>
-  <action name="default" imageset="base"/>
-  <action name="stand" imageset="base">
-    <animation direction="down">
-      <frame index="0"/>
-    </animation>
-    <animation direction="left">
-      <frame index="18"/>
-    </animation>
-    <animation direction="up">
-      <frame index="36"/>
-    </animation>
-    <animation direction="right">
-      <frame index="54"/>
-    </animation>
-  </action>
-  <action name="walk" imageset="base">
-    <animation direction="down">
-      <sequence start="1" end="6" delay="75"/>
-    </animation>
-    <animation direction="left">
-      <sequence start="19" end="24" delay="75"/>
-    </animation>
-    <animation direction="up">
-      <sequence start="37" end="42" delay="75"/>
-    </animation>
-    <animation direction="right">
-      <sequence start="55" end="60" delay="75"/>
-    </animation>
-  </action>
-  <action name="sit" imageset="base">
-    <animation direction="down">
-      <frame index="7"/>
-    </animation>
-    <animation direction="left">
-      <frame index="25"/>
-    </animation>
-    <animation direction="up">
-      <frame index="43"/>
-    </animation>
-    <animation direction="right">
-      <frame index="61"/>
-    </animation>
-  </action>
-  <action name="dead" imageset="base">
-    <animation direction="down">
-      <frame index="8"/>
-    </animation>
-    <animation direction="left">
-      <frame index="26"/>
-    </animation>
-    <animation direction="up">
-      <frame index="44"/>
-    </animation>
-    <animation direction="right">
-      <frame index="62"/>
-    </animation>
-  </action>
-  <action name="attack" imageset="base">
-    <animation direction="down">
-      <sequence start="9" end="12" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <sequence start="27" end="30" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <sequence start="45" end="48" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <sequence start="63" end="66" delay="75"/>
-      <end/>
-    </animation>
-  </action>
-  <action name="attack_sword_stab" imageset="base">
-    <animation direction="down">
-      <sequence start="9" end="12" delay="100"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <sequence start="27" end="30" delay="100"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <sequence start="45" end="48" delay="100"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <sequence start="63" end="66" delay="100"/>
-      <end/>
-    </animation>
-  </action>
-  <action name="attack_bow" imageset="base">
-    <animation direction="down">
-      <sequence start="13" end="17" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <sequence start="31" end="35" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <sequence start="49" end="53" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <sequence start="67" end="71" delay="75"/>
-      <end/>
-    </animation>
-  </action>
-  <action name="attack_spear" imageset="base">
-    <animation direction="down">
-      <sequence start="72" end="75" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <sequence start="76" end="79" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <sequence start="81" end="84" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <sequence start="85" end="88" delay="140"/>
-      <end/>
-    </animation>
-  </action>
-  <action name="attack_chop" imageset="base">
-    <animation direction="down">
-      <sequence start="90" end="93" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <sequence start="94" end="97" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <sequence start="99" end="102" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <sequence start="103" end="106" delay="140"/>
-      <end/>
-    </animation>
-  </action>
-  <action name="attack_2hand" imageset="base">
-    <animation direction="down">
-      <sequence start="108" end="111" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <sequence start="112" end="115" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <sequence start="117" end="120" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <sequence start="121" end="124" delay="140"/>
-      <end/>
-    </animation>
-  </action>
-  <action name="cast" imageset="base">
-    <animation direction="down">
-      <sequence start="126" end="127" delay="250"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <sequence start="128" end="129" delay="250"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <sequence start="130" end="131" delay="250"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <sequence start="132" end="133" delay="250"/>
-      <end/>
-    </animation>
-  </action>
-</sprite>
diff --git a/graphics/sprites/model/Talponian.png b/graphics/sprites/model/Talponian.png
deleted file mode 100644
index f1e8780a..00000000
--- a/graphics/sprites/model/Talponian.png
+++ /dev/null
diff --git a/graphics/sprites/model/Talponian.xml b/graphics/sprites/model/Talponian.xml
deleted file mode 100644
index 86a7f3eb..00000000
--- a/graphics/sprites/model/Talponian.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0"?>
-<sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/model/Talponian.png|W;B;R" width="64" height="64"/>
-  <action name="default" imageset="base"/>
-  <action name="stand" imageset="base">
-    <animation direction="down">
-      <frame index="0"/>
-    </animation>
-    <animation direction="left">
-      <frame index="18"/>
-    </animation>
-    <animation direction="up">
-      <frame index="36"/>
-    </animation>
-    <animation direction="right">
-      <frame index="54"/>
-    </animation>
-  </action>
-  <action name="walk" imageset="base">
-    <animation direction="down">
-      <sequence start="1" end="6" delay="75"/>
-    </animation>
-    <animation direction="left">
-      <sequence start="19" end="24" delay="75"/>
-    </animation>
-    <animation direction="up">
-      <sequence start="37" end="42" delay="75"/>
-    </animation>
-    <animation direction="right">
-      <sequence start="55" end="60" delay="75"/>
-    </animation>
-  </action>
-  <action name="sit" imageset="base">
-    <animation direction="down">
-      <frame index="7"/>
-    </animation>
-    <animation direction="left">
-      <frame index="25"/>
-    </animation>
-    <animation direction="up">
-      <frame index="43"/>
-    </animation>
-    <animation direction="right">
-      <frame index="61"/>
-    </animation>
-  </action>
-  <action name="dead" imageset="base">
-    <animation direction="down">
-      <frame index="8"/>
-    </animation>
-    <animation direction="left">
-      <frame index="26"/>
-    </animation>
-    <animation direction="up">
-      <frame index="44"/>
-    </animation>
-    <animation direction="right">
-      <frame index="62"/>
-    </animation>
-  </action>
-  <action name="attack" imageset="base">
-    <animation direction="down">
-      <sequence start="9" end="12" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <sequence start="27" end="30" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <sequence start="45" end="48" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <sequence start="63" end="66" delay="75"/>
-      <end/>
-    </animation>
-  </action>
-  <action name="attack_sword_stab" imageset="base">
-    <animation direction="down">
-      <sequence start="9" end="12" delay="100"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <sequence start="27" end="30" delay="100"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <sequence start="45" end="48" delay="100"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <sequence start="63" end="66" delay="100"/>
-      <end/>
-    </animation>
-  </action>
-  <action name="attack_bow" imageset="base">
-    <animation direction="down">
-      <sequence start="13" end="17" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <sequence start="31" end="35" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <sequence start="49" end="53" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <sequence start="67" end="71" delay="75"/>
-      <end/>
-    </animation>
-  </action>
-  <action name="attack_spear" imageset="base">
-    <animation direction="down">
-      <sequence start="72" end="75" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <sequence start="76" end="79" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <sequence start="81" end="84" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <sequence start="85" end="88" delay="140"/>
-      <end/>
-    </animation>
-  </action>
-  <action name="attack_chop" imageset="base">
-    <animation direction="down">
-      <sequence start="90" end="93" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <sequence start="94" end="97" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <sequence start="99" end="102" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <sequence start="103" end="106" delay="140"/>
-      <end/>
-    </animation>
-  </action>
-  <action name="attack_2hand" imageset="base">
-    <animation direction="down">
-      <sequence start="108" end="111" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <sequence start="112" end="115" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <sequence start="117" end="120" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <sequence start="121" end="124" delay="140"/>
-      <end/>
-    </animation>
-  </action>
-  <action name="cast" imageset="base">
-    <animation direction="down">
-      <sequence start="126" end="127" delay="250"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <sequence start="128" end="129" delay="250"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <sequence start="130" end="131" delay="250"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <sequence start="132" end="133" delay="250"/>
-      <end/>
-    </animation>
-  </action>
-</sprite>
diff --git a/graphics/sprites/model/Tritan.png b/graphics/sprites/model/Tritan.png
deleted file mode 100644
index a9659253..00000000
--- a/graphics/sprites/model/Tritan.png
+++ /dev/null
diff --git a/graphics/sprites/model/Tritan.xml b/graphics/sprites/model/Tritan.xml
deleted file mode 100644
index 5d957bf3..00000000
--- a/graphics/sprites/model/Tritan.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0"?>
-<sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/model/Tritan.png|W;B;R" width="64" height="64"/>
-  <action name="default" imageset="base"/>
-  <action name="stand" imageset="base">
-    <animation direction="down">
-      <frame index="0"/>
-    </animation>
-    <animation direction="left">
-      <frame index="18"/>
-    </animation>
-    <animation direction="up">
-      <frame index="36"/>
-    </animation>
-    <animation direction="right">
-      <frame index="54"/>
-    </animation>
-  </action>
-  <action name="walk" imageset="base">
-    <animation direction="down">
-      <sequence start="1" end="6" delay="75"/>
-    </animation>
-    <animation direction="left">
-      <sequence start="19" end="24" delay="75"/>
-    </animation>
-    <animation direction="up">
-      <sequence start="37" end="42" delay="75"/>
-    </animation>
-    <animation direction="right">
-      <sequence start="55" end="60" delay="75"/>
-    </animation>
-  </action>
-  <action name="sit" imageset="base">
-    <animation direction="down">
-      <frame index="7"/>
-    </animation>
-    <animation direction="left">
-      <frame index="25"/>
-    </animation>
-    <animation direction="up">
-      <frame index="43"/>
-    </animation>
-    <animation direction="right">
-      <frame index="61"/>
-    </animation>
-  </action>
-  <action name="dead" imageset="base">
-    <animation direction="down">
-      <frame index="8"/>
-    </animation>
-    <animation direction="left">
-      <frame index="26"/>
-    </animation>
-    <animation direction="up">
-      <frame index="44"/>
-    </animation>
-    <animation direction="right">
-      <frame index="62"/>
-    </animation>
-  </action>
-  <action name="attack" imageset="base">
-    <animation direction="down">
-      <sequence start="9" end="12" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <sequence start="27" end="30" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <sequence start="45" end="48" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <sequence start="63" end="66" delay="75"/>
-      <end/>
-    </animation>
-  </action>
-  <action name="attack_sword_stab" imageset="base">
-    <animation direction="down">
-      <sequence start="9" end="12" delay="100"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <sequence start="27" end="30" delay="100"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <sequence start="45" end="48" delay="100"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <sequence start="63" end="66" delay="100"/>
-      <end/>
-    </animation>
-  </action>
-  <action name="attack_bow" imageset="base">
-    <animation direction="down">
-      <sequence start="13" end="17" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <sequence start="31" end="35" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <sequence start="49" end="53" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <sequence start="67" end="71" delay="75"/>
-      <end/>
-    </animation>
-  </action>
-  <action name="attack_spear" imageset="base">
-    <animation direction="down">
-      <sequence start="72" end="75" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <sequence start="76" end="79" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <sequence start="81" end="84" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <sequence start="85" end="88" delay="140"/>
-      <end/>
-    </animation>
-  </action>
-  <action name="attack_chop" imageset="base">
-    <animation direction="down">
-      <sequence start="90" end="93" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <sequence start="94" end="97" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <sequence start="99" end="102" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <sequence start="103" end="106" delay="140"/>
-      <end/>
-    </animation>
-  </action>
-  <action name="attack_2hand" imageset="base">
-    <animation direction="down">
-      <sequence start="108" end="111" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <sequence start="112" end="115" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <sequence start="117" end="120" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <sequence start="121" end="124" delay="140"/>
-      <end/>
-    </animation>
-  </action>
-  <action name="cast" imageset="base">
-    <animation direction="down">
-      <sequence start="126" end="127" delay="250"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <sequence start="128" end="129" delay="250"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <sequence start="130" end="131" delay="250"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <sequence start="132" end="133" delay="250"/>
-      <end/>
-    </animation>
-  </action>
-</sprite>
diff --git a/graphics/sprites/model/base.xml b/graphics/sprites/model/base.xml
index 030a8fd7..790ccee4 100644
--- a/graphics/sprites/model/base.xml
+++ b/graphics/sprites/model/base.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <!-- FOR RETRO-COMPATIBILITY WITH OLD NPCs -->
-  <imageset name="base" src="graphics/sprites/model/Talponian.png|W;B;R" width="64" height="64"/>
-  <include file="model/Talponian.xml"/>
+  <!-- uses the male model because otherwise the neutral tank top shows on some npcs -->
+  <imageset name="base" src="graphics/sprites/model/male.png|W;B;R" width="64" height="64"/>
+  <include file="model/neutral.xml"/>
 </sprite>
diff --git a/graphics/sprites/model/female.png b/graphics/sprites/model/female.png
new file mode 100644
index 00000000..cb66ed85
--- /dev/null
+++ b/graphics/sprites/model/female.png
diff --git a/graphics/sprites/model/female.xml b/graphics/sprites/model/female.xml
new file mode 100644
index 00000000..6c070232
--- /dev/null
+++ b/graphics/sprites/model/female.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<sprite variants="135" variant_offset="1">
+  <imageset name="base" src="graphics/sprites/model/female.png|W;B;R" width="64" height="64"/>
+  <include file="model/neutral.xml"/>
+</sprite>
diff --git a/graphics/sprites/model/male.png b/graphics/sprites/model/male.png
new file mode 100644
index 00000000..d16cad92
--- /dev/null
+++ b/graphics/sprites/model/male.png
diff --git a/graphics/sprites/model/male.xml b/graphics/sprites/model/male.xml
new file mode 100644
index 00000000..364efa34
--- /dev/null
+++ b/graphics/sprites/model/male.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<sprite variants="135" variant_offset="1">
+  <imageset name="base" src="graphics/sprites/model/male.png|W;B;R" width="64" height="64"/>
+  <include file="model/neutral.xml"/>
+</sprite>
diff --git a/graphics/sprites/model/neutral.png b/graphics/sprites/model/neutral.png
new file mode 100644
index 00000000..2ffb4f53
--- /dev/null
+++ b/graphics/sprites/model/neutral.png
diff --git a/graphics/sprites/model/Gispaan.xml b/graphics/sprites/model/neutral.xml
index 24c85e81..0cbdaf45 100644
--- a/graphics/sprites/model/Gispaan.xml
+++ b/graphics/sprites/model/neutral.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite variants="135" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/model/Gispaan.png|W;B;R" width="64" height="64"/>
+  <imageset name="base" src="graphics/sprites/model/neutral.png|W;B;R" width="64" height="64"/>
   <action name="default" imageset="base"/>
   <action name="stand" imageset="base">
     <animation direction="down">