From ae98c57b6d7d6ec999ed767e5c58e880e405516f Mon Sep 17 00:00:00 2001
From: wushin <pasekei@gmail.com>
Date: Wed, 25 Dec 2013 09:03:24 -0600
Subject: Core Xml changes for Annual Xmas

---
 items.xml    | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 license.txt  |  99 ++++++++++++++++++++++++++++--------------------
 monsters.xml |  24 ++++++++++++
 npcs.xml     |  42 ++++++++++++++++++++-
 4 files changed, 239 insertions(+), 46 deletions(-)

diff --git a/items.xml b/items.xml
index 2f1fa0e4..c721ad61 100644
--- a/items.xml
+++ b/items.xml
@@ -3275,8 +3275,7 @@
     <item id="856"
         image="equipment/head/knit-cap.png"
         name="Knit Cap"
-        description="A knitted cap keeping your head warm in the crual cold."
-        effect="M. Attack 0"
+        description="A knitted cap keeping your head warm in the cruel cold."
         type="equip-head"
         defense="3"
         weight="50"
@@ -3764,7 +3763,122 @@
         weight="1"/>
 
     <!-- HERE ARE SOME UNUSED ITEM IDS -->
-
+    <item id="1183"
+        image="equipment/chest/ugly-sweater.png|W:#ffffff;Y:#b0242f,e1c130;G:#35bc40;C:#8c7223,e1c130,ffdb63"
+        name="Amber Christmas Sweater"
+        description="An itchy woolen amber sweater with a pinetree motive."
+        effect="M. Attack -12"
+        type="equip-torso"
+        defense="6"
+        weight="35">
+            <sprite gender="male">equipment/chest/ugly-sweater-male.xml|#ffffff;#b0242f,e1c130;#35bc40;#8c7223,e1c130,ffdb63</sprite>
+            <sprite gender="female">equipment/chest/ugly-sweater-female.xml|#ffffff;#b0242f,e1c130;#35bc40;#8c7223,e1c130,ffdb63</sprite>
+    </item>
+    <item id="1184"
+        image="equipment/chest/ugly-sweater.png|W:#3f3f3f,ffffff;Y:#af5a2f,af5a2f,;G:#8ece91,ffffff;C:#578760,6daa78,92e5a2,9be8a9"
+        name="Funky Christmas Sweater"
+        description="An itchy woolen tan green sweater with holiday motive."
+        effect="M. Attack -12"
+        type="equip-torso"
+        defense="6"
+        weight="35">
+        <sprite gender="male">equipment/chest/ugly-sweater-male.xml|#3f3f3f,ffffff;#af5a2f,af5a2f;#8ece91,ffffff;#578760,6daa78,92e5a2,9be8a9</sprite>
+        <sprite gender="female">equipment/chest/ugly-sweater-female.xml|#3f3f3f,ffffff;#af5a2f,af5a2f;#8ece91,ffffff;#578760,6daa78,92e5a2,9be8a9</sprite>
+    </item>
+    <item id="1185"
+        image="equipment/chest/ugly-sweater.png|W:#000000,333333;Y:#c44dff;G:#ff4df0;C:#a3a3a3,ffffff"
+        name="Pink Christmas Sweater"
+        description="A light and only slightly itchy pink christmas sweater."
+        type="equip-torso"
+        defense="5"
+        weight="30"
+        sellProtected="true">
+        <sprite gender="male">equipment/chest/ugly-sweater-male.xml|#000000,333333;#c44dff;#ff4df0;#a3a3a3,ffffff</sprite>
+        <sprite gender="female">equipment/chest/ugly-sweater-male.xml|#000000,333333;#c44dff;#ff4df0;#a3a3a3,ffffff</sprite>
+    </item>
+    <item id="1186"
+        image="equipment/chest/ugly-sweater.png|W:#3f3f3f,ffffff;Y:#af5a2f,af5a2f;G:#8ece91,364c17;C:#49661f"
+        name="Dark Christmas Sweater"
+        description="A thick, warming, yet itchy christmas themed sweater"
+        effect="M. Attack -12"
+        type="equip-torso"
+        defense="6"
+        weight="35">
+        <sprite gender="male">equipment/chest/ugly-sweater-male.xml|#3f3f3f,ffffff;#af5a2f,af5a2f;#8ece91,364c17;#49661f</sprite>
+        <sprite gender="female">equipment/chest/ugly-sweater-female.xml|#3f3f3f,ffffff;#af5a2f,af5a2f;#8ece91,364c17;#49661f</sprite>
+    </item>
+    <item id="1187"
+        image="equipment/chest/ugly-sweater.png|W:#ffffff;Y:#2958b5G:#ff4df0;G:#a7a7a7,d6d6d6,fffffe;C:#2958b5,789eea,c5d8ff"
+        name="Blue Christmas Sweater"
+        description="A light and warming sweater with holiday motive."
+        type="equip-torso"
+        defense="5"
+        weight="30"
+        sellProtected="true">
+        <sprite gender="male">equipment/chest/ugly-sweater-male.xml|#ffffff;#2958b5G:#ff4df0;#a7a7a7,d6d6d6,fffffe;#2958b5,789eea,c5d8ff</sprite>
+        <sprite gender="female">equipment/chest/ugly-sweater-female.xml|#ffffff;#2958b5G:#ff4df0;#a7a7a7,d6d6d6,fffffe;#2958b5,789eea,c5d8ff</sprite>
+    </item>
+    <item id="1188"
+        image="equipment/feet/assassinboots.png|W:#b80f0f,580000,a40000,b80f0f,c02020,ff6060"
+        name="Red Stockings"
+        description="Someone thought of you at christmas eve."
+        effect="M. Attack +2"
+        type="equip-feet"
+        defense="1"
+        weight="10"
+        sellProtected="true">
+        <sprite gender="male">equipment/feet/assassin-boots-male.xml|#b80f0f,580000,a40000,b80f0f,c02020,ff6060</sprite>
+        <sprite gender="female">equipment/feet/assassin-boots-female.xml|#b80f0f,580000,a40000,b80f0f,c02020,ff6060</sprite>
+    </item>
+    <item id="1189"
+        image="use/food/snake-egg.png|W:#ffffff;R:#ffffff;G:#ffffff"
+        name="Pollett Egg"
+        description="Mmm.. A nice treat."
+        type="usable"
+        hp="75"
+        mp="10"
+        weight="1"/>
+    <item id="1190"
+        image="equipment/head/nutcrackerhat.png"
+        name="Nutcracker Hat"
+        description="Now you will look just like a Nutcracker!"
+        effect="M. Attack +2"
+        type="equip-head"
+        defense="5"
+        weight="20"
+        sellProtected="true">
+        <sprite>equipment/head/nutcrackerhat.xml</sprite>
+    </item>
+    <item id="1191"
+        image="generic/wrapping-paper.png|W:#ffffff"
+        name="White Wrap"
+        description="A role of white wrapping paper."
+        type="generic"
+        weight="5"/>
+    <item id="1192"
+        image="generic/wrapping-paper.png|W:#effe6c"
+        name="Yellow Wrap"
+        description="A role of yellow wrapping paper."
+        type="generic"
+        weight="5"/>
+    <item id="1193"
+        image="generic/wrapping-paper.png|W:#6bc6ff"
+        name="Blue Wrap"
+        description="A role of blue wrapping paper."
+        type="generic"
+        weight="5"/>
+    <item id="1194"
+        image="generic/wrapping-paper.png|W:#ff8eff"
+        name="Purple Wrap"
+        description="A role of purple wrapping paper."
+        type="generic"
+        weight="5"/>
+    <item id="1195"
+        image="generic/wrapping-paper.png|W:#00b97a"
+        name="Green Wrap"
+        description="A role of green wrapping paper."
+        type="generic"
+        weight="5"/>
     <item id="1197"
         image="equipment/charms/skeletoncharm.png"
         name="Jack's Skeleton Charm"
