X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomrogue%2Ftasks.py;h=08a4a4f58119d2818a89a18a5b5e2577f230b945;hb=856b68988876a63409737dac77b4d4921b9a466b;hp=9fccbc33450f2c50fe5caf6269d0ba171bc7e644;hpb=ed297e4e19f8a83872d6345b86321e10aec019d4;p=plomrogue2

diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index 9fccbc3..08a4a4f 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
 
 
 
@@ -120,7 +123,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 +147,7 @@ class Task_DOOR(Task):
                 t.open()
             else:
                 t.close()
+        self.thing.game.changed_fovs = True
 
 
 
@@ -157,6 +167,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
 
 
 
@@ -219,12 +230,18 @@ class Task_WEAR(Task):
 
     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 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."')