X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=plomrogue%2Ftasks.py;h=6ee273164f19dd33422c99c21d708f71cab21dc8;hb=5cd44408532e23648ddcd1d59004a9dae59694af;hp=4a6df1641202d75ca66f7f1a057d779774f155f9;hpb=aab94ffb12aa0dedc240d7b29001699b95c49249;p=plomrogue2 diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py index 4a6df16..6ee2731 100644 --- a/plomrogue/tasks.py +++ b/plomrogue/tasks.py @@ -36,15 +36,42 @@ class Task_MOVE(Task): test_yxyx = self._get_move_target() move_blockers = self.thing.game.get_movement_blockers() if test_yxyx in [t.position for t in self.thing.game.things - if t.blocking]: + if t.blocks_movement]: raise PlayError('blocked by other thing') elif self.thing.game.maps[test_yxyx[0]][test_yxyx[1]] in move_blockers: raise PlayError('blocked by impassable tile') def do(self): - self.thing.game.record_fov_change(self.thing.position) + if self.thing.type_ == 'Player' and not self.thing.standing: + self.thing.standing = True + self.thing.send_msg('CHAT "You get up."') + self.thing.game.record_change(self.thing.position, 'other') + if self.thing.blocks_light: + self.thing.game.record_change(self.thing.position, 'fov') self.thing.position = self._get_move_target() - self.thing.game.record_fov_change(self.thing.position) + 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]] + if terrain in self.thing.game.terrains: + 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."' + % terrain_type.description) + self.thing.invalidate('fov') + if self.thing.blocks_light: + self.thing.game.record_change(self.thing.position, 'fov') if self.thing.carrying: self.thing.carrying.position = self.thing.position @@ -62,7 +89,7 @@ class Task_WRITE(Task): big_yx = self.thing.position[0] little_yx = self.thing.position[1] self.thing.game.maps[big_yx][little_yx] = self.args[0] - self.thing.game.record_fov_change((big_yx, little_yx)) + self.thing.game.record_change((big_yx, little_yx), 'fov') @@ -79,7 +106,7 @@ class Task_FLATTEN_SURROUNDINGS(Task): if not self.thing.game.can_do_tile_with_pw(*yxyx, self.args[0]): continue self.thing.game.maps[yxyx[0]][yxyx[1]] = self.thing.game.get_flatland() - self.thing.game.record_fov_change(yxyx) + self.thing.game.record_change(yxyx, 'fov') @@ -111,8 +138,7 @@ class Task_PICK_UP(Task): to_pick_up.position = self.thing.position[:] self.thing.carrying = to_pick_up to_pick_up.carried = True - # FIXME: pseudo-FOV-change actually - self.thing.game.record_fov_change(self.thing.position) + self.thing.game.record_change(self.thing.position, 'other') @@ -155,23 +181,45 @@ class Task_DROP(Task): and t.position == dropped.position]: t.accept(dropped) break - # FIXME: pseudo-FOV-change actually - self.thing.game.record_fov_change(self.thing.position) + self.thing.game.record_change(self.thing.position, 'other') class Task_DOOR(Task): + def check(self): + action_radius = list(self.thing.game.map_geometry. + get_neighbors_yxyx(self.thing.position).values()) + 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. get_neighbors_yxyx(self.thing.position).values()) for t in [t for t in self.thing.game.things if t.type_ == 'Door' and t.position in action_radius]: - if t.blocking: + if t.blocks_movement: t.open() else: t.close() - self.thing.game.record_fov_change(t.position) + 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') @@ -179,8 +227,8 @@ class Task_INTOXICATE(Task): def check(self): if self.thing.carrying is None: - raise PlayError('carrying nothing to drink from') - if self.thing.carrying.type_ not in {'Bottle', 'Cookie'}: + raise PlayError('carrying nothing to consume') + if self.thing.carrying.type_ not in {'Bottle', 'Cookie', 'Psychedelic'}: raise PlayError('cannot consume this kind of thing') if self.thing.carrying.type_ == 'Bottle' and\ not self.thing.carrying.full: @@ -190,11 +238,17 @@ class Task_INTOXICATE(Task): if self.thing.carrying.type_ == 'Bottle': self.thing.carrying.full = False self.thing.carrying.empty() - self.thing.send_msg('RANDOM_COLORS') self.thing.send_msg('CHAT "You are drunk now."') + self.thing.need_for_toilet += 10000 self.thing.drunk = 10000 - # FIXME: pseudo-FOV-change actually - self.thing.game.record_fov_change(self.thing.position) + self.thing.invalidate('fov') + self.thing.game.record_change(self.thing.position, 'other') + elif self.thing.carrying.type_ == 'Psychedelic': + self.thing.tripping = 10000 + self.thing.send_msg('CHAT "You start tripping."') + self.thing.send_msg('RANDOM_COLORS') + eaten = self.thing.uncarry() + self.thing.game.remove_thing(eaten) elif self.thing.carrying.type_ == 'Cookie': self.thing.send_msg('CHAT ' + quote('You eat a cookie and gain the ability to draw the following character: "%s"' % self.thing.carrying.thing_char)) self.thing.add_cookie_char(self.thing.carrying.thing_char) @@ -248,8 +302,7 @@ class Task_INSTALL(Task): else: self._get_uninstallables()[0].uninstall() self.thing.send_msg('CHAT "You uninstall the thing here."') - # FIXME: pseudo-FOV-change actually - self.thing.game.record_fov_change(self.thing.position) + self.thing.game.record_change(self.thing.position, 'other') @@ -285,10 +338,9 @@ class Task_WEAR(Task): self.thing.game.hats[self.thing.name] =\ self.thing.carrying.design self.thing.send_msg('CHAT "You put on a hat."') - dropped = self.uncarry() + dropped = self.thing.uncarry() self.thing.game.remove_thing(dropped) - # FIXME: pseudo-FOV-change actually - self.thing.game.record_fov_change(self.thing.position) + self.thing.game.record_change(self.thing.position, 'other')