summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xgraphics/items/use-food-juice.pngbin794 -> 1027 bytes
-rwxr-xr-xgraphics/items/use-food-skull-mug.pngbin889 -> 636 bytes
-rwxr-xr-xgraphics/items/use-food-snapple.pngbin910 -> 1595 bytes
-rwxr-xr-xgraphics/items/use-food-zombie-nachos.pngbin1044 -> 1119 bytes
-rwxr-xr-xgraphics/particles/casket-lid.xml12
-rwxr-xr-xgraphics/particles/casket-monster.xml13
-rwxr-xr-xgraphics/particles/casket-trap_96x96.pngbin60924 -> 57126 bytes
-rwxr-xr-xgraphics/particles/gate-opening.xml4
-rwxr-xr-xgraphics/particles/pool-horiz-2.xml11
-rwxr-xr-xgraphics/particles/pool-horiz.xml4
-rwxr-xr-xgraphics/particles/pool-vert-2.xml11
-rwxr-xr-xgraphics/particles/pool-vert.xml5
-rwxr-xr-xgraphics/particles/pool_32x58.particle.pngbin4575 -> 0 bytes
-rwxr-xr-xgraphics/particles/pool_32x59.particle.pngbin0 -> 4416 bytes
-rwxr-xr-xgraphics/particles/pool_65x26.particle.pngbin4387 -> 0 bytes
-rwxr-xr-xgraphics/particles/pool_65x27.particle.pngbin0 -> 4450 bytes
-rwxr-xr-xgraphics/sprites/npcs/npc-gate-open.xml2
-rwxr-xr-xgraphics/sprites/npcs/npc-gate_224x192.pngbin25367 -> 104542 bytes
-rw-r--r--graphics/tiles/Crypt-Blockwall.pngbin293050 -> 293058 bytes
-rw-r--r--graphics/tiles/Crypt-Fringe.pngbin224070 -> 201001 bytes
-rw-r--r--graphics/tiles/Crypt-Fringe_x3.pngbin156570 -> 148821 bytes
-rwxr-xr-xmaps/027-3.tmx29
-rw-r--r--maps/027-4.tmx27
-rwxr-xr-xmaps/debugroom.tmx43
-rwxr-xr-xmonsters.xml4
25 files changed, 71 insertions, 94 deletions
diff --git a/graphics/items/use-food-juice.png b/graphics/items/use-food-juice.png
index f4a3288a..b21e7ce2 100755
--- a/graphics/items/use-food-juice.png
+++ b/graphics/items/use-food-juice.png
Binary files differ
diff --git a/graphics/items/use-food-skull-mug.png b/graphics/items/use-food-skull-mug.png
index 83d781f1..7ca071fe 100755
--- a/graphics/items/use-food-skull-mug.png
+++ b/graphics/items/use-food-skull-mug.png
Binary files differ
diff --git a/graphics/items/use-food-snapple.png b/graphics/items/use-food-snapple.png
index 445cecd2..d5502c50 100755
--- a/graphics/items/use-food-snapple.png
+++ b/graphics/items/use-food-snapple.png
Binary files differ
diff --git a/graphics/items/use-food-zombie-nachos.png b/graphics/items/use-food-zombie-nachos.png
index a96716b2..5049dec8 100755
--- a/graphics/items/use-food-zombie-nachos.png
+++ b/graphics/items/use-food-zombie-nachos.png
Binary files differ
diff --git a/graphics/particles/casket-lid.xml b/graphics/particles/casket-lid.xml
index a737fd6c..b5b353b9 100755
--- a/graphics/particles/casket-lid.xml
+++ b/graphics/particles/casket-lid.xml
@@ -2,16 +2,16 @@
<effect>
<!-- The lid opening portion of the casket trap-->
- <particle position-x="0" position-y="0" position-z="43" lifetime="110">
+ <particle position-x="0" position-y="0" position-z="43" lifetime="80">
<emitter>
<property name="position-y" value="37" />
- <property name="lifetime" value="110"/>
+ <property name="lifetime" value="80"/>
<property name="output" value="1"/>
- <property name="output-pause" value="15"/>
+ <property name="output-pause" value="12"/>
<animation imageset="graphics/particles/casket-trap_96x96.png" width="96" height="96">
- <frame index="11" delay="100"/>
- <frame index="12" delay="900"/>
- <frame index="11" delay="100"/>
+ <frame index="10" delay="250"/>
+ <frame index="11" delay="400"/>
+ <frame index="10" delay="150"/>
</animation>
</emitter>
</particle>
diff --git a/graphics/particles/casket-monster.xml b/graphics/particles/casket-monster.xml
index 8511851d..68e52dee 100755
--- a/graphics/particles/casket-monster.xml
+++ b/graphics/particles/casket-monster.xml
@@ -2,15 +2,18 @@
<effect>
<!-- The monster portion of the casket trap-->
- <particle position-x="100" position-y="0" position-z="97" lifetime="110">
+ <particle position-x="100" position-y="0" position-z="97" lifetime="80">
<emitter>
<property name="position-y" value="114" />
- <property name="lifetime" value="110"/>
+ <property name="lifetime" value="80"/>
<property name="output" value="1"/>
- <property name="output-pause" value="15"/>
+ <property name="output-pause" value="12"/>
<animation imageset="graphics/particles/casket-trap_96x96.png" width="96" height="96">
- <sequence start="0" end="9" delay="100" />
- <frame index="0" delay="100"/>
+ <frame index="0" delay="250"/>
+ <sequence start="1" end="3" delay="70" />
+ <frame index="4" delay="120"/>
+ <frame index="1" delay="70"/>
+ <frame index="0" delay="150"/>
</animation>
</emitter>
</particle>
diff --git a/graphics/particles/casket-trap_96x96.png b/graphics/particles/casket-trap_96x96.png
index 7839fbe8..ffba9984 100755
--- a/graphics/particles/casket-trap_96x96.png
+++ b/graphics/particles/casket-trap_96x96.png
Binary files differ
diff --git a/graphics/particles/gate-opening.xml b/graphics/particles/gate-opening.xml
index 7292bf4d..26d82882 100755
--- a/graphics/particles/gate-opening.xml
+++ b/graphics/particles/gate-opening.xml
@@ -4,8 +4,8 @@
<!-- The gate opening animation -->
<particle position-x="0" position-y="0" position-z="32">
<animation imageset="graphics/sprites/npcs/npc-gate_224x192.png" width="224" height="192">
- <sequence start="0" end="2" delay="100" />
- <frame index="3" />
+ <sequence start="0" end="4" delay="100" />
+ <frame index="5" />
</animation>
</particle>
</effect>
diff --git a/graphics/particles/pool-horiz-2.xml b/graphics/particles/pool-horiz-2.xml
new file mode 100755
index 00000000..4b909ce4
--- /dev/null
+++ b/graphics/particles/pool-horiz-2.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+
+<effect>
+ <!-- The gate opening animation -->
+ <particle position-x="16" position-y="0" position-z="44">
+ <animation imageset="graphics/particles/pool_65x27.particle.png" width="65" height="27">
+ <sequence start="3" end="7" delay="235" />
+ <sequence start="0" end="2" delay="235" />
+ </animation>
+ </particle>
+</effect>
diff --git a/graphics/particles/pool-horiz.xml b/graphics/particles/pool-horiz.xml
index 80a5c31d..617f5594 100755
--- a/graphics/particles/pool-horiz.xml
+++ b/graphics/particles/pool-horiz.xml
@@ -3,8 +3,8 @@
<effect>
<!-- The gate opening animation -->
<particle position-x="16" position-y="0" position-z="44">
- <animation imageset="graphics/particles/pool_65x26.particle.png" width="65" height="26">
- <sequence start="0" end="3" delay="400" />
+ <animation imageset="graphics/particles/pool_65x27.particle.png" width="65" height="27">
+ <sequence start="0" end="7" delay="235" />
</animation>
</particle>
</effect>
diff --git a/graphics/particles/pool-vert-2.xml b/graphics/particles/pool-vert-2.xml
new file mode 100755
index 00000000..f8aff50c
--- /dev/null
+++ b/graphics/particles/pool-vert-2.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+
+<effect>
+ <!-- The gate opening animation -->
+ <particle position-x="0" position-y="0" position-z="60">
+ <animation imageset="graphics/particles/pool_32x59.particle.png" width="32" height="59">
+ <sequence start="4" end="7" delay="235" />
+ <sequence start="0" end="3" delay="235" />
+ </animation>
+ </particle>
+</effect>
diff --git a/graphics/particles/pool-vert.xml b/graphics/particles/pool-vert.xml
index 6be72a1c..575068d4 100755
--- a/graphics/particles/pool-vert.xml
+++ b/graphics/particles/pool-vert.xml
@@ -3,8 +3,9 @@
<effect>
<!-- The gate opening animation -->
<particle position-x="0" position-y="0" position-z="60">
- <animation imageset="graphics/particles/pool_32x58.particle.png" width="32" height="58">
- <sequence start="0" end="3" delay="400" />
+ <animation imageset="graphics/particles/pool_32x59.particle.png" width="32" height="59">
+ <sequence start="2" end="7" delay="235" />
+ <sequence start="0" end="1" delay="235" />
</animation>
</particle>
</effect>
diff --git a/graphics/particles/pool_32x58.particle.png b/graphics/particles/pool_32x58.particle.png
deleted file mode 100755
index ba7e13b4..00000000
--- a/graphics/particles/pool_32x58.particle.png
+++ /dev/null
Binary files differ
diff --git a/graphics/particles/pool_32x59.particle.png b/graphics/particles/pool_32x59.particle.png
new file mode 100755
index 00000000..ad362139
--- /dev/null
+++ b/graphics/particles/pool_32x59.particle.png
Binary files differ
diff --git a/graphics/particles/pool_65x26.particle.png b/graphics/particles/pool_65x26.particle.png
deleted file mode 100755
index 0be73c63..00000000
--- a/graphics/particles/pool_65x26.particle.png
+++ /dev/null
Binary files differ
diff --git a/graphics/particles/pool_65x27.particle.png b/graphics/particles/pool_65x27.particle.png
new file mode 100755
index 00000000..299e4f25
--- /dev/null
+++ b/graphics/particles/pool_65x27.particle.png
Binary files differ
diff --git a/graphics/sprites/npcs/npc-gate-open.xml b/graphics/sprites/npcs/npc-gate-open.xml
index 893f5dbf..6445c4fd 100755
--- a/graphics/sprites/npcs/npc-gate-open.xml
+++ b/graphics/sprites/npcs/npc-gate-open.xml
@@ -4,7 +4,7 @@
<action name="stand" imageset="base">
<animation direction="default">
<!-- Open gate -->
- <frame index="3" />
+ <frame index="5" />
</animation>
</action>
</sprite>
diff --git a/graphics/sprites/npcs/npc-gate_224x192.png b/graphics/sprites/npcs/npc-gate_224x192.png
index 81800b78..6fcbfd8c 100755
--- a/graphics/sprites/npcs/npc-gate_224x192.png
+++ b/graphics/sprites/npcs/npc-gate_224x192.png
Binary files differ
diff --git a/graphics/tiles/Crypt-Blockwall.png b/graphics/tiles/Crypt-Blockwall.png
index ec7b3949..befef9d3 100644
--- a/graphics/tiles/Crypt-Blockwall.png
+++ b/graphics/tiles/Crypt-Blockwall.png
Binary files differ
diff --git a/graphics/tiles/Crypt-Fringe.png b/graphics/tiles/Crypt-Fringe.png
index 9389469e..1ae63a5b 100644
--- a/graphics/tiles/Crypt-Fringe.png
+++ b/graphics/tiles/Crypt-Fringe.png
Binary files differ
diff --git a/graphics/tiles/Crypt-Fringe_x3.png b/graphics/tiles/Crypt-Fringe_x3.png
index e803c6a2..90911abd 100644
--- a/graphics/tiles/Crypt-Fringe_x3.png
+++ b/graphics/tiles/Crypt-Fringe_x3.png
Binary files differ
diff --git a/maps/027-3.tmx b/maps/027-3.tmx
index e9d9f106..50cc964c 100755
--- a/maps/027-3.tmx
+++ b/maps/027-3.tmx
@@ -1,53 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
<map version="1.0" orientation="orthogonal" width="150" height="90" tilewidth="32" tileheight="32">
<properties>
<property name="music" value="Faith.ogg"/>
<property name="name" value="Crypt"/>
</properties>
<tileset firstgid="1" name="Crypt-Archways" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/Crypt-Archways.png" width="512" height="512"/>
+ <image source="../graphics/tiles/Crypt-Archways.png"/>
</tileset>
<tileset firstgid="257" name="Crypt-Blockwall" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/Crypt-Blockwall.png" width="512" height="512"/>
+ <image source="../graphics/tiles/Crypt-Blockwall.png"/>
</tileset>
<tileset firstgid="513" name="Crypt-Fringe" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/Crypt-Fringe.png" width="512" height="512"/>
+ <image source="../graphics/tiles/Crypt-Fringe.png"/>
</tileset>
<tileset firstgid="769" name="Crypt-Fringe_x3" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/Crypt-Fringe_x3.png" width="512" height="512"/>
+ <image source="../graphics/tiles/Crypt-Fringe_x3.png"/>
</tileset>
<tileset firstgid="1025" name="collision" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/collision.png" trans="000000" width="64" height="32"/>
+ <image source="../graphics/tiles/collision.png" trans="000000"/>
</tileset>
<layer name="Ground" width="150" height="90">
<data encoding="base64" compression="gzip">
- H4sIAAAAAAAAA+3YsVHEMBBA0XMDQEVABUAHFH4JFVDDkZAxg2xW7K78ghdrpP0zlnXdLpcrAAAAAAAAAAAAAEzwFCx7P9TwGix7P9TwHix7P9TwESx7P9SgK2bQFTPoihnO3pW3FF3N4C1FVzN4S9HVDJ9FZJ+DrnSV5W4bu38+b/FdPQ6se//locA56Wqf0fvn2xbf1cuO9bPPSVf7jN4/o5v61un+23nO/21WLyvexXSlK13pSlfrye5FV2vK7kVXa8ruRVdryu4luivvSTVk9xLdma5qyO5DV2vK7mN2V7/t/0gnuqrd4F/W1tU6Mrsa5TvYj650tVpXo7PUVT+VuvppthlN6WrtrjJlz6U7XelKV7rqwv+grnSlqy50pStdjc38SCe60pWu6uvYle9gfbrSla501YWudKUrXXWhK13pSldd6EpXutJVF7rSla7GZn6kE13pSlf1dezKd7A+XelKV7rqQle60pWuutCVrnSlqy50pauzyuhKWwAAAAAAAACc3Q38dDUI8NIAAA==
+ H4sIAAAAAAAAC+3YsVHEMBBA0XMDQEVABUAHFH4JFVDDkZAxg2xW7K78ghdrpP0zlnXdLpcrAAAAAAAAAAAAAEzwFCx7P9TwGix7P9TwHix7P9TwESx7P9SgK2bQFTPoihnO3pW3FF3N4C1FVzN4S9HVDJ9FZJ+DrnSV5W4bu38+b/FdPQ6se//locA56Wqf0fvn2xbf1cuO9bPPSVf7jN4/o5v61un+23nO/21WLyvexXSlK13pSlfrye5FV2vK7kVXa8ruRVdryu4luivvSTVk9xLdma5qyO5DV2vK7mN2V7/t/0gnuqrd4F/W1tU6Mrsa5TvYj650tVpXo7PUVT+VuvppthlN6WrtrjJlz6U7XelKV7rqwv+grnSlqy50pStdjc38SCe60pWu6uvYle9gfbrSla501YWudKUrXXWhK13pSldd6EpXutJVF7rSla7GZn6kE13pSlf1dezKd7A+XelKV7rqQle60pWuutCVrnSlqy50pauzyuhKWwAAAAAAAACc3Q38dDUI8NIAAA==
</data>
</layer>
<layer name="Fringe2" width="150" height="90">
<data encoding="base64" compression="gzip">
- H4sIAAAAAAAAA+3ZYUoCQRjH4Vn3UlpkniA7QXWh6gTmLRXxiy8MfQss8I+5PA+8sMwuAzP8vm1rAAAAAAAAAAAAAAAAAAAAAAAA/8d6aO15uPy+T0Pfm/Pe654+aj4ndF+vdZa3wHlehr43523qnr5qtu6LC9IVCboiQVck6IoEXZGgKxJ0RYKuSNAVCbrK+P4/NrV/ZL+lKxJ0RYKuSNAVCboiQVck6IoEXZGgKxJ0RYKuSNAVCboiYcpd7cc+D7PWljWPNaua49jfz+t5UXNXcz/ra8cfvj/U2m683jlu0ZS74np0RYKuSNAVCboiQVck6IoEXZGgKwAAAAAAAAAAAAAAAADgr06ndCEM8NIAAA==
+ H4sIAAAAAAAAC+3ZYUoCQRjH4Vn3UlpkniA7QXWh6gTmLRXxiy8MfQss8I+5PA+8sMwuAzP8vm1rAAAAAAAAAAAAAAAAAAAAAAAA/8d6aO15uPy+T0Pfm/Pe654+aj4ndF+vdZa3wHlehr43523qnr5qtu6LC9IVCboiQVck6IoEXZGgKxJ0RYKuSNAVCbrK+P4/NrV/ZL+lKxJ0RYKuSNAVCboiQVck6IoEXZGgKxJ0RYKuSNAVCboiYcpd7cc+D7PWljWPNaua49jfz+t5UXNXcz/ra8cfvj/U2m683jlu0ZS74np0RYKuSNAVCboiQVck6IoEXZGgKwAAAAAAAAAAAAAAAADgr06ndCEM8NIAAA==
</data>
</layer>
<layer name="Fringe" width="150" height="90">
<data encoding="base64" compression="gzip">
- H4sIAAAAAAAAA+2dy48URRzHu2eCPFUu8ha98NpVeYMo7C6sKMju8pTnsuzChQOQcOMgBIOeFPaw6oWoF/WyES/qxX+EhJAYLwLrH+AqJH4rmQ7N8KvqnpmqflR/P8knk3R39aPmm5nq+vVkgoAQQgghhBBCCCGEEEIIIYQQQgghhBBCCCGEEPt8XrO/zy8c7JOUi3Wh/X2+5WCfpFwwV8QFzBVxAXNFXMBcERdIudqA+7mNcBPcLNzbJa1nrkjVP6/UPEtvKGtC16YTfZqfqXqu1PXv12hC16YTy9RvSUi5mlEPghfgTDir/vz62Vg2B86F84T1Zeofdf1nNJrQtenEMvVbElKuXkFWFsCFcJGQm8VYtgQuhcs8yFVRKFO/mVgbyv26AllZCVfB1UJu1mBZF+yGbzBX1ihTv6XhJq7nliXHS9Y3Ua4GMGYehEM5jp19y9VPuJ47lvy5hb4pwmdFdA7DyNNpOBLLVdbvs2+5yosi5eoC8nQRXsowV+rYf9aeylzZoUi5+hjv61V4jbnKlPOGcYdpnYki5SpiBVwJVwXMVRZcMWTHtM5E2lypOfGXQ3fqYK7MSPc6Lu9/0u47ba5Mc+I21MFcmZHudaRlro63vR4EO2AP7IV9jTmv20JtTqqRuc7VXRzjIXwEp+Df8H7AXCUh3etIy1wdbwA5GoRDcD880MjVZC1djcxUa7HhPzjGNPwX/gcfwycBc5WEdK8jLWt3/J10vGHk6DQcgWfgaCNXv9fS1cjyGt8zV3Zod/xtk7xydQN+Cj9LOBebVCVXRSCvXE3AL+FX8GvDudiEucqOtLkyvQe6HDa3udzU5nu8/gB/THEMGzBX6YiPz/4Ik1XEa97jLYyvbOTqk6Y2v+D1V/hbimPYgLlKR6vjM9Wv38BvG34He8Jn5yzV3EOf0N89of55Xmn7NG3i34EK5so+11NkJM02JqRcDQnzSweE/lbbbYVvw23wHfgu3K7ZPmqzXmizpdEm/h2oYK7KSZpc3TDk6gO4B+6FH8J9cCAhVzuFNu832sS/AxXMVeckzV2twfou2G1xLkL1a/zZL/Xs1kj47HzWBBwV+lttdwwehyfgSXgKDmu2j9ocFNoc1bRhrjonj7mrIjzPoGMsYK7Kyu0CzMOaYK7KySRz5X2ubNQGbdUXm2F9sLzYGF+5GqMxV8QFzFW5eRHX9pJ65hfOT/HZ0+r27eKqjtPJMWxQhVzdrQfBq7i25fA1+Dq8J/yWOeKesH20H9swV+XkL2ThAXxTXRtcC9fBKUNGpoTtHzb2YxvpPXdRH2yGufIbKVdRrW8D3Ag3wc3h01qfRFRTnAVnwzlwbqivKTJXfqPLlar17YL98D24O1brk4hqiovgYrgELg31NUXmym+kXEW1vkPwMDwCPzLU+qI2rdQUmSu/4TxDdTmb8TxDFjBX9jhYwJodc0VcwFz5z64KPafFXPkNc+UP/QUaZ/laxyH5wlxVk52OP9t8rQ+SfNHVcWYKtb55CXUc0+8Hm2Gu/EaXq4VCrW9ZQq5Mvx9shrmyx7k2v9MOZzzf3m59sEi/HyT54us8Q5U5VID5BuaqGoxlnDXmiriAuSKEEEIIIYQQQvwi+k8iQlzwOO8TIIQQQgjxhPh/iRJig+m8T4AQUij+B6nzEkfw0gAA
+ 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
</data>
</layer>
<layer name="Over2" width="150" height="90">
<data encoding="base64" compression="gzip">
- H4sIAAAAAAAAA+3ZMQ6AIAwF0MJtxPufxsuocWcSEXgv6djkD39qIwAAAAAAAAAAAAAAAAAAAAAAAOBxpN4JAAAAAICR3DfF2ry1w1r0CgAAAACYmZslMDJ/HFrQKwC+tOWIcs2eeycBAAAAgP/zx6EFvQIAAAAAAAAAAAAAAAAAVnUCVI9a//DSAAA=
+ H4sIAAAAAAAAC+3ZMQ6AIAwF0MJtxPufxsuocWcSEXgv6djkD39qIwAAAAAAAAAAAAAAAAAAAAAAAOBxpN4JAAAAAICR3DfF2ry1w1r0CgAAAACYmZslMDJ/HFrQKwC+tOWIcs2eeycBAAAAgP/zx6EFvQIAAAAAAAAAAAAAAAAAVnUCVI9a//DSAAA=
</data>
</layer>
<layer name="Over" width="150" height="90">
<data encoding="base64" compression="gzip">
- H4sIAAAAAAAAA+3cS27TUBQGYMdA5+U1bykdVuyAMbACYMIKWQflMUeiWUBpmQMBieNhhH25Chzia32f9CsDO1Iev68tHyVdBwAAAAAAAAAAAAAAQKZV33V95EbkZuRW5KCv3w5jDqMjtyN3Incj9yL3+/rtMOYoOnIceRA5iTyMnPb12wEAgHxHO1yDu24HYG7OVvt+Be27is/wS2JeN3j9oFdk0Csy6BUZ9Kre49V4+J1e1XsTOY+8jbyLvI982Osrmi+9IoNekUGvyLD0XpXuWV5PvPddnsO2pfeq9P4eTWzb5Tls21TOEsaO0yd91z2NPCvMGUr71M4/rBHLNXacPo+uvIi8LPSqtM+wLnyqiDViuaa+21cVM9GpfZZ+DubPMtYMvUKvyKBXZNArMuyzVxfuRyzWPntVcy/C/Yg2OQ+SodVemQ/OW6u9Mh+ct1Z7xbzpFRn0igx6RQa9IoNekUGvyKBXZNArMugVGVrtlfngvLXaK/PBeWu1V8ybXpFBr8igV2TQKzLoFRn0igx6RQa9IkPpN8fDbGPqv81LM5G1XlEwrGVT/23+P9ek2t/b/+s4PnIMvfoYj5eRz5GryHVk3TnXsbuhV1/j8Vvke2QT+RH52ekVAAAAAAAA/I1fGSQR0vDSAAA=
+ H4sIAAAAAAAAC+3cyW7TUBQG4BsX2DEPO4Yy7Sh9g66BJwA2PCHPwbivFLqGkrIHChLHEpWosM1V4BA7+j7pVxa+jjL8vrZ8lZQCAAAAAAAAAAAAAABApllTShPZiJyInIycauq3Q5fz0ZELkYuRS5HLkStN/XboshkduRm5FbkduRO529RvBwAA8m0ucQ3uuh2AsdmarfoVTN8iPsNPiXk+wesHvSKDXpFBr8igV/V2Zt3hd3pV70XkZeRV5HXkTeTtSl/ReOkVGfSKDHpFhnXv1dA9y4Oe977MPhy37r0aen/bPduW2YfjDivXErqO0wdNKQ8jjwbWGYbG1K5/mCPWV9dx+ji68iTydKBXQ2PaeWFeEXPE+ur7bp9VrIn2jVn3czB/ljFn6BV6RQa9IoNekWGVvXrnfsTaWmWvau5FuB8xTc6DZJhqr6wPjttUe2V9cNx+/TxPN6WciZyNnKu439433nmQo17tbpRyNbpxLXI9ciMy3+jfb94x/uh59Iq2V++jCx8i96IbW5H7ke3IYqBXi47x+z+fR6+Y6vUV46ZXZNArMugVGfSKDHpFBr0iw1R7ZX1w3KbaK+uD4zbVXjFuekUGvSKDXpFBr8igV2TQKzLoFRn0igxDvzlu1zb6/tt8aE1kT68Y0M5lff9t/j/npNrf2//rOD5ytL3ajcf9yMfIInIQ2SvOdSyv7dXnePwS+Ro5jHyLfC96BQAAAAAAAH/jB+KsCq/w0gAA
</data>
</layer>
<layer name="Collision" width="150" height="90">
<data encoding="base64" compression="gzip">
- H4sIAAAAAAAAA+3Sy4rDMBAEwBD2/795T4EQ4pcsuTVxDdQlIEea7uff4/EEAAAAAAAAAAAAAACgq96Tfg9z0CtG0CtGWOvGVnf0iiW9J/0e5qBXjLDWja3u6BVL7t6rWSa9h9n3mn5P+v2tk97D7HtNv6f1/emOpfegV3pVwd33837vq99RcW+zT3o/W3vSq/G92tp/6zdnkLzfjPvQK71K7+vb/np37+i30/vRq9/o1ee90vtZ61Yqowr25Dxq1nb27be0b/fXq327OtqFnnM2u8To1fy9OnIHvZpbxdn7lpa3Hz2jV3qlV/PpNa9vnflvvfodvUav9GpPBlvTmp9e3UPv0Ste++zZL71itl7NNOlcqkvmMfOkc6muQh6JSedS3WuHPXIYlUdi0rlU996JszmMyiMx6Vyqq5DH0f9oudcV77iT3qNX6JVe6VV7R1rOpHP5dTPsW6/qWZulfW+d0St6j15RtVdXTDqX6nplMDKPxKRzqe5zlzPmkZh0LtVVyCMx6VyqO7rrRB6JSedSXYU8jv5Hy72ueMedLGWgV/Tu1ZnRK3r06vMbekWPXl2Rx9mOtJxJ51Jd79ErPvfZ2rP3c3pFa4/WpsIdU++4k63dzpBHYtK5VNey76vzSEw6l+oq5JGYdC6Mp1cAAAAAAAAAcL1/pVRfLPDSAAA=
+ H4sIAAAAAAAAC+3Sy4rDMBAEwBD2/795T4EQ4pcsuTVxDdQlIEea7uff4/EEAAAAAAAAAAAAAACgq96Tfg9z0CtG0CtGWOvGVnf0iiW9J/0e5qBXjLDWja3u6BVL7t6rWSa9h9n3mn5P+v2tk97D7HtNv6f1/emOpfegV3pVwd33837vq99RcW+zT3o/W3vSq/G92tp/6zdnkLzfjPvQK71K7+vb/np37+i30/vRq9/o1ee90vtZ61Yqowr25Dxq1nb27be0b/fXq327OtqFnnM2u8To1fy9OnIHvZpbxdn7lpa3Hz2jV3qlV/PpNa9vnflvvfodvUav9GpPBlvTmp9e3UPv0Ste++zZL71itl7NNOlcqkvmMfOkc6muQh6JSedS3WuHPXIYlUdi0rlU996JszmMyiMx6Vyqq5DH0f9oudcV77iT3qNX6JVe6VV7R1rOpHP5dTPsW6/qWZulfW+d0St6j15RtVdXTDqX6nplMDKPxKRzqe5zlzPmkZh0LtVVyCMx6VyqO7rrRB6JSedSXYU8jv5Hy72ueMedLGWgV/Tu1ZnRK3r06vMbekWPXl2Rx9mOtJxJ51Jd79ErPvfZ2rP3c3pFa4/WpsIdU++4k63dzpBHYtK5VNey76vzSEw6l+oq5JGYdC6Mp1cAAAAAAAAAcL1/pVRfLPDSAAA=
</data>
</layer>
<objectgroup name="Objects" width="150" height="90">
@@ -63,10 +62,10 @@
<object name="graphics/particles/portal.particle.xml" type="PARTICLE_EFFECT" x="1360" y="2528"/>
<object name="graphics/particles/portal.particle.xml" type="PARTICLE_EFFECT" x="1264" y="2528"/>
<object name="Gate Placeholder" x="1216" y="1824" width="192" height="32"/>
- <object name="graphics/particles/pool-vert.xml" type="PARTICLE_EFFECT" x="1680" y="1248"/>
+ <object name="graphics/particles/pool-vert-2.xml" type="PARTICLE_EFFECT" x="1680" y="1248"/>
<object name="graphics/particles/pool-horiz.xml" type="PARTICLE_EFFECT" x="1424" y="928"/>
- <object name="graphics/particles/pool-horiz.xml" type="PARTICLE_EFFECT" x="1168" y="928"/>
- <object name="graphics/particles/pool-vert.xml" type="PARTICLE_EFFECT" x="944" y="1248"/>
+ <object name="graphics/particles/pool-horiz-2.xml" type="PARTICLE_EFFECT" x="1168" y="928"/>
+ <object name="graphics/particles/pool-vert-2.xml" type="PARTICLE_EFFECT" x="944" y="1248"/>
<object name="graphics/particles/pool-vert.xml" type="PARTICLE_EFFECT" x="784" y="1248"/>
<object name="graphics/particles/pool-vert.xml" type="PARTICLE_EFFECT" x="3120" y="1056"/>
</objectgroup>
diff --git a/maps/027-4.tmx b/maps/027-4.tmx
index b1631188..018f3f2e 100644
--- a/maps/027-4.tmx
+++ b/maps/027-4.tmx
@@ -1,56 +1,55 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
<map version="1.0" orientation="orthogonal" width="80" height="100" tilewidth="32" tileheight="32">
<properties>
<property name="music" value=""/>
<property name="name" value="Inner Chamber"/>
</properties>
<tileset firstgid="1" name="Crypt-Archways" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/Crypt-Archways.png" width="512" height="512"/>
+ <image source="../graphics/tiles/Crypt-Archways.png"/>
</tileset>
<tileset firstgid="257" name="Crypt-Blockwall" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/Crypt-Blockwall.png" width="512" height="512"/>
+ <image source="../graphics/tiles/Crypt-Blockwall.png"/>
</tileset>
<tileset firstgid="513" name="Crypt-Fringe" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/Crypt-Fringe.png" width="512" height="512"/>
+ <image source="../graphics/tiles/Crypt-Fringe.png"/>
</tileset>
<tileset firstgid="769" name="Crypt-Fringe_x3" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/Crypt-Fringe_x3.png" width="512" height="512"/>
+ <image source="../graphics/tiles/Crypt-Fringe_x3.png"/>
</tileset>
<tileset firstgid="1025" name="arena" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/arena.png" width="512" height="512"/>
+ <image source="../graphics/tiles/arena.png"/>
</tileset>
<tileset firstgid="1281" name="collision" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/collision.png" trans="000000" width="64" height="32"/>
+ <image source="../graphics/tiles/collision.png" trans="000000"/>
</tileset>
<layer name="Ground" width="80" height="100">
<data encoding="base64" compression="gzip">
- H4sIAAAAAAAAA+3QsQ3CUBQEQVMZJVAChbsIWnCOHHwZS/dOTDDpBrs/tm0HAAAAAAAAAAAA/t7zort7q/1pXhfd3VvtT/O+6HPil9639JdVZx8mSH/xz78G6U/++TdR+ot//jVIf/LPv4nSX/zzr0H6k3/+TZT+4p9/DdKf/PNvovQX//xrkP7kn38Tpb/451+D9Cf//Jso/cU//xqkP/nn30TpL/751yD9yT//Jkp/8c+/BulP7f8AAAAAAADodQC1dlnFAH0AAA==
+ H4sIAAAAAAAAC+3QsQ3CUBQEQVMZJVAChbsIWnCOHHwZS/dOTDDpBrs/tm0HAAAAAAAAAAAA/t7zort7q/1pXhfd3VvtT/O+6HPil9639JdVZx8mSH/xz78G6U/++TdR+ot//jVIf/LPv4nSX/zzr0H6k3/+TZT+4p9/DdKf/PNvovQX//xrkP7kn38Tpb/451+D9Cf//Jso/cU//xqkP/nn30TpL/751yD9yT//Jkp/8c+/BulP7f8AAAAAAADodQC1dlnFAH0AAA==
</data>
</layer>
<layer name="Fringe2" width="80" height="100">
<data encoding="base64" compression="gzip">
- H4sIAAAAAAAAA+3XwQnCQBBA0Q3YgFd7VyswtujW4FeTyHsw9+GzLMwY+3JdxrjNuS9bb3JM+jX6Nfo1+jX6Nfo1+jX6Nfo1+jX6Nfo1+jX6Nfo1+jX6Nfo1+jX6Nfo1+jX6Nfo1+jX6Nfo1+jX6Nfo1+jX6Nfo1j9ltnfPUDwAA+IDzaesNAAAA+BY3HwAAwH9w3/FrF28OODj/GAAAAAAAAAAA73oBr3x3qAB9AAA=
+ H4sIAAAAAAAAC+3XwQnCQBBA0Q3YgFd7VyswtujW4FeTyHsw9+GzLMwY+3JdxrjNuS9bb3JM+jX6Nfo1+jX6Nfo1+jX6Nfo1+jX6Nfo1+jX6Nfo1+jX6Nfo1+jX6Nfo1+jX6Nfo1+jX6Nfo1+jX6Nfo1+jX6Nfo1j9ltnfPUDwAA+IDzaesNAAAA+BY3HwAAwH9w3/FrF28OODj/GAAAAAAAAAAA73oBr3x3qAB9AAA=
</data>
</layer>
<layer name="Fringe" width="80" height="100">
<data encoding="base64" compression="gzip">
- H4sIAAAAAAAAA+3ZSU7DQABE0XYiZrbMbJkRygHIcABIcgBIch84JSehJC8sWWLhrk6C2/9JtbHkVvyVXYfwfwyKEH561V6Kbf+idqGfh34e+nno56Gfh34e+nno56Gfh34e+nno56Gfh34e+nno56Gfh34e+nno56Gfh34e+nno56Gfh34e+nno56Gfh34e+oXw1Yt7b6xWk1q/UVE+T+U78rdt0iDye2d6b17rNy3K56m04f8c22+p91a1fouifJ5Kzv02gX4e+nno5+lyv4N+CIfakXbcjzujy/0u1OxSu9Ku6dfYg5o9ak/ac0f7veq7h9pIG2uTyA6x2t7vTb3etak20+YJ++3orF1tT9v/49y29/vQd31qC22prRL2O9FZp9qZdp5pv3W6UbNb7U67p99a0M9DPw/9PPTz0M9DPw/9PPTz0M9DPw/9PPTz0M9DPw/9PDn1S3Ef2VRO/VLcRzaVU78U95FN5dRvG+hXiblLpl8l5i6ZfpWYu2T6eejnoZ+Hfh76eejnoZ+Hfh76edrQDwAAAAAAAAAAAOiyX46JeREAfQAA
+ H4sIAAAAAAAAC+3ZSU7DQABE0XYiZrbMbJkRygHIcABIcgBIch84JSehJC8sWWLhrk6C2/9JtbHkVvyVXYfwfwyKEH561V6Kbf+idqGfh34e+nno56Gfh34e+nno56Gfh34e+nno56Gfh34e+nno56Gfh34e+nno56Gfh34e+nno56Gfh34e+nno56Gfh34e+oXw1Yt7b6xWk1q/UVE+T+U78rdt0iDye2d6b17rNy3K56m04f8c22+p91a1fouifJ5Kzv02gX4e+nno5+lyv4N+CIfakXbcjzujy/0u1OxSu9Ku6dfYg5o9ak/ac0f7veq7h9pIG2uTyA6x2t7vTb3etak20+YJ++3orF1tT9v/49y29/vQd31qC22prRL2O9FZp9qZdp5pv3W6UbNb7U67p99a0M9DPw/9PPTz0M9DPw/9PPTz0M9DPw/9PPTz0M9DPw/9PDn1S3Ef2VRO/VLcRzaVU78U95FN5dRvG+hXiblLpl8l5i6ZfpWYu2T6eejnoZ+Hfh76eejnoZ+Hfh76edrQDwAAAAAAAAAAAOiyX46JeREAfQAA
</data>
</layer>
<layer name="Over2" width="80" height="100">
<data encoding="base64" compression="gzip">
- H4sIAAAAAAAAA+3BMQEAAADCoPVP7WENoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABucSjRWwB9AAA=
+ H4sIAAAAAAAAC+3BMQEAAADCoPVP7WENoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABucSjRWwB9AAA=
</data>
</layer>
<layer name="Over" width="80" height="100">
<data encoding="base64" compression="gzip">
- H4sIAAAAAAAAA+3QQQ0AIAwEwat/i1QCHvjiANLMJGtgEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAG6rkv1pXa/vAAAAAAAAMN0BRflnPAB9AAA=
+ H4sIAAAAAAAAC+3QQQ0AIAwEwat/i1QCHvjiANLMJGtgEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAG6rkv1pXa/vAAAAAAAAMN0BRflnPAB9AAA=
</data>
</layer>
<layer name="Collision" width="80" height="100">
<data encoding="base64" compression="gzip">
- H4sIAAAAAAAAA+3SQQrCQABDURG8/5XdulKK1ST6An9XZspjrrfL5SpJkiRJkiRJkvSkx6X/ZTF+/Pjtxo8fv9348eO3Gz9+/Hbjx49fj0HT0i78+C3UurRL2u/d89Mu/Lb93l3a5Sy/lHPa5Qy/T77TV+emXc7y+9T+wS+5tAs/fgu1Lu3Cj99CrUu78OO3UOvSLvz4LdS6tAs/fgu1Lu3Cr8vv295pF35dft9e2oXf7/kduTPt0uZ39M60S6Pf0e8Xal3ahR+/hVqXduHHb6HWpV348VuodWkXSZIkSZIkSZIk/X53Jem+HQB9AAA=
+ H4sIAAAAAAAAC+3SQQrCQABDURG8/5XdulKK1ST6An9XZspjrrfL5SpJkiRJkiRJkvSkx6X/ZTF+/Pjtxo8fv9348eO3Gz9+/Hbjx49fj0HT0i78+C3UurRL2u/d89Mu/Lb93l3a5Sy/lHPa5Qy/T77TV+emXc7y+9T+wS+5tAs/fgu1Lu3Cj99CrUu78OO3UOvSLvz4LdS6tAs/fgu1Lu3Cr8vv295pF35dft9e2oXf7/kduTPt0uZ39M60S6Pf0e8Xal3ahR+/hVqXduHHb6HWpV348VuodWkXSZIkSZIkSZIk/X53Jem+HQB9AAA=
</data>
</layer>
<objectgroup name="Objects" width="80" height="100">
@@ -62,7 +61,7 @@
</properties>
</object>
<object name="graphics/particles/pool-horiz.xml" type="PARTICLE_EFFECT" x="1392" y="1312"/>
- <object name="graphics/particles/pool-horiz.xml" type="PARTICLE_EFFECT" x="1648" y="1440"/>
+ <object name="graphics/particles/pool-horiz-2.xml" type="PARTICLE_EFFECT" x="1648" y="1440"/>
<object name="graphics/particles/pool-horiz.xml" type="PARTICLE_EFFECT" x="1008" y="2048"/>
</objectgroup>
</map>
diff --git a/maps/debugroom.tmx b/maps/debugroom.tmx
deleted file mode 100755
index 007f0f36..00000000
--- a/maps/debugroom.tmx
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" width="50" height="50" tilewidth="32" tileheight="32">
- <properties>
- <property name="music" value="Magick - Real.ogg"/>
- <property name="name" value="Woodland mining camp"/>
- </properties>
- <tileset firstgid="1" name="Woodland Indoor" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/woodland_indoor.png"/>
- </tileset>
- <tileset firstgid="257" name="Woodland Indoor x2" tilewidth="32" tileheight="64">
- <image source="../graphics/tiles/woodland_indoor_x2.png"/>
- </tileset>
- <tileset firstgid="275" name="Woodland Indoor x3" tilewidth="32" tileheight="96">
- <image source="../graphics/tiles/woodland_indoor_x3.png"/>
- </tileset>
- <tileset firstgid="291" name="Woodland Village" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/Woodland_village.png"/>
- </tileset>
- <tileset firstgid="547" name="Unbenannt" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/collision.png"/>
- </tileset>
- <layer name="Ground" width="50" height="50">
- <data encoding="base64" compression="gzip">
- H4sIAAAAAAAAC+3UUQ2DQABEwasEJFAHeAAUtFUA+JfAKbiQptn0yGwyAt7PTqWUCQAAAC54BCQ6hoBExxiQ6HgG6Phdx1wtDWsnHa/q3fDRoeOLjq3aG45OOu7yV710JJboAAAAgH9xAv9kaOkQJwAA
- </data>
- </layer>
- <layer name="Fringe" width="50" height="50">
- <data encoding="base64" compression="gzip">
- H4sIAAAAAAAAC+3BAQ0AAADCoPdPbQ43oAAAAAAAAAAAAODfAC7KO00QJwAA
- </data>
- </layer>
- <layer name="Over" width="50" height="50">
- <data encoding="base64" compression="gzip">
- H4sIAAAAAAAAC+3DMQ0AAAgDsFnCvzlcjIM2aQIAAAAAAFyYQgAAAPhkASvbHPkQJwAA
- </data>
- </layer>
- <layer name="Collision" width="50" height="50">
- <data encoding="base64" compression="gzip">
- H4sIAAAAAAAAC+3PAQkAAAzDsHEt86/xLg6HFCKgnaQAAADAOxf58OHDhw8fPnwAAADAJwuZdk/7ECcAAA==
- </data>
- </layer>
- <objectgroup name="Object Group" width="50" height="50"/>
-</map>
diff --git a/monsters.xml b/monsters.xml
index 426aa976..97e55dc7 100755
--- a/monsters.xml
+++ b/monsters.xml
@@ -1473,8 +1473,4 @@ exp<TAG>: Tells how much experience point a monster is giving up
/>
</monster>
- <monster id="997" name="" targetCursor="small"> <!-- Dummy mob for weapon testing -->
- <sprite>monsters/monster-slime.xml|#000000,ffffff</sprite>
- </monster>
-
</monsters>
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-06-28 01:22:25 +0000