X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=plomrogue%2Ftasks.py;h=b408ea49636b582a3dcbe8fd505faa196270fe99;hb=71479a362ed07ab792833f1378b0206d4ba68117;hp=6a886496658f4c228e33563fb6958a09c8efe4cc;hpb=eadcddf7699d5df683d544531b441332d79b6661;p=plomrogue2 diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py index 6a88649..b408ea4 100644 --- a/plomrogue/tasks.py +++ b/plomrogue/tasks.py @@ -34,18 +34,42 @@ class Task_MOVE(Task): def check(self): 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]] != '.': + 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') + self.thing.try_to_sit() + 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 + if self.thing.carrying.type_ == 'Crate': + for t in self.thing.carrying.content: + t.position = self.thing.position @@ -61,7 +85,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') @@ -77,8 +101,8 @@ class Task_FLATTEN_SURROUNDINGS(Task): self.thing.position).values()): 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.record_fov_change(yxyx) + self.thing.game.maps[yxyx[0]][yxyx[1]] = self.thing.game.get_flatland() + self.thing.game.record_change(yxyx, 'fov') @@ -110,6 +134,12 @@ class Task_PICK_UP(Task): to_pick_up.position = self.thing.position[:] self.thing.carrying = to_pick_up to_pick_up.carried = True + for t in [t for t in self.thing.game.things + if t.type_ == 'Crate' and to_pick_up in t.content]: + t.remove_from_crate(to_pick_up) + self.thing.send_msg('CHAT "You take the item out of the crate."') + break + self.thing.game.record_change(self.thing.position, 'other') @@ -120,44 +150,89 @@ class Task_DROP(Task): if not self.thing.carrying: raise PlayError('nothing to drop') target_position = self._get_move_target() - if self.thing.carrying.type_ == 'Bottle' and self.thing.carrying.full: - for t in [t for t in self.thing.game.things - if t.type_ == 'BottleDeposit' - and t.position == target_position]: - raise PlayError('cannot drop full bottle into bottle deposit') + targets = [t for t in self.thing.game.things + if t.position == target_position + and not t == self.thing.carrying] + for target in targets: + if target.type_ == 'CookieSpawner' and\ + not self.thing.carrying.cookable: + raise PlayError('cannot cook items of this type') + elif target.type_ == 'BottleDeposit': + if not self.thing.carrying.type_ == 'Bottle': + raise PlayError('cannot only put bottle into bottle deposit') + if self.thing.carrying.full: + raise PlayError('cannot drop full ' + 'bottle into bottle deposit') + elif target.type_ == 'Crate' and\ + self.thing.carrying.type_ == 'Crate': + raise PlayError('cannot put crate into crate') def do(self): target_position = self._get_move_target() dropped = self.thing.uncarry() dropped.position = target_position - if dropped.type_ == 'Bottle' and not dropped.full: - for t in [t for t in self.thing.game.things - if t.type_ == 'BottleDeposit' - and t.position == dropped.position]: - t.accept() + if dropped.type_ == 'Crate': + for item in dropped.content: + item.position = target_position + targets = [t for t in self.thing.game.things + if t.position == dropped.position and not t == dropped] + for target in targets: + if target.type_ == 'CookieSpawner': + target.accept(dropped) self.thing.game.remove_thing(dropped) break - elif dropped.type_ == 'Hat': - for t in [t for t in self.thing.game.things - if t.type_ == 'HatRemixer' - and t.position == dropped.position]: + elif target.type_ == 'BottleDeposit': + target.accept() + self.thing.game.remove_thing(dropped) + break + elif target.type_ == 'Crate': + target.accept(dropped) + self.thing.send_msg('CHAT "You put the item into the crate."') + break + elif target.type_ == 'HatRemixer': t.accept(dropped) break + 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') + if len([d for d in reachable_doors if not d.portable]) == 0: + raise PlayError('can only open/close doors that are installed') + 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') @@ -165,19 +240,38 @@ 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_ != 'Bottle': - raise PlayError('cannot drink from non-bottle') - if not self.thing.carrying.full: + raise PlayError('carrying nothing to consume') + if not self.thing.carrying.consumable: + raise PlayError('cannot consume this kind of thing') + if self.thing.carrying.type_ == 'Bottle' and\ + not self.thing.carrying.full: raise PlayError('bottle is empty') def do(self): - 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.drunk = 10000 - self.thing.invalidate_map_view() + if self.thing.carrying.type_ == 'Bottle': + self.thing.carrying.full = False + self.thing.carrying.empty() + self.thing.send_msg('CHAT "You are drunk now."') + self.thing.need_for_toilet += 1 + self.thing.drunk += 100000 + self.thing.invalidate('fov') + self.thing.game.record_change(self.thing.position, 'other') + elif self.thing.carrying.type_ == 'Psychedelic': + self.thing.tripping += 100000 + 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 that grants the ability to draw the following character: "%s"' % self.thing.carrying.thing_char)) + self.thing.add_cookie_char(self.thing.carrying.thing_char) + eaten = self.thing.uncarry() + self.thing.game.remove_thing(eaten) + elif self.thing.carrying.type_ == 'Stimulant': + self.thing.send_msg('CHAT "You feel a flash of energy."') + self.thing.energy += 50 + eaten = self.thing.uncarry() + self.thing.game.remove_thing(eaten) @@ -198,6 +292,7 @@ class Task_COMMAND(Task): class Task_INSTALL(Task): + argtypes = 'string' def _get_uninstallables(self): return [t for t in self.thing.game.things @@ -207,6 +302,9 @@ class Task_INSTALL(Task): and t.position == self.thing.position] def check(self): + if not self.thing.game.can_do_tile_with_pw(*self.thing.position, + self.args[0]): + raise GameError('wrong password for tile') if self.thing.carrying: if not hasattr(self.thing.carrying, 'installable')\ or not self.thing.carrying.installable: @@ -222,6 +320,7 @@ class Task_INSTALL(Task): else: self._get_uninstallables()[0].uninstall() self.thing.send_msg('CHAT "You uninstall the thing here."') + self.thing.game.record_change(self.thing.position, 'other') @@ -257,8 +356,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."') - self.thing.game.remove_thing(self.thing.carrying) - self.thing.carrying = None + dropped = self.thing.uncarry() + self.thing.game.remove_thing(dropped) + self.thing.game.record_change(self.thing.position, 'other') @@ -272,3 +372,13 @@ class Task_SPIN(Task): def do(self): self.thing.carrying.spin() + self.thing.send_msg('CHAT "You spin this object."') + + + +class Task_DANCE(Task): + + def do(self): + self.thing.send_msg('CHAT "You dance."') + self.thing.dancing += 10 + self.thing.game.changed = True