Changeset 550:ebd51cb1d672


Ignore:
Timestamp:
04/09/11 23:07:32 (12 years ago)
Author:
Neil Muller <drnlmuller@…>
Branch:
default
Phase:
public
Rebase:
39393630303665313137393561663832323636303466373736376131613762666637376663663935
Message:

Work on geisha room

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • data/game.json

    r549 r550  
    166166        "kaneda2": { "type": "Kaneda", "level": "tea_house", "pos": [6, 10], "dsm": "npcs/kaneda2.json", "state": "start", "facing": "right", "present": true },
    167167        "tetsuo": { "type": "Tetsuo", "level": "tea_house", "pos": [9, 10], "dsm": "npcs/tetsuo.json", "state": "start", "facing": "left" },
    168         "kaneda": { "type": "Kaneda", "level": "geisha_room", "pos": [10, 3], "dsm": "npcs/kaneda.json", "state": "start", "facing": "left", "present": true },
     168        "kaneda": { "type": "Kaneda", "level": "geisha_room", "pos": [10, 3], "dsm": "npcs/kaneda.json", "state": "start", "facing": "left", "present": false },
    169169        "kumiko": { "type": "Kumiko", "level": "geisha_room", "pos": [11, 13], "dsm": "npcs/kumiko.json", "state": "start" },
    170170        "maneki": { "type": "Maneki", "level": "market", "pos": [35, 6], "dsm": "npcs/maneki.json", "state": "start" },
  • skaapsteker/sprites/npcs.py

    r549 r550  
    6666        super(Kaneda, self).setup(name, world, dsm, state, facing)
    6767
     68    def player_action(self, player):
     69        if not self._me.present:
     70            return
     71        super(Kaneda, self).player_action(player)
     72
    6873    def update(self):
    69         if not self._me.present:
     74        if not self._me.present and self.alive:
     75            self._all_groups = self.groups()
    7076            self.remove()
     77        if self._me.present and not self.alive:
     78            self.add(*self._all_groups)
    7179        super(Kaneda, self).update()
    7280
     
    8997class Kumiko(NPC):
    9098    image_dir = 'sprites/geisha'
     99
     100    animation_regexes = [
     101        ("standing", r"^.*_01.png$"),
     102    ]
    91103
    92104
Note: See TracChangeset for help on using the changeset viewer.