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

9 files changed, 109 insertions, 42 deletions

diff --git a/graphics/particles/polter.particle.xml b/graphics/particles/polter.particle.xml
new file mode 100644
index 00000000..723bbb28
--- /dev/null
+++ b/graphics/particles/polter.particle.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+
+<!--
+A circle on the ground 60 pixels in diameter made from particles.
+-->
+
+<effect>
+	<particle
+		position-x = "0"
+		position-y = "0"
+		position-z = "48"
+		>
+		<emitter>
+			<property name="position-y" min="-16" max="16"/>
+			<property name="position-y" min="-16" max="16"/>
+			<property name="position-z" min="-16" max="16"/>
+			<property name="horizontal-angle" min="0" max="360"/>
+			<property name="vertical-angle" min="0" max="360"/>
+			<property name="power" min="0.4" max="2"/>
+			<property name="lifetime" value="160"/>
+			<property name="fade-out" value="40" />
+			<property name="fade-in" value="40" />
+			<property name="output" min="-20" max="1"/>
+			<property name="acceleration" value="0.1" />
+			<property name="alpha" value="0.5" />
+			<property name="image" value="graphics/particles/star-small.png|W:#77ffdd,77ddff" />
+			<property name="follow-parent" />
+		</emitter>
+	</particle>
+</effect>
+
diff --git a/graphics/particles/spectre.particle.xml b/graphics/particles/spectre.particle.xml
new file mode 100644
index 00000000..097e0fed
--- /dev/null
+++ b/graphics/particles/spectre.particle.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+
+<!--
+A circle on the ground 60 pixels in diameter made from particles.
+-->
+
+<effect>
+	<particle
+		position-x = "0"
+		position-y = "0"
+		position-z = "48"
+		>
+		<emitter>
+			<property name="position-y" min="-16" max="16"/>
+			<property name="position-y" min="-16" max="16"/>
+			<property name="position-z" min="-16" max="16"/>
+			<property name="horizontal-angle" min="0" max="360"/>
+			<property name="vertical-angle" min="0" max="360"/>
+			<property name="power" min="0.4" max="2"/>
+			<property name="lifetime" value="160"/>
+			<property name="fade-out" value="40" />
+			<property name="fade-in" value="40" />
+			<property name="output" min="-20" max="1"/>
+			<property name="acceleration" value="0.1" />
+			<property name="alpha" value="0.5" />
+			<property name="image" value="graphics/particles/star-small.png|W:#ff77dd,dd77ff" />
+			<property name="follow-parent" />
+		</emitter>
+	</particle>
+</effect>
+
diff --git a/graphics/sprites/hairstyle17.png b/graphics/sprites/hairstyle17.png
new file mode 100644
index 00000000..8a80a0a1
--- /dev/null
+++ b/graphics/sprites/hairstyle17.png
diff --git a/graphics/sprites/hairstyle17.xml b/graphics/sprites/hairstyle17.xml
new file mode 100644
index 00000000..6c6e4cea
--- /dev/null
+++ b/graphics/sprites/hairstyle17.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<sprite>
+
+	<imageset name="base" src="graphics/sprites/hairstyle17.png|W" width="40" height="40" />
+
+	<include file="hairstyle1.xml"/>
+
+</sprite>
diff --git a/items.xml b/items.xml
index 455b4c91..6568af33 100644
--- a/items.xml
+++ b/items.xml
@@ -60,7 +60,10 @@
     <item id="-16" type="hairsprite" name="Bun">
         <sprite>hairstyle16.xml</sprite>
     </item>
-
+    <item id="-17" type="hairsprite" name="Tousled layers">
+        <sprite>hairstyle17.xml</sprite>
+    </item>
+    
     <!-- Treating the base sprite as equipment too will be useful when we
          implement other playable races -->
     <item id="-100" type="racesprite" name="Human">
@@ -2802,7 +2805,7 @@
         hp="50"
         weight="5"
         max-per-slot="10"/>
-	<item id="785"
+    <item id="785"
         image="use-food-lady-fingers.png"
         name="Lady Fingers"
         description="Made with simulated lady fingers."
@@ -2811,7 +2814,7 @@
         hp="50"
         weight="5"
         max-per-slot="10"/>
-	<item id="786"
+    <item id="786"
         image="use-food-jello.png"
         name="Slime Jell-Ahh"
         description="Finally, an edible form of slime!"