diff --git a/license.txt b/license.txt
index 6ea747b0..c71c03ed 100644
--- a/license.txt
+++ b/license.txt
@@ -110,6 +110,7 @@ http://creativecommons.org/licenses/by-sa/3.0/
     graphics/items/equipment/chest/tanktop.png (VXD)                                                          (GPLv2), (CC BY-SA 3.0)
     graphics/items/equipment/chest/terranite.png (Kr0n05931)                                                  (GPLv2)
     graphics/items/equipment/chest/tnecksweater.png (Saphy)                                                   (GPLv2)
+    graphics/items/equipment/chest/ugly-sweater.png (Chayenne, Kr0n05931)                                     (GPLv2)
     graphics/items/equipment/chest/valentine-dress.png (Frictor)                                              (GPLv2)
     graphics/items/equipment/chest/vnecksweater.png (Saphy)                                                   (GPLv2)
     graphics/items/equipment/chest/warlordplate.png (????)                                                    (GPLv2)
@@ -407,6 +408,7 @@ http://creativecommons.org/licenses/by-sa/3.0/
     graphics/items/generic/wooden-mouboo.png (????, Enchilado)                                                           (GPLv2)
     graphics/items/generic/wrapping-paper-dotted.png (Lizandra, Enchilado)                                               (GPLv2)
     graphics/items/generic/wrapping-paper-striped.png (Lizandra, Enchilado)                                              (GPLv2)
