HAIR ON SKELS!!!11

24 files changed, 26 insertions, 9 deletions

diff --git a/items/equip-charm/_include.xml b/items/equip-charm/_include.xml
index f4603d4a..e80abf41 100644
--- a/items/equip-charm/_include.xml
+++ b/items/equip-charm/_include.xml
@@ -15,6 +15,5 @@
   <include name="items/equip-charm/item832_GoldenFourLeafAmulet.xml"/>
   <include name="items/equip-charm/item865_Grimoire.xml"/>
   <include name="items/equip-charm/item879_HeartofIsis.xml"/>
-  <include name="items/equip-charm/item1197_JacksSkeletonCharm.xml"/>
   <include name="items/equip-charm/item1227_EnchantersAmulet.xml"/>
 </items>
diff --git a/items/generic/_include.xml b/items/generic/_include.xml
index 2b387f8f..c28ab4e8 100644
--- a/items/generic/_include.xml
+++ b/items/generic/_include.xml
@@ -181,6 +181,7 @@
   <include name="items/generic/item1249_StrangeCoin.xml"/>
   <include name="items/generic/item1254_DarkPetal.xml"/>
   <include name="items/generic/item1257_FlawedLens.xml"/>
+  <include name="items/generic/item1197_JacksSkeletonCharm.xml"/>
   <include name="items/generic/item2250_RedCottonCloth.xml"/>
   <include name="items/generic/item2251_GreenCottonCloth.xml"/>
   <include name="items/generic/item2252_DarkBlueCottonCloth.xml"/>
diff --git a/items/equip-charm/item1197_JacksSkeletonCharm.xml b/items/generic/item1197_JacksSkeletonCharm.xml
index fa1cbcdd..75998f31 100644
--- a/items/equip-charm/item1197_JacksSkeletonCharm.xml
+++ b/items/generic/item1197_JacksSkeletonCharm.xml
@@ -6,10 +6,5 @@
     <its:translateRule selector="//item/@effect" translate="yes"/>
     <its:translateRule selector="//*" translate="no"/>
   </its:rules>
-  <item id="1197" image="equipment/charms/skeletoncharm.png" name="Jack's Skeleton Charm" description="A mysterious charm" type="equip-charm" weight="10" sellProtected="true">
-    <replace sprite="race">
-      <item to="-99044"/>
-    </replace>
-    <replace sprite="hair"/>
-  </item>
+  <item id="1197" image="equipment/charms/skeletoncharm.png" name="Jack's Skeleton Charm" description="A mysterious charm" type="generic" weight="10" sellProtected="true"/>
 </items>
diff --git a/items/hairsprite/item-10_Shortandcurly.xml b/items/hairsprite/item-10_Shortandcurly.xml
index 93b9a95b..0437b0f4 100644
--- a/items/hairsprite/item-10_Shortandcurly.xml
+++ b/items/hairsprite/item-10_Shortandcurly.xml
@@ -13,5 +13,6 @@
     <sprite race="1" gender="female">hairstyles/hairstyle09-female.xml</sprite>
     <sprite race="0" gender="other">hairstyles/hairstyle09.xml</sprite>
     <sprite race="1" gender="other">hairstyles/hairstyle09.xml</sprite>
+    <sprite race="6">monsters/accessories/hairstyle09.xml</sprite>
   </item>
 </items>
diff --git a/items/hairsprite/item-11_Pigtails.xml b/items/hairsprite/item-11_Pigtails.xml
index aecfe8a2..e157839e 100644
--- a/items/hairsprite/item-11_Pigtails.xml
+++ b/items/hairsprite/item-11_Pigtails.xml
@@ -13,5 +13,6 @@
     <sprite race="1" gender="female">hairstyles/hairstyle10-female.xml</sprite>
     <sprite race="0" gender="other">hairstyles/hairstyle10.xml</sprite>
     <sprite race="1" gender="other">hairstyles/hairstyle10.xml</sprite>
+    <sprite race="6">monsters/accessories/hairstyle10.xml</sprite>
   </item>
 </items>
diff --git a/items/hairsprite/item-12_Longandcurly.xml b/items/hairsprite/item-12_Longandcurly.xml
index b20d990c..8017cb86 100644
--- a/items/hairsprite/item-12_Longandcurly.xml
+++ b/items/hairsprite/item-12_Longandcurly.xml
@@ -13,5 +13,6 @@
     <sprite race="1" gender="female">hairstyles/hairstyle11-female.xml</sprite>
     <sprite race="0" gender="other">hairstyles/hairstyle11.xml</sprite>
     <sprite race="1" gender="other">hairstyles/hairstyle11.xml</sprite>