@@ -2820,7 +2823,7 @@
         hp="50"
         weight="5"
         max-per-slot="10"/>
-	<item id="787"
+    <item id="787"
         image="use-food-snapple.png"
         name="Snapple"
         description="Bite it before it bites you!"
@@ -2829,7 +2832,7 @@
         hp="50"
         weight="5"
         max-per-slot="10"/>
-	<item id="788"
+    <item id="788"
         image="use-food-juice.png"
         name="Beetle Juice"
         description="Thist quencing and nutritious!"
@@ -2838,7 +2841,7 @@
         hp="50"
         weight="5"
         max-per-slot="10"/>
-	<item id="789"
+    <item id="789"
         image="use-food-skull-mug.png"
         name="Gut Buster Brew"
         description="If you can survive the first gulp, the rest goes down smooth."
@@ -2860,10 +2863,10 @@
         image="armor-chest-tanktop.png|W:#412300,c9866b,8d4900;#ffff00"
         name="Yeti Skin Shirt"
         description="A shirt made of hardened yeti skin."
-        effect="+12% Defense"
+        effect=""
         type="equip-torso"
         weight="20"
-        defense="4"
+        defense="12"
         max-per-slot="1">
         <sprite gender="male">chest-leather-male.xml|#573a26,c9866b,d3b79e,ffffff;#b96b3d,fbf5f1</sprite>
         <sprite gender="female">chest-leather-female.xml|#412300,c9866b,8d4900;#ffff00</sprite>
diff --git a/maps/018-3.tmx b/maps/018-3.tmx
index 3a648e1a..890ad8db 100644
--- a/maps/018-3.tmx
+++ b/maps/018-3.tmx
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="200" height="200" tilewidth="32" tileheight="32">
  <properties>
   <property name="minimap" value="graphics/minimaps/018-3.png"/>
@@ -7,45 +6,45 @@
   <property name="name" value="Cave"/>
  </properties>
  <tileset firstgid="1" name="Cave" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/cave.png"/>
+  <image source="../graphics/tiles/cave.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="Cave Bilevel" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/cave_bilevel.png"/>
+  <image source="../graphics/tiles/cave_bilevel.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="385" name="Cave x2" tilewidth="32" tileheight="64">
-  <image source="../graphics/tiles/cave_x2.png"/>
+  <image source="../graphics/tiles/cave_x2.png" width="512" height="64"/>
  </tileset>
  <tileset firstgid="401" name="Arena" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/arena.png"/>
+  <image source="../graphics/tiles/arena.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="657" name="Woodland Ground" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/Woodland_ground.png"/>
+  <image source="../graphics/tiles/Woodland_ground.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="913" name="Woodland x2" tilewidth="32" tileheight="64">
-  <image source="../graphics/tiles/Woodland_x2.png"/>
+  <image source="../graphics/tiles/Woodland_x2.png" width="512" height="128"/>
  </tileset>
  <tileset firstgid="945" name="Woodland x3" tilewidth="32" tileheight="96">
-  <image source="../graphics/tiles/Woodland_x3.png"/>
+  <image source="../graphics/tiles/Woodland_x3.png" width="512" height="192"/>
  </tileset>
  <tileset firstgid="977" name="Woodland Village" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/Woodland_village.png"/>
+  <image source="../graphics/tiles/Woodland_village.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="1233" name="Woodland Village x2" tilewidth="32" tileheight="64">
-  <image source="../graphics/tiles/Woodland_village_x2.png"/>
+  <image source="../graphics/tiles/Woodland_village_x2.png" width="512" height="64"/>
  </tileset>
  <tileset firstgid="1249" name="Woodland Indoor" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/woodland_indoor.png"/>
+  <image source="../graphics/tiles/woodland_indoor.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="1505" name="Woodland Indoor x2" tilewidth="32" tileheight="64">
-  <image source="../graphics/tiles/woodland_indoor_x2.png"/>
+  <image source="../graphics/tiles/woodland_indoor_x2.png" width="512" height="64"/>
  </tileset>
  <tileset firstgid="1521" name="Woodland Indoor x3" tilewidth="32" tileheight="96">
-  <image source="../graphics/tiles/woodland_indoor_x3.png"/>
+  <image source="../graphics/tiles/woodland_indoor_x3.png" width="512" height="96"/>
  </tileset>
  <tileset firstgid="1537" name="Collision" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/collision.png"/>
