X-Git-Url: https://plomlompom.com/repos/%7B%7Bdb.prefix%7D%7D/todo?a=blobdiff_plain;f=plomrogue%2Ftasks.py;h=9d3c23e7b69359da3dd9cdcd23a6cf853eb4ebbc;hb=04230c463dc78b92adfe0f1a432117e349aa771e;hp=9fccbc33450f2c50fe5caf6269d0ba171bc7e644;hpb=ed297e4e19f8a83872d6345b86321e10aec019d4;p=plomrogue2 diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py index 9fccbc3..9d3c23e 100644 --- a/plomrogue/tasks.py +++ b/plomrogue/tasks.py @@ -122,6 +122,12 @@ 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 @@ -224,7 +230,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."')