Wider walkways in northern Fallhaven.

Minor cleanup in pwcave* and waytobrimhavencave* maps.
Bugfix: Do not remove other lingering actor conditions when changing equipment (for example, if the player has a condition caused by something else with duration="forever", that condition would be removed when equipping or unequipping an item).

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@217 08aca716-68be-ccc6-4d58-36f5abd142ac

diff --git a/AndorsTrail/res/drawable/map_tiles_1_7.png b/AndorsTrail/res/drawable/map_tiles_1_7.png
index 305455819943205f8e4cb502972576c526db471a..440afa19a7447755a37891f8170370088baf4cd9 100644 (file)
Binary files a/AndorsTrail/res/drawable/map_tiles_1_7.png and b/AndorsTrail/res/drawable/map_tiles_1_7.png differ

diff --git a/AndorsTrail/res/drawable/map_tiles_2_2.png b/AndorsTrail/res/drawable/map_tiles_2_2.png
index d232c72e444b7e50bd656f325d3bc8e05b2a99b9..fc52c8d3b0b1982119a37b5dbd86843dfc696a43 100644 (file)
Binary files a/AndorsTrail/res/drawable/map_tiles_2_2.png and b/AndorsTrail/res/drawable/map_tiles_2_2.png differ

diff --git a/AndorsTrail/res/drawable/map_tiles_2_3.png b/AndorsTrail/res/drawable/map_tiles_2_3.png
index 6c95fd5f67da0fce11d8c2a3effcd6ab94a0febe..07598e2ae7197669c6ceb4b40e89dd4b322ae41c 100644 (file)
Binary files a/AndorsTrail/res/drawable/map_tiles_2_3.png and b/AndorsTrail/res/drawable/map_tiles_2_3.png differ

diff --git a/AndorsTrail/res/xml/fallhaven_ne.tmx b/AndorsTrail/res/xml/fallhaven_ne.tmx
index 02047a13c71880a11b570e6714fdfa7c718424d4..4699277f0bbabe5d7dcf419fec976cf645b49aa2 100644 (file)
--- a/AndorsTrail/res/xml/fallhaven_ne.tmx
+++ b/AndorsTrail/res/xml/fallhaven_ne.tmx
@@ -55,21 +55,21 @@
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJy1V71KA0EQvpA9fQFfII2mFVGvSGcQEbsLYhdBEDstErDTdCkk/sQnsLPxp0sj6iOIT2BjJ1b27nA73HeT2SR3xg+Gnf39dmZnb/aCIMFqGARRGGQg21adXg1TnUFtC2FS/gdwL6zjHuTeJf6yN5zLuvRNYyYp10y21PyaB5HzK+tdMzxmzrbHrp3L73JxToY840nG/8VW31qbpWxf27VvA5fml7w4tOvtOtmwsm55d6DNJ0c5bD5w+6zDfptu/rFrWy+ldfYD93VMqjcL+Lqh8L4LXsQ7jO8L3rpiC+pzYn8UxxSXNL8D42qWd2WEtEpZXrYBbWG9rfiEfTjKzwxN53nSHlknyFjF+X3gJfuvgesG9EvgPbdyYaUHXFwfmLROa/bAr9R24olnjteO584Q76jzQKl5dJRInB/79XY20ancM0k/24Z2aLZjHeOW5w2UON9y465Mol+Bn7XvhwGegdKv3RfEuPtZ5P5OwovnrslpTt6u8n2gfPdp7/K9lQeRa+QdNAXtZBCvXOPZcr443mnkOh8vo+18sGTLecu3XNZjQsOiGda/7Px9k8gS9Mdheo9aY855WiB76P6hvR8F8umk/mB0IK5id76Prryze/opp+8qjjOMN9T3TFr64o3ipOrOLhbfjVc350nEEscZxhvrWq5hnOG72Y6NYF3kffPkFn5n+nJoVE5t9sGIdyr6mcD3Gv0l33AV8cbWvpOjzl36uQiqOfKRLzf53hTSbvlPIfOsloswj2Iu9o3T8je+8TVQrFU8fQT2cxzq56HN1Th/AXGYhlA=
+   eJy1V71OwzAQTlUHXoAX6AJdUQVk6AZCCLEFITaQKiE2GFqJDbJ1QPw/ARsLPxsLAh4B9QlY2BATOz7Fp3w5zmmTwiedfHFsf77zXc4JghQLYRBEYZCD7FtwejPMdAb1zYRp+x/AvbCOe5B7lxhnbziXdemb9Ym0XTT5VvNrGUTOr6z3ze8xU7Y/dv3cftWrczLkGY8yfhxbfWut1vLveq5/A7g0v5TFnl1v28mKlWXLuwl9PtkvYfOu2+cS7HfLzT9wfcu17Jn9wO8Sk+lbFXy9rvAOBC9iAOMvBe+SYgvqU2J/FMcUlzQ/gXFtyztfIN1anpdtQFtY7yk+YR8W+Zmh6TxP2iOfCTJWcf4l8JL9V8B1Dfo58J5aObNyAlz8/GiyZ1rzBPxKfYeeeOZ4TTw5Q7xF54HS9ugokTg/9uvNZKpT2zH5eKa9bSj+1YBxyzY9KnG+5sZdmFS/AD9r3w8D/Lwe76kR6vmCGJafVfKXMIwXz12To5K8feX7QPXuw+bynZV7UWtkDpqKdjKIV67xbDlfHO9f1DofL6PnfNCy7bTlm6vnY6wIs+a3/mnn75hUWvA+DrM86g45578C2UP5h/a+V6ino/qDkUBcxe58H1x7a/f0Xc/uVRxnGG+od0zW+uKN4qTpzi4W+fvq5jyJWOI4w3hjXas1jGO8N9uxEayLvG+e2sL3TF8NjeqZzT4YcU9FPxM4r9Ff8g7XEHds7TtZdO7Sz1XQLFGPfLXJd6eQdst/CllntTqMdRRrsW+cVr/xjq+BYq3heUdgP8ehfh7aXI3zB4UEgx8=
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzVVm0KwjAMrWjxKN1v8QROvIgH2m9P6RGUIoE4mrwuaYs+KPvIkreXZUlDaIvzTrefgN3qdwX2i5HX6kd47X3+lnylGMIUfbxcN4p1c3JxWOvDC/SdvTmVdHnrA0HS1ZuXx+fn3rrcwvvsrJFjBNcSP0u6lu4hPI7fx18A0mrR2QPavGvdy3g8bd55Z5Y1XuueUpu/1nuOrHeuqK3We45S/pC2Erbq5bykG2krAeklHjrmnlmTZwSt7rKNenNiz90PbXgngXv9Tuv9g6Yb/UfaDJXmUE2eJd80sM9SnkZyItTOorwoz3P8nxnG8Qa64TFH
+   eJzNVlEOwiAMxSjxKOzbeAJnvIgH2ren9AgaYppUQvsY7cheQhhj5fG60hKCL64Hff4C5nvt7mD+1snba0f4HG32Pf5KMYQp2ni5brTWw8jF0RsfVqD/bPWppMsaHwiSrq15+fr82RqXa3jfG2vkGMG1xF+TxtI7hNf5vy/heb69sJc9afXOO5fx9bR6Z61Zvet555RW/3nfObLeuSG+vO8cNf8hbTWs1ct5STfSVgPSSzzU55zZ4mcELe7yHOXmxL57nnx4J4G73FN5f9B0o3Ok1VCpDrX4WbJNA3Mt+WkkJwKquzTOjfw8x3a7PeELiNYuZQ==
   </data>
  </layer>
- <layer name="Walkable" width="30" height="30" visible="0">
+ <layer name="Walkable" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJztk1EOwCAIQ3sF73/Z/RpSUSjDfYzEzGyMR7EOAONf6YVLTKCPfxpd7GGeb7K7feTNk+lXtWTi61zvP5AcNtt5n/UpqxnJqfYqUNdvJuz8q+7aKdf7rmhWfKHozM5LnfENJqZ33VzWx1vcjnNmdTt02rqWpTDnGitt3jmv6kW8EtGrck/PkeWy/a7XnVdWEc2vYKqsCp9X350u7gMQFCjH
+   eJztk0sOwCAIROcK3v+y3RoyIj/RRUlITUp5DkwHgPFnOHGJCfTxrdHFHuJ5kt3tI22eTH9WSyRe52rfgdSw2c7nqE9ZT09NtVeBuvtGQs7fs5cKrvbeyvLuycKt8PXpvMFlejv4uzjJ7dgz69uhU/aVrAxz7rHSpu151c/jFY/eLNe6R1bLzru77ryyCm99BTPLqvB59b/Txf0AnoYoDA==
   </data>
  </layer>
  <objectgroup name="Mapevents" width="30" height="30">
-  <object name="west1" type="mapchange" x="0" y="416" width="32" height="32">
+  <object name="west1" type="mapchange" x="0" y="416" width="32" height="64">
    <properties>
     <property name="map" value="fallhaven_nw"/>
     <property name="place" value="east1"/>

