OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-01-07 20:17:20 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Player respawns on last place of rest. Resting resets respawn place.

Browse Source 
git-svn-id: https://andors-trail.googlecode.com/svn/trunk@58 08aca716-68be-ccc6-4d58-36f5abd142ac
This commit is contained in:
oskar.wiksten@gmail.com
2011-03-15 20:07:47 +00:00
parent b70c925fec
commit 3c7e67b59b
12 changed files with 116 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
AndorsTrail/res/xml/crossglen_hall.tmx
View File

@@ -1,71 +1,71 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.0" orientation="orthogonal" width="20" height="15" tilewidth="32" tileheight="32">
<tileset firstgid="1" name="tiles_1_1" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_1_1.png"/>
<image source="../drawable/map_tiles_1_1.png" width="512" height="256"/>
</tileset>
<tileset firstgid="129" name="tiles_1_2" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_1_2.png"/>
<image source="../drawable/map_tiles_1_2.png" width="512" height="256"/>
</tileset>
<tileset firstgid="257" name="tiles_2_1" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_2_1.png"/>
<image source="../drawable/map_tiles_2_1.png" width="512" height="256"/>
</tileset>
<tileset firstgid="385" name="tiles_2_2" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_2_2.png"/>
<image source="../drawable/map_tiles_2_2.png" width="512" height="256"/>
</tileset>
<tileset firstgid="513" name="tiles_2_3" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_2_3.png"/>
<image source="../drawable/map_tiles_2_3.png" width="512" height="256"/>
</tileset>
<tileset firstgid="641" name="tiles_2_4" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_2_4.png"/>
<image source="../drawable/map_tiles_2_4.png" width="512" height="256"/>
</tileset>
<tileset firstgid="769" name="tiles_2_5" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_2_5.png"/>
<image source="../drawable/map_tiles_2_5.png" width="512" height="256"/>
</tileset>
<tileset firstgid="897" name="tiles_1_3" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_1_3.png"/>
<image source="../drawable/map_tiles_1_3.png" width="512" height="256"/>
</tileset>
<tileset firstgid="1025" name="tiles_1_4" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_1_4.png"/>
<image source="../drawable/map_tiles_1_4.png" width="512" height="256"/>
</tileset>
<tileset firstgid="1153" name="tiles_1_5" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_1_5.png"/>
<image source="../drawable/map_tiles_1_5.png" width="512" height="256"/>
</tileset>
<tileset firstgid="1281" name="tiles_1_6" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_1_6.png"/>
<image source="../drawable/map_tiles_1_6.png" width="512" height="256"/>
</tileset>
<tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_1_7.png"/>
<image source="../drawable/map_tiles_1_7.png" width="512" height="256"/>
</tileset>
<tileset firstgid="1537" name="tiles_2_1" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_1_8.png"/>
<image source="../drawable/map_tiles_1_8.png" width="512" height="224"/>
</tileset>
<tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_2_6.png"/>
<image source="../drawable/map_tiles_2_6.png" width="512" height="256"/>
</tileset>
<tileset firstgid="1777" name="tiles_2_7" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_2_7.png"/>
<image source="../drawable/map_tiles_2_7.png" width="512" height="256"/>
</tileset>
<tileset firstgid="1905" name="tiles_2_8" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_2_8.png"/>
<image source="../drawable/map_tiles_2_8.png" width="512" height="224"/>
</tileset>
<layer name="Ground" width="20" height="15">
<data encoding="base64" compression="gzip">
H4sIAAAAAAAAAwtiZGBoxIKDgJiTATsOwqMHhCdiwYTMw6UHhB0ZMHEQI36MTw82OWz+QcakmofNP8iYVPPIwcjmNUIxtcyjtvvIwRtxmIcuPhT8G0gA4zIPV9rElddgGKTmJQsDQz4Qv2KBphFG3GmTGPN+As0pAOJfUPNAZqH7AcYmZB6ucAAA3NS0n7AEAAA=
<data encoding="base64" compression="zlib">
eJwLYmRgaMSCg4CYkwE7DsKjB4QnYsGEzMOlB4QdGTBxECN+jE8PNjls/kHGpJqHzT/ImFTzyMHI5jVCMbXMo7b7yMEbcZiHLj4U/BtIAOMyD1faxJXXYBik5iULA0M+EL9igaYRRtxpkxjzfgLNKQDiX1DzQGah+wHGJmQernAAAASQWAQ=
</data>
</layer>
<layer name="Objects" width="20" height="15">
<data encoding="base64" compression="gzip">
H4sIAAAAAAAAA2NggABpdgYGThYITSzIgerJxKJHGygmyQKhSQEgPehAihVCi5Jg1l02BoYDbBD6ApQmBDZD/YPM3gy18y0bdhoEbjPjNhPZP9j8hg0kIpl3Csg+DcS/iXA/MzvEnyzsqP4tRDJvCloY6rFiZ8MANv/iAruB/tvDgjALxsdmLjL4hmT2EiT9p4HsM0hhhs6HgatAsRw8cQAD2NyBy201SG5yBprtgsX8q0TGJzoIBpoVQoR7SQHIbukhEN4g4MCOn08OkAHaKwvEckTYTy4AAAqCKQuwBAAA
<data encoding="base64" compression="zlib">
eJxjYIAAaXYGBk4WCE0syIHqycSiRxsoJskCoUkBID3oQIoVQouSYNZdNgaGA2wQ+gKUJgQ2Q/2DzN4MtfMtG3YaBG4z4zYT2T/Y/IYNJCKZdwrIPg3Ev4lwPzM7xJ8s7Kj+LUQybwpaGOqxYmfDADb/4gK7gf7bw4IwC8bHZi4y+IZk9hIk/aeB7DNIYYbOh4GrQLEcPHEAA9jcgcttNUhucgaa7YLF/KtExic6CAaaFUKEe0kByG7pIRDeIODAjp9PDpAB2isLxHJE2E8uAADffiPp
</data>
</layer>
<layer name="Above" width="20" height="15">
<data encoding="base64" compression="gzip">
H4sIAAAAAAAAA2NgYGD4z8xAMsCnB11uNRHmDxfztgHZu4kw7z2R5rWwE1ZPCCCbR4k52MxDBkJAt/5gQ/AFgXxOdvLNIxcMFfOSWYjXY8COm0+u+3hYGRh4gZiPFVUcPY0IExGH9AIA9VJKh7AEAAA=
<data encoding="base64" compression="zlib">
eJxjYGBg+M/MQDLApwddbjUR5g8X87YB2buJMO89kea1sBNWTwggm0eJOdjMQwZCQLf+YEPwBYF8TnbyzSMXDBXzklmI12PAjptPrvt4WBkYeIGYjxVVHD2NCBMRh/QCAKxIG1s=
</data>
</layer>
<layer name="Walkable" width="20" height="15" visible="0">
<data encoding="base64" compression="gzip">
H4sIAAAAAAAAAxNkYGAQHAKYAY2m1CxkQI4edH20Mo+QHmLtRVZDLiDkDlxuJ6SeUHgQYx4x4UsKIDbOKDGTkH2khg+xZhGynxzzsJlBSA05GAD9cUNrsAQAAA==
<data encoding="base64" compression="zlib">
eJwTZGBgEBwCmAGNptQsZECOHnR9tDKPkB5i7UVWQy4g5A5cbieknlB4EGMeMeFLCiA2zigxk5B9pIYPsWYRsp8c87CZQUgNORgAXCMLoA==
</data>
</layer>
<objectgroup name="Mapevents" width="20" height="15">
@@ -75,10 +75,10 @@
<property name="place" value="hall"/>
</properties>
</object>
<object name="rest1" type="rest" x="512" y="192" width="32" height="32"/>
<object name="rest1" type="rest" x="576" y="192" width="32" height="32"/>
<object name="rest1" type="rest" x="576" y="96" width="32" height="32"/>
<object name="rest1" type="rest" x="512" y="96" width="32" height="32"/>
<object name="rest4" type="rest" x="512" y="192" width="32" height="32"/>
<object name="rest5" type="rest" x="576" y="192" width="32" height="32"/>
<object name="rest3" type="rest" x="576" y="96" width="32" height="32"/>
<object name="rest2" type="rest" x="512" y="96" width="32" height="32"/>
<object name="rest1" type="rest" x="448" y="96" width="32" height="32"/>
</objectgroup>
<objectgroup name="Spawn" width="20" height="15" visible="0">

