Mercurial > skaapsteker

changeset 63:5b1778ed0e34

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
moar tile
author Adrianna Pińska <adrianna.pinska@gmail.com>
date Sun, 03 Apr 2011 22:33:22 +0200
parents 8aef264cb471
children 13b9031febeb
files data/levels/level1.json data/levels/level2.json data/levels/level3.json data/levels/level4.json data/tiles/dummy/cap-c.png data/tiles/dummy/cap-cc.png data/tiles/dummy/cap-d.png data/tiles/dummy/cap-dd.png data/tiles/dummy/cnr-backslash.png data/tiles/dummy/cnr-slash.png data/tiles/dummy/floor-cap-e.png data/tiles/dummy/floor-cap-w.png data/tiles/dummy/floor-cnr-l.png data/tiles/dummy/floor-cnr-r.png data/tiles/dummy/solid-cap-e.png data/tiles/dummy/solid-cap-ne.png data/tiles/dummy/solid-cap-nw.png data/tiles/dummy/solid-cap-se.png data/tiles/dummy/solid-cap-sw.png data/tiles/dummy/solid-cap-w.png data/tiles/dummy/solid-cnr-l.png data/tiles/dummy/solid-cnr-r.png skaapsteker/level.py
diffstat 23 files changed, 56 insertions(+), 50 deletions(-) [+]
line wrap: on
line diff
--- a/data/levels/level1.json	Sun Apr 03 22:32:04 2011 +0200
+++ b/data/levels/level1.json	Sun Apr 03 22:33:22 2011 +0200
@@ -5,18 +5,18 @@
     "tileset": "dummy",
     "tiles": [
         "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-        "X.......................................X................................X",
+        "X{.....................................}X{..............................}X",
         "X.......................................X................................X",
-        "X.......................................XXXXX---.........................X",
-        "X-----------XXXX.........................................................X",
+        "X.......................................bXXXX=-->........................X",
+        "X=---------+XXXq.........................................................X",
         "X...........XXXX.........................................................X",
-        "X...........XXXX------------XXXX-----------------------------------------X",
-        "X..........................XXXXX.........................................X",
-        "X.........................XXXXXX.........................................X",
-        "X........................XXXXXXXXXXXXXXX.................................X",
-        "XXXXXXXX................XXXXXXXXXXXXXXXX.................................X",
-        "XXXXXXXX...............XXXXXXXXX.........................................X",
-        "XXXXXXXX..............XXXXXXXXXX.........................................X",
+        "X...........XXXX=----------+XXXX=---------------------------------------+X",
+        "X...........bXXd...........pXXXX.........................................X",
+        "X.........................pXXXXX.........................................X",
+        "X........................pXXXXXXXXXXXXXq.................................X",
+        "XXXXXXXq................pXXXXXXXXXXXXXXd.................................X",
+        "XXXXXXXX...............pXXXXXXXX{........................................X",
+        "XXXXXXXX..............pXXXXXXXXX.........................................X",
         "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
     ],
     "enemies": [
--- a/data/levels/level2.json	Sun Apr 03 22:32:04 2011 +0200
+++ b/data/levels/level2.json	Sun Apr 03 22:33:22 2011 +0200
@@ -6,26 +6,26 @@
     "tileset": "dummy",
     "tiles": [
         "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-        "X...........XXXX...........................XXXX...........XXXX...........X",
-        "X............XX..........X........X.........XX.............XX........--XXX",
-        "X..........-XXXX-.....--XXXXXXXXXXXX--....-XXXX-...........XX............X",
-        "X...........................XXXX...................-XX-....XXX--.......--X",
-        "X........X........X..........XX............................XX............X",
-        "X.....--XXXXXXXXXXXX--...--XXXX.........X........X......--XXX............X",
-        "X...........XXXXX............XX......--XXXXXXXXXXXX--......XXX--.........X",
-        "X............XXX--...........XXX-...........XX.............XX............X",
-        "XXXXX--......XX........---XXXXX..........--XXX..........--XXX............X",
-        "XX...........XX..............XX.............XX.............XXX--.........X",
-        "X...........XXXX--...........XXX-...........XX.............XX............X",
-        "X.....--XXXXXXX........---XXXXX.........--XXXX..........--XXX............X",
-        "X...........XXX..............XX.............XX.............XXX--.........X",
-        "X............XXX--...........XXX-...........XX.........X..XXX...X........X",
-        "XXXXX--......XX..........--XXXX.........--XXXX......--XXXXXXXXXXXX--.....X",
-        "XX...........XX.............................XX...........................X",
-        "X...........XXXX--..........................XX...........................X",
-        "X.....--XXXXXXX..............XX..........--XXX............-XX-.....--XXXXX",
-        "X...........XXX..............XX.............XX...........................X",
-        "X............XXX--........--XXXX--.........XXXX..........................X",
+        "X{..........}XX{...........................}XX{...........}XX{..........}X",
+        "X............XX..........X........X.........XX.............XX........<+XXX",
+        "X.........<+XXXX=>....<+XXXXXXXXXXXX=>...<+XXXX=>..........XX...........}X",
+        "X...........bXXd............}XX{............bd....<+XX=>...XXX=>.........X",
+        "X........X........X..........XX............................XX{.........<+X",
+        "X.....<+XXXXXXXXXXXX=>...<+XXXX.........X........X......<+XXX............X",
+        "X...........}XXX{...........}XX......<+XXXXXXXXXXXX=>......XXX=>.........X",
+        "X............XXX=>...........XXX=>..........XX{............XX{...........X",
+        "XXXXX=>......XX........<-+XXXXX{.........<+XXX..........<+XXX............X",
+        "X{...........XX.............}XX............}XX............}XXX=>.........X",
+        "X...........XXXX=>...........XXX==>.........XX.............XX{...........X",
+        "X.....<+XXXXXXX{.......<-+XXXXX{........<+XXXX..........<+XXX............X",
+        "X...........}XX.............}XX............}XX.............}XX=>.........X",
+        "X............XXX=>...........XXX=>..........XX.........X..XXX...X........X",
+        "XXXXX=>......XX{.........<+XXX{.........<+XXXX......<+XXXXXXXXXXXX=>.....X",
+        "X{...........XX............................}XX........bXXXXXXXXXXd.......X",
+        "X...........XXXX=>..........................XX...........................X",
+        "X.....<+XXXXXXX..............XX..........<+XXX...........<+XX=>....<+XXXXX",
+        "X...........}XX..............XX.............}X..........................}X",
+        "X............XXX=>........<+XXXX...........XXXX..........................X",
         "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
     ],
     "enemies": [],
--- a/data/levels/level3.json	Sun Apr 03 22:32:04 2011 +0200
+++ b/data/levels/level3.json	Sun Apr 03 22:33:22 2011 +0200
@@ -6,13 +6,13 @@
     "tileset": "dummy",
     "tiles": [
         "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-        "X...............................................X........................X",
-        "X.......--XXXXXXXXX......XXXXX--XXXXXX--........X........................X",
-        "X...........--..-XXXXXXXXXX-......--............X........................X",
-        "X.................-X--..........................X...XXXXXXXXX............X",
-        "XXXXXXXX...........X.......................XXXXXXXXXXX-...-XXX--XXXX.....X",
-        "X-...-XXXXXX--XXXXXXXX...........XXXXX--XXXXX--..---.............-XXXXXXXX",
-        "X.......--........--XXXXXX--XXXXXXX-......-.........................--..-X",
+        "X{..}X{..............}X{.......................}X{........}XXXXXXX{.....}X",
+        "X.......-+XXXXXXXXX......XXXXX=+XXXXXX=-........X..........bXXXXXd.......X",
+        "X...............}XXXXXXXXXX{....................X........................X",
+        "X.................}X{...........................X...XXXXXXXXX............X",
+        "XXXXXXXX...........X.......................XXXXXXXXXXX{...}XXX=+XXXX.....X",
+        "X{...}XXXXXX=+XXXXXXXX...........XXXXX=+XXXXX{...................}XXXXXXXX",
+        "X..................}XXXXXX=+XXXXXXX{....................................}X",
         "X........................................................................X",
         "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
     ],
--- a/data/levels/level4.json	Sun Apr 03 22:32:04 2011 +0200
+++ b/data/levels/level4.json	Sun Apr 03 22:33:22 2011 +0200
@@ -6,16 +6,16 @@
     "tileset": "dummy",
     "tiles": [
         "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-        "X/................`X/...................................................`X",
+        "X{................}X{...................................................}X",
         "X..................X.....................................................X",
-        "XXXXXD..CXXXXXXXXXXXXXXXXXXXXD..CXXXXXXXXXXXXXXXXXXXXXD..CXXXXXXXXXXXXXXXX",
-        "X/........`X/.............................`X/...........................`X",
+        "XXXXX)..(XXXXXXXXXXXXXXXXXXXX)..(XXXXXXXXXXXXXXXXXXXXX)..(XXXXXXXXXXXXXXXX",
+        "X{........}X{.............................}X{...........................}X",
         "X..........X...............................X.............................X",
-        "X..CXXXXXXXXXXXXXXXXXXXXD..CXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXD..CXXXXXXXXX",
-        "X...........................`X/...........................`X/...........`X",
+        "X..(XXXXXXXXXXXXXXXXXXXX)..(XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX)..(XXXXXXXXX",
+        "X...........................}X{...........................}X{...........}X",
         "X............................X.............................X.............X",
-        "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXD..CXXXXXXXXD..CXXXXXXXXXXXXXXXXXXXXXD..CXX",
-        "X/..................................`X/.................................`X",
+        "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX)..(XXXXXXXX)..(XXXXXXXXXXXXXXXXXXXXX)..(XX",
+        "X{..................................}X{.................................}X",
         "X....................................X...................................X",
         "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
     ],
Binary file data/tiles/dummy/cap-c.png has changed
Binary file data/tiles/dummy/cap-cc.png has changed
Binary file data/tiles/dummy/cap-d.png has changed
Binary file data/tiles/dummy/cap-dd.png has changed
Binary file data/tiles/dummy/cnr-backslash.png has changed
Binary file data/tiles/dummy/cnr-slash.png has changed
Binary file data/tiles/dummy/floor-cap-e.png has changed
Binary file data/tiles/dummy/floor-cap-w.png has changed
Binary file data/tiles/dummy/floor-cnr-l.png has changed
Binary file data/tiles/dummy/floor-cnr-r.png has changed
Binary file data/tiles/dummy/solid-cap-e.png has changed
Binary file data/tiles/dummy/solid-cap-ne.png has changed
Binary file data/tiles/dummy/solid-cap-nw.png has changed
Binary file data/tiles/dummy/solid-cap-se.png has changed
Binary file data/tiles/dummy/solid-cap-sw.png has changed
Binary file data/tiles/dummy/solid-cap-w.png has changed
Binary file data/tiles/dummy/solid-cnr-l.png has changed
Binary file data/tiles/dummy/solid-cnr-r.png has changed
--- a/skaapsteker/level.py	Sun Apr 03 22:32:04 2011 +0200
+++ b/skaapsteker/level.py	Sun Apr 03 22:33:22 2011 +0200
@@ -25,12 +25,18 @@
         image_name = {
             '-': 'floor.png',
             'X': 'solid.png',
-            'c': 'cap-c.png',
-            'C': 'cap-cc.png',
-            'd': 'cap-d.png',
-            'D': 'cap-dd.png',
-            '/': 'cnr-slash.png',
-            '`': 'cnr-backslash.png',
+            '<': 'floor-cap-w.png',
+            '>': 'floor-cap-e.png',
+            '=': 'floor-cnr-l.png',
+            '+': 'floor-cnr-r.png',
+            '(': 'solid-cap-w.png',
+            ')': 'solid-cap-e.png',
+            'q': 'solid-cap-ne.png',
+            'd': 'solid-cap-se.png',
+            'p': 'solid-cap-nw.png',
+            'b': 'solid-cap-sw.png',
+            '{': 'solid-cnr-l.png',
+            '}': 'solid-cnr-r.png',
             }[tilechar]
         image_file = self.dirname + '/' + image_name
         return data.load_image(image_file)