From ec3266539a40191dea8860ad72477e847e5e0ab5 Mon Sep 17 00:00:00 2001
From: mekolat <mekolat@users.noreply.github.com>
Date: Tue, 5 Jan 2016 13:01:16 -0500
Subject: 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
---
 items/equip-arms/item2160_RedCottonGloves.xml       | 4 +++-
 items/equip-arms/item2161_GreenCottonGloves.xml     | 4 +++-
 items/equip-arms/item2162_DarkBlueCottonGloves.xml  | 4 +++-
 items/equip-arms/item2163_YellowCottonGloves.xml    | 4 +++-
 items/equip-arms/item2164_LightBlueCottonGloves.xml | 4 +++-
 items/equip-arms/item2165_PinkCottonGloves.xml      | 4 +++-
 items/equip-arms/item2166_BlackCottonGloves.xml     | 4 +++-
 items/equip-arms/item2167_OrangeCottonGloves.xml    | 4 +++-
 items/equip-arms/item2168_PurpleCottonGloves.xml    | 4 +++-
 items/equip-arms/item2169_DarkGreenCottonGloves.xml | 4 +++-
 items/equip-arms/item531_MinerGloves.xml            | 4 +++-
 items/equip-arms/item532_LeatherGloves.xml          | 4 +++-
 items/equip-arms/item563_WinterGloves.xml           | 4 +++-
 items/equip-arms/item741_CottonGloves.xml           | 4 +++-
 items/equip-arms/item756_AssassinGloves.xml         | 4 +++-
 items/equip-arms/item794_BromenalGloves.xml         | 4 +++-
 items/equip-arms/item868_SilkGloves.xml             | 4 +++-
 17 files changed, 51 insertions(+), 17 deletions(-)

(limited to 'items/equip-arms')

diff --git a/items/equip-arms/item2160_RedCottonGloves.xml b/items/equip-arms/item2160_RedCottonGloves.xml
index 6dd69c94..1cafd289 100644
--- a/items/equip-arms/item2160_RedCottonGloves.xml
+++ b/items/equip-arms/item2160_RedCottonGloves.xml
@@ -7,6 +7,8 @@
     <its:translateRule selector="//*" translate="no"/>
   </its:rules>
   <item id="2160" image="equipment/hands/basicgloves.png|W:#581a1a,a41111,c03a3a,ff6060" name="Red Cotton Gloves" description="A red pair of comfy cotton gloves." effect="M. Attack -10" type="equip-arms" defense="1" weight="20">
-    <sprite>equipment/hands/generic.xml|#581a1a,a41111,c03a3a,ff6060</sprite>
+    <sprite gender="female">equipment/hands/generic-female.xml|#581a1a,a41111,c03a3a,ff6060</sprite>
+    <sprite gender="male">equipment/hands/generic.xml|#581a1a,a41111,c03a3a,ff6060</sprite>
+    <sprite gender="other">equipment/hands/generic.xml|#581a1a,a41111,c03a3a,ff6060</sprite>
   </item>
 </items>
diff --git a/items/equip-arms/item2161_GreenCottonGloves.xml b/items/equip-arms/item2161_GreenCottonGloves.xml
index e4e20194..5100a216 100644
--- a/items/equip-arms/item2161_GreenCottonGloves.xml
+++ b/items/equip-arms/item2161_GreenCottonGloves.xml
@@ -7,6 +7,8 @@
     <its:translateRule selector="//*" translate="no"/>
   </its:rules>
   <item id="2161" image="equipment/hands/basicgloves.png|W:#255511,579932,4aaf36,4ed65e" name="Green Cotton Gloves" description="A green pair of comfy cotton gloves." effect="M. Attack -10" type="equip-arms" defense="1" weight="20">
-    <sprite>equipment/hands/generic.xml|#255511,579932,4aaf36,4ed65e</sprite>
+    <sprite gender="female">equipment/hands/generic-female.xml|#255511,579932,4aaf36,4ed65e</sprite>
+    <sprite gender="male">equipment/hands/generic.xml|#255511,579932,4aaf36,4ed65e</sprite>
+    <sprite gender="other">equipment/hands/generic.xml|#255511,579932,4aaf36,4ed65e</sprite>
   </item>
 </items>