+    graphics/items/generic/wrapping-paper.png (Wushin, Lizandra, Enchilado)                                              (GPLv2)
     graphics/items/generic/yeti-claw.png (Nami, Enchilado)                                                               (GPLv2), (CC BY-SA 3.0)
 ## Use
 ### Food
@@ -513,6 +515,7 @@ http://creativecommons.org/licenses/by-sa/3.0/
     graphics/particles/orb-large.png (Crush)                                                                  (GPLv2), (CC BY-SA 3.0)
     graphics/particles/orb-medium.png (Crush)                                                                 (GPLv2), (CC BY-SA 3.0)
     graphics/particles/orb-small.png (Crush)                                                                  (GPLv2), (CC BY-SA 3.0)
+    graphics/particles/peppermint.png (Wushin, Fother)                                                        (GPLv2), (CC BY-SA 3.0)
     graphics/particles/pool_32x59.particle.png (Skipy)                                                        (GPLv2)
     graphics/particles/pool_65x27.particle.png (Skipy)                                                        (GPLv2)
     graphics/particles/pool-undyed.png (Alige, Skipy)                                                         (GPLv2)
@@ -608,6 +611,8 @@ http://creativecommons.org/licenses/by-sa/3.0/
     graphics/sprites/equipment/chest/terranite-male.png (Kr0n05931)                                           (GPLv2)
     graphics/sprites/equipment/chest/tnecksweater-female.png (Saphy)                                          (GPLv2)
     graphics/sprites/equipment/chest/tnecksweater-male.png (Saphy)                                            (GPLv2)
+    graphics/sprites/equipment/chest/ugly-sweater-female.png (Fate, Varuna, Chayenne)                         (GPLv2)
+    graphics/sprites/equipment/chest/ugly-sweater-male.png (Kr0n05931, Chayenne)                              (GPLv2)
     graphics/sprites/equipment/chest/valentine-dress.png (Frictor)                                            (GPLv2)
     graphics/sprites/equipment/chest/vnecksweater-female.png (Saphy)                                          (GPLv2)
     graphics/sprites/equipment/chest/vnecksweater-male.png (Saphy)                                            (GPLv2)
@@ -684,6 +689,7 @@ http://creativecommons.org/licenses/by-sa/3.0/
     graphics/sprites/equipment/head/moubootaurhead.png (????)                                                 (GPLv2)
     graphics/sprites/equipment/head/mushroom.png (crevost2, Yuuki)                                            (GPLv2)
     graphics/sprites/equipment/head/nohmask.png (????)                                                        (GPLv2)
