Add Ship-indoor_x3 (Ok I lie),

Add new tiles on 000-2-1 and remove test changes.

1 files changed, 44 insertions, 8 deletions

diff --git a/maps/000-2-1.tmx b/maps/000-2-1.tmx
index 87dee8e1..5333a2c4 100644
--- a/maps/000-2-1.tmx
+++ b/maps/000-2-1.tmx
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.0" orientation="orthogonal" width="83" height="59" tilewidth="32" tileheight="32">
  <properties>
+  <property name="actorsfix" value="1"/>
   <property name="minimap" value="graphics/minimaps/000-2-1.png"/>
   <property name="music" value="Artis indoor - In the Forest of the Birches.ogg"/>
  </properties>
@@ -10,7 +11,7 @@
  <tileset firstgid="129" name="Village-indoor2" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Indoor/Village-indoor2.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="385" name="Ship-indoor_x2" tilewidth="96" tileheight="64">
+ <tileset firstgid="385" name="Ship-indoor_x2" tilewidth="96" tileheight="32">
   <image source="../graphics/tiles/Indoor/Ship-indoor_x2.png" width="384" height="128"/>
   <tile id="0">
    <properties>
@@ -44,8 +45,40 @@
     <property name="animation-frame5" value="5"/>
    </properties>
   </tile>
+  <tile id="8">
+   <properties>
+    <property name="animation-delay0" value="30"/>
+    <property name="animation-delay1" value="18"/>
+    <property name="animation-delay2" value="15"/>
+    <property name="animation-delay3" value="40"/>
+    <property name="animation-delay4" value="18"/>
+    <property name="animation-delay5" value="15"/>
+    <property name="animation-frame0" value="8"/>
+    <property name="animation-frame1" value="9"/>
+    <property name="animation-frame2" value="10"/>
+    <property name="animation-frame3" value="11"/>
+    <property name="animation-frame4" value="10"/>
+    <property name="animation-frame5" value="9"/>
+   </properties>
+  </tile>
+  <tile id="12">
+   <properties>
+    <property name="animation-delay0" value="30"/>
+    <property name="animation-delay1" value="18"/>
+    <property name="animation-delay2" value="15"/>
+    <property name="animation-delay3" value="40"/>
+    <property name="animation-delay4" value="18"/>
+    <property name="animation-delay5" value="15"/>
+    <property name="animation-frame0" value="12"/>
+    <property name="animation-frame1" value="13"/>
+    <property name="animation-frame2" value="14"/>
+    <property name="animation-frame3" value="15"/>
+    <property name="animation-frame4" value="14"/>
+    <property name="animation-frame5" value="13"/>
+   </properties>
+  </tile>
  </tileset>
- <tileset firstgid="393" name="Candle" tilewidth="32" tileheight="64">
+ <tileset firstgid="401" name="Candle" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/Indoor/Candle.png" width="96" height="128"/>
   <tile id="0">
    <properties>
@@ -76,12 +109,15 @@
    </properties>
   </tile>
  </tileset>
- <tileset firstgid="399" name="Box" tilewidth="32" tileheight="32">
+ <tileset firstgid="407" name="Box" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Box.png" width="128" height="128"/>
  </tileset>
- <tileset firstgid="415" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="423" name="Collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Collision.png" width="64" height="64"/>
  </tileset>