diff --git a/items/equip-arms/item2162_DarkBlueCottonGloves.xml b/items/equip-arms/item2162_DarkBlueCottonGloves.xml
index e2e14238..6a5fd402 100644
--- a/items/equip-arms/item2162_DarkBlueCottonGloves.xml
+++ b/items/equip-arms/item2162_DarkBlueCottonGloves.xml
@@ -7,6 +7,8 @@
     <its:translateRule selector="//*" translate="no"/>
   </its:rules>
   <item id="2162" image="equipment/hands/basicgloves.png|W:#1a1a41,392b6e,4c529f,5d5dc2" name="Dark Blue Cotton Gloves" description="A dark blue pair of comfy cotton gloves." effect="M. Attack -10" type="equip-arms" defense="1" weight="20">
-    <sprite>equipment/hands/generic.xml|#1a1a41,392b6e,4c529f,5d5dc2</sprite>
+    <sprite gender="female">equipment/hands/generic-female.xml|#1a1a41,392b6e,4c529f,5d5dc2</sprite>
+    <sprite gender="male">equipment/hands/generic.xml|#1a1a41,392b6e,4c529f,5d5dc2</sprite>
+    <sprite gender="other">equipment/hands/generic.xml|#1a1a41,392b6e,4c529f,5d5dc2</sprite>
   </item>
 </items>
diff --git a/items/equip-arms/item2163_YellowCottonGloves.xml b/items/equip-arms/item2163_YellowCottonGloves.xml
index 132cc49f..de527dc7 100644
--- a/items/equip-arms/item2163_YellowCottonGloves.xml
+++ b/items/equip-arms/item2163_YellowCottonGloves.xml
@@ -7,6 +7,8 @@
     <its:translateRule selector="//*" translate="no"/>
   </its:rules>
   <item id="2163" image="equipment/hands/basicgloves.png|W:#846928,dab641,ffef93,fff7c9" name="Yellow Cotton Gloves" description="A yellow pair of comfy cotton gloves." effect="M. Attack -10" type="equip-arms" defense="1" weight="20">
-    <sprite>equipment/hands/generic.xml|#846928,dab641,ffef93,fff7c9</sprite>
+    <sprite gender="female">equipment/hands/generic-female.xml|#846928,dab641,ffef93,fff7c9</sprite>
+    <sprite gender="male">equipment/hands/generic.xml|#846928,dab641,ffef93,fff7c9</sprite>
+    <sprite gender="other">equipment/hands/generic.xml|#846928,dab641,ffef93,fff7c9</sprite>
   </item>
 </items>
diff --git a/items/equip-arms/item2164_LightBlueCottonGloves.xml b/items/equip-arms/item2164_LightBlueCottonGloves.xml
index 8d314b57..1202b522 100644
--- a/items/equip-arms/item2164_LightBlueCottonGloves.xml
+++ b/items/equip-arms/item2164_LightBlueCottonGloves.xml
@@ -7,6 +7,8 @@
     <its:translateRule selector="//*" translate="no"/>
   </its:rules>
   <item id="2164" image="equipment/hands/basicgloves.png|W:#16486e,498ec5,e4f2fc" name="Light Blue Cotton Gloves" description="A light blue pair of comfy cotton gloves." effect="M. Attack -10" type="equip-arms" defense="1" weight="20">
-    <sprite>equipment/hands/generic.xml|#16486e,498ec5,e4f2fc</sprite>
+    <sprite gender="female">equipment/hands/generic-female.xml|#16486e,498ec5,e4f2fc</sprite>
+    <sprite gender="male">equipment/hands/generic.xml|#16486e,498ec5,e4f2fc</sprite>
+    <sprite gender="other">equipment/hands/generic.xml|#16486e,498ec5,e4f2fc</sprite>
   </item>
 </items>
diff --git a/items/equip-arms/item2165_PinkCottonGloves.xml b/items/equip-arms/item2165_PinkCottonGloves.xml
index 6ceb56a0..6f2365ec 100644
--- a/items/equip-arms/item2165_PinkCottonGloves.xml
+++ b/items/equip-arms/item2165_PinkCottonGloves.xml
@@ -7,6 +7,8 @@
     <its:translateRule selector="//*" translate="no"/>
   </its:rules>
   <item id="2165" image="equipment/hands/basicgloves.png|W:#bf369b,f25cb1,ff87b7,ffcccf" name="Pink Cotton Gloves" description="A pink pair of comfy cotton gloves." effect="M. Attack -10" type="equip-arms" defense="1" weight="20">
