X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/edit?a=blobdiff_plain;f=plomrogue%2Ftasks.py;h=a5407f345867a7c5f8ad8cc2c632cdbc411d4cbc;hb=8d0b5840b7df40ee883fdcf2fa1b4cd1d39e26fa;hp=f3945c2a36366ea7b9a370a8e35a0772ed1490c8;hpb=ea5ddf2c37571f3fb0ed486cd4a4294b82c54b54;p=plomrogue2 diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py index f3945c2..a5407f3 100644 --- a/plomrogue/tasks.py +++ b/plomrogue/tasks.py @@ -38,7 +38,9 @@ class Task_MOVE(Task): raise PlayError('blocked by impassable tile') def do(self): + self.thing.game.record_fov_change(self.thing.position) self.thing.position = self.get_move_target() + self.thing.game.record_fov_change(self.thing.position) if self.thing.carrying: self.thing.carrying.position = self.thing.position @@ -56,6 +58,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)) @@ -72,6 +75,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.record_fov_change(yxyx) @@ -120,7 +124,13 @@ class Task_DROP(Task): if t.type_ == 'BottleDeposit' and t.position == self.thing.position]: t.accept() - self.thing.game.things.remove(self.thing.carrying) + self.thing.game.remove_thing(self.thing.carrying) + break + elif self.thing.carrying.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) break self.thing.carrying = None @@ -138,6 +148,7 @@ class Task_DOOR(Task): t.open() else: t.close() + self.thing.game.record_fov_change(t.position) @@ -157,6 +168,7 @@ class Task_INTOXICATE(Task): self.thing.send_msg('RANDOM_COLORS') self.thing.send_msg('CHAT "You are drunk now."') self.thing.drunk = 10000 + self.thing.invalidate_map_view() @@ -198,5 +210,39 @@ class Task_INSTALL(Task): if self.thing.carrying: self.thing.carrying.install() self.thing.carrying = None + 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."') + + + +class Task_WEAR(Task): + + def check(self): + if self.thing.name in self.thing.game.hats: + return + if not self.thing.carrying: + 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') + + def do(self): + if self.thing.name in self.thing.game.hats: + 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 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: + from plomrogue.misc import quote + self.thing.game.hats[self.thing.name] = self.thing.carrying.design + self.thing.game.remove_thing(self.thing.carrying) + self.thing.carrying = None + self.thing.send_msg('CHAT "You put on a hat."')