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, 40 insertions, 14 deletions

diff --git a/items/equip-2hand/item1200_Bow.xml b/items/equip-2hand/item1200_Bow.xml
index b61e073f..95113537 100644
--- a/items/equip-2hand/item1200_Bow.xml
+++ b/items/equip-2hand/item1200_Bow.xml
@@ -7,6 +7,8 @@
     <its:translateRule selector="//*" translate="no"/>
   </its:rules>
   <item id="1200" image="equipment/weapon/bow-bow.png" name="Bow" description="A distance weapon." effect="Damage +20 / Range 5" type="equip-2hand" weight="20" missile-particle="graphics/particles/arrow.particle.xml" attack-action="attack_bow" attack-range="5">
-    <sprite>equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite gender="female">equipment/weapons/bow-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite gender="male">equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite gender="other">equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
   </item>
 </items>
diff --git a/items/equip-2hand/item530_ShortBow.xml b/items/equip-2hand/item530_ShortBow.xml
index af377a5c..d8b8f5df 100644
--- a/items/equip-2hand/item530_ShortBow.xml
+++ b/items/equip-2hand/item530_ShortBow.xml
@@ -7,6 +7,8 @@
     <its:translateRule selector="//*" translate="no"/>
   </its:rules>
   <item id="530" image="equipment/weapon/bow-shortbow.png" name="Short Bow" description="A bow for short distances." effect="Damage +50 / Range 5" type="equip-2hand" attack-action="attack_bow" attack-range="5" weight="600" missile-particle="graphics/particles/arrow.particle.xml">
-    <sprite>equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite gender="female">equipment/weapons/bow-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite gender="male">equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite gender="other">equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
   </item>
 </items>
diff --git a/items/equip-2hand/item545_ForestBow.xml b/items/equip-2hand/item545_ForestBow.xml
index b0c70476..d2a78357 100644
--- a/items/equip-2hand/item545_ForestBow.xml
+++ b/items/equip-2hand/item545_ForestBow.xml
@@ -7,6 +7,8 @@
     <its:translateRule selector="//*" translate="no"/>
   </its:rules>
   <item id="545" image="equipment/weapon/bow-forestbow.png" name="Forest Bow" description="A bow usually used for hunting." effect="Damage +70 / Range 5" type="equip-2hand" attack-action="attack_bow" attack-range="5" weight="1200" missile-particle="graphics/particles/arrow.particle.xml">
-    <sprite>equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite gender="female">equipment/weapons/bow-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite gender="male">equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite gender="other">equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
   </item>
 </items>
diff --git a/items/equip-2hand/item548_Halberd.xml b/items/equip-2hand/item548_Halberd.xml
index 25fdf6b3..d46bb05e 100644
--- a/items/equip-2hand/item548_Halberd.xml
+++ b/items/equip-2hand/item548_Halberd.xml
@@ -7,6 +7,8 @@
     <its:translateRule selector="//*" translate="no"/>
   </its:rules>
   <item id="548" image="equipment/weapon/polearm-halberd.png" name="Halberd" description="A weapon usually carried by guards." effect="Damage +?" type="equip-2hand" attack-action="attack_2hand" attack-range="2" weight="1400">
-    <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>
+    <sprite gender="female">equipment/weapons/polearm-chop-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite gender="male">equipment/weapons/polearm-chop.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite gender="other">equipment/weapons/polearm-chop.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
   </item>
 </items>
diff --git a/items/equip-2hand/item588_BastardSword.xml b/items/equip-2hand/item588_BastardSword.xml
index 0d124cec..81734b9a 100644
--- a/items/equip-2hand/item588_BastardSword.xml
+++ b/items/equip-2hand/item588_BastardSword.xml
@@ -7,6 +7,8 @@
     <its:translateRule selector="//*" translate="no"/>
   </its:rules>
   <item id="588" image="equipment/weapon/sword-bastardsword.png" name="Bastard Sword" description="A large two handed sword." effect="Damage +?" type="equip-2hand" attack-action="attack_2hand" attack-range="2" weight="10">
-    <sprite>equipment/weapons/sword-long.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
+    <sprite gender="female">equipment/weapons/sword-long-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
+    <sprite gender="male">equipment/weapons/sword-long.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
+    <sprite gender="other">equipment/weapons/sword-long.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
   </item>
 </items>
