Mercurial > skaapsteker

changeset 550:ebd51cb1d672

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Work on geisha room
author Neil Muller <drnlmuller@gmail.com>
date Sun, 10 Apr 2011 01:07:32 +0200
parents b7f912705adb
children 40a104ca0a69
files data/game.json skaapsteker/sprites/npcs.py
diffstat 2 files changed, 14 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/data/game.json	Sun Apr 10 01:14:14 2011 +0200
+++ b/data/game.json	Sun Apr 10 01:07:32 2011 +0200
@@ -165,7 +165,7 @@
         "sasuke": { "type": "Sasuke", "level": "road", "pos": [54, 8], "dsm": "npcs/sasuke.json", "state": "start", "present": true},
         "kaneda2": { "type": "Kaneda", "level": "tea_house", "pos": [6, 10], "dsm": "npcs/kaneda2.json", "state": "start", "facing": "right", "present": true },
         "tetsuo": { "type": "Tetsuo", "level": "tea_house", "pos": [9, 10], "dsm": "npcs/tetsuo.json", "state": "start", "facing": "left" },
-        "kaneda": { "type": "Kaneda", "level": "geisha_room", "pos": [10, 3], "dsm": "npcs/kaneda.json", "state": "start", "facing": "left", "present": true },
+        "kaneda": { "type": "Kaneda", "level": "geisha_room", "pos": [10, 3], "dsm": "npcs/kaneda.json", "state": "start", "facing": "left", "present": false },
         "kumiko": { "type": "Kumiko", "level": "geisha_room", "pos": [11, 13], "dsm": "npcs/kumiko.json", "state": "start" },
         "maneki": { "type": "Maneki", "level": "market", "pos": [35, 6], "dsm": "npcs/maneki.json", "state": "start" },
         "fishmonger": { "type": "FishMonger", "level": "fishmonger_house", "pos": [23, 5], "dsm": "npcs/fishmonger.json", "state": "start" },
--- a/skaapsteker/sprites/npcs.py	Sun Apr 10 01:14:14 2011 +0200
+++ b/skaapsteker/sprites/npcs.py	Sun Apr 10 01:07:32 2011 +0200
@@ -65,9 +65,17 @@
     def setup(self, name, world, dsm, state, present, facing=None):
         super(Kaneda, self).setup(name, world, dsm, state, facing)
 
-    def update(self):
+    def player_action(self, player):
         if not self._me.present:
+            return
+        super(Kaneda, self).player_action(player)
+
+    def update(self):
+        if not self._me.present and self.alive:
+            self._all_groups = self.groups()
             self.remove()
+        if self._me.present and not self.alive:
+            self.add(*self._all_groups)
         super(Kaneda, self).update()
 
 
@@ -89,6 +97,10 @@
 class Kumiko(NPC):
     image_dir = 'sprites/geisha'
 
+    animation_regexes = [
+        ("standing", r"^.*_01.png$"),
+    ]
+
 
 class FishMonger(NPC):
     image_dir = 'sprites/fishmonger'