-    <sprite>equipment/hands/generic.xml|#bf369b,f25cb1,ff87b7,ffcccf</sprite>
+    <sprite gender="female">equipment/hands/generic-female.xml|#bf369b,f25cb1,ff87b7,ffcccf</sprite>
+    <sprite gender="male">equipment/hands/generic.xml|#bf369b,f25cb1,ff87b7,ffcccf</sprite>
+    <sprite gender="other">equipment/hands/generic.xml|#bf369b,f25cb1,ff87b7,ffcccf</sprite>
   </item>
 </items>
diff --git a/items/equip-arms/item2166_BlackCottonGloves.xml b/items/equip-arms/item2166_BlackCottonGloves.xml
index cb5293f8..6fc71655 100644
--- a/items/equip-arms/item2166_BlackCottonGloves.xml
+++ b/items/equip-arms/item2166_BlackCottonGloves.xml
@@ -7,6 +7,8 @@
     <its:translateRule selector="//*" translate="no"/>
   </its:rules>
   <item id="2166" image="equipment/hands/basicgloves.png|W:#111111,222222,333333,444444,555555,aaaaaa" name="Black Cotton Gloves" description="A black pair of comfy cotton gloves." effect="M. Attack -10" type="equip-arms" defense="1" weight="20">
-    <sprite>equipment/hands/generic.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+    <sprite gender="female">equipment/hands/generic-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+    <sprite gender="male">equipment/hands/generic.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+    <sprite gender="other">equipment/hands/generic.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
   </item>
 </items>
diff --git a/items/equip-arms/item2167_OrangeCottonGloves.xml b/items/equip-arms/item2167_OrangeCottonGloves.xml
index 3ebbdd87..1f68a31f 100644
--- a/items/equip-arms/item2167_OrangeCottonGloves.xml
+++ b/items/equip-arms/item2167_OrangeCottonGloves.xml
@@ -7,6 +7,8 @@
     <its:translateRule selector="//*" translate="no"/>
   </its:rules>
   <item id="2167" image="equipment/hands/basicgloves.png|W:#80280f,b04810,ef681f,ffb830" name="Orange Cotton Gloves" description="An orange pair of comfy cotton gloves." effect="M. Attack -10" type="equip-arms" defense="1" weight="20">
-    <sprite>equipment/hands/generic.xml|#80280f,b04810,ef681f,ffb830</sprite>
+    <sprite gender="female">equipment/hands/generic-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
+    <sprite gender="male">equipment/hands/generic.xml|#80280f,b04810,ef681f,ffb830</sprite>
+    <sprite gender="other">equipment/hands/generic.xml|#80280f,b04810,ef681f,ffb830</sprite>
   </item>
 </items>
diff --git a/items/equip-arms/item2168_PurpleCottonGloves.xml b/items/equip-arms/item2168_PurpleCottonGloves.xml
index 0c37255e..8195f86e 100644
--- a/items/equip-arms/item2168_PurpleCottonGloves.xml
+++ b/items/equip-arms/item2168_PurpleCottonGloves.xml
@@ -7,6 +7,8 @@
     <its:translateRule selector="//*" translate="no"/>
   </its:rules>
   <item id="2168" image="equipment/hands/basicgloves.png|W:#1a0a33,380f4d,82158c,b359ab" name="Purple Cotton Gloves" description="A purple pair of comfy cotton gloves." effect="M. Attack -10" type="equip-arms" defense="1" weight="20">
-    <sprite>equipment/hands/generic.xml|#1a0a33,380f4d,82158c,b359ab</sprite>
+    <sprite gender="female">equipment/hands/generic-female.xml|#1a0a33,380f4d,82158c,b359ab</sprite>
+    <sprite gender="male">equipment/hands/generic.xml|#1a0a33,380f4d,82158c,b359ab</sprite>
+    <sprite gender="other">equipment/hands/generic.xml|#1a0a33,380f4d,82158c,b359ab</sprite>
   </item>
 </items>
