From 69db7d94aab42358e0ba28cfbe31dd2013ed220f Mon Sep 17 00:00:00 2001
From: Micksha <Micksha@users.noreply.github.com>
Date: Tue, 30 Oct 2018 10:43:45 +0100
Subject: bugfix a lot of .png, improve scythe-attack, few map fixes

---
 graphics/items/equipment/legs/silkpants.png        | Bin 620 -> 674 bytes
 .../equipment/hands/cottongloves-female.png        | Bin 9626 -> 9987 bytes
 .../sprites/equipment/hands/cottongloves-male.png  | Bin 9774 -> 9987 bytes
 graphics/sprites/equipment/head/bowlerhat.png      | Bin 1601 -> 1585 bytes
 graphics/sprites/equipment/head/candlehelmet.xml   | 168 ++++++++++-----------
 graphics/sprites/equipment/head/headmodel-male.xml |   2 +-
 graphics/sprites/equipment/head/infantryhelmet.png | Bin 4894 -> 4855 bytes
 .../sprites/equipment/legs/cottonskirt-female.png  | Bin 28268 -> 28778 bytes
 .../sprites/equipment/legs/cottonskirt-female.xml  |   2 +-
 .../sprites/equipment/legs/cottonskirt-male.png    | Bin 28914 -> 28914 bytes
 .../sprites/equipment/legs/cottonskirt-male.xml    |   2 +-
 .../sprites/equipment/legs/silkpants-female.png    | Bin 16658 -> 17949 bytes
 .../sprites/equipment/legs/silkpants-female.xml    |   2 +-
 graphics/sprites/equipment/legs/silkpants-male.png | Bin 16229 -> 17226 bytes
 graphics/sprites/equipment/weapons/knife.xml       |  26 ++--
 graphics/sprites/equipment/weapons/scythe.png      | Bin 21887 -> 25878 bytes
 .../sprites/equipment/weapons/trainingwand.png     | Bin 26955 -> 26817 bytes
 items.xml                                          |  15 +-
 maps/008-1.tmx                                     |   4 +-
 maps/008-2-2.tmx                                   |   6 +-
 20 files changed, 122 insertions(+), 105 deletions(-)

diff --git a/graphics/items/equipment/legs/silkpants.png b/graphics/items/equipment/legs/silkpants.png
index 96e80660..9eae0200 100644
Binary files a/graphics/items/equipment/legs/silkpants.png and b/graphics/items/equipment/legs/silkpants.png differ
diff --git a/graphics/sprites/equipment/hands/cottongloves-female.png b/graphics/sprites/equipment/hands/cottongloves-female.png
index af222a0e..50c3d4f6 100644
Binary files a/graphics/sprites/equipment/hands/cottongloves-female.png and b/graphics/sprites/equipment/hands/cottongloves-female.png differ
diff --git a/graphics/sprites/equipment/hands/cottongloves-male.png b/graphics/sprites/equipment/hands/cottongloves-male.png
index 3dc86098..a1556682 100644
Binary files a/graphics/sprites/equipment/hands/cottongloves-male.png and b/graphics/sprites/equipment/hands/cottongloves-male.png differ
diff --git a/graphics/sprites/equipment/head/bowlerhat.png b/graphics/sprites/equipment/head/bowlerhat.png
index bd8b47eb..1891e2f1 100644
Binary files a/graphics/sprites/equipment/head/bowlerhat.png and b/graphics/sprites/equipment/head/bowlerhat.png differ
diff --git a/graphics/sprites/equipment/head/candlehelmet.xml b/graphics/sprites/equipment/head/candlehelmet.xml
index 9d676b03..15694b7b 100644
--- a/graphics/sprites/equipment/head/candlehelmet.xml
+++ b/graphics/sprites/equipment/head/candlehelmet.xml
@@ -4,133 +4,133 @@
   <imageset name="base_dead" src="graphics/sprites/equipment/head/candlehelmet.png" width="50" height="44"/>
   <action name="stand" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-39" delay="75"/>