+    <sprite race="6">monsters/accessories/hairstyle11.xml</sprite>
   </item>
 </items>
diff --git a/items/hairsprite/item-13_Parted.xml b/items/hairsprite/item-13_Parted.xml
index 3056160a..b5f90e67 100644
--- a/items/hairsprite/item-13_Parted.xml
+++ b/items/hairsprite/item-13_Parted.xml
@@ -13,5 +13,6 @@
     <sprite race="1" gender="female">hairstyles/hairstyle12-female.xml</sprite>
     <sprite race="0" gender="other">hairstyles/hairstyle12.xml</sprite>
     <sprite race="1" gender="other">hairstyles/hairstyle12.xml</sprite>
+    <sprite race="6">monsters/accessories/hairstyle12.xml</sprite>
   </item>
 </items>
diff --git a/items/hairsprite/item-14_Perkyponytail.xml b/items/hairsprite/item-14_Perkyponytail.xml
index f4890694..f864bc03 100644
--- a/items/hairsprite/item-14_Perkyponytail.xml
+++ b/items/hairsprite/item-14_Perkyponytail.xml
@@ -13,5 +13,6 @@
     <sprite race="1" gender="female">hairstyles/hairstyle13-female.xml</sprite>
     <sprite race="0" gender="other">hairstyles/hairstyle13.xml</sprite>
     <sprite race="1" gender="other">hairstyles/hairstyle13.xml</sprite>
+    <sprite race="6">monsters/accessories/hairstyle13.xml</sprite>
   </item>
 </items>
diff --git a/items/hairsprite/item-15_Wave.xml b/items/hairsprite/item-15_Wave.xml
index 829e5ba4..6d797411 100644
--- a/items/hairsprite/item-15_Wave.xml
+++ b/items/hairsprite/item-15_Wave.xml
@@ -13,5 +13,6 @@
     <sprite race="1" gender="female">hairstyles/hairstyle14-female.xml</sprite>
     <sprite race="0" gender="other">hairstyles/hairstyle14.xml</sprite>
     <sprite race="1" gender="other">hairstyles/hairstyle14.xml</sprite>
+    <sprite race="6">monsters/accessories/hairstyle14.xml</sprite>
   </item>
 </items>
diff --git a/items/hairsprite/item-16_Mane.xml b/items/hairsprite/item-16_Mane.xml
index f766b8ec..a39cf6ae 100644
--- a/items/hairsprite/item-16_Mane.xml
+++ b/items/hairsprite/item-16_Mane.xml
@@ -13,5 +13,6 @@
     <sprite race="1" gender="female">hairstyles/hairstyle15-female.xml</sprite>
     <sprite race="0" gender="other">hairstyles/hairstyle15.xml</sprite>
     <sprite race="1" gender="other">hairstyles/hairstyle15.xml</sprite>
+    <sprite race="6">monsters/accessories/hairstyle15.xml</sprite>
   </item>
 </items>
diff --git a/items/hairsprite/item-17_Bun.xml b/items/hairsprite/item-17_Bun.xml
index e86e8f7a..eb04a08b 100644
--- a/items/hairsprite/item-17_Bun.xml
+++ b/items/hairsprite/item-17_Bun.xml
@@ -13,5 +13,6 @@
     <sprite race="1" gender="female">hairstyles/hairstyle16-female.xml</sprite>
     <sprite race="0" gender="other">hairstyles/hairstyle16.xml</sprite>
     <sprite race="1" gender="other">hairstyles/hairstyle16.xml</sprite>
+    <sprite race="6">monsters/accessories/hairstyle16.xml</sprite>
   </item>
 </items>
diff --git a/items/hairsprite/item-18_Shoulderlengthflick.xml b/items/hairsprite/item-18_Shoulderlengthflick.xml
index 9a3d183c..ef98d79c 100644
--- a/items/hairsprite/item-18_Shoulderlengthflick.xml
+++ b/items/hairsprite/item-18_Shoulderlengthflick.xml
@@ -13,5 +13,6 @@
     <sprite race="1" gender="female">hairstyles/hairstyle17-female.xml</sprite>
     <sprite race="0" gender="other">hairstyles/hairstyle17.xml</sprite>
     <sprite race="1" gender="other">hairstyles/hairstyle17.xml</sprite>