diff --git a/AndorsTrail/res/xml/fallhaven_nw.tmx b/AndorsTrail/res/xml/fallhaven_nw.tmx
index 31387b110b9910b009aa4447207e2e6995191140..dae088ce0e6d2632e82403df0045d4fe2e44e5f3 100644 (file)
--- a/AndorsTrail/res/xml/fallhaven_nw.tmx
+++ b/AndorsTrail/res/xml/fallhaven_nw.tmx
@@ -55,17 +55,17 @@
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJylVrFOw0AMpcqFL+gPdOMLaAYGJKqo6koVkRkGxAhqJLp1gUqVChNfUZg70J2FkQ/oiMSOxERMbcV17OtFPOmU5M7nZ/ts5/J47w9dfPqQMBmQT5Q9fN6SAeRCl4ZQXU0wjut6CUns51lE/7PlcceekbH+GtXnQs4LcNiqRr9V95djuL95PkfbT8suH9au8jdtVTYD55vT96xKvna8eQIc43WBNvC8It7c2DvA9Q6uzxS5g0DeMcpdu4p3jnMQB3ifYExgfc700jq98/zqYawujZhxHLW2z1sO3zrkBo/TMICvI84XMBX7rLMmpMi7Rrk2s4G/9xQ9nDcEC1ZHqfDXslOLA+ydBMSHQPU7dXVewsDjS6LEmWoTavYnqr41FK6ecwCei5SbJAOcTuFdCR74vjK4oZ6snLPmOYi3wFhDjlCcbkvOscdnX25kcb3+tL28Jrm+wnP2IJcG9Iyl2+QDDKr3YyNOgA7TKfvzGs83Qxnq498oL2uSoPWnh7jyNxN+yP5M/krce87FAtUm6dPqkdcc5x25urz2v9B6OdXmrt5JI2nYc3gv5zX7yfy1/q8U/7VxfoUnzz5cFS9Zs8TbBMsG/Q4AOXeDe0bGufkg++tC8aEfbQbAdx+aYH2QDy/sHL7w/Z3p5/Wi3b2A8ywwx32904Ksb6pn4DwXcTlx2zKAmehXbSM2cp7sk3ZC3LrlXILzd+X3KbOD69HuNhwQW9l3pOzI1fcAnspnhjZcNLjb/GcQNJt9d7lCkV+Kf6z85xZx9S3rjX/n8fY9QruLaP3P6iNcxy+NDIqn
+   eJylVr1OwzAQJorDE/QFuvEENAMDElVVdaWqyAwDYgQlEt26QKVKhYmnKMwd6M7CyAN0RGJHYiJHffLlcuc44pOsxPb5vvP9JVmy94eeffqQEhmQT4UzdF2TAWRMl4RQXW0wTep6EWni51nF/7PlseFMruy/xvW1kHgBDiM3hlH9vhTj/d3zOa4+Nbt82Bp330HkbAbONyOf2ZR8nWT3BBjCawJtoHmFvJlydmT3u3Z/IcgdBPJOrdy1cbxLuwZ+gPeZ9QnsL4le3Md3ml9966tLxWcUR1E13nz49ofMV+MAvi6LL6Bg/tJijYCzEFvk7ZDz9L0v6KG8IViROuK5odkp+QHOzgL8g8D6nZsqL435yHOXVPAz1ibU7E/s5hIKwrtmdmMuYm6iTcBpBN4N44H5lcIN9aTlnLbObUP7AdBT0E+3JefUc2dfbkwaalo6W8lxT+xBbqDoR9+ura8hH2BgvR8rfgJ0iU7en7c2vngv7OPfVn6u2Cv1p4fE9SjuJ96f8b4c9564aMDaRH1SPdKao7y5qctL3wupl2NtNvVOHGnLnkN7Oa3ZT3Jf+L5K31j0/1aJH++1FB/G+YvXLPK2Ae8bTYCcu7FnciVuPvD+uhLuMIx3A+D7H5rZ+sA7vJA4fNn3d6Kf1ov07wWcZ4E57uudGnh9Yz0D5znzy4mpygAWSZW3o/iGr6N93E7wW69cS+36XTk/JXZQPdK/DQX4lvcdLpub+hnAU/mcWBsuWvzb/GcgJJt9/3KFII99H+f8m1skbs7rjc4zy5sRPRxS/9P6CNXxC834icg=
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzFlssNwjAMhoPSbsAO6bliggqxCCcW4VSJUTtCwYcIy3LyO4/CJyE1ch7279jEuTLC6Nw0Fi7qvNfq0+svp3a/0B4zs0cfrmDNS/gZ2DjGgPZYmL1HnFZ2//1GPkZkvDVs7NxfxhsJhrwiuA5SExrn7Br/0IFo1YGzejyH2JV5Pep9Bmu2hH/87Bo9loNzl9KCxxvvnHYXtW/Ew6e1QPHeGnsEihfZpQ7a/4mmBYq3Vo8USCetTqx2mXdrbRKpOsnZSd9czaLabCFXs7nctN7THCh3R0G5sfROmY94P1KaWN50lt5J+Sh5h/W6U3umn3HfiPtQf6e0cy1zwuc3NdS7tGk1eh7xHA0+T/ZWuYfsOz3ei0dT+pZrGXOeQ73PEtTf33rROXs=
+   eJzFlssNwjAMhoPSbMAO6bliggqxCCcW4VSJUTtCwIcIy3Js51H4JCQq5+HX79a5OmJwbg6Vmwaftfny/sup3y/tjAXZsw9XZc+L+BnRc45BO2NF9hFxWkn++1/zMUPjbWFH9/4y3kw01FUD54HmBJ4lO8c/8gD05gGzeX0NkJh1I/S+KHv2gn/47pZ8rMyeETrJlHKhxUv9qPHp4cu54OLF3Dpj1+KtzYf1faTFK9mp5i1oeeJ0YrXTulu1CZR0Itkhv5JmLb3aiqRZqVd7+1RCq91RQG0ss5PWI/dHKScWDVlmJ9Sj5jtsVE8lYZ5h34D71N5T3L2WNfHzmzv0Tm2cRs9BX8OB19E5R8+gc2fke/Aoar/lep4xz6ndZ4o239/T3je/
   </data>
  </layer>
- <layer name="Walkable" width="30" height="30" visible="0">
+ <layer name="Walkable" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzlk1EOgDAIQ3uF3f+yfpkYHaMldMZI4oeT8aDUAWD89MFLzDPuZ27ejOFkZ/Pi8u6emQm31g7fdcast6jXrMZOblWzrNfqfjO2yo3+owpX8eKqL7aPjlC1Z/MUXzE12e9RHhMVLpuz8imj8z0v69vll69xV/7r5ALPebt0Ue+zXFZHdgZ2H07ujNE5b1RP5WJxT/FUpAPrl6onO2KnX9T9Ouoemq4nHg==
+   eJzlk10OwCAIg3sF73/ZPS1ZjGIrZT8ZiQ8a4StYG4D204WHmGf0Z9W8EaOSveoXl311z0xUz7rCd+5gtb6Jm/WkoinDbUHuqq6Ly/TJ9MvqcIQ6e+ZeVo/yts6/vMtVtYHI63X191a6q/zyRe7M404uMOY65qLmK3PJLpXrYEbcEcPZ76yeykWQp3hqNgfWL7uedMSdflHft6LuAXYxJrg=
   </data>
  </layer>
  <objectgroup name="Mapevents" width="30" height="30">
@@ -75,7 +75,7 @@
     <property name="place" value="west2"/>
    </properties>
   </object>
-  <object name="east1" type="mapchange" x="928" y="416" width="32" height="32">
+  <object name="east1" type="mapchange" x="928" y="416" width="32" height="64">
    <properties>
     <property name="map" value="fallhaven_ne"/>
     <property name="place" value="west1"/>
@@ -153,6 +153,6 @@
   <object name="fallhaven_oldman" type="spawn" x="864" y="608" width="32" height="32"/>
   <object name="fallhaven_guard" type="spawn" x="448" y="832" width="32" height="32"/>
   <object name="fallhaven_drunk" type="spawn" x="320" y="480" width="32" height="32"/>
-  <object name="fallhaven_priest" type="spawn" x="672" y="320" width="96" height="64"/>
+  <object name="fallhaven_priest" type="spawn" x="672" y="320" width="96" height="32"/>
  </objectgroup>
 </map>

diff --git a/AndorsTrail/res/xml/pwcave1.tmx b/AndorsTrail/res/xml/pwcave1.tmx
index 41c11e1f3100977c869019480102257cfa707c47..5fe1404a3812aa9328972ed33038fd7d08cfc8e8 100644 (file)
--- a/AndorsTrail/res/xml/pwcave1.tmx
+++ b/AndorsTrail/res/xml/pwcave1.tmx
@@ -50,7 +50,7 @@
  </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJy9V9sNwjAQayIWgBH45YsBYANYh33YADZoN2g3gElIJU49Hb5HguDD4qEkzjk+p72mrrv+GPeCXbeg/wPnjJzjvIOB2lo3gtfa35h0pBznlxp7+3skHeu88NfyanPkOA3Eb3EPYL15Djpf6QEPFvcNnC2qWfPAN9xofuQshqAGFjefjzRGZzEKDW5v/TRuua7UUOtdudaY8BzNf7LmmszQtORrarxcb+QXixetSfpG9kncyBdeNqN1KCfJa73DjXrI49U8RtiIc0QcSDMv35BGMit5n/VK3VrPWhkd6VlUewtnbVZq9wP1OM/q7GRLpFYvL0g3+p90QWNbOC2f5rzUPhVsy+99/syfVk7kU3p2QLpGcq+lL6Z3DWPy7yqNl3KKw+p/8o+WnUPAwzKjPEysVuS9KX1qpI21nu8k5jWexnlF7l7en1G0eJ73+q9QcxdJXFYLrHHIM5H3k29qJ9+TZw7l+zHVvRehPrKAPHMqn2fB+wKAiIgO
+   eJy9V93NwjAMbCIWgBF45YkBYAO+db592KBs0G7QEdiEImHVMne2UwQPJ36U5OLL+dJeS9ddv4zbjEO3YPgB5xO15nlHB6217gyvt7+pcJSa57caR/u7F45tXfhbedkcO45B+D3uEaz3nIPO13oggsfdg7NFNTMPfMKN5mfOYkxq4HHr+UhjdBaT0aB/6ce47bpWQ9a7dq2p4DnMf7bmlsxgWuo1Ga/WG/nF40Vrir6ZfQo38kWUzWgdyUnx2hBwox6KeJnHBDujOeJAmkX5hjSyWan7bCB1s571MjrTs7b2TE601MrA7gfpcZ3VNciWTK1RXohu8r/ogsau4fR8Kufevzyxn38f63v+rOW0PhVN2Rlkcm9NX4imU4nvKsYrOaXBdNWZ4uVO5GGbURF0prCesxp5Y7OQ57IW7zGdW3jXeF73+rfQchdZ/G8WeOOQZzLvJ5/ULr4Xz5zm7+fS9l6E+sgD8sxl/vwzvA8lOYin
   </data>
  </layer>
  <layer name="Objects" width="30" height="30">

diff --git a/AndorsTrail/res/xml/pwcave2.tmx b/AndorsTrail/res/xml/pwcave2.tmx
index 4fdddbee8d0049a400b17b14a2d863a3262d30de..751fb14a034657104b063dda83ded888cd0dd957 100644 (file)
--- a/AndorsTrail/res/xml/pwcave2.tmx
+++ b/AndorsTrail/res/xml/pwcave2.tmx
@@ -50,12 +50,12 @@
  </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJyllsuNwzAMRCV2YLexXee2R+WWo93BuqKsAA/C0OJPPgziILEeJXJIPWopD0X7hLS1IurvE5Vy/H/+JVXpO47jlMfsvP7+Snlm10LXOCJM8H7KvGQcFvt57vEOT5PFft7c4yzb4kbrcYatcaNMou9ni705XK8W4RXUY/8/nq19e1yrHoj5BZwlwOTc3TgbLSfc39kaA7c5dRHJiSbEjO9tcHaIwcuJVTdazBrPq23EPdNftgBT289C+TOO+oL3aC3mzBnL2tyTTM6d7eGYU5Lv+T3TDzXxORmplUj+s3yrVlq99o1IH4xI424sJrCzTCsvUa62xsj7Wx17Vr43yhf3jfRfU/oP+vxvuXLXgYdHZ8dZi+N78DCbXuV6rySWK977NK9jz2DLdXDXlfdBea9c6TMnrbxx9n7uWc5crKPNQs7la8ocWH3mqPdm7qh2PPZdziw3Kq33S99rc7EFJX3bc8J/w7P0S+e+AbfoUhQ=