+  <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
- <layer name="Ground" width="200" height="200" visible="0">
+ <layer name="Ground" width="200" height="200">
   <data encoding="base64" compression="gzip">
    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
   </data>
diff --git a/maps/027-2.tmx b/maps/027-2.tmx
index 3a078ce1..875eb9fd 100644
--- a/maps/027-2.tmx
+++ b/maps/027-2.tmx
@@ -39,9 +39,9 @@
    H4sIAAAAAAAAA+3d607CMBQA4BFINBj1B7yI76g+nZcBPpAlbsE0c+zG6Ob3JSeNeLgk1J627pJlAAAAAAAAAAAAAABA6paLLFstTi0MYRP60nZxalOyC7EPcYgei3+OcwBSl1/7A1zAU02kbMwaMsfvnXbKecvvSFU85wKAlJhXDWPOeyop9hHzq/TUrWOntK5lHp5DvIR4bfk7mJoUa3RTdTVC/YBqX1E7lDbzOH+fAKTOehCAuSnrVxnqGDBV195Dsu8FQAqa7E9V5ZyrU2oZAGNru66yJgMAAAAAAAAAAAAAAAAA6OZ4LfrHM/dFPuY8JHbvZIBLegvx3vI5N8U4eVu0y9CujJ30dF/0obIOb0K71a/o6a7oQ2t9iZ5cv2WahrieT5OcrvltcwEAAOhmiHvMjhkAsSb/z2uS8xHis+N75xXvY+xiLOtrfwAq7UMcRsoBmLryHlpH8byty7FbUCc/nwL8I2MdO9M3BwD6sscEUG2X/YyRZcRjZdU5gY53oC/nBAJ/6XNeVdPndHlNtQwAAAAAAAAAAAAAAAAAAADo4hs7wjzFsDABAA==
   </data>
  </layer>
- <layer name="Collision" width="150" height="130" visible="0">
+ <layer name="Collision" width="150" height="130">
   <data encoding="base64" compression="gzip">
-   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
+   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
   </data>
  </layer>
  <objectgroup name="Objects" width="150" height="130">
diff --git a/maps/030-1.tmx b/maps/030-1.tmx
index dd5a1db6..1985b3eb 100644
--- a/maps/030-1.tmx
+++ b/maps/030-1.tmx
@@ -23,34 +23,34 @@
  <tileset firstgid="608" name="Snow_tree_x3" tilewidth="64" tileheight="96">
   <image source="../graphics/tiles/Snow_tree_x3.png" width="192" height="96"/>
  </tileset>
- <layer name="Ground" width="138" height="128" visible="0">
+ <layer name="Ground" width="138" height="128">
   <data encoding="base64" compression="gzip">
    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
   </data>
  </layer>
- <layer name="extra Layer" width="138" height="128" visible="0">
+ <layer name="extra Layer" width="138" height="128">
   <data encoding="base64" compression="gzip">
    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
   </data>
  </layer>
- <layer name="Fringe" width="138" height="128" visible="0">
+ <layer name="Fringe" width="138" height="128">
   <data encoding="base64" compression="gzip">