+    <sprite race="6">monsters/accessories/hairstyle17.xml</sprite>
   </item>
 </items>
diff --git a/items/hairsprite/item-19_Fizzy.xml b/items/hairsprite/item-19_Fizzy.xml
index 8a7d7bc2..7a7f1413 100644
--- a/items/hairsprite/item-19_Fizzy.xml
+++ b/items/hairsprite/item-19_Fizzy.xml
@@ -13,5 +13,6 @@
     <sprite race="1" gender="female">hairstyles/hairstyle18-female.xml</sprite>
     <sprite race="0" gender="other">hairstyles/hairstyle18.xml</sprite>
     <sprite race="1" gender="other">hairstyles/hairstyle18.xml</sprite>
+    <sprite race="6">monsters/accessories/hairstyle18.xml</sprite>
   </item>
 </items>
diff --git a/items/hairsprite/item-20_LongandClipped.xml b/items/hairsprite/item-20_LongandClipped.xml
index 6a68b993..be9c49b6 100644
--- a/items/hairsprite/item-20_LongandClipped.xml
+++ b/items/hairsprite/item-20_LongandClipped.xml
@@ -13,5 +13,6 @@
     <sprite race="1" gender="female">hairstyles/hairstyle19-female.xml</sprite>
     <sprite race="0" gender="other">hairstyles/hairstyle19.xml</sprite>
     <sprite race="1" gender="other">hairstyles/hairstyle19.xml</sprite>
+    <sprite race="6">monsters/accessories/hairstyle19.xml</sprite>
   </item>
 </items>
diff --git a/items/hairsprite/item-2_Flatponytail.xml b/items/hairsprite/item-2_Flatponytail.xml
index 29fc29f0..548d3d5e 100644
--- a/items/hairsprite/item-2_Flatponytail.xml
+++ b/items/hairsprite/item-2_Flatponytail.xml
@@ -15,5 +15,6 @@
     <sprite race="1" gender="female">hairstyles/hairstyle01-female.xml</sprite>
     <sprite race="0" gender="other">hairstyles/hairstyle01.xml</sprite>
     <sprite race="1" gender="other">hairstyles/hairstyle01.xml</sprite>
+    <sprite race="6">monsters/accessories/hairstyle01.xml</sprite>
   </item>
 </items>
diff --git a/items/hairsprite/item-3_Bowlcut.xml b/items/hairsprite/item-3_Bowlcut.xml
index c7e75f97..4c992836 100644
--- a/items/hairsprite/item-3_Bowlcut.xml
+++ b/items/hairsprite/item-3_Bowlcut.xml
@@ -15,5 +15,6 @@
     <sprite race="1" gender="female">hairstyles/hairstyle02-female.xml</sprite>
     <sprite race="0" gender="other">hairstyles/hairstyle02.xml</sprite>
     <sprite race="1" gender="other">hairstyles/hairstyle02.xml</sprite>
+    <sprite race="6">monsters/accessories/hairstyle02.xml</sprite>
   </item>
 </items>
diff --git a/items/hairsprite/item-4_Combedback.xml b/items/hairsprite/item-4_Combedback.xml
index 01d20dbc..f4c38469 100644
--- a/items/hairsprite/item-4_Combedback.xml
+++ b/items/hairsprite/item-4_Combedback.xml
@@ -15,5 +15,6 @@
     <sprite race="1" gender="female">hairstyles/hairstyle03-female.xml</sprite>
     <sprite race="0" gender="other">hairstyles/hairstyle03.xml</sprite>
     <sprite race="1" gender="other">hairstyles/hairstyle03.xml</sprite>
+    <sprite race="6">monsters/accessories/hairstyle03.xml</sprite>
   </item>
 </items>
diff --git a/items/hairsprite/item-5_Emo.xml b/items/hairsprite/item-5_Emo.xml
index 17f79c30..d72c747c 100644
--- a/items/hairsprite/item-5_Emo.xml
+++ b/items/hairsprite/item-5_Emo.xml
@@ -15,5 +15,6 @@
     <sprite race="1" gender="female">hairstyles/hairstyle04-female.xml</sprite>
     <sprite race="0" gender="other">hairstyles/hairstyle04.xml</sprite>
     <sprite race="1" gender="other">hairstyles/hairstyle04.xml</sprite>
+    <sprite race="6">monsters/accessories/hairstyle04.xml</sprite>
   </item>
 </items>