+ <tileset firstgid="427" name="Ship-indoor_x3" tilewidth="64" tileheight="128">
+  <image source="../graphics/tiles/Indoor/Ship-indoor_x3.png" width="64" height="128"/>
+ </tileset>
  <layer name="Ground" width="83" height="59">
   <data encoding="base64" compression="gzip">
    H4sIAAAAAAAAC+2YTU/DMAyGWyFAqOIwJg5l4of1OJXTutP+/4FGalVj2a5Ttpmg9/Bobb6WPEviZF1VVR0AAAAAAAAAAAAAAAAAAAAAIISjg9pZziJ6nPdyJfHM3h9HHkbeJ+opbc7fTXVqVnb/j1ynfj4JfZfSNF5GXkfe6p+ktIa4pI4ll1Y/oj1tnZd0vOm9Hfkkzprp/cDqcZcp7ZzRRm/8XtGePPCx8fHOPhIDef4SxjvnUYeUC8u7kOe1fkR78s7LXhg7f+dlpPJn9iz51DxT11JatKecNc7nk+WWP2tuLIfeOiWtcW280hq+NUPhLmmMyJljt0LrQ7SnXJfWWKwYq63jXIeSv1I8Wi7nWNOOfFRLXD1VS6xN6fxc5PldLJ90b4l2s9WltsYkL5Kj3Ji99n2lu7TGZZ0bveW27ANdQV41H9eOQb9tL9pTjkvqkLuk98mZWkiz8LSh3Zv6P+DJ65KfJblPerc7Vkscali9/eQssWN5a22s7bfRnnLnpbYetZjDyx0mZ4lWaXsg9fi99GT0J9rTVpfzPLXiDL+jWP6lz9w9NNrTteal5sBzDrLuomv31NLOR955EU20p3v4TvnSf200zdMG8M3t6P4BAAAAAAAAAAAAAABASXwDYfgknYRMAAA=
@@ -89,22 +125,22 @@
  </layer>
  <layer name="Ground2" width="83" height="59">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAC+2Yu24UQRBFa2wcWER48UqAQLIRAcaJjQMkEB/gzDIRGfgXyHiEfoAjS35BDgvkPEzMH0AA/AYfwC1tNdMqZple71qemb1Huq7emt5S79VM17RFCCGEEEIIIYQQQgghhBBCCBkut6G7JbpzaqurFmVePYbamcgE4jg0bULqb+5JSY2meF12Tynn5F9/lJZFzWf4M+b0LZobc+WY66g6mUV/T4WcUuSlfm7lZWQFF89D29BvfF5CXM3y6+MYbyE+N72Avva5jqrj/Zk+Zp0V++H3EM9A15yXOj5EfGl6BX0vWYd/DprAG6hTMmcGP3zW6WrkZQvjt4jvTO9PbLXVZh86GLCG+voB8aPp08Crqicp9yVJY/k/GrRGETtZjwsVZ8v1CI/28CnJe8GsdHtB2/Ji+evSu3+FGm2bOxPNVVrSDB65HuHxXs5J7oPm1YdJaAE6C102aW7Rcr6G970pXt6ymPpcLVrcxfy9xO9cgC5K7rH3/VLqYivOduTHgyHsU0+hZwnz+tkT63LuUfTdbxg+xgyzf9TlXd2/U1cJXdZ9qY+Xawk+bkCb0u0T8xbXLd8v+t0bknZW1b31oXT31qYQn3uWLO5ZXtE+vW7jTcl91nFRj755MsusBUXnnteWV7RPq8fB8+Cz5nyPjn0eRYrOz+FsHQjedtw47AOhRvD5oKDGKPEZOoK+uPxq9H8L9Sse77u5sc+jzA/oJ/TL5Xu9B8T7QCD2maQzys8wIYQQQgghhBBCCCGEkNPnD+h2b0uETAAA