52
AndorsTrail/res/xml/fallhaven_tavern.tmx
View File

@@ -1,71 +1,71 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.0" orientation="orthogonal" width="20" height="19" tilewidth="32" tileheight="32">
<tileset firstgid="1" name="tiles_1_1" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_1_1.png"/>
<image source="../drawable/map_tiles_1_1.png" width="512" height="256"/>
</tileset>
<tileset firstgid="129" name="tiles_1_2" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_1_2.png"/>
<image source="../drawable/map_tiles_1_2.png" width="512" height="256"/>
</tileset>
<tileset firstgid="257" name="tiles_2_1" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_2_1.png"/>
<image source="../drawable/map_tiles_2_1.png" width="512" height="256"/>
</tileset>
<tileset firstgid="385" name="tiles_2_2" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_2_2.png"/>
<image source="../drawable/map_tiles_2_2.png" width="512" height="256"/>
</tileset>
<tileset firstgid="513" name="tiles_2_3" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_2_3.png"/>
<image source="../drawable/map_tiles_2_3.png" width="512" height="256"/>
</tileset>
<tileset firstgid="641" name="tiles_2_4" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_2_4.png"/>
<image source="../drawable/map_tiles_2_4.png" width="512" height="256"/>
</tileset>
<tileset firstgid="769" name="tiles_2_5" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_2_5.png"/>
<image source="../drawable/map_tiles_2_5.png" width="512" height="256"/>
</tileset>
<tileset firstgid="897" name="tiles_1_3" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_1_3.png"/>
<image source="../drawable/map_tiles_1_3.png" width="512" height="256"/>
</tileset>
<tileset firstgid="1025" name="tiles_1_4" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_1_4.png"/>
<image source="../drawable/map_tiles_1_4.png" width="512" height="256"/>
</tileset>
<tileset firstgid="1153" name="tiles_1_5" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_1_5.png"/>
<image source="../drawable/map_tiles_1_5.png" width="512" height="256"/>
</tileset>
<tileset firstgid="1281" name="tiles_1_6" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_1_6.png"/>
<image source="../drawable/map_tiles_1_6.png" width="512" height="256"/>
</tileset>
<tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_1_7.png"/>
<image source="../drawable/map_tiles_1_7.png" width="512" height="256"/>
</tileset>
<tileset firstgid="1537" name="tiles_2_1" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_1_8.png"/>
<image source="../drawable/map_tiles_1_8.png" width="512" height="224"/>
</tileset>
<tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_2_6.png"/>
<image source="../drawable/map_tiles_2_6.png" width="512" height="256"/>
</tileset>
<tileset firstgid="1777" name="tiles_2_7" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_2_7.png"/>
<image source="../drawable/map_tiles_2_7.png" width="512" height="256"/>
</tileset>
<tileset firstgid="1905" name="tiles_2_8" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_2_8.png"/>
<image source="../drawable/map_tiles_2_8.png" width="512" height="224"/>
</tileset>
<layer name="Ground" width="20" height="19">
<data encoding="base64" compression="gzip">
H4sIAAAAAAAAA62S3Q2DMAyEr/xJDMRDX1oxAozRl46QGZiHDledoghkHEgcHk5RbOeTdZf5Acw361vdo8BbOi9X2cX3gTciX0MNfLCJtRKeplRe8EPOvlrg3frTst9+9ixf9tcG+DXbvLxLXixfnpb9tIzZd4k85nnlDfsTjhqV2qT4p/F6pCslDysvloeVF8vDyovlUeJfKW//V+W/fda+lsOjR3wX/JP7uUye9iel/lQWwuXwBQAA
<data encoding="base64" compression="zlib">
eJytkt0NgzAMhK/8SQzEQ19aMQKM0ZeOkBmYhw5XnaIIZBxIHB5OUWznk3WX+QHMN+tb3aPAWzovV9nF94E3Il9DDXywibUSnqZUXvBDzr5a4N3607LffvYsX/bXBvg127y8S14sX56W/bSM2XeJPOZ55Q37E44aldqk+KfxeqQrJQ8rL5aHlRfLw8qL5VHiXylv/1flv33WvpbDo0d8F/yT+7lMnvYnpf4tlmRN
</data>
</layer>
<layer name="Objects" width="20" height="19">
<data encoding="base64" compression="gzip">
H4sIAAAAAAAAA2NgoAwoseOX52RhYNgMVBPAimDnsCPYyGpAwIiAeZJAtS3sCHYmMwNDFjOEjawGBpywmLeQDYJFoXJTgHQ1M4RdCaSroOxsZlR9yVBzO1gh+mHgGxvDoAO/0dwkyo6bDwsPUoAQVL8IlBYGxSmSmX9wmAeK+81obgGZcRoYtmdYMPkiBNIDNgByiyoWfTCxMGZMOWRwAej2u1SI0ylIbnhLgXkbWSl3CzI4iGQeKC5yyQhjZHCRyu5DB5TERwsOv5EbH8hx+pANgpNZcKsnBmDTP4XCOMEFAPWS7JjwBQAA
<data encoding="base64" compression="zlib">
eJxjYKAMKLHjl+dkYWDYDFQTwIpg57Aj2MhqQMCIgHmSQLUt7Ah2JjMDQxYzhI2sBgacsJi3kA2CRaFyU4B0NTOEXQmkq6DsbGZUfclQcztYIfph4Bsbw6ADv9HcJMqOmw8LD1KAEFS/CJQWBsUpkpl/cJgHivvNaG4BmXEaGLZnWDD5IgTSAzYAcosqFn0wsTBmTDlkcAHo9rtUiNMpSG54S4F5G1kpdwsyOIhkHigucskIY2RwkcruQweUxEcLDr+RGx/IcfqQDYKTWXCrJwZg0z+FwjjBBQBLRCQn
</data>
</layer>
<layer name="Above" width="20" height="19">
<data encoding="base64" compression="gzip">
H4sIAAAAAAAAA2NgoD74z4xd3IeVuuaRC2DmJbNQ1zxqAWqYh+w3UswjRu1gN+89mea1sBOvjxjzqAFA5rFRwV3I5lETDCXzLrJBMLXMo0baQU6rpKRbcgEA5Xi8NfAFAAA=
<data encoding="base64" compression="zlib">
eJxjYKA++M+MXdyHlbrmkQtg5iWzUNc8agFqmIfsN1LMI0btYDfvPZnmtbATr48Y86gBQOaxUcFdyOZREwwl8y6yQTC1zKNG2kFOq6SkW3IBAKIeGu8=
</data>
</layer>
<layer name="Walkable" width="20" height="19" visible="0">
<data encoding="base64" compression="gzip">
H4sIAAAAAAAAAxNkYGAQHMGYgQCbAQcbmzmUAmLNwmUvPj+Sah4pYUYKn1zzGHDIk+NnQupISTO47CUlfsi1a7iahw6o5UZqmYuul1I3YnMfNcMUGQMAKrZNJfAFAAA=
<data encoding="base64" compression="zlib">
eJwTZGBgEBzBmIEAmwEHG5s5lAJizcJlLz4/kmoeKWFGCp9c8xhwyJPjZ0LqSEkzuOwlJX7ItWu4mocOqOVGapmLrpdSN2JzHzXDFBkDAMrPEsw=
</data>
</layer>
<objectgroup name="Mapevents" width="20" height="19">
@@ -75,8 +75,8 @@
<property name="place" value="tavern"/>
</properties>
</object>
<object name="rest" type="rest" x="576" y="320" width="32" height="32"/>
<object name="rest" type="rest" x="576" y="480" width="32" height="32"/>
<object name="rest1" type="rest" x="576" y="320" width="32" height="32"/>
<object name="rest2" type="rest" x="576" y="480" width="32" height="32"/>
</objectgroup>
<objectgroup name="Spawn" width="20" height="19" visible="0">
<object name="drunk" type="spawn" x="64" y="128" width="224" height="128">

