Mercurial > vanillian

changeset 42:e99fee284b36

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
basic plot
author Radomir Dopieralski <sheep-devel@sheep.art.pl>
date Sun, 16 Dec 2012 18:01:05 +0100
parents bf9aa3991319
children 53ae6905cfff
files cellar.tmx furniture.png lab.tmx level01.tmx mobs.png tiles.png town.tmx
diffstat 7 files changed, 239 insertions(+), 30 deletions(-) [+]
line wrap: on
line diff
--- a/cellar.tmx	Sun Dec 16 16:10:42 2012 +0100
+++ b/cellar.tmx	Sun Dec 16 18:01:05 2012 +0100
@@ -1,7 +1,7 @@
 <?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"/>
+  <property name="music" value="labz.xm"/>
  </properties>
  <tileset firstgid="1" name="tiles" tilewidth="48" tileheight="48">
   <image source="tiles.png" width="288" height="432"/>
@@ -41,12 +41,12 @@
  </tileset>
  <layer name="floor" width="21" height="16">
   <data encoding="base64" compression="zlib">
-   eJy9k0EOgCAMBEvxEyqJ/v+V6oFks2k2SKqHuSxkCi0UMyuAAwuAeXnJiPMUsK8NOjcB+noNXO8+zDzIsDY79psKrIMZO5k6gXK2SSffNeOcbvqtZTuPhH5yT2f7qZwZc2en/zAjD+qofZGzBTU6z/9Rb/BrLjaoB3I=
+   eJy9k0EOgCAMBNviJ1QS/f8rlQPJZlMbJNXDXLZkoAVURBQwYAEw15eMOM8A9lWqdx9mzblRtgHd9VTvTszMybAfpdp+U4B1MGMnUyaInHXSyb1mnNMkfmvZziNhnjzT2XlGzox7Z6f9cEfm7BOt85zV2aPT/k/0Br/mAqjECHQ=
   </data>
  </layer>
  <layer name="furniture" width="21" height="16">
   <data encoding="base64" compression="zlib">
-   eJxjYBgF6MAaB5tWdtHajuEOzIHYAogtqWimLRDbAbE9Fc2kFDgMtANoAEBxR814ozcAAI21Av8=
+   eJxjYBhewAaKKQHWaGwnKKYFsEazbxSQDsyB2AKILalopi0Q2wGxPRXNpBQ4DLQDaABAcUfNeKM3AAC+6QP7
   </data>
  </layer>
  <layer name="furniture2" width="21" height="16">
@@ -59,11 +59,13 @@
   <object x="689" y="341">
    <properties>
     <property name="cells" value="1-2,4"/>
+    <property name="text" value="We've been waiting for you, professor!"/>
    </properties>
   </object>
   <object x="674" y="504">
    <properties>
     <property name="cells" value="1-2,3"/>
+    <property name="text" value="Everything is ready, just press the button."/>
    </properties>
   </object>
   <object x="121" y="234">
@@ -72,13 +74,19 @@
     <property name="exit" value="lab.tmx"/>
    </properties>
   </object>
+  <object x="504" y="392">
+   <properties>
+    <property name="cells" value="3-4,3"/>
+    <property name="text" value="Malfunction!"/>
+   </properties>
+  </object>
  </objectgroup>
  <layer name="overlay" width="21" height="16">
   <properties>
    <property name="overlay" value="1"/>
   </properties>
   <data encoding="base64" compression="zlib">
-   eJzjZWBg4KUh5gFiWSQsR4IYLnP4gVgBiq2BmA8qZo0kzoemDoS50cwUhIqDgCIDKpDHImYNxcgAm5mUAnqYKQTE4lDMSSUzqeHmUTOHl5kcDJjpC5sYPjOR0yoIS5AgRsuyDYQBMxYM6Q==
+   eJzjZWBg4KUh5gFiWSQsR4IYLnP4GRDAGoj5oGLWSOJ8aOpAgBvNTEEG3EAeiBXRxKzR7CDVTGIBPcwUAmJxKOakkpnUcPOomcPLTA4GzPSFTQyfmchpFYQlSBCjZdkGwgBAEwvI
   </data>
  </layer>
  <layer name="control" width="21" height="16">
Binary file furniture.png has changed
--- a/lab.tmx	Sun Dec 16 16:10:42 2012 +0100
+++ b/lab.tmx	Sun Dec 16 18:01:05 2012 +0100
@@ -1,7 +1,7 @@
 <?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"/>
+  <property name="music" value="labz.xm"/>
  </properties>
  <tileset firstgid="1" name="tiles" tilewidth="48" tileheight="48">
   <image source="tiles.png" width="288" height="432"/>