diff --git a/items/equip-arms/item2169_DarkGreenCottonGloves.xml b/items/equip-arms/item2169_DarkGreenCottonGloves.xml
index 8b15970b..153bba0e 100644
--- a/items/equip-arms/item2169_DarkGreenCottonGloves.xml
+++ b/items/equip-arms/item2169_DarkGreenCottonGloves.xml
@@ -7,6 +7,8 @@
     <its:translateRule selector="//*" translate="no"/>
   </its:rules>
   <item id="2169" image="equipment/hands/basicgloves.png|W:#0b300b,195519,3e832e,3e9c3e" name="Dark Green Cotton Gloves" description="A dark green pair of comfy cotton gloves." effect="M. Attack -10" type="equip-arms" defense="1" weight="20">
-    <sprite>equipment/hands/generic.xml|#0b300b,195519,3e832e,3e9c3e</sprite>
+    <sprite gender="female">equipment/hands/generic-female.xml|#0b300b,195519,3e832e,3e9c3e</sprite>
+    <sprite gender="male">equipment/hands/generic.xml|#0b300b,195519,3e832e,3e9c3e</sprite>
+    <sprite gender="other">equipment/hands/generic.xml|#0b300b,195519,3e832e,3e9c3e</sprite>
   </item>
 </items>
diff --git a/items/equip-arms/item531_MinerGloves.xml b/items/equip-arms/item531_MinerGloves.xml
index 1e1b6d36..d167e581 100644
--- a/items/equip-arms/item531_MinerGloves.xml
+++ b/items/equip-arms/item531_MinerGloves.xml
@@ -7,6 +7,8 @@
     <its:translateRule selector="//*" translate="no"/>
   </its:rules>
   <item id="531" image="equipment/hands/minergloves.png" name="Miner Gloves" description="Gloves used by miners, very useful." effect="M. Attack -10" type="equip-arms" defense="2" weight="30">
-    <sprite>equipment/hands/generic.xml|#202020,505050</sprite>
+    <sprite gender="female">equipment/hands/generic-female.xml|#202020,505050</sprite>
+    <sprite gender="male">equipment/hands/generic.xml|#202020,505050</sprite>
+    <sprite gender="other">equipment/hands/generic.xml|#202020,505050</sprite>
   </item>
 </items>
diff --git a/items/equip-arms/item532_LeatherGloves.xml b/items/equip-arms/item532_LeatherGloves.xml
index 05a382e2..c16e9b15 100644
--- a/items/equip-arms/item532_LeatherGloves.xml
+++ b/items/equip-arms/item532_LeatherGloves.xml
@@ -7,6 +7,8 @@
     <its:translateRule selector="//*" translate="no"/>
   </its:rules>
   <item id="532" image="equipment/hands/leathergloves.png" name="Leather Gloves" description="Gloves made of hardened leather." effect="M. Attack -20" type="equip-arms" defense="4" weight="20">
-    <sprite>equipment/hands/generic.xml|#4e2e18,c8752f</sprite>
+    <sprite gender="female">equipment/hands/generic-female.xml|#4e2e18,c8752f</sprite>
+    <sprite gender="male">equipment/hands/generic.xml|#4e2e18,c8752f</sprite>
+    <sprite gender="other">equipment/hands/generic.xml|#4e2e18,c8752f</sprite>
   </item>
 </items>
diff --git a/items/equip-arms/item563_WinterGloves.xml b/items/equip-arms/item563_WinterGloves.xml
index ef57ebc7..d4744e6d 100644
--- a/items/equip-arms/item563_WinterGloves.xml
+++ b/items/equip-arms/item563_WinterGloves.xml
@@ -7,6 +7,8 @@
     <its:translateRule selector="//*" translate="no"/>
   </its:rules>
   <item id="563" image="equipment/hands/basicgloves.png|W:#a0a0a0,d0d0d0,ffffff,ffffff" name="Winter Gloves" description="A pair of soft, warm gloves." effect="M. Attack -15" type="equip-arms" defense="3" weight="20">
-    <sprite>equipment/hands/generic.xml|#202020,c0c0c0,ffffff,ffffff</sprite>
+    <sprite gender="female">equipment/hands/generic-female.xml|#202020,c0c0c0,ffffff,ffffff</sprite>
+    <sprite gender="male">equipment/hands/generic.xml|#202020,c0c0c0,ffffff,ffffff</sprite>
+    <sprite gender="other">equipment/hands/generic.xml|#202020,c0c0c0,ffffff,ffffff</sprite>
   </item>
 </items>
