From 4d6ac2fc722158e22ddf33b4c1f7a14afd18a627 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Sat, 31 Oct 2009 01:53:39 -0600
Subject: Add items for Halloween

---
 graphics/items/generic-caramelapple.png | Bin 0 -> 4304 bytes
 graphics/items/generic-fakefangs.png    | Bin 0 -> 536 bytes
 graphics/items/generic-lollipop.png     | Bin 0 -> 559 bytes
 graphics/sprites/npcs/npcs.png          | Bin 158625 -> 162315 bytes
 items.xml                               |  45 ++++++++++++++++++++++++++++++++
 npcs.xml                                |   1 +
 6 files changed, 46 insertions(+)
 create mode 100644 graphics/items/generic-caramelapple.png
 create mode 100644 graphics/items/generic-fakefangs.png
 create mode 100644 graphics/items/generic-lollipop.png

diff --git a/graphics/items/generic-caramelapple.png b/graphics/items/generic-caramelapple.png
new file mode 100644
index 00000000..637bed4d
Binary files /dev/null and b/graphics/items/generic-caramelapple.png differ
diff --git a/graphics/items/generic-fakefangs.png b/graphics/items/generic-fakefangs.png
new file mode 100644
index 00000000..b5aa096b
Binary files /dev/null and b/graphics/items/generic-fakefangs.png differ
diff --git a/graphics/items/generic-lollipop.png b/graphics/items/generic-lollipop.png
new file mode 100644
index 00000000..97e99061
Binary files /dev/null and b/graphics/items/generic-lollipop.png differ
diff --git a/graphics/sprites/npcs/npcs.png b/graphics/sprites/npcs/npcs.png
index df8af7d0..516d677b 100644
Binary files a/graphics/sprites/npcs/npcs.png and b/graphics/sprites/npcs/npcs.png differ
diff --git a/items.xml b/items.xml
index c2d58fef..b2f38f25 100644
--- a/items.xml
+++ b/items.xml
@@ -2993,6 +2993,51 @@
         max-per-slot="1"
         luck="5"/>
 
+    <item id="1229"
+        image="generic-caramelapple.png"
+        name="Caramel Apple"
+        description="A caramel coated apple, complete with stick."
+        effect="Rots teeth, tastes good."
+        type="generic"
+        weight="5"
+        max-per-slot="200"/>
+
+    <item id="1230"
+        image="generic-lollipop.png|W:#2502d6"
+        name="Booberry Blue Lollipop"
+        description="A Lollipop."
+        effect="Mmm."
+        type="generic"
+        weight="1"
+        max-per-slot="200"/>
+
+    <item id="1231"
+        image="generic-lollipop.png|W:#00ba16"
+        name="Ghastly Green Lollipop"
+        description="A Lollipop."
+        effect="Tasty."
+        type="generic"
+        weight="1"
+        max-per-slot="200"/>
+
+    <item id="1232"
+        image="generic-lollipop.png|W:#e00418"
+        name="Blood Red Lollipop"
+        description="A Lollipop."
+        effect="Yum."
+        type="generic"
+        weight="1"
+        max-per-slot="200"/>
+
+    <item id="1233"
+        image="generic-fakefangs.png"
+        name="Cheap Plastic Fangs"
+        description="A costumed dracula's must."
+        effect="Doesn't suck.. blood."
+        type="generic"
+        weight="1"
+        max-per-slot="100"/>
+
     <!-- The 2XXY IDs are used for recolored items on eAthena.
         XX = item
         Y = color variant
diff --git a/npcs.xml b/npcs.xml
index 52f25b86..1c178f50 100644
--- a/npcs.xml
+++ b/npcs.xml
@@ -94,6 +94,7 @@
 <npc id="180"><sprite>npcs/npc-savannahman.xml</sprite></npc><!-- Blue Savannah Man with idle animation -->
 <npc id="181"><sprite variant="81">npcs/npc.xml</sprite></npc><!-- Green Savannah Man -->
 <npc id="182"><sprite variant="82">npcs/npc.xml</sprite></npc><!-- Young archer -->
+<npc id="183"><sprite variant="83">npcs/npc.xml</sprite></npc><!-- Skeleton man -->
 
 <npc id="200">
    <sprite>npcs/npc-test.xml</sprite>
-- 
cgit v1.2.3-60-g2f50