Don't uncarry things on dooring.

[plomrogue2] / plomrogue / tasks.py

diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index 2312ab4f6e0b268fa32254c9b5815e713623887c..c7b35bd00b76bfa6ee0f3695f098c5e71b758fa3 100644 (file)
--- 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,7 @@ 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
@@ -135,7 +139,6 @@ class Task_DROP(Task):
 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
@@ -144,6 +147,7 @@ class Task_DOOR(Task):
                 t.open()
             else:
                 t.close()
+            self.thing.game.record_fov_change(t.position)
 
 
 
@@ -163,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.invalidate_map_view()
 
 
 
@@ -225,19 +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 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:
+            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.game.remove_thing(self.thing.carrying)
             self.thing.carrying = None
             self.thing.send_msg('CHAT "You put on a hat."')