Merge remote-tracking branch 'wushin/tonori-cave-release'

Conflicts:
license.txt: graphics/tiles/Woodland_ground.png was changed in master
    added also enchilado here, since that edit was forgotten
npcs.xml: id conflict with trapper and supply chest, moved supply chest down to 378

1 files changed, 7 insertions, 6 deletions

diff --git a/maps/032-3.tmx b/maps/032-3.tmx
index 40553bd7..63fc252e 100644
--- a/maps/032-3.tmx
+++ b/maps/032-3.tmx
@@ -7,24 +7,25 @@
   <property name="overlay0keepratio" value="true"/>
  </properties>
  <tileset firstgid="1" source="../tilesets/collision.tsx"/>
- <tileset firstgid="3" source="../tilesets/cave.tsx"/>
- <tileset firstgid="131" source="../tilesets/cave_x2.tsx"/>
+ <tileset firstgid="3" source="../tilesets/cave2.tsx"/>
+ <tileset firstgid="259" source="../tilesets/cave2_x2.tsx"/>
+ <tileset firstgid="291" source="../tilesets/cave2_bilevel.tsx"/>
  <layer name="Ground" width="160" height="100">
   <data encoding="base64" compression="gzip">
-   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
+   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
   </data>
  </layer>
  <layer name="Fringe" width="160" height="100">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3OMQEAAAwCIIOsf84V8PeBBCQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANLcOAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwNAD42jPuQD6AAA=
+   H4sIAAAAAAAAA+3asQ3AIAwEQLJHtoqy/ypZIAUFAt7clVQu0Ft6uTUAAAAAAAAAAAAAAAAAAAAAAAAAAMj3XKsnAFhHBnIqfx/YQUoWvSFzAowk++pL2cMAAAAAAOS7f9701MCuZuSTDASAdexhAJK45wVOJPuAE8k+AAAAyOcegVFSu6LUuQEAAIC5RvdoPZ2E7q4OHRQAAAAAAAAAAAAAAAAAUMUHUCTZNgD6AAA=
   </data>
  </layer>
  <layer name="Over" width="160" height="100">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3d0Y6jIBgG0CZ7ufMCnX3g2X3r7Vw0MQ6iIAjIOYk3bdNW+fi1ovTxAAAAAAAAAAAAAAAAgD49X8vnavnT9Bsxi+/sfQQe//34mcnQIqfk2speilhO97L5THgt91Iie2c++3P1+d85Ts1g6LhBje5fy+zFpGSw13Wgb3u5yamDjKP1fvfIZ8vgPY20z5LB61yxrUfK3psMXud9HqPG9h4xe7QRy+Ez8txdqYFthM7rfiye0yZ1bZ1btB+ZT63+Fjt/LWdxamCaUNbeGfu1WKC0vd9fX6/l72v5d83XAQAAAIDTZhwrpq3lOf7lWLEc0lqJ8bpngffgno5c41cig6HrcmLv6R5LaovdA7y+x1IOyVHyGuplXmWxPddSnWc/T47UffKR65JTj1FRA4/Od5R7DLDevurlT47P61pm3PX19EK/pwezHwMBc0utgeaWoDT7YUag9pXlmkFCjpwrPXs+VV9OM8v2Wq/n1jjBkdfUGFeY0QzZC80Rn8v8JrSUOr+J33/bZql9rddRBqEvPdSF2mZYRyCNugB16WN9Gqld/G68l5GyBz3I/S9b/awvI7eJ/TCjGLmf3ZU2gbnMfswQmj8RalnP5SFz1CRv5h25Suz/BqF0P1TbrjF6/QzdV7B1v8rReX3lrb6S94O0kPP9j87rS7+25mu8qnaO3m/Is9fue/dolvivBrnrw1YNqlGTSrX7Op+p8+PKXXupbXFm/KF2u+/lUe76Umv8+sj821dY51Hu2irVHnvHZdoZAAAAAAAAAPr1H/XbsEwA+gAA