+   H4sIAAAAAAAAC+2YzU4UURCFqwUXhhWOTIIEEjAsRDYiCxKJD+COwMqd+grudAuCxgUJEcTgUv72grj2DXSBvoYP4KlMXfumaOienzjdM+dLDnWnprtyOdy+1RcRQgghhBBCCCGEEEIIIYQQQjrLQ+hRjha7NrtykefVS6ieiFxHHIBGTEj9y73KqdErXuetKWVYLvqj1CxqPsGPa04/omtjJlqcR9lJLPo1FXJKlpf6uZaWkSV8eQvagv7g8zzicpJ+P4DxBuIb01voe5PzKDven5EW6yzZL76COAhNOy91/AFx1/QR+pkzD/8clJ3V5GLuncvtQwc5dSZxz5TTnahODeNDxCPTcVuzri7b0E6bNdTXL4gnptO2Z1U+OrUuSTEeX6F2a2Sxm/H3rQKbrkco8brUHn5T0l4wJY1eULe8WP6uXN6/Qo26XTsZXavUpDd44XqEx3s5I6kPmlcfbkD3oSFo3KS5Ocv5Gt73XvFywWLR52rO4h6u/1TwnlHotqQee9/Hik625GxFfjz9j/tUM3tiVc49ir77ddrHTvaPqryr+3dqxb8TdQudxhOpjpfPC/j2GlqXRp+Ytbhm+WbRe+9JsbOq7q3PpLG3VoEi7+rxuWfe4nvLK9qn12y8LqnPOs7q0Q9an27lyTr3fLa8on1aPQ6eB58153t07HM/4Ndl1vk5nK0DwdsDNw77QKgRfN7JqNFPfIXOoG8uvxz930L9isfb7trY537mHPoF/Xb5y85N8T4QiH0mxennZ5gQQgghhBBCCCGEEEJI9/kLUNyDxYRMAAA=
   </data>
  </layer>
  <layer name="Fringe" width="83" height="59">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAC+3XzU3DMBTA8UaI0lPFgXMHQFw6BJt0g7IAB0qvFVKDgPYITAATMAIjMALlynvqsxQsk9pS1Xz9f9JTkhcncV4sOe71AAAAAAAAAAAAANTZRmJg+6cSQ9vX3HclPao3V6tR4Nxx9v91ZbUclJxrq1uJuZebWd65DNRTc0+WPyupd5fkEvcSX3as26XlHVfLSbbdn2bh+rbZdcT7hsbls8RLwnOudjznMXA+l9xKYt3gb3IT0fc3iXcvN87+xr7cNaSWMeMScfJALWPGJQ5HP8e5xFHVHalY6rhclMwRD4xxAEAEf+7Z2PbDa9dPmFf0HsW1k95L1/Q/EdcuGjJ/pfyrf9rWfzety0WgvdbuxNr6a3q9l7+mb6PUfyJXF1X8NyrWTtfur951qWv6LptV3YEa2Ncacrm7CQAAAAAAAAAAQKf8AlMapI2ETAAA
+   H4sIAAAAAAAAC+3XQU7CQBSAYRojsjIsWHMAw8ZDeBNvgBdgg3IBhLggUQQT93oCj+ARPIKw9b3wJimTsbSG2Hb6f8lLh9fppH2d0k6rBQAAAAAAAAAAAKDKNhIda3clzq2tue9SzqjaXK36gX2nye/HZdWyk7EvVrcSd15ubHnnKlBPzS0t38uodyxGgWuceLl7iZnEl/3W7dTyjqvldbJrD5NwfZsuNC9XEusCY9wcqOtTYP9Ccs8Sq5rckzzzMuRN4t3LXSb7cSwPNakljmfxx3mJ/6O340LipOwTqZl5xjvikTmOCnhlHu7h3YOy5flW39j2w+vXLjB/dYz02knH0jX9Nsex8wifk0/b+temdRkE+mvtzqyvv6bXsfw1fYyK/l+6uqj0t1G6drp2f/GOK7qmb7Jx2ScQkenhLgAAAAAAAAAAAI3yA/+KubiETAAA
   </data>
  </layer>
  <layer name="Over" width="83" height="59">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAC+2YzUoDMRSF71jcKiJdi3/gooILXfmz0QptFRdWxb1VNwqidaPv4Ev5CL5Lt97LTGAImSRDU53JnA8ObXKTm8whnSQlAgAAAAAAAAAAAAAAAAAAALcl1WRC+hOz1yHXUjep1nz+GpnXvke7D0e8x7pyeNlz5Pj0mMcBVdvLQ492Lh8kPirw8iXxz+HilJrh5XjKdQkv/eIhcnwl8DJkjiZ4ec3qO3Ru6X/nMYZQBy/n+PfzbWl36cgzZMnrcpXVYrUzSd1aVmfL0c9ymLhgbbK6rBOqvpfTsqyVR6z7Ev3blpisxW2qx/kyhJc6T6znQLnEyz2qto/CrLwcs94D5VLvyDp5+fOfE7FwwzrKvsdw7xmQfY8+m2EOtX8JddjHXch5ZZ7S/XiBtcFapPQ5pc73TKRySN911kouRyxnIhf6c3YM8SVKPZY9/YH1qNVJm2HBPXNiGMNEjF7uGuKTgr6dXJsyY5iI0cuy8VA5muJlC/8T0TGl97Ot7DMvVffqyBNiXb4ZxtXLVb9DKu1o5Xxdkd++XgvKK5dPprno5bpieyaX1yavYvUpBL5rG14BAAAAAAAAAAAAAACAP7/2ESPhhEwAAA==