-   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
+   H4sIAAAAAAAAA+2dTc4cNRCGJ1/IAVghllllzY+EOEJYskHsMkiIEwBrAhdAkJuw5B5wENgzo8wo/oyr6q1y+bfrkVqZ7uluu+23y1Vlz5fTKZiV58L+ivx02X4eXYnN2E0nV428uWy/X7bXp9CLF59eto+T7ZOx1anm12z/tyG1CEZztRevme3NuKptz7PRFbjB9X/oIAiC4HR69TC6Bo+ZrDrBJMym02Aucn2EXgKKkjZCPz5Q7ZYev3/u0cY1ZXD1XF0fs9d/1fqVdH7lPPnztMarP5F2H9HW3Phx/5zX6zzIJu5Iqc/vx76ZsE1LfZ8TPklbatq3ZV8g9y7VHdXRqsw6hvZqX6kcyvfQHgswNP1Ri8etpP4vvV/U96EbO5QdG9Wmkl3l7EroYF88+vZM+CWhm4Aj18esvh9Frb7j/QiCNuz2bu32PEEQBEGAwOUkWuesfjm9/b1Ben+unBirgztUXk3K4wd+IG3d+32W8mWcncnzJEfWz8hnr5kbevrkdHrvCX5t7VyfZYwsnXdUqaHzI1pNSOenv7VD1hvdoeb50HkpZK3Vavnalkjzqhye50ljSP7ZWvbq/m/vOmrLOxf6Dr2n1K9fXravTpjdknwNbgxK69FzHcXKSO3beo1tyoeX7cWJ14rU/5Zyr8Q6FBtWO8PdS7rnt7d/v1Nco6mPNn5bWS8tfaratYXIdVz9v79sP1y2H4nzJH+FOsbZCkqPu+glZ5ZnkcatUjW1+TFOd1Z/dVddeMK1kWadodc5lpweSqxr88UrbtS+p2hulbs3aieQnG3QFw+bwsXkqB6t/u2qeOu+RfyL5sFGxeK7aWI02vbW/IbX4htR9+TenRp/d8bfys6Cxd+rydnVxh5W/3Rlm7JK3aV8hiU3XuP3SsctdQveUdNW3Bij6QskF4aAXLu7Nno9n8XWc/2j8bnRe1raYnd9IGjjn5o2Q/vPqhXJD64dMz4PvXQBmRO5UxO/U9q4blQuBdHOF8Y6XeOeP5k1dzMyKjdE9UvJdnjkeBA7gvrTd1KdUDHvH4QeVtOJRAvt3N9lqV9yavXyqqC7PIen+Wy1J7tppAY0ziz1Xb7P6UPTVU+Z8vN9ZBx6+aD7vy/+uenjqpO/Ltvfk+ml1XjiEQejedRWdk26f34Op9n3hTp+cPs+7AlP6V29tlluU1Bb0gtUo89v5z0jzn8xmU5q3z3vd5cb569tlm7nh/9/PmfnSYzS1kdCuZ8l38847lD0bE9KK5I9Ke1rymj5jKX8ydcPb7ecfxfRxCgon4OLg9PjaD9zYxUaT2lzKNZ4Z2e0cyula0v9QI0jqI/Swg9Gzw2d+JL3ZZqzuPsfd7i/da4pg/oemT9C7U/oxB/LfE3NmCP1P0U63sW4Q+Ntn6WcZmpP8n+lfEV6bv45v49UZ8uc4FF0Mmo+J+2TfNypXUeAzN14PffLjXTSUwtU+dwYkMbF+TnpeRTI/4szW94u4JHiHev8MDKfOPp9CeQ+4MYcLg97JdUMl4st2QxtXBxaGg81t5P2aa6JUt5eKoOzI6GDerT+o6XN0djYmkOpOT94DGqLre+eZQy6I40X0fdjGGGHqXmdfNxJ9yNeOQYan0EzLxia8WPm+FCaM6aOhT58GKkFtGxkPaykj9BLf2q0pfFdue+4vCylkdBKG7i+6F126bg0BpXG0dDKerTIuZfioR7rGo+OR97E83fI6BrIUrmadQcz+fAzsYI/m5+riX00fhH1m/TI6z+mpg2k/6vEox7cmjMkFuKu0WghxjGa0e+RpI18X1pXjeRx83W6VD2CepD4hTrGrTejzuP6kbI51JpKrp5H1YvGlo60u6lWLPM73Hpq7jc91PGj6mVXpLkfxPeldBRaqQMZW9DrPOByK6gtyb/T/J5jRWbz2bXtrDlfEwtx+V3JX9pVKyPwWNtk7RfJl6G0g/rX3D12o8U74dV2NTkOqm8t2kA+76QXaz4UOe7ZTqXcKBIjo3WQ/CjNXEHEQu/wbhPkWml+D13/pi1Xq4Uj51ZmgLMfiO+i1YTGxnA5W258W2VsalXPlvMj1LiDjA0aHdSeX2KnuAj1/1B6tImkBc28IuffUHZDOg9hB+1oQPNTtfeyXMvlxDT+jdXfQfy5VfRizUnU3kdTnuXe2ri2tI/cu6b8HZhh7m8mNNpA1vCi9wxsaGyAxT5obUW6nx/n5qq1dezFrHqeoQ4UqH60/g96j6ANUm4WsQO1vje35m52WzKKHdrBYy3TDu1gpeWzt25Xzu7UxHOaXM4KzBLLt54jqqHGP9bUbWUdeeMRY9f6DVZfsnd+OaCxthOiBescTA+bG/rwYcT7PWv+YEVWakvr3I30nQezttkIPDRlzWN5zV2h5XmUMwO96lfTjprfCFu+1xDve5nZdN6znyw+sZf/vTIj+whFs+Zghr6ZoQ4I3v5nyz6qeXc9n0kzT9SiPiugeb7RubRaX7Z2nNl5LVLOiOcb9S563ZfS12y+Xi88YtmW9eiZJ51lfuxIlNp29BhWAl3LuCut+gkpx+O6VnbuSP5GyiyxvqTBI/XJ0dG8i565de21yN9l4/aPhmVsbl0Pj3zJ0fu1FbX5MLS/RvcfV/5R41mKmdqjx+/jOa2O1u3qoHl+NGbq0R+1mgvN7IFmnWv4Lb7M3G7S+IDkyEeuWVud2doH8XVr49iZfLJdaGGzrWvaa+yB5u/DBm3waG9LngSNY2rLOyIz5QyoumjWBCF1jti3L73H+Zp1d5p4KJDxjgG0f79BO2ZJ2omY5hhobYh2HA2tYPwHEia3GAAUAQA=
   </data>
  </layer>