diff --git a/items/equip-2hand/item594_Spear.xml b/items/equip-2hand/item594_Spear.xml
index 6f6d2dea..61c43565 100644
--- a/items/equip-2hand/item594_Spear.xml
+++ b/items/equip-2hand/item594_Spear.xml
@@ -7,6 +7,8 @@
     <its:translateRule selector="//*" translate="no"/>
   </its:rules>
   <item id="594" image="equipment/weapon/polearm-spear.png" name="Spear" description="A light spear with a wooden pole." effect="Damage +?" type="equip-2hand" attack-action="attack_spear" attack-range="2" weight="700">
-    <sprite>equipment/weapons/polearm-spear.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite gender="female">equipment/weapons/polearm-spear-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite gender="male">equipment/weapons/polearm-spear.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite gender="other">equipment/weapons/polearm-spear.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
   </item>
 </items>
diff --git a/items/equip-2hand/item595_HeavySpear.xml b/items/equip-2hand/item595_HeavySpear.xml
index e2ebf0fb..ab76d192 100644
--- a/items/equip-2hand/item595_HeavySpear.xml
+++ b/items/equip-2hand/item595_HeavySpear.xml
@@ -7,6 +7,8 @@
     <its:translateRule selector="//*" translate="no"/>
   </its:rules>
   <item id="595" image="equipment/weapon/polearm-heavyspear.png" name="Heavy Spear" description="A heavy spear with a wooden pole." effect="Damage +?" type="equip-2hand" attack-action="attack_spear" attack-range="2" weight="1000">
-    <sprite>equipment/weapons/polearm-spear.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite gender="female">equipment/weapons/polearm-spear-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite gender="male">equipment/weapons/polearm-spear.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite gender="other">equipment/weapons/polearm-spear.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
   </item>
 </items>
diff --git a/items/equip-2hand/item596_Pike.xml b/items/equip-2hand/item596_Pike.xml
index 7faaffc9..a5de2393 100644
--- a/items/equip-2hand/item596_Pike.xml
+++ b/items/equip-2hand/item596_Pike.xml
@@ -7,6 +7,8 @@
     <its:translateRule selector="//*" translate="no"/>
   </its:rules>
   <item id="596" image="equipment/weapon/polearm-pike.png" name="Pike" description="A light spear with an iron pole." effect="Damage +?" type="equip-2hand" attack-action="attack_spear" attack-range="2" weight="1200">
-    <sprite>equipment/weapons/polearm-spear.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite gender="female">equipment/weapons/polearm-spear-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite gender="male">equipment/weapons/polearm-spear.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite gender="other">equipment/weapons/polearm-spear.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
   </item>
 </items>
diff --git a/items/equip-2hand/item597_HeavyPike.xml b/items/equip-2hand/item597_HeavyPike.xml
index 873f28ae..2417046e 100644
--- a/items/equip-2hand/item597_HeavyPike.xml
+++ b/items/equip-2hand/item597_HeavyPike.xml
@@ -7,6 +7,8 @@
     <its:translateRule selector="//*" translate="no"/>
   </its:rules>
   <item id="597" image="equipment/weapon/polearm-heavypike.png" name="Heavy Pike" description="A heavy spear with an iron pole." effect="Damage +?" type="equip-2hand" attack-action="attack_spear" attack-range="2" weight="1500">
-    <sprite>equipment/weapons/polearm-spear.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite gender="female">equipment/weapons/polearm-spear-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite gender="male">equipment/weapons/polearm-spear.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite gender="other">equipment/weapons/polearm-spear.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
   </item>
 </items>
diff --git a/items/equip-2hand/item623_Scythe.xml b/items/equip-2hand/item623_Scythe.xml
index 321c7f45..1d7a85de 100644
--- a/items/equip-2hand/item623_Scythe.xml
+++ b/items/equip-2hand/item623_Scythe.xml
@@ -7,6 +7,8 @@
     <its:translateRule selector="//*" translate="no"/>
   </its:rules>
   <item id="623" image="equipment/weapon/polearm-scythe.png" name="Scythe" description="Usually used for farming but also usable as a weapon. Slow but deadly." effect="Damage +75" type="equip-2hand" attack-action="attack_2hand" attack-range="2" weight="1200" sellProtected="true">
-    <sprite>equipment/weapons/polearm-stab.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite gender="female">equipment/weapons/polearm-stab-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite gender="male">equipment/weapons/polearm-stab.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite gender="other">equipment/weapons/polearm-stab.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
   </item>
 </items>
