Mercurial > skaapsteker

changeset 119:0f24800e9ca8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Display level3 and 4 on main menu
author Stefano Rivera <stefano@rivera.za.net>
date Mon, 04 Apr 2011 22:07:01 +0200
parents 081f78470dcf
children 9b08afeadf06
files data/levels/level3.json skaapsteker/level.py skaapsteker/menuscene.py
diffstat 3 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/data/levels/level3.json	Mon Apr 04 22:05:16 2011 +0200
+++ b/data/levels/level3.json	Mon Apr 04 22:07:01 2011 +0200
@@ -6,7 +6,7 @@
     "tileset": "flower_dark",
     "tiles": [
         "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-        "X{..}bd{............}bd{......................}bXd{.......}XX{.}XX{.....}X",
+        "X{?.}bd{............}bd{......................}bXd{.......}XX{.}XX{.....}X",
         "X.......<-+bXXXXXXq......pXXXd=+bXXXXd=->......}X{.........bXXXXXd.......X",
         "X...............}bXXXXXXXXd{....................X........................X",
         "X.................}X{...........................X...pXXXXXXXq............X",
@@ -18,5 +18,5 @@
     ],
     "enemies": [],
     "sprites": [],
-    "player": {}
+    "player": {"pos": [2, 1], "direction": "right"}
 }
--- a/skaapsteker/level.py	Mon Apr 04 22:05:16 2011 +0200
+++ b/skaapsteker/level.py	Mon Apr 04 22:07:01 2011 +0200
@@ -148,7 +148,7 @@
         objects = []
         objects += self.level_data.get('enemies', [])
         objects += self.level_data.get('sprites', [])
-        if 'player' in self.level_data:
+        if 'pos' in self.level_data['player']:
             objects.append(self.level_data['player'])
 
         for object_ in objects:
--- a/skaapsteker/menuscene.py	Mon Apr 04 22:05:16 2011 +0200
+++ b/skaapsteker/menuscene.py	Mon Apr 04 22:07:01 2011 +0200
@@ -13,6 +13,8 @@
         menu_options = [
             ('Level 1', 'level1'),
             ('Level 2', 'level2'),
+            ('Level 3', 'level3'),
+            ('Level 4', 'level4'),
             ('Quit', 'quit'),
         ]
         if cur_game is not None: