X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/copy_structured?a=blobdiff_plain;f=plomrogue%2Ftasks.py;h=4cf8700b1f5b93473fabb70c3acedf471167667d;hb=1101707a5518de54204fb2f856bdc540ae622991;hp=de9f1c87d1591820f2a405bf97313866e0c90ab5;hpb=78c02188e008392eddc2e806bacacecc7d8fd94b;p=plomrogue2 diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py index de9f1c8..4cf8700 100644 --- a/plomrogue/tasks.py +++ b/plomrogue/tasks.py @@ -49,6 +49,17 @@ class Task_MOVE(Task): if self.thing.blocks_light: self.thing.game.record_change(self.thing.position, 'fov') self.thing.position = self._get_move_target() + for t in [t for t in self.thing.game.things + if t.type_ == 'Player' and not t == self.thing + and t.position == self.thing.position]: + self.thing.send_msg('CHAT %s' % + quote('You get awkwardly close to %s.' % t.name)) + for c_id in self.thing.game.sessions: + if self.thing.game.sessions[c_id]['thing_id'] == t.id_: + t.send_msg('CHAT %s' % + quote('%s gets awkwardly close to you.' % + self.thing.name)) + break self.thing.game.record_change(self.thing.position, 'other') terrain = \ self.thing.game.maps[self.thing.position[0]][self.thing.position[1]] @@ -176,6 +187,13 @@ class Task_DROP(Task): class Task_DOOR(Task): + def check(self): + action_radius = list(self.thing.game.map_geometry. + get_neighbors_yxyx(self.thing.position).values()) + if len([t for t in self.thing.game.things if + t.type_ == 'Door' and t.position in action_radius]) == 0: + raise PlayError('not standing next to a door to open/close') + def do(self): action_radius = list(self.thing.game.map_geometry. get_neighbors_yxyx(self.thing.position).values())