Merge branch 'master' of gitorious.org:~wombat/tmwdata/cache-clientdata

15 files changed, 459 insertions, 5 deletions

diff --git a/graphics/items/equipment/head/wizard-hat.png b/graphics/items/equipment/head/wizard-hat.png
new file mode 100644
index 00000000..ab9a49b8
--- /dev/null
+++ b/graphics/items/equipment/head/wizard-hat.png
diff --git a/graphics/items/equipment/head/yeti-mask.png b/graphics/items/equipment/head/yeti-mask.png
new file mode 100644
index 00000000..53c5bb15
--- /dev/null
+++ b/graphics/items/equipment/head/yeti-mask.png
diff --git a/graphics/items/generic-animal-bones.png b/graphics/items/generic-animal-bones.png
new file mode 100644
index 00000000..7f8bdf11
--- /dev/null
+++ b/graphics/items/generic-animal-bones.png
diff --git a/graphics/items/generic-frozen-yeti-tear.png b/graphics/items/generic-frozen-yeti-tear.png
new file mode 100644
index 00000000..af1e6de8
--- /dev/null
+++ b/graphics/items/generic-frozen-yeti-tear.png
diff --git a/graphics/items/generic-ice-cube.png b/graphics/items/generic-ice-cube.png
new file mode 100644
index 00000000..7277aea4
--- /dev/null
+++ b/graphics/items/generic-ice-cube.png
diff --git a/graphics/items/generic-rawlog.png b/graphics/items/generic-rawlog.png
index 95ab5511..038d5a5f 100644
--- a/graphics/items/generic-rawlog.png
+++ b/graphics/items/generic-rawlog.png
diff --git a/graphics/items/generic-yeti-claw.png b/graphics/items/generic-yeti-claw.png
new file mode 100644
index 00000000..361e7d3c
--- /dev/null
+++ b/graphics/items/generic-yeti-claw.png
diff --git a/graphics/sprites/equipment/head/wizard-hat.png b/graphics/sprites/equipment/head/wizard-hat.png
new file mode 100644
index 00000000..3b4be79e
--- /dev/null
+++ b/graphics/sprites/equipment/head/wizard-hat.png
diff --git a/graphics/sprites/equipment/head/wizard-hat.xml b/graphics/sprites/equipment/head/wizard-hat.xml
new file mode 100644
index 00000000..3f06f733
--- /dev/null
+++ b/graphics/sprites/equipment/head/wizard-hat.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0"?>
+<sprite>
+	<imageset name="base" src="graphics/sprites/equipment/head/wizard-hat.png|W" width="40" height="40" />
+
+	<action name="stand" imageset="base">
+		<animation direction="down">
+		  <frame index="0" offsetX="0" offsetY ="-31" />
+		</animation>
+		<animation direction="left">
+		  <frame index="1" offsetX="0" offsetY ="-31"/>
+		</animation>
+		<animation direction="up">
+		  <frame index="2" offsetX="-1" offsetY ="-27"/>
+		</animation>
+		<animation direction="right">
+		  <frame index="3" offsetX="0" offsetY ="-31"/>
+		</animation>
+	</action>
+
+	<action name="walk" imageset="base">
+		<animation direction="down">
+		  <frame index="0" offsetX="0" offsetY ="-30" delay="75"/>
+		  <frame index="0" offsetX="0" offsetY ="-31" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-31" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-30" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-31" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-31" delay="75" />
+		</animation>
+		<animation direction="left">
+		  <frame index="1" offsetX="0" offsetY ="-31" delay="75"/>
+		  <frame index="1" offsetX="0" offsetY ="-30" delay="75"/>
+		  <frame index="1" offsetX="0" offsetY ="-31" delay="75"/>
+		  <frame index="1" offsetX="0" offsetY ="-31" delay="75"/>
+		  <frame index="1" offsetX="0" offsetY ="-30" delay="75"/>
+		  <frame index="1" offsetX="0" offsetY ="-31" delay="75"/>
+		</animation>
+		<animation direction="up">
+		  <frame index="2" offsetX="-1" offsetY ="-27" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-28" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-28" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-27" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-28" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-28" delay="75"/>
+		</animation>
+		<animation direction="right">
+		  <frame index="3" offsetX="0" offsetY ="-31" delay="75"/>
+		  <frame index="3" offsetX="0" offsetY ="-30" delay="75"/>
+		  <frame index="3" offsetX="0" offsetY ="-31" delay="75"/>
+		  <frame index="3" offsetX="0" offsetY ="-31" delay="75"/>
+		  <frame index="3" offsetX="0" offsetY ="-30" delay="75"/>
+		  <frame index="3" offsetX="0" offsetY ="-31" delay="75"/>
+		</animation>
+	</action>
+
+	<action name="attack" imageset="base">
+		<animation direction="down">
+		  <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-30" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-27" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-26" delay="75" />
+		  <end />
+		</animation>
+		<animation direction="left">
+		  <frame index="1" offsetX="4" offsetY ="-32" delay="75" />
+		  <frame index="1" offsetX="4" offsetY ="-33" delay="75" />
+		  <frame index="1" offsetX="0" offsetY ="-30" delay="75" />
+		  <frame index="1" offsetX="-1" offsetY ="-29" delay="75" />
+		  <end />
+		</animation>
+		<animation direction="up">
+		  <frame index="2" offsetX="-2" offsetY ="-27" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-27" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-27" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
+		  <end />
+		</animation>
+		<animation direction="right">
+		  <frame index="3" offsetX="-3" offsetY ="-32" delay="75"/>
+		  <frame index="3" offsetX="-3" offsetY ="-33" delay="75"/>
+		  <frame index="3" offsetX="0" offsetY ="-30" delay="75"/>
+		  <frame index="3" offsetX="1" offsetY ="-29" delay="75"/>
+		  <end />
+		</animation>
+	</action>
+
+	<action name="attack_bow" imageset="base">
+		<animation direction="down">
+		  <frame index="0" offsetX="0" offsetY ="-30" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-30" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-30" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-30" delay="75" />
+		  <end />
+		</animation>
+		<animation direction="left">
+		  <frame index="1" offsetX="3" offsetY ="-31" delay="75" />
+		  <frame index="1" offsetX="3" offsetY ="-31" delay="75" />
+		  <frame index="1" offsetX="3" offsetY ="-31" delay="75" />
+		  <frame index="1" offsetX="5" offsetY ="-32" delay="75" />
+		  <frame index="1" offsetX="5" offsetY ="-32" delay="75" />
+		  <end />
+		</animation>
+		<animation direction="up">
+		  <frame index="2" offsetX="-1" offsetY ="-27" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-27" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-27" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-26" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-27" delay="75"/>
+		  <end />
+		</animation>
+		<animation direction="right">
+		  <frame index="3" offsetX="-3" offsetY ="-31" delay="75"/>
+		  <frame index="3" offsetX="-3" offsetY ="-31" delay="75"/>
+		  <frame index="3" offsetX="-3" offsetY ="-31" delay="75"/>
+		  <frame index="3" offsetX="-5" offsetY ="-32" delay="75"/>
+		  <frame index="3" offsetX="-5" offsetY ="-32" delay="75"/>
+		  <end />
+		</animation>
+	</action>
+
+	<action name="sit" imageset="base">
+		<animation direction="down">
+		  <frame index="0" offsetX="0" offsetY ="-19" />
+		</animation>
+		<animation direction="left">
+		  <frame index="1" offsetX="4" offsetY ="-22"/>
+		</animation>
+		<animation direction="up">
+		  <frame index="2" offsetX="0" offsetY ="-19"/>
+		</animation>
+		<animation direction="right">
+		  <frame index="3" offsetX="-6" offsetY ="-22"/>
+		</animation>
+	</action>
+
+	<action name="dead" imageset="base">
+		<animation direction="default">
+			<frame index="4" offsetX="23" offsetY="-4"/>
+		</animation>
+	</action>
+
+</sprite>
diff --git a/graphics/sprites/equipment/head/yeti-mask.png b/graphics/sprites/equipment/head/yeti-mask.png
new file mode 100644
index 00000000..1eab7ce5
--- /dev/null
+++ b/graphics/sprites/equipment/head/yeti-mask.png
diff --git a/graphics/sprites/equipment/head/yeti-mask.xml b/graphics/sprites/equipment/head/yeti-mask.xml
new file mode 100644
index 00000000..4a502713
--- /dev/null
+++ b/graphics/sprites/equipment/head/yeti-mask.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0"?>
+<sprite>
+    <imageset name="base" src="graphics/sprites/equipment/head/yeti-mask.png" width="40" height="31" />
+
+    <action name="stand" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetX="-1" offsetY ="-33" />
+        </animation>
+        <animation direction="left">
+            <frame index="1" offsetX="-2" offsetY ="-34"/>
+        </animation>
+        <animation direction="up">
+            <frame index="2" offsetX="-3" offsetY ="-34"/>
+        </animation>
+        <animation direction="right">
+            <frame index="3" offsetX="-1" offsetY ="-32"/>
+        </animation>
+    </action>
+
+    <action name="walk" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetX="-1" offsetY ="-32" delay="75"/>
+            <frame index="0" offsetX="-1" offsetY ="-33" delay="75" />
+            <frame index="0" offsetX="-1" offsetY ="-33" delay="75" />
+            <frame index="0" offsetX="-1" offsetY ="-32" delay="75" />
+            <frame index="0" offsetX="-1" offsetY ="-33" delay="75" />
+            <frame index="0" offsetX="-1" offsetY ="-33" delay="75" />
+        </animation>
+        <animation direction="left">
+            <frame index="1" offsetX="-2" offsetY ="-34" delay="75"/>
+            <frame index="1" offsetX="-2" offsetY ="-33" delay="75"/>
+            <frame index="1" offsetX="-2" offsetY ="-34" delay="75"/>
+            <frame index="1" offsetX="-2" offsetY ="-34" delay="75"/>
+            <frame index="1" offsetX="-2" offsetY ="-33" delay="75"/>
+            <frame index="1" offsetX="-2" offsetY ="-34" delay="75"/>
+        </animation>
+        <animation direction="up">
+            <frame index="2" offsetX="-3" offsetY ="-34" delay="75"/>
+            <frame index="2" offsetX="-3" offsetY ="-35" delay="75"/>
+            <frame index="2" offsetX="-3" offsetY ="-35" delay="75"/>
+            <frame index="2" offsetX="-3" offsetY ="-34" delay="75"/>
+            <frame index="2" offsetX="-3" offsetY ="-35" delay="75"/>
+            <frame index="2" offsetX="-3" offsetY ="-35" delay="75"/>
+        </animation>
+        <animation direction="right">
+            <frame index="3" offsetX="-1" offsetY ="-32" delay="75"/>
+            <frame index="3" offsetX="-1" offsetY ="-31" delay="75"/>
+            <frame index="3" offsetX="-1" offsetY ="-32" delay="75"/>
+            <frame index="3" offsetX="-1" offsetY ="-32" delay="75"/>
+            <frame index="3" offsetX="-1" offsetY ="-31" delay="75"/>
+            <frame index="3" offsetX="-1" offsetY ="-32" delay="75"/>
+        </animation>
+    </action>
+
+    <action name="attack" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetX="-1" offsetY ="-31" delay="75" />
+            <frame index="0" offsetX="-1" offsetY ="-32" delay="75" />
+            <frame index="0" offsetX="-1" offsetY ="-29" delay="75" />
+            <frame index="0" offsetX="-1" offsetY ="-28" delay="75" />
+            <end />
+        </animation>
+        <animation direction="left">
+            <frame index="1" offsetX="2" offsetY ="-35" delay="75" />
+            <frame index="1" offsetX="2" offsetY ="-36" delay="75" />
+            <frame index="1" offsetX="-2" offsetY ="-33" delay="75" />
+            <frame index="1" offsetX="-3" offsetY ="-32" delay="75" />
+            <end />
+        </animation>
+        <animation direction="up">
+            <frame index="2" offsetX="-3" offsetY ="-34" delay="75"/>
+            <frame index="2" offsetX="-3" offsetY ="-34" delay="75"/>
+            <frame index="2" offsetX="-3" offsetY ="-34" delay="75"/>
+            <frame index="2" offsetX="-3" offsetY ="-32" delay="75"/>
+            <end />
+        </animation>
+        <animation direction="right">
+            <frame index="3" offsetX="-5" offsetY ="-33" delay="75"/>
+            <frame index="3" offsetX="-5" offsetY ="-34" delay="75"/>
+            <frame index="3" offsetX="-2" offsetY ="-31" delay="75"/>
+            <frame index="3" offsetX="-1" offsetY ="-30" delay="75"/>
+            <end />
+        </animation>
+    </action>
+
+    <action name="attack_bow" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetX="-1" offsetY ="-32" delay="75" />
+            <frame index="0" offsetX="-1" offsetY ="-32" delay="75" />
+            <frame index="0" offsetX="-1" offsetY ="-32" delay="75" />
+            <frame index="0" offsetX="-1" offsetY ="-31" delay="75" />
+            <frame index="0" offsetX="-1" offsetY ="-32" delay="75" />
+            <end />
+        </animation>
+        <animation direction="left">
+            <frame index="1" offsetX="1" offsetY ="-34" delay="75" />
+            <frame index="1" offsetX="1" offsetY ="-34" delay="75" />
+            <frame index="1" offsetX="1" offsetY ="-34" delay="75" />
+            <frame index="1" offsetX="3" offsetY ="-35" delay="75" />
+            <frame index="1" offsetX="3" offsetY ="-35" delay="75" />
+            <end />
+        </animation>
+        <animation direction="up">
+            <frame index="2" offsetX="-2" offsetY ="-34" delay="75"/>
+            <frame index="2" offsetX="-2" offsetY ="-34" delay="75"/>
+            <frame index="2" offsetX="-3" offsetY ="-34" delay="75"/>
+            <frame index="2" offsetX="-3" offsetY ="-33" delay="75"/>
+            <frame index="2" offsetX="-3" offsetY ="-34" delay="75"/>
+            <end />
+        </animation>
+        <animation direction="right">
+            <frame index="3" offsetX="-5" offsetY ="-33" delay="75"/>
+            <frame index="3" offsetX="-5" offsetY ="-33" delay="75"/>
+            <frame index="3" offsetX="-5" offsetY ="-33" delay="75"/>
+            <frame index="3" offsetX="-7" offsetY ="-34" delay="75"/>
+            <frame index="3" offsetX="-7" offsetY ="-34" delay="75"/>
+            <end />
+        </animation>
+    </action>
+
+    <action name="sit" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetX="-1" offsetY ="-19" />
+        </animation>
+        <animation direction="left">
+            <frame index="1" offsetX="2" offsetY ="-23"/>
+        </animation>
+        <animation direction="up">
+            <frame index="2" offsetX="-2" offsetY ="-24"/>
+        </animation>
+        <animation direction="right">
+            <frame index="3" offsetX="-8" offsetY ="-23"/>
+        </animation>
+    </action>
+
+    <action name="dead" imageset="base">
+        <animation direction="default">
+            <frame index="4" offsetX="21" offsetY="-8"/>
+        </animation>
+    </action>
+
+</sprite>
diff --git a/graphics/sprites/hairstyle1.png b/graphics/sprites/hairstyle1.png
index 6bb2657e..8c16d68e 100644
--- a/graphics/sprites/hairstyle1.png
+++ b/graphics/sprites/hairstyle1.png
diff --git a/graphics/tiles/collision.png b/graphics/tiles/collision.png
index 9640aa80..d0e9c7d0 100644
--- a/graphics/tiles/collision.png
+++ b/graphics/tiles/collision.png
diff --git a/items.xml b/items.xml
index 78e982d0..73058bdb 100644
--- a/items.xml
+++ b/items.xml
@@ -2638,7 +2638,7 @@
         effect="+3% Defense"
         type="equip-head"
         weight="30"