51
AndorsTrail/res/xml/home.tmx
View File

@@ -1,71 +1,71 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.0" orientation="orthogonal" width="10" height="10" tilewidth="32" tileheight="32">
<tileset firstgid="1" name="tiles_1_1" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_1_1.png"/>
<image source="../drawable/map_tiles_1_1.png" width="512" height="256"/>
</tileset>
<tileset firstgid="129" name="tiles_1_2" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_1_2.png"/>
<image source="../drawable/map_tiles_1_2.png" width="512" height="256"/>
</tileset>
<tileset firstgid="257" name="tiles_2_1" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_2_1.png"/>
<image source="../drawable/map_tiles_2_1.png" width="512" height="256"/>
</tileset>
<tileset firstgid="385" name="tiles_2_2" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_2_2.png"/>
<image source="../drawable/map_tiles_2_2.png" width="512" height="256"/>
</tileset>
<tileset firstgid="513" name="tiles_2_3" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_2_3.png"/>
<image source="../drawable/map_tiles_2_3.png" width="512" height="256"/>
</tileset>
<tileset firstgid="641" name="tiles_2_4" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_2_4.png"/>
<image source="../drawable/map_tiles_2_4.png" width="512" height="256"/>
</tileset>
<tileset firstgid="769" name="tiles_2_5" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_2_5.png"/>
<image source="../drawable/map_tiles_2_5.png" width="512" height="256"/>
</tileset>
<tileset firstgid="897" name="tiles_1_3" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_1_3.png"/>
<image source="../drawable/map_tiles_1_3.png" width="512" height="256"/>
</tileset>
<tileset firstgid="1025" name="tiles_1_4" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_1_4.png"/>
<image source="../drawable/map_tiles_1_4.png" width="512" height="256"/>
</tileset>
<tileset firstgid="1153" name="tiles_1_5" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_1_5.png"/>
<image source="../drawable/map_tiles_1_5.png" width="512" height="256"/>
</tileset>
<tileset firstgid="1281" name="tiles_1_6" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_1_6.png"/>
<image source="../drawable/map_tiles_1_6.png" width="512" height="256"/>
</tileset>
<tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_1_7.png"/>
<image source="../drawable/map_tiles_1_7.png" width="512" height="256"/>
</tileset>
<tileset firstgid="1537" name="tiles_2_1" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_1_8.png"/>
<image source="../drawable/map_tiles_1_8.png" width="512" height="224"/>
</tileset>
<tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_2_6.png"/>
<image source="../drawable/map_tiles_2_6.png" width="512" height="256"/>
</tileset>
<tileset firstgid="1777" name="tiles_2_7" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_2_7.png"/>
<image source="../drawable/map_tiles_2_7.png" width="512" height="256"/>
</tileset>
<tileset firstgid="1905" name="tiles_2_8" tilewidth="32" tileheight="32">
<image source="../drawable/map_tiles_2_8.png"/>
<image source="../drawable/map_tiles_2_8.png" width="512" height="224"/>
</tileset>
<layer name="Ground" width="10" height="10">
<data encoding="base64" compression="gzip">
H4sIAAAAAAAAAwtiZGAIIhI3EsAwdRMJYJg6Rwb8mBJ1L1kYGPKh+BULbnV5QDkYyEVS10iEukaof5DV/QTKFUDxL6g6kJpABgR2ZEDlI2MAxi8HupABAAA=
<data encoding="base64" compression="zlib">
eJwLYmRgCCISNxLAMHUTCWCYOkcG/JgSdS9ZGBjyofgVC251eUA5GMhFUtdIhLpGqH+Q1f0EyhVA8S+oOpCaQAYEdmRA5SNjAIJFJI8=
</data>
</layer>
<layer name="Objects" width="10" height="10">
<data encoding="base64" compression="gzip">
H4sIAAAAAAAAA2NgIB7ksjMweLEg+DD2TzZMtVFAuWKgeAs7hK3FysCgCcSerAg1d4HyzED5ZiA9BUj3AOWskDAMvMViPjZwkUh1D9kgGAR0gPbsBrpvDwuEjQw2ovFxqbuIxAfJnQaqOQMNm19EugkGAGc0HW+QAQAA
<data encoding="base64" compression="zlib">
eJxjYCAe5LIzMHixIPgw9k82TLVRQLlioHgLO4StxcrAoAnEnqwINXeB8sxA+WYgPQVI9wDlrJAwDLzFYj42cJFIdQ/ZIBgEdID27Aa6bw8LhI0MNqLxcam7iMQHyZ0GqjkDDZtfRLoJBgCErxNf
</data>
</layer>
<layer name="Walkable" width="10" height="10">
<data encoding="base64" compression="gzip">
H4sIAAAAAAAAAxNkYGAQHOSYECBWLS5zcfHRzaOGOkEcYjAMAKpaHhWQAQAA
<data encoding="base64" compression="zlib">
eJwTZGBgEBzkmBAgVi0uc3Hx0c2jhjpBHGIwDAAZbASn
</data>
</layer>
<layer name="Above" width="10" height="10">
<data encoding="base64" compression="gzip">
H4sIAAAAAAAAA2NgIB58YCZO3X8kdfj0IKt7T6Q6QvZeZCNOHQgks0Boblbi7eVkJ07dMhxmEgIAugjLAZABAAA=
<data encoding="base64" compression="zlib">
eJxjYCAefGAmTt1/JHX49CCre0+kOkL2XmQjTh0IJLNAaG5W4u3lZCdO3TIcZhICAOWWC/A=
</data>
</layer>
<objectgroup name="mapevents" width="10" height="10">
@@ -75,8 +75,7 @@
<property name="place" value="home"/>
</properties>
</object>
<object name="rest" type="mapchange" x="64" y="128" width="32" height="32"/>
<object name="bed" type="rest" x="32" y="128" width="32" height="32"/>
<object name="rest" type="rest" x="32" y="128" width="32" height="32"/>
<object name="startitems2" type="container" x="256" y="256" width="32" height="32"/>
</objectgroup>
<objectgroup name="keys" width="10" height="10">