+    graphics/sprites/equipment/head/nutcrackerhat.png (Chayenne, ????, Alige, Lizandra, Salmondine)           (GPLv2)
     graphics/sprites/equipment/head/operamask.png (Meway)                                                     (GPLv2), (CC BY-SA 3.0)
     graphics/sprites/equipment/head/overlordhelm.png (Black Don)                                              (GPLv2)
     graphics/sprites/equipment/head/paladinhelm.png (Black Don)                                               (GPLv2)
@@ -765,6 +771,7 @@ http://creativecommons.org/licenses/by-sa/3.0/
     graphics/sprites/monsters/butterfly.png (Meway)                                                           (GPLv2), (CC BY-SA 3.0)
     graphics/sprites/monsters/cave-maggot-giant.png (????, Neoriceisgood)                                     (GPLv2)
     graphics/sprites/monsters/cave-maggot.png (????, Neoriceisgood)                                           (GPLv2)
+    graphics/sprites/monsters/christmas-mouboo.png (Cassy, Yuuki)                                             (GPLv2)
     graphics/sprites/monsters/clover.png (5t3v3)                                                              (GPLv2)
     graphics/sprites/monsters/demon.png (FotherJ, V0id)                                                       (GPLv2), (CC BY-SA 3.0)
     graphics/sprites/monsters/duck.png (Meway)                                                                (GPLv2), (CC BY-SA 3.0)
@@ -785,6 +792,8 @@ http://creativecommons.org/licenses/by-sa/3.0/
     graphics/sprites/monsters/mushroom-red.png (Yuuki)                                                        (GPLv2)
     graphics/sprites/monsters/mushroom-spiky.png (Yuuki)                                                      (GPLv2)
     graphics/sprites/monsters/mushroom-wicked.png (Cassy, Yuuki)                                              (GPLv2)
+    graphics/sprites/monsters/nutcracker.png (Chayenne, ????, Alige, Lizandra, Salmondine)                    (GPLv2)
+    graphics/sprites/monsters/penguin.png (Fother)                                                            (GPLv2)
     graphics/sprites/monsters/pinkie.png (Crush)                                                              (GPLv2), (CC BY-SA 3.0)
     graphics/sprites/monsters/plant.png (Crush, Seradest)                                                     (GPLv2)
     graphics/sprites/monsters/pumpkin.png (????)                                                              (GPLv2)
@@ -820,53 +829,61 @@ http://creativecommons.org/licenses/by-sa/3.0/
     graphics/sprites/monsters/accessories/generic-shadow-medium-circle.png (????)                             (GPLv2)
     graphics/sprites/monsters/accessories/generic-shadow-small-circle.png (????)                              (GPLv2)
     graphics/sprites/monsters/accessories/mouboo-antlers.png (Alige, Wombat)                                  (GPLv2), (CC BY-SA 3.0)
+    graphics/sprites/monsters/accessories/mouboo-red-nose.png (Cassy)                                         (GPLv2)
+    graphics/sprites/monsters/accessories/mouboo-red-saddle.png (Cassy)                                       (GPLv2)
+    graphics/sprites/monsters/accessories/mouboo-red-shoes.png (Cassy)                                        (GPLv2)
+    graphics/sprites/monsters/accessories/mouboo-santa-hat.png (Cassy)                                        (GPLv2)
     graphics/sprites/monsters/accessories/scythe-shadow.png (????)                                            (GPLv2)
+    graphics/sprites/monsters/accessories/slime-bubble.png (Fother)                                           (GPLv2), (CC BY-SA 3.0)
     graphics/sprites/monsters/accessories/slime-littleslime.png (Wombat)                                      (GPLv2), (CC BY-SA 3.0)
     graphics/sprites/monsters/accessories/slime-rudolph.png (????)                                            (GPLv2)
     graphics/sprites/monsters/accessories/slime-santa.png (????)                                              (GPLv2)
     graphics/sprites/monsters/accessories/slime-seajelly.png (FotherJ)                                        (GPLv2), (CC BY-SA 3.0)
 ## NPCs