-        defense="5"
+        defense="3"
         max-per-slot="1">
         <sprite>head-guyfawkes.xml</sprite>
     </item>
@@ -4885,7 +4885,7 @@
     <item id="2199"
         image="equipment/head/rabbit-ears.png|W:#104010,208020,30c030"
         name="Dark green rabbit ears"
-        description="A headband with rabbit ears, pure white."
+        description="A headband with rabbit ears, dark green."
         effect="+5% Defense"
         defense="5"
         type="equip-head"
@@ -4893,6 +4893,116 @@
         max-per-slot="1">
         <sprite>equipment/head/rabbit-ears.xml|#104010,208020,30c030</sprite>
     </item>
+    <item id="2200"
+        image="equipment/head/wizard-hat.png|W:#580000,a40000,c02020,ff6060"
+        name="Red wizard hat"
+        description="A wizard hat, bright red."
+        effect="+5% Defense"
+        defense="5"
+        type="equip-head"
+        weight="15"
+        max-per-slot="1">
+        <sprite>equipment/head/wizard-hat.xml|#580000,a40000,c02020,ff6060</sprite>
+    </item>
+    <item id="2201"
+        image="equipment/head/wizard-hat.png|W:#115511,22aa22,99dd99"
+        name="Green wizard hat"
+        description="A wizard hat, warm green."
+        effect="+5% Defense"
+        defense="5"
+        type="equip-head"
+        weight="15"
+        max-per-slot="1">
+        <sprite>equipment/head/wizard-hat.xml|#115511,22aa22,99dd99</sprite>
+    </item>
+    <item id="2202"
+        image="equipment/head/wizard-hat.png|W:#222255,6666ff"
+        name="Dark blue wizard hat"
+        description="A wizard hat, iridescent dark blue."
+        effect="+5% Defense"
+        defense="5"
+        type="equip-head"
+        weight="15"
+        max-per-slot="1">
+        <sprite>equipment/head/wizard-hat.xml|#222255,6666ff</sprite>
+    </item>
+    <item id="2203"
+        image="equipment/head/wizard-hat.png|W:#846211,dab333,fffb93,ffffff"
+        name="Yellow wizard hat"
+        description="A wizard hat, soft yellow."
+        effect="+5% Defense"
+        defense="5"
+        type="equip-head"
+        weight="15"
+        max-per-slot="1">
+        <sprite>equipment/head/wizard-hat.xml|#846211,dab333,fffb93,ffffff</sprite>
+    </item>
+    <item id="2204"
+        image="equipment/head/wizard-hat.png|W:#16486e,498ec5,e4f2fc"
+        name="Light blue wizard hat"
+        description="A wizard hat, light blue."
+        effect="+5% Defense"
+        defense="5"
+        type="equip-head"
+        weight="15"
+        max-per-slot="1">
+        <sprite>equipment/head/wizard-hat.xml|#16486e,498ec5,e4f2fc</sprite>
+    </item>
+    <item id="2205"
+        image="equipment/head/wizard-hat.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
+        name="Pink wizard hat"
+        description="A wizard hat, bright pink."
+        effect="+5% Defense"
+        defense="5"
+        type="equip-head"
+        weight="15"
+        max-per-slot="1">
+        <sprite>equipment/head/wizard-hat.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+    </item>
+    <item id="2206"
+        image="equipment/head/wizard-hat.png|W:#111111,222222,333333,444444,555555,aaaaaa"
+        name="Black wizard hat"
+        description="A wizard hat, deep black."
+        effect="+5% Defense"
+        defense="5"
+        type="equip-head"
+        weight="15"
+        max-per-slot="1">
+        <sprite>equipment/head/wizard-hat.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+    </item>
+    <item id="2207"
+        image="equipment/head/wizard-hat.png|W:#80280f,b04810,ef681f,ffb830"
+        name="Orange wizard hat"
+        description="A wizard hat, bright orange."
+        effect="+5% Defense"
+        defense="5"
+        type="equip-head"
+        weight="15"
+        max-per-slot="1">
+        <sprite>equipment/head/wizard-hat.xml|#80280f,b04810,ef681f,ffb830</sprite>
+    </item>
+    <item id="2208"
+        image="equipment/head/wizard-hat|W:#4f0a76,8010c0,d699f7"
+        name="Purple wizard hat"
+        description="A wizard hat, strong purple."
+        effect="+5% Defense"
+        defense="5"
+        type="equip-head"
+        weight="15"
+        max-per-slot="1">
+        <sprite>equipment/head/wizard-hat.xml|#4f0a76,8010c0,d699f7</sprite>
+    </item>
+    <item id="2209"
+        image="equipment/head/wizard-hat.png|W:#104010,208020,30c030"
+        name="Dark green wizard hat"
+        description="A wizard hat, dark green."
+        effect="+5% Defense"
+        defense="5"
+        type="equip-head"
+        weight="15"
+        max-per-slot="1">
+        <sprite>equipment/head/wizard-hat.xml|#104010,208020,30c030</sprite>
+    </item>
     <item id="4000"
         image="generic-scorpionstinger.png|W:#800000,ffffff"
         name="Angry Scorpion Stinger"
