Mercurial > skaapsteker

changeset 288:ddcfc159dc2a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Combine 'fox' and 'player' sections in game.json.
author Simon Cross <hodgestar@gmail.com>
date Fri, 08 Apr 2011 21:23:00 +0200
parents f512e874b2e7
children 16ffe6f5dbb8
files data/game.json skaapsteker/levelscene.py
diffstat 2 files changed, 8 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/data/game.json	Fri Apr 08 21:17:30 2011 +0200
+++ b/data/game.json	Fri Apr 08 21:23:00 2011 +0200
@@ -3,7 +3,9 @@
         "item": null,
         "tails" : [],
         "cur_health" : 40,
-        "max_health" : 40
+        "max_health" : 40,
+        "level": "temple",
+        "doorway": "starting"
     },
     "missions": {
         "monk_tea": false,
@@ -40,6 +42,5 @@
         "temple" : "temple",
         "theatre" : "theatre",
         "town" : "town"
-    },
-    "player": {"level": "temple", "doorway": "starting"}
+    }
 }
--- a/skaapsteker/levelscene.py	Fri Apr 08 21:17:30 2011 +0200
+++ b/skaapsteker/levelscene.py	Fri Apr 08 21:23:00 2011 +0200
@@ -22,9 +22,9 @@
         super(LevelScene, self).__init__(game_state, soundsystem)
 
         if doorway_def is not None:
-            player_def = self.game_state.world.player
-            player_def.level, player_def.doorway = doorway_def.split('.')
-        self._level = level.Level(self.game_state.world.player.level, soundsystem)
+            fox = self.game_state.world.fox
+            fox.level, fox.doorway = doorway_def.split('.')
+        self._level = level.Level(self.game_state.world.fox.level, soundsystem)
         self._player_dead = False
         self._dialogue = None
 
@@ -45,7 +45,7 @@
         self._key_sequence = []
 
     def setup_player(self):
-        doorway = self._level.doorways[self.game_state.world.player.doorway]
+        doorway = self._level.doorways[self.game_state.world.fox.doorway]
         self._player = player.Player(self.game_state.world, self._soundsystem)
         self._player.set_facing(doorway.facing)
         self._player.set_image()