- <layer name="lower Over layer" width="138" height="128" visible="0">
+ <layer name="lower Over layer" width="138" height="128">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3SsQkAIBAEwdfvvxsLNBU0ehANZuDyCzYCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKButNcP+FX2fbA6NaIVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIA7Jt/YOu0AFAEA
+   H4sIAAAAAAAAA+3SMQoAIAwEwRA/k/+/0FbQSghazMD1V2wEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMC9ytcP+NXIfbA6NaIVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAeE2U581QAFAEA
   </data>
  </layer>
- <layer name="Over" width="138" height="128" visible="0">
+ <layer name="Over" width="138" height="128">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3aTUrDQBgG4Gk3XsVjeZXqCbS6Ff9wKf7hUhTFc/kFEgghqTUZTdo+D7yEhCyG4eUbAkkJNtMicljmaOS1ALAZnBdATmYKkJOZAuRkprAuXQFyMlOAnMwUICczBQAA2HX1/+77JPd31W/W45tuuGK/f9rH4p2zf1jLEAfz7menSW9y6dq7KXZk0bivd6StL83nzd7oTn/VXJ9aR4ZodmhVd9p60zzrdrlb29iPplV96Tqrqj2pv7v8y0VO2Lb3o4+qF13nGbut6IVuAAAAAAAAAAAAMJbjWUonkeVs7JUwRUU/LiKXkavI/jylG32h5rzsx33kIfIYeYo8R64jt7pCuCv78RZ5j+zFLPmI62fZlxc9IbyW/WhT9OVLTwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgbd9UwtiiABQBAA==
+   H4sIAAAAAAAAA+3ay0rDQBSA4Wk3vqavUn0CrW7FGy7FGy5FsfhcnkACITS1JqNJm++DQ2noYhh+Zgg0JdhNi5ijco4HXgsAu8F9AeTkTAFycqYAOTlT2JZWgJycKUBOzhQgJ2cKAAAwdfX/3XeZ3O9Vv1mPd7r+iv3+aR+L35z/w1r6OJy3PztLusmlbe/G2Mii8b3eyLpems+b3Winu+pcH1sjfTQb2tTOum6ad92U29rHPpo29dJ2V1V7Uv/t8i8XOWL73kcXVRdt9xnTVnShDQAAAAAAAAAAAIZyMkvpNGY5G3oljFHRx2XMVcx12cmtXqi5KPt4iHmMeYp5jnmJuYm50wrhvuzjPeYj5mCe0md8rspeXnVCeCv7WKfo5UsnAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALC1b7WToagAFAEA
   </data>
  </layer>