-      <frame index="1" offsetX="-1" offsetY="-39" delay="75"/>
-      <frame index="2" offsetX="-1" offsetY="-39" delay="75"/>
-      <frame index="3" offsetX="-1" offsetY="-39" delay="75"/>
-      <frame index="4" offsetX="-1" offsetY="-39" delay="75"/>
-      <frame index="5" offsetX="-1" offsetY="-39" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY="-39" delay="80"/>
+      <frame index="1" offsetX="-1" offsetY="-39" delay="80"/>
+      <frame index="2" offsetX="-1" offsetY="-39" delay="80"/>
+      <frame index="3" offsetX="-1" offsetY="-39" delay="80"/>
+      <frame index="4" offsetX="-1" offsetY="-39" delay="80"/>
+      <frame index="5" offsetX="-1" offsetY="-39" delay="80"/>
     </animation>
     <animation direction="left">
-      <frame index="6" offsetX="-2" offsetY="-38" delay="75"/>
-      <frame index="7" offsetX="-2" offsetY="-38" delay="75"/>
-      <frame index="8" offsetX="-2" offsetY="-38" delay="75"/>
-      <frame index="9" offsetX="-2" offsetY="-38" delay="75"/>
-      <frame index="10" offsetX="-2" offsetY="-38" delay="75"/>
-      <frame index="11" offsetX="-2" offsetY="-38" delay="75"/>
+      <frame index="6" offsetX="-2" offsetY="-38" delay="80"/>
+      <frame index="7" offsetX="-2" offsetY="-38" delay="80"/>
+      <frame index="8" offsetX="-2" offsetY="-38" delay="80"/>
+      <frame index="9" offsetX="-2" offsetY="-38" delay="80"/>
+      <frame index="10" offsetX="-2" offsetY="-38" delay="80"/>
+      <frame index="11" offsetX="-2" offsetY="-38" delay="80"/>
     </animation>
     <animation direction="up">
-      <frame index="12" offsetX="-2" offsetY="-38" delay="75"/>
-      <frame index="13" offsetX="-2" offsetY="-38" delay="75"/>
-      <frame index="14" offsetX="-2" offsetY="-38" delay="75"/>
-      <frame index="15" offsetX="-2" offsetY="-38" delay="75"/>
-      <frame index="16" offsetX="-2" offsetY="-38" delay="75"/>
-      <frame index="17" offsetX="-2" offsetY="-38" delay="75"/>
+      <frame index="12" offsetX="-2" offsetY="-38" delay="80"/>
+      <frame index="13" offsetX="-2" offsetY="-38" delay="80"/>
+      <frame index="14" offsetX="-2" offsetY="-38" delay="80"/>
+      <frame index="15" offsetX="-2" offsetY="-38" delay="80"/>
+      <frame index="16" offsetX="-2" offsetY="-38" delay="80"/>
+      <frame index="17" offsetX="-2" offsetY="-38" delay="80"/>
     </animation>
     <animation direction="right">
-      <frame index="18" offsetX="1" offsetY="-40" delay="75"/>
-      <frame index="19" offsetX="1" offsetY="-40" delay="75"/>
-      <frame index="20" offsetX="1" offsetY="-40" delay="75"/>
-      <frame index="21" offsetX="1" offsetY="-40" delay="75"/>
-      <frame index="22" offsetX="1" offsetY="-40" delay="75"/>
-      <frame index="23" offsetX="1" offsetY="-40" delay="75"/>
+      <frame index="18" offsetX="1" offsetY="-40" delay="80"/>
+      <frame index="19" offsetX="1" offsetY="-40" delay="80"/>
+      <frame index="20" offsetX="1" offsetY="-40" delay="80"/>
+      <frame index="21" offsetX="1" offsetY="-40" delay="80"/>
+      <frame index="22" offsetX="1" offsetY="-40" delay="80"/>
+      <frame index="23" offsetX="1" offsetY="-40" delay="80"/>
     </animation>
   </action>
   <action name="walk" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-38" delay="75"/>