4
AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
View File

@@ -14,9 +14,9 @@ import android.view.WindowManager;
public final class AndorsTrailApplication extends Application {
public static final boolean DEVELOPMENT_DEBUGRESOURCES = false;
public static final boolean DEVELOPMENT_FORCE_STARTNEWGAME = true;
public static final boolean DEVELOPMENT_FORCE_STARTNEWGAME = false;
public static final boolean DEVELOPMENT_FORCE_CONTINUEGAME = false;
public static final boolean DEVELOPMENT_DEBUGBUTTONS = false;
public static final boolean DEVELOPMENT_DEBUGBUTTONS = true;
public static final boolean DEVELOPMENT_VALIDATEDATA = true;
public static final boolean DEVELOPMENT_DEBUGMESSAGES = true;
public static final int CURRENT_VERSION = 17;

7
AndorsTrail/src/com/gpl/rpg/AndorsTrail/Dialogs.java
View File

@@ -36,6 +36,7 @@ import com.gpl.rpg.AndorsTrail.controller.ItemController;
import com.gpl.rpg.AndorsTrail.model.actor.Monster;
import com.gpl.rpg.AndorsTrail.model.item.ItemType;
import com.gpl.rpg.AndorsTrail.model.item.Loot;
import com.gpl.rpg.AndorsTrail.model.map.MapObject;
import com.gpl.rpg.AndorsTrail.resource.TileStore;
import com.gpl.rpg.AndorsTrail.view.ItemContainerAdapter;
@@ -203,9 +204,9 @@ public final class Dialogs {
currentActivity.startActivityForResult(intent, MainActivity.INTENTREQUEST_LEVELUP);
}
public static void showRest(final Activity currentActivity, final ViewContext viewContext) {
public static void showRest(final Activity currentActivity, final ViewContext viewContext, final MapObject area) {
if (!viewContext.preferences.confirmRest) {
Controller.ui_playerRested(currentActivity, viewContext);
Controller.ui_playerRested(currentActivity, viewContext, area);
return;
}
Dialog d = new AlertDialog.Builder(currentActivity)
@@ -214,7 +215,7 @@ public final class Dialogs {
.setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
Controller.ui_playerRested(currentActivity, viewContext);
Controller.ui_playerRested(currentActivity, viewContext, area);
}
})
.setNegativeButton(android.R.string.no, null)

2
AndorsTrail/src/com/gpl/rpg/AndorsTrail/WorldSetup.java
View File

@@ -110,7 +110,7 @@ public final class WorldSetup {
private void createNewWorld() {
world.model = new ModelContainer();
world.model.player.initializeNewPlayer_(world.itemTypes, world.dropLists, newHeroName);
Controller.playerRested(world);
Controller.playerRested(world, null);
MovementController.respawnPlayer(world);
}

16
AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Controller.java
View File

@@ -37,10 +37,10 @@ public final class Controller {
if (o.map == null || o.place == null) return;
int offset_x = position.x - o.position.topLeft.x;
int offset_y = position.y - o.position.topLeft.y;
view.movementController.placePlayerAt(o.map, o.place, offset_x, offset_y);
view.movementController.placePlayerAt(MapObject.MAPEVENT_NEWMAP, o.map, o.place, offset_x, offset_y);
break;
case MapObject.MAPEVENT_REST:
Dialogs.showRest(view.mainActivity, view);
Dialogs.showRest(view.mainActivity, view, o);
break;
}
}
@@ -66,7 +66,7 @@ public final class Controller {
if (lostExp < 0) lostExp = 0; // Shouldn't happen, but just to be sure.
player.addExperience(-lostExp);
model.statistics.addPlayerDeath(lostExp);
playerRested(world);
playerRested(world, null);
MovementController.respawnPlayer(world);
final MainActivity act = view.mainActivity;
act.updateStatus();
@@ -74,19 +74,23 @@ public final class Controller {
act.message(act.getResources().getString(R.string.combat_hero_dies, lostExp));
}
public static void playerRested(final WorldContext world) {
public static void playerRested(final WorldContext world, MapObject area) {
final Player player = world.model.player;
ActorStatsController.removeAllTemporaryConditions(player);
ActorStatsController.recalculatePlayerCombatTraits(player);
player.setMaxAP();
player.setMaxHP();
if (area != null) {
player.spawnPlace = area.id;
player.spawnMap = world.model.currentMap.name;
}
for (LayeredWorldMap m : world.maps.predefinedMaps) {
if (m.visited) m.spawnAll(world);
}
}
public static void ui_playerRested(final Activity currentActivity, final ViewContext viewContext) {
playerRested(viewContext);
public static void ui_playerRested(final Activity currentActivity, final ViewContext viewContext, MapObject area) {
playerRested(viewContext, area);
viewContext.mainActivity.updateStatus();
Dialogs.showRested(currentActivity, viewContext);
}

13
AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MovementController.java
View File

@@ -24,21 +24,22 @@ public final class MovementController {
this.model = world.model;
}
public void placePlayerAt(String mapName, String placeName, int offset_x, int offset_y) {
placePlayerAt(world, mapName, placeName, offset_x, offset_y);
public void placePlayerAt(int objectType, String mapName, String placeName, int offset_x, int offset_y) {
placePlayerAt(world, objectType, mapName, placeName, offset_x, offset_y);
view.mainActivity.clearMessages();
view.mainActivity.mainview.notifyMapChanged();
}
public static void placePlayerAt(final WorldContext world, String mapName, String placeName, int offset_x, int offset_y) {
public static void placePlayerAt(final WorldContext world, int objectType, String mapName, String placeName, int offset_x, int offset_y) {
if (mapName == null || placeName == null) return;
LayeredWorldMap newMap = world.maps.findPredefinedMap(mapName);
if (newMap == null) {
L.log("Cannot find map " + mapName);
return;
}
MapObject place = newMap.findEventObject(MapObject.MAPEVENT_NEWMAP, placeName);
MapObject place = newMap.findEventObject(objectType, placeName);
if (place == null) {
L.log("Cannot find place " + placeName + " in map " + mapName);
L.log("Cannot find place " + placeName + " of type " + objectType + " in map " + mapName);
return;
}
final ModelContainer model = world.model;
@@ -173,7 +174,7 @@ public final class MovementController {
}
public static void respawnPlayer(final WorldContext world) {
placePlayerAt(world, world.model.player.spawnMap, world.model.player.spawnPlace, 0, 0);
placePlayerAt(world, MapObject.MAPEVENT_REST, world.model.player.spawnMap, world.model.player.spawnPlace, 0, 0);
}
public static void moveBlockedActors(final WorldContext world) {

2
AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/LayeredWorldMap.java
View File

@@ -82,7 +82,7 @@ public final class LayeredWorldMap {
public MapObject findEventObject(int objectType, String name) {
for (MapObject o : eventObjects) {
if (o.type == objectType && o.id.equals(name)) return o;
if (o.type == objectType && name.equals(o.id)) return o;
}
return null;
}

9
AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapCollection.java
View File

@@ -79,6 +79,15 @@ public final class MapCollection {
continue;
}
world.conversations.getPhrase(o.id); // Will warn inside if not available.
} else if (o.type == MapObject.MAPEVENT_REST) {
if (o.id == null || o.id.length() <= 0) {
L.log("WARNING: Map \"" + m.name + "\" contains rest area without id.");
continue;
}
if (m.findEventObject(MapObject.MAPEVENT_REST, o.id) != o) {
L.log("WARNING: Map \"" + m.name + "\" contains duplicate rest area with id \"" + o.id + "\".");
continue;
}
}
}

4
AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapObject.java
View File

@@ -35,8 +35,8 @@ public final class MapObject {
public static MapObject createNewMapEvent(final CoordRect position, final String thisMapTitle, final String destinationMap, final String destinationPlace) {
return new MapObject(position, MAPEVENT_NEWMAP, thisMapTitle, destinationMap, destinationPlace, null, null);
}
public static MapObject createNewRest(final CoordRect position) {
return new MapObject(position, MAPEVENT_REST, null, null, null, null, null);
public static MapObject createNewRest(final CoordRect position, final String placeId) {
return new MapObject(position, MAPEVENT_REST, placeId, null, null, null, null);
}
public static MapObject createNewKeyArea(final CoordRect position, final String phraseID, final QuestProgress requireQuestStage) {
return new MapObject(position, MAPEVENT_KEYAREA, phraseID, null, null, requireQuestStage, null);

2
AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/TMXMapReader.java
View File

@@ -355,7 +355,7 @@ public final class TMXMapReader {
mapObjects.add(MapObject.createNewKeyArea(position, phraseID, requireQuestStage));
} else if (object.type.equals("rest")) {
mapObjects.add(MapObject.createNewRest(position));
mapObjects.add(MapObject.createNewRest(position, object.name));
} else if (object.type.equals("container")) {
DropList dropList = dropLists.getDropList(object.name);
if (dropList == null) continue;