+   eJyllsFtxDAMBCV1YLeRru+Xp++Xp66DpISrJBDgRTa0lqLkB4HDwdaQInfpR07pIeK1EKMzFAvPlpLSd56PXP5z8P9xhmKCty9yt3LNow7qbEzwPtJ62DwaWzGfZ413eCo89vNmjatsj+v1ZibvHlu9F2FiNir99th1wPXmgbWJeWzP47dX94jrzQPrG5wtwGTuy7kb1RPW9+yMgQsvudMTFS1nfl55luJXc8cz+qnZ98jIjK34y8gnvXq2Mn/HUV2wR6ucZ+7Yzqbag572wF31cOwpyx/pnfNb4bbgPRmZlUj/Z/nerBz56hsRH4yE4lbKCexZpteXKFd5Wk/7P7mvWfter1+sG6s/9Y0Gn/9MV+7e0XDv7sBCjyO7ELvpK12/Kwv1ir1PaR01w2ftObwLeTfZ78q9/O1JrkNpvZ39Pmu2OxfnqF3IXD7T9sDzGdzf6s7tzc6IfZezyo0Gz5KdOZ5dtRePYFjdss75HKuXxv0FaJZT/g==
   </data>
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJy1V7FOwzAQTROSzkWqxITUSrCXz2EF0R+AgsQ3IFY6sLEwMCAWWJla/qDZ6MDebkzgU/rI9cV2XIU+yUrqnP3Od+9sN4rC8LATaOjAe6to/4l5Wjxf2mVfJyueS8O1MO151Riw4/GCvbRqPwxc/2OY2R/6cRTdqblfA3gmxmZgxn0qP9/IxpUv4RN01dhUvU9NLD4oHj5MA2zAyZD8jCN/W1LudHwGjnl9Wl0EaBDagH/aB3xzcbOdjbNJLYnm67i3AejCxr2JXgCpuXG2rg39Dk3OjF3eLvgZOfWFxGWYlDy9uKpNyZXO98zC+5MUT58WkX/Mf2nGXJl2YsZcZ5EXLo3qvU3Dtu6brGjbwIVHv/eG8ymAV/vcIXtbfWiNiRZ0jHQObx3czBEKrTHWwtkqn8AoKfomDc9KrMfms+T+gHiFU/pG1A8g1nzO2Tg1WIdad7LGw6QaAxd3KOfMbe4FahHaxPnG/LZ6F3BNMVLLnUDPUTd+E4iPWA+fkcLzHa3nhs8oXZ/Hxu9T0/aNls5T97mk46L7fWeVfIvjdR9tcO0XTc5BG1ddDuR7i/LfteT1y5PrOsw3HJvT76O4vFOhXrWPUh967TiLgB6tT+bHndS2Vr4PYjzuluIPzwkg3tBUT+0zu3F5J5W5MU/fs+9rYA91cTPEDjx1d1KtV/xPwO/c4Re0yvH2+c48NjT9XxUC131CfOL98BcxI30I
+   eJy9V7FOwzAQdRPSzh0qMSG1Euzlc1hB9AegIPENiJUObCwMTCzwBy1/0Gx0YKcbE/gUHr2++hxXVfukKIlz9jvfvbMd59LwuJdouEPMiur+0lq0tZvVfd5w7qth94Ud9xfsF6v2g8T5P6WZ/aOXOXevxn5N4Bl7m77v96H8fCMbK1/CJ+iovoV6nvhYvFM8Ypgk2ICTIfkZufg1pxzq+PSNcWNajWkCgDbgn/YB3yxutgtxblJLovk67m0Aughxr6MXQGpu1FzWhn6GJqfermxV/IyS2lLiMsgXPN1sVZuSK53vaYD3J6/uMS0i/xj/yve59tep73PTdFFYGtVrm0Zo3rfN6toGLiP6ffCczwm82uc22YfqQ2tMtKBjpHN4Z3AzRyq0xlgL53/5BIZ51TbecK/EfEI+S+4PiVc4pW1I7QBizftciFODdah1J3M8yldjYHGnck5t8yhQi9Am9jfmD9W7gGuKUQTOBHqMuv7rQHzEfHiPFJ5vt5wb3qN0fZ54v8/8deC1dFHY+5KOi26P7VXyLcuWfQzBWi822QdDXHU5kO8Nyn8nkNfPSK7rMFuzb0nvx9niTIV61T5Kfei5Yy8CujQ/GR9n0tBc+TyI/jhbij88JoB4Q1NdY52RsTFOL7Lua2ANtbgZYgeeujOp1iv+E/BeGn5BqxzvmO/ME8Iu/qus84T4xOvhL7JyeVE=
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
@@ -63,12 +63,12 @@
    eJzNll0KwjAQhCO29ApeRXoCf27hi1etbz56CsULaAMGlpikO2a2dSBQCtmvm0x317n/02v9/e7YObf9rL6z4aW4XvuRtxvXgcj1rMC7Z7hsBeZcPMmdmxm4S4jJfQCxarhyr/RmrCHxD6DcmCWfcz65VXJlTueIg3rzucK4SPwLqcZYeb/kx5JvalWKa1VfpvKxyFVTo3PcU2PHZAtlInVwiqtlMv2sjcO+Cy3X1zTm/S/Vexk5/PLtNf6U8+emxfZqe1EqJ/b8mZsN2ignhHfN9EN53qnZwKqWIb0fkT8nVo1DufKs3n5ZWOk=
   </data>
  </layer>
- <layer name="Walkable" width="30" height="30">
+ <layer name="Walkable" width="30" height="30" visible="0">
   <data encoding="base64" compression="zlib">
    eJztk1EKwDAIQ71C73/Z/UshiRr3sQnCoDUvanci4vwJMxb0lXCxVD8dZtevk4m0pu5O9uDkvtXvBvemgTRVn/m76x3VsjG9HxcX7UQJFxd5cc0ZzWGKqfbLsNn71aj8OyqXmT3ji31zjNfbmYPZ3et0fo2L9u6ur9QqUeVWNHNt1391lptvJ3MfzXEpcQ==
   </data>
  </layer>
- <objectgroup name="Mapevents" width="30" height="30">
+ <objectgroup name="Mapevents" width="30" height="30" visible="0">
   <object name="south" type="mapchange" x="864" y="928" width="64" height="32">
    <properties>
     <property name="map" value="pwcave1"/>
@@ -88,7 +88,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="30" height="30">
+ <objectgroup name="Spawn" width="30" height="30" visible="0">
   <object name="iqhan_2" type="spawn" x="768" y="832" width="64" height="32">
    <properties>
     <property name="quantity" value="1"/>

diff --git a/AndorsTrail/res/xml/pwcave2a.tmx b/AndorsTrail/res/xml/pwcave2a.tmx
index 73d609e6aecb41a02b2b50b8351fee7f566b6e5e..be3d7683a585f7b782eb210fe9bbb2469b054f67 100644 (file)
--- a/AndorsTrail/res/xml/pwcave2a.tmx
+++ b/AndorsTrail/res/xml/pwcave2a.tmx
@@ -50,25 +50,25 @@
  </tileset>
  <layer name="Ground" width="20" height="25">
   <data encoding="base64" compression="zlib">
-   eJy1lLEVgzAMRG1tgNfIDMkIDOkuZehSmg3YKFGh98why8IkxTVG+pwPoRxDyKDVENZa4nqiELbYViQfXzipw5voyEfWUnFuYa/79+wB58hH5qJwas2d58wsDp7nXaIer871FzzOpMcq0c/jTBId++varcHLzowsz8jz5K55xrzPevSyao/PixycjTf0vYx5srxhNq18MXvrrv/kyW4a4WnfV3aT7I8ej5TdhUzZSTi73DtBf1J4njksRq+m1j9wNj+vz1FeiznKQibPzBVvOJse1gckottw
+   eJytlMERQiEMRIEO+G1Yg5Zgkdw8+m8e+R18K9LMmBlcA1nRw16APJYFUmIIBbQNhGtHkvUphbDHvmLi+MpZHF5On3xkrQ3nEN51fI6dYBz5yFwNTquzMy/MSvCYvVQeT+cl13/wJBNhLQNejTwvG6wKa/cOr5AZqWfvvGzuluf27lCMR5bVeryQnKvzfzWbm1HHesI/16tr88XsR2dl3ugsT3vTDM+6X+1N2j88XjJ6FzK1J2EOUpuhfjF4zDusr1o2x1EP+CY/1ucsr8ecZSHzHn/zhm+TYT0AvB7bfQ==
   </data>
  </layer>
  <layer name="Objects" width="20" height="25">
   <data encoding="base64" compression="zlib">
-   eJy9VL1Ow0AMNqFJZyLxszZv0IcAiYUNXqUP0Fdh6czSihcoA4gZBGJiDxsbti6fcI2dSzPwSdE5Z993vu/sI/ofnJZEy4nvuw3m+/BapnGr1q7K/Xmaguh+SlRX6f+c/y+KZG+Yb8Z2NYC3Kf7OtQdEX/zdGN+J4ps76wRXnM9CxQnXUbUbY3VbT345tQ/29eEuZw6y50smRjg1tA44P+yCfXVwXsHaqQNPV8GKElfkx77ArCdWsOnZC7D6A1sn74duFO1bkwt4kON3sJ+Xs+WKkOupoTzROuTu3VkO0GZsDjibaONpH92TXW/xyO/A8zTZGK3/yZmPcMmxH108xrtulF54Y/t9Dz6Brmupj7Oun9FXWg+rr+0JwPb43Kk7rM1pi30lHrkcj3iXBfaedP5j6s5CzqI5pQ+tZrk+8vQQzs+RZ44wlO8HhtpA4g==
+   eJy9VDtuAkEMNRt2qUHKp4UbcAiQ0tAlV8kBcpU01DSgXIAUQdREiVLRs12qxE+zVgZj7yxb8KTVeGfsN/ab8RBdBrc50XPXXntx5uvwkYdxHcXO8/N5RhnRa49oUIT/Cf9Ps2CvmG/IdtGAd5Sdzh06RCV/j2rtJuIbG3HAjPN5ivzA1S+OfbRuy+4/Z7wm9sPVMWcK2HOX8AFnXTzqFzvjvAZOvcDSuAeWrsCcApe3/qvyGtb4AquavQRaf8HayPutGqH9oWPzSI4/zn5WzprLQ6qnmvJ4cXKu1pmlINq0zUFqgzaW9t456XiNd34Htr1gy6jXN8a8h3v2/a78ZVxUI3rhk+2vM/iAMtIM9+Ou6mfpq1gPrW/p6K17fGzcO4lNaSv7wl9yuW7xLgP6nOL829w7DdQSc6IPtWapPrL0AOe+Zc0emvL9AUxMQNw=
   </data>
  </layer>
  <layer name="Above" width="20" height="25">
   <data encoding="base64" compression="zlib">
-   eJxjYKA9+M9MXXOoYR7IDJg570kw7xkrbvNIMYcQwOfHD2TYg888csITlx7kcMUlj839+MxDD9cPSOmA1HDHphY5XeEzi9hwJydd4QOkmENO2sAHYH7BZ+5HRuLNwhc2pLqdUHyRmq4t2RkYrNkhbC92THlPoJgPFnFc4BMwXLyh6rHpo1a5SKl5rDjKNGqWZ6OAMkBs3gAAiZAyKg==
+   eJxjYKA9+M9MXXOoYR7IDJg574F0Mgtx+p6x4jbvPZX8CTMPF/hAhj34zCMnPHHpQQ5XXPLY3I/PPPRw/YCUDnCF+ydG7OZhU4ucrvDFIbHhjpyu8AFcbkQHpKQrctIGPgDzCz5zPxLpD/Q8hw5IdTuh+CI1XVuyMzBYs0PYXuyY8p5AMR8s4rgAKH69oeqx6aNWuUipeaw4yjRqlmejgDJAbN4AABfaNHc=
   </data>
  </layer>