- <layer name="higher Overlayer" width="138" height="128" visible="0">
+ <layer name="Collision" width="138" height="128">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3OMQ0AAAgDsOH/xDASSHh4WgVNAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADuur4HAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAZnLDwRABQBAA==
+   H4sIAAAAAAAAA+3Wa46rMAwG0NHd6Ox/F/fXSAgBCcHUiXssHWkebTD218fvv5+fXwAAAAAAAAAAAAAAAAAAgIL+KrsP5vSXDTnhzDYb+5yslJttZfdS1VVl9zbSf3Y/la2cldX6XVFvZfd5p/fsvqqSE1pz7s1Kdq9ykjvjo3kf5WhGMpI355XmvWLPK1sxLyv1WoGMUC0fV31n91XdSvPe97hK31Ws8PpsVXZ/la0y897K7rOqFWZ+t7L7rWj2uY9W9lwrmnHuTyt7ppXMNv8n/cjJPDt5ewet3c/Q47eK2sPIbvbPiazsuVZxNtuRPYzu5ui8qMqebyWRtT3z7Py7fYz2nj3XKjLrTg8j95A922re2Gt0yUm+N3b0pI7OPbuenMyfke0ZV+ft/9e6dmT+sudbScR87+ys53FRlT3bSiLnvH/e0Rn7/x9dM6qyZ1tB9IzvnnX12IjKnm8l0TNundO736eVPddK3pp3xI5b13+jb+7P+83s2fE6ovclH7VF7a7nDNlY25OstHLwNH/M5e5+n1T2vfKZrMgIMkJvTt7KTPa9EZ8VGSEjL9n3whpZyb4P1shK9j0wf0Zkpb7Wzvc/y8n3idi3fNQW9Z4gJ3VFfmbIyfxGPiMiv1P4brKG3h1tHxOVlci88ZmcjFbEdbNnwPs5Gd1zZOb4fE7u5Kf3/LPrZd87Y3lpZWgkK1fZy75nYnJzlYvW761syEktV6/93vcaOeEoL2d/lw1631ey+2QuV+8v2b0BAAAAAAAAAAAAAAAAAAAAAAAAAADf6T+CdKKTABQBAA==
   </data>
  </layer>
  <objectgroup name="Objects" width="0" height="0" visible="0">
@@ -86,9 +86,4 @@
    </properties>
   </object>
  </objectgroup>
- <layer name="Collision" width="138" height="128">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3Wa46rMAwG0NHd6Ox/F/fXSAgBCcHUiXssHWkebTD218fvv5+fXwAAAAAAAAAAAAAAAAAAgIL+KrsP5vSXDTnhzDYb+5yslJttZfdS1VVl9zbSf3Y/la2cldX6XVFvZfd5p/fsvqqSE1pz7s1Kdq9ykjvjo3kf5WhGMpI355XmvWLPK1sxLyv1WoGMUC0fV31n91XdSvPe97hK31Ws8PpsVXZ/la0y897K7rOqFWZ+t7L7rWj2uY9W9lwrmnHuTyt7ppXMNv8n/cjJPDt5ewet3c/Q47eK2sPIbvbPiazsuVZxNtuRPYzu5ui8qMqebyWRtT3z7Py7fYz2nj3XKjLrTg8j95A922re2Gt0yUm+N3b0pI7OPbuenMyfke0ZV+ft/9e6dmT+sudbScR87+ys53FRlT3bSiLnvH/e0Rn7/x9dM6qyZ1tB9IzvnnX12IjKnm8l0TNundO736eVPddK3pp3xI5b13+jb+7P+83s2fE6ovclH7VF7a7nDNlY25OstHLwNH/M5e5+n1T2vfKZrMgIMkJvTt7KTPa9EZ8VGSEjL9n3whpZyb4P1shK9j0wf0Zkpb7Wzvc/y8n3idi3fNQW9Z4gJ3VFfmbIyfxGPiMiv1P4brKG3h1tHxOVlci88ZmcjFbEdbNnwPs5Gd1zZOb4fE7u5Kf3/LPrZd87Y3lpZWgkK1fZy75nYnJzlYvW761syEktV6/93vcaOeEoL2d/lw1631ey+2QuV+8v2b0BAAAAAAAAAAAAAAAAAAAAAAAAAADf6T+CdKKTABQBAA==
-  </data>
- </layer>
 </map>
diff --git a/monsters.xml b/monsters.xml
index 840e7b0c..cf8db49f 100755
--- a/monsters.xml
+++ b/monsters.xml
@@ -1033,7 +1033,7 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
 
     <monster id="40" name="Spectre">
         <sprite>monsters/monster-wisp.xml|#ff77dd,dd77ff</sprite>
-	<particlefx>graphics/particles/wisp.particle.xml</particlefx>
+	<particlefx>graphics/particles/spectre.particle.xml</particlefx>
         <exp>20</exp>
         <attributes
             hp="20"
@@ -1158,7 +1158,7 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
 
     <monster id="45" name="Poltergeist">
         <sprite>monsters/monster-wisp.xml|#77ffdd,77ddff</sprite>
-	<particlefx>graphics/particles/wisp.particle.xml</particlefx>
+	<particlefx>graphics/particles/polter.particle.xml</particlefx>
         <exp>20</exp>
         <attributes
             hp="20"