-    graphics/sprites/npcs/bones.png (FotherJ, Salmondine)                                                     (GPLv2)
-    graphics/sprites/npcs/childoutfits.png (Milla, Mrgrey, Nami, Salmondine, Wombat)                          (GPLv2)
-    graphics/sprites/npcs/childposes.png (Milla, Mrgrey, Nami, Salmondine)                                    (GPLv2)
-    graphics/sprites/npcs/christmas_npcs.png (????, Alige, Lizandra, Salmondine)                              (GPLv2)
-    graphics/sprites/npcs/evil-obelisk.png (Alige, ChefChelios, Leela)                                        (GPLv2)
-    graphics/sprites/npcs/furnace.png (Salmondine)                                                            (GPLv2)
-    graphics/sprites/npcs/hugenpcs.png (ChefChelios, Nami)                                                    (GPLv2), (CC BY-SA 3.0)
-    graphics/sprites/npcs/npc-annualeaster.png (????)                                                         (GPLv2)
-    graphics/sprites/npcs/npc-beerguyghost.png (Reid, Skipy)                                                  (GPLv2)
-    graphics/sprites/npcs/npc-chronos.png (Lien)                                                              (GPLv2)
-    graphics/sprites/npcs/npc-cindycage.png (Skipy)                                                           (GPLv2)
-    graphics/sprites/npcs/npc-creepysurgeon.png (Modanung)                                                    (GPLv2), (CC BY-SA 3.0)
-    graphics/sprites/npcs/npc-cryingchild.png (Lien, Reid)                                                    (GPLv2)
-    graphics/sprites/npcs/npc-dice.png (Skipy, Wombat)                                                        (GPLv2)
-    graphics/sprites/npcs/npc-dyer.png (ChefChelios)                                                          (GPLv2), (CC BY-SA 3.0)
-    graphics/sprites/npcs/npc-gate_224x192.png (Skipy)                                                        (GPLv2)
-    graphics/sprites/npcs/npc-ghostinnkeeper.png (Reid)                                                       (GPLv2), (CC BY-SA 3.0)
-    graphics/sprites/npcs/npc-guard.png (Skipy)                                                               (GPLv2)
-    graphics/sprites/npcs/npc-headhang.png (Reid, Skipy)                                                      (GPLv2)
-    graphics/sprites/npcs/npc-headless.png (Reid, Skipy)                                                      (GPLv2)
-    graphics/sprites/npcs/npc-lightman.png (Lien)                                                             (GPLv2)
-    graphics/sprites/npcs/npc-lumberjack.png (Crush)                                                          (GPLv2), (CC BY-SA 3.0)
-    graphics/sprites/npcs/npc-mirak.png (ChefChelios)                                                         (GPLv2), (CC BY-SA 3.0)
-    graphics/sprites/npcs/npc-receptionist.png (Skipy)                                                        (GPLv2)
-    graphics/sprites/npcs/npc-savannahman.png (Modanung)                                                      (GPLv2), (CC BY-SA 3.0)
-    graphics/sprites/npcs/npc-test.png (Modanung)                                                             (GPLv2), (CC BY-SA 3.0)
-    graphics/sprites/npcs/npc-treasurebox.png (????)                                                          (GPLv2)
-    graphics/sprites/npcs/npc-supply-crate.png (????,wushin)                                                  (GPLv2)
-    graphics/sprites/npcs/npc-undeadbanker.png (Reid)                                                         (GPLv2), (CC BY-SA 3.0)
-    graphics/sprites/npcs/npc-weaver.png (ChefChelios)                                                        (GPLv2), (CC BY-SA 3.0)
-    graphics/sprites/npcs/npc-woodenpump.png (Varuna)                                                         (GPLv2), (CC BY-SA 3.0)
-    graphics/sprites/npcs/npcs.png (????, Crush, Fate, Haay, Lien, Qwerty Dragon, Salmondine, Skipy, Wombat)  (GPLv2)
-    graphics/sprites/npcs/npcs2.png (Reid, Salmondine, Skipy)                                                 (GPLv2)
-    graphics/sprites/npcs/outfits.png (Wombat)                                                                (GPLv2), (CC BY-SA 3.0)
-    graphics/sprites/npcs/poses.png (Lien, Meemixes, Salmondine, Wombat)                                      (GPLv2)
-    graphics/sprites/npcs/saboteur.png (Wombat)                                                               (GPLv2), (CC BY-SA 3.0)
-    graphics/sprites/npcs/sages.png (Alige, Nami, Salmondine)                                                 (GPLv2)
-    graphics/sprites/npcs/shapeshifter.png (Alige, Modanung)                                                  (GPLv2), (CC BY-SA 3.0)
-    graphics/sprites/npcs/sittingsage.png (Alige, Nami)                                                       (GPLv2), (CC BY-SA 3.0)
-    graphics/sprites/npcs/soulmenhirs.png (Alige, Lien)                                                       (GPLv2)
-    graphics/sprites/npcs/thermin_npcs.png (Lien, Nami, Salmondine, Varuna)                                   (GPLv2)
+    graphics/sprites/npcs/bones.png (FotherJ, Salmondine)                                                      (GPLv2)
+    graphics/sprites/npcs/childoutfits.png (Milla, Mrgrey, Nami, Salmondine, Wombat)                           (GPLv2)
+    graphics/sprites/npcs/childposes.png (Milla, Mrgrey, Nami, Salmondine)                                     (GPLv2)
+    graphics/sprites/npcs/christmas_npcs.png (????, Alige, Lizandra, Salmondine)                               (GPLv2)
+    graphics/sprites/npcs/christmastree.png (Chayenne, ????, Alige, Hal9000, Enchilado, Kekskiller, FotherJ)   (GPLv2)
+    graphics/sprites/npcs/evil-obelisk.png (Alige, ChefChelios, Leela)                                         (GPLv2)
+    graphics/sprites/npcs/furnace.png (Salmondine)                                                             (GPLv2)
+    graphics/sprites/npcs/hugenpcs.png (ChefChelios, Nami)                                                     (GPLv2), (CC BY-SA 3.0)
+    graphics/sprites/npcs/npc-annualeaster.png (????)                                                          (GPLv2)
+    graphics/sprites/npcs/npc-beerguyghost.png (Reid, Skipy)                                                   (GPLv2)
+    graphics/sprites/npcs/npc-chronos.png (Lien)                                                               (GPLv2)
+    graphics/sprites/npcs/npc-cindycage.png (Skipy)                                                            (GPLv2)
+    graphics/sprites/npcs/npc-creepysurgeon.png (Modanung)                                                     (GPLv2), (CC BY-SA 3.0)
+    graphics/sprites/npcs/npc-cryingchild.png (Lien, Reid)                                                     (GPLv2)
+    graphics/sprites/npcs/npc-dice.png (Skipy, Wombat)                                                         (GPLv2)
+    graphics/sprites/npcs/npc-dyer.png (ChefChelios)                                                           (GPLv2), (CC BY-SA 3.0)
+    graphics/sprites/npcs/npc-gate_224x192.png (Skipy)                                                         (GPLv2)
+    graphics/sprites/npcs/npc-ghostinnkeeper.png (Reid)                                                        (GPLv2), (CC BY-SA 3.0)
+    graphics/sprites/npcs/npc-guard.png (Skipy)                                                                (GPLv2)
+    graphics/sprites/npcs/npc-headhang.png (Reid, Skipy)                                                       (GPLv2)
+    graphics/sprites/npcs/npc-headless.png (Reid, Skipy)                                                       (GPLv2)
+    graphics/sprites/npcs/npc-lightman.png (Lien)                                                              (GPLv2)
+    graphics/sprites/npcs/npc-lumberjack.png (Crush)                                                           (GPLv2), (CC BY-SA 3.0)
+    graphics/sprites/npcs/npc-mirak.png (ChefChelios)                                                          (GPLv2), (CC BY-SA 3.0)
+    graphics/sprites/npcs/npc-receptionist.png (Skipy)                                                         (GPLv2)
+    graphics/sprites/npcs/npc-savannahman.png (Modanung)                                                       (GPLv2), (CC BY-SA 3.0)
+    graphics/sprites/npcs/npc-test.png (Modanung)                                                              (GPLv2), (CC BY-SA 3.0)
+    graphics/sprites/npcs/npc-treasurebox.png (????)                                                           (GPLv2)
+    graphics/sprites/npcs/npc-supply-crate.png (????,wushin)                                                   (GPLv2)
+    graphics/sprites/npcs/npc-undeadbanker.png (Reid)                                                          (GPLv2), (CC BY-SA 3.0)
+    graphics/sprites/npcs/npc-weaver.png (ChefChelios)                                                         (GPLv2), (CC BY-SA 3.0)
+    graphics/sprites/npcs/npc-woodenpump.png (Varuna)                                                          (GPLv2), (CC BY-SA 3.0)
+    graphics/sprites/npcs/npcs.png (????, Crush, Fate, Haay, Lien, Qwerty Dragon, Salmondine, Skipy, Wombat)   (GPLv2)
+    graphics/sprites/npcs/npcs2.png (Reid, Salmondine, Skipy)                                                  (GPLv2)
+    graphics/sprites/npcs/outfits.png (Wombat)                                                                 (GPLv2), (CC BY-SA 3.0)
+    graphics/sprites/npcs/poses.png (Lien, Meemixes, Salmondine, Wombat)                                       (GPLv2)
+    graphics/sprites/npcs/saboteur.png (Wombat)                                                                (GPLv2), (CC BY-SA 3.0)
+    graphics/sprites/npcs/sages.png (Alige, Nami, Salmondine)                                                  (GPLv2)
+    graphics/sprites/npcs/shapeshifter.png (Alige, Modanung)                                                   (GPLv2), (CC BY-SA 3.0)
+    graphics/sprites/npcs/sittingsage.png (Alige, Nami)                                                        (GPLv2), (CC BY-SA 3.0)
+    graphics/sprites/npcs/soulmenhirs.png (Alige, Lien)                                                        (GPLv2)
+    graphics/sprites/npcs/thermin_npcs.png (Lien, Nami, Salmondine, Varuna)                                    (GPLv2)
+    graphics/sprites/npcs/xmas-palm.png (Chayenne, ????, Enchilado)                                            (GPLv2)
+    graphics/sprites/npcs/xmastree-nosnow.png (Chayenne, ????, Alige, Hal9000, Enchilado, Kekskiller, FotherJ) (GPLv2)
 
 # Tilesets
     graphics/tiles/arena.png (????)                                                                               (GPLv2)