@@ -5067,6 +5177,60 @@
         type="generic"
         weight="10"
         max-per-slot="10"/>
+    <item id="4023"
+        image="generic-animal-bones.png"
+        name="Animal Bones"
+        description="Bones from an animal."
+        effect=""
+        type="generic"
+        weight="10"
+        max-per-slot="10"/>
+    <item id="4024"
+        image="generic-frozen-yeti-tear.png"
+        name="Frozen Yeti Tear"
+        description="A tear from a yeti, frozen."
+        effect=""
+        type="generic"
+        weight="10"
+        max-per-slot="10"/>
+    <item id="4025"
+        image="generic-yeti-claw.png"
+        name="Yeti Claw"
+        description="A claw broken off from a yeti"
+        effect=""
+        type="generic"
+        weight="10"
+        max-per-slot="10"/>
+    <item id="4026"
+        image="generic-ice-cube.png"
+        name="Ice Cube"
+        description="Very cold ice cube that never seems to completely melt."
+        effect=""
+        type="generic"
+        weight="10"
+        max-per-slot="10"/>
+    <item id="4027"
+        image="equipment/head/yeti-mask.png"
+        name="Yeti Mask"
+        description="A mask made from the yeti's head."
+        effect="+ 4% Defense"
+        type="equip-head"
+        defense="4"
+        weight="10"
+	max-per-slot="1">
+        <sprite>equipment/head/yeti-mask.xml</sprite>
+    </item>
+    <item id="4028"
+        image="equipment/head/wizard-hat.png"
+        name="Wizard hat"
+        description="A wizard hat."
+        effect="+5% Defense"
+        defense="5"
+        type="equip-head"
+        weight="15"
+        max-per-slot="1">
+        <sprite>equipment/head/wizard-hat.xml</sprite>
+     </item>
     <item id="3000"
         image="generic-jackolantern.png"
         name="Jack-o-Lantern"