- <layer name="Walkable" width="20" height="25">
+ <layer name="Walkable" width="20" height="25" visible="0">
   <data encoding="base64" compression="zlib">
    eJztkzsOwDAIQ32F3P+ynYNiPo4rdWgklggeBpkFYP1xfLeMjF31APbaSmvFjHo6PJYfdTFe1q+7O5UXmdUf66XsHahZLLerWeFNOBMfTm+k4ynl5hy8zE9qvMFzzsv2eMPLPOiY3cVzzPklDz0nyxik
   </data>
  </layer>
- <objectgroup name="Mapevents" width="20" height="25">
+ <objectgroup name="Mapevents" width="20" height="25" visible="0">
   <object name="south" type="mapchange" x="320" y="768" width="32" height="32">
    <properties>
     <property name="map" value="pwcave2"/>
@@ -76,7 +76,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="20" height="25">
+ <objectgroup name="Spawn" width="20" height="25" visible="0">
   <object name="iqhan_4" type="spawn" x="160" y="544" width="32" height="32">
    <properties>
     <property name="quantity" value="1"/>

diff --git a/AndorsTrail/res/xml/pwcave3.tmx b/AndorsTrail/res/xml/pwcave3.tmx
index 6c3609039ffb04e6e47cd3e52e448076fa51001d..2900f9234f36381fb35c0ab85916ef0057ec856c 100644 (file)
--- a/AndorsTrail/res/xml/pwcave3.tmx
+++ b/AndorsTrail/res/xml/pwcave3.tmx
@@ -50,12 +50,12 @@
  </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJytVsFRxDAMtNOB6YA3NUAHUGR+PMOPp+ngUhHxEE2WnZXkG3ho7sZStLK0krzWUlZHvpwzlEyvbDysIctSyu34rct1tp9yA0G9fcOCNgoTv3s4/zc66+ST9QoXbUYMiPlB3z2VS/Csk471Q56P/y+Oj3bGjndlf0reJ2xeD39vIj6TTndl/VZ/BM8+hR+0WQUe+0BctuXaZ7FzzdgPnnUnx1x7FZuysX4wf8ZjhatyzLVXd1Y21g/mr0Ev4t2iHM7cmXlp/cA8bsvvu3n+LNahizif8XKGz0rf4M4cM+bE+36Wi55+EZhYY9X7UQ0Z16tflEMVE3Mj61GOO+vf7sQ08oA9tNZrBimuoo8sF9iHHjdwF0V7L+sj09ncNxuvBriLGB93GH5je1bNHJv7ls9sljI+4io+7WTv9XnWF4yvdinX9hH2v7cr1UzN+DjjZwt6OMJVvDH7jURxKsJU/Wg1Qt7gG4TjNG5vxHOF2SHOJrhvu8ns8Q3i2aIoTMzHTjFne0LNBfUe9GYCvk35vRi91bLdmolh7fXqEbVro1l07/7Efrw3VsT27so8/w/hOcNv0WwG/CWmaM54onZZtOfUzBq43/tiZCw=
+   eJytVstVxDAMTNxBtgPO1AAdQJG5cVxuHE0H2Q6gEuLH6mUYZizvg4PeZm1ZM5L18TpP02rkXfxnUWcyHYfVpJRp2vbfuRxrmxDcjzM9HYWJ507X74XWLmST9xUu6jQOiPlK5+6nQ3DtQnu83+Rh/340NhqHSr6yPSUvAzpPu71nwS+kkq+8f56/BdfehB3UYX21hrisy3efcec7Yzu4Vk2M+e4VN6UT9RD2Io8Vroox373yWelEPYS9BWoRfevFcMRnzsuoB87jpRxc0K663+W6H7YxfqN5qQTjpHAReyXOHBN3fjQX3X4RmMhd1b6qQYfr7q8XQ8WJcyOrUead1W81nFocsIbW+fBf5SrayGKBdehyA2dRb+5xrFg/9qLvRzzdHeAsYns4wzK+4Vv0/YhnxHEUH3FVPn2QvqtzvJMR/DqQ53cw/92sVD01q6MRO+dODTtclzehfyZR9dfDVPWo8gbfII7nJ/FVmBV4LuW3nZhNoY9vEKe7Cb6uH53Kz7hmc0L1BfUedD0h6qtx5fdi762WzdZMAiv8wvei89W9YW/BDaxbuWZzvwnn+X9Ir8+oucF9+C+cVB1l4ji5OafmRsP9ArANYiY=
   </data>
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzNVrFSAjEQDbk7qXEGxxb/RGekt9Bv8xesbfiEw86CgrOisVZmLGxQdswze8tuEpSC13Akm32bl81unDt+bCrn3qr4/7XR7c7D+Jkxvw8eh+W2L4FvyXhpvRUnx4V3bnTi3MT3xyS0+evt79RHfm6jcdO6Rd0fm9W7drn5262fuxA3R1v3Y+DjwPsgfq/DN2Li/mBHNvxbmyfMxXlxDTkn5ya+ObNZC7ux0FDzsxS8Ul8N2GeJ7SEh96cBed8asXENoDFyRDt7Cctm1UR/ZDMWuTVI+IaODy6eYyPOjucH9NfuGfgxNxI2MufJlmvShd+n4S4vOC1t+V3TdMqdH/nuAp/MSw7tDgJyfxxTUT9oba5WpaDdZwuYR3zUE57DHkm3qU/H9BfkauPNlueScUn7Uh2AXNzQC3Uf+GK9EfpwbquXYRxnqtVA4MrHum/FxZHbu7bXXH5bPvm6trAWydoLH1Ye5vzJ2CdGXvyn5qfuZs5/SlvZK6mGkY5azd1U/f8yFzlkDdY4SZtPNt6FGGTvleuQi6m60TU/byPkeep+kT6pHlMC/uZaNXlOgjfmf/tPOPP7Wt+r9/ENKUG58NHEnEBOkh6nfv/6ZKEkp8El9eC9lsOqvWQ7M96TBLzr9sUi03vhm/NJHquGYLytY421au2hzqQEGv83DjR7Bg==
+   eJzNVrFSwzAMdZ2knRnKsZY/gTuyM8C38QvMLP2ElI2hQ9OpCzP0joGlEB1+Z0WV7AQ68JamtqwnPcuynfv/OBTOvRXx/2ul212E8XNjfgyeZsNtt4Fvw3hpvRUnx6V37mzq3ML3xyS0+Zvut/aRn9to3LRuXfbHluWxXW7+rvNzH+LmaMp+DHwceJ/E7334RkzcH+zIhn9r84SV2C+uIefk3MS3YjZ7YTcXGmp+NoJX6qsBeQ6xPSVkfhpQ940RG9cAGqNGtL2XsGx2VfRHNvOpbqcBOj66uI+V2DteH9BfO2fgt+ZkzZMt16QNv8+zY15wWtrys6bplNs/8t0GPlmXHNoZBGR+HLXoH7Q216tS0M6zBcwjProTXkKOpFvt0zH9BrneeNvxXDEuaT9UByAXN/RC3we+2N0IfTi3dZdhHHuq9UDg2se+b8XFkctdyzVX35ZPvq4Z2Itk74UPqw5z/mTsC6Mu/tLzU2cz5z+lrbwrqYeRjhMl50PR/y9rUUL2YclJ2nyy8TbEIO9euQ61mOobbfXzNkKdp84X6aPlOwb8zbWr8pwpYB32/KHUc/U+viElqBY+qlgTqEnoMbY/WRhS0+CSelh3rdV7yXZpvCcJeNeNxTpz98I355M8Vg/BeFPGHmv12lPtyRBo/N8T3XrY
   </data>
  </layer>
  <layer name="Above" width="30" height="30">

diff --git a/AndorsTrail/res/xml/pwcave4.tmx b/AndorsTrail/res/xml/pwcave4.tmx
index bcee6a84fcb686e07ce7fe78012af125fa16c0ce..3a11964a174940ce40f518e3423d72d6314038e6 100644 (file)
--- a/AndorsTrail/res/xml/pwcave4.tmx
+++ b/AndorsTrail/res/xml/pwcave4.tmx
@@ -50,12 +50,12 @@
  </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJytVstuwzAMc4z8QPYb++vec8juHdDdN2D9olbAhCos9XC6AxEkMk0rlmifptZOBF8JGIfN0Xtr722PSzD2d4qRrVHneEt0cWxV11ujzoGaAuV+FMZ6XG+NGc/qVvQsn+1dhqXvdW1snR+w76ire3e+xz7n/ZN9Z/8ZdSv/WN+/7+N/5vyJNfWqLuYTAXvI02VxrX/9bvPBcdXetbqRJ2xkf1nNovbU9zHbS6KLcesPUscS13q2+TKe1ZZ6xj3WXhLd5W9u9B9dm8RZvshjXunV1mrmQP9hfY77u/Rn7xrRFWT+49Wz513RHmR9lOVb7SHM2frVOnM/GnlGuTL/YH6EsSM+5aHyb6v56vjqXSHSr/gxcpaea2vPsbvCK0DPsIjuJ/8Bpqs5jt4BPFTOhei/VmsNOaxO0KuY5pE6Zzw7d3TuW6719sqes/MkypdxhXN1vD3THj0TLDc6gzJ4vIo/jtZqBtZDFZ7cbTbgbQZHdHEORNVbq3PcAEW9fOM=