-      <frame index="1" offsetX="-1" offsetY="-39" delay="75"/>
-      <frame index="2" offsetX="-1" offsetY="-39" delay="75"/>
-      <frame index="3" offsetX="-1" offsetY="-38" delay="75"/>
-      <frame index="4" offsetX="-1" offsetY="-39" delay="75"/>
-      <frame index="5" offsetX="-1" offsetY="-39" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY="-38" delay="80"/>
+      <frame index="1" offsetX="-1" offsetY="-39" delay="80"/>
+      <frame index="2" offsetX="-1" offsetY="-39" delay="80"/>
+      <frame index="3" offsetX="-1" offsetY="-38" delay="80"/>
+      <frame index="4" offsetX="-1" offsetY="-39" delay="80"/>
+      <frame index="5" offsetX="-1" offsetY="-39" delay="80"/>
     </animation>
     <animation direction="left">
-      <frame index="6" offsetX="-2" offsetY="-38" delay="75"/>
-      <frame index="7" offsetX="-2" offsetY="-37" delay="75"/>
-      <frame index="8" offsetX="-2" offsetY="-38" delay="75"/>
-      <frame index="9" offsetX="-2" offsetY="-38" delay="75"/>
-      <frame index="10" offsetX="-2" offsetY="-37" delay="75"/>
-      <frame index="11" offsetX="-2" offsetY="-38" delay="75"/>
+      <frame index="6" offsetX="-2" offsetY="-38" delay="80"/>
+      <frame index="7" offsetX="-2" offsetY="-37" delay="80"/>
+      <frame index="8" offsetX="-2" offsetY="-38" delay="80"/>
+      <frame index="9" offsetX="-2" offsetY="-38" delay="80"/>
+      <frame index="10" offsetX="-2" offsetY="-37" delay="80"/>
+      <frame index="11" offsetX="-2" offsetY="-38" delay="80"/>
     </animation>
     <animation direction="up">
-      <frame index="12" offsetX="-2" offsetY="-38" delay="75"/>
-      <frame index="13" offsetX="-2" offsetY="-39" delay="75"/>
-      <frame index="14" offsetX="-2" offsetY="-39" delay="75"/>
-      <frame index="15" offsetX="-2" offsetY="-38" delay="75"/>
-      <frame index="16" offsetX="-2" offsetY="-39" delay="75"/>
-      <frame index="17" offsetX="-2" offsetY="-39" delay="75"/>
+      <frame index="12" offsetX="-2" offsetY="-38" delay="80"/>
+      <frame index="13" offsetX="-2" offsetY="-39" delay="80"/>
+      <frame index="14" offsetX="-2" offsetY="-39" delay="80"/>
+      <frame index="15" offsetX="-2" offsetY="-38" delay="80"/>
+      <frame index="16" offsetX="-2" offsetY="-39" delay="80"/>
+      <frame index="17" offsetX="-2" offsetY="-39" delay="80"/>
     </animation>
     <animation direction="right">
-      <frame index="18" offsetX="1" offsetY="-40" delay="75"/>
-      <frame index="19" offsetX="1" offsetY="-39" delay="75"/>
-      <frame index="20" offsetX="1" offsetY="-40" delay="75"/>
-      <frame index="21" offsetX="1" offsetY="-40" delay="75"/>
-      <frame index="22" offsetX="1" offsetY="-39" delay="75"/>
-      <frame index="23" offsetX="1" offsetY="-40" delay="75"/>
+      <frame index="18" offsetX="1" offsetY="-40" delay="80"/>
+      <frame index="19" offsetX="1" offsetY="-39" delay="80"/>
+      <frame index="20" offsetX="1" offsetY="-40" delay="80"/>
+      <frame index="21" offsetX="1" offsetY="-40" delay="80"/>
+      <frame index="22" offsetX="1" offsetY="-39" delay="80"/>
+      <frame index="23" offsetX="1" offsetY="-40" delay="80"/>
     </animation>
   </action>
   <action name="attack" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-36" delay="75"/>
-      <frame index="1" offsetX="-1" offsetY="-38" delay="75"/>
-      <frame index="2" offsetX="-1" offsetY="-35" delay="75"/>
-      <frame index="3" offsetX="-1" offsetY="-34" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY="-36" delay="80"/>
+      <frame index="1" offsetX="-1" offsetY="-38" delay="80"/>
+      <frame index="2" offsetX="-1" offsetY="-35" delay="80"/>
+      <frame index="3" offsetX="-1" offsetY="-34" delay="80"/>
       <end/>
     </animation>
     <animation direction="left">