diff --git a/items/equip-2hand/item758_WoodenStaff.xml b/items/equip-2hand/item758_WoodenStaff.xml
index 95c5fcca..c251d583 100644
--- a/items/equip-2hand/item758_WoodenStaff.xml
+++ b/items/equip-2hand/item758_WoodenStaff.xml
@@ -7,6 +7,8 @@
     <its:translateRule selector="//*" translate="no"/>
   </its:rules>
   <item id="758" image="equipment/weapon/staff-woodstaff.png" name="Wooden Staff" description="A basic wooden staff." effect="Damage +50 / M. Attack +10 / Lvl 2 Wand / Requires Int 60+" type="equip-2hand" attack-action="attack_sword_stab" attack-range="2" weight="1000">
-    <sprite>equipment/weapons/polearm-blunt.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite gender="female">equipment/weapons/polearm-blunt-female.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite gender="male">equipment/weapons/polearm-blunt.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite gender="other">equipment/weapons/polearm-blunt.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
   </item>
 </items>
diff --git a/items/equip-2hand/item878_BansheeBow.xml b/items/equip-2hand/item878_BansheeBow.xml
index 14f8a008..f10d755c 100644
--- a/items/equip-2hand/item878_BansheeBow.xml
+++ b/items/equip-2hand/item878_BansheeBow.xml
@@ -7,6 +7,8 @@
     <its:translateRule selector="//*" translate="no"/>
   </its:rules>
   <item id="878" image="equipment/weapon/bow-bansheebow.png" name="Banshee Bow" description="A bow that has been enchanted by the dark powers of a witch." effect="Damage +90 / Range 6 / Attack Speed +20% / Critical Damage +70 / -150 HP / Defense -40% / VIT Defense -35% / Vanishes HP by 4% of damages dealt / Requires Level 90 / Dexterity 80+ required to activate the bonuses" type="equip-2hand" attack-action="attack_bow" attack-range="5" weight="900" missile-particle="graphics/particles/arrow-banshee.particle.xml" sellProtected="true">
-    <sprite>equipment/weapons/bow-banshee.xml|#27113e,7442a7,b498d1</sprite>
+    <sprite gender="female">equipment/weapons/bow-banshee-female.xml|#27113e,7442a7,b498d1</sprite>
+    <sprite gender="male">equipment/weapons/bow-banshee.xml|#27113e,7442a7,b498d1</sprite>
+    <sprite gender="other">equipment/weapons/bow-banshee.xml|#27113e,7442a7,b498d1</sprite>
   </item>
 </items>
diff --git a/items/equip-2hand/item903_SlingShot.xml b/items/equip-2hand/item903_SlingShot.xml
index c54eaa0e..9b718860 100644
--- a/items/equip-2hand/item903_SlingShot.xml
+++ b/items/equip-2hand/item903_SlingShot.xml
@@ -7,6 +7,8 @@
     <its:translateRule selector="//*" translate="no"/>
   </its:rules>
   <item id="903" image="equipment/weapon/slingshot-icon.png|G:#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;R:#332c19,443a20,453b1e,61532d,87733d,a58d4d" name="Sling Shot" description="In the right hands, everything is a weapon." effect="Damage +5 / Range 3" type="equip-2hand" attack-action="attack_bow" attack-range="5" weight="10" missile-particle="graphics/particles/stoneprojectile.particle.xml">
-    <sprite>equipment/weapons/bow-slingshot.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite gender="female">equipment/weapons/bow-slingshot-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite gender="male">equipment/weapons/bow-slingshot.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite gender="other">equipment/weapons/bow-slingshot.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
   </item>
 </items>
diff --git a/items/equip-2hand/item906_KidBook.xml b/items/equip-2hand/item906_KidBook.xml
index 286bfb75..477c89ae 100644
--- a/items/equip-2hand/item906_KidBook.xml
+++ b/items/equip-2hand/item906_KidBook.xml
@@ -9,7 +9,7 @@
   <item id="906" image="equipment/weapon/kidbook.png" name="Kid Book" description="A big spell book used to transform humans into Trolls." effect="Damage +1" type="equip-2hand" weight="100" missile-particle="graphics/particles/monster-troll-foefire.particle.xml" sellProtected="true">
     <replace/>
     <replace sprite="race">
-      <item to="-199"/>
+      <item to="-99054"/>
     </replace>
   </item>
 </items>