diff --git a/items/equip-arms/item741_CottonGloves.xml b/items/equip-arms/item741_CottonGloves.xml
index 4eee19cd..4bcba343 100644
--- a/items/equip-arms/item741_CottonGloves.xml
+++ b/items/equip-arms/item741_CottonGloves.xml
@@ -7,6 +7,8 @@
     <its:translateRule selector="//*" translate="no"/>
   </its:rules>
   <item id="741" image="equipment/hands/basicgloves.png|W:#a4b2b2,ffffff" name="Cotton Gloves" description="A pair of comfy cotton gloves." effect="M. Attack -10" type="equip-arms" defense="1" weight="10">
-    <sprite>equipment/hands/generic.xml|#a4b2b2,ffffff</sprite>
+    <sprite gender="female">equipment/hands/generic-female.xml|#a4b2b2,ffffff</sprite>
+    <sprite gender="male">equipment/hands/generic.xml|#a4b2b2,ffffff</sprite>
+    <sprite gender="other">equipment/hands/generic.xml|#a4b2b2,ffffff</sprite>
   </item>
 </items>
diff --git a/items/equip-arms/item756_AssassinGloves.xml b/items/equip-arms/item756_AssassinGloves.xml
index 62e0bf34..13ea6f94 100644
--- a/items/equip-arms/item756_AssassinGloves.xml
+++ b/items/equip-arms/item756_AssassinGloves.xml
@@ -7,6 +7,8 @@
     <its:translateRule selector="//*" translate="no"/>
   </its:rules>
   <item id="756" image="equipment/hands/assassingloves.png" name="Assassin Gloves" description="Gloves for a master assassin." effect="M. Attack -3" type="equip-arms" defense="5" agi="5" weight="9" sellProtected="true">
-    <sprite>equipment/hands/assassin.xml</sprite>
+    <sprite gender="female">equipment/hands/assassin-female.xml</sprite>
+    <sprite gender="male">equipment/hands/assassin.xml</sprite>
+    <sprite gender="other">equipment/hands/assassin.xml</sprite>
   </item>
 </items>
diff --git a/items/equip-arms/item794_BromenalGloves.xml b/items/equip-arms/item794_BromenalGloves.xml
index 4f2d8a77..35cfe47d 100644
--- a/items/equip-arms/item794_BromenalGloves.xml
+++ b/items/equip-arms/item794_BromenalGloves.xml
@@ -7,6 +7,8 @@
     <its:translateRule selector="//*" translate="no"/>
   </its:rules>
   <item id="794" image="equipment/hands/bromenalgloves.png" name="Bromenal Gloves" description="A pair of bromenal gloves." effect="M. Attack -20" type="equip-arms" weight="40" defense="4" sellProtected="true">
-    <sprite>equipment/hands/bromenalgloves.xml</sprite>
+    <sprite gender="female">equipment/hands/bromenalgloves-female.xml</sprite>
+    <sprite gender="male">equipment/hands/bromenalgloves.xml</sprite>
+    <sprite gender="other">equipment/hands/bromenalgloves.xml</sprite>
   </item>
 </items>
diff --git a/items/equip-arms/item868_SilkGloves.xml b/items/equip-arms/item868_SilkGloves.xml
index d6108861..7be4f944 100644
--- a/items/equip-arms/item868_SilkGloves.xml
+++ b/items/equip-arms/item868_SilkGloves.xml
@@ -7,6 +7,8 @@
     <its:translateRule selector="//*" translate="no"/>
   </its:rules>
   <item id="868" image="equipment/hands/basicgloves.png|W:#87876c,bbc39c,edf4e1,ffffff" name="Silk Gloves" description="Soft and graceful silk gloves which don't restrain magic." type="equip-arms" defense="1" weight="4">
-    <sprite>equipment/hands/generic.xml|#87876c,bbc39c,edf4e1,ffffff</sprite>
+    <sprite gender="female">equipment/hands/generic-female.xml|#87876c,bbc39c,edf4e1,ffffff</sprite>
+    <sprite gender="male">equipment/hands/generic.xml|#87876c,bbc39c,edf4e1,ffffff</sprite>
+    <sprite gender="other">equipment/hands/generic.xml|#87876c,bbc39c,edf4e1,ffffff</sprite>
   </item>
 </items>
-- 
cgit v1.2.3-60-g2f50