Recalc FOVs and their map view results only on relevant changes.

[plomrogue2] / plomrogue / tasks.py

diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index 1204001b4d202ec54ff8a3891d5b13708608045f..edfc3d10efddbd1fc4a9d95031b3fd8ea4101aca 100644 (file)
--- 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
 
 
 
@@ -154,12 +166,10 @@ class Task_INTOXICATE(Task):
     def do(self):
         self.thing.carrying.full = False
         self.thing.carrying.empty()
-        for c_id in self.thing.game.sessions:
-            if self.thing.game.sessions[c_id]['thing_id'] == self.thing.id_:
-                self.thing.game.io.send('RANDOM_COLORS', c_id)
-                self.thing.game.io.send('CHAT "You are drunk now."', c_id)
-                break
+        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
 
 
 
@@ -174,10 +184,9 @@ class Task_COMMAND(Task):
 
     def do(self):
         from plomrogue.misc import quote
-        reply = self.thing.carrying.interpret(self.args[0])
-        for c_id in self.thing.game.sessions:
-            if self.thing.game.sessions[c_id]['thing_id'] == self.thing.id_:
-                self.thing.game.io.send('REPLY ' + quote(reply), c_id)
+        reply_lines = self.thing.carrying.interpret(self.args[0])
+        for line in reply_lines:
+            self.thing.send_msg('REPLY ' + quote(line))
 
 
 
@@ -202,5 +211,41 @@ 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.thing_types['Hat'](self.thing.game,
+                                                   position=self.thing.position)
+            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."')