diff --git a/maps/031-2.tmx b/maps/031-2.tmx
index b9a799aa..936afe7e 100644
--- a/maps/031-2.tmx
+++ b/maps/031-2.tmx
@@ -21,19 +21,24 @@
    H4sIAAAAAAAAA+3TsQ6CMBSF4SZKIjoyEGWUmCgjoILv/1A4eYaSNB1smFrIP3y5zb3LOUMnY8wEAAAAAAA2JZO9HCSXo5xkZ/fzPXbOkKe85C1nuUglhZR23hLIGXKV2s67PKTx9nUCOUNaxyCjfLx9m0DOJT066e27N+vt8U/snPSgRwzuf+687O4tds4lvglkAAAAAABgDX7hnrJxECcAAA==
   </data>
  </layer>
+ <layer name="Upper Ground" width="50" height="50">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA+3OsQ1AUBhG0bf/QJgAE2AEIyh9rY48yd+ck9z+tgYAAAAA753VAz+5qgd4GNKYpuqRTnNa0lo90mlLezqqRwAAAAA+ugEzez5aECcAAA==
+  </data>
+ </layer>
  <layer name="Subfringe" width="50" height="50">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3PwQ2CQABE0eWuVoD234taAVABWAGQMB144LBZ8l7y7zOlAAAAAFDLuyvlk75d7SXnDNk/pqnxH3P2L+nX+I81+7e0N/7jCm7pnh61h5zUp2d61R4CAAAA8McBqc4JOxAnAAA=
