summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--charcreation.xml11
-rw-r--r--graphics/items/equipment/head/beaniecopter.pngbin0 -> 786 bytes
-rw-r--r--graphics/items/equipment/head/magicgmtophat.pngbin0 -> 869 bytes
-rw-r--r--graphics/items/equipment/head/thin-crown.pngbin0 -> 420 bytes
-rw-r--r--graphics/particles/arrow-banshee.particle.xml20
-rw-r--r--graphics/particles/luvia-attack.particle.xml38
-rw-r--r--graphics/particles/magic-dark-explosion.particle.xml28
-rw-r--r--graphics/particles/monster-luvia.particle.xml67
-rw-r--r--graphics/particles/monster-witchguard.particle.xml28
-rw-r--r--graphics/sprites/equipment/chest/demonwarlordplate-male.xml2
-rw-r--r--graphics/sprites/equipment/head/beaniecopter.pngbin0 -> 4058 bytes
-rw-r--r--graphics/sprites/equipment/head/beaniecopter.xml259
-rw-r--r--graphics/sprites/equipment/head/bull.xml237
-rw-r--r--graphics/sprites/equipment/head/magicgmtophat.pngbin0 -> 2542 bytes
-rw-r--r--graphics/sprites/equipment/head/magicgmtophat.xml117
-rw-r--r--graphics/sprites/equipment/head/rednose.xml237
-rw-r--r--graphics/sprites/equipment/head/thin-crown.pngbin0 -> 901 bytes
-rw-r--r--graphics/sprites/equipment/head/thin-crown.xml117
-rw-r--r--graphics/sprites/monsters/accessories/slime-santa.xml4
-rw-r--r--graphics/sprites/monsters/accessories/slime-seajelly.xml1
-rw-r--r--graphics/sprites/monsters/ball-lightning.xml1
-rw-r--r--graphics/sprites/monsters/bee.xml4
-rw-r--r--graphics/sprites/monsters/butterfly.xml4
-rw-r--r--graphics/sprites/monsters/cave-maggot.xml4
-rw-r--r--graphics/sprites/monsters/element-ball.xml19
-rw-r--r--graphics/sprites/monsters/flower.xml4
-rw-r--r--graphics/sprites/monsters/ghost-pumpkin.xml4
-rw-r--r--graphics/sprites/monsters/larvespa.xml4
-rw-r--r--graphics/sprites/monsters/maggot.xml4
-rw-r--r--graphics/sprites/monsters/reaper.pngbin98514 -> 114405 bytes
-rw-r--r--graphics/sprites/monsters/reaper.xml12
-rw-r--r--graphics/sprites/monsters/skull-ice.xml4
-rw-r--r--graphics/sprites/monsters/snail.xml4
-rw-r--r--graphics/sprites/monsters/squirrel.xml4
-rw-r--r--graphics/sprites/monsters/vespa.xml4
-rw-r--r--graphics/sprites/monsters/wisp.xml4
-rw-r--r--graphics/sprites/monsters/wolvern.xml4
-rw-r--r--graphics/sprites/monsters/yeti.xml4
-rw-r--r--items.xml42
-rw-r--r--maps/007-1.tmx2
-rw-r--r--maps/010-1.tmx4
-rw-r--r--maps/013-1.tmx4
-rw-r--r--maps/016-1.tmx4
-rw-r--r--maps/018-1.tmx4
-rw-r--r--maps/019-1.tmx14
-rw-r--r--maps/056-1.tmx4
-rw-r--r--npcs.xml2
-rw-r--r--tools/client-updates/README.init.verbose.txt97
-rwxr-xr-xtools/map-diff.py192
-rwxr-xr-xtools/minimap-render.py155
50 files changed, 1406 insertions, 372 deletions
diff --git a/charcreation.xml b/charcreation.xml
index c9b6bd78..63678bd0 100644
--- a/charcreation.xml
+++ b/charcreation.xml
@@ -1,9 +1,8 @@
<?xml version="1.0"?>
<chars>
- <haircolor min="0" max="11" />
- <hairstyle min="0" max="19" />
- <stat min="1" max="9" sum="30" />
- <item id="1202"/>
- <item id="881"/>
+ <haircolor min="0" max="11"/>
+ <hairstyle min="0" max="19"/>
+ <stat min="1" max="9" sum="30"/>
+ <item id="1202"/>
+ <item id="881"/>
</chars>
-
diff --git a/graphics/items/equipment/head/beaniecopter.png b/graphics/items/equipment/head/beaniecopter.png
new file mode 100644
index 00000000..c07d6d04
--- /dev/null
+++ b/graphics/items/equipment/head/beaniecopter.png
Binary files differ
diff --git a/graphics/items/equipment/head/magicgmtophat.png b/graphics/items/equipment/head/magicgmtophat.png
new file mode 100644
index 00000000..d6728216
--- /dev/null
+++ b/graphics/items/equipment/head/magicgmtophat.png
Binary files differ
diff --git a/graphics/items/equipment/head/thin-crown.png b/graphics/items/equipment/head/thin-crown.png
new file mode 100644
index 00000000..24b07a51
--- /dev/null
+++ b/graphics/items/equipment/head/thin-crown.png
Binary files differ
diff --git a/graphics/particles/arrow-banshee.particle.xml b/graphics/particles/arrow-banshee.particle.xml
index 0e26750b..654d0aba 100644
--- a/graphics/particles/arrow-banshee.particle.xml
+++ b/graphics/particles/arrow-banshee.particle.xml
@@ -29,16 +29,16 @@
<property name="vertical-angle" min="0" max="90"/>
</emitter>
<emitter>
- <property name="image" value="graphics/particles/orb-small.png|W:#222222"/>
- <property name="lifetime" value="90"/>
- <property name="fade-in" value="10"/>
- <property name="fade-out" value="90"/>
- <property name="output" min="0" max="1"/>
- <property name="power" min="0" max="2"/>
- <property name="horizontal-angle" min="-15" max="-175"/>
- <property name="momentum" value="0.95"/>
- <property name="randomnes" value="200"/>
- <property name="vertical-angle" min="0" max="90"/>
+ <property name="image" value="graphics/particles/orb-small.png|W:#222222"/>
+ <property name="lifetime" value="90"/>
+ <property name="fade-in" value="10"/>
+ <property name="fade-out" value="90"/>
+ <property name="output" min="0" max="1"/>
+ <property name="power" min="0" max="2"/>
+ <property name="horizontal-angle" min="-15" max="-175"/>
+ <property name="momentum" value="0.95"/>
+ <property name="randomnes" value="200"/>
+ <property name="vertical-angle" min="0" max="90"/>
</emitter>
</particle>
</effect>
diff --git a/graphics/particles/luvia-attack.particle.xml b/graphics/particles/luvia-attack.particle.xml
index 5fce5e2f..3e9c3ab5 100644
--- a/graphics/particles/luvia-attack.particle.xml
+++ b/graphics/particles/luvia-attack.particle.xml
@@ -16,29 +16,29 @@
<property name="vertical-angle" min="0" max="90"/>
</emitter>
<emitter>
- <property name="image" value="graphics/particles/orb-large.png|W:#130F16"/>
- <property name="lifetime" value="60"/>
- <property name="fade-out" value="90"/>
- <property name="output" min="0" max="1"/>
- <property name="power" min="0" max="1"/>
- <property name="horizontal-angle" min="-10" max="-10"/>
- <property name="momentum" value="0.95"/>
- <property name="randomnes" value="200"/>
- <property name="vertical-angle" min="0" max="90"/>
+ <property name="image" value="graphics/particles/orb-large.png|W:#130F16"/>
+ <property name="lifetime" value="60"/>
+ <property name="fade-out" value="90"/>
+ <property name="output" min="0" max="1"/>
+ <property name="power" min="0" max="1"/>
+ <property name="horizontal-angle" min="-10" max="-10"/>
+ <property name="momentum" value="0.95"/>
+ <property name="randomnes" value="200"/>
+ <property name="vertical-angle" min="0" max="90"/>
</emitter>
<emitter>
- <animation imageset="graphics/particles/electricity.particle.png|W:#333333" width="15" height="15">
+ <animation imageset="graphics/particles/electricity.particle.png|W:#333333" width="15" height="15">
<sequence start="0" end="7" delay="10"/>
<frame index="0" delay="10"/>
- </animation>
- <property name="lifetime" value="50"/>
- <property name="fade-out" value="90"/>
- <property name="output" min="2" max="3"/>
- <property name="power" min="1" max="4"/>
- <property name="horizontal-angle" min="-15" max="-175"/>
- <property name="momentum" value="0.95"/>
- <property name="randomnes" value="200"/>
- <property name="vertical-angle" min="0" max="90"/>
+ </animation>
+ <property name="lifetime" value="50"/>
+ <property name="fade-out" value="90"/>
+ <property name="output" min="2" max="3"/>
+ <property name="power" min="1" max="4"/>
+ <property name="horizontal-angle" min="-15" max="-175"/>
+ <property name="momentum" value="0.95"/>
+ <property name="randomnes" value="200"/>
+ <property name="vertical-angle" min="0" max="90"/>
</emitter>
</particle>
</effect>
diff --git a/graphics/particles/magic-dark-explosion.particle.xml b/graphics/particles/magic-dark-explosion.particle.xml
index 2ff95065..8a88478a 100644
--- a/graphics/particles/magic-dark-explosion.particle.xml
+++ b/graphics/particles/magic-dark-explosion.particle.xml
@@ -5,20 +5,20 @@
<effect>
<particle position-x="0" position-y="0" position-z="16" lifetime="1">
<emitter>
- <property name="position-z" min="14" max="18"/>
- <property name="position-y" min="-8" max="8"/>
- <property name="position-x" min="-8" max="8"/>
- <property name="image" value="graphics/particles/orb-large.png|W:#130F16"/>
- <property name="lifetime" value="120"/>
- <property name="fade-out" value="90"/>
- <property name="output" min="7" max="9"/>
- <property name="power" min="4" max="12"/>
- <property name="gravity" value="0.07"/>
- <property name="momentum" value="0.95"/>
- <property name="randomnes" value="200"/>
- <property name="vertical-angle" min="0" max="90"/>
- <property name="horizontal-angle" min="-15" max="-175"/>
- <property name="gravity" value="0.01"/>
+ <property name="position-z" min="14" max="18"/>
+ <property name="position-y" min="-8" max="8"/>
+ <property name="position-x" min="-8" max="8"/>
+ <property name="image" value="graphics/particles/orb-large.png|W:#130F16"/>
+ <property name="lifetime" value="120"/>
+ <property name="fade-out" value="90"/>
+ <property name="output" min="7" max="9"/>
+ <property name="power" min="4" max="12"/>
+ <property name="gravity" value="0.07"/>
+ <property name="momentum" value="0.95"/>
+ <property name="randomnes" value="200"/>
+ <property name="vertical-angle" min="0" max="90"/>
+ <property name="horizontal-angle" min="-15" max="-175"/>
+ <property name="gravity" value="0.01"/>
</emitter>
<emitter>
<property name="position-z" min="14" max="18"/>
diff --git a/graphics/particles/monster-luvia.particle.xml b/graphics/particles/monster-luvia.particle.xml
index e07b7ee5..c077da38 100644
--- a/graphics/particles/monster-luvia.particle.xml
+++ b/graphics/particles/monster-luvia.particle.xml
@@ -20,45 +20,44 @@ Dark Purple particles flying around the target, giving a demonic aura.
<property name="lifetime" value="1"/>
<property name="output" value="1"/>
<emitter>
- <property name="image" value="graphics/particles/orb-small.png|W:#401c52"/>
- <property name="lifetime" value="90"/>
- <property name="fade-in" value="10"/>
- <property name="fade-out" value="90"/>
- <property name="output" min="0" max="1"/>
- <property name="power" min="0" max="4"/>
- <property name="horizontal-angle" min="-15" max="-175"/>
- <property name="momentum" value="0.95"/>
- <property name="randomnes" value="200"/>
- <property name="vertical-angle" min="0" max="90"/>
+ <property name="image" value="graphics/particles/orb-small.png|W:#401c52"/>
+ <property name="lifetime" value="90"/>
+ <property name="fade-in" value="10"/>
+ <property name="fade-out" value="90"/>
+ <property name="output" min="0" max="1"/>
+ <property name="power" min="0" max="4"/>
+ <property name="horizontal-angle" min="-15" max="-175"/>
+ <property name="momentum" value="0.95"/>
+ <property name="randomnes" value="200"/>
+ <property name="vertical-angle" min="0" max="90"/>
</emitter>
<emitter>
- <property name="image" value="graphics/particles/star-small.png|W:#512C75,222222"/>
- <property name="lifetime" value="90"/>
- <property name="fade-in" value="10"/>
- <property name="fade-out" value="90"/>
- <property name="output" min="0" max="1"/>
- <property name="power" min="0" max="4"/>
- <property name="horizontal-angle" min="-15" max="-175"/>
- <property name="momentum" value="0.95"/>
- <property name="randomnes" value="200"/>
- <property name="vertical-angle" min="0" max="90"/>
+ <property name="image" value="graphics/particles/star-small.png|W:#512C75,222222"/>
+ <property name="lifetime" value="90"/>
+ <property name="fade-in" value="10"/>
+ <property name="fade-out" value="90"/>
+ <property name="output" min="0" max="1"/>
+ <property name="power" min="0" max="4"/>
+ <property name="horizontal-angle" min="-15" max="-175"/>
+ <property name="momentum" value="0.95"/>
+ <property name="randomnes" value="200"/>
+ <property name="vertical-angle" min="0" max="90"/>
</emitter>
-
</emitter>
<emitter>
- <animation imageset="graphics/particles/electricity.particle.png|W:#333333" width="15" height="15">
- <sequence start="0" end="7" delay="10"/>
- <frame index="0" delay="10"/>
- </animation>
- <property name="lifetime" value="90"/>
- <property name="fade-in" value="10"/>
- <property name="fade-out" value="90"/>
- <property name="output" min="0" max="1"/>
- <property name="power" min="0" max="4"/>
- <property name="horizontal-angle" min="-15" max="-175"/>
- <property name="momentum" value="0.95"/>
- <property name="randomnes" value="50"/>
- <property name="vertical-angle" min="0" max="90"/>
+ <animation imageset="graphics/particles/electricity.particle.png|W:#333333" width="15" height="15">
+ <sequence start="0" end="7" delay="10"/>
+ <frame index="0" delay="10"/>
+ </animation>
+ <property name="lifetime" value="90"/>
+ <property name="fade-in" value="10"/>
+ <property name="fade-out" value="90"/>
+ <property name="output" min="0" max="1"/>
+ <property name="power" min="0" max="4"/>
+ <property name="horizontal-angle" min="-15" max="-175"/>
+ <property name="momentum" value="0.95"/>
+ <property name="randomnes" value="50"/>
+ <property name="vertical-angle" min="0" max="90"/>
</emitter>
</emitter>
</particle>
diff --git a/graphics/particles/monster-witchguard.particle.xml b/graphics/particles/monster-witchguard.particle.xml
index 2429252a..7705af75 100644
--- a/graphics/particles/monster-witchguard.particle.xml
+++ b/graphics/particles/monster-witchguard.particle.xml
@@ -12,20 +12,20 @@ Dark Purple particles flying around the target, giving a demonic aura.
<property name="lifetime" value="1"/>
<property name="output" value="1"/>
<emitter>
- <animation imageset="graphics/particles/electricity.particle.png|W:#555555" width="15" height="15">
- <sequence start="0" end="7" delay="10"/>
- <frame index="0" delay="10"/>
- </animation>
- <property name="lifetime" value="25"/>
- <property name="fade-in" value="5"/>
- <property name="fade-out" value="25"/>
- <property name="output" min="0" max="1"/>
- <property name="power" min="0" max="2"/>
- <property name="horizontal-angle" min="-15" max="-175"/>
- <property name="momentum" value="0.95"/>
- <property name="randomnes" value="50"/>
- <property name="vertical-angle" min="0" max="90"/>
- </emitter>
+ <animation imageset="graphics/particles/electricity.particle.png|W:#555555" width="15" height="15">
+ <sequence start="0" end="7" delay="10"/>
+ <frame index="0" delay="10"/>
+ </animation>
+ <property name="lifetime" value="25"/>
+ <property name="fade-in" value="5"/>
+ <property name="fade-out" value="25"/>
+ <property name="output" min="0" max="1"/>
+ <property name="power" min="0" max="2"/>
+ <property name="horizontal-angle" min="-15" max="-175"/>
+ <property name="momentum" value="0.95"/>
+ <property name="randomnes" value="50"/>
+ <property name="vertical-angle" min="0" max="90"/>
+ </emitter>
</emitter>
</particle>
</effect>
diff --git a/graphics/sprites/equipment/chest/demonwarlordplate-male.xml b/graphics/sprites/equipment/chest/demonwarlordplate-male.xml
index b08d3d14..e0fe05ff 100644
--- a/graphics/sprites/equipment/chest/demonwarlordplate-male.xml
+++ b/graphics/sprites/equipment/chest/demonwarlordplate-male.xml
@@ -2,4 +2,4 @@
<sprite name="player" action="stand">
<imageset name="base" src="graphics/sprites/equipment/chest/demonwarlordplate-male.png|W" width="64" height="64"/>
<include file="equipment/chest/warlordplate-male.xml"/>
-</sprite> \ No newline at end of file
+</sprite>
diff --git a/graphics/sprites/equipment/head/beaniecopter.png b/graphics/sprites/equipment/head/beaniecopter.png
new file mode 100644
index 00000000..aef9505e
--- /dev/null
+++ b/graphics/sprites/equipment/head/beaniecopter.png
Binary files differ
diff --git a/graphics/sprites/equipment/head/beaniecopter.xml b/graphics/sprites/equipment/head/beaniecopter.xml
new file mode 100644
index 00000000..4de672ca
--- /dev/null
+++ b/graphics/sprites/equipment/head/beaniecopter.xml
@@ -0,0 +1,259 @@
+<?xml version="1.0"?>
+<sprite>
+ <imageset name="base" src="graphics/sprites/equipment/head/beaniecopter.png" width="30" height="30" offsetY="-44"/>
+ <action name="stand" imageset="base">
+ <animation direction="down">
+ <frame index="0" offsetX="-1" delay="56"/>
+ <frame index="1" offsetX="-1" delay="19"/>
+ <frame index="1" offsetX="-1" delay="37"/>
+ <frame index="2" offsetX="-1" delay="38"/>
+ <frame index="2" offsetX="-1" delay="18"/>
+ <frame index="3" offsetX="-1" delay="57"/>
+ <frame index="0" offsetX="-1" delay="55"/>
+ <frame index="1" offsetX="-1" delay="20"/>
+ <frame index="1" offsetX="-1" delay="36"/>
+ <frame index="2" offsetX="-1" delay="39"/>
+ <frame index="2" offsetX="-1" delay="17"/>
+ <frame index="3" offsetX="-1" delay="58"/>
+ </animation>
+ <animation direction="left">
+ <frame index="4" offsetY="-1" delay="56"/>
+ <frame index="5" offsetY="-1" delay="19"/>
+ <frame index="5" offsetY="-1" delay="37"/>
+ <frame index="6" offsetY="-1" delay="38"/>
+ <frame index="6" offsetY="-1" delay="18"/>
+ <frame index="7" offsetY="-1" delay="56"/>
+ <frame index="4" offsetY="-1" delay="56"/>
+ <frame index="5" offsetY="-1" delay="20"/>
+ <frame index="5" offsetY="-1" delay="36"/>
+ <frame index="6" offsetY="-1" delay="39"/>
+ <frame index="6" offsetY="-1" delay="17"/>
+ <frame index="7" offsetY="-1" delay="58"/>
+ </animation>
+ <animation direction="up">
+ <frame index="8" offsetX="-2" offsetY="-1" delay="56"/>
+ <frame index="9" offsetX="-2" offsetY="-1" delay="19"/>
+ <frame index="9" offsetX="-2" offsetY="-1" delay="37"/>
+ <frame index="10" offsetX="-2" offsetY="-1" delay="38"/>
+ <frame index="10" offsetX="-2" offsetY="-1" delay="18"/>
+ <frame index="11" offsetX="-2" offsetY="-1" delay="57"/>
+ <frame index="8" offsetX="-2" offsetY="-1" delay="55"/>
+ <frame index="9" offsetX="-2" offsetY="-1" delay="20"/>
+ <frame index="9" offsetX="-2" offsetY="-1" delay="36"/>
+ <frame index="10" offsetX="-2" offsetY="-1" delay="39"/>
+ <frame index="10" offsetX="-2" offsetY="-1" delay="17"/>
+ <frame index="11" offsetX="-2" offsetY="-1" delay="58"/>
+ </animation>
+ <animation direction="right">
+ <frame index="12" offsetY="-1" delay="56"/>
+ <frame index="13" offsetY="-1" delay="19"/>
+ <frame index="13" offsetY="-1" delay="37"/>
+ <frame index="14" offsetY="-1" delay="38"/>
+ <frame index="14" offsetY="-1" delay="18"/>
+ <frame index="15" offsetY="-1" delay="56"/>
+ <frame index="12" offsetY="-1" delay="56"/>
+ <frame index="13" offsetY="-1" delay="20"/>
+ <frame index="13" offsetY="-1" delay="36"/>
+ <frame index="14" offsetY="-1" delay="39"/>
+ <frame index="14" offsetY="-1" delay="17"/>
+ <frame index="15" offsetY="-1" delay="56"/>
+ </animation>
+ </action>
+ <action name="walk" imageset="base">
+ <animation direction="down">
+ <frame index="0" offsetX="-1" delay="56"/>
+ <frame index="1" offsetX="-1" delay="19"/>
+ <frame index="1" offsetX="-1" offsetY="-1" delay="37"/>
+ <frame index="2" offsetX="-1" offsetY="-1" delay="38"/>
+ <frame index="2" offsetX="-1" offsetY="-1" delay="18"/>
+ <frame index="3" offsetX="-1" offsetY="-1" delay="57"/>
+ <frame index="0" offsetX="-1" delay="55"/>
+ <frame index="1" offsetX="-1" delay="20"/>
+ <frame index="1" offsetX="-1" offsetY="-1" delay="36"/>
+ <frame index="2" offsetX="-1" offsetY="-1" delay="39"/>
+ <frame index="2" offsetX="-1" offsetY="-1" delay="17"/>
+ <frame index="3" offsetX="-1" offsetY="-1" delay="58"/>
+ </animation>
+ <animation direction="left">
+ <frame index="4" offsetX="-1" offsetY="-1" delay="56"/>
+ <frame index="5" offsetX="-1" offsetY="-1" delay="19"/>
+ <frame index="5" offsetX="-1" delay="37"/>
+ <frame index="6" offsetX="-1" delay="38"/>
+ <frame index="6" offsetX="-1" offsetY="-1" delay="18"/>
+ <frame index="7" offsetX="-1" offsetY="-1" delay="57"/>
+ <frame index="4" offsetX="-1" offsetY="-1" delay="55"/>
+ <frame index="5" offsetX="-1" offsetY="-1" delay="20"/>
+ <frame index="5" offsetX="-1" delay="36"/>
+ <frame index="6" offsetX="-1" delay="39"/>
+ <frame index="6" offsetX="-1" offsetY="-1" delay="17"/>
+ <frame index="7" offsetX="-1" offsetY="-1" delay="58"/>
+ </animation>
+ <animation direction="up">
+ <frame index="8" offsetX="-2" offsetY="-1" delay="56"/>
+ <frame index="9" offsetX="-2" offsetY="-1" delay="19"/>
+ <frame index="9" offsetX="-2" offsetY="-2" delay="37"/>
+ <frame index="10" offsetX="-2" offsetY="-2" delay="38"/>
+ <frame index="10" offsetX="-2" offsetY="-2" delay="18"/>
+ <frame index="11" offsetX="-2" offsetY="-2" delay="57"/>
+ <frame index="8" offsetX="-2" offsetY="-1" delay="55"/>
+ <frame index="9" offsetX="-2" offsetY="-1" delay="20"/>
+ <frame index="9" offsetX="-2" offsetY="-2" delay="36"/>
+ <frame index="10" offsetX="-2" offsetY="-2" delay="39"/>
+ <frame index="10" offsetX="-2" offsetY="-2" delay="17"/>
+ <frame index="11" offsetX="-2" offsetY="-2" delay="58"/>
+ </animation>
+ <animation direction="right">
+ <frame index="12" offsetY="-1" delay="56"/>
+ <frame index="13" offsetY="-1" delay="19"/>
+ <frame index="13" delay="37"/>
+ <frame index="14" delay="38"/>
+ <frame index="14" offsetY="-1" delay="18"/>
+ <frame index="15" offsetY="-1" delay="57"/>
+ <frame index="12" offsetY="-1" delay="55"/>
+ <frame index="13" offsetY="-1" delay="20"/>
+ <frame index="13" delay="36"/>
+ <frame index="14" delay="39"/>
+ <frame index="14" offsetY="-1" delay="17"/>
+ <frame index="15" offsetY="-1" delay="56"/>
+ </animation>
+ </action>
+ <action name="attack" imageset="base">
+ <animation direction="down">
+ <frame index="0" offsetX="-1" offsetY="3" delay="75"/>
+ <frame index="1" offsetX="-1" offsetY="2" delay="75"/>
+ <frame index="2" offsetX="-1" offsetY="5" delay="75"/>
+ <frame index="3" offsetX="-1" offsetY="6" delay="75"/>
+ <end/>
+ </animation>
+ <animation direction="left">
+ <frame index="4" offsetX="3" offsetY="-3" delay="75"/>
+ <frame index="5" offsetX="3" offsetY="-4" delay="75"/>
+ <frame index="6" offsetX="-1" offsetY="-1" delay="75"/>
+ <frame index="7" offsetX="-2" delay="75"/>
+ <end/>
+ </animation>
+ <animation direction="up">
+ <frame index="8" offsetX="-3" delay="75"/>
+ <frame index="9" offsetX="-3" delay="75"/>
+ <frame index="10" offsetX="-3" delay="75"/>
+ <frame index="11" offsetX="-3" offsetY="2" delay="75"/>
+ <end/>
+ </animation>
+ <animation direction="right">
+ <frame index="12" offsetX="-2" offsetY="-2" delay="75"/>
+ <frame index="13" offsetX="-2" offsetY="-3" delay="75"/>
+ <frame index="14" offsetX="1" offsetY="1" delay="75"/>
+ <frame index="15" offsetX="2" offsetY="2" delay="75"/>
+ <end/>
+ </animation>
+ </action>
+ <action name="attack_bow" imageset="base">
+ <animation direction="down">
+ <frame index="0" offsetX="-1" offsetY="1" delay="75"/>
+ <frame index="0" offsetX="-1" offsetY="1" delay="19"/>
+ <frame index="1" offsetX="-1" offsetY="1" delay="75"/>
+ <frame index="1" offsetX="-1" offsetY="1" delay="19"/>
+ <frame index="2" offsetX="-1" offsetY="1" delay="37"/>
+ <frame index="2" offsetX="-1" offsetY="2" delay="57"/>
+ <frame index="3" offsetX="-1" offsetY="2" delay="18"/>
+ <frame index="3" offsetX="-1" offsetY="1" delay="75"/>
+ <end/>
+ </animation>
+ <animation direction="left">
+ <frame index="4" offsetX="2" offsetY="-1" delay="75"/>
+ <frame index="4" offsetX="2" offsetY="-1" delay="19"/>
+ <frame index="5" offsetX="2" offsetY="-1" delay="75"/>
+ <frame index="5" offsetX="2" offsetY="-1" delay="19"/>
+ <frame index="6" offsetX="2" offsetY="-1" delay="37"/>
+ <frame index="6" offsetX="4" offsetY="-2" delay="57"/>
+ <frame index="7" offsetX="4" offsetY="-2" delay="18"/>
+ <frame index="7" offsetX="4" offsetY="-2" delay="75"/>
+ <end/>
+ </animation>
+ <animation direction="up">
+ <frame index="8" offsetX="-2" offsetY="-1" delay="75"/>
+ <frame index="8" offsetX="-2" offsetY="-1" delay="19"/>
+ <frame index="9" offsetX="-2" offsetY="-1" delay="75"/>
+ <frame index="9" offsetX="-2" offsetY="-1" delay="19"/>
+ <frame index="10" offsetX="-2" offsetY="-1" delay="37"/>
+ <frame index="10" offsetX="-3" delay="57"/>
+ <frame index="11" offsetX="-3" delay="18"/>
+ <frame index="11" offsetX="-3" offsetY="-1" delay="75"/>
+ <end/>
+ </animation>
+ <animation direction="right">
+ <frame index="12" offsetX="-5" offsetY="-1" delay="75"/>
+ <frame index="12" offsetX="-5" offsetY="-1" delay="19"/>
+ <frame index="13" offsetX="-5" offsetY="-1" delay="75"/>
+ <frame index="13" offsetX="-5" offsetY="-1" delay="19"/>
+ <frame index="14" offsetX="-5" offsetY="-1" delay="37"/>
+ <frame index="14" offsetX="-7" offsetY="-2" delay="57"/>
+ <frame index="15" offsetX="-7" offsetY="-2" delay="18"/>
+ <frame index="15" offsetX="-7" offsetY="-2" delay="75"/>
+ <end/>
+ </animation>
+ </action>
+ <action name="sit" imageset="base">
+ <animation direction="down">
+ <frame index="0" offsetX="-1" offsetY="12" delay="56"/>
+ <frame index="1" offsetX="-1" offsetY="12" delay="19"/>
+ <frame index="1" offsetX="-1" offsetY="12" delay="37"/>
+ <frame index="2" offsetX="-1" offsetY="12" delay="38"/>
+ <frame index="2" offsetX="-1" offsetY="12" delay="18"/>
+ <frame index="3" offsetX="-1" offsetY="12" delay="57"/>
+ <frame index="0" offsetX="-1" offsetY="12" delay="55"/>
+ <frame index="1" offsetX="-1" offsetY="12" delay="20"/>
+ <frame index="1" offsetX="-1" offsetY="12" delay="36"/>
+ <frame index="2" offsetX="-1" offsetY="12" delay="39"/>
+ <frame index="2" offsetX="-1" offsetY="12" delay="17"/>
+ <frame index="3" offsetX="-1" offsetY="12" delay="58"/>
+ </animation>
+ <animation direction="left">
+ <frame index="4" offsetX="4" offsetY="8" delay="56"/>
+ <frame index="5" offsetX="4" offsetY="8" delay="19"/>
+ <frame index="5" offsetX="4" offsetY="8" delay="37"/>
+ <frame index="6" offsetX="4" offsetY="8" delay="38"/>
+ <frame index="6" offsetX="4" offsetY="8" delay="18"/>
+ <frame index="7" offsetX="4" offsetY="8" delay="56"/>
+ <frame index="4" offsetX="4" offsetY="8" delay="56"/>
+ <frame index="5" offsetX="4" offsetY="8" delay="20"/>
+ <frame index="5" offsetX="4" offsetY="8" delay="36"/>
+ <frame index="6" offsetX="4" offsetY="8" delay="39"/>
+ <frame index="6" offsetX="4" offsetY="8" delay="17"/>
+ <frame index="7" offsetX="4" offsetY="8" delay="58"/>
+ </animation>
+ <animation direction="up">
+ <frame index="8" offsetX="-1" offsetY="8" delay="56"/>
+ <frame index="9" offsetX="-1" offsetY="8" delay="19"/>
+ <frame index="9" offsetX="-1" offsetY="8" delay="37"/>
+ <frame index="10" offsetX="-1" offsetY="8" delay="38"/>
+ <frame index="10" offsetX="-1" offsetY="8" delay="18"/>
+ <frame index="11" offsetX="-1" offsetY="8" delay="57"/>
+ <frame index="8" offsetX="-1" offsetY="8" delay="55"/>
+ <frame index="9" offsetX="-1" offsetY="8" delay="20"/>
+ <frame index="9" offsetX="-1" offsetY="8" delay="36"/>
+ <frame index="10" offsetX="-1" offsetY="8" delay="39"/>
+ <frame index="10" offsetX="-1" offsetY="8" delay="17"/>
+ <frame index="11" offsetX="-1" offsetY="8" delay="58"/>
+ </animation>
+ <animation direction="right">
+ <frame index="12" offsetX="-6" offsetY="8" delay="56"/>
+ <frame index="13" offsetX="-6" offsetY="8" delay="19"/>
+ <frame index="13" offsetX="-6" offsetY="8" delay="37"/>
+ <frame index="14" offsetX="-6" offsetY="8" delay="38"/>
+ <frame index="14" offsetX="-6" offsetY="8" delay="18"/>
+ <frame index="15" offsetX="-6" offsetY="8" delay="56"/>
+ <frame index="12" offsetX="-6" offsetY="8" delay="56"/>
+ <frame index="13" offsetX="-6" offsetY="8" delay="20"/>
+ <frame index="13" offsetX="-6" offsetY="8" delay="36"/>
+ <frame index="14" offsetX="-6" offsetY="8" delay="39"/>
+ <frame index="14" offsetX="-6" offsetY="8" delay="17"/>
+ <frame index="15" offsetX="-6" offsetY="8" delay="56"/>
+ </animation>
+ </action>
+ <action name="dead" imageset="base">
+ <animation direction="default">
+ <frame index="16" offsetX="32" offsetY="30"/>
+ </animation>
+ </action>
+</sprite>
diff --git a/graphics/sprites/equipment/head/bull.xml b/graphics/sprites/equipment/head/bull.xml
index 529fd173..7a9af4a3 100644
--- a/graphics/sprites/equipment/head/bull.xml
+++ b/graphics/sprites/equipment/head/bull.xml
@@ -1,124 +1,117 @@
<?xml version="1.0"?>
<sprite>
- <imageset name="equipment" src="graphics/sprites/equipment/head/bull.png" width="27" height="26"/>
-
- <action name="stand" imageset="equipment">
- <animation direction="down">
- <frame index="0" offsetX="-1" offsetY="-37"/>
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="-1" offsetY="-39"/>
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-2" offsetY="-37"/>
- </animation>
- <animation direction="right">
- <frame index="3" offsetY="-39"/>
- </animation>
- </action>
-
- <action name="walk" imageset="equipment">
- <animation direction="down">
- <frame index="0" offsetX="-1" offsetY="-36" delay="75"/>
- <frame index="0" offsetX="-1" offsetY="-37" delay="150"/>
- <frame index="0" offsetX="-1" offsetY="-36" delay="75"/>
- <frame index="0" offsetX="-1" offsetY="-37" delay="150"/>
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="-1" offsetY="-39" delay="75"/>
- <frame index="1" offsetX="-1" offsetY="-38" delay="75"/>
- <frame index="1" offsetX="-1" offsetY="-39" delay="150"/>
- <frame index="1" offsetX="-1" offsetY="-38" delay="75"/>
- <frame index="1" offsetX="-1" offsetY="-39" delay="75"/>
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-2" offsetY="-37" delay="75"/>
- <frame index="2" offsetX="-2" offsetY="-38" delay="150"/>
- <frame index="2" offsetX="-2" offsetY="-37" delay="75"/>
- <frame index="2" offsetX="-2" offsetY="-38" delay="150"/>
- </animation>
- <animation direction="right">
- <frame index="3" offsetY="-39" delay="75"/>
- <frame index="3" offsetY="-38" delay="75"/>
- <frame index="3" offsetY="-39" delay="150"/>
- <frame index="3" offsetY="-38" delay="75"/>
- <frame index="3" offsetY="-39" delay="75"/>
- </animation>
- </action>
-
- <action name="attack" imageset="equipment">
- <animation direction="down">
- <frame index="0" offsetX="-1" offsetY="-35" delay="75"/>
- <frame index="0" offsetX="-1" offsetY="-36" delay="75"/>
- <frame index="0" offsetX="-1" offsetY="-33" delay="75"/>
- <frame index="0" offsetX="-1" offsetY="-31" delay="75"/>
- <end />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="3" offsetY="-40" delay="75"/>
- <frame index="1" offsetX="3" offsetY="-41" delay="75"/>
- <frame index="1" offsetX="-1" offsetY="-39" delay="75"/>
- <frame index="1" offsetX="-2" offsetY="-37" delay="75"/>
- <end />
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-3" offsetY="-37" delay="225"/>
- <frame index="2" offsetX="-3" offsetY="-36" delay="75"/>
- <end />
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="-3" offsetY="-40" delay="75"/>
- <frame index="3" offsetX="-3" offsetY="-41" delay="75"/>
- <frame index="3" offsetY="-39" delay="75"/>
- <frame index="3" offsetX="1" offsetY="-37" delay="75"/>
- <end />
- </animation>
- </action>
-
- <action name="attack_bow" imageset="equipment">
- <animation direction="down">
- <frame index="0" offsetX="-1" offsetY="-35" delay="225"/>
- <frame index="0" offsetX="-1" offsetY="-34" delay="75"/>
- <frame index="0" offsetX="-1" offsetY="-35" delay="75"/>
- <end />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="2" offsetY="-39" delay="225"/>
- <frame index="1" offsetX="4" offsetY="-40" delay="150"/>
- <end />
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-2" offsetY="-37" delay="225"/>
- <frame index="2" offsetX="-3" offsetY="-36" delay="75"/>
- <frame index="2" offsetX="-3" offsetY="-37" delay="75"/>
- <end />
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="-3" offsetY="-39" delay="225"/>
- <frame index="3" offsetX="-5" offsetY="-40" delay="150"/>
- <end />
- </animation>
- </action>
-
- <action name="sit" imageset="equipment">
- <animation direction="down">
- <frame index="0" offsetX="-1" offsetY="-24" />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="3" offsetY="-30"/>
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-1" offsetY="-29"/>
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="-6" offsetY="-30"/>
- </animation>
- </action>
-
- <action name="dead" imageset="equipment">
- <animation direction="default">
- <frame index="4" offsetX="38" offsetY="-6"/>
- </animation>
- </action>
-
-</sprite> \ No newline at end of file
+ <imageset name="equipment" src="graphics/sprites/equipment/head/bull.png" width="27" height="26"/>
+ <action name="stand" imageset="equipment">
+ <animation direction="down">
+ <frame index="0" offsetX="-1" offsetY="-37"/>
+ </animation>
+ <animation direction="left">
+ <frame index="1" offsetX="-1" offsetY="-39"/>
+ </animation>
+ <animation direction="up">
+ <frame index="2" offsetX="-2" offsetY="-37"/>
+ </animation>
+ <animation direction="right">
+ <frame index="3" offsetY="-39"/>
+ </animation>
+ </action>
+ <action name="walk" imageset="equipment">
+ <animation direction="down">
+ <frame index="0" offsetX="-1" offsetY="-36" delay="75"/>
+ <frame index="0" offsetX="-1" offsetY="-37" delay="150"/>
+ <frame index="0" offsetX="-1" offsetY="-36" delay="75"/>
+ <frame index="0" offsetX="-1" offsetY="-37" delay="150"/>
+ </animation>
+ <animation direction="left">
+ <frame index="1" offsetX="-1" offsetY="-39" delay="75"/>
+ <frame index="1" offsetX="-1" offsetY="-38" delay="75"/>
+ <frame index="1" offsetX="-1" offsetY="-39" delay="150"/>
+ <frame index="1" offsetX="-1" offsetY="-38" delay="75"/>
+ <frame index="1" offsetX="-1" offsetY="-39" delay="75"/>
+ </animation>
+ <animation direction="up">
+ <frame index="2" offsetX="-2" offsetY="-37" delay="75"/>
+ <frame index="2" offsetX="-2" offsetY="-38" delay="150"/>
+ <frame index="2" offsetX="-2" offsetY="-37" delay="75"/>
+ <frame index="2" offsetX="-2" offsetY="-38" delay="150"/>
+ </animation>
+ <animation direction="right">
+ <frame index="3" offsetY="-39" delay="75"/>
+ <frame index="3" offsetY="-38" delay="75"/>
+ <frame index="3" offsetY="-39" delay="150"/>
+ <frame index="3" offsetY="-38" delay="75"/>
+ <frame index="3" offsetY="-39" delay="75"/>
+ </animation>
+ </action>
+ <action name="attack" imageset="equipment">
+ <animation direction="down">
+ <frame index="0" offsetX="-1" offsetY="-35" delay="75"/>
+ <frame index="0" offsetX="-1" offsetY="-36" delay="75"/>
+ <frame index="0" offsetX="-1" offsetY="-33" delay="75"/>
+ <frame index="0" offsetX="-1" offsetY="-31" delay="75"/>
+ <end/>
+ </animation>
+ <animation direction="left">
+ <frame index="1" offsetX="3" offsetY="-40" delay="75"/>
+ <frame index="1" offsetX="3" offsetY="-41" delay="75"/>
+ <frame index="1" offsetX="-1" offsetY="-39" delay="75"/>
+ <frame index="1" offsetX="-2" offsetY="-37" delay="75"/>
+ <end/>
+ </animation>
+ <animation direction="up">
+ <frame index="2" offsetX="-3" offsetY="-37" delay="225"/>
+ <frame index="2" offsetX="-3" offsetY="-36" delay="75"/>
+ <end/>
+ </animation>
+ <animation direction="right">
+ <frame index="3" offsetX="-3" offsetY="-40" delay="75"/>
+ <frame index="3" offsetX="-3" offsetY="-41" delay="75"/>
+ <frame index="3" offsetY="-39" delay="75"/>
+ <frame index="3" offsetX="1" offsetY="-37" delay="75"/>
+ <end/>
+ </animation>
+ </action>
+ <action name="attack_bow" imageset="equipment">
+ <animation direction="down">
+ <frame index="0" offsetX="-1" offsetY="-35" delay="225"/>
+ <frame index="0" offsetX="-1" offsetY="-34" delay="75"/>
+ <frame index="0" offsetX="-1" offsetY="-35" delay="75"/>
+ <end/>
+ </animation>
+ <animation direction="left">
+ <frame index="1" offsetX="2" offsetY="-39" delay="225"/>
+ <frame index="1" offsetX="4" offsetY="-40" delay="150"/>
+ <end/>
+ </animation>
+ <animation direction="up">
+ <frame index="2" offsetX="-2" offsetY="-37" delay="225"/>
+ <frame index="2" offsetX="-3" offsetY="-36" delay="75"/>
+ <frame index="2" offsetX="-3" offsetY="-37" delay="75"/>
+ <end/>
+ </animation>
+ <animation direction="right">
+ <frame index="3" offsetX="-3" offsetY="-39" delay="225"/>
+ <frame index="3" offsetX="-5" offsetY="-40" delay="150"/>
+ <end/>
+ </animation>
+ </action>
+ <action name="sit" imageset="equipment">
+ <animation direction="down">
+ <frame index="0" offsetX="-1" offsetY="-24"/>
+ </animation>
+ <animation direction="left">
+ <frame index="1" offsetX="3" offsetY="-30"/>
+ </animation>
+ <animation direction="up">
+ <frame index="2" offsetX="-1" offsetY="-29"/>
+ </animation>
+ <animation direction="right">
+ <frame index="3" offsetX="-6" offsetY="-30"/>
+ </animation>
+ </action>
+ <action name="dead" imageset="equipment">
+ <animation direction="default">
+ <frame index="4" offsetX="38" offsetY="-6"/>
+ </animation>
+ </action>
+</sprite>
diff --git a/graphics/sprites/equipment/head/magicgmtophat.png b/graphics/sprites/equipment/head/magicgmtophat.png
new file mode 100644
index 00000000..1ef8d71f
--- /dev/null
+++ b/graphics/sprites/equipment/head/magicgmtophat.png
Binary files differ
diff --git a/graphics/sprites/equipment/head/magicgmtophat.xml b/graphics/sprites/equipment/head/magicgmtophat.xml
new file mode 100644
index 00000000..f36438a3
--- /dev/null
+++ b/graphics/sprites/equipment/head/magicgmtophat.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0"?>
+<sprite>
+ <imageset name="base" src="graphics/sprites/equipment/head/magicgmtophat.png" width="21" height="34"/>
+ <action name="stand" imageset="base">
+ <animation direction="down">
+ <frame index="0" offsetX="-1" offsetY="-50"/>
+ </animation>
+ <animation direction="left">
+ <frame index="1" offsetX="0" offsetY="-50"/>
+ </animation>
+ <animation direction="up">
+ <frame index="2" offsetX="-2" offsetY="-50"/>
+ </animation>
+ <animation direction="right">
+ <frame index="3" offsetX="-1" offsetY="-50"/>
+ </animation>
+ </action>
+ <action name="walk" imageset="base">
+ <animation direction="down">
+ <frame index="0" offsetX="-1" offsetY="-49" delay="75"/>
+ <frame index="0" offsetX="-1" offsetY="-50" delay="150"/>
+ <frame index="0" offsetX="-1" offsetY="-49" delay="75"/>
+ <frame index="0" offsetX="-1" offsetY="-50" delay="150"/>
+ </animation>
+ <animation direction="left">
+ <frame index="1" offsetX="0" offsetY="-50" delay="75"/>
+ <frame index="1" offsetX="0" offsetY="-49" delay="75"/>
+ <frame index="1" offsetX="0" offsetY="-50" delay="150"/>
+ <frame index="1" offsetX="0" offsetY="-49" delay="75"/>
+ <frame index="1" offsetX="0" offsetY="-50" delay="75"/>
+ </animation>
+ <animation direction="up">
+ <frame index="2" offsetX="-2" offsetY="-50" delay="75"/>
+ <frame index="2" offsetX="-2" offsetY="-51" delay="150"/>
+ <frame index="2" offsetX="-2" offsetY="-50" delay="75"/>
+ <frame index="2" offsetX="-2" offsetY="-51" delay="150"/>
+ </animation>
+ <animation direction="right">
+ <frame index="3" offsetX="-1" offsetY="-50" delay="75"/>
+ <frame index="3" offsetX="-1" offsetY="-49" delay="75"/>
+ <frame index="3" offsetX="-1" offsetY="-50" delay="150"/>
+ <frame index="3" offsetX="-1" offsetY="-49" delay="75"/>
+ <frame index="3" offsetX="-1" offsetY="-50" delay="75"/>
+ </animation>
+ </action>
+ <action name="attack" imageset="base">
+ <animation direction="down">
+ <frame index="0" offsetX="-1" offsetY="-48" delay="75"/>
+ <frame index="0" offsetX="-1" offsetY="-49" delay="75"/>
+ <frame index="0" offsetX="-1" offsetY="-46" delay="75"/>
+ <frame index="0" offsetX="-1" offsetY="-45" delay="75"/>
+ <end/>
+ </animation>
+ <animation direction="left">
+ <frame index="1" offsetX="4" offsetY="-51" delay="75"/>
+ <frame index="1" offsetX="4" offsetY="-52" delay="75"/>
+ <frame index="1" offsetX="0" offsetY="-49" delay="75"/>
+ <frame index="1" offsetX="-1" offsetY="-48" delay="75"/>
+ <end/>
+ </animation>
+ <animation direction="up">
+ <frame index="2" offsetX="-3" offsetY="-50" delay="225"/>
+ <frame index="2" offsetX="-3" offsetY="-48" delay="75"/>
+ <end/>
+ </animation>
+ <animation direction="right">
+ <frame index="3" offsetX="-4" offsetY="-51" delay="75"/>
+ <frame index="3" offsetX="-4" offsetY="-52" delay="75"/>
+ <frame index="3" offsetX="-1" offsetY="-49" delay="75"/>
+ <frame index="3" offsetX="0" offsetY="-48" delay="75"/>
+ <end/>
+ </animation>
+ </action>
+ <action name="attack_bow" imageset="base">
+ <animation direction="down">
+ <frame index="0" offsetX="-1" offsetY="-49" delay="225"/>
+ <frame index="0" offsetX="-1" offsetY="-48" delay="75"/>
+ <frame index="0" offsetX="-1" offsetY="-49" delay="75"/>
+ <end/>
+ </animation>
+ <animation direction="left">
+ <frame index="1" offsetX="3" offsetY="-50" delay="225"/>
+ <frame index="1" offsetX="5" offsetY="-51" delay="150"/>
+ <end/>
+ </animation>
+ <animation direction="up">
+ <frame index="2" offsetX="-2" offsetY="-50" delay="225"/>
+ <frame index="2" offsetX="-3" offsetY="-49" delay="75"/>
+ <frame index="2" offsetX="-3" offsetY="-50" delay="75"/>
+ <end/>
+ </animation>
+ <animation direction="right">
+ <frame index="3" offsetX="-4" offsetY="-50" delay="225"/>
+ <frame index="3" offsetX="-6" offsetY="-51" delay="150"/>
+ <end/>
+ </animation>
+ </action>
+ <action name="sit" imageset="base">
+ <animation direction="down">
+ <frame index="0" offsetX="-1" offsetY="-38"/>
+ </animation>
+ <animation direction="left">
+ <frame index="1" offsetX="4" offsetY="-41"/>
+ </animation>
+ <animation direction="up">
+ <frame index="2" offsetX="-1" offsetY="-42"/>
+ </animation>
+ <animation direction="right">
+ <frame index="3" offsetX="-7" offsetY="-41"/>
+ </animation>
+ </action>
+ <action name="dead" imageset="base">
+ <animation direction="default">
+ <frame index="4" offsetX="40" offsetY="-6"/>
+ </animation>
+ </action>
+</sprite>
diff --git a/graphics/sprites/equipment/head/rednose.xml b/graphics/sprites/equipment/head/rednose.xml
index d02e69f4..29ea7eb6 100644
--- a/graphics/sprites/equipment/head/rednose.xml
+++ b/graphics/sprites/equipment/head/rednose.xml
@@ -1,125 +1,118 @@
<?xml version="1.0"?>
<sprite>
- <imageset name="equipment" src="graphics/sprites/equipment/head/rednose.png" width="18" height="15"/>
-
- <action name="stand" imageset="equipment">
- <animation direction="down">
- <frame index="0" offsetY="-36"/>
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="-2" offsetY="-39"/>
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-1" offsetY="-41"/>
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="2" offsetY="-39"/>
- </animation>
- </action>
-
- <action name="walk" imageset="equipment">
- <animation direction="down">
- <frame index="0" offsetY="-35" delay="75"/>
- <frame index="0" offsetY="-36" delay="150"/>
- <frame index="0" offsetY="-35" delay="75"/>
- <frame index="0" offsetY="-36" delay="150"/>
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="-2" offsetY="-39" delay="75"/>
- <frame index="1" offsetX="-2" offsetY="-38" delay="75"/>
- <frame index="1" offsetX="-2" offsetY="-39" delay="150"/>
- <frame index="1" offsetX="-2" offsetY="-38" delay="75"/>
- <frame index="1" offsetX="-2" offsetY="-39" delay="75"/>
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-1" offsetY="-41" delay="75"/>
- <frame index="2" offsetX="-1" offsetY="-42" delay="150"/>
- <frame index="2" offsetX="-1" offsetY="-41" delay="75"/>
- <frame index="2" offsetX="-1" offsetY="-42" delay="150"/>
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="2" offsetY="-39" delay="75"/>
- <frame index="3" offsetX="2" offsetY="-38" delay="75"/>
- <frame index="3" offsetX="2" offsetY="-39" delay="150"/>
- <frame index="3" offsetX="2" offsetY="-38" delay="75"/>
- <frame index="3" offsetX="2" offsetY="-39" delay="75"/>
- </animation>
- </action>
-
- <action name="attack" imageset="equipment">
- <animation direction="down">
- <frame index="0" offsetY="-34" delay="75"/>
- <frame index="0" offsetY="-35" delay="75"/>
- <frame index="0" offsetY="-32" delay="75"/>
- <frame index="0" offsetY="-31" delay="75"/>
- <end />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="2" offsetY="-40" delay="75"/>
- <frame index="1" offsetX="2" offsetY="-41" delay="75"/>
- <frame index="1" offsetX="-1" offsetY="-38" delay="75"/>
- <frame index="1" offsetX="-3" offsetY="-37" delay="75"/>
- <end />
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-2" offsetY="-41" delay="225"/>
- <frame index="2" offsetX="-2" offsetY="-39" delay="75"/>
- <end />
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="-1" offsetY="-40" delay="75"/>
- <frame index="3" offsetX="-1" offsetY="-41" delay="75"/>
- <frame index="3" offsetX="2" offsetY="-38" delay="75"/>
- <frame index="3" offsetX="3" offsetY="-37" delay="75"/>
- <end />
- </animation>
- </action>
-
- <action name="attack_bow" imageset="equipment">
- <animation direction="down">
- <frame index="0" offsetY="-35" delay="225"/>
- <frame index="0" offsetY="-34" delay="75"/>
- <frame index="0" offsetY="-35" delay="75"/>
- <end />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="1" offsetY="-38" delay="225"/>
- <frame index="1" offsetX="3" offsetY="-40" delay="150"/>
- <end />
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-1" offsetY="-41" delay="150"/>
- <frame index="2" offsetX="-2" offsetY="-41" delay="75"/>
- <frame index="2" offsetX="-2" offsetY="-40" delay="75"/>
- <frame index="2" offsetX="-2" offsetY="-41" delay="75"/>
- <end />
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="-1" offsetY="-38" delay="225"/>
- <frame index="3" offsetX="-3" offsetY="-40" delay="150"/>
- <end />
- </animation>
- </action>
-
- <action name="sit" imageset="equipment">
- <animation direction="down">
- <frame index="0" offsetY="-24"/>
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="2" offsetY="-30"/>
- </animation>
- <animation direction="up">
- <frame index="2" offsetY="-33"/>
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="-4" offsetY="-30"/>
- </animation>
- </action>
-
- <action name="dead" imageset="equipment">
- <animation direction="default">
- <frame index="4" offsetX="16" offsetY="-18"/>
- </animation>
- </action>
-
+ <imageset name="equipment" src="graphics/sprites/equipment/head/rednose.png" width="18" height="15"/>
+ <action name="stand" imageset="equipment">
+ <animation direction="down">
+ <frame index="0" offsetY="-36"/>
+ </animation>
+ <animation direction="left">
+ <frame index="1" offsetX="-2" offsetY="-39"/>
+ </animation>
+ <animation direction="up">
+ <frame index="2" offsetX="-1" offsetY="-41"/>
+ </animation>
+ <animation direction="right">
+ <frame index="3" offsetX="2" offsetY="-39"/>
+ </animation>
+ </action>
+ <action name="walk" imageset="equipment">
+ <animation direction="down">
+ <frame index="0" offsetY="-35" delay="75"/>
+ <frame index="0" offsetY="-36" delay="150"/>
+ <frame index="0" offsetY="-35" delay="75"/>
+ <frame index="0" offsetY="-36" delay="150"/>
+ </animation>
+ <animation direction="left">
+ <frame index="1" offsetX="-2" offsetY="-39" delay="75"/>
+ <frame index="1" offsetX="-2" offsetY="-38" delay="75"/>
+ <frame index="1" offsetX="-2" offsetY="-39" delay="150"/>
+ <frame index="1" offsetX="-2" offsetY="-38" delay="75"/>
+ <frame index="1" offsetX="-2" offsetY="-39" delay="75"/>
+ </animation>
+ <animation direction="up">
+ <frame index="2" offsetX="-1" offsetY="-41" delay="75"/>
+ <frame index="2" offsetX="-1" offsetY="-42" delay="150"/>
+ <frame index="2" offsetX="-1" offsetY="-41" delay="75"/>
+ <frame index="2" offsetX="-1" offsetY="-42" delay="150"/>
+ </animation>
+ <animation direction="right">
+ <frame index="3" offsetX="2" offsetY="-39" delay="75"/>
+ <frame index="3" offsetX="2" offsetY="-38" delay="75"/>
+ <frame index="3" offsetX="2" offsetY="-39" delay="150"/>
+ <frame index="3" offsetX="2" offsetY="-38" delay="75"/>
+ <frame index="3" offsetX="2" offsetY="-39" delay="75"/>
+ </animation>
+ </action>
+ <action name="attack" imageset="equipment">
+ <animation direction="down">
+ <frame index="0" offsetY="-34" delay="75"/>
+ <frame index="0" offsetY="-35" delay="75"/>
+ <frame index="0" offsetY="-32" delay="75"/>
+ <frame index="0" offsetY="-31" delay="75"/>
+ <end/>
+ </animation>
+ <animation direction="left">
+ <frame index="1" offsetX="2" offsetY="-40" delay="75"/>
+ <frame index="1" offsetX="2" offsetY="-41" delay="75"/>
+ <frame index="1" offsetX="-1" offsetY="-38" delay="75"/>
+ <frame index="1" offsetX="-3" offsetY="-37" delay="75"/>
+ <end/>
+ </animation>
+ <animation direction="up">
+ <frame index="2" offsetX="-2" offsetY="-41" delay="225"/>
+ <frame index="2" offsetX="-2" offsetY="-39" delay="75"/>
+ <end/>
+ </animation>
+ <animation direction="right">
+ <frame index="3" offsetX="-1" offsetY="-40" delay="75"/>
+ <frame index="3" offsetX="-1" offsetY="-41" delay="75"/>
+ <frame index="3" offsetX="2" offsetY="-38" delay="75"/>
+ <frame index="3" offsetX="3" offsetY="-37" delay="75"/>
+ <end/>
+ </animation>
+ </action>
+ <action name="attack_bow" imageset="equipment">
+ <animation direction="down">
+ <frame index="0" offsetY="-35" delay="225"/>
+ <frame index="0" offsetY="-34" delay="75"/>
+ <frame index="0" offsetY="-35" delay="75"/>
+ <end/>
+ </animation>
+ <animation direction="left">
+ <frame index="1" offsetX="1" offsetY="-38" delay="225"/>
+ <frame index="1" offsetX="3" offsetY="-40" delay="150"/>
+ <end/>
+ </animation>
+ <animation direction="up">
+ <frame index="2" offsetX="-1" offsetY="-41" delay="150"/>
+ <frame index="2" offsetX="-2" offsetY="-41" delay="75"/>
+ <frame index="2" offsetX="-2" offsetY="-40" delay="75"/>
+ <frame index="2" offsetX="-2" offsetY="-41" delay="75"/>
+ <end/>
+ </animation>
+ <animation direction="right">
+ <frame index="3" offsetX="-1" offsetY="-38" delay="225"/>
+ <frame index="3" offsetX="-3" offsetY="-40" delay="150"/>
+ <end/>
+ </animation>
+ </action>
+ <action name="sit" imageset="equipment">
+ <animation direction="down">
+ <frame index="0" offsetY="-24"/>
+ </animation>
+ <animation direction="left">
+ <frame index="1" offsetX="2" offsetY="-30"/>
+ </animation>
+ <animation direction="up">
+ <frame index="2" offsetY="-33"/>
+ </animation>
+ <animation direction="right">
+ <frame index="3" offsetX="-4" offsetY="-30"/>
+ </animation>
+ </action>
+ <action name="dead" imageset="equipment">
+ <animation direction="default">
+ <frame index="4" offsetX="16" offsetY="-18"/>
+ </animation>
+ </action>
</sprite>
diff --git a/graphics/sprites/equipment/head/thin-crown.png b/graphics/sprites/equipment/head/thin-crown.png
new file mode 100644
index 00000000..4d88808e
--- /dev/null
+++ b/graphics/sprites/equipment/head/thin-crown.png
Binary files differ
diff --git a/graphics/sprites/equipment/head/thin-crown.xml b/graphics/sprites/equipment/head/thin-crown.xml
new file mode 100644
index 00000000..fc47dd5a
--- /dev/null
+++ b/graphics/sprites/equipment/head/thin-crown.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0"?>
+<sprite>
+ <imageset name="base" src="graphics/sprites/equipment/head/thin-crown.png|W;R;G" width="21" height="15"/>
+ <action name="stand" imageset="base">
+ <animation direction="down">
+ <frame index="0" offsetX="-1" offsetY="-49"/>
+ </animation>
+ <animation direction="left">
+ <frame index="1" offsetX="0" offsetY="-49"/>
+ </animation>
+ <animation direction="up">
+ <frame index="2" offsetX="-2" offsetY="-49"/>
+ </animation>
+ <animation direction="right">
+ <frame index="3" offsetX="-1" offsetY="-49"/>
+ </animation>
+ </action>
+ <action name="walk" imageset="base">
+ <animation direction="down">
+ <frame index="0" offsetX="-1" offsetY="-48" delay="75"/>
+ <frame index="0" offsetX="-1" offsetY="-49" delay="150"/>
+ <frame index="0" offsetX="-1" offsetY="-48" delay="75"/>
+ <frame index="0" offsetX="-1" offsetY="-49" delay="150"/>
+ </animation>
+ <animation direction="left">
+ <frame index="1" offsetX="0" offsetY="-49" delay="75"/>
+ <frame index="1" offsetX="0" offsetY="-48" delay="75"/>
+ <frame index="1" offsetX="0" offsetY="-49" delay="150"/>
+ <frame index="1" offsetX="0" offsetY="-48" delay="75"/>
+ <frame index="1" offsetX="0" offsetY="-49" delay="75"/>
+ </animation>
+ <animation direction="up">
+ <frame index="2" offsetX="-2" offsetY="-49" delay="75"/>
+ <frame index="2" offsetX="-2" offsetY="-50" delay="150"/>
+ <frame index="2" offsetX="-2" offsetY="-49" delay="75"/>
+ <frame index="2" offsetX="-2" offsetY="-50" delay="150"/>
+ </animation>
+ <animation direction="right">
+ <frame index="3" offsetX="-1" offsetY="-49" delay="75"/>
+ <frame index="3" offsetX="-1" offsetY="-48" delay="75"/>
+ <frame index="3" offsetX="-1" offsetY="-49" delay="150"/>
+ <frame index="3" offsetX="-1" offsetY="-48" delay="75"/>
+ <frame index="3" offsetX="-1" offsetY="-49" delay="75"/>
+ </animation>
+ </action>
+ <action name="attack" imageset="base">
+ <animation direction="down">
+ <frame index="0" offsetX="-1" offsetY="-47" delay="75"/>
+ <frame index="0" offsetX="-1" offsetY="-48" delay="75"/>
+ <frame index="0" offsetX="-1" offsetY="-45" delay="75"/>
+ <frame index="0" offsetX="-1" offsetY="-44" delay="75"/>
+ <end/>
+ </animation>
+ <animation direction="left">
+ <frame index="1" offsetX="4" offsetY="-50" delay="75"/>
+ <frame index="1" offsetX="4" offsetY="-51" delay="75"/>
+ <frame index="1" offsetX="0" offsetY="-48" delay="75"/>
+ <frame index="1" offsetX="-1" offsetY="-47" delay="75"/>
+ <end/>
+ </animation>
+ <animation direction="up">
+ <frame index="2" offsetX="-3" offsetY="-49" delay="225"/>
+ <frame index="2" offsetX="-3" offsetY="-47" delay="75"/>
+ <end/>
+ </animation>
+ <animation direction="right">
+ <frame index="3" offsetX="-4" offsetY="-50" delay="75"/>
+ <frame index="3" offsetX="-4" offsetY="-51" delay="75"/>
+ <frame index="3" offsetX="-1" offsetY="-48" delay="75"/>
+ <frame index="3" offsetX="0" offsetY="-47" delay="75"/>
+ <end/>
+ </animation>
+ </action>
+ <action name="attack_bow" imageset="base">
+ <animation direction="down">
+ <frame index="0" offsetX="-1" offsetY="-48" delay="225"/>
+ <frame index="0" offsetX="-1" offsetY="-47" delay="75"/>
+ <frame index="0" offsetX="-1" offsetY="-48" delay="75"/>
+ <end/>
+ </animation>
+ <animation direction="left">
+ <frame index="1" offsetX="3" offsetY="-49" delay="225"/>
+ <frame index="1" offsetX="5" offsetY="-50" delay="150"/>
+ <end/>
+ </animation>
+ <animation direction="up">
+ <frame index="2" offsetX="-2" offsetY="-49" delay="225"/>
+ <frame index="2" offsetX="-3" offsetY="-48" delay="75"/>
+ <frame index="2" offsetX="-3" offsetY="-49" delay="75"/>
+ <end/>
+ </animation>
+ <animation direction="right">
+ <frame index="3" offsetX="-4" offsetY="-49" delay="225"/>
+ <frame index="3" offsetX="-6" offsetY="-50" delay="150"/>
+ <end/>
+ </animation>
+ </action>
+ <action name="sit" imageset="base">
+ <animation direction="down">
+ <frame index="0" offsetX="-1" offsetY="-37"/>
+ </animation>
+ <animation direction="left">
+ <frame index="1" offsetX="4" offsetY="-40"/>
+ </animation>
+ <animation direction="up">
+ <frame index="2" offsetX="-1" offsetY="-41"/>
+ </animation>
+ <animation direction="right">
+ <frame index="3" offsetX="-7" offsetY="-40"/>
+ </animation>
+ </action>
+ <action name="dead" imageset="base">
+ <animation direction="default">
+ <frame index="0" offsetX="40" offsetY="-10"/>
+ </animation>
+ </action>
+</sprite>
diff --git a/graphics/sprites/monsters/accessories/slime-santa.xml b/graphics/sprites/monsters/accessories/slime-santa.xml
index d6237409..30803a80 100644
--- a/graphics/sprites/monsters/accessories/slime-santa.xml
+++ b/graphics/sprites/monsters/accessories/slime-santa.xml
@@ -18,15 +18,19 @@
<action name="attack" imageset="base">
<animation direction="down">
<frame index="2" offsetX="3" offsetY="-15"/>
+ <end/>
</animation>
<animation direction="left">
<frame index="2" offsetX="3" offsetY="-15"/>
+ <end/>
</animation>
<animation direction="up">
<frame index="6" offsetX="-3" offsetY="-15"/>
+ <end/>
</animation>
<animation direction="right">
<frame index="6" offsetX="-3" offsetY="-15"/>
+ <end/>
</animation>
</action>
<action name="dead" imageset="base">
diff --git a/graphics/sprites/monsters/accessories/slime-seajelly.xml b/graphics/sprites/monsters/accessories/slime-seajelly.xml
index 3905f8c2..87c4d928 100644
--- a/graphics/sprites/monsters/accessories/slime-seajelly.xml
+++ b/graphics/sprites/monsters/accessories/slime-seajelly.xml
@@ -23,6 +23,7 @@
<action name="attack" imageset="base">
<animation>
<sequence start="0" end="1" delay="75" offsetY="-5"/>
+ <end/>
</animation>
</action>
<action name="dead" imageset="base">
diff --git a/graphics/sprites/monsters/ball-lightning.xml b/graphics/sprites/monsters/ball-lightning.xml
index 19ee1caf..6bc6f98c 100644
--- a/graphics/sprites/monsters/ball-lightning.xml
+++ b/graphics/sprites/monsters/ball-lightning.xml
@@ -20,6 +20,7 @@
<action name="attack" imageset="base">
<animation direction="default">
<sequence start="0" end="2" delay="100"/>
+ <end/>
</animation>
</action>
</sprite>
diff --git a/graphics/sprites/monsters/bee.xml b/graphics/sprites/monsters/bee.xml
index 371900ae..c718bbd0 100644
--- a/graphics/sprites/monsters/bee.xml
+++ b/graphics/sprites/monsters/bee.xml
@@ -58,6 +58,7 @@
<frame index="10" delay="75" offsetY="-4"/>
<frame index="9" delay="75" offsetY="-8"/>
<frame index="8" delay="75" offsetY="-12"/>
+ <end/>
</animation>
<animation direction="left">
<frame index="0" delay="75" offsetY="-16" offsetX="0"/>
@@ -67,6 +68,7 @@
<frame index="2" delay="75" offsetY="-16" offsetX="-8"/>
<frame index="1" delay="75" offsetY="-16" offsetX="-4"/>
<frame index="0" delay="75" offsetY="-16" offsetX="0"/>
+ <end/>
</animation>
<animation direction="up">
<frame index="12" delay="75" offsetY="-14"/>
@@ -76,6 +78,7 @@
<frame index="14" delay="75" offsetY="-18"/>
<frame index="13" delay="75" offsetY="-16"/>
<frame index="12" delay="75" offsetY="-14"/>
+ <end/>
</animation>
<animation direction="right">
<frame index="4" delay="75" offsetY="-16" offsetX="0"/>
@@ -85,6 +88,7 @@
<frame index="6" delay="75" offsetY="-16" offsetX="8"/>
<frame index="5" delay="75" offsetY="-16" offsetX="4"/>
<frame index="4" delay="75" offsetY="-16" offsetX="0"/>
+ <end/>
</animation>
</action>
</sprite>
diff --git a/graphics/sprites/monsters/butterfly.xml b/graphics/sprites/monsters/butterfly.xml
index 40ea9267..0fd14173 100644
--- a/graphics/sprites/monsters/butterfly.xml
+++ b/graphics/sprites/monsters/butterfly.xml
@@ -38,6 +38,7 @@
<frame index="2" delay="60" offsetY="-36"/>
<frame index="1" delay="60" offsetY="-28"/>
<frame index="0" delay="60" offsetY="-24"/>
+ <end/>
</animation>
<animation direction="down">
<frame index="0" delay="50" offsetY="-16"/>
@@ -47,6 +48,7 @@
<frame index="2" delay="60" offsetY="-4"/>
<frame index="1" delay="60" offsetY="-12"/>
<frame index="0" delay="60" offsetY="-16"/>
+ <end/>
</animation>
<animation direction="right">
<frame index="4" delay="50" offsetY="-20" offsetX="4"/>
@@ -56,6 +58,7 @@
<frame index="6" delay="60" offsetY="-20" offsetX="16"/>
<frame index="5" delay="60" offsetY="-20" offsetX="8"/>
<frame index="4" delay="60" offsetY="-20" offsetX="4"/>
+ <end/>
</animation>
<animation direction="left">
<frame index="8" delay="50" offsetY="-20" offsetX="-4"/>
@@ -65,6 +68,7 @@
<frame index="10" delay="60" offsetY="-20" offsetX="-16"/>
<frame index="9" delay="60" offsetY="-20" offsetX="-8"/>
<frame index="8" delay="60" offsetY="-20" offsetX="-4"/>
+ <end/>
</animation>
</action>
<action name="dead" imageset="base">
diff --git a/graphics/sprites/monsters/cave-maggot.xml b/graphics/sprites/monsters/cave-maggot.xml
index f26797eb..f51be495 100644
--- a/graphics/sprites/monsters/cave-maggot.xml
+++ b/graphics/sprites/monsters/cave-maggot.xml
@@ -46,15 +46,19 @@
<action name="attack" imageset="base">
<animation direction="down">
<sequence start="5" end="8" delay="150" offsetY="-8"/>
+ <end/>
</animation>
<animation direction="left">
<sequence start="15" end="18" delay="150" offsetY="-11"/>
+ <end/>
</animation>
<animation direction="up">
<sequence start="25" end="28" delay="150" offsetY="-10"/>
+ <end/>
</animation>
<animation direction="right">
<sequence start="35" end="38" delay="150" offsetY="-11"/>
+ <end/>
</animation>
</action>
</sprite>
diff --git a/graphics/sprites/monsters/element-ball.xml b/graphics/sprites/monsters/element-ball.xml
index ed29fda8..f8884488 100644
--- a/graphics/sprites/monsters/element-ball.xml
+++ b/graphics/sprites/monsters/element-ball.xml
@@ -53,8 +53,22 @@
</animation>
</action>
<action name="attack" imageset="base">
- <animation direction="right"><frame index="20" delay="80"/><frame index="21" delay="80"/><frame index="22" delay="80"/><frame index="23" delay="80"/><frame index="24" delay="80"/> 3
-<frame index="25" delay="80"/><frame index="26" delay="220"/><frame index="25" delay="180"/><frame index="24" delay="140"/><frame index="23" delay="100"/><frame index="22" delay="80"/><frame index="21" delay="60"/><frame index="20" delay="60"/></animation>
+ <animation direction="right">
+ <frame index="20" delay="80"/>
+ <frame index="21" delay="80"/>
+ <frame index="22" delay="80"/>
+ <frame index="23" delay="80"/>
+ <frame index="24" delay="80"/>
+ <frame index="25" delay="80"/>
+ <frame index="26" delay="220"/>
+ <frame index="25" delay="180"/>
+ <frame index="24" delay="140"/>
+ <frame index="23" delay="100"/>
+ <frame index="22" delay="80"/>
+ <frame index="21" delay="60"/>
+ <frame index="20" delay="60"/>
+ <end/>
+ </animation>
<animation direction="left">
<frame index="36" delay="80"/>
<frame index="35" delay="80"/>
@@ -69,6 +83,7 @@
<frame index="34" delay="80"/>
<frame index="35" delay="60"/>
<frame index="36" delay="60"/>
+ <end/>
</animation>
</action>
</sprite>
diff --git a/graphics/sprites/monsters/flower.xml b/graphics/sprites/monsters/flower.xml
index a8f5a0bd..5a385cb2 100644
--- a/graphics/sprites/monsters/flower.xml
+++ b/graphics/sprites/monsters/flower.xml
@@ -32,15 +32,19 @@
<action name="attack" imageset="base">
<animation direction="down">
<sequence start="1" end="5" delay="75" offsetY="3"/>
+ <end/>
</animation>
<animation direction="left">
<sequence start="7" end="10" delay="75" offsetY="3"/>
+ <end/>
</animation>
<animation direction="up">
<sequence start="13" end="16" delay="75" offsetY="3"/>
+ <end/>
</animation>
<animation direction="right">
<sequence start="19" end="22" delay="75" offsetY="3"/>
+ <end/>
</animation>
</action>
</sprite>
diff --git a/graphics/sprites/monsters/ghost-pumpkin.xml b/graphics/sprites/monsters/ghost-pumpkin.xml
index 3cef62f7..85b76e93 100644
--- a/graphics/sprites/monsters/ghost-pumpkin.xml
+++ b/graphics/sprites/monsters/ghost-pumpkin.xml
@@ -18,15 +18,19 @@
<action name="attack" imageset="base">
<animation direction="down">
<sequence start="12" end="14" delay="200"/>
+ <end/>
</animation>
<animation direction="right">
<sequence start="15" end="17" delay="200"/>
+ <end/>
</animation>
<animation direction="left">
<sequence start="18" end="20" delay="200"/>
+ <end/>
</animation>
<animation direction="up">
<sequence start="21" end="23" delay="200"/>
+ <end/>
</animation>
</action>
<action name="dead" imageset="base">
diff --git a/graphics/sprites/monsters/larvespa.xml b/graphics/sprites/monsters/larvespa.xml
index 17f56d8a..a431f679 100644
--- a/graphics/sprites/monsters/larvespa.xml
+++ b/graphics/sprites/monsters/larvespa.xml
@@ -46,15 +46,19 @@
<action name="attack" imageset="base">
<animation direction="down">
<sequence start="32" end="34" delay="150"/>
+ <end/>
</animation>
<animation direction="left">
<sequence start="5" end="7" delay="150"/>
+ <end/>
</animation>
<animation direction="up">
<sequence start="14" end="16" delay="150"/>
+ <end/>
</animation>
<animation direction="right">
<sequence start="23" end="25" delay="150"/>
+ <end/>
</animation>
</action>
</sprite>
diff --git a/graphics/sprites/monsters/maggot.xml b/graphics/sprites/monsters/maggot.xml
index efe15ede..fa093e05 100644
--- a/graphics/sprites/monsters/maggot.xml
+++ b/graphics/sprites/monsters/maggot.xml
@@ -46,15 +46,19 @@
<action name="attack" imageset="base">
<animation direction="down">
<sequence start="5" end="8" delay="150" offsetY="-8"/>
+ <end/>
</animation>
<animation direction="left">
<sequence start="15" end="18" delay="150" offsetY="-11"/>
+ <end/>
</animation>
<animation direction="up">
<sequence start="25" end="28" delay="150" offsetY="-10"/>
+ <end/>
</animation>
<animation direction="right">
<sequence start="35" end="38" delay="150" offsetY="-11"/>
+ <end/>
</animation>
</action>
</sprite>
diff --git a/graphics/sprites/monsters/reaper.png b/graphics/sprites/monsters/reaper.png
index 2e5de375..2b6598d8 100644
--- a/graphics/sprites/monsters/reaper.png
+++ b/graphics/sprites/monsters/reaper.png
Binary files differ
diff --git a/graphics/sprites/monsters/reaper.xml b/graphics/sprites/monsters/reaper.xml
index 428b5492..88b26b8e 100644
--- a/graphics/sprites/monsters/reaper.xml
+++ b/graphics/sprites/monsters/reaper.xml
@@ -53,12 +53,6 @@
<frame index="21" delay="75" offsetY="-1"/>
</animation>
</action>
- <action name="dead" imageset="base">
- <animation direction="default">
- <sequence start="30" end="44" delay="150"/>
- <frame index="45"/>
- </animation>
- </action>
<action name="attack" imageset="base">
<animation direction="down">
<sequence start="0" end="5" delay="75"/>
@@ -95,4 +89,10 @@
<end/>
</animation>
</action>
+ <action name="dead" imageset="base">
+ <animation direction="default">
+ <sequence start="30" end="44" delay="150"/>
+ <frame index="45"/>
+ </animation>
+ </action>
</sprite>
diff --git a/graphics/sprites/monsters/skull-ice.xml b/graphics/sprites/monsters/skull-ice.xml
index e3baea08..6b34efd6 100644
--- a/graphics/sprites/monsters/skull-ice.xml
+++ b/graphics/sprites/monsters/skull-ice.xml
@@ -54,15 +54,19 @@
<action name="attack" imageset="base">
<animation direction="down">
<sequence start="5" end="7" delay="100"/>
+ <end/>
</animation>
<animation direction="left">
<sequence start="17" end="19" delay="100"/>
+ <end/>
</animation>
<animation direction="up">
<sequence start="29" end="31" delay="100"/>
+ <end/>
</animation>
<animation direction="right">
<sequence start="41" end="43" delay="100"/>
+ <end/>
</animation>
</action>
</sprite>
diff --git a/graphics/sprites/monsters/snail.xml b/graphics/sprites/monsters/snail.xml
index 730683ef..96f1c322 100644
--- a/graphics/sprites/monsters/snail.xml
+++ b/graphics/sprites/monsters/snail.xml
@@ -73,24 +73,28 @@
<frame index="6" delay="150" offsetY="-2"/>
<frame index="7" delay="150" offsetY="-3"/>
<frame index="8" delay="150" offsetY="-2"/>
+ <end/>
</animation>
<animation direction="left">
<frame index="35" delay="150" offsetX="-1"/>
<frame index="36" delay="150" offsetX="-2"/>
<frame index="37" delay="150" offsetX="-3"/>
<frame index="38" delay="150" offsetX="-2"/>
+ <end/>
</animation>
<animation direction="up">
<frame index="25" delay="150" offsetY="1"/>
<frame index="26" delay="150" offsetY="2"/>
<frame index="27" delay="150" offsetY="3"/>
<frame index="28" delay="150" offsetY="2"/>
+ <end/>
</animation>
<animation direction="right">
<frame index="15" delay="150" offsetX="1"/>
<frame index="16" delay="150" offsetX="2"/>
<frame index="17" delay="150" offsetX="3"/>
<frame index="18" delay="150" offsetX="2"/>
+ <end/>
</animation>
</action>
</sprite>
diff --git a/graphics/sprites/monsters/squirrel.xml b/graphics/sprites/monsters/squirrel.xml
index a5403465..d8d5e05b 100644
--- a/graphics/sprites/monsters/squirrel.xml
+++ b/graphics/sprites/monsters/squirrel.xml
@@ -47,18 +47,22 @@
<animation direction="down">
<frame index="16" delay="250"/>
<frame index="52" delay="250"/>
+ <end/>
</animation>
<animation direction="right">
<frame index="0" delay="250"/>
<frame index="36" delay="250"/>
+ <end/>
</animation>
<animation direction="up">
<frame index="24" delay="250"/>
<frame index="60" delay="250"/>
+ <end/>
</animation>
<animation direction="left">
<frame index="8" delay="250"/>
<frame index="44" delay="250"/>
+ <end/>
</animation>
</action>
</sprite>
diff --git a/graphics/sprites/monsters/vespa.xml b/graphics/sprites/monsters/vespa.xml
index a47e9a7c..d90138a0 100644
--- a/graphics/sprites/monsters/vespa.xml
+++ b/graphics/sprites/monsters/vespa.xml
@@ -46,15 +46,19 @@
<action name="attack" imageset="base">
<animation direction="down">
<sequence start="21" end="24" delay="65"/>
+ <end/>
</animation>
<animation direction="left">
<sequence start="34" end="37" delay="65"/>
+ <end/>
</animation>
<animation direction="up">
<sequence start="47" end="50" delay="65"/>
+ <end/>
</animation>
<animation direction="right">
<sequence start="8" end="11" delay="65"/>
+ <end/>
</animation>
</action>
</sprite>
diff --git a/graphics/sprites/monsters/wisp.xml b/graphics/sprites/monsters/wisp.xml
index db006334..39753943 100644
--- a/graphics/sprites/monsters/wisp.xml
+++ b/graphics/sprites/monsters/wisp.xml
@@ -30,6 +30,7 @@
<frame index="2" delay="50" offsetY="16"/>
<frame index="1" delay="50" offsetY="8"/>
<frame index="0" delay="0" offsetY="4"/>
+ <end/>
</animation>
<animation direction="right">
<frame index="0" delay="50" offsetX="4"/>
@@ -41,6 +42,7 @@
<frame index="2" delay="50" offsetX="16"/>
<frame index="1" delay="50" offsetX="8"/>
<frame index="0" delay="0" offsetX="4"/>
+ <end/>
</animation>
<animation direction="up">
<frame index="0" delay="50" offsetY="0"/>
@@ -52,6 +54,7 @@
<frame index="2" delay="50" offsetY="-8"/>
<frame index="1" delay="50" offsetY="-4"/>
<frame index="0" delay="0" offsetY="0"/>
+ <end/>
</animation>
<animation direction="left">
<frame index="0" delay="50" offsetX="0"/>
@@ -63,6 +66,7 @@
<frame index="2" delay="50" offsetX="-8"/>
<frame index="1" delay="50" offsetX="-4"/>
<frame index="0" delay="0" offsetX="0"/>
+ <end/>
</animation>
</action>
</sprite>
diff --git a/graphics/sprites/monsters/wolvern.xml b/graphics/sprites/monsters/wolvern.xml
index a761c4e0..39ac12b5 100644
--- a/graphics/sprites/monsters/wolvern.xml
+++ b/graphics/sprites/monsters/wolvern.xml
@@ -86,15 +86,19 @@
<action name="attack" imageset="base">
<animation direction="down">
<sequence start="55" end="59" delay="70"/>
+ <end/>
</animation>
<animation direction="left">
<sequence start="49" end="53" delay="70"/>
+ <end/>
</animation>
<animation direction="up">
<sequence start="60" end="64" delay="70"/>
+ <end/>
</animation>
<animation direction="right">
<sequence start="44" end="48" delay="70"/>
+ <end/>
</animation>
</action>
</sprite>
diff --git a/graphics/sprites/monsters/yeti.xml b/graphics/sprites/monsters/yeti.xml
index 8c7cbcb3..9d1e995a 100644
--- a/graphics/sprites/monsters/yeti.xml
+++ b/graphics/sprites/monsters/yeti.xml
@@ -46,15 +46,19 @@
<action name="attack" imageset="base">
<animation direction="down">
<sequence start="5" end="8" delay="60"/>
+ <end/>
</animation>
<animation direction="left">
<sequence start="15" end="18" delay="60"/>
+ <end/>
</animation>
<animation direction="up">
<sequence start="35" end="38" delay="60"/>
+ <end/>
</animation>
<animation direction="right">
<sequence start="25" end="28" delay="60"/>
+ <end/>
</animation>
</action>
</sprite>
diff --git a/items.xml b/items.xml
index f0ae9c8e..f57dc263 100644
--- a/items.xml
+++ b/items.xml
@@ -3370,7 +3370,7 @@
image="equipment/head/bull.png"
name="Bull Helmet"
description="A black steel helmet worn by the most ferocious warriors."
- effect="M. Attack -52 / Double Damage +20% / Critical Damage +15 / Attack Speed +10% / VIT Defense -39% / Accuracy -15 / Requires Level 90, Strength 70+, Vitality 50+ and Luck 50+ / Melee only"
+ effect="M. Attack -52 / Double Damage +20% / Critical Damage +15 / Attack Speed +10% / VIT Defense -39% / Accuracy -15 / Melee only / Requires Level 90 / Strength 70+, Vitality 50+ and Luck 50+ required to activate the bonuses"
type="equip-head"
weight="1300"
str="10"
@@ -3389,7 +3389,7 @@
image="equipment/weapon/bow-bansheebow.png"
name="Banshee Bow"
description="A bow that has been enchanted by the dark powers of a witch."
- effect="Damage +90 / Range 6 / Attack Speed +20% / Critical Damage +70 / -150 HP / Defense -40% / VIT Defense -35% / Vanishes HP by 4% of damages dealt / Requires Level 90 and Dexterity 80+"
+ effect="Damage +90 / Range 6 / Attack Speed +20% / Critical Damage +70 / -150 HP / Defense -40% / VIT Defense -35% / Vanishes HP by 4% of damages dealt / Requires Level 90 / Dexterity 80+ required to activate the bonuses"
type="equip-2hand"
weapon-type="bow"
attack-action="attack_bow"
@@ -3408,7 +3408,7 @@
image="equipment/chest/sorcerer-robe.png|W:#2470BF,C9EAFF,D9D244;R:#cc7722"
name="Lazurite Robe"
description="A robe overflowing of magical aura."
- effect="M. Attack +60 / Move Speed -15% / VIT Defense -40% / M. Defense +60 / Requires Level 90, Intelligence 70+ and Vitality 40+"
+ effect="M. Attack +60 / Move Speed -15% / VIT Defense -40% / M. Defense +60 / Requires Level 90 / Intelligence 70+ and Vitality 40+ required to activate the bonuses"
type="equip-torso"
defense="7"
vit="-1"
@@ -3509,6 +3509,42 @@
<item from="-5"/>
</replace>
</item>
+ <item id="888"
+ image="equipment/head/magicgmtophat.png"
+ name="Magic GM Top Hat"
+ description="Probably not the best way to stay hidden."
+ effect="M. Attack +20 / HP +31000 / Flee -200 / HP Recovery Rate -400% / Critical Defense +250 / M. Defense +89"
+ type="equip-head"
+ defense="60"
+ weight="30">
+ <sprite>equipment/head/magicgmtophat.xml</sprite>
+ <replace sprite="hair">
+ <item from="-5"/>
+ </replace>
+ <replace direction="upall" sprite="hair">
+ <item from="-5" to="-5"/>
+ </replace>
+ </item>
+ <item id="889"
+ image="equipment/head/thin-crown.png|W:#343434,ababab;R:#003300,00FF00;G:#29758A,9BDBEC"
+ name="Murderer Crown"
+ description="Royal blood has been shed for the ownership of this crown."
+ type="equip-head"
+ defense="4"
+ weight="240">
+ <sprite>equipment/head/thin-crown.xml|#343434,ababab;#003300,00FF00;#29758A,9BDBEC</sprite>
+ </item>
+ <item id="890"
+ image="equipment/head/beaniecopter.png"
+ name="Beanie Copter"
+ description="A funny beanie cap with a spinning propeller."
+ effect="M. Attack +2"
+ type="equip-head"
+ defense="4"
+ weight="20">
+ <sprite>equipment/head/beaniecopter.xml</sprite>
+ </item>
+
<!-- HERE ARE SOME UNUSED ITEM IDS -->
<item id="1198"
diff --git a/maps/007-1.tmx b/maps/007-1.tmx
index 58bf5f7c..6bdf77df 100644
--- a/maps/007-1.tmx
+++ b/maps/007-1.tmx
@@ -35,7 +35,7 @@
</layer>
<layer name="Fringe" width="144" height="124">
<data encoding="base64" compression="gzip">
- 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
+ H4sIAAAAAAAAA+1dy44dNRC9E16KNAuSH8hEPIV4/BwE9kgBiSUSILZICInlZDcbJJZZsswn8BP0JWPF8dhVp8plu9ztI7Xuo31tt31criqXfU8nHI+i99fR+/cuTqf3L169frBdH0av4XsLfLrl80mD6/NM/b5oVFbr6zOirc99eGXTFf/jJnof+jvF49srTnNNpEfKvLx4edVwiysfyVtbPlV27Xih8s7d0/aDBZ4T90I7xPwJuM6kT+VOKb+bu7fI8mvTxvXRtDVSD+6Zw3hB8+TuX2byHIEXyt89u30tPSfVTxRnUUjHKJXOcn4tIfS1Vn6ENJeFaxT+zXz3VJiHtC9jzvboO0v05Nze0XouHjmv5+CtPiWgcumj7f7HDZ8nba+zXEr1HmT+KrV7/Jwe+6ZGR+n9PGldShxqMedJ8ovtrtRuD0DaTvIc6JyR+g9qdVQJ0Lx68YrjT4tykDYI8ifljqYvtGOBKit3L1fHVvoLWlbufq49JDpCnGcv3VpaTs5uz6HGP2IxRtPn0vIF/Z1FX3HjOP0+/jxq/kdswbiez062876l/7Bk23L9aqHnpOUgbYmWj9RplD1YI+cQPcNiXHBtlZP/1LxcM265skufubxQ/+Nof2EKaZ0ozqB6a9pWWo7l6s61t3SconNJTV5Impytyo0rjzbtGajsbFn/EeNRut6GjCdEb9A8q1fupPDCHWou0NalZEOlvMj5uiRcQ+daVHfy5JdCyq5dn6wF0obWtjvlt0C/y61pBUj0/h5+iRKQsYq0x2h5WdNuLeM84t9yuk36mbMDtOW1AMcjiutW80VvSHmD+O3iz5zuTY3Lkv8B9auhdV3II8dtrd2O2v8tuFZKh9ShB0q6S8524OY2D3KH659av5ukPaj0iL4f1sdROWaxpqQB0u/IvNUbKCcsfThnoM8trZeUm0ieT5I6vbHde7Nhn+XGCGU7oPaqJRCfgcTu5exKyo8j4Sbqi44/a/20vfqD0xPS+ljPV9o41FIMCcUb9FljULKWs0ElvM3ViRrLlM/ES4xkSbbUxB22sIOReYCSk1zdqbHD8RblBffMpe+s9DotEJ+g9LccHvFJWNTovQHa+kttY+R7C56P8PvE4OSMdq7x9jw19an1wVu0k6f9Fwhq5qsACw6h84xlnhy0z4VyILfGgazF98KD7XrYv1gYUt+2td1Rm1/av1SMG7VOQcXFjdaTLTFizUWiX4yoZwyEP3F9pTybGZw9O9rfWAtJf3E+KoRDJZk1cztK7M2WfuqaPDnforZ8dD8eOpcFzKQrB33o4e17CXqta3B9bqHvW9QH5SYlk0pcm33uKs1VnM9xpufuWdcSTwJmkkFScFzSwNIW18ir2jK1KOk6e+EPKnc4XdoKuXyl54d4h7cYGWuU9B4r+e9l3El8T5K18d76midI16A1nOJ8tZoyLGzxhTpw8XRSe6yUjrNvJXlKxjWnw/aUEaWyWseDWYJbw5bEJUhQw58W5eb8xDkg8xKi28ws/7hn4tqoxicUjy2UQ9K2purF2UFojKE0FvEooOJXavUc6l6tDJLGScTpe+rxR9GhS/4eKYcQv1kNf7T1qdG1984BqYyQ2jqS9uS4IuVPbd/lymjhR595ndmqrrVr7xKuWOnQHAdQ+SNpQ0layX6N0UDqI91fIHnGWllD5alF7e/ReGUU3jhzhlV8XdzWmn0tVvyxtvPTvLRr7R773gJW867EL4Lmg3AgLgf9LarD5NbEOWh5orXxR/NSuh8plyZt35LPp6VeaD33IXn3Wrf3EntLodZ3XBrTvZ61J2962H5ajOCWFXfSz9p1MApS3akGufmYmxN7wpt9ZlEmugeyNuYzRgvuUPWZYT7phZIeqbE9e8eOBbTkT4wj84RDCz9iz/XkWu68JfiNl3hATu+YyY+90A4z6e8LvoDagL32Ti3Mhxo/QmudTZI/yu2lZ9pDw5m3O/QBskdAE//iQY4ia2o97LaW8NDOMSxiFUox0VrU9PWeueMVFv3fI34e7e+R/PEmH6yRtt27t9cZOV8ysr5lvW7ciz8LcqBth66lt/Ktof1duu+BN0exKx6dXj8jFV2PGK071/BrQYcHp7vn/Fyd7p6xy3GjRdwGlUe673LNR2MQzouKOXTmzlUmrUavGRX/c1S02gOMInBHc8Z3KqOszpgL4LhxdO7MBmpOa73GvlDGDD4DhDN7OENhgYZmP2VO7vSYdxd/XsGTjJHEHqFpkfO3NG0wkj/oeuQ7jetlGftrVRdEDiFxv9JzV3P3pXudPeH+xV3fgnW/SmIlewLVh3P3/4reI2cqoWdRIecteEGPeAlvkKxdIToOlSa3noaknwn3J6tvLdJxnq5d5CDdm6OJUZvhTJMn906nr7frm3v5+y3qjP5HQi+E5wt+6KtT3vccoJUJHuJALPHtxpmn2/Xddn2/XT9EHIrrnOpClvDUNmEN4+qUlz/UOYfIOZGle5pzYzzgx40vP23Xz9v1y3b9WpBBAZ762hKhb5D/kUNsJcnc5ckOleK3jS+/33Lmj+31z3vt7fYYHsdUCbGdg3An/c/69L5XtKpfT17F6L0PuIScr0V6RtQsttXj0RWohEe5RPnrKN545cisqOXGyP6I+SOxrT2OByv0mpck/d7S3rNEzle9ZE97eG/Xr8DvS+ms9355wig9GEWuvUfKo5IdFYCuQ+wBXD/s8Zk1QOVPABcDZH2ukHeZJtm/a8m5OK+wxtGrrUrckKSndB/vfT4Se2ub0pzFzWUBmnhGDiPO1gq6jrXOoz0XckaeSeVSQAtdoKedR50BKt3LjWBGbpQg1X9ShLb426g+e2pbDY76/P9E758U3qNYfqWXOBqXOBl0w9yfLbbjSyCNJP7L07OVIBnLJbuq1M9BBpXkz3NFmXG5XLreaNnfHp4vB+15YhZrXi8M6ti7Xb3242hwsqWkg7T635TVT3Mg9/8miP06yl+oiWccBW+x7i2AyA1kH04uPZcOqROyn2jkvksEM+jBNaDkR8lvh+xvrrG7SzqXJ/my8Dpy/a2NQ61ZJ+TmSG/z1JFB6cQB0n0S2hggdD6sLWfBFpKzfDj5k+tTjbyYJd7+6OB0XU2/1coCSufi9K+F8agZ69J+zfkjKQ4vubQQUPI7xfcW9o1aHxm1FwiNw1k4HizO9l060DGByJORvuUFn+BiMSzX9hf2BWrNHl3b31Ns+YIOlIxB1vYX5oVGR5HuV1myZn+Q6ihnIFyTru2jZS/0Axp3iOooEq6ha/trDvMNybim+KSJdZWu7efqvTAOGrsHlQuoPlwba7QwFlQ/IzqK9Mz59B733YJ/cDIA2WeB6sPovIP8bs1hY2EpU7Tzj9bGXxgPSqYga+EaG0oyTy7MBdRvp4m7kPqV0blyYRzifkb+nwCNrdekX/7B+VCzTiCJu5eeeYDGsy6u+UQqC7i5R8u3Un6SOi6Mg3YPVY5XaSyr5twMar5bfPGJVNaUOIX2n0Q+IWmXn9Ev/gNhvxcHABcBAA==
</data>
</layer>
<layer name="Over" width="144" height="124">
diff --git a/maps/010-1.tmx b/maps/010-1.tmx
index 2b0495c1..03086d28 100644
--- a/maps/010-1.tmx
+++ b/maps/010-1.tmx
@@ -21,7 +21,7 @@
</layer>
<layer name="Fringe" width="150" height="120">
<data encoding="base64" compression="gzip">
- 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
+ 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
</data>
</layer>
<layer name="Over" width="150" height="120">
@@ -34,7 +34,7 @@
H4sIAAAAAAAAA+3UuQrCQBSG0fjSai9uWLrbiqL4kt5AhDCMkijiwjnwM+0tPqYoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAb9btFEUv1u98+hL+QdnTMDaKjWOT2FRfPOnW07JavauJvmgp7elRV/qiiUGmpyZdldvGZtoiY/5CV+V2uiJDV7zDo65WsXVsoytaSrsaVT0dYseqmVO85zt96YqcefI/1XtK5frSFTmLBj2l6n3pipx9i55SZV8XXQEAAAAAAAAAAAAAAAAAAAAAAPy0KwgBEv5AGQEA
</data>
</layer>
- <layer name="Collision" width="150" height="120" visible="0" opacity="0.62">
+ <layer name="Collision" width="150" height="120">
<data encoding="base64" compression="gzip">
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
</data>
diff --git a/maps/013-1.tmx b/maps/013-1.tmx
index 2f1e4d29..935cf52d 100644
--- a/maps/013-1.tmx
+++ b/maps/013-1.tmx
@@ -21,12 +21,12 @@
</layer>
<layer name="Fringe" width="154" height="124">
<data encoding="base64" compression="gzip">
- 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
+ H4sIAAAAAAAAA91dS7NdRRXuBCYqVYklOrIqnETUKl/MEQlzFZw5k8x9YAH+Ag1jRo4tMCIMg5R6JwiWkWSoE4ohJVhmqKHAcuBe5iyzzsp6fKu797kn+ap23Xv2o7t399fr1Y/d2i4ePNHa50+0OxbfW44nl+MCeH/lfc8t933OuHffdebl55XPO5+lbeUTvau8diPJd1adfTSexP9QqSMCyjOdrnzv6JqXhvw/ah8vbfR5DX0eKROfj94ZyTu7NhtXV0r3SPyP8O3x5Tjfcp7ptLz2QOWGVTarLbNrWboehzLeeP/rd4y4npXVOy+fu3z77SUgz98opknykHmG9hmWZV9bjh8b19F+2SsTvPszWRWVp0deIH0FeZbQ26esfFGeeRwe5amHa0DejKosQ3RHxhmNTA9F6aEyJ9O/WX7IvdnvqKzeOcKbt58qgXhWlVcI3ml432RZRofFM6vOUfnm9XGkzSu2DdL+WfpRf8jqoNdfsJ61yvEXLGkXa8mz6+L/qL2kLPN0ppdOJvOzft5jSyN6FJETFXst4zDyXp6tgNpuo0DlYdUHZZ5l5c7sMkaPH6l/I36fbg+Ei9Hz2fv3yOXM7kTSRu5F7EPUhhyRh38E7/PqHLXLqvrEetZLC9F3qLys6tJKbMXKr+KjjHJWo6oH31W/K3GOI+c8+v6ZLOu1XzNfsdJ30fguoncrss2TixWfMusHUV/L3snjGap36XlUR1oxMiTGQMhkWa8d1CtDvHfI8svKkfG0N46a9SvkPbN0I4z6n8jz7J9qeYbqFwIqyzIbWecV5Y34odZvVFd63ELbOeJeNa6G6HBdlqyfSYz6n5XniWdRe0VtgowxIWlV/aNITlbiolX/Qv+u/B/ZAZks88pzXH4nQ9trKCrxBMT+R9pBp5/JMdTWynR/xsdK/LNH11X6XMU/qOhXFDL90Tgtoi/l/5HORHwe1M+I7qvqtkhuZO1btQOtNLJ3jfJF2qTiux4n2FZD7JxMZ6LvX9WlWb1XkMVL9D2oDrW4i3IHlU095ToU0HgmYiNHOnPEno/yRvVY5qsidv6I/Vexw6P3iPJC7LjsWhUz03pH/fba+aF2u85E5Quq6yptjcaUKrZPJp+yvLx37pXn0XNIfKUXa4xp8jhTZgtonVn1jao2Te8z2XNojEXeK69nXNDPVe0njz9If0HkD1KGWXPOvLmMES9Ynl0wns3qWiKzT+Q9+npWjz1+a0V/jfg3kaxE43fW+Zm2K8PjWbXf/x54/tGTt8qrbTM+/9jJ+D2jd6+0o76/Evuo6PNKnAGVf14ZMv+jqi+yd42gn1trLpDXvxhePAPRdYgMQX2s7JqXXjXmgr5PlY9W/Z5uMXe8dJF37cUIz6yxT9RPtuIZlbhWxbZBfFWJTB4gdkFVtmTv5ul9iVPBe+i6yOpttk9Q4VkmQyvyWttmWf9D9V90PuJBxk80DmGVtdInoveV5061uOxZmaJyVWzOy8A9hFft00NAymnJs0zPWPWS+WFVuw7Vqdk79qTTI0P0vfeduHl49yB9zyvXuYRnKHpsvheX4yXnWlRvzLNHl+M7RhmQvobGLTJ9pu9B4lze+1n/Z2lX4xQEzSV9jnUoImetayjWsu81srlDXvl/1Oy4hvVMbxwqK0dmbyHoiRv05GPBkl0SqD3oPRPdx5jNM69e0LlDkUxjnlXsAi/NyGbJYkRZ2+t29dokOz+iFyvQfqdOL9IdngzW2Jc8q8wduqZ+e7rTaw+0D0bnK/b8farOfwY8453r0UtVvfZsks5IrNWrN8++H11LPAIe9+QyR7qzAsQvkPlavysxME9f6f6BxGEr7xaVU4L7Q/ZOFTmW5anfDfVD18CvjHPevCAaL3hCHZbMk0B8y0xfRvYO80seXl6jddsjiy0gsT7rtyejUexLn1rg8XU5x9vi2ePt1pp0fUiuSVR0zGz9Mco1JAaS+So/SdKtyPnM50c4NMqzkTaSPHtu+7+00VhunW+3xqSe2h4PNduWizBiQ68hj7J8ED1rlUuPAxCeMcrSExPSeRMQnTi6Bkqjpy3lmLu00eShxz3lfRWueZBjZvu2HyxkeiuLy6HpWmlHYwXyOvMM4VBlDdOssa0IF9tNDj2lDuaYrIPZXLMwwrnetRWoTkM4c1qlfarFcqwqTwmj6+jWxsUJaczyUVE845zv7YNIbKYaU876RuYHW2WL+OfFsh5ejq/7xTgYRDyU71rZuxb1txD02FyMTYu5ZPnX2s/O4syIv+2VFY1dHBoqMVXyCaw1Ul67ZvFdK/+ojSq6coYtp99Lzvm0DvmeFd82GyOvyrW7AZU9bC07bXS8bkbMnLBJfmvoPd+0nerZo9nYPQOR58h4yoit/qXl+HLfo2ZZIry3HL9ejped60fqbyb7NddYvyDzMbzyj9RrZkOfNc5F+wqyTxH5PpU+g44NRDytxGmPCy9s/+p1BAwe+9T7dETyRcdEMh+06ndFtkuvfSR/o/sKWlzzeJ3pT+u3VTavPkZsfV22NfyGLObCY5/WPmoZ16R+udB261HPLUf8tXu2h3e/lZYnPzfNflaOeVwA3zOL6WTvhti+lXHe2ejNW74LGnM5arZcyPK2xhVYl6J1pPO9J7jHAjpvJNuH10unqkNHbIXqXJHjwIg8ZP2J2lccDzjffF+tMh4f6cFIXmS6ln9nHMti9RHXPPlc/W2df/DELftsBu8i32AfcTi5Z0Jmi1vxAGtMVB+Se5n+YbAurfRzq90jmwyNdWm7NOKa99vKLxrznDV/JHqv2fdGuK7S8tLVHGN+6TFRL07AR8Q5tE2y+Gklxoz6vJ6/bQHlr8wT1Sd3Kqw94M+03fe0Yk7WPjAWJPcszum28mznyBeN9CyybtVCFtuR5c9kboUz6L1fWO754sq8nBGHYyD92dM9T2//ngHzsjiXyQY0ZmHdL8vuybNKWvIdLJvtI+NZxP/03us44mdr+CDoeEdlfBPtV5ZsiPwHgpyfkcXRtL+ClN16D48byPwCqw9XYzWzIeeyaZk4CmofvSYlm0sg0bOfVXQfQ8sGfVT8B/m/ZUuisYxKf9bjvl55MtsrinUg8Mps+ZEz1xnL2Ct9N+W15fhrs7mF6Dxdn/qZzC5H+Rb5rRnnGJEtqcuLyl40vhbN/dDpZPW0lh/APNO2F/+uxDgkz1iOVWWNhKcjtL9gAZWbsjwZ77w21XPQvbGlTcNthmwMyZufbJXVmm+kf1f0jIXMdh9ZR6DTJp7x3DK9p2gFVhwqsnOQcb1K/cn4VRajk0c2fmmVBfGHPG4i8Rw6ojGFTP4jc4eR+d3MsxmxWT1mGcXZI0j96M1B0zKtN0ZuYdNs+aHb1JuDvtn+tdYmZGVG68hakyLLmcVyvLhujzxDxhoReabllucvSJs/iwNWYhJeTJzA6fN8JFo7+svl+Hvz607/1vpsTXj1kck165yWNdov9ea2ZX2vx9/MeNS7n6gF0pXUh9EYM9q2lp3GadI+RsQt3suI6/7DdpNrEui8mVHI9zob5BXFr3S9ePKLEcmjaL7orHF05pGXxsz1xBTjpzZ/2cgvG78haBkn9Y6002RaUflfaZg+ReWehOc7boB7K2OPVd8U9VE9e62XaxV5Nqo7eCyJ5jhKvWX106pf7cWM2Aa1vj/L5dD5cx7W3FdGFIOo+BmVsQRdzkyGRWkj41ee7/xEkq8F4lHkc2oezhpbutRuyjZpLxHQcY+sjrg/sg2q48GyHF7+ElaefM6SURt1j5UGIsOzaxYynkd1nMVD+KhC8oh9ysvO9Qijtoy0lxB5kNkZdEjZH8VRzrTb7TVLhp5Vz3nvzHtcjMhn7xn0fuTZSIdmvnMVFo96eCbhfbtawpKLr4j/0f6t0bt+WHIt8u0y+zjy8aLz2n6K3jGSrdE9Ub5r+9MWj151/keB8MyC9d2xyngcz9NAYrfWfroPtJtcz9qxOg6Dji9674f6l5VyR3ZgzztmuOzkqVHJS/IMtefITtf770V5R2VGeEb+gd73kGSatuMyubBx0t8Y5UbtMQuZ3kTjvFZ+iPz2fqPQ8gzVmbo8kk+ePIu4Ss9cb/E7o0B4ZsWoya7yuK7PefzSQPxSi3PVsYCK35qds54flWns96M+ACKf9NpMpA943PRiDt59BL3mqbqfUNTWVX5pyPKfbraMq4zte2lH57z3y7ilr0d7geh61/161AfohRdTk0D7qDdXcY39q6q60ePIKfVXPlMdWxyxcb1xTf072wuEjmi9thxbz+Y4sgy06s6TTzKG/83l+NZyfHv7W8bUdGwtqmvrmjVeXFmnrs9V9IbXljKNKMaq9yqTyMrh+a2ZbELSls+cb7evK7PmhXh1LuXbiDxDfM7vL8dXl+ORtss3DY439Pjz0bx5AulBJHbB92bI4hhVO7oS79BAbCxPzkY2I+HJFs9zytbNvyv+93jm2Why7tA19Vvrcs6XuPaD7fHDIH2KN+h9+zN/Ssu3rI+hMXMNaw7WSFxK72Wc+d9o7NY7H/le3m9rPrAGuu8m6dDecSYZf7d0eXW/Ty0faX9FnovB+jXjSRbD3bQ+Xnioxi40vL0+0Xiah8yXzXT2OXUt4gjCNe0jVOY6Xhf/s/+nj2ydpISOa9F8MoohPy3KZelXnZ6OeVjfDh0FGuNEuYdyrZIOI5Lbkb6ooKJDe+HtH4fIUwk9PvlC29UvXBfSl3jZuD5rLV5vPMlqa0vv6u/McX6njXNIHla5vftG5bCFtfeu9tbyju5jjOh0a62LxbNNR/6ELFYRAeEp6lv2oGLjyesohy2sxTUpyywuVWSLBun0q8Z5qdtJBmZ6U6PKuRljfxnQ8QLkeSuNLFZcGYdgePsoImv+qsf55vu/JGtkmyNrYjR6xvhHv8eOAFkDdNo5j8bNeniAjA1EeUqMzENE57hVD0t2kKyRbd77zQNuU2u+rIaWr1E/njHOyojaGuWw9R30U233f+85NIaR2WVZPTzsnLN8R2SOW/UgWWbxINNhFTniyWmGjq1wnpyHtR4qi1VWy+zxLYpJePudVuIYDEvXIr5OpR169FIVUdzDGh/w1l7OhLXPI+txrj9rLpo155Eh6z2Li6zhs/YgswUyOYuWtUcvzVoLQLrN2qddxtXWGOv29nnU34ySfVDyRq6H0mWXqPBlht9mIZM5lTHTiHNW2SRPZsTCPFiyytrzwBp7tNZFa7711Hu2z6Msi9cHeQ6Jvr86xq3lPDLOg+hF/aw118N7BtGho/5QFXquRk9+ljwjROvwR3xdTsfbm8cqiwWO++p5IxmifeT1uR5bC0F1Ppq8HvWraDzAsp10/EnKoOpcDetb1BLWd5sksj3Heg7mWASr3q24HEGuiRrt2xTXWYtfhEguZlyL0ut574hL1djUkfG/xz1kvIR91cfamJ/rpR8hendts0lYfdmzcbP9knq+4VmJ2Xr6MordMh4s8ozqM/IRe2Mo0Vi7N//Os1nuD9JAMNumkDabB6R8141zkd9VibNF5YlsOCt2MxJHpDgR+fE0Ds1rX/nvPuIfbO9xuWXsSo6B01wMyTNkbkFz7l8ble8tkKyyeGZhjXdAuOPJu4jv9yzn791eI37RejI51+GT4v8s/lGJkdG9f1qO95fjz847EMc+MNLiMfD71TOWLR7Z2CPzcs6ov5fbnH3gsngR54GMcfQgqi/P/td6KIo/kazS31+W8qxnLpZsR+aZjKFcN85J+aXjo1y3bL8wz3i9pZ5jlo0BV99Bgzj2wPZ/bbfN1smaw96eILMQ6YSoLklGWbF17j9SVqF2ZsXvZJ79O7jH4paEHj9insn5GTrWkMURqf9460ujerD2+ps5LzLj6cjeqj1raK3rno59stVj65EuIJ5l+7nz8/qbmR7e317/+fbv28H90j6T8kTPoZX5Zn0oGwu10Ds2ct+JmwcCrSdRG87ai8fj2az90yvryBBU9qdF99X4YCnzpeX4x3K8tBz/Ee+w882H5fg0kB7LNw+9tnTFFpNyjrkljwhcPtaTV8Q12cZk22yM599st3PB07mWn1eZV8tltdaReWuEEXj8t8qmefZd4znqo585eev3V5b/P3ty9x7i170N4xhD1l+PrZ7Jq6pNjsowiWgvOAbx7Gzb3SNL+26/ab7O7RnnjvqpN5esKuMq8VriWdZeH1/K+4ltmb+x8OsRg2MZvywbCa0/r3zWvrkSs2xyxL5j+czrG6x2lrLNGrv2dC7dW9k3BRnX9b6rULXfUL9K2j3apsu+1xPJsI91yIaZ3zQjVGzynli+BcltvXZ1BFUbDY2fMarfq6+WAYHVBoiOfB3P4v+I1hatEf/s6Q8WZGwHaVd0D3yG5hkam6/GcbJ1J6P7t2hZ8vxgeoeCWXIqQ48//EDbjfVF0O1LNsfvwHy4f+p9ULx9USKuefyOZMCsb1lnMZQ/TMjDAn0P6LmV0t4HKjLNkyN6ngrz3ZJjqJ1JNqbHNbapuc0r8xAsvNhu2bQ8R9qKgaAx0Iv5LTD2za9f7DEvD55vt8Y+ZDzvINOh3lwsFMQdei+2aVlWZv7bPtpjH/zK7EC26WRfvNp219JHmDk+UYktkA2B1h/vbx1xbQbH5d6zLCu1/0b17dnRWRl+GlxbY/8MC6Njnbovrj22ORMXnb8MOZfK45puY1mfWvdFfNDj6TK+E/lp1Gekvdi7lzeKWT6jBsJD2RetOEpP2TyZI+UsKkuQuuf89L1yLrLFtTebL/sjnrH9FpUNrTfpD7Ftetw2+8y5GtFYQ4VbnjzJgOrLyA+m9mB/nPK35DH7BQS9v0oUZ0fkmcUzXXdvBHkQ/rkcb7XcVszSycoxit6YHCInUD973/3PW0fnxbWlDrXWiVttrDlrfYtgpp7r2U+DIH2KCrf2OR93bay5Ju5t9Zu+eR/NNSG/gHhh8cySVZqzqDxbG1489bjjxYfE27X3Uo94dtRinrHNxfaETkva6xx7Q3i2L58QQW+/75G1a6+7HUFVPhA/pA/wtyRtRJ55ZbBsOcse3Mf4zSHJjn1jxrtnPOO592zXS354MZkb4rrHM9lfvTJYNuHI3OMIkU8wU1fvY/2Xh7X6CiJHszFWnnuv4+/ka2ZtTtc9nklU2hGZe0x94VOFNPkZ0t+vLcdv2+44MFo+pL5792WLkH1jaBZG5v+g0PF3gtfm0t6azbMRRPlQHco+R3EP5lpP+fapZ619c6tAOLmP7yZZ69k8yHbx9vOUdXIIYyKWPntr+xfZv+g4gdgSM3x3mcYh2Ksydobs5znT5urVFbJcr7h39UO3yxX/Vhien27B8l+r/XuWbXnJOf+vtjvej8hPjp0RJM/W3Ddtbcy0d2bwLJJHiLyp9m9vT/Jqvgyr/HSOxmFebxjPOKZBGNlvfRbW0HMje8vOQM88WQlLDkbvlK05qSLi2RtJXjyHkWMahOPi2Rr7ZUY4JJttLczkmdVPpC5H9DTHNAg9PEPe5xBs0UMHsk60Uo+WnTdDbnMZpC5HYkAc0yCsxbMe9NRJD5+z/Sj3heMYDx6B1OWoLc8y0OJZ1t7R+N5M/TTzmxFr5tML4plck44A/WbBoYBl4Az7bF/tdLfaWDJWc4hcmYFenvXWx91ajyN9Ddmf9E7HIcQ1ZgL5JsQV4N5940Pn/N3iT2meVfYMOnQch56t+EhyztQhjO+tCZRno5jN0zV5X0lb36vrD53XudacqlG8l1xH18avwbOZe8YeCtAy9o4zovs57hvR91A09F4Gso9pnllzNizsSyfN5uDa+p/HGXv49uzksszCfwFXXH3JYCoBAA==
</data>
</layer>
<layer name="Over" width="154" height="124">
<data encoding="base64" compression="gzip">
- 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
+ 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
</data>
</layer>
<layer name="Over2" width="154" height="124">
diff --git a/maps/016-1.tmx b/maps/016-1.tmx
index 4482666a..b486dc0d 100644
--- a/maps/016-1.tmx
+++ b/maps/016-1.tmx
@@ -23,7 +23,7 @@
</layer>
<layer name="Fringe" width="140" height="120">
<data encoding="base64" compression="gzip">
- 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
+ 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
</data>
</layer>
<layer name="Over" width="140" height="120">
@@ -31,7 +31,7 @@
H4sIAAAAAAAAA+3cu47TQBQG4LELoKEFGmh5Ql6BJ0AIUdDA3rRAs0BBy6WAkksFEhVCLFvQUXKsJFoTTbI2dmIbvk86GsuOrCl+nfE4klPKu77ifFe3ipRuR+1E7Ran578X+bGyH8cHUXei7tbO078HUXtRO1HfBp5L5f5STtqocnMoL1vzK80y8zXqIM1y9DfORZ2PutBhLov+cdxwPJGTrXlTO96N2u94v0tRl6OudLwP09ZH32iqaX85yTzPMA65vrHNDDE9y/ui5Qz1lZ+qX/ws5n2jnI1FObtWluv3S4xHbh9dP+fZhbqz8tLVp0yf+Fz8eS33G8ZpkY36urOpd3f8O6w7wKbV1yV7a85SX5esUTTheZc25AUAmCJ7adqwl6Yt+yTakBfakBcAAAAAAAAAADj1xXc7AHq3l8b1XWSm43DoCTApz5MeQzuLb69DU9YlAPp2sRx6BozVUZHSk6inmfFZi3fYNzY3RUbkRWTiZdSrzPh6nhf/fbDwLrLwPupDZvwoJ6zwo5aN4xU5ubbmueZmv9MB/gNva71mXX8BAAAAAAAAAAAAAAAAAAAAAAAAAKbr6rzuDT0RJqHKyqOox0NPhEl4mGQFAAAAAAAAAAAAAAAAAGAqfgPXp240gAYBAA==
</data>
</layer>
- <layer name="Collision" width="140" height="120" visible="0">
+ <layer name="Collision" width="140" height="120">
<data encoding="base64" compression="gzip">
H4sIAAAAAAAAA+2TW47sIAxEo97/ou/XSBHXTyCYhFPSkdITsCt2ze+6rh8AAAAAAAAAAAAAAAAAAAAAAAAAHMNd1V5gf+6q9gL7c1e1F9gbSdWeYF8kVXuCvZFU7Qn2RVK1J9gTSdWeYD80VfvS/FX7ORlP1f7+PErPUE+raj+7ejodSdWeNG/VfkBWtSfNW7Uf2Gc3Un/tb9WzOpGreZak7TS692xWLG+W1+pZnsAsZXb+lKpneQLRHTytTI+Ip+q5fg1P93PSvdEcZXYerafdhzWZaecefSdlzaqTzV0mQzA3K9a+rbs997y+s1Q9268xY9aRGu2z9Fu6m5XUD9ZmJ3I+kp2ZsvpVz/EkZs1eqtE+e4pkOXIX1uamsu/VvPPyUz23E7G0sp/2zrtfPb9T0fRUj/Zv0nvNy1P+vsKq+Ty5F6m29Oxli7zEs9LqDT2iit7V8nc6llb1m1mz97uuy65VvaddiOgNmWn32j5H+rRnruv/WqcS1cr+mTsj35X1FPX3RXpV4ed+Jnu+5xu0O5kaX2JEK3xl9x25k/kGqd6peZmhJ/14O8vsuNev9s1PzWBXIvLOVvia9U0z8lK9w93yktETfrR3I983My+9Nd9IdJ4ZPZnb9ny2dnt3pM6JecnMKbPb0X6RXqM5lN73zKX3/te4mmfp96yZRWuN9vM0az6nEZmlp96Za3/L9sho1pyq97YbPfKyMXp3xJtUx8t05n8K/JnNlJZX73f0TLRfr18Ym+dd1j6j9SM5GfEm1bHqV+/jDUTm5inTJ7PHnp17HiNnoD8z2m9tvpFa0XcZP162JJ/SM8T3qimy78wetLpaDauXV8e6p72HeGa8XWez1taceTeSKa9v9Q52J6JMrbau1s/arda/x0+PJ+jPijXL+zvvvFVHy82Kb72/r97HzkQ1mjOvVjZXI9+YfQ99ut/Vnu+/2z6V32n9tvxDLDPSPHuy5t2p2pXnB/I7n3lWyp92ZtW3Sz6q97IjljIZmXFf22Hlt4O8E0+Z3Utntfu/5n3FHCy/kNt9r6xeVmal59VzqN7L7qxSb7+VeXqq7leZrbZutk/0fO/eI7VgTVZ6NduPlKHIeajNi9SnKrNWv+o97M7IbGdJ8uT17fVFVp7LyhNqe1u/V2b1/gx6VkZ30nN/tgerRrR29T52xpuldt5S786lXk/kKdIPYrmpluRnhcfq+b+V7Fy991bd+7tf8zfLy+z8VM/8jXgztOYcnXl7R5N2dlZOsr7B3uWMc5m+d0n5sM725qd63m9nh3lG+/eovVs97y9QOdd7v2hfTdb76hl/CW3eq3q3O9ayk1X1XL9M9azbnpI0z9pvWLuznYio2iPswZ+s39UeAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYIx/VSVtnIAGAQA=
</data>
diff --git a/maps/018-1.tmx b/maps/018-1.tmx
index 7b8adaf7..fe07834e 100644
--- a/maps/018-1.tmx
+++ b/maps/018-1.tmx
@@ -179,8 +179,8 @@
</object>
<object name="Jack O" type="spawn" x="5344" y="608" width="576" height="640">
<properties>
- <property name="eA_death" value="240000"/>
- <property name="eA_spawn" value="300000"/>
+ <property name="eA_death" value="120000"/>
+ <property name="eA_spawn" value="180000"/>
<property name="max_beings" value="1"/>
<property name="monster_id" value="20"/>
</properties>
diff --git a/maps/019-1.tmx b/maps/019-1.tmx
index c7e5346f..b7c4dff1 100644
--- a/maps/019-1.tmx
+++ b/maps/019-1.tmx
@@ -19,35 +19,35 @@
</layer>
<layer name="Ground2" width="138" height="128">
<data encoding="base64" compression="gzip">
- H4sIAAAAAAAAA+2dy44dNRCGWyIIhaxZABsuYgFsAAELYBeGBbALAgLsA+IBYAS73B6AJPMAIU8w5AnCvBddmlNKpaiyy5ey3T3+JCvJOSfdbvvvcrl8W5Z6nK7pH/InTdJnD9f09yHdrZgPK3fI/SE9OuTr8ZpeW9Pra3pjkfPO018d8kvzjPl+XOle9ytei/NkTf8udp3Qz6hmeKqhoVgZYznn6oTnv5buab55fmme8e9nle75qNK1QqBeaIrpJFQXIQ1ZU6yMS3XCf5OqG0nHkr2I6aQU1IiXLYkR006oLiz1FEuxMsZ/Q77gPXpvTe+v6QMl77H3IKYbi44lHUjfYx5qvP/Y3njbkhRo+ffSCa3rkrKJ6ST2DFL+JJ1wfdasz1B7cyuSblfMR4jQO1tLJ55lzPNfUyce+ZUo8V0fLHEteWvKYvdjqWYZW3zUmG4sOm6hDcr9RveLaaqVbfImpw8c03pvfwDbnBGw2KbRtXRzaRMraQX2s3r2cXK43/Bed4y/A22gjk+W/egEbQi2e71tWgotdWK9F9dFDZ1o8RJrKo3j0TjJCO1eKlvQCcRCrPVkiZ/lJC0eY8kX1cjW9IFsQSenwmeINmZk7d9Yk9Z/ssSut66R1j53rk6eCJ8BtL337u9q/SdLrGnLGgE8xyg5KZqUNCG9t7S979XftcSaUvNk9fdb0UonqWNdkk6k93br76nESHEVpEU8MMeHk/xW6b0tzTvtf/eOK9G4Sk/ta/NBalxH8/9z/XzQREofJ5dQfxtilK20guWE2u8VL5L8PbTbNa6j+f9UI5+s6dM1fWa8F2jF+92WfB6qzRZ9QT5mDDbupMF9JdAPKdEJjxPRpI3TUjvy5Zq+WtMfi00v9J2K1Zdm42L2SGrLuM694W1/z9gz1UlO+x5rP6R+Ir8+6gTT14vs12Pd8vqKxSekfkbOfGCqnVa+G2UUncTyofkxVh8Dy5kCbc6fy1ON/LqmnyLX4XYpp99J69xrPm2ImC8n+ayj6CTkH4b8mJJ364c1/UhSTCMA10kpvI2J+SYxLONFmp3T9N3TNwGoTqD8Na2E/JiSMs2htk44Md+kVAM57VbvcXGuE9SK1r5Yxka87XiJTui7npKvlHl8Hr7LKDpBPxOTpAfrvNbadjx0/RR/m7/rvde2Wend5vD+OZR/SCe574lmx1v6izRWJeVrZM2MYksoqJXSuFsMjKvWrhtpLoHF7oT6P637QpwRdQJ4jJdIhOpGI9WHzMl3yBep3YbG6N3mAC3nDsTgdWPxe1r5kLE8eL7vPW0Jn9dda6ziuzV9T9L1StcdiaPl/Dmvkz89fa3esTXahynVCerjXfb5L4XXHQ36nG+TPz21MopOzpYynUDZcX0gWIZ74Ns1vap8h8/pUaej6AT/nUNII8hebAp/1lfY9y8vPjallU5Ce9KU6MSikctrOs649ohotgTxan9a6QRth7QeX9MJ5O2e8DnlhvCZ9I7tAcs7AXi0P63ikZpOaB+S6wFjBKG5OJJOOHtoc6waQWq3P6H1STXRdMJ/Q8EYQSgWEdPJHtqcVI0AtdsfbX1SbUI6oXGUVGI6kWzJpYz79ETySXjbKlFbKz11wudxpxLSyUWxJfCcL67pivBdTa200okU2y5dn/Pb8mz5YJlBohp5ruAe3txTEsCfjwLP+vuarh5+/7ny21p+bQud0P1w6BqGGrF6KEtJG1shpJNQXA18VYzNXj/8VtMVtL+9x3tTabn/wMhAuxuaOwCEdAJ1D+3uz4e/Hx2SpBWv+JsnaFtK10ZZ4ive8PffCvQfzpbw2DN8H/JPQBugCWh7jg+/fWc5ty1oY6+Q3z5JzOMolNavJb7iDc77SNWJlVD8Ff0OsDlfLE/tCH5ONTZ6rDG0NiC1fvn6O5zv1ns/bdSrB5Y4PdoQaHPQl0VbA38fqd+Xs5cU1G9K+8PX31nicC2omQ8+d8YaX0O9XFvOtQK6AN3cWPzGy2Nz+lL0oO2pnDP+13K9ZA++WcK6wH4wJK2vDJoArXCf1qPdCa31D9W5t072jtbGYEzo2PBbQGqLPNqd2jqJzSGdOjknNP8IYyTYr0kZNz6qkrv/k6uTnPnEI+7h1Ase9+BjOKgXTSNS/N5zrDw2l7zG/PJR9nAajVj/JgT4IDzOtpU5n6F+ENXXaPsH9kIbo6FQf5b6tKgT2i6N1CeWkNbRavan1dlzWyF1DBy1hf5rK41ofd+U8+wscwVm2yMj2RS0IVq9S+0Vjvl4ofkglvPsNH9Fm0e911hIKVwr3M/AeNy1w7976ESj9FyhUt/3IgE64XXPx21ou6LpZLJ/pLrH9X8A6ABiuFpfeXSd5O4VNHl27m6s70M1IzGSTkJ+h/dYag6jjB1aKYmnjKQTbd4rsrV6GYmc9RgUb52kjhNPfLCsx9DWZ7SIr3nG6yd2Rm5zZvy8PzjPNbfN8bYlc+y2PxafJLQW0FMjM34epuUasdC6rhi1NZK7Z+WkDdQvsawjBmpqRBvDnfoYC8vcAs7ljPtY53xMxiVFK5otia0TlWJfUx/bAff5pFqh6+t5ym1v5rzkbQO+LNQ9XaeBY8VvrelDkl7KvMfs2+4DqX8MsbM32Wf83xLaGNxsX7aPNPcRdQJ2BucnxXRC9yGaPkgbtH1KcvYriMF1gr4q6AL8lquHz0M60eYdj7xn0B7opRPan7G2O3Nuej9a6kTbayCmk4seW8d1hz1pqRMA+z0Uiz25qP4H7gPkVR9WYnNxWvDx8my/+KNG990SLeuDM8LZTDFwL6+LzN73Pknhhd4ZmEwmk8kmuRT/yWQymUwmk8lkMplMJpNBoXusb2FPyUkf6BwZugf2ZEKR5mbuWS8zLppHaP/SkfbomfRl6mRiYepkYmHqZGKBn1VJ8dDJ3MNp20h7tnjopPRM9El/+F5yXjqZbBtvncx18/vAUyd8bWOLPc7BdpXup36n8P/vEQ+dSGsbYd3FwwrXjt0X1+7jfup32ffavvz8bKHYXkUXCb4HR+lecXx/OO67eq9Tov4yrgfiZ6zzffmlPfvPlnSd8POra4yxYnn2RNqnpeSsZPouh7Tg+Z5K/jLXCcLX//E8p+RT2xO25IxHa3l6I+2ZnauT0B4LN9d0i6STzHtYSNFJDKtOYvsG52plhFiC9my5Ogk9U6t2XutXUV0+MF7r5mLTc+p51BZo290bLW5fon2tj9FKJzXfP2ueQ+MfHGvZog/V25YAoefLsSn4bNI5lC11UgtLnnPOzrFoZaSYZEgnqTaF2ntpbwjQjncsomYsz9rmpNgSSizusBWdACk2BZ7rceD708VfK6O3OZQ96STFpsTqCGyMt1ZatzmAh05GG+OwnO1htSmWOkKtePgqPdocwHo+Cp5zjkmLY466f2PsOVP8cwuglVo64TH21m0OIpWhVReUUTWCxLRiGevxiF1JcG147NGV0zZCGabqgjK6RpDQWYaj6ITvze1VpjhW2WqseCsaAUI2JUUnPD4P6Tb7Lidm37osW2llSxpBNJti0QnEwjUNhL6z0mOcw1srW9QIUKITT0r7MjjWnzMWgVrR5qvkslWNhOLPPXWSU558Dgg9AylnTgiNL0vznlII7Uu/hX0BSv1YD3I1Yh27zakP1Awfw9J0Yz3zlee7ZM6KJ5pOvM/cDpHqk3iNyUnwMSxp7NN65quW797tvYSkk14ayZl7kaMRpMa7q+2LH9P5qO29hqSTHvnMmedXohGk9bOiLxLK9xZ00suW5PR/c8fiKC3qhPqpmj7ouehb0ElPW5JCDVsC0Od9fkk/pzyExXZIjKaT2usyckjt26SUPT07Wqp/r+fN1Qcykk6083NbkqORlLKncyNa+WE17NwofeP/AMIR/hYAFAEA
+ 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
</data>
</layer>
<layer name="Ground3" width="138" height="128">
<data encoding="base64" compression="gzip">
- H4sIAAAAAAAAA+3YwQ3CMBAEwJA8qIAKgJRA/zVRAaGDsxXlbN2M5J8fK93Klr0sAADAyN7ZAbhcz8yfp6dgdD0z15N69IQIPSGiZ+av01MwOmcDEZ9jPbJDMIXWM8X/SU2tPXFX1aQnRPzfL3vDfj2pa2vY610MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQHXfW3YCZrCt2QmYgZ4QoSdErEdP7tkhAAbwA28tUi8AFAEA
+ H4sIAAAAAAAAA+3YSwrCMBQF0NoOXIEDx36gG3D/4I5cgRU38FKDLyHnQGcZXMjlJek0AQAALbtlB+Dv9uz5pXoKWrdnz/VkPHpChJ4QsWfPr9VT0DqzgYjH9p2yQ9CF0pni/8mYSnvirBqTnhDxeb/cC9brybiWgrXexQAAAAAAAAD07pkdgC6sk64Qc84OQBfMFKJ0BajNTCFKV4hwVyFKVwAAAAAAAAAAAAAA4GvNDgAAAAHurQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwm9chOwE9WObsBPRAT4jQEyLmrSfH7BAADXgD4uQXGQAUAQA=
</data>
</layer>
<layer name="Fringe" width="138" height="128">
<data encoding="base64" compression="gzip">
- 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
+ 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
</data>
</layer>
<layer name="Over" width="138" height="128">
<data encoding="base64" compression="gzip">
- H4sIAAAAAAAAA+3XwQ2CQBAFULRIGrEUYwXGErxZnAcvRklYwiy7A+8l3kicHX8+7jAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQIyx9QCkISuUkhUAAADWcK8EAAD2yF0HAIBs/IcFYCveOQBsxTsHiKBLgAi6hDky0s614Jlb9SnoXZac6JK2suSEj2ej75WTesZhPz14L3jmUX0KOKbfHtlLr7CM351aZAuIpFOASDqFUrICRNIpQCSdAkTSKQAAAFAm8x068+w9mdtjj3teM1OP58mux53WmKnHc2Zw9L1Nnf/oO/lmFwAAAAAAAAAAAAAAx/E6/X/g21RGZAVY6nJuPcEybz9j07UAFAEA
+ H4sIAAAAAAAAA+3XQQ6DMAwEwLSP5CN9W299HFfUIhEUQ+JmRuLumNVCSgEAAAAAAAAAAAAAAAAAAAAAAAAAAACAGEvvAUhDVqglKwAAALRwrwQAAP6Ruw4AANn4hwXgLr45ANzFNweIoEuACLqEIzICRNAlUO/dewDCLUUPAu2+e0SvzMl75yqyBUTSKUAknUItWQEi6RQgkk4BIukUAAAAqJP5Dp159pEc7XHEPbfMNOJ5shtxp1fMNOI5M5h9b3vnn30nW3YBAAAAAAAAAAAAADCPz+P3ga29jMgKcNbr2XuCc1awEXZfABQBAA==
</data>
</layer>
<layer name="Over2" width="138" height="128">
<data encoding="base64" compression="gzip">
- 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
+ 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
</data>
</layer>
- <layer name="Collision" width="138" height="128" visible="0">
+ <layer name="Collision" width="138" height="128" opacity="0.72">
<data encoding="base64" compression="gzip">
H4sIAAAAAAAAA+2U7Y7kIAwEo33/hz7tj9NFXEhsPtwGqqWSdmcSIO6a/FzX9QMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAx1JGfR7ISRn1eSAnZdTngZyUUZ8HcvY5a13o66SlO0uyeTJ6vVOwdjEyCk96z3M61pmV39fusybKE2/UfWRlVqx+3b8b4cnMqLtSMyqW9SL6jIy6u4yelNc/3f+25m6O/EbdXUZPvPM6Jer+1J6U33v/f/t8N5fUHSo98c7I+91OUXcY7YnVH8+7Y6dYfhO7UntWTyze7O7Qb9Rdqj3x9r2bE9bnUXcZ5UlrvtbayZky5bOr+8ziyW7vCm8879MdmJ2sLtVmUXsv1P6vrfu2z2pYMutadXpm83TN233qnrO/SzKmZTb3z2p/j9gzMy1Ru9bzHN65WNb/ukbdscqVlT3p3bP2N66MdWxEIs9h7d+6zuq0PqMyked42sezt7pfhScnhffJud23pHde6n7xJDZPc2t5J68K+T9fs/HMTt0vnszP17vD6tMOkH/5csE7M3W3eDI/tfl45qbuFkdi0/pOUfeLIzHpnZW6Y/yIycmeRDtzqqPqbldy5BLt6cmsc6n7XcmRS7ivOuqOV3DjxJRzVveNI2tE3TmO5I+6czxZI+rO8WSNqDs/xZNVz/0bdd8nebJy1H3jyxpR94wf+aPuGj/WiLpzPNHFOlt13/iizSme4E1fLDNUd3qKJ09ny/I8X3tazqXufBdPnpLleVocsKyRGe9srst338is4In1POreZzjy9FyKrOiJZ40s3M/ojaIPyxmyeuK5NyM9wZPv4EmuPtQZ9U7ODImPunM8yRt1zyu7ot6/zMyzqDte2RN1Ip9f3TGu+KOYgbpfPGmLZRYjZ6PuN9KV2nX3zxW/0Z57o3476m6jXbHMImu+PJ/pi7pXpSdfc3+7ZmbKPS3PO9MTdafRrjx9P3qmI2PxteZL63619XfEOpPW+c50yrK25+y9Z1V3mcEVy3xm52uf+/dP11o/64m6y0hPPH30ZpanHme+rr3fY913V97S6tOseDwurx3t+NtcdiRzRpwx2nV1nyd6MiMz3zPlmjtB5kTdK56My6gZPK2h7hVPcqU2S3WvCkey+Zjxt6DuUu1LtJOWZDrLyHOtQMRz9yb6+TOdLwuRz1ub71MyzKN2jixnjZ6L+gyrcY/6LJCXv1GfAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAL75Ay++UpUAFAEA
</data>
</layer>
- <objectgroup name="Objects" width="0" height="0" visible="0">
+ <objectgroup name="Objects" width="0" height="0">
<object name="graphics/particles/whirlpool.particle.xml" type="particle_effect" x="2000" y="592"/>
<object name="graphics/particles/whirlpool.particle.xml" type="particle_effect" x="2032" y="592"/>
<object name="graphics/particles/whirlpool.particle.xml" type="particle_effect" x="2000" y="624"/>
diff --git a/maps/056-1.tmx b/maps/056-1.tmx
index f66d993a..f969f816 100644
--- a/maps/056-1.tmx
+++ b/maps/056-1.tmx
@@ -42,9 +42,9 @@
H4sIAAAAAAAAA+3RwQ1AQBRF0T/9l2NogGhgUI9fwFhYCc5J7v4lLwIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAL5pKBG105hN5el13DXnZ8tFqz9fp+VnW6c9O/wJAAAAAAAAAAAAAAAAAAAAv3ECDFCycNCvAAA=
</data>
</layer>
- <layer name="Collision" width="116" height="97" visible="0" opacity="0.5">
+ <layer name="Collision" width="116" height="97" opacity="0.5">
<data encoding="base64" compression="gzip">
- H4sIAAAAAAAAA+3S0Y6EIAyFYeP7P/ReTeIyFMpQPEX/Jl/WUXRLD+dxHCcAAAAAAAAAAAAAAAAAAAAA3OBI0AN8OdWq9VzdM+wqn1vr1f0rZnX9ba3LkqOn1HNV59maiXWv9TxDpiv6yS6qVvZm9dpbo57tznmWlaEf9WzJM66v8/L3jSLqzl5G+1bPN2umnrXqcxXZz+6sWdTmEj3LVaWeqdroHGZn2XrP+t1bP7oH/J9ha/6169FzMVPq+eygNbfR+Y686/lu7Xvqee2iNrvevD1nY+S7v/xP9HMtZzg6T2+NvqeezU5GZu35jicj8lyTo3U9O9uZ8p4z+GderunNeEX1+lXPL7PWPL1z9Lzrfd57D/P5zpbnu2dxfRbXWJuvtS7yXKj3/gS9WY5W77vWesRnas3aule7Rk5lflb26j7hz7OXNXnmVyvrGfnuJbLUe8F3thE5q/eB7wy998qqnQ3kUGbUyt8q9R4wnjf57clT6h6xLm91P5jL71PqvrAmX3U/iMnT+o378/BkZK2plXpPb/ZrtbJGnkwj8lfvB3NngAz3dhjX2FOv1P1hPtfrPXVfiMn0U+qeEJvnkaAvxOer7gXzGZLjs5Drc5Dls5Sl7gcxmap7AHkCAAAAAAAAAAAAAAAAeI8/Oj4O6tCvAAA=
+ H4sIAAAAAAAAA+3S0Y6EIAyFYeP7P/ReTeIyFMpQPEX/Jl/WUWRrD+dxHCcAAAAAAAAAAAAAAAAAAAAA3OBI0AN8OdWq9VzdM+wqn1vr1f0rZnX9ba3LkqOn1HNV59maiXWv9TxDpiv6yS6qVvZm9dpbo57tznmWlaEf9WzJM66v8/L3jSLqzl5G+1bPN2umnrXqcxXZz+6sWdTmEj3LVaWeqdroHGZn2XrP+t1bP/oN+D/D1vxr16PnYqbU89lBa26j8x1517NvbT/1vHZRm11v3p6zMbLvL/8Tv+UQsZ+1/+w5Qn+WreeefTwZkeeaHK3r2dnOlPecwT/zck1vxiuq1696fpm15umdo+dd7/Pee5jPd7Y8+57F9VlcY22+1rrIc6H+9ifozXK0evta6xGfqTVr617tGjmV+VnZq/uEP89e1uSZX62sZ+S7l8hSfwu+s43IWf0d+M7Qe6+s2tlADmVGrfytUn8DxvMmvz15St0j1uWt7gdz+X1K3RfW5KvuBzF5Wr9xfx6ejKw1tVJ/05v9Wq2skSfTiPzV34O5M0CGezuMa+ypV+r+MJ/r9Z66L8Rk+il1T4jN80jQF+LzVfeC+QzJ8VnI9TnI8lnKUveDmEzVPYA8AQAAAAAAAAAAAAAAALzHH9fvn0XQrwAA
</data>
</layer>
<objectgroup name="Objects" width="116" height="97">
diff --git a/npcs.xml b/npcs.xml
index 03b20964..e6be10f8 100644
--- a/npcs.xml
+++ b/npcs.xml
@@ -918,7 +918,7 @@
<sprite>hairstyles/hairstyle11.xml|#8c6625,dab425,ffffff</sprite>
<sprite>equipment/head/wizard-hat.xml|#070707,121212,663399</sprite>
</npc>
-<!-- Old man sitting in front of desk -->
+ <!-- Old man sitting in front of desk -->
<npc id="372">
<sprite>npcs/npc-mirak.xml</sprite>
</npc>
diff --git a/tools/client-updates/README.init.verbose.txt b/tools/client-updates/README.init.verbose.txt
new file mode 100644
index 00000000..a0d33742
--- /dev/null
+++ b/tools/client-updates/README.init.verbose.txt
@@ -0,0 +1,97 @@
+$ ~/Desktop ➜ mkdir client-data-test
+$ ~/Desktop ➜ cd client-data-test
+$ ~/Desktop/client-data-test ➜ git clone git://github.com/themanaworld/tmwa-client-data.git
+Cloning into 'tmwa-client-data'...
+remote: Counting objects: 15162, done.
+remote: Compressing objects: 100% (5452/5452), done.
+remote: Total 15162 (delta 9679), reused 15083 (delta 9629)
+Receiving objects: 100% (15162/15162), 58.81 MiB | 188 KiB/s, done.
+Resolving deltas: 100% (9679/9679), done.
+$ ~/Desktop/client-data-test ➜ ls
+tmwa-client-data
+$ ~/Desktop/client-data-test ➜ cp -a tmwa-client-data/tools/client-updates .
+$ ~/Desktop/client-data-test ➜ ls
+client-updates tmwa-client-data
+$ ~/Desktop/client-data-test ➜ cd client-updates
+$ ~/Desktop/client-data-test/client-updates ➜ ls
+README release src
+$ ~/Desktop/client-data-test/client-updates ➜ cd src
+$ ~/Desktop/client-data-test/client-updates/src ➜ make
+gcc -lz -o adler32 adler32.c
+$ ~/Desktop/client-data-test/client-updates/src ➜ cp client-updates.conf.example client-updates.conf
+$ ~/Desktop/client-data-test/client-updates/src ➜ vim client-updates.conf
+$ ~/Desktop/client-data-test/client-updates/src ➜ cat client-updates.conf
+# The client-data directory
+CLIENT_DATA_DIR="$HOME/Desktop/client-data-test/tmwa-client-data"
+
+# The updates working directory
+UPDATES_DIR="$HOME/Desktop/client-data-test/client-updates"
+
+# The git branch used for generating the updates
+# This allows for more complex setups, where e.g a branch is used for merging
+# from various other branches. It's used on the testing server
+# Defaults to master
+CLIENT_DATA_BRANCH=master
+
+# Local directory served by the web server,
+# where the update files will be copied
+UPDATES_PUBLISH_DIR="$HOME/Desktop/client-data-test/www"
+$ ~/Desktop/client-data-test/client-updates/src ➜ cd ..
+$ ~/Desktop/client-data-test/client-updates ➜ git init
+Initialized empty Git repository in /home/vincent/Desktop/client-data-test/client-updates/.git/
+$ ~/Desktop/client-data-test/client-updates ➜ git add .
+$ ~/Desktop/client-data-test/client-updates ➜ git commit -m 'Initial scripts'
+[master (root-commit) 88b4d1f] Initial scripts
+ 12 files changed, 277 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 README
+ create mode 100644 release/news.txt
+ create mode 100644 release/resources.xml
+ create mode 100644 release/resources2.txt
+ create mode 100644 src/adler32.c
+ create mode 100755 src/client-updates-gen
+ create mode 100755 src/client-updates-inspect
+ create mode 100755 src/client-updates-news
+ create mode 100755 src/client-updates-push
+ create mode 100644 src/client-updates.conf.example
+ create mode 100644 src/makefile
+$ ~/Desktop/client-data-test/client-updates ➜ cd ../tmwa-client-data
+$ ~/Desktop/client-data-test/tmwa-client-data ➜ git log --oneline | tail -n 1
+840c732 *** empty log message ***
+$ ~/Desktop/client-data-test/tmwa-client-data ➜ cd ..
+$ ~/Desktop/client-data-test ➜ mkdir www
+$ ~/Desktop/client-data-test ➜ ls
+client-updates tmwa-client-data www
+$ ~/Desktop/client-data-test ➜ ./client-updates/src/client-updates-gen 840c732
+Adding update-840c732..15ff3ba.zip:
+Archive: update-840c732..15ff3ba.zip
+ Length Date Time Name
+--------- ---------- ----- ----
+ 191 02-06-2013 17:22 charcreation.xml
+ 18009 02-06-2013 17:22 COPYING
+ 1657 02-06-2013 17:22 ea-skills.xml
+.................. MORE FILES HERE
+........
+........
+--------- -------
+ 20138266 1793 files
+$ ~/Desktop/client-data-test ➜ ls client-updates/release
+news.txt resources2.txt resources.xml update-840c732..15ff3ba.zip
+$ ~/Desktop/client-data-test ➜ cat client-updates/release/{news.txt,resources2.txt,resources.xml}
+update-840c732..15ff3ba.zip 71aa03f0
+<?xml version="1.0"?>
+<updates>
+ <update type="data" file="update-840c732..15ff3ba.zip" hash="71aa03f0" />
+</updates>
+$ ~/Desktop/client-data-test ➜ ./client-updates/src/client-updates-push
+sending incremental file list
+./
+news.txt
+resources.xml
+resources2.txt
+update-840c732..15ff3ba.zip
+
+sent 16973826 bytes received 91 bytes 33947834.00 bytes/sec
+total size is 16971447 speedup is 1.00
+$ ~/Desktop/client-data-test ➜ ls www
+news.txt resources2.txt resources.xml update-840c732..15ff3ba.zip
diff --git a/tools/map-diff.py b/tools/map-diff.py
new file mode 100755
index 00000000..1da5cdec
--- /dev/null
+++ b/tools/map-diff.py
@@ -0,0 +1,192 @@
+#!/usr/bin/env python
+#-*- coding:utf-8 -*-
+
+import sys
+import os
+import subprocess
+import re
+import tempfile
+
+class MapDiff(object):
+
+ @staticmethod
+ def check_programs():
+ """
+ Checks the require programs are available
+ """
+ def which(program):
+ import os
+ def is_exe(fpath):
+ return os.path.isfile(fpath) and os.access(fpath, os.X_OK)
+ fpath, fname = os.path.split(program)
+ if fpath:
+ if is_exe(program):
+ return program
+ else:
+ for path in os.environ["PATH"].split(os.pathsep):
+ exe_file = os.path.join(path, program)
+ if is_exe(exe_file):
+ return exe_file
+ return None
+
+ platform_programs = MapDiff.PROGRAMS.get(sys.platform, MapDiff.PROGRAMS.get('default'))
+ for program in platform_programs.values():
+ if not which(program):
+ raise Exception('The required "%s" program is missing from your PATH.' % program)
+
+ MAP_RE = re.compile(r'^\d{3}-\d{1}(\.tmx)?$')
+ PROGRAMS = {
+ 'default': {
+ 'tmxrasterizer': 'tmxrasterizer',
+ 'im_convert': 'convert',
+ 'im_display': 'display',
+ 'git': 'git',
+ },
+ 'win32': {
+ 'tmxrasterizer': 'tmxrasterizer.exe',
+ 'im_convert': 'convert.exe',
+ 'im_display': 'display.exe',
+ 'git': 'git.exe',
+ },
+ }
+
+ def __init__(self):
+ self.platform_programs = MapDiff.PROGRAMS.get(sys.platform, MapDiff.PROGRAMS.get('default'))
+
+ def _diffmaps(self, tmx1, tmx2, tmxdiffpath):
+ tmxraster1 = self._rastermap(tmx1)
+ tmxraster2 = self._rastermap(tmx2)
+ tmxf, tmxdiff = tempfile.mkstemp(suffix='.png')
+ subprocess.check_call([
+ self.platform_programs.get('im_convert'), tmxraster1, tmxraster2,
+ '-compose', 'Difference',
+ '-auto-level',
+ '-composite',
+ tmxraster2,
+ '-compose', 'Screen',
+ '-composite',
+ tmxdiffpath
+ ])
+ os.unlink(tmxdiff)
+ os.unlink(tmxraster1)
+ os.unlink(tmxraster2)
+ sys.stdout.write((u'Map diff written to %s\n' % tmxdiffpath).encode('utf-8'))
+ subprocess.check_call([self.platform_programs.get('im_display'), tmxdiffpath])
+
+ def _rastermap(self, tmx):
+ tmxf, tmxraster = tempfile.mkstemp(suffix='.png')
+ subprocess.check_call([
+ self.platform_programs.get('tmxrasterizer'),
+ '--scale', '1.0',
+ tmx, tmxraster
+ ])
+ if os.stat(tmxraster).st_size == 0:
+ raise Exception('A problem was encountered when rendering a map')
+ return tmxraster
+
+
+class MapGitRevDiff(MapDiff):
+
+ def __init__(self, map_name):
+ super(MapGitRevDiff, self).__init__()
+ self.map_name = map_name
+
+ def diff(self):
+ if not MapDiff.MAP_RE.match(self.map_name):
+ sys.stderr.write(u'Invalid map name: %s.\n' % self.map_name)
+ return 1
+ if not self.map_name.endswith(u'.tmx'):
+ self.map_name = self.map_name+u'.tmx'
+ self.tmx_path = os.path.join(u'..', u'maps', self.map_name)
+ self.map_number = os.path.splitext(os.path.basename(self.map_name))[0]
+ p = subprocess.Popen([self.platform_programs.get('git'), '--no-pager', 'log', '-n', '2', '--oneline', '--follow', self.tmx_path], stdout=subprocess.PIPE)
+ log = p.communicate()[0].splitlines()
+ if not len(log) == 2:
+ raise Exception('This map has only one version')
+ c1 = log[0].split(' ')[0]
+ c2 = log[1].split(' ')[0]
+
+ # We have the 2 revs to compare. Let's extract the related tmx file
+ p1 = self._mktmx_from_rev(c1)
+ p2 = self._mktmx_from_rev(c2)
+ try:
+ difftmxpath = '%s_%s-%s.png' % (self.map_number, c1, c2)
+ self._diffmaps(p1, p2, difftmxpath)
+ finally:
+ os.unlink(p1)
+ os.unlink(p2)
+
+ def _mktmx_from_rev(self, rev):
+ p = subprocess.Popen([self.platform_programs.get('git'), '--no-pager', 'show', '%s:%s' % (rev, self.tmx_path)], stdout=subprocess.PIPE)
+ contents = p.communicate()[0]
+ revtmx = '%s-%s.tmx' % (self.map_number, rev)
+ f = open(revtmx, 'w')
+ f.write(contents)
+ f.close()
+ return revtmx
+
+
+class MapFileDiff(MapDiff):
+
+ def __init__(self, map1, map2):
+ super(MapFileDiff, self).__init__()
+ self.map1 = map1
+ self.map2 = map2
+
+ def diff(self):
+ b1 = os.path.splitext(os.path.basename(self.map1))[0]
+ b2 = os.path.splitext(os.path.basename(self.map2))[0]
+ difftmxpath = '%s__%s.png' % (b1, b2)
+ self._diffmaps(self.map1, self.map2, difftmxpath)
+
+
+def usage():
+ sys.stderr.write(u'''Usage: %s MAP_NAME
+ %s CHANGED_TMX REFERENCE_TMX
+
+ Example:
+ $ ./map-diff.py 007-1
+ will highlight the changes between the current 007-1 map and its previous version
+
+ $ ./map-diff.py changes-made-by-someone-007-1.tmx ../maps-007-1.tmx
+ will highlight the changes between the two tmx maps.
+ Note that these 2 tmx to compare have to satisfy their dependancies, e.g tilesets.
+ Hence they should be in a sibling directory of the client-data/maps folder.
+ \n''' % (sys.argv[0], sys.argv[0]))
+
+def main():
+ if not len(sys.argv) > 1:
+ usage()
+ return 127
+ if not os.path.basename(os.path.dirname(os.getcwdu())) == u'client-data':
+ sys.stderr.write(u'This script must be run from client-data/tools.\n')
+ return 1
+ try:
+ MapDiff.check_programs()
+ except Exception as e:
+ sys.stderr.write(u'%s\n' % e)
+ return 126
+ if len(sys.argv) == 2:
+ map_name = sys.argv[1]
+ mapdiff = MapGitRevDiff(map_name)
+ try:
+ mapdiff.diff()
+ except Exception as e:
+ sys.stderr.write(u'\x1b[31m\x1b[1mError while generating the diff for map %s: %s\x1b[0m\n' % (map_name, e))
+ return 1
+ else:
+ return 0
+ else:
+ map1 = sys.argv[1]
+ map2 = sys.argv[2]
+ mapdiff = MapFileDiff(map1, map2)
+ try:
+ mapdiff.diff()
+ except Exception as e:
+ sys.stderr.write(u'\x1b[31m\x1b[1mError while generating the diff for %s and %s: %s\x1b[0m\n' % (map1, map2, e))
+ return 1
+ else:
+ return 0
+
+if __name__ == '__main__':
+ sys.exit(main())
diff --git a/tools/minimap-render.py b/tools/minimap-render.py
new file mode 100755
index 00000000..6b6b009f
--- /dev/null
+++ b/tools/minimap-render.py
@@ -0,0 +1,155 @@
+#!/usr/bin/env python
+#-*- coding:utf-8 -*-
+
+import sys
+import os
+import subprocess
+import tempfile
+import re
+
+
+class MinimapRenderer(object):
+
+ MAP_RE = re.compile(r'^\d{3}-\d{1}(\.tmx)?$')
+ PROGRAMS = {
+ 'default': {
+ 'tmxrasterizer': 'tmxrasterizer',
+ 'im_convert': 'convert',
+ },
+ 'win32': {
+ 'tmxrasterizer': 'tmxrasterizer.exe',
+ 'im_convert': 'convert.exe',
+ },
+ }
+
+ def __init__(self, map_name, tilesize, useAntiAliasing):
+ self.map_name = map_name
+ self.tilesize = tilesize
+ self.useAntiAliasing = useAntiAliasing
+
+ def render(self):
+ """
+ Processes a map
+ """
+ if not MinimapRenderer.MAP_RE.match(self.map_name):
+ sys.stderr.write(u'Invalid map name: %s. Skipping.\n' % self.map_name)
+ return 1
+ if not self.map_name.endswith(u'.tmx'):
+ self.map_name = self.map_name+u'.tmx'
+
+ map_number = os.path.splitext(os.path.basename(self.map_name))[0]
+ tmx_file = os.path.normpath(os.path.join(os.getcwdu(), u'..', u'maps', self.map_name))
+ minimap_file = os.path.normpath(os.path.join(os.getcwdu(), u'..', u'graphics', u'minimaps', map_number+u'.png'))
+
+ prefix = os.path.commonprefix((tmx_file, minimap_file))
+ sys.stdout.write(u'%s -> %s\n' % (os.path.relpath(tmx_file, prefix), os.path.relpath(minimap_file, prefix)))
+
+ try:
+ self.do_render(tmx_file, minimap_file)
+ except Exception as e:
+ sys.stderr.write(u'\x1b[31m\x1b[1mError while rendering %s: %s\x1b[0m\n' % (self.map_name, e))
+ return 1
+ else:
+ return 0
+
+ def do_render(self, tmx_file, bitmap_file):
+ """
+ The map rendering implementation
+ """
+ platform_programs = MinimapRenderer.PROGRAMS.get(sys.platform, MinimapRenderer.PROGRAMS.get('default'))
+ # tmx rasterize
+ mrf, map_raster = tempfile.mkstemp(suffix='.png')
+ tmxrasterizer_cmd = [
+ platform_programs.get('tmxrasterizer'),
+ '--tilesize', str(self.tilesize),
+ ]
+ if self.useAntiAliasing:
+ tmxrasterizer_cmd.append('--anti-aliasing')
+ tmxrasterizer_cmd += [tmx_file, map_raster]
+ subprocess.check_call(tmxrasterizer_cmd)
+ if os.stat(map_raster).st_size == 0:
+ raise Exception('A problem was encountered when rendering a map')
+ # add cell-shading to the minimap to improve readability
+ ebf, edges_bitmap = tempfile.mkstemp(suffix='.png')
+ subprocess.check_call([
+ platform_programs.get('im_convert'), map_raster,
+ '-set', 'option:convolve:scale', '-1!',
+ '-morphology', 'Convolve', 'Laplacian:0',
+ '-colorspace', 'gray',
+ '-auto-level',
+ '-threshold', '2.8%',
+ '-negate',
+ '-transparent', 'white',
+ edges_bitmap
+ ])
+ subprocess.check_call([
+ platform_programs.get('im_convert'), map_raster, edges_bitmap,
+ '-compose', 'Dissolve',
+ '-define', 'compose:args=35',
+ '-composite',
+ bitmap_file
+ ])
+ os.unlink(map_raster)
+ os.unlink(edges_bitmap)
+
+ @staticmethod
+ def check_programs():
+ """
+ Checks the require programs are available
+ """
+ def which(program):
+ import os
+ def is_exe(fpath):
+ return os.path.isfile(fpath) and os.access(fpath, os.X_OK)
+ fpath, fname = os.path.split(program)
+ if fpath:
+ if is_exe(program):
+ return program
+ else:
+ for path in os.environ["PATH"].split(os.pathsep):
+ exe_file = os.path.join(path, program)
+ if is_exe(exe_file):
+ return exe_file
+ return None
+
+ platform_programs = MinimapRenderer.PROGRAMS.get(sys.platform, MinimapRenderer.PROGRAMS.get('default'))
+ for program in platform_programs.values():
+ if not which(program):
+ raise Exception('The required "%s" program is missing from your PATH.' % program)
+
+def usage():
+ sys.stderr.write(u'''Usage: %s MAP_NAME...
+
+ Example:
+ $ ./minimap-render.py 007-1
+ will render the map at maps/007-1.tmx in the graphics/minimaps directory.
+
+ For convenience,
+ $ ./minimap-render.py 007-1.tmx
+ is also acceptable, for e.g running things like,
+ $ ./minimap-render.py $(ls ../maps/)
+ that would render all existing maps.
+ \n''' % sys.argv[0])
+
+def main():
+ if not len(sys.argv) > 1:
+ usage()
+ return 127
+ if not os.path.basename(os.path.dirname(os.getcwdu())) == u'client-data':
+ sys.stderr.write(u'This script must be run from client-data/tools.\n')
+ return 1
+ try:
+ MinimapRenderer.check_programs()
+ except Exception as e:
+ sys.stderr.write(u'%s\n' % e)
+ return 126
+
+ status = 0
+ for map_name in sys.argv[1:]:
+ # Render tiles at 1 pixel size
+ map_renderer = MinimapRenderer(map_name, 1, True)
+ status += map_renderer.render()
+ return status
+
+if __name__ == '__main__':
+ sys.exit(main())