+   H4sIAAAAAAAAA+3d0XKjIBgGUHu1u7N9gXTf/z23veiMYxFBQUDOmfEmySRRPn6NClkWAAAAAAAAAAAAAAAA6NPrc/nYLP+afiNm8ZW998Djf5efmQwtcspZe9nLEcvpUTZfGa/lWUpk78pnf2w+/yvHuRkMHTeo0f1rmb2YnAz2ug707Sg3Z+og42i93035bBl8ppH2WTJ4nzu29UjZ+yaD9/k+j1Fje4+YPdqI5fAVee6p1MA2Qud131fPaZO69s4t2o/Mp1Z/i52/lrM4NTBPKGsyxh2Ofn/9eluW35/Ln7e7vhEAAAAAXDPjtWLaWp/jX18rlkNaK3G97lXgPXimlHv8SmQwdF9O7D2NsaS22Bjg7RhLOeSMkvdQr/Mqi+25l+o6+3nOyN0np9yXnHuMihqYOt/R2WOA7fZVL39yfF7XOuPufaYX+j09mP0YCJhbbg00twSl2Q8zArWvLPcMEpJyrvTq+VR9Oc8s22u7nnvXCVJeU+O6woxmyF5ojngYUe78Jn7/7Zul9rVeRxmEvvRQF2qbYR2BPOoC1KWP9WmkdvG78VlGyh704Ox/2epnfRm5TeyHGcXI/eyptAnMZfZjhtD8iVDLdi4PmaMmeTPvyF383yAxpfuh2naP0etnaFzB3niV1Hl95a2+0ceDnPn+qfP60q+9+Rrvqp2j9xvOOWr3ozGaJf6rQe76sFeDatSkUu2+zWfu/Lhy115uW1y5/lC73Y/yKHd9qXX9OmX+7Tts8yh3bZVqj6PjMu0MAAAAAAAAAP36D9kZez8A+gAA
   </data>
  </layer>
- <layer name="Collision" width="160" height="100" visible="0">
+ <layer name="Collision" width="160" height="100">
   <data encoding="base64" compression="gzip">
    H4sIAAAAAAAAA+2TUY4bMQxDg9z/0P0oChSzO4ntkfQomwQeWrSJRVHM+/V6vY0xxhhjjDHGGGOMMcYYY4wxxhhjNucq2o/Zk1XRvk1vohXthc7H5HLVXQ9WNdqziHejMsiYYfK6oKKKHel77UYXqXql79cdK0f0Xbtg1Yq+txoZGnlX+fdQ4ePT7nQnOndvRJ29V4nuhlL/Iu9N79Wpx3Q/VPoXJXKvqByq86U7skv/6L0isiDypTvi/uV3bzSPinyv36M7skP/yJ0iM6HypXvSuX/0TtG5rH7/Sd50T7p2UGGf7Fwq8qQ70rGHKjuo5PFEdDfIG67eRMH7Ux8qojuhhHJm0T6qRd+2A8qZZsyP1vVt+p4dmRXpiezfyNv0LTsyqxP7R99oZ1bk/pkT+/d09qroG+3IU1G+3L++3GU7qutnif6tzn0q+nadydLs/EivkRlk9v50srUyO8prhwxOpVKr86O8qmRB31yFCM28R3ZfUfT9u3Xv/d+fq2+7ez9Fd0G9dyt5Rbx/ouh+VPdv9s4VXV95M+N3RonuSGX/MrOpmJG9Lym6K1T/Pn0uYlbU+6d0ke6M0h1m58zOU937zl/Um7NzO/NE0XOun1PZn+55tCc1KjKomKHK3S5PRO+k0MMn747OozNRynv3XEb3nskhQnQuCrmfkEl0DlGic1HMnvZL9+5bHtGiM6JucPd/tF+V3mVo58wj7kH73LFzI6KzU7kP7fHE7v0TnSF9I9rfbt2b9UjnSN+J9lfVv5HvV8z49p3d2HH3WUXOzfBJ50ncifaWtZfSjl18ErvT/rJvqrJjF5+VO9P+su+ptmMnrxX3oT1m7qa4Yze/mbehfWbvp7hjR8+R9zhhz/fl7yrM+FcmQvQOVfvS3nfqX6ToXSr2pn0/2YP2mtU7td0yM6A9f/P/aS/ar7u3f/86+P/mr+NOFTekvT7tnsIu0aLvUJkJ7TP6hndv/vbvM14qevfNVye67XmyRn4T3RjdWwXrr+g7VN6S8OQO/hTdF6J7FRnMzjxFdEfUuneXyd1nRt+YndlFs17pXij0r+utZ0XvRndAsXu/5XKqonOg767ASk6zGv1+RreJnkS9cwIj+vadu3eezFQQfZsTyNTqTMrvyHzTt3+zn6/eh77FiUTc4qmI/armm7n7ZN45albUvnT2Ju4en0TvaIwxxhhjjDHGGGOMMcYYY4wxxph7/gBezHMOAPoAAA==
   </data>