-      <frame index="6" offsetX="2" offsetY="-39" delay="75"/>
-      <frame index="7" offsetX="2" offsetY="-40" delay="75"/>
-      <frame index="8" offsetX="-2" offsetY="-37" delay="75"/>
-      <frame index="9" offsetX="-3" offsetY="-36" delay="75"/>
+      <frame index="6" offsetX="2" offsetY="-39" delay="80"/>
+      <frame index="7" offsetX="2" offsetY="-40" delay="80"/>
+      <frame index="8" offsetX="-2" offsetY="-37" delay="80"/>
+      <frame index="9" offsetX="-3" offsetY="-36" delay="80"/>
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="12" offsetX="-3" offsetY="-38" delay="75"/>
-      <frame index="13" offsetX="-3" offsetY="-38" delay="75"/>
-      <frame index="14" offsetX="-3" offsetY="-38" delay="75"/>
-      <frame index="15" offsetX="-3" offsetY="-35" delay="75"/>
+      <frame index="12" offsetX="-3" offsetY="-38" delay="80"/>
+      <frame index="13" offsetX="-3" offsetY="-38" delay="80"/>
+      <frame index="14" offsetX="-3" offsetY="-38" delay="80"/>
+      <frame index="15" offsetX="-3" offsetY="-35" delay="80"/>
       <end/>
     </animation>
     <animation direction="right">
-      <frame index="18" offsetX="-2" offsetY="-41" delay="75"/>
-      <frame index="19" offsetX="-2" offsetY="-42" delay="75"/>
-      <frame index="20" offsetX="1" offsetY="-39" delay="75"/>
-      <frame index="21" offsetX="2" offsetY="-38" delay="75"/>
+      <frame index="18" offsetX="-2" offsetY="-41" delay="80"/>
+      <frame index="19" offsetX="-2" offsetY="-42" delay="80"/>
+      <frame index="20" offsetX="1" offsetY="-39" delay="80"/>
+      <frame index="21" offsetX="2" offsetY="-38" delay="80"/>
       <end/>
     </animation>
   </action>
   <action name="attack_bow" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-40" delay="75"/>
-      <frame index="1" offsetX="-1" offsetY="-40" delay="75"/>
-      <frame index="2" offsetX="-1" offsetY="-40" delay="75"/>
-      <frame index="3" offsetX="-1" offsetY="-39" delay="75"/>
-      <frame index="4" offsetX="-1" offsetY="-40" delay="75"/>
+      <frame index="0" offsetX="-1" offsetY="-40" delay="80"/>
+      <frame index="1" offsetX="-1" offsetY="-40" delay="80"/>
+      <frame index="2" offsetX="-1" offsetY="-40" delay="80"/>
+      <frame index="3" offsetX="-1" offsetY="-39" delay="80"/>
+      <frame index="4" offsetX="-1" offsetY="-40" delay="80"/>
       <end/>
     </animation>
     <animation direction="left">
-      <frame index="6" offsetX="3" offsetY="-41" delay="75"/>
-      <frame index="7" offsetX="3" offsetY="-41" delay="75"/>
-      <frame index="8" offsetX="3" offsetY="-41" delay="75"/>
-      <frame index="9" offsetX="5" offsetY="-42" delay="75"/>
-      <frame index="10" offsetX="5" offsetY="-42" delay="75"/>
+      <frame index="6" offsetX="3" offsetY="-41" delay="80"/>
+      <frame index="7" offsetX="3" offsetY="-41" delay="80"/>
+      <frame index="8" offsetX="3" offsetY="-41" delay="80"/>
+      <frame index="9" offsetX="5" offsetY="-42" delay="80"/>
+      <frame index="10" offsetX="5" offsetY="-42" delay="80"/>
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="12" offsetX="-2" offsetY="-42" delay="75"/>
-      <frame index="13" offsetX="-2" offsetY="-42" delay="75"/>
-      <frame index="14" offsetX="-3" offsetY="-42" delay="75"/>
-      <frame index="15" offsetX="-3" offsetY="-41" delay="75"/>
-      <frame index="16" offsetX="-3" offsetY="-42" delay="75"/>
+      <frame index="12" offsetX="-2" offsetY="-42" delay="80"/>
+      <frame index="13" offsetX="-2" offsetY="-42" delay="80"/>
+      <frame index="14" offsetX="-3" offsetY="-42" delay="80"/>
+      <frame index="15" offsetX="-3" offsetY="-41" delay="80"/>
+      <frame index="16" offsetX="-3" offsetY="-42" delay="80"/>
       <end/>
     </animation>
     <animation direction="right">
