bugfix a lot of .png, improve scythe-attack, few map fixes

16 files changed, 105 insertions, 97 deletions

diff --git a/graphics/sprites/equipment/hands/cottongloves-female.png b/graphics/sprites/equipment/hands/cottongloves-female.png
index af222a0e..50c3d4f6 100644
--- a/graphics/sprites/equipment/hands/cottongloves-female.png
+++ b/graphics/sprites/equipment/hands/cottongloves-female.png
diff --git a/graphics/sprites/equipment/hands/cottongloves-male.png b/graphics/sprites/equipment/hands/cottongloves-male.png
index 3dc86098..a1556682 100644
--- a/graphics/sprites/equipment/hands/cottongloves-male.png
+++ b/graphics/sprites/equipment/hands/cottongloves-male.png
diff --git a/graphics/sprites/equipment/head/bowlerhat.png b/graphics/sprites/equipment/head/bowlerhat.png
index bd8b47eb..1891e2f1 100644
--- a/graphics/sprites/equipment/head/bowlerhat.png
+++ b/graphics/sprites/equipment/head/bowlerhat.png
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
--- a/graphics/sprites/equipment/head/infantryhelmet.png
+++ b/graphics/sprites/equipment/head/infantryhelmet.png
diff --git a/graphics/sprites/equipment/legs/cottonskirt-female.png b/graphics/sprites/equipment/legs/cottonskirt-female.png
index dca8bde3..799897a8 100644
--- a/graphics/sprites/equipment/legs/cottonskirt-female.png
+++ b/graphics/sprites/equipment/legs/cottonskirt-female.png
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
--- a/graphics/sprites/equipment/legs/cottonskirt-male.png
+++ b/graphics/sprites/equipment/legs/cottonskirt-male.png
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
--- a/graphics/sprites/equipment/legs/silkpants-female.png
+++ b/graphics/sprites/equipment/legs/silkpants-female.png
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
--- a/graphics/sprites/equipment/legs/silkpants-male.png
+++ b/graphics/sprites/equipment/legs/silkpants-male.png
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
--- a/graphics/sprites/equipment/weapons/scythe.png
+++ b/graphics/sprites/equipment/weapons/scythe.png
diff --git a/graphics/sprites/equipment/weapons/trainingwand.png b/graphics/sprites/equipment/weapons/trainingwand.png
index c37efc91..dd58ad42 100644
--- a/graphics/sprites/equipment/weapons/trainingwand.png
+++ b/graphics/sprites/equipment/weapons/trainingwand.png