diff --git a/monsters.xml b/monsters.xml
index 186100bf..f667d8a1 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -438,6 +438,9 @@
   </monster>
   <monster id="92" name="Reinboo">
     <sprite>monsters/mouboo.xml</sprite>
+    <sprite>monsters/accessories/mouboo-red-nose.xml</sprite>
+    <sprite>monsters/accessories/mouboo-red-saddle.xml</sprite>
+    <sprite>monsters/accessories/mouboo-red-shoes.xml</sprite>
     <sprite>monsters/accessories/mouboo-antlers.xml</sprite>
   </monster>
   <monster id="93" name="White Bell">
@@ -530,4 +533,25 @@
     <particlefx>graphics/particles/monster-angry-green-slime.particle.xml</particlefx>
     <sound event="hit">monsters/slime/slime-hit1.ogg</sound>
   </monster>
+  <monster id="109" name="Candied Slime">
+    <sprite>monsters/slime.xml|#fd2273,ffbeff,ffffff</sprite>
+    <sprite>monsters/accessories/slime-bubble.xml|#feaaa7,fdfffb</sprite>
+    <attack id="1" missile-particle="graphics/particles/peppermint.particle.xml" action="attack"/>
+    <sound event="hit">monsters/slime/slime-hit1.ogg</sound>
+  </monster>
+  <monster id="110" name="Santaboo">
+    <sprite>monsters/christmas-mouboo.xml</sprite>
+    <sprite>monsters/accessories/mouboo-red-nose.xml</sprite>
+    <sprite>monsters/accessories/mouboo-red-saddle.xml</sprite>
+    <sprite>monsters/accessories/mouboo-red-shoes.xml</sprite>
+    <sprite>monsters/accessories/mouboo-santa-hat.xml</sprite>
+  </monster>
+  <monster id="111" name="Pollett">
+    <sprite>monsters/penguin.xml</sprite>
+  </monster>
+  <monster id="112" name="Nut Cracker">
+    <sprite>monsters/nutcracker.xml</sprite>
+    <sprite>monsters/accessories/nutcrackerhair.xml|#333333</sprite>
+    <sprite>monsters/accessories/nutcrackerhat.xml</sprite>
+  </monster>
 </monsters>