@@ -55,15 +55,17 @@
   </data>
  </layer>
  <objectgroup name="mobs" width="21" height="16">
-  <object name="villain" x="310" y="297"/>
+  <object name="villain" x="359" y="308"/>
   <object x="816" y="322">
    <properties>
     <property name="cells" value="1-2,4"/>
+    <property name="text" value="I'm so excited!"/>
    </properties>
   </object>
   <object x="686" y="314">
    <properties>
     <property name="cells" value="1-2,3"/>
+    <property name="text" value="After all those years of research, at last!|A real doomsday machine in the basement, can you imagine?"/>
    </properties>
   </object>
   <object x="360" y="187">
--- a/level01.tmx	Sun Dec 16 16:10:42 2012 +0100
+++ b/level01.tmx	Sun Dec 16 18:01:05 2012 +0100
@@ -41,48 +41,131 @@
  </tileset>
  <layer name="floor" width="21" height="16">
   <data encoding="base64" compression="zlib">
-   eJxjZGBgYBxCmBmKB4OZClCsSAU3yENpKSiWxiKvQCSGuUcSiJXw2CmJZB8hjOweGSqHP7GYBQljk2dCwwNlJiFMCzMHGpOSPnFhRTQzSUmfxKRbWmAAfQUJIw==
+   eJzTZmBg0B7FWDELFjYLEqalfdQ0Ex0PFXfTykwFJKxIJTOlkLA0krwMGWyYmUxDBKvSAKvTANPCnQCzTy0+
   </data>
  </layer>
  <layer name="furniture" width="21" height="16">
   <data encoding="base64" compression="zlib">
-   eJxjYBgFQw1Y45GzItNMRyxi5kBsAcWWZJqLDmyB2A6K7YHYgQpmUsOMUTAKyAEALHsDDw==
+   eJxjYBgFo4A44DvQDhgFo2CQAQDyRABO
   </data>
  </layer>
  <layer name="furniture2" width="21" height="16">
   <data encoding="base64" compression="zlib">
-   eJxjYBgFQxFYQTEysKaBPY40MHMUjILhAgA1AQDx
+   eJxjYBgFo2AUjIJRQA4AAAVAAAE=
   </data>
  </layer>
  <objectgroup name="mobs" width="21" height="16">
-  <object name="villain" x="454" y="504"/>
-  <object x="672" y="528" width="48" height="48"/>
-  <object x="851" y="274">
+  <object name="villain" x="48" y="624">
+   <properties>
+    <property name="cells" value="1,1-2"/>
+   </properties>
+  </object>
+  <object x="0" y="624">
    <properties>
-    <property name="cells" value="1-2,4"/>
+    <property name="cells" value="4,4"/>
+    <property name="exit" value="town.tmx"/>
+   </properties>
+  </object>
+  <object x="384" y="384">
+   <properties>
+    <property name="cells" value="3-4,2"/>
+    <property name="text" value="Baa!"/>
+   </properties>
+  </object>
+  <object x="768" y="336">
+   <properties>
+    <property name="cells" value="3-4,2"/>
+    <property name="text" value="Maa!"/>
    </properties>
   </object>
-  <object x="696" y="408">
+  <object x="432" y="192">
+   <properties>
+    <property name="cells" value="3-4,2"/>
+    <property name="text" value="Bee!"/>
+   </properties>
+  </object>
+  <object x="528" y="336">
+   <properties>
+    <property name="cells" value="1-2,2"/>
+    <property name="text" value="Hello professor Vanilla!|Today is the day of starting your doomsday machine.|We all cheer for you!"/>
+   </properties>
+  </object>
+  <object x="0" y="528">
    <properties>
-    <property name="cells" value="1-2,3"/>
-    <property name="text" value="Hello!|I've been waiting for you!"/>
+    <property name="cells" value="4,4"/>
+    <property name="exit" value="town.tmx"/>
+   </properties>
+  </object>
+  <object x="0" y="576">
+   <properties>
+    <property name="cells" value="4,4"/>
+    <property name="exit" value="town.tmx"/>
+   </properties>
+  </object>
+  <object x="5" y="598">
+   <properties>
+    <property name="cells" value="4,4"/>
+    <property name="exit" value="town.tmx"/>
    </properties>
   </object>
-  <object x="792" y="714">
+  <object x="6" y="553">
+   <properties>
+    <property name="cells" value="4,4"/>
+    <property name="exit" value="town.tmx"/>
+   </properties>
+  </object>
+  <object x="5" y="647">
    <properties>