+   eJytVkGOwyAMBJQPZL/RX3PPIbnvSu29lfYLfUlrrVCc6diYdg8jmoI9GOwxNadUCS4dMBvmo5SUTumIs7P2N/s4Z3+PzcdXhxfXRnmtPTYfyClonFtgLdvz5uzRstNnu3XWWrzs7nqYy35WG3Au0w79rde0WOX393PuZzqO7H92zsgbOeP2fX2uv039EXPqHd6qbDCeiG0FH8i75j/o+VyOtanj0UA7q3bv+ciL86saV3K/ms+KSfbMclp8CS/Oa32QOGWexcvs9D3qfMZaEt657OeJGiZ7k3kWL9oxrbRya1E+UH9YneP9zuVVu0Z4BT39sfLZ0i68+2rwRmDlcySXdcxar5aJ69HIiDrl5R2L50piekenGFitM0TjbeujbwWPP6LHaDOXPnerOfZW+ASoGRre++Q/wHhbjKNvAAuRvuCdazTXNKy+gFrFOL2+EuWs4Nvr+9pWa3vkzlk/8eJlttiDRvJ2tCdoW68H9WDZRfRxNFd7YDUU5cJcWzN/g0V50Qcioq0jPh4c5H2f
   </data>
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJy9Vr1OAzEMvh4NnUACCYkBKtE3KBs/C/1BohtcQYiZNwCJV2HpS9CnYGTsbfACVbsxlZiLdT7Xzl3KzydFFyW2PzuxfYmiv8dbI0z+yMqfEJ1TOz8OsLFYy75Tk6/RuaZzYTk2THEMGsu6t3Ztm6yNiW+t2NoiewuF991kslPLu2fn+2w0Ta77UouiXTcHXkNsgg0JNWEdZTchTudzX9Evs78KgOvKjp6zObBxDd18az2KZrUsVo7zOJNLiCxHm/n5XM/nZxVj0GJNnN+A7i+eBwLztQwTe2epUgeSjRk5y7mbf0Z5bsSeWFB3Tmy8emowFTg1zAUZSQ/koHf4eAGdFe5EyiEE5uDEw1tWFx8l/aYMBx77UAt0f8z8PHT7ko8+PQCtGw7sFWgDexj0k4d6XtcUWHs7Zjkm9E/LGZ7T2p1denh/gp5Q84nrRR02UBb38QugdVulPiQ/IPYbISbgMEKudZ1PIecg1SXvd0MSlyQLZ9F3vFC30n9IQ0rmCdGjfHjeFBjjtYsZ6zaE29dbQ+CrWw7I/zsjj3t3p4/KvjaqcAIgn6S6oXgS7IX+F1pxsW65vsQxWi/u8ZrBPNH6M+17Ur2ly0sFXvhO2B59l0g+U06uK6Ep9LKR0t+qvMEknyR9ykF1QvIWgG96sMffXvhfoLLfZ+pqjMdJuUFPu3cKtNFW/nNUH3ON8tKcpLFoKHujrfruKeP9b3wBFS1v6A==
+   eJy9VjtOA0EM3YRsUoEEEhIFRCI3CB2fhnyQSAcbEKLmBiBxFZpcgpyCkjLp4AIR6ajCmIyVt449uxs+TxrtaMb2s2ds70TR3+O1Vkz+0Mkfg86Jmx8VsDFbm38n8WIN55bOueNYj9OjV1vWvXFrW7A2BN8aZWcL9mYG71s8l5043l033xOjHqd1d/yceGNYJxsaSso6y25QnN7nrqGfZX8VENelGx1vs1eKor6fb1aj6KOk652V53IJyEo0hZ9PlcX8NGcMVqyJ95vQ/sXzYHC+ZmHk7mxs1IFmA89z6uefOX1i3SnYeAnU4FjhtDBVZDQ9kqPeEeIltFa4Ey2HJEYB3qy6eM/oN1nYD9inWsD9ofDzwO9rPob0CFg3Etwr2Ab3MOon95VFXSO49rbj5ZjYPytnZE5bd3YR4P0JOkrNJ74XtcRgWd7nLwHrNk99aH5Q7NdKTMQRK7nW9j4VOQetLmW/60NcmiydRdfzUt1q/yELY5gnoId8fN4IjvHKx8x1W4Q71FuLIFS3EpT/t7E+7vydPhj71sjDSaB80uoG8ajYK/pfaJTTdSv1NY5BNb0na4bzxOrP2Pe0ehsvL6V46TsSe89gR/MZOaWuhrrSywZGf8vzBtN80vSRA3WK5C2B3/RkT769+L+Ast9n6mtMxoncpGfdO4JtNI3/HOpzriEv5iTGYiHrjbbquyeL97/xBcrwbcg=
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
@@ -63,12 +63,12 @@
    eJzdVm0KwjAM7ZCZPyL4W2+gN/HrTt7CI+llpl5AO6SjlCRt0g/QB2OwJu8t6esWY+rjPdPFHsGY67yurosZemMW9tpbzQt8nx3sfdmn805c3vqzw2OmO8K/Qmoe4yndQVKnYC9cnjQH05XmSPOoPkt1U2q9WV/cgeaQ4tXFY1pwtMQjw1MOrtcSrhwvh7oUF+aB1Hfk4jDeNfDrsXo3QOdyvFtPV9PTHcRzS3uaO7chSvhTA833458g2aNSGHvecr/9GaDE9yhVUzsDxHAmZjSn2arG2pqcT1I0tT7juGOzKJafesak/4TwudM8CWd4ro85M3AOfm2+0uIDg25auA==
   </data>
  </layer>
- <layer name="Walkable" width="30" height="30">
+ <layer name="Walkable" width="30" height="30" visible="0">
   <data encoding="base64" compression="zlib">
    eJy9k0sOACEIQ7mC97/sbM0EaSmfJm5U+gDxmNlZWLc2eH/uJnOb6ym6G8V58RkxuXUzPW7Go5Orxmbue1zPI3p7xFXnUJ3Z6vx3cxnPKe7rXOlXN5fxeEnp4aS2uNmZmpA6LxvMbr7C7eJX2Nm/MV0j+vtszVF8lE/UA8RFuSEpb4Jiq1zvnGG+uCge5ZXJ2Zx95M3Ugepj+s7UynhU/x7rMbk+u8AjEQ==
   </data>
  </layer>
- <objectgroup name="Mapevents" width="30" height="30">
+ <objectgroup name="Mapevents" width="30" height="30" visible="0">
   <object name="north" type="mapchange" x="832" y="0" width="96" height="32">
    <properties>
     <property name="map" value="pwcave3"/>
@@ -88,7 +88,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="30" height="30">
+ <objectgroup name="Spawn" width="30" height="30" visible="0">
   <object name="iqhan_chb_1" type="spawn" x="64" y="128" width="384" height="160">
    <properties>
     <property name="quantity" value="3"/>

diff --git a/AndorsTrail/res/xml/waytobrimhavencave1.tmx b/AndorsTrail/res/xml/waytobrimhavencave1.tmx
index dc03d511c3a7cdb74e8b5948fbb3fc71c6a9a6aa..397586ade4ffac0d39283cd7caaa4cbe7aca156a 100644 (file)
--- a/AndorsTrail/res/xml/waytobrimhavencave1.tmx
+++ b/AndorsTrail/res/xml/waytobrimhavencave1.tmx
@@ -50,7 +50,7 @@
  </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzdVtuNwzAMc7xBMkWBbp0Nmg3aETpCJrkYCQGCpfxAD/dxH0TS2hYlWaKyTimtB14Hck5pyue7orbmsJLdNUCx+T6ey/Gcr3eFru1mD6P4CLuOc7tsFjv3dOJ5/b8TsLZPfSg+LpQjxwubAHy9pRO8dhPoWcUcxOx44avaVk7lfRhbyF8Pr8LxMaerK82fy7Xj6OV0dfi4akb3uLhHeDUfXE+wnfPnnhI395frO+RfOXE2uhPwLvlzrcSNdfiJHLFOuFhxVuMBand4J7+158Af3StiRm+yf5zHiBt+q034UOOFf9pvc8CruXG8vXA9wPW6kVbqXX/D62pe+2Q2nLjjkX6J9jjel8kvNI11rYe3tQ91xfOtlg+tux49q2mXzrdWvdfQ4uW97k6R48i+028AdwM+/G71TY0PwLeC80e1zM0hnUfRnSq2yfe/fvNAY6LvnFHeHMSac6xlrLVcTzx7a4C28F7tidFej74TNX86y6Oe6NUwnc8Obpa3endEx3t14Bu+/wjWsr/m7NHRnvNAbe038AOmVVIY
+   eJzdVtGtwyAMBDZIpqjUrbNBssHrBm+EdJIXlJzkXs7EqNX76MeJtBifbfDBlFOaNjw2lJJSLvs3ozWnMBm/k4Pq83cbx20cjm9Ga06hxgi/inM5fK7beE87fo7/VwPMrTmGGuNoaqR44RNArLe0w87dCLyWMTg5K17Eyr6Zk3ln4Qv1i/AyFJ/lfNKZepJPr9aKI8qpztp8nBm2UXn38HI97HmC71LONjVv21+q71B/5sRab0/AO5bzXM0b81wjqxMqV6zlfIDWHt5N3Nxz4Pf2FTmjN218to4eN+Jmn4ihxYs+434bHF6ujeKNQvWAPa+L0Ure63d41ZnnPhkEJ/a4p188G8X7EPWFplldi/Be2UGX7P3WqgfHMOdXRHkHw7eKnLzz3sIVr7VVe4p8PP+t9wHyBx9+X/VNiw/AW0HFw1rGGqvuI3UXKCxZ9z+/eaAx3junl7eUsy1y9LSM3zjq7m0B2mJtuSd6ez3yFoRva+v1RFTD+H5WUHf5Ve/26HhUB97h+0ZYLftvzoiORtYDrblP4A8h1FHE
   </data>
  </layer>
  <layer name="Objects" width="30" height="30">
@@ -60,7 +60,7 @@
  </layer>
  <layer name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzdVlEOgjAMHeLkAIbEX4+gV/QUXsc//PPHBP48AegFlEYay+yAzg2CL1nImtHXvbXdlJoWz1j+T6rf36tuzyWcMNJV216RWMD3dqFUlih1Tj72m5DL5C2Z/XIa5DVnkXzbXXkptLbz+oTpH7TbaF6DOaASxH1shg33aLgvqqMW5J8kXlfETDyh8wryaN3wZoSf44UaNvGrLuAzJ7yYz4dle505H6KLjzPDPSP/kHoLfWY2TNELOM6HoB4lQF3HqEVERe6ZMfUNpSH47euXofSNmP5BcarjKjxx0Rrk+hbFpebd96xx4cV82Vl8S/OJ6yto89lzzDdgF2/ImiiZu3qu751/QFffMO9nX3Dpg5J3XUi8AI2sQMk=
+   eJzdVlEOgjAMHeLkAIbEX4+gV/QUHgn//DGBP70A6AWURhrL7IDODYIvWcia0de9td2UmhbPWP5Pqt/fi27PJZww0lXbXpFYwPd2oVSWKHVKPvarkMvkLZn9chrkNWeRfNtdeSm0tvP6hOkftNtoXoM5oBLEfWyGDfdouC+qoxbknyReV8RMPKHzCvJo3fBmhJ/jhRo28asu4DMnvJjPh2V7nTkfoouPM8M9I/+Qegt9ZjZM0Qs4zoegHiVAXceoRURF7pkx9Q2lIfjt65eh9I2Y/kFxq+MqPHHRGuT6FsW55t33rHHhxXzZWXxL84nrK2jz2XPMN2AXb8iaKJm7eq7vnX9AV98w72dfcOmDknddSLwAJ7tA6Q==
   </data>
  </layer>
  <layer name="Walkable" width="30" height="30" visible="0">

diff --git a/AndorsTrail/res/xml/waytobrimhavencave2.tmx b/AndorsTrail/res/xml/waytobrimhavencave2.tmx
index 6ec03d053c5e7ff05c7e60edeead864ccbfdf3b8..d2beee8a7f1c2ca19e068a7d9372082c31085447 100644 (file)
--- a/AndorsTrail/res/xml/waytobrimhavencave2.tmx
+++ b/AndorsTrail/res/xml/waytobrimhavencave2.tmx
@@ -50,25 +50,25 @@
  </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJytlsuRAjEMRGdUmwCTAbetIsDNx7cNgSNkACFsJKwOLnqaln/jg2qwsfVku2U5rcuSJtkdbGQe9p2sjWP/4x7r21bb/1+Kh+dYwFScjdonars9wbfyk+e4L47bTHMuy6cx1/uy7wTx8hwcx+tSnFZDLvZ/g3Hc0bheSyJ25io7wlRc1M9MTonLup3NvIFv1JNr14RuWuMvmfu9Bety7Sq9RiyMt8bdxJia7n++tGG8nOfMULHVuLX1qjznOKL7doTL/NI9WTuLo7kT3ZP5LPz7G+gQ5+JejfLxLNz/NeCq2hbVtd44Ii6ysOZEda2HH+Wc2Z5Vqmt/EEvr+nGvmTlS06J3RD6rBbhn4ipmq15w78zebf/9XPU+55hG8lXdGZvt3yvRPvNbYzRfWRMPcdaoaRw7Wt9a7znkzqqxPdpIDXk3cl/X/NS4ipl1e4RZml9itrJ7fbSML7GjGlN7k8w2xXwBmPk9Lw==
