Disallow picking up thing already carried by other player.

[plomrogue2] / plomrogue / tasks.py

diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index edfc3d10efddbd1fc4a9d95031b3fd8ea4101aca..9447cc6eecb2b8eb9135ec702a3426bdf8ad451e 100644 (file)
--- a/plomrogue/tasks.py
+++ b/plomrogue/tasks.py
@@ -38,10 +38,11 @@ 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
-        self.thing.game.changed_fovs = True
 
 
 
@@ -57,7 +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.changed_fovs = True
+        self.thing.game.record_fov_change((big_yx, little_yx))
 
 
 
@@ -74,7 +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.changed_fovs = True
+            self.thing.game.record_fov_change(yxyx)
 
 
 
@@ -94,6 +95,8 @@ class Task_PICK_UP(Task):
             raise PlayError('cannot pick up oneself')
         elif to_pick_up.type_ == 'Player':
             raise PlayError('cannot pick up player')
+        elif to_pick_up.carried:
+            raise PlayError('thing already carried by a player')
         elif to_pick_up.position not in reach:
             raise PlayError('thing not in reach')
         elif not to_pick_up.portable:
@@ -103,7 +106,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
+        to_pick_up.carried = True
 
 
 
@@ -119,28 +122,26 @@ class Task_DROP(Task):
                 raise PlayError('cannot drop full bottle into bottle deposit')
 
     def do(self):
-        if self.thing.carrying.type_ == 'Bottle' and not self.thing.carrying.full:
+        dropped = self.thing.uncarry()
+        if dropped.type_ == 'Bottle' and not dropped.full:
             for t in [t for t in self.thing.game.things
                       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(dropped)
                 break
-        elif self.thing.carrying.type_ == 'Hat':
+        elif dropped.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)
+                t.accept(dropped)
                 break
-        self.thing.carrying = None
-        #self.thing.game.changed_fovs = True
 
 
 
 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
@@ -149,7 +150,7 @@ class Task_DOOR(Task):
                 t.open()
             else:
                 t.close()
-        self.thing.game.changed_fovs = True
+            self.thing.game.record_fov_change(t.position)
 
 
 
@@ -169,7 +170,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
+        self.thing.invalidate_map_view()
 
 
 
@@ -209,8 +210,8 @@ class Task_INSTALL(Task):
 
     def do(self):
         if self.thing.carrying:
-            self.thing.carrying.install()
-            self.thing.carrying = None
+            t = self.thing.uncarry()
+            t.install()
             self.thing.send_msg('CHAT "You install the thing you carry."')
         else:
             self._get_uninstallables()[0].uninstall()
@@ -232,9 +233,7 @@ 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."')
@@ -246,6 +245,6 @@ class Task_WEAR(Task):
         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."')