diff --git a/npcs.xml b/npcs.xml
index df37b3ee..b1947158 100644
--- a/npcs.xml
+++ b/npcs.xml
@@ -735,11 +735,17 @@
   </npc>
   <!-- Nutcracker -->
   <npc id="330">
-    <sprite variant="2">npcs/christmas_npcs.xml</sprite>
+    <sprite variant="0">monsters/nutcracker.xml</sprite>
+    <sprite>monsters/accessories/nutcrackerhair.xml|#333333</sprite>
+    <sprite>monsters/accessories/nutcrackerhat.xml</sprite>
   </npc>
   <!-- Santaboo -->
   <npc id="331">
-    <sprite variant="3">npcs/christmas_npcs.xml</sprite>
+    <sprite>monsters/christmas-mouboo.xml</sprite>
+    <sprite>monsters/accessories/mouboo-red-nose.xml</sprite>
+    <sprite>monsters/accessories/mouboo-red-saddle.xml</sprite>
+    <sprite>monsters/accessories/mouboo-red-shoes.xml</sprite>
+    <sprite>monsters/accessories/mouboo-santa-hat.xml</sprite>
   </npc>
   <!-- Bodyguard Elf1 -->
   <npc id="332">
@@ -949,6 +955,38 @@
   <npc id="378">
     <sprite>npcs/npc-supply-crate.xml</sprite>
   </npc>