+   eJytls1twzAMhWWiCzgb9FYgA3Yf33qsbj06GzQbtJM0AkLk+fVRlhQfiCC2xO+Z4o+WKaUlsFx5p+wCNrIPubO1cey27nt62GTb95GeLPYUX2vAY86J/s/0n30rP76n+GLdZppzTv+NmeWZ+86gl/fgOv4uxWk15OLzNzDWHa3rtSy0M1fZM0zF/ZwediSHbQH/nrueb0czsTYwn0rumsibFp8eo6jWuSYxziV3Vb5GLNRb60f5/n38bC/v31+0oV6uc2awthbu3veqOmcds+h9nLu9NaP6k9KxiFgwH+upWGvORn3Sz6L8fiSdAxgPPK8eDSpuhXm97f8SXGThrODz+r1br4414CILZ04011xHCz+qObMtqzbXfkiL++A+wly+RzhzZKapuwH6TcB9tW0uKWZrvuDZm23vK8WvirO/H6lX1TNOtr2vqDivsHZ09vDZ4/9aTuPa0fnW2ueQe9SM7cmNtbHmjrh3oI9lh6tix3U6wqztrzF72JGPqK/sMb3uFQv7CPqI+kvtfvSMKd1/nTlGqQ==
   </data>
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJy1VrFOAkEQvTvvqCwEldgethbqFwgotYjyJ3yBHX9ga2gstcLWClsTC+3gDzCxM9F9uZ0wDrO7p4SXbOD25ubNzM7MThT5EScBgTVhHpfbA9LMrytx+PC9EUVZ4NsPwTlT5Hcri/8nqd0zcjUH7455txfgdX3XsDpHlidPCv/PzfPU6m0I3oRxVSvFNwCXg70kp/FwXNu9sf29SH7bs2/jURO2nCWFbMeso6Sw1yf3n8X9JFyZ/ZZZfft+m73jnJcr5jriAl6Zp+/2F/GSvrk4B0rcgbrVf2+XlttPdp/yj/um6W3b+NC6iZaXrAP5DLzEBSfO8svUVlexjXP1V4j3hPnB83Uz1XmbZm/LEVMNrl4D5MlyjYWg1VFZjD3fHnj8PWQ1CaDXDR26tPPk+xRv1BLVlsbbYzXOuQGqd62HugB+nMWtWC57iZ9soN5EdqA/8n4NPXcObsn5Vxs6zPehOAvgsYT/14G80ezgMSA7eAxcdoOrbs8GMaI7Ks8W+8BbVD4OnZJ1MhV3AI8T6pvnjOSeK7b0Arza/Yb/stbovvzM/LlAfbjp4ZU9Q94FiNVE8L+W6BvPHt6GPXv4QXzyzumxHAF4zmGe0XLwWPibO/hDd4+sV9KFeaaSFTx4nmULThcvxVe7y3HvnLI9bovM06qYD7oKr8wTyYlza9s7juaPlrBB48ZsMkoX+gZMD4drfiBZORPPS/QJro/0UE747kMpC8g5yNUjND1lQLKIM2JGc7xmJ3HL/IMsn218vvK+EpqNNI7QHCVzbt14iHU/fwAtZ5kP
+   eJy1VjtSAkEQXcZdIgNBpUwXUwP1BAJKLKLchBOQcQNzEkON8AZcwEAzuIFWmVml+2qni6bp3lmheFVTsLO9/Xp6+hdFxai4gMCO8FkptwfESbEuZ5zhdy+KksC3X4JzocgfV5f/r2K/l8nVDd6j7N1JgNf6rul1TjxP6vLz32bPc6+3KXgd46pV828ALgd7SU7j4Rj5van/vXOr9px6f9SFLTcul+1m68Ll9hbJbbL4OQkP2X47WwP//pC945z3W8Y6/AJeGacf/hf+kmezOIeK34GG1//slxXb2Kf442fT9Ha8f2g9RutL5oF8JoATd/mT5VZPsY1zDbbw94ydg8frfqzztrK9A8OnGqxaA6RuPcdC0PKoLKYF354VnPec5SSAWjc2dFn3Sfvkb+QS5ZbG22c5zrkBynethloAv3YXlr3ETzZQbSI7UB95vYaep/Lm/MuGLjv7WNwF8FqCY1QibqQd3AdkB/eBZTe4Gv5u4CPqUWmy3AfeA/zcjm7JPJmLHsD9hPzmMcPjQcYH2dIP8Gr9Df9lrlG//N6gX1ucBNkL4KuZ4H/bom4Q58T3JeKTPafPYgTgMYd5RovBS6EjNfwd6j0yX0kX5plqkvPgeZGscraU+kL+1Xo5+s412+O2yDitifmgp/DKOJGcuLeO73E0f7SFDRo3ZpNJvNQ3ZHo4rPmBZOVMDBtCdYLrIz0UE0X9UMoCcg6yaoSmpwxIFn6Gz2iOL+oVMv4gi9mGOIvOyutKaDbSOEJzlIy5XePF6Kt/BAGDyw==
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJxjYBj64D/zwNhDrr3E6oOpQ1f/nkR7cZlDSD2p9lBqDqX2odtLbzBQ9uIKN5B7PpDopo+MxKtFNxs5neGNSxbS7cJmDzofZicv0Hw+NMzPQp5d+OxF9qMM0HxZIJZDw/JArECh3YTSlS7QfD00rE8F/w43IMI60C4gHdCzTEG2i551KrJduMoNUuPuJwOkfFkExdjspFZ9AwKHGCF4ER3thJl7CWjXSgYIjU2e2nbCzAWBnQzY0wot0o8SE8IvJxmw+4sWfh0FowAGyG2zDBUAAEJWQaA=
+   eJxjYBj64D/zwNhDrr3E6oOpQ1f/nkR7cZlDSD2p9lBqDqX2odtLbzBQ9uIKN5B7PpDopo+MxKtFNxs5neGNSxbS7cJmDzofZicv0Hw+NMzPQp5d+OxF9qMM0HxZIJZDw/JArECh3YTSlS7QfD00rE8F/w43IMI60C4gHdCzTEG2i551KrJduMoNUuPuJwOkfNkIxIvQyhmYndSqb0DgENCOR1C7DtHJThB4yAjBK6FsdEALO2HmgsBOBuxphRbpR4kJ4ZeTDNj9RQu/DgdAbl07EsAnEsJmuIcjAL8GQ9I=
   </data>
  </layer>
- <layer name="Walkable" width="30" height="30">
+ <layer name="Walkable" width="30" height="30" visible="0">
   <data encoding="base64" compression="zlib">
    eJztklEKwCAMQ72C97/sfod0Nk0ydbBCwQ+bl2p6a63//am+FzPHcNBCdVy8SFedV/+lupsrD0hWHDw0T04WwkV4iqeRWy2Vy2gqXIbv2tnt9QQPq3yc8Aajj+qMi8/+k/JusxmmVG6m+QY30kLuObmzXI3nrJ70Z94zLSUPChO5i8y78sNkwcXMcrOid3GjvgAFyyos
   </data>
  </layer>
- <objectgroup name="Mapevents" width="30" height="30">
+ <objectgroup name="Mapevents" width="30" height="30" visible="0">
   <object name="east" type="mapchange" x="928" y="160" width="32" height="32">
    <properties>
     <property name="map" value="waytobrimhavencave3"/>
@@ -82,7 +82,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="30" height="30">
+ <objectgroup name="Spawn" width="30" height="30" visible="0">
   <object name="allaceph_2" type="spawn" x="352" y="352" width="32" height="32">
    <properties>
     <property name="quantity" value="1"/>

diff --git a/AndorsTrail/res/xml/waytobrimhavencave3.tmx b/AndorsTrail/res/xml/waytobrimhavencave3.tmx
index 526c99b13b78697753bbc6421c6c1dbd8e8b77f5..0cc2187d20cf9f891bcaabc81e5fb5a88ff2bac6 100644 (file)
--- a/AndorsTrail/res/xml/waytobrimhavencave3.tmx
+++ b/AndorsTrail/res/xml/waytobrimhavencave3.tmx
@@ -50,17 +50,17 @@
  </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJy9lrFqAzEMhn2GZr9AsncrdM8D3xAInZItYwJt5gu0D1Bon6MWZ3F/fiTbbWmHHyd3kj5blnUeuhDOBQ1Z16zBEfrEePuui7aPxBsdiQ/HsuaGMZZx8lOfPs42J4gh7z1uH29jIe8KnHfweQyz3y7MrANwx+wvtp44Fq5rLPjKu2OY88xctH0gWbFGw6+kPucKuRifmb8VszXnxz9gldjCO/8Tl/nXfEZa56rad7a8+rDi9XmvW+pJ5PUJfN7CFx0a6pI52ru2Tg9rYQ8VLp/zrSPm19h6nktrHXJP85g1tsW3bHitwpTe9JSe3aXxJT17TlrE6T+zTw7bqxWuW83FMsd+S1rFaXxNWsfpv7AXwNc+rnMuMdkGe6rG+0y6hGn8yL9Fwl4DX86Jznvf2TkcaF14xk6w99s8XsI8spSP31vdI49r5UNtVnlvN2RjsTdxnjMzMY/WWi2bdZznUepj3joxj8gtfb+4JzEb56f3DItp5bn07cT7ztlYSw972heYXl15tnjf0XuGlxurTjg3eFer2Su/dM+orRVtvLqq9W1vLS0918ux7hXfV9EGv4H6W3PtrbPG5Xsj76vWmPTiXbh9b+Va+4+e61JNWVyel8Q/Nuy7cu5j+zkq1ViLHZ4xT5Yf359+Is6vJbyrld59VxzrC3DPVaM=
