X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/decks/%7B%7Bdeck_id%7D%7D/cards/%7B%7Bcard_id%7D%7D/form?a=blobdiff_plain;f=plomrogue%2Ftasks.py;h=edfc3d10efddbd1fc4a9d95031b3fd8ea4101aca;hb=54d8db95b3bb690b712ec09179922829d0c68a54;hp=9fccbc33450f2c50fe5caf6269d0ba171bc7e644;hpb=ed297e4e19f8a83872d6345b86321e10aec019d4;p=plomrogue2 diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py index 9fccbc3..edfc3d1 100644 --- a/plomrogue/tasks.py +++ b/plomrogue/tasks.py @@ -41,6 +41,7 @@ class Task_MOVE(Task): self.thing.position = self.get_move_target() if self.thing.carrying: self.thing.carrying.position = self.thing.position + self.thing.game.changed_fovs = True @@ -56,6 +57,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.changed_fovs = True @@ -72,6 +74,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.changed_fovs = True @@ -100,6 +103,7 @@ 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 + #self.thing.game.changed_fovs = True @@ -122,7 +126,14 @@ class Task_DROP(Task): t.accept() self.thing.game.things.remove(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 + #self.thing.game.changed_fovs = True @@ -138,6 +149,7 @@ class Task_DOOR(Task): t.open() else: t.close() + self.thing.game.changed_fovs = True @@ -157,6 +169,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.game.changed_fovs = True @@ -224,7 +237,15 @@ class Task_WEAR(Task): self.thing.game.things += [t] 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.things.remove(self.thing.carrying) self.thing.carrying = None + self.thing.send_msg('CHAT "You put on a hat."')