+  <npc id="379"
+    targetSelection="false">
+    <sprite>npcs/christmastree.xml</sprite>
+  </npc>
+  <npc id="380"
+    targetSelection="false">
+    <sprite variant="1">npcs/snowtree.xml</sprite>
+  </npc>
+  <npc id="381"
+    targetSelection="false">
+    <sprite variant="1">npcs/xmastree-nosnow.xml</sprite>
+  </npc>
+  <npc id="382"
+    targetSelection="false">
+    <sprite variant="3">npcs/tree.xml</sprite>
+  </npc>
+  <npc id="383"
+    targetSelection="false">
+    <sprite variant="3">npcs/xmas-palm.xml</sprite>
+  </npc>
+  <npc id="384"
+    targetSelection="false">
+    <sprite variant="1">npcs/palm-tree.xml</sprite>
+  </npc>
+  <!-- Young Male Wizard In Bubble -->
+  <npc id="385">
+    <sprite variant="58">npcs/npc.xml</sprite>
+    <particlefx>graphics/particles/sphere-white.particle.xml</particlefx>
+  </npc>
+  <npc id="386">
+    <sprite>npcs/present.xml|R:#ec2843;W:#1e8c1e</sprite>
+  </npc>
   <!-- empty (Invisible NPC used in scripts) -->
   <!-- for npcs that shouldn't be selectable (e.g. in magic effects) use 127,
        for warps/doors use 45,
-- 
cgit v1.2.3-60-g2f50