+   eJy9lkFLAzEQhbOBel/B3r0J3vuDcxCKpxYUeuyCem5B7y3o7zBDM+zrYyabqnh4bLeZzJeZTGaTuhCGilLRrig5wjkxhrCFsS6ONsnwaUnmsC9rbTjnOp7myZx9fu/jaIM+ZNzj9vHcl9gfi5BzgPf7MM5bhpG1Bq7OE1tP7At5OubN24Qxz8xF2zuS5WtnzKupL7lCLvpn5m/FbMn5vuTgr1k1tvCGf+IyX/e7da2qVWfLqw/LX1/2uqWeRFaP4F7QwhetG+qSWVrPT9DDhgvZaYKL501ZogcQ8lvZep5rsabS016Ix/LYFt+y4ViFKb3pKmuW9dqdpO/M3jpsKx62WUFPFeZzfs7z8ybrI/9+h/dZWZPkQ+y0j+uaa0y2wZ6q+f3Kegun52f5LRL2HPhyTnTdq87OYaK48Ixty/8ziFdZlpSva8Y98rhWPtRG/D3m9wXZWOxFHNfMTMyjFatlM4fvfq2PeXFiHpFb+35xT2I21oLeM7xvOue59u3E+85gxNLDnvYVpldXni3ed7z7ibKtOuHcxFivK4tfu2dMxYo2Xl1N9W0vlpae6+UY9/IIQhv9L8G45tqLc4rL90beV/Gt99hlOB+3cq39R891raYsLq9L/G8a9l05t7H9HNVqrMUOz5gnax7fn34izq8lvKvVxi4V+/oGgaBW1w==
   </data>
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzFVstNAzEU3F0+OSNEAUAHSFAAnxRAgE6ogFa4UAJHjuGWA0gJEhJ0kEhBygXYER4y+3hv13BhJIuN/TzzfjYuijzMyqKYlpnGmXhf8edf1/L2V1W7Pf2dtfj9kqkFTOR7a335vZf8uFrN47l27LarJpflg96OrI16y31dMXDfZc13Un+fptGvx4bEAS6NS/UA2l6KX8NAk/wANM+EayA+/HaQEzncNv7dGP4zidvDQ0e9dN9AtAFqQ3Ph2BNHtd3hH8axky/qI+dPqebobWsPzQvJE9F2fsGzWdf3PNDvp96A9q3sOxefL6om56JD0+qTz4sdY5jstGcJ5B7znh7O7TzNv9V/S+NnpA1oj3wE95Xlmhsf1qtYX7Vt3i0QY249qWV/W23mUut46PhHbJrc21hzfSEvzwziugtsxkUz1lzNCLk5tPcL8VyPffR7ysVB9fXbwnKzf2wOFbjXh73m3FrifiyXZ0x7FdoHLX1DWF4C9zx0x71mzMw/4uD9QG17T9HG8qK/xoGuYmRslIt3HMZucMZVk/DuA6xr/b27RDFpX/7m7OLx7o6ov9rAvNg4UNv7jjyrffRuYP5Qa+uf5pbnFrWdBLpt/ii3jYXr2lPoD+aYtly3NaY/9v3nvbs0FmC3o47jYJ65aesD9lLUv1xnr9g47f8tD9FbGLXg/pye7oLtJQ94y0a9gd7jW1f7SvPrvdu9c2TfXdfpLeC9qb36dJ1d6w/tp+XPNUV0z+fk7r/wCfC4lrM=
+   eJzFVklOAzEQnAxLzijiAZAfIJEHhOUBbD/hBXwlF57AkWO45cAhQUKCHwQpSLkAU8IFlabbY7hQkpXJuN3VS9njqirDS6eq5p1C40K8rfnvnzfK1td13p7xvmTifirkAmbyvL35/byX4rhaL/Mzcux26lVf1h/4dmVu0v1e15YD1102/o6a55M0jpuxJXnAl+alfABtLyWuccBJ/wA4z8TXqcTw20GfqOGOie/a+D+TvD3ct/RL150KN0BucC4de+KgsRv+YRw69SI/av6Qeg5tW3twXkidiNz+hZ9e09/zgP84aQPcN7LuXGK+qFd9Lls4LT/9ebljjJOdapZA7fHe48O+XaT3r81vx8QZcQOqkffgvLK+FpmcLb9y27pbIMfSfpZys5bax6ETH9Eztc/larkV9Ms9g7xuA5tptZprKWeE0hra84V4bMY+9J5qMag//1tY39SPraEC5/q4G89zn6lWwT3I6IaI/OKcB++0u5oz6488EHvP0QpjgI3Vym76vkwz+RATY6O+eMZh9IM9rpyEdx5gXvvvnSWKWX76y2ebH+/siPSVA+ti80Bv71rqrPbRvYH1Q69tfFpb7lv0dhbw5uJR3zYXzqumoA/WmLactz1mPPb+5927NBeg39LHafCetcnpgFqK9Mt5asXmab9bHqK7MHrB9SWaboPVkgfcZSNtQHu866qutL7evd3bR/beNUp3Ae9O7fWnbe/aeGg/7/ycU0TnfEnt/gsf7FuUMw==
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJxjYBg48ImRgeEDM2Vm/CdTP6X66GXvaVZUfe/JtJdUfbdZKbNvFAxP0MwCwSBAad4lFaDnBXoDUHk1EsDHIeRPctICNdItOfbeIsJMQm4jx15C5oLkKSnnTZmwm4nPXJg8NQEhO2FqqFmnEWMnCJBadlAzzkhJ7/jM/UBi2JESv/jMJdVOaqUraoUbqYBQOYFuLyFwkp14vcT6mRh7bxJhryK07CA27Mitg0+SYMdIBgBCLUa0
+   eJxjYBg48ImRgeEDM2Vm/CdTP6X66GXvaVZUfe/JtJdUfbdZKbNvFAxP0MwCwSBAad4lFaDnBXoDUHk1EsDHIeRPctICNdItOfbeIsJMQm4jx15C5oLkCZXz+NK+KRN2M/GZC5OnJiBkJ0wNNes0YuwEAVLLDmrEGQyQkt7xmfuBxLAjJX7xmUuqndRKV9QKN1IBoXIC3V5C4CQ78XqJ9TMx9t4kwl5FaNlBbNiRWwefJMGOkQwA3a9Hpw==
   </data>
  </layer>
  <layer name="Walkable" width="30" height="30" visible="0">

diff --git a/AndorsTrail/res/xml/waytobrimhavencave3a.tmx b/AndorsTrail/res/xml/waytobrimhavencave3a.tmx
index 94ff1f43ff42d068267448bb22ec74099a9b09af..0a1dadfaf77617bfe3217c78cbe8df6a3d341159 100644 (file)
--- a/AndorsTrail/res/xml/waytobrimhavencave3a.tmx
+++ b/AndorsTrail/res/xml/waytobrimhavencave3a.tmx
@@ -50,7 +50,7 @@
  </tileset>
  <layer name="Ground" width="20" height="22">
   <data encoding="base64" compression="zlib">
-   eJzVVNsNwjAMdCK1G6SLs0N/GIEBmIBuAHMQC51ijJ2kaX/4sCxdeuf6uQai1bE5Ek3Rf68Zc7fsH6H4JWPJwDXHisncV/bPUPydPqZxzUkqD44Dbo+BJ7EUv+Ps1dJ6XhyLx7nM8bfemoOcPRzGuSyx/m8yZwvfKnNTq7cXj/t2JXtuvHrrmdHvN7LnpqdXXk1G5uhf9I5otu7DWTot7RG+p9l7C3HbLlQMGHZX7o28hfAyFm6b1AOG3dUzrb28V/hW6h3p8Sj3jF637A25VypH
+   eJy1VEkOwjAMdCLRH5SP84dcOKcXzoUX0B/AO6hFRnHNtLQsB8vqKDOu1xREUrGzsyaK7OIrnhwnEVPuMPprqH4/Yi3Be8fRmFarK9z76G+h+os8zeO947RxqqlxwF1j0LOYato4a7WyyWlNHMbTXJpY6zaXk75jeugpuJrLPk7rzf6hLW8YPpS6s7lZqjdielz7dhQ+N3P1tvVgOZyEz81S39/VZOsc/UuP1XCrsT3+pRYsb9DNCzpM12tng8/x/H3ztw69YrfQ38Qu1Nt2kGrAsLt2b+wthMe96sxts3rAsLt+pr239wpvrd438/cJl80A6+UaYzx8PwDdRjFz
   </data>
  </layer>
  <layer name="Objects" width="20" height="22">
@@ -63,12 +63,12 @@
    eJxjYKAd+M+MXcyYjTQ9MHEQLmNH1f8eh3pkPbjk8OklRQ8+ewiZBwPIfiLHbejmESOOD3zA46dvjKSbh81PX4kwB90NsHAixk8fcMQVCMyBpiMQDQLEhDc2O2H61rCj0sQAcuIFHyAnXkYBcQBbWsIFYPFKqGwi1TxkgF6GUmoeulvxuR3d7sGc7gCTbzAX
   </data>
  </layer>
- <layer name="Walkable" width="20" height="22">
+ <layer name="Walkable" width="20" height="22" visible="0">
   <data encoding="base64" compression="zlib">
    eJwTZGBgEBzBmAGJxgXINYdSd1HDHGx+I0cvqXLk+IkU8xhw0LjMI2QuNkCsebjUEvIzpYDYcCZkBj6zSHUnJekS3b2UpnlK881wNg9buBNKv4TUEwtoGQ7oGAA+kBVS
   </data>
  </layer>
- <objectgroup name="Mapevents" width="20" height="22">
+ <objectgroup name="Mapevents" width="20" height="22" visible="0">
   <object name="south" type="mapchange" x="96" y="608" width="96" height="32">
    <properties>
     <property name="map" value="waytobrimhavencave3b"/>
@@ -76,7 +76,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="20" height="22">
+ <objectgroup name="Spawn" width="20" height="22" visible="0">
   <object name="toszylae" type="spawn" x="320" y="96" width="32" height="32">
    <properties>
     <property name="respawn" value="false"/>

diff --git a/AndorsTrail/res/xml/waytobrimhavencave3b.tmx b/AndorsTrail/res/xml/waytobrimhavencave3b.tmx
index 3e39e2d02959db6877f17a217231c1aa28c41132..4f2c30b12cf5710ddbb1d65a9eadba94f7700619 100644 (file)
--- a/AndorsTrail/res/xml/waytobrimhavencave3b.tmx
+++ b/AndorsTrail/res/xml/waytobrimhavencave3b.tmx
@@ -50,7 +50,7 @@
  </tileset>
  <layer name="Ground" width="14" height="7">
   <data encoding="base64" compression="zlib">
-   eJxbxsjAsIxMzMrEwMAGxNeA7KuM+GmQWpg+USBbDIifAdlPGfHTokj6jjOQhonVNxkJ49JHatiQqgcAhGVDLQ==
+   eJxbxsjAsAyKjxGBYWq3ATErEwMDGxBfA7KvMuKnQWph+kSBbDEgfgZkP2XET4PUHoXqO85AGiZW32QkDNO3DE3fViS/b8WBkcMG2RxiMADDt0WC
   </data>
  </layer>
  <layer name="Objects" width="14" height="7">
@@ -63,12 +63,12 @@
    eJxjYKAc/GcmTf0HZvL0wdS/x6JvDjtuPiF7PuCQ/8ZIvNuINRMXAAClLgoR
   </data>
  </layer>
- <layer name="Walkable" width="14" height="7">
+ <layer name="Walkable" width="14" height="7" visible="0">
   <data encoding="base64" compression="zlib">
    eJwTZGBgEByCmBDApx5ZDJccuhpy3EeKegBXSAVi
   </data>
  </layer>
- <objectgroup name="Mapevents" width="14" height="7">
+ <objectgroup name="Mapevents" width="14" height="7" visible="0">
   <object name="south" type="mapchange" x="64" y="192" width="32" height="32">
    <properties>
     <property name="map" value="waytobrimhavencave3"/>