-      <frame index="18" offsetX="-3" offsetY="-41" delay="75"/>
-      <frame index="19" offsetX="-3" offsetY="-41" delay="75"/>
-      <frame index="20" offsetX="-3" offsetY="-41" delay="75"/>
-      <frame index="21" offsetX="-5" offsetY="-42" delay="75"/>
-      <frame index="22" offsetX="-5" offsetY="-42" delay="75"/>
+      <frame index="18" offsetX="-3" offsetY="-41" delay="80"/>
+      <frame index="19" offsetX="-3" offsetY="-41" delay="80"/>
+      <frame index="20" offsetX="-3" offsetY="-41" delay="80"/>
+      <frame index="21" offsetX="-5" offsetY="-42" delay="80"/>
+      <frame index="22" offsetX="-5" offsetY="-42" delay="80"/>
       <end/>
     </animation>
   </action>
diff --git a/graphics/sprites/equipment/head/headmodel-male.xml b/graphics/sprites/equipment/head/headmodel-male.xml
index dbb6bb76..b9a9a5a1 100644
--- a/graphics/sprites/equipment/head/headmodel-male.xml
+++ b/graphics/sprites/equipment/head/headmodel-male.xml
@@ -108,7 +108,7 @@ Copyright (C) 2018 TMW2 -->
 
     <action name="sit" imageset="base">
         <animation direction="down">
-            <frame index="0" offsetX="-1" offsetY="-14"/>
+            <frame index="0" offsetX="-1" offsetY="-19"/>
         </animation>
         <animation direction="left">
             <frame index="1" offsetX="3" offsetY="-17"/>
diff --git a/graphics/sprites/equipment/head/infantryhelmet.png b/graphics/sprites/equipment/head/infantryhelmet.png
index ea45233b..39d390d9 100644
Binary files a/graphics/sprites/equipment/head/infantryhelmet.png and b/graphics/sprites/equipment/head/infantryhelmet.png differ
diff --git a/graphics/sprites/equipment/legs/cottonskirt-female.png b/graphics/sprites/equipment/legs/cottonskirt-female.png
index dca8bde3..799897a8 100644
Binary files a/graphics/sprites/equipment/legs/cottonskirt-female.png and b/graphics/sprites/equipment/legs/cottonskirt-female.png differ
diff --git a/graphics/sprites/equipment/legs/cottonskirt-female.xml b/graphics/sprites/equipment/legs/cottonskirt-female.xml
index 60a1e5f7..2e97e772 100644
--- a/graphics/sprites/equipment/legs/cottonskirt-female.xml
+++ b/graphics/sprites/equipment/legs/cottonskirt-female.xml
@@ -3,7 +3,7 @@
 Copyright (C) 2018 TMW2 -->
 <sprite>
     <imageset name="base"
-              src="graphics/sprites/equipment/legs/cottonskirt-female.png"
+              src="graphics/sprites/equipment/legs/cottonskirt-female.png|W"
               width="64"
               height="64"/>
 
diff --git a/graphics/sprites/equipment/legs/cottonskirt-male.png b/graphics/sprites/equipment/legs/cottonskirt-male.png
index 3053aa0d..e85f0241 100644
Binary files a/graphics/sprites/equipment/legs/cottonskirt-male.png and b/graphics/sprites/equipment/legs/cottonskirt-male.png differ
diff --git a/graphics/sprites/equipment/legs/cottonskirt-male.xml b/graphics/sprites/equipment/legs/cottonskirt-male.xml
index 627970d7..4eba770b 100644
--- a/graphics/sprites/equipment/legs/cottonskirt-male.xml
+++ b/graphics/sprites/equipment/legs/cottonskirt-male.xml
@@ -3,7 +3,7 @@
 Copyright (C) 2014 Evol Online -->
 <sprite>
     <imageset name="base"