+   H4sIAAAAAAAAA+3PwQ2CQABE0eUuVqD03wtYAXrxClagJowVmOBhs+a95N9nSgEAAACglrErZUqXrvaS/e7ZPqdrujX842PJ/jU9Gv/xzP5Xejf+4x8cUp+OtYf86JTOaag9BAAAAOCLDYFoKWkQJwAA
   </data>
  </layer>
  <layer name="Fringe" width="50" height="50">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3OwQ2CQBRF0VEawL6kA+gAG8BYAaEVNkAFQAVKD5bg0pfAyh3ODH9zT3Lzk8ksnnMAAAAAAACI6aoy6xEB5KpQb+shnkp1Ux/rIRGl6mI9IoDKesAfOtWrQd23t/a03ofNpF2S83pHNalZ1T9/mmMneXmql1qshwAAAAAAgMN8AdM+ux8QJwAA
+   H4sIAAAAAAAAA+3OwQ2CQBCG0UUbwL60A+gAG9BYgbEVa2QSOcGF6K5zeS/5M9k9faUAAAAA0NI5dsmOqGCIjdkRFUyxa3ZEY33slB1RwS074Ef35b67z32klex3PGz/nqv36y8lAAAAAN+ZAZvHhDwQJwAA
   </data>
  </layer>
  <layer name="collision" width="50" height="50" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3RwQZAIRRF0av//+jmeZR6HJcVaxAN9tGoqgEAAAAAh2pz7+LrpJte+9cdHTadnnTn7Y71TbrzZku658//6LytWy8AAACkTGpaw4YQJwAA
+   H4sIAAAAAAAAA+3RsQoAIQxEweD/f/T1qcQT1sAEprN4i6uqFgAAAABsqgcabu3ol2762993TNi0e+nO0x39TbrzZEu65+Z/TN42rRcAAABSPoDEU8sQJwAA
   </data>
  </layer>
  <layer name="Over" width="50" height="50">
@@ -50,5 +55,6 @@
     <property name="dest_y" value="2624"/>
    </properties>
   </object>
+  <object name="graphics/particles/fireplace.particle.xml" type="PARTICLE_EFFECT" x="768" y="736" width="32" height="32"/>
  </objectgroup>
 </map>