-    <property name="cells" value="3,1"/>
-    <property name="exit" value="lab.tmx"/>
+    <property name="cells" value="4,4"/>
+    <property name="exit" value="town.tmx"/>
+   </properties>
+  </object>
+  <object x="7" y="671">
+   <properties>
+    <property name="cells" value="4,4"/>
+    <property name="exit" value="town.tmx"/>
+   </properties>
+  </object>
+  <object x="2" y="684" width="14" height="21">
+   <properties>
+    <property name="cells" value="4,4"/>
+    <property name="exit" value="town.tmx"/>
    </properties>
   </object>
-  <object x="216" y="457">
+  <object x="2" y="709" width="14" height="21">
    <properties>
-    <property name="cells" value="4,1"/>
+    <property name="cells" value="4,4"/>
+    <property name="exit" value="town.tmx"/>
+   </properties>
+  </object>
+  <object x="4" y="731" width="14" height="21">
+   <properties>
+    <property name="cells" value="4,4"/>
+    <property name="exit" value="town.tmx"/>
    </properties>
   </object>
-  <object x="624" y="528">
+  <object x="13" y="564">
+   <properties>
+    <property name="cells" value="4,4"/>
+    <property name="exit" value="town.tmx"/>
+   </properties>
+  </object>
+  <object x="14" y="538">
    <properties>
-    <property name="cells" value="3-4,2"/>
-    <property name="text" value="Don't mind me.|I'm just a goat."/>
+    <property name="cells" value="4,4"/>
+    <property name="exit" value="town.tmx"/>
+   </properties>
+  </object>
+  <object x="10" y="614">
+   <properties>
+    <property name="cells" value="4,4"/>
+    <property name="exit" value="town.tmx"/>
+   </properties>
+  </object>
+  <object x="0" y="576" width="19" height="14">
+   <properties>
+    <property name="cells" value="4,4"/>
+    <property name="exit" value="town.tmx"/>
    </properties>
   </object>
  </objectgroup>
@@ -91,12 +174,12 @@
    <property name="overlay" value="1"/>
   </properties>
   <data encoding="base64" compression="zlib">
-   eJxjYBiagAOIxbFgThzqRKBYFE2eC4nNDcS8WLAQmtl8QCyIx218SPbJEsD8SPrE8Jg5WAEXGh8U3tjiAF0MHxBA44PiBT28sYnR00wOHPphaQWGJUgwE5ebsKVJQmbC0j02+0HpE1d6FMGDcaXbkQwAnEsGmg==
+   eJxjYKA+EEfCnFQykxcJC46aOWLMlEXC/FQyEwSUsYixU8AeBSMTAAAS7AJL
   </data>
  </layer>
  <layer name="control" width="21" height="16">
   <data encoding="base64" compression="zlib">
-   eJxjY2BgYBvFYMyKBxNShy5PjJnIesmxk1gzyfEvPvfgM5OcMMamBpseXGLEuIdUM4n1CzXNJDXe6W0mNdMnufmMUjOpjQGVpQdc
+   eJxjY2BgYBsCmBUNj5pJfzMJqRss7hxMZlLCHsWDHwMAQOgHtw==
   </data>
  </layer>
 </map>
Binary file mobs.png has changed
Binary file tiles.png has changed
--- a/town.tmx	Sun Dec 16 16:10:42 2012 +0100
+++ b/town.tmx	Sun Dec 16 18:01:05 2012 +0100
@@ -46,24 +46,26 @@
  </layer>
  <layer name="furniture" width="21" height="16">
   <data encoding="base64" compression="zlib">
-   eJxjYBgF1ATmQGxJZTNtgdieBPUOVLZ/IO0dDOE5GIEemfpGw5O6AACm+ANz
+   eJxjYBgF1ATmQGxJZTNtgdieBPW+VLafWOBAAzMHQ3gORqBHpr7R8KQuAADTdAOA
   </data>
  </layer>
  <layer name="furniture2" width="21" height="16">
   <data encoding="base64" compression="zlib">
-   eJxjYBgFo2DwAu+BdsAwA54D7YBhBgAp/wCV
+   eJxjYBgF1Aa+A+2AYQS8B9oBwwwM5bTpi4NNqVpKAADtqgIa
   </data>
  </layer>
  <objectgroup name="mobs" width="21" height="16">
-  <object name="villain" x="750" y="421"/>
+  <object name="villain" x="884" y="410"/>
   <object x="33" y="155">
    <properties>
     <property name="cells" value="1-2,4"/>