@@ -82,7 +82,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="14" height="7">
+ <objectgroup name="Spawn" width="14" height="7" visible="0">
   <object name="allaceph_4" type="spawn" x="224" y="96" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>

diff --git a/AndorsTrail/res/xml/waytobrimhavencave4.tmx b/AndorsTrail/res/xml/waytobrimhavencave4.tmx
index 5e6d1debf46259cfd5baa8f3d3285e86676f3c87..1fd3ec27dbc7be128940c42d1acc17ed2eefeff4 100644 (file)
--- a/AndorsTrail/res/xml/waytobrimhavencave4.tmx
+++ b/AndorsTrail/res/xml/waytobrimhavencave4.tmx
@@ -50,7 +50,7 @@
  </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJy9ljFuwzAMRSUt3QLYp0jRW3vr6G4dnRvEY8eepCDgD7PfJGXZRgYCRsTokdQnpSGnNAT2OGHRvhGvlJSe+bjl0sYHrz/J7UrM17URJngfabV7g+n/RfxxsXnJ8SjPY2v+7NT3CqbHFpsM5lW5RmypdcSUdfn9ava4MD/Tlon1PuC+k1k+UtMvpc+BNGXlinVrv1uuc6FdaIbPdaCYxER3k1qr5WpxOzUDOBePq+OzuFa+FlvPAInDYvNZcI8fqTVrqiv/c+3Ltn/R43L+3zu0dXO04OlGW6u+NHtPH3GtkTNz4QddQqetfe1pNtLXnFddQqdRX++ZWTUuavIb1PkoF3V85O29gDq31NW6C6xZOCz3H7TLPlzXPftGFr032LdWM30+I8XPudTeOt49aGlDuD9v61lBFxPth5jGgOudqd5b60LPY5yN9mHzmFav8N54v8H3mW1/y/h9x3PLmvX6m1mWf41r3cVn+jaymp5fyX0F2+OiJ7X2uTd5BkU+LdxajyO2PTOI4/oDLcY3Yw==
+   eJy9ljFuwzAMRSUt2QLYp0jRW3vr6G4dnRtk7ZaepCCQjzD0JyXZRoYPBBWrJ1KflKec0hToukPRvhGvlJRuebty6eODN+7kDiXm69oIE7zP9NSlQ/r/Iv78EHLcyvPYls/qewTTY4sWwjwq14gttY6Ysi5/P5o9P5hfac3E+hhwP4xYjNT0W/lzMp5iuWKd7XfOdS68C8/Ye53MmUTiu0Wt1XJl3KG89ofOxePq8zEuy5ex9QyQczC2vQvb41tqbT01lNdcx7LuX9RJ7v+nwVtnxwueb7R6/aXZLX1ka42cLRdx8CV82tvXnmcjf2lfwqdRX7fMrBoXNbkHdd7KRR2vef0uoM49dWVvAZuFeP/gXVZnXdeWfSOxuQXZ2FrN9P3M5vw2l9q3jvcOsnML9/f0vCv4YjH74UxzwPXuVO+tfaF9j7tBzF9u+9YsTq/YveELxN4yj2ey33d2brFZr39bFouvcdlbvKdvI9X8/E7uO9geFz2pvW97k80gL6aHG80WfTZv3c4PrX+BeTcZ
   </data>
  </layer>
  <layer name="Objects" width="30" height="30">
@@ -63,12 +63,12 @@
    eJztVksSgjAMLaCwduEBXHgEj+DJvIYHEm6Al0DcuVI62jF2kjQtEVn4NmVayEtePtSYeeJexL1fL3X4Ynh3pTHtCF7L5fi6YT0sZN/tS/pMYsNydpH6hrBmfErhDNmTAubzmunYDPFhsV4EsW+JmPvs0/ceiaMj9HV70trCQPkeq6eN71g9n93KgetFTk/srHj1aSPoV44X097hFjaNoh60aCp6BuT5+5mKW1JfPtqB88zkAcZKaaI9RyBgH2nNAwn8ul553ClaQ9SM5pxtmINUHzY5vs/VvM2B018737H/eS3AHJ9Az43NbSq+2Udzga9tOwEnvGNh8Oetm8UanDE5Dc1iKe8v6miKe9Uf0+AB9llKag==
   </data>
  </layer>
- <layer name="Walkable" width="30" height="30">
+ <layer name="Walkable" width="30" height="30" visible="0">
   <data encoding="base64" compression="zlib">
    eJztk0sKwEAIQ73C3P+y3ZahxsTPlEIF6Sb61EmXma0/X0/bvozeBD2qV/pk655q990z7Kg20jDsCa53D8RgdlGZHp+9kTcr8jfacYJ7ZzO1UU9GE0XVixnmFJf1lvr+LBexkYbtp7I7/MpwGW+e4LKhcjsi4y3Uh+FFXI/Nzl35T6L9JvMUp3Kbr3Pv0XHzPbI6dQ5F3x3d71G97cm8AP3KKzw=
   </data>
  </layer>
- <objectgroup name="Mapevents" width="30" height="30">
+ <objectgroup name="Mapevents" width="30" height="30" visible="0">
   <object name="east" type="mapchange" x="928" y="800" width="32" height="32">
    <properties>
     <property name="map" value="waytobrimhavencave1a"/>

diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ActorStatsController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ActorStatsController.java
index 25cd0112af41f6feebc33b91d08d9818b850be67..cf266badddbb455899d5b49ef2dd087c2acf197e 100644 (file)
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ActorStatsController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ActorStatsController.java
@@ -26,25 +26,61 @@ public class ActorStatsController {
        this.view = context;
        //this.world = context;
     }
-       
-       public static void removeOrAddConditionsFromEquippedItems(Player player) {
-               for(int i = player.conditions.size() - 1; i >= 0; --i) {
-                       if (!player.conditions.get(i).isTemporaryEffect()) {
-                               player.conditions.remove(i);
+
+       public static void addConditionsFromEquippedItem(Player player, ItemType itemType) {
+               ItemTraits_OnEquip equipEffects = itemType.effects_equip;
+               if (equipEffects == null) return;
+               if (equipEffects.addedConditions == null) return;
+               for (ActorConditionEffect e : equipEffects.addedConditions) {
+                       applyActorCondition(player, e, ActorCondition.DURATION_FOREVER);
+               }
+       }
+       public static void removeConditionsFromUnequippedItem(Player player, ItemType itemType) {
+               ItemTraits_OnEquip equipEffects = itemType.effects_equip;
+               if (equipEffects == null) return;
+               if (equipEffects.addedConditions == null) return;
+               for (ActorConditionEffect e : equipEffects.addedConditions) {
+                       if (e.isRemovalEffect()) continue;
+                       if (e.magnitude <= 0) continue;
+                       if (e.conditionType.isStacking) {
+                               removeStackableActorCondition(player, e.conditionType, e.magnitude, ActorCondition.DURATION_FOREVER);
+                       } else {
+                               removeNonStackableActorCondition(player, e.conditionType, e.magnitude, ActorCondition.DURATION_FOREVER);
                        }
                }
-               
+       }
+
+       private static void removeStackableActorCondition(Actor actor, ActorConditionType type, int magnitude, int duration) {
+               for(int i = actor.conditions.size() - 1; i >= 0; --i) {
+                       ActorCondition c = actor.conditions.get(i);
+                       if (!type.conditionTypeID.equals(c.conditionType.conditionTypeID)) continue;
+                       if (c.duration != duration) continue;
+                       
+                       actor.conditions.remove(i);
+                       magnitude = c.magnitude - magnitude;
+                       if (magnitude > 0) {
+                               actor.conditions.add(new ActorCondition(type, magnitude, duration));
+                       }
+                       break;
+               }
+       }
+
+       private static void removeNonStackableActorCondition(Player player, ActorConditionType type, int magnitude, int duration) {
                for (int i = 0; i < Inventory.NUM_WORN_SLOTS; ++i) {
-                       ItemType type = player.inventory.wear[i];
-                       if (type == null) continue;
+                       ItemType t = player.inventory.wear[i];
+                       if (t == null) continue;
                
-                       ItemTraits_OnEquip equipEffects = type.effects_equip;
-                       if (equipEffects != null && equipEffects.addedConditions != null) {
-                               for (ActorConditionEffect e : equipEffects.addedConditions) {
-                                       applyActorCondition(player, e, ActorCondition.DURATION_FOREVER);
-                               }
+                       ItemTraits_OnEquip equipEffects = t.effects_equip;
+                       if (equipEffects == null) continue;
+                       if (equipEffects.addedConditions == null) continue;
+                       for (ActorConditionEffect e : equipEffects.addedConditions) {
+                               if (!e.conditionType.conditionTypeID.equals(type.conditionTypeID)) continue;
+                               if (e.duration != duration) continue;
+                               // The player is wearing some other item that gives this condition. It will not be removed now.
+                               return;
                        }
                }
+               removeStackableActorCondition(player, type, magnitude, duration);
        }
        
        public static void applyActorCondition(Actor actor, ActorConditionEffect e) { applyActorCondition(actor, e, e.duration); }

diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ItemController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ItemController.java
index 23d9b33217e5d86449dbe33b143b19f27b67f9f3..da00622d56ca68e9ec1de6cdab37a9500db25938 100644 (file)
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ItemController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ItemController.java
@@ -57,7 +57,7 @@ public final class ItemController {
                }
                player.inventory.wear[slot] = type;
                
-               ActorStatsController.removeOrAddConditionsFromEquippedItems(player);
+               ActorStatsController.addConditionsFromEquippedItem(player, type);
                ActorStatsController.recalculatePlayerCombatTraits(player);
                
        //message(androidContext, androidContext.getResources().getString(R.string.inventory_item_equipped, t.name));
@@ -75,9 +75,7 @@ public final class ItemController {
                player.inventory.addItem(player.inventory.wear[slot]);
                player.inventory.wear[slot] = null;
                
-               if (type.effects_equip != null && type.effects_equip.addedConditions != null) {
-                       ActorStatsController.removeOrAddConditionsFromEquippedItems(player);
-               }
+               ActorStatsController.removeConditionsFromUnequippedItem(player, type);
                ActorStatsController.recalculatePlayerCombatTraits(player);
                
        //message(androidContext, androidContext.getResources().getString(R.string.inventory_item_unequipped, t.name));

diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemTypeCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemTypeCollection.java
index 8df1ff744ea9307a6bdb0f231c2ba77d2507d444..db4ff63d9eadc4f3285fef459c31b29943563f82 100644 (file)
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemTypeCollection.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemTypeCollection.java
@@ -1,6 +1,5 @@
 package com.gpl.rpg.AndorsTrail.model.item;\r
 \r
-import java.util.Collection;\r
 import java.util.HashMap;\r
 \r
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;\r
@@ -31,8 +30,8 @@ public final class ItemTypeCollection {
        }\r
 \r
        // Unit test method. Not part of the game logic.\r
-       public Collection<ItemType> UNITTEST_getAllItemTypes() {\r
-               return itemTypes.values();\r
+       public HashMap<String, ItemType> UNITTEST_getAllItemTypes() {\r
+               return itemTypes;\r
        }\r
 }\r
   
\ No newline at end of file