-              src="graphics/sprites/equipment/legs/cottonskirt-male.png"
+              src="graphics/sprites/equipment/legs/cottonskirt-male.png|W"
               width="64"
               height="64"/>
 
diff --git a/graphics/sprites/equipment/legs/silkpants-female.png b/graphics/sprites/equipment/legs/silkpants-female.png
index fede06a9..ac26bc61 100644
Binary files a/graphics/sprites/equipment/legs/silkpants-female.png and b/graphics/sprites/equipment/legs/silkpants-female.png differ
diff --git a/graphics/sprites/equipment/legs/silkpants-female.xml b/graphics/sprites/equipment/legs/silkpants-female.xml
index 0e8b1465..fb653ca1 100644
--- a/graphics/sprites/equipment/legs/silkpants-female.xml
+++ b/graphics/sprites/equipment/legs/silkpants-female.xml
@@ -3,7 +3,7 @@
 Copyright (C) 2018 TMW2 -->
 <sprite>
     <imageset name="base"
-              src="graphics/sprites/equipment/legs/silkpants-female.png"
+              src="graphics/sprites/equipment/legs/silkpants-female.png|W"
               width="64"
               height="64"/>
 
diff --git a/graphics/sprites/equipment/legs/silkpants-male.png b/graphics/sprites/equipment/legs/silkpants-male.png
index a9e67807..3d944714 100644
Binary files a/graphics/sprites/equipment/legs/silkpants-male.png and b/graphics/sprites/equipment/legs/silkpants-male.png differ
diff --git a/graphics/sprites/equipment/weapons/knife.xml b/graphics/sprites/equipment/weapons/knife.xml
index 9c2beb1e..0d7f023d 100644
--- a/graphics/sprites/equipment/weapons/knife.xml
+++ b/graphics/sprites/equipment/weapons/knife.xml
@@ -101,38 +101,46 @@ Copyright (C) 2012-2013 Evol Online -->
    <action name="attack_scythe" imageset="base">
         <animation direction="down">
             <frame index="11" delay="100"/>
-            <frame index="8" delay="90"/>
-            <frame index="9" delay="80"/>
-            <frame index="10" delay="100"/>
+            <frame index="8" delay="100"/>
             <frame index="9" delay="90"/>
-            <frame index="8" delay="90"/>
+            <frame index="7" delay="90"/>
+            <frame index="10" delay="85"/>
+            <frame index="7" delay="90"/>
+            <frame index="9" delay="90"/>
+            <frame index="8" delay="100"/>
             <end />
         </animation>
         <animation direction="left">
             <frame index="27" delay="100"/>
+            <frame index="23" delay="90"/>
             <frame index="24" delay="90"/>
             <frame index="25" delay="80"/>
             <frame index="26" delay="90"/>
             <frame index="25" delay="90"/>
             <frame index="24" delay="100"/>
+            <frame index="23" delay="90"/>
             <end />
         </animation>
         <animation direction="up">
-            <frame index="47" delay="100"/>
-            <frame index="40" delay="90"/>
-            <frame index="41" delay="80"/>
+            <frame index="43" delay="100"/>
             <frame index="42" delay="90"/>
             <frame index="41" delay="90"/>
-            <frame index="40" delay="100"/>
+            <frame index="40" delay="80"/>
+            <frame index="39" delay="90"/>
+            <frame index="40" delay="90"/>
+            <frame index="41" delay="100"/>
+            <frame index="42" delay="90"/>
             <end />
         </animation>
         <animation direction="right">
             <frame index="59" delay="100"/>
+            <frame index="55" delay="90"/>
             <frame index="56" delay="90"/>
             <frame index="57" delay="80"/>
             <frame index="58" delay="90"/>
-            <frame index="57" delay="100"/>
+            <frame index="57" delay="90"/>
             <frame index="56" delay="100"/>
+            <frame index="55" delay="90"/>
             <end />
         </animation>
     </action>
