Mercurial > vanillian

changeset 26:52488e54b266

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Radomir Dopieralski <sheep-devel@sheep.art.pl>
date Sun, 16 Dec 2012 11:10:38 +0100
parents 8891a036fb23 (current diff) 5e21e27942c7 (diff)
children cafccce2b005
files main.lua
diffstat 5 files changed, 249 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cellar.tmx	Sun Dec 16 11:10:38 2012 +0100
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" width="21" height="16" tilewidth="48" tileheight="48">
+ <properties>
+  <property name="music" value="walktune.xm"/>
+ </properties>
+ <tileset firstgid="1" name="tiles" tilewidth="48" tileheight="48">
+  <image source="tiles.png" width="288" height="288"/>
+  <tile id="1">
+   <properties>
+    <property name="block" value="1"/>
+   </properties>
+  </tile>
+  <tile id="4">
+   <properties>
+    <property name="block" value="1"/>
+   </properties>
+  </tile>
+  <tile id="20">
+   <properties>
+    <property name="block" value="1"/>
+   </properties>
+  </tile>
+  <tile id="21">
+   <properties>
+    <property name="block" value="1"/>
+   </properties>
+  </tile>
+  <tile id="22">
+   <properties>
+    <property name="block" value="1"/>
+   </properties>
+  </tile>
+  <tile id="23">
+   <properties>
+    <property name="block" value="1"/>
+   </properties>
+  </tile>
+ </tileset>
+ <tileset firstgid="37" name="furniture" tilewidth="48" tileheight="48">
+  <image source="furniture.png" width="288" height="288"/>
+ </tileset>
+ <layer name="floor" width="21" height="16">
+  <data encoding="base64" compression="zlib">
+   eJy9k0EKgDAMBNPUT6gF/f8r1UNhWcJSS/Qwl7RM0iQtZlYABxYA4+UlI85TwL426NwEUZ143n0Y8yCGudmx31RgHYyxk6kTKGebdPJbM+p007uW7TwS+sk9ne2ncmbMnZ3+w4w8yKPuRc4W5Og8/0ft4Ndcs1UHUw==
+  </data>
+ </layer>
+ <layer name="furniture" width="21" height="16">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgF6EATB5tWdtHajuEOVIFYDYjVqWimNhDrALEuFc2kFOgNtANoAEBxR814ozcAAEF/AhU=
+  </data>
+ </layer>
+ <layer name="furniture2" width="21" height="16">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFo2AUjIJRQA4AAAVAAAE=
+  </data>
+ </layer>
+ <objectgroup name="mobs" width="21" height="16">
+  <object name="villain" x="335" y="288"/>
+  <object x="689" y="341">
+   <properties>
+    <property name="cells" value="1-2,4"/>
+   </properties>
+  </object>
+  <object x="674" y="504">
+   <properties>
+    <property name="cells" value="1-2,3"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <layer name="overlay" width="21" height="16">
+  <properties>
+   <property name="overlay" value="1"/>
+  </properties>
+  <data encoding="base64" compression="zlib">
+   eJzjZWBg4KUh5gFiWSQsR4IYsjnIcvxArADFmkDMBxXTRBLnQ1MHwtxoZiLLKTIggD4Qy0PF9JHENaEYGaCbSSrQR7ODGmZiA+hmiiNhTiqZiYwFR80cNRMIOBgw0xc2MXxmCjGgplcJEsRoWbaBMACK7A2A
+  </data>
+ </layer>
+ <layer name="control" width="21" height="16">
+  <data encoding="base64" compression="zlib">
+   eJxjZWBgYB3FNMNsSJhUMWxy5GJ6mEkNO8gxkxT5gTSTUr+TY+5giSNK/ExqPqJn/gYAeBIHFQ==
+  </data>
+ </layer>
+</map>
Binary file furniture.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lab.tmx	Sun Dec 16 11:10:38 2012 +0100
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" width="21" height="16" tilewidth="48" tileheight="48">
+ <properties>
+  <property name="music" value="walktune.xm"/>
+ </properties>
+ <tileset firstgid="1" name="tiles" tilewidth="48" tileheight="48">
+  <image source="tiles.png" width="288" height="288"/>
+  <tile id="1">
+   <properties>
+    <property name="block" value="1"/>
+   </properties>
+  </tile>
+  <tile id="4">
+   <properties>
+    <property name="block" value="1"/>
+   </properties>
+  </tile>
+  <tile id="20">
+   <properties>
+    <property name="block" value="1"/>
+   </properties>
+  </tile>
+  <tile id="21">
+   <properties>
+    <property name="block" value="1"/>
+   </properties>
+  </tile>
+  <tile id="22">
+   <properties>
+    <property name="block" value="1"/>
+   </properties>
+  </tile>
+  <tile id="23">
+   <properties>
+    <property name="block" value="1"/>
+   </properties>
+  </tile>
+ </tileset>
+ <tileset firstgid="37" name="furniture" tilewidth="48" tileheight="48">
+  <image source="furniture.png" width="288" height="288"/>
+ </tileset>
+ <layer name="floor" width="21" height="16">
+  <data encoding="base64" compression="zlib">
+   eJzVkkEKgDAMBFPxE9VC1f8/UoQGQmiSzUk9zKGsTpcmhYjKyxwBmf842wIsp/ftGjDrdRr39JGhTtlnN5x1ZKhzUXgz+oIT2aWss6s5XaB/lrGzijk95xb0R5wW3F8id07niJP7Wzunc++9MrP7IzfTQQlL
+  </data>
+ </layer>
+ <layer name="furniture" width="21" height="16">
+  <data encoding="base64" compression="zlib">
+   eJxjYBjeQBWI1aBYnUpmagOxDhTrArEemrwmGk0NoI9GUwugu30UjIJRQDwAADyvAlU=
+  </data>
+ </layer>
+ <layer name="furniture2" width="21" height="16">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgcQJlIMVKBOZS2BGILKpg3CkbBKBgFMAAAJ6gA7w==
+  </data>
+ </layer>
+ <objectgroup name="mobs" width="21" height="16">
+  <object name="villain" x="335" y="288"/>
+  <object x="816" y="322">
+   <properties>
+    <property name="cells" value="1-2,4"/>
+   </properties>
+  </object>
+  <object x="686" y="314">
+   <properties>
+    <property name="cells" value="1-2,3"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <layer name="overlay" width="21" height="16">
+  <properties>
+   <property name="overlay" value="1"/>
+  </properties>
+  <data encoding="base64" compression="zlib">
+   eJzjZWBg4CUS8wCxLAEsR4I+kFpBBsKAG4uZuPRxk2Amurv4cajlwyNHjt2kgOFoJgcQc5JhpjAQiwCxKJTPjmSeBJH2o5spD8QKQKwI5SshqQOlMyEgFodiZDdzIIkTazcoHaHnAX488tSOIwYamYkcRsiYmDjGBXCVQbjsIgYTW86RggHy0gpw
+  </data>
+ </layer>
+ <layer name="control" width="21" height="16" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJxjZWBgYB3FGJgNhxg2cVzq0fWxYTEDmxw2dbQwk41I9cRgYu2mlZnk+B09fNkYsMclLcwkJV1Rkj4Gi5nkxj017aJFOQEAqJYHLQ==
+  </data>
+ </layer>
+</map>
Binary file tiles.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/town.tmx	Sun Dec 16 11:10:38 2012 +0100
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" width="21" height="16" tilewidth="48" tileheight="48">
+ <properties>
+  <property name="music" value="walktune.xm"/>
+ </properties>
+ <tileset firstgid="1" name="tiles" tilewidth="48" tileheight="48">
+  <image source="tiles.png" width="288" height="288"/>
+  <tile id="1">
+   <properties>
+    <property name="block" value="1"/>
+   </properties>
+  </tile>
+  <tile id="4">
+   <properties>
+    <property name="block" value="1"/>
+   </properties>
+  </tile>
+  <tile id="20">
+   <properties>
+    <property name="block" value="1"/>
+   </properties>
+  </tile>
+  <tile id="21">
+   <properties>
+    <property name="block" value="1"/>
+   </properties>
+  </tile>
+  <tile id="22">
+   <properties>
+    <property name="block" value="1"/>
+   </properties>
+  </tile>
+  <tile id="23">
+   <properties>
+    <property name="block" value="1"/>
+   </properties>
+  </tile>
+ </tileset>
+ <tileset firstgid="37" name="furniture" tilewidth="48" tileheight="48">
+  <image source="furniture.png" width="288" height="288"/>
+ </tileset>
+ <layer name="floor" width="21" height="16">
+  <data encoding="base64" compression="zlib">
+   eJy1k0EKwCAMBE3xE7VC/f8reyosQdZkIYe5hDjomlhrzYAL6ADWLUnEuQjeN4POQVDv2Qnetwqco8AZzfMmeT5inieizowXfW8it2imLE/V6d+uepmP7Y76R0qf752bsz84k7sZrOYDsBUGow==
+  </data>
+ </layer>
+ <layer name="furniture" width="21" height="16">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgF1ASqQKxOZTO1gViXBPV6VLZ/IO0dDOE5nMBoeFIXAADbuwJJ
+  </data>
+ </layer>
+ <layer name="furniture2" width="21" height="16">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFo2DwAsuBdsAoGAV4AACa4AA6
+  </data>
+ </layer>
+ <objectgroup name="mobs" width="21" height="16">
+  <object name="villain" x="335" y="288"/>
+  <object x="33" y="155">
+   <properties>
+    <property name="cells" value="1-2,4"/>
+   </properties>
+  </object>
+  <object x="24" y="550">
+   <properties>
+    <property name="cells" value="1-2,3"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <layer name="overlay" width="21" height="16">
+  <properties>
+   <property name="overlay" value="1"/>
+  </properties>
+  <data encoding="base64" compression="zlib">
+   eJxjYEAAdgbiADcQ8+LByECJBmYSCwbaTGLDkw+IZfFgZEBseMoDsTIQK6BhmNhQBMSGJymA2PAcjgBfeAoDsQgUi5JgJr7wBKVJBShWJMHMwQwAYXgE6w==
+  </data>
+ </layer>
+ <layer name="control" width="21" height="16">
+  <data encoding="base64" compression="zlib">
+   eJxjY2BgYCMRsxLA6GqHgpnU8js5ZpNiJjFmk+o+aoUnuWFKjJ20MpNWbqa2mcMhPMlNK7Qwk1oYAKLNB4s=
+  </data>
+ </layer>
+</map>