Mercurial > skaapsteker

changeset 218:7ee5bd883d62

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
renamed first proper level
author Adrianna Pińska <adrianna.pinska@gmail.com>
date Thu, 07 Apr 2011 01:02:36 +0200
parents fcc5eca8eaca
children c83f021cc327
files data/levels/level1.json data/levels/temple.json skaapsteker/menuscene.py
diffstat 3 files changed, 36 insertions(+), 35 deletions(-) [+]
line wrap: on
line diff
--- a/data/levels/level1.json	Thu Apr 07 00:59:08 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-{
-    "backgrounds": [
-        "background_01_back.png"
-    ],
-    "tileset": "blue",
-    "tiles": [
-        "XXXXXXXXXXXXXXXXXXXX",
-        "XXd{....}bd{....}bXX",
-        "Xd{..........?...}bX",
-        "X{..........(X)...}X",
-        "X..................X",
-        "X..<+bd=>..........X",
-        "X.................pX",
-        "X?...........<--+bXX",
-        "Xq..?..pq.........}X",
-        "XXXXXd=-->.........X",
-        "X{................?X",
-        "X..........pq..?..pX",
-        "X.........<--+bXXXXX",
-        "Xq................}X",
-        "XXd=-->............X",
-        "X{.................X",
-        "Xq..?.....pq...?..pX",
-        "XXXXXXXXXXXXXXXXXXXX"
-    ],
-    "enemies": [
-        {"type": "Dummy", "pos": [4, 8], "direction": "left" },
-        {"type": "Dummy", "pos": [15, 11], "direction": "right" }
-    ],
-    "player": {"pos": [4, 17], "direction": "right"}
-}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/data/levels/temple.json	Thu Apr 07 01:02:36 2011 +0200
@@ -0,0 +1,32 @@
+{
+    "description": "A small temple",
+    "backgrounds": [
+        "background_01_back.png"
+    ],
+    "tileset": "blue",
+    "tiles": [
+        "XXXXXXXXXXXXXXXXXXXX",
+        "XXd{....}bd{....}bXX",
+        "Xd{..........?...}bX",
+        "X{..........(X)...}X",
+        "X..................X",
+        "X..<+bd=>..........X",
+        "X.................pX",
+        "X?...........<--+bXX",
+        "Xq..?..pq.........}X",
+        "XXXXXd=-->.........X",
+        "X{................?X",
+        "X..........pq..?..pX",
+        "X.........<--+bXXXXX",
+        "Xq................}X",
+        "XXd=-->............X",
+        "X{.................X",
+        "Xq..?.....pq...?..pX",
+        "XXXXXXXXXXXXXXXXXXXX"
+    ],
+    "enemies": [
+        {"type": "Dummy", "pos": [4, 8], "direction": "left" },
+        {"type": "Dummy", "pos": [15, 11], "direction": "right" }
+    ],
+    "player": {"pos": [4, 17], "direction": "right"}
+}
--- a/skaapsteker/menuscene.py	Thu Apr 07 00:59:08 2011 +0200
+++ b/skaapsteker/menuscene.py	Thu Apr 07 01:02:36 2011 +0200
@@ -12,7 +12,7 @@
         self.widgets.append(Text("MENU:", (50, 50), color='white', size=48))
         self.cur_game = cur_game
         menu_options = [
-            ('Level 1', 'level1'),
+            ('Temple', 'temple'),
             ('Level 2', 'level2'),
             ('Level 3', 'level3'),
             ('Level 4', 'level4'),
@@ -28,14 +28,14 @@
 
     def selected(self, option, data):
         "Callback from menu TextChoice"
-        if data.startswith('level'):
-            ChangeScene.post(LevelScene(self.game_state, data))
-        elif data == 'resume':
+        if data == 'resume':
             ChangeScene.post(self.cur_game)
         elif data == 'cutscene':
             ChangeScene.post(opening_cutscene(self.game_state))
         elif data == 'quit':
             pygame.event.post(pygame.event.Event(QUIT))
+        else:
+            ChangeScene.post(LevelScene(self.game_state, data))
 
     def draw(self, surface, engine):
         surface.fill(pygame.Color('black'))