diff --git a/graphics/sprites/equipment/weapons/scythe.png b/graphics/sprites/equipment/weapons/scythe.png
index cca3223b..ba39bb30 100644
Binary files a/graphics/sprites/equipment/weapons/scythe.png and b/graphics/sprites/equipment/weapons/scythe.png differ
diff --git a/graphics/sprites/equipment/weapons/trainingwand.png b/graphics/sprites/equipment/weapons/trainingwand.png
index c37efc91..dd58ad42 100644
Binary files a/graphics/sprites/equipment/weapons/trainingwand.png and b/graphics/sprites/equipment/weapons/trainingwand.png differ
diff --git a/items.xml b/items.xml
index 8ec3a1c1..c020ba44 100644
--- a/items.xml
+++ b/items.xml
@@ -1446,9 +1446,18 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         weight="400">
         <sprite>equipment/head/infantryhelmet.xml</sprite>
         <replace sprite="hair">
-    <item from="-5" to="-4"/>
-    <item from="-14" to="-9"/>
-    <item from="-15" to="-19"/>
+            <item from="-3" to="-7"/>
+            <item from="-4" to="-7"/>
+            <item from="-5" to="-27"/>
+            <item from="-6" to="-7"/>
+            <item from="-13" to="-1"/>
+            <item from="-14" to="-7"/>
+            <item from="-15" to="-7"/>
+            <item from="-16" to="-10"/>
+            <item from="-21" to="-7"/>
+            <item from="-23" to="-1"/>
+            <item from="-25" to="-7"/>
+            <item from="-26" to="-21"/>
         </replace>
     </item>
     <item id="2907"
