X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=plomrogue%2Ftasks.py;h=4f390d47c92a88fbb1782944f623b3c44012d846;hb=a1dff58317110c212b5493e3d1432b06d5058e10;hp=2312ab4f6e0b268fa32254c9b5815e713623887c;hpb=bf8653594beb9ee94b8e7c4139b2891425a6367b;p=plomrogue2 diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py index 2312ab4..4f390d4 100644 --- a/plomrogue/tasks.py +++ b/plomrogue/tasks.py @@ -1,4 +1,5 @@ from plomrogue.errors import PlayError, GameError +from plomrogue.misc import quote @@ -10,6 +11,12 @@ class Task: self.thing = thing self.args = args + def _get_move_target(self): + if self.args[0] == 'HERE': + return self.thing.position + return self.thing.game.map_geometry.move_yxyx(self.thing.position, + self.args[0]) + def check(self): pass @@ -25,20 +32,24 @@ class Task_WAIT(Task): class Task_MOVE(Task): argtypes = 'string:direction' - def get_move_target(self): - return self.thing.game.map_geometry.move_yxyx(self.thing.position, - self.args[0]) - def check(self): - test_yxyx = self.get_move_target() + 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.position = self.get_move_target() + 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_change(self.thing.position, 'other') + 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 @@ -56,6 +67,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_change((big_yx, little_yx), 'fov') @@ -71,7 +83,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.maps[yxyx[0]][yxyx[1]] = self.thing.game.get_flatland() + self.thing.game.record_change(yxyx, 'fov') @@ -91,6 +104,8 @@ class Task_PICK_UP(Task): raise PlayError('cannot pick up oneself') elif to_pick_up.type_ == 'Player': raise PlayError('cannot pick up player') + elif to_pick_up.carried: + raise PlayError('thing already carried by a player') elif to_pick_up.position not in reach: raise PlayError('thing not in reach') elif not to_pick_up.portable: @@ -100,50 +115,67 @@ class Task_PICK_UP(Task): to_pick_up = self.thing.game.get_thing(self.args[0]) to_pick_up.position = self.thing.position[:] self.thing.carrying = to_pick_up + to_pick_up.carried = True + self.thing.game.record_change(self.thing.position, 'other') class Task_DROP(Task): + argtypes = 'string:direction+here' def check(self): 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 == self.thing.position]: + and t.position == target_position]: raise PlayError('cannot drop full bottle into bottle deposit') def do(self): - if self.thing.carrying.type_ == 'Bottle' and not self.thing.carrying.full: + target_position = self._get_move_target() + dropped = self.thing.uncarry() + dropped.position = target_position + over_cookie_spawner = None + for t in [t for t in self.thing.game.things + if t.type_ == 'CookieSpawner' + and t.position == dropped.position]: + over_cookie_spawner = t + break + if over_cookie_spawner: + over_cookie_spawner.accept(dropped) + self.thing.game.remove_thing(dropped) + elif 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 == self.thing.position]: + and t.position == dropped.position]: t.accept() - self.thing.game.things.remove(self.thing.carrying) + self.thing.game.remove_thing(dropped) break - elif self.thing.carrying.type_ == 'Hat': + elif dropped.type_ == 'Hat': for t in [t for t in self.thing.game.things if t.type_ == 'HatRemixer' - and t.position == self.thing.position]: - t.accept(self.thing.carrying) + and t.position == dropped.position]: + t.accept(dropped) break - self.thing.carrying = None + self.thing.game.record_change(self.thing.position, 'other') class Task_DOOR(Task): def do(self): - self.thing.carrying = None 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_change(t.position, 'other') + self.thing.game.record_change(t.position, 'fov') @@ -151,18 +183,33 @@ 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 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: 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 + 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 += 10000 + self.thing.drunk = 10000 + 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) + eaten = self.thing.uncarry() + self.thing.game.remove_thing(eaten) @@ -176,7 +223,6 @@ class Task_COMMAND(Task): raise PlayError('cannot command this item type') def do(self): - from plomrogue.misc import quote reply_lines = self.thing.carrying.interpret(self.args[0]) for line in reply_lines: self.thing.send_msg('REPLY ' + quote(line)) @@ -184,6 +230,7 @@ class Task_COMMAND(Task): class Task_INSTALL(Task): + argtypes = 'string' def _get_uninstallables(self): return [t for t in self.thing.game.things @@ -193,6 +240,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: @@ -202,12 +252,13 @@ class Task_INSTALL(Task): def do(self): if self.thing.carrying: - self.thing.carrying.install() - self.thing.carrying = None + t = self.thing.uncarry() + t.install() self.thing.send_msg('CHAT "You install the thing you carry."') 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') @@ -220,24 +271,43 @@ class Task_WEAR(Task): raise PlayError('carrying nothing to wear') if self.thing.name in self.thing.game.hats: raise PlayError('already wearing a hat') - if self.thing.carrying.type_ != 'Hat': - raise PlayError('can only wear a hat') + if self.thing.carrying.type_ not in {'Hat', 'Bottle'}: + raise PlayError('can not wear the kind of thing you hold') def do(self): if self.thing.name in self.thing.game.hats: - t = self.thing.game.thing_types['Hat'](self.thing.game, - position=self.thing.position) - self.thing.game.things += [t] + t = self.thing.game.add_thing('Hat', self.thing.position) t.design = self.thing.game.hats[self.thing.name] del self.thing.game.hats[self.thing.name] self.thing.send_msg('CHAT "You drop your hat."') - for t in [t for t in self.thing.game.things - if t.type_ == 'HatRemixer' - and t.position == self.thing.position]: - t.accept(t) + for remixer in [t for t in self.thing.game.things + if t.type_ == 'HatRemixer' + and t.position == self.thing.position]: + remixer.accept(t) break else: - self.thing.game.hats[self.thing.name] = self.thing.carrying.design - self.thing.game.things.remove(self.thing.carrying) - self.thing.carrying = None - self.thing.send_msg('CHAT "You put on a hat."') + if self.thing.carrying.type_ == 'Bottle': + self.thing.send_msg('CHAT "Your attempt to wear a bottle on ' + 'your head fails."') + self.thing.carrying.sound('BOTTLE', 'SMASH') + elif self.thing.carrying.type_ == 'Hat': + self.thing.game.hats[self.thing.name] =\ + self.thing.carrying.design + self.thing.send_msg('CHAT "You put on a hat."') + dropped = self.thing.uncarry() + self.thing.game.remove_thing(dropped) + self.thing.game.record_change(self.thing.position, 'other') + + + +class Task_SPIN(Task): + + def check(self): + if not self.thing.carrying: + raise PlayError('holding nothing to spin') + if not hasattr(self.thing.carrying, 'spinnable'): + raise PlayError('held object not spinnable') + + def do(self): + self.thing.carrying.spin() + self.thing.send_msg('CHAT "You spin this object."')