Changeset 546:05d93c10e5ae


Ignore:
Timestamp:
04/09/11 22:44:04 (12 years ago)
Author:
Neil Muller <drnlmuller@…>
Branch:
default
Phase:
public
Rebase:
37303266656166633539353333363336373234626165313563303834643435643666336534663538
Message:

Remove Kaneda after the deal is off

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • data/game.json

    r542 r546  
    163163        "ichiro": { "type": "Ichiro", "level": "road", "pos": [36, 8], "dsm": "npcs/ichiro.json", "state": "start", "block": true, "facing": "right" },
    164164        "sasuke": { "type": "Sasuke", "level": "road", "pos": [54, 8], "dsm": "npcs/sasuke.json", "state": "start", "present": true},
    165         "kaneda2": { "type": "Kaneda", "level": "tea_house", "pos": [6, 10], "dsm": "npcs/kaneda2.json", "state": "start", "facing": "right" },
     165        "kaneda2": { "type": "Kaneda", "level": "tea_house", "pos": [6, 10], "dsm": "npcs/kaneda2.json", "state": "start", "facing": "right", "present": true },
    166166        "tetsuo": { "type": "Tetsuo", "level": "tea_house", "pos": [9, 10], "dsm": "npcs/tetsuo.json", "state": "start", "facing": "left" },
    167         "kaneda": { "type": "Kaneda", "level": "geisha_room", "pos": [10, 3], "dsm": "npcs/kaneda.json", "state": "start", "facing": "left" },
     167        "kaneda": { "type": "Kaneda", "level": "geisha_room", "pos": [10, 3], "dsm": "npcs/kaneda.json", "state": "start", "facing": "left", "present": true },
    168168        "kumiko": { "type": "Kumiko", "level": "geisha_room", "pos": [11, 13], "dsm": "npcs/kumiko.json", "state": "start" },
    169169        "maneki": { "type": "Maneki", "level": "market", "pos": [35, 6], "dsm": "npcs/maneki.json", "state": "start" },
  • data/npcs/kaneda2.json

    r311 r546  
    3434        "on_exit" : "switch_to('tetsuo')"
    3535    },
    36     "gone" : {
     36    "gone" : { "on_entry": "npcs.kaneda2.present = False"
    3737    }
    3838}
  • skaapsteker/sprites/npcs.py

    r544 r546  
    6363                }
    6464
     65    def setup(self, name, world, dsm, state, present, facing=None):
     66        super(Kaneda, self).setup(name, world, dsm, state, facing)
     67
     68    def update(self):
     69        if not self._me.present:
     70            self.remove()
     71        super(Kaneda, self).update()
     72
    6573
    6674class Tetsuo(NPC):
Note: See TracChangeset for help on using the changeset viewer.