+    <property name="text" value="I'm waiting for my vanilla icecream."/>
    </properties>
   </object>
   <object x="24" y="550">
    <properties>
     <property name="cells" value="1-2,3"/>
+    <property name="text" value="Today is the great day!|Hurry up to the laboratory!"/>
    </properties>
   </object>
   <object x="816" y="331">
@@ -72,6 +74,120 @@
     <property name="exit" value="lab.tmx"/>
    </properties>
   </object>
+  <object x="996" y="384">
+   <properties>
+    <property name="cells" value="4,4"/>
+    <property name="exit" value="level01.tmx"/>
+   </properties>
+  </object>
+  <object x="996" y="415">
+   <properties>
+    <property name="cells" value="4,4"/>
+    <property name="exit" value="level01.tmx"/>
+   </properties>
+  </object>
+  <object x="995" y="350">
+   <properties>
+    <property name="cells" value="4,4"/>
+    <property name="exit" value="level01.tmx"/>
+   </properties>
+  </object>
+  <object x="995" y="396">
+   <properties>
+    <property name="cells" value="4,4"/>
+    <property name="exit" value="level01.tmx"/>
+   </properties>
+  </object>
+  <object x="988" y="365" width="9" height="12">
+   <properties>
+    <property name="cells" value="4,4"/>
+    <property name="exit" value="level01.tmx"/>
+   </properties>
+  </object>
+  <object x="995" y="442">
+   <properties>
+    <property name="cells" value="4,4"/>
+    <property name="exit" value="level01.tmx"/>
+   </properties>
+  </object>
+  <object x="996" y="462">
+   <properties>
+    <property name="cells" value="4,4"/>
+    <property name="exit" value="level01.tmx"/>
+   </properties>
+  </object>
+  <object x="993" y="483">
+   <properties>
+    <property name="cells" value="4,4"/>
+    <property name="exit" value="level01.tmx"/>
+   </properties>
+  </object>
+  <object x="995" y="505">
+   <properties>
+    <property name="cells" value="4,4"/>
+    <property name="exit" value="level01.tmx"/>
+   </properties>
+  </object>
+  <object x="998" y="527">
+   <properties>
+    <property name="cells" value="4,4"/>
+    <property name="exit" value="level01.tmx"/>
+   </properties>
+  </object>
+  <object x="996" y="550">
+   <properties>
+    <property name="cells" value="4,4"/>
+    <property name="exit" value="level01.tmx"/>
+   </properties>
+  </object>
+  <object x="996" y="570">
+   <properties>
+    <property name="cells" value="4,4"/>
+    <property name="exit" value="level01.tmx"/>
+   </properties>
+  </object>
+  <object x="996" y="595">
+   <properties>
+    <property name="cells" value="4,4"/>
+    <property name="exit" value="level01.tmx"/>
+   </properties>
+  </object>
+  <object x="993" y="619">
+   <properties>
+    <property name="cells" value="4,4"/>
+    <property name="exit" value="level01.tmx"/>
+   </properties>
+  </object>
+  <object x="999" y="644">
+   <properties>
+    <property name="cells" value="4,4"/>
+    <property name="exit" value="level01.tmx"/>
+   </properties>
+  </object>
+  <object x="994" y="668">
+   <properties>
+    <property name="cells" value="4,4"/>
+    <property name="exit" value="level01.tmx"/>
+   </properties>
+  </object>
+  <object x="997" y="694">
+   <properties>
+    <property name="cells" value="4,4"/>
+    <property name="exit" value="level01.tmx"/>
+   </properties>
+  </object>
+  <object x="998" y="720">
+   <properties>
+    <property name="cells" value="4,4"/>
+    <property name="exit" value="level01.tmx"/>
+   </properties>
+  </object>
+  <object x="998" y="744">
+   <properties>
+    <property name="cells" value="4,4"/>
+    <property name="exit" value="level01.tmx"/>
+   </properties>
+  </object>
  </objectgroup>
  <layer name="overlay" width="21" height="16">
   <properties>
@@ -83,7 +199,7 @@
  </layer>
  <layer name="control" width="21" height="16">
   <data encoding="base64" compression="zlib">
-   eJxjY2BgYCMRsxLA6GqHgpnU8js5ZpNiJjFmk+o+aoUnuWFKjJ20MpNWbqa2mcMhPMlNK7Qwk1oYAKLNB4s=
+   eJxjY2BgYCMRsxLA6GqHgpnU8js5ZpNiJjFmk+o+aoUnuWFKjJ20MpNWbqa2mcMhPMlNK9jMZiVgJi42tTEAoO0Hhw==
   </data>
  </layer>
 </map>