+   H4sIAAAAAAAAC+2YzUoDMRSF71jcKiJdi3/gooILXfmz0QptFRdWxb2iW1FX+h6+kI/gu3TrvcwMDEMmN8OkmsmcDw5tcpObzCHTJCUCAAAAAAAAAAAAAAAAAAAA9zXVZXz6E7PXPtfSMAlrPn+NzOvQod2HEh+xbhQvR0qOT4d5HFHYXh47tNN8kPhjhZcviXsOjXPqhpfvDdclvHSL+8jxlcBLnzm64OUta6zo0tL/wWEMoQ1eLvD7821pd63kmbLk53Kd1WP1M0ndRlZnyzHOcpi4Ym2zhqwzCt/Lpqw27N+3xGQt7lI7zpc+vJwn4uUBhe2j0BYvQ1+TQtHLn/+ciIU71kn2PYZ7z4Tse/TFHHPk+5fQhn1cQ84ri5Tux0usLdYypc8pda5nojyH9N1krRVyxHIm0ig/58AQX6HUY9nTn1jPpTppM624Z84MY5iI0ct9Q3xW0XdQaFNnDBMxelk37itHV7zs4X8iOqX0fraTfRaV170qeXysyzfDuOVy6HfIXHulcrGuym9Xr4XcK80n01zK5bZieybNa5NXsfrkA9e1Da8AAAAAAAAAAAAAAADAnV+4fJJ1hEwAAA==
   </data>
  </layer>
  <layer name="Collision" width="83" height="59">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAC+3TWw7CIBBA0br/TXSpxg8TYgoyQp0+ziQn8dnKBdfHsqwAAAAAAAAAEPCa7N9wFa2Wd+r8nvJxOf9s+cu9j6TWL9qyNaPXyG4Ubdnqmt3yjD23umo53nPGGiLfv2rL8vnonoy0jO7HUfTO5/r2nOwme3aMrH/mtc5mxrpnT3aTI5zNWZPdZEbD8vWtz0f3YXQvsxtFW/Z2rbXu7f7r/yK706xz2bPGrTVHW7buld1p9rmMvF/r61x+X+Noh6u2rHXVct/ed+qQ3VpLAAAAAICYJxlW7Y+ETAAA
+   H4sIAAAAAAAAC+3SSw6DMAxAQXr/i3DMqotuEEkxODWfiTQSQm3Aj8yvaZoBAAAAAAAAIOCzqt/hLnotn9T5u3rX/2q5XNVt9rZsrTPsUd0o2rJ3Xd3yij0rO9yl5XKW6Lns7ZnxPa/c8sgMe//fevbVOm45F635Rq7qJiM7RubP3OtqMubOXtVNMlqO6LJnVTfJPo9rvz+6R/Q9qhtFW0aul/d6jUd90zPaMsOWGddmjrbsPau6U/a5jLRu9XUuf894tIOWWmb2flKH6tZaAgAAAADEvAFF1R+jhEwAAA==
   </data>
  </layer>
  <objectgroup name="Object" width="83" height="59" visible="0">