summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--maps/022-1.tmx7
-rwxr-xr-xmaps/041-1.tmx98
-rwxr-xr-xmaps/042-1.tmx39
-rw-r--r--maps/042-2.tmx36
4 files changed, 150 insertions, 30 deletions
diff --git a/maps/022-1.tmx b/maps/022-1.tmx
index 03b942d7..a42860e9 100644
--- a/maps/022-1.tmx
+++ b/maps/022-1.tmx
@@ -75,12 +75,5 @@
<property name="dest_y" value="672"/>
</properties>
</object>
- <object name="to042-1" type="warp" x="608" y="1151" width="32" height="128">
- <properties>
- <property name="dest_map" value="042-1"/>
- <property name="dest_x" value="3584"/>
- <property name="dest_y" value="2432"/>
- </properties>
- </object>
</objectgroup>
</map>
diff --git a/maps/041-1.tmx b/maps/041-1.tmx
index 5f409c9e..29ecd0d0 100755
--- a/maps/041-1.tmx
+++ b/maps/041-1.tmx
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.0" orientation="orthogonal" width="125" height="125" tilewidth="32" tileheight="32">
+ <properties>
+ <property name="music" value="faith.ogg"/>
+ </properties>
<tileset firstgid="1" name="Trans woodland desert" tilewidth="32" tileheight="32">
<image source="../graphics/tiles/trans_woodland-desert.png" width="512" height="256"/>
</tileset>
@@ -45,13 +48,6 @@
</data>
</layer>
<objectgroup name="Object" width="125" height="125">
- <object name="to042-1" type="warp" x="1024" y="160" width="96" height="32">
- <properties>
- <property name="dest_map" value="042-1"/>
- <property name="dest_x" value="544"/>
- <property name="dest_y" value="2592"/>
- </properties>
- </object>
<object name="to004-1" type="warp" x="2400" y="3042" width="96" height="32">
<properties>
<property name="dest_map" value="004-1"/>
@@ -59,5 +55,93 @@
<property name="dest_y" value="640"/>
</properties>
</object>
+ <object name="Scorpion" type="spawn" x="1504" y="1632" width="608" height="320">
+ <properties>
+ <property name="eA_death" value="30000"/>
+ <property name="eA_spawn" value="100000"/>
+ <property name="max_beings" value="3"/>
+ <property name="monster_id" value="1"/>
+ </properties>
+ </object>
+ <object name="Scorpion" type="spawn" x="2144" y="2016" width="608" height="320">
+ <properties>
+ <property name="eA_death" value="30000"/>
+ <property name="eA_spawn" value="100000"/>
+ <property name="max_beings" value="3"/>
+ <property name="monster_id" value="1"/>
+ </properties>
+ </object>
+ <object name="Scorpion" type="spawn" x="2112" y="2560" width="608" height="320">
+ <properties>
+ <property name="eA_death" value="30000"/>
+ <property name="eA_spawn" value="100000"/>
+ <property name="max_beings" value="3"/>
+ <property name="monster_id" value="1"/>
+ </properties>
+ </object>
+ <object name="Scorpion" type="spawn" x="960" y="768" width="448" height="672">
+ <properties>
+ <property name="eA_death" value="30000"/>
+ <property name="eA_spawn" value="100000"/>
+ <property name="max_beings" value="3"/>
+ <property name="monster_id" value="1"/>
+ </properties>
+ </object>
+ <object name="Sea Slime" type="spawn" x="800" y="192" width="352" height="1568">
+ <properties>
+ <property name="eA_death" value="30000"/>
+ <property name="eA_spawn" value="100000"/>
+ <property name="max_beings" value="3"/>
+ <property name="monster_id" value="31"/>
+ </properties>
+ </object>
+ <object name="Scorpion" type="spawn" x="928" y="288" width="352" height="320">
+ <properties>
+ <property name="eA_death" value="30000"/>
+ <property name="eA_spawn" value="100000"/>
+ <property name="max_beings" value="3"/>
+ <property name="monster_id" value="1"/>
+ </properties>
+ </object>
+ <object name="Black Scorpion" type="spawn" x="1088" y="192" width="128" height="96">
+ <properties>
+ <property name="eA_death" value="30000"/>
+ <property name="eA_spawn" value="100000"/>
+ <property name="max_beings" value="1"/>
+ <property name="monster_id" value="7"/>
+ </properties>
+ </object>
+ <object name="Black Scorpion" type="spawn" x="1280" y="1536" width="128" height="96">
+ <properties>
+ <property name="eA_death" value="30000"/>
+ <property name="eA_spawn" value="100000"/>
+ <property name="max_beings" value="1"/>
+ <property name="monster_id" value="7"/>
+ </properties>
+ </object>
+ <object name="Black Scorpion" type="spawn" x="1920" y="2272" width="704" height="320">
+ <properties>
+ <property name="eA_death" value="30000"/>
+ <property name="eA_spawn" value="100000"/>
+ <property name="max_beings" value="1"/>
+ <property name="monster_id" value="7"/>
+ </properties>
+ </object>
+ <object name="Red Scorpion" type="spawn" x="2112" y="1696" width="608" height="320">
+ <properties>
+ <property name="eA_death" value="30000"/>
+ <property name="eA_spawn" value="100000"/>
+ <property name="max_beings" value="3"/>
+ <property name="monster_id" value="2"/>
+ </properties>
+ </object>
+ <object name="Red Scorpion" type="spawn" x="1568" y="1920" width="608" height="320">
+ <properties>
+ <property name="eA_death" value="30000"/>
+ <property name="eA_spawn" value="100000"/>
+ <property name="max_beings" value="3"/>
+ <property name="monster_id" value="2"/>
+ </properties>
+ </object>
</objectgroup>
</map>
diff --git a/maps/042-1.tmx b/maps/042-1.tmx
index cc43a97c..8e6fc9ba 100755
--- a/maps/042-1.tmx
+++ b/maps/042-1.tmx
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.0" orientation="orthogonal" width="148" height="100" tilewidth="32" tileheight="32">
+ <properties>
+ <property name="music" value="faith.ogg"/>
+ </properties>
<tileset firstgid="1" name="Trans woodland desert" tilewidth="32" tileheight="32">
<image source="../graphics/tiles/trans_woodland-desert.png" width="512" height="256"/>
</tileset>
@@ -31,12 +34,12 @@
</layer>
<layer name="Lower" width="148" height="100">
<data encoding="base64" compression="gzip">
- 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
+ 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
</data>
</layer>
<layer name="Fringe" width="148" height="100">
<data encoding="base64" compression="gzip">
- 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
+ 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
</data>
</layer>
<layer name="Over" width="148" height="100">
@@ -46,22 +49,36 @@
</layer>
<layer name="Collision" width="148" height="100">
<data encoding="base64" compression="gzip">
- H4sIAAAAAAAAA+3Ua2rrMBgE0EL3v48us/RHoITYlh/S6HEGDty2N7L0aZyf76+vHwAAAAAAAAAAAAAAAAAAAAAAAAAATnk66fMwT5f0aj0lPdj7Wae404m7SZ+b8Tv0nvQcmKdLr6TnwVx9+kt6JuT7c7T22Wen50Tb/rRIenY836NeOpme52qevrvekp7vKu7eUU/Z2096zitYLel5zyxxl7MkfXe9qT3r2ZO+v570nBp7rHHm9B321Jue+1fyzF7eifT9pnt0dQ6fPj9DSme197fZlc7x6TV7Scv9pu860aet383ap5ZJ33XrLt2dw+v/ynbSd65PcyfdgUSfEpn1XO9Jd0Cfxj7Xe9IdGK1LV581wtnOZGt/6R6M1qermfVs+pTJE2fb+ncyK/Wpl5n/ZW/fI78rK/Vp9Nw5Y4uZfNpXugej92nru+bptRNn3Hrm3r7SPRi9T7VT44xX1yqZfboHLfs0Wu96fV/0qWxGI+doDk9/v22tl+5BrT71+F7PkqO5prvQw/fTmXnVTOLZZ5+pT/1kpL1uRZ/kPXdmNnufVkxyTiVrpTsxQpdaPu/Ts/7/rtWsjvZx9NnRrJrUrM6ule6HPpWl5ffT3bXSHRmhT+kuv55fOqOS/daae7ojLftUsk4vHa6V2nNPdyR5rpLPXU2rd6TGnu7sM92RHt6Tvc+0mF2ttJp/uhe99akHTyWxz/Ts9Klep9JnGNHM89MVAAAAAAAAAAAA4IpfUYpg5UDnAAA=
+ H4sIAAAAAAAAA+3Ua2rrMBgE0EL3v48us/RHoITYlh/S6HEGDty2N7L0aZyf76+vHwAAAAAAAAAAAAAAAAAAAAAAAAAATnk66fMwT5f0aj0lPdj7Wae404m7SZ+b8Tv0nvQcmKdLr6TnwVx9+kt6JuT7c7T22Wen50Tb/rRIenY836NeOpme52qevrvekp7vKu7eUU/Z2096zitYLel5zyxxl7MkfXe9qT3r2ZO+v56slhpnTt9hT73puX8lz+zlnUjfb7pHV+fw6fMzpHRWe3+bXekcn16zl7Tcb/quE33a+t2sfWqZ9F237tJTc5DtpO98pD69/q+UJ92BRJ8SmfVc70l3QJ/GPtd70h0YrUtXnzXC2c5ka3/pHozWp6uZ9Wz6lMkTZ9v6dzIr9amXmf9lb98jvysr9Wn03Dlji5l82le6B6P3aeu75um1E2fceubevtI9GL1PtVPjjFfXKpl9ugct+zRa73p9X/SpbEYj52gOT3+/ba2X7kGtPvX4Xs+So7mmu9DD99OZedVM4tlnn6lP/WSkvW5Fn+Q9d2Y2e59WTHJOJWulOzFCl1o+79Oz/v+u1ayO9nH02dGsmtSszq6V7oc+laXl99PdtdIdGaFP6S6/nl86o5L91pp7uiMt+1SyTi8drpXac093JHmuks9dTat3pMae7uwz3ZEe3pO9z7SYXa20mn+6F731qQdPJbHP9Oz0qV6n0mcY0czz0xUAAAAAAAAAAADgil/WzeFiQOcAAA==
</data>
</layer>
<objectgroup name="Object" width="148" height="100">
- <object name="to041-1" type="warp" x="512" y="2624" width="96" height="32">
+ <object name="toStorehouse" type="warp" x="2784" y="2432" width="32" height="32">
<properties>
- <property name="dest_map" value="041-1"/>
- <property name="dest_x" value="1056"/>
- <property name="dest_y" value="192"/>
+ <property name="dest_map" value="042-2"/>
+ <property name="dest_x" value="1408"/>
+ <property name="dest_y" value="2912"/>
</properties>
</object>
- <object name="to022-1" type="warp" x="3776" y="2400" width="32" height="128">
+ <object name="toStorehouse" type="warp" x="2464" y="2432" width="32" height="32">
<properties>
- <property name="dest_map" value="022-1"/>
- <property name="dest_x" value="640"/>
- <property name="dest_y" value="1184"/>
+ <property name="dest_map" value="042-2"/>
+ <property name="dest_x" value="704"/>
+ <property name="dest_y" value="2912"/>
+ </properties>
+ </object>
+ <object name="toInside" type="warp" x="1984" y="1984" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="042-2"/>
+ <property name="dest_x" value="928"/>
+ <property name="dest_y" value="1920"/>
+ </properties>
+ </object>
+ <object name="toInside" type="warp" x="1184" y="1792" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="042-2"/>
+ <property name="dest_x" value="1408"/>
+ <property name="dest_y" value="928"/>
</properties>
</object>
</objectgroup>
diff --git a/maps/042-2.tmx b/maps/042-2.tmx
index d0a48a28..6a02dd05 100644
--- a/maps/042-2.tmx
+++ b/maps/042-2.tmx
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.0" orientation="orthogonal" width="70" height="110" tilewidth="32" tileheight="32">
+ <properties>
+ <property name="music" value="faith.ogg"/>
+ </properties>
<tileset firstgid="1" name="inn" tilewidth="32" tileheight="32">
<image source="../graphics/tiles/inn.png" width="512" height="512"/>
</tileset>
@@ -14,22 +17,45 @@
</tileset>
<layer name="Ground" width="70" height="110">
<data encoding="base64" compression="gzip">
- H4sIAAAAAAAAA+3cwYnCQBQG4IiLF0/agVuCdViCJViCJViCJXiUrWSxFT06Qi6RQZMxZkb5Bj4evgTh/dc85lxV1RkAAAAAAIJR8BOMO9a2vUkBM6aYBfOE2rY3K2DGFIvgN6G27S0KmDHFcgC5Z5SLXOQil5LIRS5yed27zyXzfAAAAAAA36qPPY/bLseq/i97Hs3euq72PJq9TV3teTRtHzzLPeOQuUzvfu/kErWXS9RBLtUx+Ovwfu4Zh8rlPzjJ5WW5Z5RLf56dS4t3np3cMwIAAAAAfCP3ecS5zyPOfR5xvh/JRS5ykYtcSiAXuXTRxx7Ho+M+DwAAAIDPdwU8cB25UHgAAA==
+ H4sIAAAAAAAAA+3cwQnCMBiA0YrixZNuoCM4hyM4giM4giM4gkdxEnEVr0bopRKkTSUJ8gKPYJTC/10NfTZN8wQAAAAAgGASzILpwL3v2byCGVMsg1XC3vdsWcGMKdbBJmHve7auYMYU2wxKz6iLLrroUhNddNFlvByr9IwAAAAAAP/oF/c83nc5du2z3PPonu3b3T2P7tmh3d3z6Dp++a70jDm7LD4+n3SJOusSddGluQa3Ab8vPWOuLvfgoctopWfU5XdyrNIzAgAAAAD8I+/ziPM+jzjv84jz/5Euuuiiiy410EWXIXKs0jMCAAAAMM4L89k05VB4AAA=
</data>
</layer>
<layer name="Fringe" width="70" height="110">
<data encoding="base64" compression="gzip">
- H4sIAAAAAAAAA+3cSUoDQRTG8SC4UdGVLtSd6E0Eh42bgMMFHE4RdSOuHC7gcAT1BOoJ1L3eQPsCvkACxfN1Vcck3amu/w8+nukqpapps+lHNRoAAAAAAAAAAKCo5cD4knHtRHKqrq0OZjkjaVoyU2DeleRazW926qfka/BLK8WaZN2oRd1J7nPGviU/fa2uOtuSHaNaJiSTkqlyllapfcmBUbUzybxkQbIoOTfmpHTfXA+SR8mTMVbkvtXVs+RF8lr1QkqwIdk0quVN8i75KGdpldqV7Bk1dYeSI6MCAAAAAAAAABCrsR7mjg9tFaNrtlN76dOwej9C/SKx6vZpzP3z91dUTZ3uEfG9u4zBheTSM677WNp9C1uNv30Lukck9neXN5Jb57Ovn8fXt6B7ROr67jLmficMV6q9Tj4p9zoBAAAAAAAAAAD0wjrDw1Lncz0s3TM8QprhKVHInJ/1OSeZGtfz68q3xyJjek7s7/z1+kOfXSk8L3lCe3fHY39GNHc/1lkm1r2x7kHmGYtd3lkm7l5T+/9p7zfvLJO871d9reh5XaOuJTn2jPfzbIT+NgAAAAAAABCzXxoT0ixQeAAA
+ H4sIAAAAAAAAA+3cOU7DQBTG8QiJBhBUUAAdgpsgsTQ0kVguwHIKlgZRsVyA5QjACYATAD3cAHwBvkixZCbPMwlZzGT+P+nTYL8BjU3kFH6aWg0AAAAAAAAAALRrMVBfMM4dKyfOueXeLCdql8qVMqlMNc/Vm+OH8lnFonpgRVk1xnbdKncltS/lu6vVVWdT2TJGy5gyrkwMZmmV2lX2jNF1qswqc8q8cmbMSem+Fd0rD8qjUWvnvg2rJ+VZeal6IQOwpqwbo+VVeVPeB7O0Sm0rO8aYun3lwBgBAAAAAAAAAIjVSAdzR/u2iv9rujl20qdh9X6E+kVilfdpzPzx95ecMXVuj4jv3WUMzpULT93tY2n0LWzUWvsW3B6R2N9dXis3hWNfP4+vb8HtERnWd5cx9zuhv1LtdfJJudcJAAAAAAAAAACgE9YeHpbU9vXI9/AIqYenRCEr/FzctySvZb+ntxwPI+saM08tNCf2d/7u+kPHRSl8XsqErr1Yj/0z4ipej7WXiXVvrHuQeWqxK9vLJL9W93mcgsb/u2wvE98z2Pc9FqtD5chT7+bZGvrbAAAAAAAAQMx+AA5/Og5QeAAA
</data>
</layer>
- <layer name="Over" width="70" height="110">
+ <layer name="Over" width="70" height="110" visible="0">
<data encoding="base64" compression="gzip">
- H4sIAAAAAAAAA+3cOw6AIAwAUK5tPK1ewlVnBgTR8PG9pAMDSdsQFhpCAAAAAAAAgD4s0XptksV49A2AGsfHAQAAAAAAMLLtir11Eh1I9cHcgnMCJdwZUCdnTsOsBwAAAAAAQL7R3/zj/O/WlJuth0/qSe2ZrT8pf6oVeI//PAAAAABIOQEllEgsUHgAAA==
+ H4sIAAAAAAAAA+3cSwqAIBAAUK8dnbYuUctatHJhH4v8vAeDuBDGQdw4GAIAAAAAAACUYYjm4y9Z1EfdAMixfBjrMQIAAAAAANRq2mP+O4kCpOqgb8E5gTvcGZDnaq9GTgAAAAAAAPSk9jf/OP+zOfe1VsMn+0mtaa0+KT3tFXjHW70c/vMAAAAAaNcGfNzpVFB4AAA=
</data>
</layer>
<layer name="Collision" width="70" height="110">
<data encoding="base64" compression="gzip">
- H4sIAAAAAAAAA+3ZQQ6DMAwEQPpF/v+YXisUwCEEN2EszQEFkHblW9bPsqwAAAAAAAB0dcdkZ3gq/x3fjS6SLdpbdpbe+1K7E3qp72xUb+/licnO+K99ZWfJzj9TLwAAAAAAwPx63IXMcD9Sk/msg0hno4j0cJbxbftSu1Nn/xnJE5OdsaWXnl1lZ7zaS+89ys7Ysi89JzujXgAAAAAAAOK29xnbu4295+37s92TRDJGzkqd/Z6NqpSn9Bztq9TRSCKZoud7/8zOeLWXs46Ospbe29u5kURn22PNZGds7SWyM3u7U+pvll6O+miZ7Iw9erljsjMCAAAA0OYLcRL4eFB4AAA=
+ H4sIAAAAAAAAA+3ZQQ6EIBAEQPeL/v8xe90YEBBxFqxJ6mBQk+7Mjf2zbTsAAAAAAABD3THRGZ7Kf8d3s6vJVttbdJbR+9K6E3pp72xWb+/liYnO+K99RWeJzr9SLwAAAAAAwPpG3IWscD/SkrnUQU1ns6jpoZTxbfvSulOl/8zkiYnO2NPLyK6iM17tZfQeRWfs2ZeRE51RLwAAAAAAAPWO9xmlu43c+6vdk5xlzPWR6ibV2e/ZrFJ5Us+pTkoTna2nj9I+1Jzn/hmd8WovpY7Osqbey+3cTGrn6ncr9FKzM7ndOXawUi9nffRMdMYRvdwx0RkBAAAA6PMF8RkSwlB4AAA=
</data>
</layer>
+ <objectgroup name="Objects" width="70" height="110">
+ <object name="toOutside" type="warp" x="928" y="1984" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="042-1"/>
+ <property name="dest_x" value="1984"/>
+ <property name="dest_y" value="2048"/>
+ </properties>
+ </object>
+ <object name="toOutside" type="warp" x="704" y="2976" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="042-1"/>
+ <property name="dest_x" value="2464"/>
+ <property name="dest_y" value="2496"/>
+ </properties>
+ </object>
+ <object name="toOutside" type="warp" x="1408" y="2976" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="042-1"/>
+ <property name="dest_x" value="2784"/>
+ <property name="dest_y" value="2496"/>
+ </properties>
+ </object>
+ </objectgroup>
</map>