X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=plomrogue%2Ftasks.py;h=9b53bbe86f98fdc0efe08cede71c0870fb3e3d17;hb=ce80e43db5939580763b1f66bff4f87f1cccc383;hp=4cf8700b1f5b93473fabb70c3acedf471167667d;hpb=1101707a5518de54204fb2f856bdc540ae622991;p=plomrogue2 diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py index 4cf8700..9b53bbe 100644 --- a/plomrogue/tasks.py +++ b/plomrogue/tasks.py @@ -67,7 +67,8 @@ class Task_MOVE(Task): terrain_type = self.thing.game.terrains[terrain] if 'sittable' in terrain_type.tags: self.thing.standing = False - self.thing.send_msg('CHAT "You sink into the %s."' + self.thing.send_msg('CHAT "You sink into the %s.' + 'Staying here will reduce your weariness."' % terrain_type.description) self.thing.invalidate('fov') if self.thing.blocks_light: @@ -154,6 +155,12 @@ class Task_DROP(Task): if t.type_ == 'BottleDeposit' and t.position == target_position]: raise PlayError('cannot drop full bottle into bottle deposit') + for t in [t for t in self.thing.game.things + if t.type_ == 'CookieSpawner' + and t.position == target_position]: + if not self.thing.carrying.cookable: + raise PlayError('cannot cook items of this type') + break def do(self): target_position = self._get_move_target() @@ -190,9 +197,19 @@ 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: + reachable_doors = [t for t in self.thing.game.things if + t.type_ == 'Door' and t.position in action_radius] + if len(reachable_doors) == 0: raise PlayError('not standing next to a door to open/close') + for door in reachable_doors: + if not door.blocks_movement: + return + if not door.locked: + return + if self.thing.carrying and self.thing.carrying.type_ == 'DoorKey'\ + and self.thing.carrying.door == door: + return + raise PlayError('cannot open locked door without its key') def do(self): action_radius = list(self.thing.game.map_geometry. @@ -203,6 +220,11 @@ class Task_DOOR(Task): t.open() else: t.close() + if self.thing.carrying and\ + self.thing.carrying.type_ == 'DoorKey' and\ + self.thing.carrying.door == t: + self.thing.send_msg('CHAT "You lock the door."') + t.lock() self.thing.game.record_change(t.position, 'other') self.thing.game.record_change(t.position, 'fov') @@ -224,7 +246,7 @@ class Task_INTOXICATE(Task): self.thing.carrying.full = False self.thing.carrying.empty() self.thing.send_msg('CHAT "You are drunk now."') - self.thing.need_for_toilet += 10000 + self.thing.need_for_toilet += 1 self.thing.drunk = 10000 self.thing.invalidate('fov') self.thing.game.record_change(self.thing.position, 'other')