summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgumi <git@gumi.ca>2018-03-09 12:53:54 -0500
committergumi <git@gumi.ca>2018-03-09 14:26:18 -0500
commit607cb1bb1b8a6bee021fcdc304794f7848337e6a (patch)
tree21db11f0c25ff75a3fde7d553120479924127d5f
parentc35ce1e64f90589afb8683b9511e7d156352f025 (diff)
downloadclientdata-607cb1bb1b8a6bee021fcdc304794f7848337e6a.tar.gz
clientdata-607cb1bb1b8a6bee021fcdc304794f7848337e6a.tar.bz2
clientdata-607cb1bb1b8a6bee021fcdc304794f7848337e6a.tar.xz
clientdata-607cb1bb1b8a6bee021fcdc304794f7848337e6a.zip
HAIR ON SKELS!!!11
-rw-r--r--graphics/sprites/monsters/accessories/hairstyle01.pngbin0 -> 1980 bytes
-rw-r--r--graphics/sprites/monsters/accessories/hairstyle01.xml5
-rw-r--r--graphics/sprites/monsters/accessories/hairstyle02.pngbin0 -> 1560 bytes
-rw-r--r--graphics/sprites/monsters/accessories/hairstyle02.xml5
-rw-r--r--graphics/sprites/monsters/accessories/hairstyle03.pngbin0 -> 1644 bytes
-rw-r--r--graphics/sprites/monsters/accessories/hairstyle03.xml5
-rw-r--r--graphics/sprites/monsters/accessories/hairstyle04.pngbin0 -> 1739 bytes
-rw-r--r--graphics/sprites/monsters/accessories/hairstyle04.xml5
-rw-r--r--graphics/sprites/monsters/accessories/hairstyle06.pngbin0 -> 1551 bytes
-rw-r--r--graphics/sprites/monsters/accessories/hairstyle06.xml5
-rw-r--r--graphics/sprites/monsters/accessories/hairstyle09.pngbin0 -> 3513 bytes
-rw-r--r--graphics/sprites/monsters/accessories/hairstyle09.xml5
-rw-r--r--graphics/sprites/monsters/accessories/hairstyle10.pngbin0 -> 4266 bytes
-rw-r--r--graphics/sprites/monsters/accessories/hairstyle10.xml5
-rw-r--r--graphics/sprites/monsters/accessories/hairstyle11.pngbin0 -> 6335 bytes
-rw-r--r--graphics/sprites/monsters/accessories/hairstyle11.xml5
-rw-r--r--graphics/sprites/monsters/accessories/hairstyle12.pngbin0 -> 2404 bytes
-rw-r--r--graphics/sprites/monsters/accessories/hairstyle12.xml5
-rw-r--r--graphics/sprites/monsters/accessories/hairstyle13.xml227
-rw-r--r--graphics/sprites/monsters/accessories/hairstyle14.pngbin0 -> 5155 bytes
-rw-r--r--graphics/sprites/monsters/accessories/hairstyle14.xml5
-rw-r--r--graphics/sprites/monsters/accessories/hairstyle15.pngbin0 -> 3217 bytes
-rw-r--r--graphics/sprites/monsters/accessories/hairstyle15.xml5
-rw-r--r--graphics/sprites/monsters/accessories/hairstyle16.pngbin0 -> 4531 bytes
-rw-r--r--graphics/sprites/monsters/accessories/hairstyle16.xml5
-rw-r--r--graphics/sprites/monsters/accessories/hairstyle17.pngbin0 -> 4638 bytes
-rw-r--r--graphics/sprites/monsters/accessories/hairstyle17.xml5
-rw-r--r--graphics/sprites/monsters/accessories/hairstyle18.pngbin0 -> 1981 bytes
-rw-r--r--graphics/sprites/monsters/accessories/hairstyle18.xml5
-rw-r--r--graphics/sprites/monsters/accessories/hairstyle19.pngbin0 -> 3262 bytes
-rw-r--r--graphics/sprites/monsters/accessories/hairstyle19.xml5
-rw-r--r--itemcolors.xml30
-rw-r--r--items/equip-charm/_include.xml1
-rw-r--r--items/generic/_include.xml1
-rw-r--r--items/generic/item1197_JacksSkeletonCharm.xml (renamed from items/equip-charm/item1197_JacksSkeletonCharm.xml)7
-rw-r--r--items/hairsprite/item-10_Shortandcurly.xml1
-rw-r--r--items/hairsprite/item-11_Pigtails.xml1
-rw-r--r--items/hairsprite/item-12_Longandcurly.xml1
-rw-r--r--items/hairsprite/item-13_Parted.xml1
-rw-r--r--items/hairsprite/item-14_Perkyponytail.xml1
-rw-r--r--items/hairsprite/item-15_Wave.xml1
-rw-r--r--items/hairsprite/item-16_Mane.xml1
-rw-r--r--items/hairsprite/item-17_Bun.xml1
-rw-r--r--items/hairsprite/item-18_Shoulderlengthflick.xml1
-rw-r--r--items/hairsprite/item-19_Fizzy.xml1
-rw-r--r--items/hairsprite/item-20_LongandClipped.xml1
-rw-r--r--items/hairsprite/item-2_Flatponytail.xml1
-rw-r--r--items/hairsprite/item-3_Bowlcut.xml1
-rw-r--r--items/hairsprite/item-4_Combedback.xml1
-rw-r--r--items/hairsprite/item-5_Emo.xml1
-rw-r--r--items/hairsprite/item-6_Mohawk.xml1
-rw-r--r--items/hairsprite/item-7_Pompadour.xml1
-rw-r--r--items/hairsprite/item-8_CenterpartingShortandslick.xml1
-rw-r--r--items/hairsprite/item-9_Longandslick.xml1
-rw-r--r--items/racesprite/_include.xml2
-rw-r--r--items/racesprite/item-106_Undead.xml (renamed from items/racesprite/item-99044_Skeleton.xml)5
56 files changed, 118 insertions, 249 deletions
diff --git a/graphics/sprites/monsters/accessories/hairstyle01.png b/graphics/sprites/monsters/accessories/hairstyle01.png
new file mode 100644
index 00000000..bdc246c9
--- /dev/null
+++ b/graphics/sprites/monsters/accessories/hairstyle01.png
Binary files differ
diff --git a/graphics/sprites/monsters/accessories/hairstyle01.xml b/graphics/sprites/monsters/accessories/hairstyle01.xml
new file mode 100644
index 00000000..ea9f33ee
--- /dev/null
+++ b/graphics/sprites/monsters/accessories/hairstyle01.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<sprite>
+ <imageset name="base" src="graphics/sprites/monsters/accessories/hairstyle01.png|W" width="40" height="40"/>
+ <include file="hairstyles/hairstyle01.xml"/>
+</sprite>
diff --git a/graphics/sprites/monsters/accessories/hairstyle02.png b/graphics/sprites/monsters/accessories/hairstyle02.png
new file mode 100644
index 00000000..d0e388e0
--- /dev/null
+++ b/graphics/sprites/monsters/accessories/hairstyle02.png
Binary files differ
diff --git a/graphics/sprites/monsters/accessories/hairstyle02.xml b/graphics/sprites/monsters/accessories/hairstyle02.xml
new file mode 100644
index 00000000..92775886
--- /dev/null
+++ b/graphics/sprites/monsters/accessories/hairstyle02.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<sprite>
+ <imageset name="base" src="graphics/sprites/monsters/accessories/hairstyle02.png|W" width="40" height="40"/>
+ <include file="hairstyles/hairstyle01.xml"/>
+</sprite>
diff --git a/graphics/sprites/monsters/accessories/hairstyle03.png b/graphics/sprites/monsters/accessories/hairstyle03.png
new file mode 100644
index 00000000..233a980e
--- /dev/null
+++ b/graphics/sprites/monsters/accessories/hairstyle03.png
Binary files differ
diff --git a/graphics/sprites/monsters/accessories/hairstyle03.xml b/graphics/sprites/monsters/accessories/hairstyle03.xml
new file mode 100644
index 00000000..e5a6744d
--- /dev/null
+++ b/graphics/sprites/monsters/accessories/hairstyle03.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<sprite>
+ <imageset name="base" src="graphics/sprites/monsters/accessories/hairstyle03.png|W" width="40" height="40"/>
+ <include file="hairstyles/hairstyle01.xml"/>
+</sprite>
diff --git a/graphics/sprites/monsters/accessories/hairstyle04.png b/graphics/sprites/monsters/accessories/hairstyle04.png
new file mode 100644
index 00000000..d46fdc77
--- /dev/null
+++ b/graphics/sprites/monsters/accessories/hairstyle04.png
Binary files differ
diff --git a/graphics/sprites/monsters/accessories/hairstyle04.xml b/graphics/sprites/monsters/accessories/hairstyle04.xml
new file mode 100644
index 00000000..9a559d75
--- /dev/null
+++ b/graphics/sprites/monsters/accessories/hairstyle04.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<sprite>
+ <imageset name="base" src="graphics/sprites/monsters/accessories/hairstyle04.png|W" width="40" height="40"/>
+ <include file="hairstyles/hairstyle01.xml"/>
+</sprite>
diff --git a/graphics/sprites/monsters/accessories/hairstyle06.png b/graphics/sprites/monsters/accessories/hairstyle06.png
new file mode 100644
index 00000000..5ef89329
--- /dev/null
+++ b/graphics/sprites/monsters/accessories/hairstyle06.png
Binary files differ
diff --git a/graphics/sprites/monsters/accessories/hairstyle06.xml b/graphics/sprites/monsters/accessories/hairstyle06.xml
new file mode 100644
index 00000000..ce641369
--- /dev/null
+++ b/graphics/sprites/monsters/accessories/hairstyle06.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<sprite>
+ <imageset name="base" src="graphics/sprites/monsters/accessories/hairstyle06.png|W" width="40" height="40"/>
+ <include file="hairstyles/hairstyle01.xml"/>
+</sprite>
diff --git a/graphics/sprites/monsters/accessories/hairstyle09.png b/graphics/sprites/monsters/accessories/hairstyle09.png
new file mode 100644
index 00000000..8a219fd2
--- /dev/null
+++ b/graphics/sprites/monsters/accessories/hairstyle09.png
Binary files differ
diff --git a/graphics/sprites/monsters/accessories/hairstyle09.xml b/graphics/sprites/monsters/accessories/hairstyle09.xml
new file mode 100644
index 00000000..7e0f4f52
--- /dev/null
+++ b/graphics/sprites/monsters/accessories/hairstyle09.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<sprite>
+ <imageset name="base" src="graphics/sprites/monsters/accessories/hairstyle09.png|W" width="40" height="40"/>
+ <include file="hairstyles/hairstyle01.xml"/>
+</sprite>
diff --git a/graphics/sprites/monsters/accessories/hairstyle10.png b/graphics/sprites/monsters/accessories/hairstyle10.png
new file mode 100644
index 00000000..bbe2a975
--- /dev/null
+++ b/graphics/sprites/monsters/accessories/hairstyle10.png
Binary files differ
diff --git a/graphics/sprites/monsters/accessories/hairstyle10.xml b/graphics/sprites/monsters/accessories/hairstyle10.xml
new file mode 100644
index 00000000..3dcdf2c0
--- /dev/null
+++ b/graphics/sprites/monsters/accessories/hairstyle10.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<sprite>
+ <imageset name="base" src="graphics/sprites/monsters/accessories/hairstyle10.png|W" width="40" height="40"/>
+ <include file="hairstyles/hairstyle01.xml"/>
+</sprite>
diff --git a/graphics/sprites/monsters/accessories/hairstyle11.png b/graphics/sprites/monsters/accessories/hairstyle11.png
new file mode 100644
index 00000000..1971ccf4
--- /dev/null
+++ b/graphics/sprites/monsters/accessories/hairstyle11.png
Binary files differ
diff --git a/graphics/sprites/monsters/accessories/hairstyle11.xml b/graphics/sprites/monsters/accessories/hairstyle11.xml
new file mode 100644
index 00000000..e92ebdad
--- /dev/null
+++ b/graphics/sprites/monsters/accessories/hairstyle11.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<sprite>
+ <imageset name="base" src="graphics/sprites/monsters/accessories/hairstyle11.png|W" width="40" height="40"/>
+ <include file="hairstyles/hairstyle01.xml"/>
+</sprite>
diff --git a/graphics/sprites/monsters/accessories/hairstyle12.png b/graphics/sprites/monsters/accessories/hairstyle12.png
new file mode 100644
index 00000000..200d328f
--- /dev/null
+++ b/graphics/sprites/monsters/accessories/hairstyle12.png
Binary files differ
diff --git a/graphics/sprites/monsters/accessories/hairstyle12.xml b/graphics/sprites/monsters/accessories/hairstyle12.xml
new file mode 100644
index 00000000..c12734ef
--- /dev/null
+++ b/graphics/sprites/monsters/accessories/hairstyle12.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<sprite>
+ <imageset name="base" src="graphics/sprites/monsters/accessories/hairstyle12.png|W" width="40" height="40"/>
+ <include file="hairstyles/hairstyle01.xml"/>
+</sprite>
diff --git a/graphics/sprites/monsters/accessories/hairstyle13.xml b/graphics/sprites/monsters/accessories/hairstyle13.xml
index 2d70caf2..f7e1858a 100644
--- a/graphics/sprites/monsters/accessories/hairstyle13.xml
+++ b/graphics/sprites/monsters/accessories/hairstyle13.xml
@@ -1,228 +1,5 @@
<?xml version="1.0"?>
<sprite>
- <imageset height="32" name="base" src="graphics/sprites/monsters/accessories/hairstyle13.png|W" width="32"/>
- <action imageset="base" name="stand">
- <animation direction="down">
- <frame index="0" offsetX="3" offsetY="-33"/>
- </animation>
- <animation direction="left">
- <frame index="3" offsetX="3" offsetY="-33"/>
- </animation>
- <animation direction="up">
- <frame index="6" offsetX="3" offsetY="-33"/>
- </animation>
- <animation direction="right">
- <frame index="9" offsetX="3" offsetY="-33"/>
- </animation>
- </action>
- <action imageset="base" name="walk">
- <animation direction="down">
- <frame delay="75" index="0" offsetX="3" offsetY="-32"/>
- <frame delay="150" index="1" offsetX="3" offsetY="-33"/>
- <frame delay="75" index="0" offsetX="3" offsetY="-32"/>
- <frame delay="150" index="2" offsetX="3" offsetY="-33"/>
- </animation>
- <animation direction="left">
- <frame delay="75" index="3" offsetX="3" offsetY="-33"/>
- <frame delay="75" index="4" offsetX="3" offsetY="-32"/>
- <frame delay="150" index="4" offsetX="3" offsetY="-33"/>
- <frame delay="75" index="5" offsetX="3" offsetY="-32"/>
- <frame delay="75" index="5" offsetX="3" offsetY="-33"/>
- </animation>
- <animation direction="up">
- <frame delay="75" index="6" offsetX="3" offsetY="-33"/>
- <frame delay="150" index="7" offsetX="3" offsetY="-34"/>
- <frame delay="75" index="6" offsetX="3" offsetY="-33"/>
- <frame delay="150" index="8" offsetX="3" offsetY="-34"/>
- </animation>
- <animation direction="right">
- <frame delay="75" index="9" offsetX="3" offsetY="-33"/>
- <frame delay="75" index="10" offsetX="3" offsetY="-32"/>
- <frame delay="150" index="10" offsetX="3" offsetY="-33"/>
- <frame delay="75" index="11" offsetX="3" offsetY="-32"/>
- <frame delay="75" index="11" offsetX="3" offsetY="-33"/>
- </animation>
- </action>
- <action imageset="base" name="attack">
- <animation direction="down">
- <frame delay="75" index="0" offsetX="3" offsetY="-30"/>
- <frame delay="75" index="0" offsetX="3" offsetY="-31"/>
- <frame delay="75" index="0" offsetX="3" offsetY="-28"/>
- <frame delay="75" index="0" offsetX="3" offsetY="-27"/>
- <end/>
- </animation>
- <animation direction="left">
- <frame delay="75" index="3" offsetX="7" offsetY="-34"/>
- <frame delay="75" index="3" offsetX="7" offsetY="-35"/>
- <frame delay="75" index="3" offsetX="3" offsetY="-32"/>
- <frame delay="75" index="3" offsetX="2" offsetY="-31"/>
- <end/>
- </animation>
- <animation direction="up">
- <frame delay="225" index="6" offsetX="2" offsetY="-33"/>
- <frame delay="75" index="6" offsetX="2" offsetY="-31"/>
- <end/>
- </animation>
- <animation direction="right">
- <frame delay="75" index="9" offsetX="0" offsetY="-34"/>
- <frame delay="75" index="9" offsetX="0" offsetY="-35"/>
- <frame delay="75" index="9" offsetX="3" offsetY="-32"/>
- <frame delay="75" index="9" offsetX="4" offsetY="-31"/>
- <end/>
- </animation>
- </action>
- <action imageset="base" name="attack_bow">
- <animation direction="down">
- <frame delay="225" index="0" offsetX="3" offsetY="-32"/>
- <frame delay="75" index="0" offsetX="3" offsetY="-31"/>
- <frame delay="75" index="0" offsetX="3" offsetY="-32"/>
- <end/>
- </animation>
- <animation direction="left">
- <frame delay="225" index="3" offsetX="6" offsetY="-33"/>
- <frame delay="150" index="3" offsetX="8" offsetY="-34"/>
- <end/>
- </animation>
- <animation direction="up">
- <frame delay="225" index="6" offsetX="3" offsetY="-33"/>
- <frame delay="75" index="6" offsetX="2" offsetY="-32"/>
- <frame delay="75" index="6" offsetX="2" offsetY="-33"/>
- <end/>
- </animation>
- <animation direction="right">
- <frame delay="225" index="9" offsetX="0" offsetY="-33"/>
- <frame delay="150" index="9" offsetX="-2" offsetY="-34"/>
- <end/>
- </animation>
- </action>
- <action imageset="base" name="sit">
- <animation direction="down">
- <frame index="0" offsetX="3" offsetY="-21"/>
- </animation>
- <animation direction="left">
- <frame index="3" offsetX="7" offsetY="-24"/>
- </animation>
- <animation direction="up">
- <frame index="6" offsetX="4" offsetY="-25"/>
- </animation>
- <animation direction="right">
- <frame index="9" offsetX="-3" offsetY="-24"/>
- </animation>
- </action>
- <action imageset="base" name="dead">
- <animation direction="default">
- <frame index="12" offsetX="23" offsetY="-8"/>
- </animation>
- </action>
- <action name="attack_2hand" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="2" offsetY="-29" delay="140"/>
- <frame index="0" offsetX="2" offsetY="-26" delay="140"/>
- <frame index="0" offsetX="2" offsetY="-31" delay="140"/>
- <frame index="0" offsetX="2" offsetY="-25" delay="140"/>
- <end/>
- </animation>
- <animation direction="left">
- <frame index="3" offsetX="2" offsetY="-30" delay="140"/>
- <frame index="3" offsetX="5" offsetY="-33" delay="280"/>
- <frame index="3" offsetX="0" offsetY="-29" delay="140"/>
- <end/>
- </animation>
- <animation direction="up">
- <frame index="6" offsetX="1" offsetY="-32" delay="280"/>
- <frame index="6" offsetX="1" offsetY="-30" delay="140"/>
- <frame index="6" offsetX="2" offsetY="-33" delay="140"/>
- <end/>
- </animation>
- <animation direction="right">
- <frame index="9" offsetX="5" offsetY="-30" delay="140"/>
- <frame index="9" offsetX="2" offsetY="-33" delay="140"/>
- <frame index="9" offsetX="0" offsetY="-33" delay="140"/>
- <frame index="9" offsetX="6" offsetY="-29" delay="140"/>
- <end/>
- </animation>
- </action>
- <action name="attack_sword_stab" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="3" offsetY="-30" delay="100"/>
- <frame index="0" offsetX="3" offsetY="-31" delay="100"/>
- <frame index="0" offsetX="3" offsetY="-28" delay="100"/>
- <frame index="0" offsetX="3" offsetY="-27" delay="100"/>
- <end/>
- </animation>
- <animation direction="left">
- <frame index="3" offsetX="7" offsetY="-34" delay="100"/>
- <frame index="3" offsetX="7" offsetY="-35" delay="100"/>
- <frame index="3" offsetX="3" offsetY="-32" delay="100"/>
- <frame index="3" offsetX="2" offsetY="-31" delay="100"/>
- <end/>
- </animation>
- <animation direction="up">
- <frame index="6" offsetX="2" offsetY="-33" delay="300"/>
- <frame index="6" offsetX="2" offsetY="-31" delay="100"/>
- <end/>
- </animation>
- <animation direction="right">
- <frame index="9" offsetX="0" offsetY="-34" delay="100"/>
- <frame index="9" offsetX="0" offsetY="-35" delay="100"/>
- <frame index="9" offsetX="3" offsetY="-32" delay="100"/>
- <frame index="9" offsetX="4" offsetY="-31" delay="100"/>
- <end/>
- </animation>
- </action>
- <action name="attack_spear" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="1" offsetY="-32" delay="280"/>
- <frame index="0" offsetX="1" offsetY="-33" delay="140"/>
- <frame index="0" offsetX="1" offsetY="-27" delay="140"/>
- <end/>
- </animation>
- <animation direction="left">
- <frame index="3" offsetX="7" offsetY="-34" delay="140"/>
- <frame index="3" offsetX="10" offsetY="-32" delay="140"/>
- <frame index="3" offsetX="3" offsetY="-34" delay="140"/>
- <frame index="3" offsetX="3" offsetY="-31" delay="140"/>
- <end/>
- </animation>
- <animation direction="up">
- <frame index="6" offsetX="0" offsetY="-33" delay="140"/>
- <frame index="6" offsetX="1" offsetY="-33" delay="140"/>
- <frame index="6" offsetX="1" offsetY="-32" delay="140"/>
- <frame index="6" offsetX="0" offsetY="-37" delay="140"/>
- <end/>
- </animation>
- <animation direction="right">
- <frame index="9" offsetX="0" offsetY="-34" delay="140"/>
- <frame index="9" offsetX="-2" offsetY="-32" delay="140"/>
- <frame index="9" offsetX="4" offsetY="-34" delay="140"/>
- <frame index="9" offsetX="5" offsetY="-31" delay="140"/>
- <end/>
- </animation>
- </action>
- <action name="attack_chop" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="2" offsetY="-29" delay="280"/>
- <frame index="0" offsetX="2" offsetY="-31" delay="140"/>
- <frame index="0" offsetX="2" offsetY="-25" delay="140"/>
- <end/>
- </animation>
- <animation direction="left">
- <frame index="3" offsetX="6" offsetY="-34" delay="140"/>
- <frame index="3" offsetX="6" offsetY="-35" delay="280"/>
- <frame index="3" offsetX="1" offsetY="-31" delay="140"/>
- <end/>
- </animation>
- <animation direction="up">
- <frame index="6" offsetX="1" offsetY="-32" delay="140"/>
- <frame index="6" offsetX="1" offsetY="-31" delay="280"/>
- <frame index="6" offsetX="1" offsetY="-30" delay="140"/>
- <end/>
- </animation>
- <animation direction="right">
- <frame index="9" offsetX="0" offsetY="-34" delay="140"/>
- <frame index="9" offsetX="1" offsetY="-35" delay="280"/>
- <frame index="9" offsetX="6" offsetY="-31" delay="140"/>
- <end/>
- </animation>
- </action>
+ <imageset name="base" src="graphics/sprites/monsters/accessories/hairstyle13.png|W" width="32" height="32"/>
+ <include file="hairstyles/hairstyle13.xml"/>
</sprite>
diff --git a/graphics/sprites/monsters/accessories/hairstyle14.png b/graphics/sprites/monsters/accessories/hairstyle14.png
new file mode 100644
index 00000000..36fe6688
--- /dev/null
+++ b/graphics/sprites/monsters/accessories/hairstyle14.png
Binary files differ
diff --git a/graphics/sprites/monsters/accessories/hairstyle14.xml b/graphics/sprites/monsters/accessories/hairstyle14.xml
new file mode 100644
index 00000000..cda6517a
--- /dev/null
+++ b/graphics/sprites/monsters/accessories/hairstyle14.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<sprite>
+ <imageset name="base" src="graphics/sprites/monsters/accessories/hairstyle14.png|W" width="40" height="40"/>
+ <include file="hairstyles/hairstyle01.xml"/>
+</sprite>
diff --git a/graphics/sprites/monsters/accessories/hairstyle15.png b/graphics/sprites/monsters/accessories/hairstyle15.png
new file mode 100644
index 00000000..cd77639c
--- /dev/null
+++ b/graphics/sprites/monsters/accessories/hairstyle15.png
Binary files differ
diff --git a/graphics/sprites/monsters/accessories/hairstyle15.xml b/graphics/sprites/monsters/accessories/hairstyle15.xml
new file mode 100644
index 00000000..e988d33e
--- /dev/null
+++ b/graphics/sprites/monsters/accessories/hairstyle15.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<sprite>
+ <imageset name="base" src="graphics/sprites/monsters/accessories/hairstyle15.png|W" width="40" height="40"/>
+ <include file="hairstyles/hairstyle01.xml"/>
+</sprite>
diff --git a/graphics/sprites/monsters/accessories/hairstyle16.png b/graphics/sprites/monsters/accessories/hairstyle16.png
new file mode 100644
index 00000000..5fd47eec
--- /dev/null
+++ b/graphics/sprites/monsters/accessories/hairstyle16.png
Binary files differ
diff --git a/graphics/sprites/monsters/accessories/hairstyle16.xml b/graphics/sprites/monsters/accessories/hairstyle16.xml
new file mode 100644
index 00000000..6bb4621f
--- /dev/null
+++ b/graphics/sprites/monsters/accessories/hairstyle16.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<sprite>
+ <imageset name="base" src="graphics/sprites/monsters/accessories/hairstyle16.png|W" width="40" height="40"/>
+ <include file="hairstyles/hairstyle01.xml"/>
+</sprite>
diff --git a/graphics/sprites/monsters/accessories/hairstyle17.png b/graphics/sprites/monsters/accessories/hairstyle17.png
new file mode 100644
index 00000000..1c2fbd54
--- /dev/null
+++ b/graphics/sprites/monsters/accessories/hairstyle17.png
Binary files differ
diff --git a/graphics/sprites/monsters/accessories/hairstyle17.xml b/graphics/sprites/monsters/accessories/hairstyle17.xml
new file mode 100644
index 00000000..96945e04
--- /dev/null
+++ b/graphics/sprites/monsters/accessories/hairstyle17.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<sprite>
+ <imageset name="base" src="graphics/sprites/monsters/accessories/hairstyle17.png|W" width="40" height="40"/>
+ <include file="hairstyles/hairstyle01.xml"/>
+</sprite>
diff --git a/graphics/sprites/monsters/accessories/hairstyle18.png b/graphics/sprites/monsters/accessories/hairstyle18.png
new file mode 100644
index 00000000..b6839304
--- /dev/null
+++ b/graphics/sprites/monsters/accessories/hairstyle18.png
Binary files differ
diff --git a/graphics/sprites/monsters/accessories/hairstyle18.xml b/graphics/sprites/monsters/accessories/hairstyle18.xml
new file mode 100644
index 00000000..01a15c70
--- /dev/null
+++ b/graphics/sprites/monsters/accessories/hairstyle18.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<sprite>
+ <imageset name="base" src="graphics/sprites/monsters/accessories/hairstyle18.png|W" width="40" height="40"/>
+ <include file="hairstyles/hairstyle01.xml"/>
+</sprite>
diff --git a/graphics/sprites/monsters/accessories/hairstyle19.png b/graphics/sprites/monsters/accessories/hairstyle19.png
new file mode 100644
index 00000000..72e19d28
--- /dev/null
+++ b/graphics/sprites/monsters/accessories/hairstyle19.png
Binary files differ
diff --git a/graphics/sprites/monsters/accessories/hairstyle19.xml b/graphics/sprites/monsters/accessories/hairstyle19.xml
new file mode 100644
index 00000000..8faffeb7
--- /dev/null
+++ b/graphics/sprites/monsters/accessories/hairstyle19.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<sprite>
+ <imageset name="base" src="graphics/sprites/monsters/accessories/hairstyle19.png|W" width="40" height="40"/>
+ <include file="hairstyles/hairstyle01.xml"/>
+</sprite>
diff --git a/itemcolors.xml b/itemcolors.xml
index 78772306..cec503ba 100644
--- a/itemcolors.xml
+++ b/itemcolors.xml
@@ -81,23 +81,23 @@
<color id="72" value="#000000" name="(free slot)"/>
<color id="73" value="#000000" name="(free slot)"/>
<color id="74" value="#000000" name="(free slot)"/>
- <!-- 75~89 Gaian (elven) colors -->
- <color id="75" value="#000000" name="(free slot)"/>
- <color id="76" value="#000000" name="(free slot)"/>
- <color id="77" value="#000000" name="(free slot)"/>
- <color id="78" value="#000000" name="(free slot)"/>
- <color id="79" value="#000000" name="(free slot)"/>
- <color id="80" value="#000000" name="(free slot)"/>
- <color id="81" value="#000000" name="(free slot)"/>
- <color id="82" value="#000000" name="(free slot)"/>
- <color id="83" value="#000000" name="(free slot)"/>
- <color id="84" value="#000000" name="(free slot)"/>
- <color id="85" value="#000000" name="(free slot)"/>
- <color id="86" value="#000000" name="(free slot)"/>
- <color id="87" value="#000000" name="(free slot)"/>
+ <!-- 75~89 headless colors -->
+ <color id="75" value="#8c4b41,da9041,ffffff" name="light brown"/>
+ <color id="76" value="#06372b,489e25,fdedcc" name="green"/>
+ <color id="77" value="#5f0b33,91191c,f9ad81" name="red"/>
+ <color id="78" value="#602486,934cc3,fdc689" name="purple"/>
+ <color id="79" value="#805e74,c6b09b,ffffff" name="gray"/>
+ <color id="80" value="#8c6625,dab425,ffffff" name="yellow"/>
+ <color id="81" value="#1d2d6d,1594a3,fdedcc" name="blue"/>
+ <color id="82" value="#831f2d,be4f2d,f8cc8b" name="light red"/>
+ <color id="83" value="#432482,584bbc,dae8e5" name="light blue"/>
+ <color id="84" value="#460850,611967,e7b4ae" name="dark purple"/>
+ <color id="85" value="#000000,202020,404040,dddddd" name="black"/>
+ <color id="86" value="#5e0034,a30059,fe7fc4,febfe1,ffffff" name="pink"/>
+ <color id="87" value="#2d1407,4d2809,785128,a66f3b,c4966e" name="brown"/>
<color id="88" value="#000000" name="(free slot)"/>
<color id="89" value="#000000" name="(free slot)"/>
- <!-- 90~104 Raijin colors -->
+ <!-- 90~104 unused race colors -->
<color id="90" value="#000000" name="(free slot)"/>
<color id="91" value="#000000" name="(free slot)"/>
<color id="92" value="#000000" name="(free slot)"/>
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>