Changeset 461:c6d1165bb16f


Ignore:
Timestamp:
04/09/11 18:43:29 (12 years ago)
Author:
Neil Muller <drnlmuller@…>
Branch:
default
Phase:
public
Rebase:
30666538383839343638653632663164323534613963316465326463666638303638663066656639
Message:

Can talk your way past the guard

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • data/npcs/guard.json

    r292 r461  
    7070    },
    7171    "agreed" : {
     72       "on_entry" : "npcs.guard.block = False"
    7273    }
    7374}
  • skaapsteker/sprites/base.py

    r460 r461  
    277277        self.name = name
    278278        self.dsm = dialogue.DSM(name, world, dsm, state)
     279        self._me = getattr(world.npcs, self.name)
    279280
    280281    def player_action(self, player):
  • skaapsteker/sprites/npcs.py

    r460 r461  
    1212    image_dir = 'sprites/guard'
    1313
     14    def update(self):
     15        if not self._me.block and self.block:
     16            self.collides_with = set([])
     17            self.block = False
     18        super(Guard, self).update()
    1419
    1520
Note: See TracChangeset for help on using the changeset viewer.