diff --git a/maps/008-1.tmx b/maps/008-1.tmx
index 66bf7f44..b18a8a3c 100644
--- a/maps/008-1.tmx
+++ b/maps/008-1.tmx
@@ -828,7 +828,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,211,0,151,228,228,181,181,228,228,228,228,228,228,181,228,228,228,228,228,228,181,228,228,181,228,228,228,228,228,228,181,181,228,228,228,228,228,228,228,228,181,228,228,228,228,228,228,228,228,228,228,228,228,228,228,181,228,228,228,228,228,181,228,228,182,0,0,0,181,228,228,228,228,228,181,228,228,228,228,228,228,181,228,228,228,228,228,228,228,228,228,181,181,228,228,228,228,228,228,228,181,228,228,228,228,228,228,228,228,228,228,228,228,228,228,228,228,181,181,228,228,228,228,228,228,228,228,228,228,228,228,228,228,228,228,228,228,181,228,228,228,228,228,228,228,228,228,228,181,228,228,228,228,228,228,228,228,228,181,228,228,228,228,228,228,228,228,0,0,0,228,228,228,228,228,230,0,0,213,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,499,500,499,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,211,0,166,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,199,245,245,245,245,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,497,498,513,498,497,497,513,497,498,497,491,282,0,0,0,0,0,0,0,288,0,0,211,0,0,213,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,499,81,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,164,0,166,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,199,245,245,245,245,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,513,498,497,0,513,0,0,513,0,497,498,495,0,0,0,0,0,0,0,0,0,0,0,211,0,0,213,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,148,149,149,196,149,196,196,197,0,0,0,0,0,0,0,0,164,0,213,0,0,0,0,0,498,0,0,0,0,0,513,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,215,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,513,0,0,0,0,0,0,0,0,497,495,0,307,308,319,321,323,310,311,0,0,0,211,0,0,213,666,667,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,343,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,148,149,149,196,149,196,196,197,0,0,0,0,0,0,0,0,164,0,213,0,0,0,0,0,498,0,0,0,0,0,513,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,215,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,513,0,0,0,0,0,0,0,0,497,495,0,307,308,319,321,323,310,311,0,0,0,211,0,0,213,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,343,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,164,0,0,0,0,0,0,166,0,0,0,0,0,0,0,0,211,0,213,0,0,0,0,0,497,513,0,0,497,497,0,0,0,497,497,497,497,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,497,0,0,0,0,0,0,0,0,497,495,0,319,320,0,0,0,322,323,0,0,0,211,0,0,213,0,0,0,0,0,0,0,0,0,302,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,345,497,0,0,490,343,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,113,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,185,0,0,227,181,181,181,152,0,0,213,0,0,0,0,0,0,0,0,211,0,213,0,0,0,513,0,0,497,0,513,0,498,0,0,0,0,513,0,498,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,346,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,513,0,0,0,0,0,0,0,513,498,496,0,0,0,0,0,0,0,0,0,0,0,211,0,0,213,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,563,0,0,0,0,0,563,0,0,369,0,498,513,495,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,164,0,0,213,0,0,0,0,0,0,0,0,211,0,213,0,0,0,0,0,0,0,0,0,0,513,0,513,497,497,497,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,358,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,513,498,497,0,0,0,0,0,0,497,498,495,0,367,564,0,564,0,346,0,0,0,0,211,0,0,213,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,369,513,497,497,496,0,0,0,0,367,0,0,0,369,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -1336,7 +1336,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,625,625,0,0,0,0,1090,1091,1092,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1090,1091,1092,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,625,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,625,625,625,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1090,1091,1092,0,0,0,491,494,494,511,494,494,511,494,494,511,494,494,494,511,494,494,511,494,494,511,494,494,512,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,510,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,625,625,625,625,625,625,625,625,625,625,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,625,625,625,0,0,0,0,0,0,0,0,0,0,0,0,625,625,625,625,0,0,1088,1089,0,625,625,0,0,0,0,0,0,0,0,0,0,0,1184,1185,1186,1187,1188,1189,0,0,0,0,0,0,495,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,510,494,494,511,494,494,511,494,511,494,494,511,494,511,494,494,511,494,494,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,625,0,0,0,0,0,0,0,0,625,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,625,625,625,0,0,625,625,625,625,0,0,0,0,0,625,625,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,495,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,0,0,0,0,0,0,0,0,0,0,0,0,0,1124,1125,1126,1127,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1190,1191,1192,1193,1194,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,625,0,0,0,0,0,0,0,0,625,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,668,669,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,625,625,625,0,0,625,625,625,625,0,0,0,0,0,625,625,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,495,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,0,0,0,0,0,0,0,0,0,0,0,0,0,1124,1125,1126,1127,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1190,1191,1192,1193,1194,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,625,0,0,0,0,0,0,0,0,625,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,666,667,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1124,1125,1126,1127,0,0,0,0,0,0,0,0,0,0,0,0,0,625,625,625,0,0,625,625,625,625,0,0,0,0,0,625,625,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,625,625,0,0,0,0,0,496,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,0,0,0,0,0,0,0,1190,1191,1192,1193,1194,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1190,1191,1192,1193,1194,0,0,0,0,0,0,0,0,0,1124,1125,1126,1127,0,0,0,0,0,0,625,625,625,625,625,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,625,0,0,0,0,0,0,0,0,625,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,625,625,625,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,625,625,625,625,0,0,0,0,495,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1139,1140,1141,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1136,1137,1138,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,625,625,625,625,625,625,625,0,0,0,0,625,625,0,0,0,0,0,0,0,0,0,0,0,0,1090,1091,1092,0,0,0,0,0,0,0,0,0,625,0,0,0,0,0,0,0,0,625,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,625,625,625,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,0,0,0,0,0,0,0,0,0,0,0,0,0,625,625,625,625,625,0,0,0,0,495,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,0,0,0,0,0,0,0,0,0,0,0,0,0,1184,1185,1186,1187,1188,1189,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1184,1185,1186,1187,1188,1189,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,625,625,625,0,0,0,0,0,0,0,625,625,625,625,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,625,0,0,0,0,0,0,0,0,625,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,625,625,625,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,625,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
diff --git a/maps/008-2-2.tmx b/maps/008-2-2.tmx
index 11e05353..e6fcd2aa 100644
--- a/maps/008-2-2.tmx
+++ b/maps/008-2-2.tmx
@@ -472,11 +472,11 @@
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,0,2,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,2,0,0,2,2,2,0,0,2,2,0,0,2,2,0,0,0,0,0,2,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,2,0,0,2,2,2,0,5,2,2,5,5,2,2,5,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,2,2,2,2,0,5,2,2,2,0,5,2,2,5,2,2,2,2,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,2,2,2,2,0,5,2,2,2,0,5,2,2,5,5,2,2,5,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,2,2,2,5,5,2,2,5,5,2,2,5,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-- 
cgit v1.2.3-60-g2f50