diff --git a/items/hairsprite/item-6_Mohawk.xml b/items/hairsprite/item-6_Mohawk.xml
index 4c0d257a..03de757a 100644
--- a/items/hairsprite/item-6_Mohawk.xml
+++ b/items/hairsprite/item-6_Mohawk.xml
@@ -15,5 +15,6 @@
     <sprite race="1" gender="female">hairstyles/hairstyle05-female.xml</sprite>
     <sprite race="0" gender="other">hairstyles/hairstyle05.xml</sprite>
     <sprite race="1" gender="other">hairstyles/hairstyle05.xml</sprite>
+    <sprite race="6">monsters/accessories/hairstyle05.xml</sprite>
   </item>
 </items>
diff --git a/items/hairsprite/item-7_Pompadour.xml b/items/hairsprite/item-7_Pompadour.xml
index 1fea5787..79e755c9 100644
--- a/items/hairsprite/item-7_Pompadour.xml
+++ b/items/hairsprite/item-7_Pompadour.xml
@@ -14,5 +14,6 @@
     <sprite race="1" gender="female">hairstyles/hairstyle06-female.xml</sprite>
     <sprite race="0" gender="other">hairstyles/hairstyle06.xml</sprite>
     <sprite race="1" gender="other">hairstyles/hairstyle06.xml</sprite>
+    <sprite race="6">monsters/accessories/hairstyle06.xml</sprite>
   </item>
 </items>
diff --git a/items/hairsprite/item-8_CenterpartingShortandslick.xml b/items/hairsprite/item-8_CenterpartingShortandslick.xml
index 6c80d6ac..36cec6ad 100644
--- a/items/hairsprite/item-8_CenterpartingShortandslick.xml
+++ b/items/hairsprite/item-8_CenterpartingShortandslick.xml
@@ -14,5 +14,6 @@
     <sprite race="1" gender="female">hairstyles/hairstyle07-female.xml</sprite>
     <sprite race="0" gender="other">hairstyles/hairstyle07.xml</sprite>
     <sprite race="1" gender="other">hairstyles/hairstyle07.xml</sprite>
+    <sprite race="6">monsters/accessories/hairstyle07.xml</sprite>
   </item>
 </items>
diff --git a/items/hairsprite/item-9_Longandslick.xml b/items/hairsprite/item-9_Longandslick.xml
index dc321a49..4d2ab808 100644
--- a/items/hairsprite/item-9_Longandslick.xml
+++ b/items/hairsprite/item-9_Longandslick.xml
@@ -13,5 +13,6 @@
     <sprite race="1" gender="female">hairstyles/hairstyle08-female.xml</sprite>
     <sprite race="0" gender="other">hairstyles/hairstyle08.xml</sprite>
     <sprite race="1" gender="other">hairstyles/hairstyle08.xml</sprite>
+    <sprite race="6">monsters/accessories/hairstyle08.xml</sprite>
   </item>
 </items>
diff --git a/items/racesprite/_include.xml b/items/racesprite/_include.xml
index 3449f95e..261f3ad0 100644
--- a/items/racesprite/_include.xml
+++ b/items/racesprite/_include.xml
@@ -12,6 +12,6 @@
   <include name="items/racesprite/item-103_Ifriton.xml"/>
   <include name="items/racesprite/item-104_Gispaan.xml"/>
   <include name="items/racesprite/item-105_Sparron.xml"/>
-  <include name="items/racesprite/item-99044_Skeleton.xml"/>
+  <include name="items/racesprite/item-106_Undead.xml"/>
   <include name="items/racesprite/item-99054_Troll.xml"/>
 </items>
diff --git a/items/racesprite/item-99044_Skeleton.xml b/items/racesprite/item-106_Undead.xml
index a534c8e1..73de98f8 100644
--- a/items/racesprite/item-99044_Skeleton.xml
+++ b/items/racesprite/item-106_Undead.xml
@@ -6,7 +6,10 @@
     <its:translateRule selector="//item/@effect" translate="yes"/>
     <its:translateRule selector="//*" translate="no"/>
   </its:rules>
-  <item id="-99044" type="racesprite" name="Skeleton">
+  <item id="-106" type="racesprite" name="Undead">
     <sprite>monsters/skeleton.xml|#ffe8bf</sprite>
+    <replace sprite="hair">
+        <item from="-1"/>
+    </replace>
   </item>
 </items>