# HG changeset patch # User Adrianna Pińska # Date 1301862802 -7200 # Node ID 5b1778ed0e3428ae4dc5b5d45f277dbad89ce928 # Parent 8aef264cb471d2e415407de7fa60b13552989e53 moar tile diff -r 8aef264cb471 -r 5b1778ed0e34 data/levels/level1.json --- 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": [ diff -r 8aef264cb471 -r 5b1778ed0e34 data/levels/level2.json --- 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": [], diff -r 8aef264cb471 -r 5b1778ed0e34 data/levels/level3.json --- 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" ], diff -r 8aef264cb471 -r 5b1778ed0e34 data/levels/level4.json --- 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" ], diff -r 8aef264cb471 -r 5b1778ed0e34 data/tiles/dummy/cap-c.png Binary file data/tiles/dummy/cap-c.png has changed diff -r 8aef264cb471 -r 5b1778ed0e34 data/tiles/dummy/cap-cc.png Binary file data/tiles/dummy/cap-cc.png has changed diff -r 8aef264cb471 -r 5b1778ed0e34 data/tiles/dummy/cap-d.png Binary file data/tiles/dummy/cap-d.png has changed diff -r 8aef264cb471 -r 5b1778ed0e34 data/tiles/dummy/cap-dd.png Binary file data/tiles/dummy/cap-dd.png has changed diff -r 8aef264cb471 -r 5b1778ed0e34 data/tiles/dummy/cnr-backslash.png Binary file data/tiles/dummy/cnr-backslash.png has changed diff -r 8aef264cb471 -r 5b1778ed0e34 data/tiles/dummy/cnr-slash.png Binary file data/tiles/dummy/cnr-slash.png has changed diff -r 8aef264cb471 -r 5b1778ed0e34 data/tiles/dummy/floor-cap-e.png Binary file data/tiles/dummy/floor-cap-e.png has changed diff -r 8aef264cb471 -r 5b1778ed0e34 data/tiles/dummy/floor-cap-w.png Binary file data/tiles/dummy/floor-cap-w.png has changed diff -r 8aef264cb471 -r 5b1778ed0e34 data/tiles/dummy/floor-cnr-l.png Binary file data/tiles/dummy/floor-cnr-l.png has changed diff -r 8aef264cb471 -r 5b1778ed0e34 data/tiles/dummy/floor-cnr-r.png Binary file data/tiles/dummy/floor-cnr-r.png has changed diff -r 8aef264cb471 -r 5b1778ed0e34 data/tiles/dummy/solid-cap-e.png Binary file data/tiles/dummy/solid-cap-e.png has changed diff -r 8aef264cb471 -r 5b1778ed0e34 data/tiles/dummy/solid-cap-ne.png Binary file data/tiles/dummy/solid-cap-ne.png has changed diff -r 8aef264cb471 -r 5b1778ed0e34 data/tiles/dummy/solid-cap-nw.png Binary file data/tiles/dummy/solid-cap-nw.png has changed diff -r 8aef264cb471 -r 5b1778ed0e34 data/tiles/dummy/solid-cap-se.png Binary file data/tiles/dummy/solid-cap-se.png has changed diff -r 8aef264cb471 -r 5b1778ed0e34 data/tiles/dummy/solid-cap-sw.png Binary file data/tiles/dummy/solid-cap-sw.png has changed diff -r 8aef264cb471 -r 5b1778ed0e34 data/tiles/dummy/solid-cap-w.png Binary file data/tiles/dummy/solid-cap-w.png has changed diff -r 8aef264cb471 -r 5b1778ed0e34 data/tiles/dummy/solid-cnr-l.png Binary file data/tiles/dummy/solid-cnr-l.png has changed diff -r 8aef264cb471 -r 5b1778ed0e34 data/tiles/dummy/solid-cnr-r.png Binary file data/tiles/dummy/solid-cnr-r.png has changed diff -r 8aef264cb471 -r 5b1778ed0e34 skaapsteker/level.py --- 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)