X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=plomrogue%2Ftasks.py;h=1e6737b64671188b967e42210a6fda8f73b7e3c9;hb=52b01fc00d6ea2c053f9022981498b97ebd05839;hp=c7b35bd00b76bfa6ee0f3695f098c5e71b758fa3;hpb=3484a01e592bafc9d573b878ff94ef5e64755476;p=plomrogue2

diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index c7b35bd..1e6737b 100644
--- a/plomrogue/tasks.py
+++ b/plomrogue/tasks.py
@@ -1,4 +1,5 @@
 from plomrogue.errors import PlayError, GameError
+from plomrogue.misc import quote
 
 
 
@@ -10,6 +11,12 @@ class Task:
         self.thing = thing
         self.args = args
 
+    def _get_move_target(self):
+        if self.args[0] == 'HERE':
+            return self.thing.position
+        return self.thing.game.map_geometry.move_yxyx(self.thing.position,
+                                                      self.args[0])
+
     def check(self):
         pass
 
@@ -25,12 +32,8 @@ class Task_WAIT(Task):
 class Task_MOVE(Task):
     argtypes = 'string:direction'
 
-    def get_move_target(self):
-        return self.thing.game.map_geometry.move_yxyx(self.thing.position,
-                                                      self.args[0])
-
     def check(self):
-        test_yxyx = self.get_move_target()
+        test_yxyx = self._get_move_target()
         if test_yxyx in [t.position for t in self.thing.game.things
                          if t.blocking]:
             raise PlayError('blocked by other thing')
@@ -39,7 +42,7 @@ class Task_MOVE(Task):
 
     def do(self):
         self.thing.game.record_fov_change(self.thing.position)
-        self.thing.position = self.get_move_target()
+        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
@@ -95,6 +98,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:
@@ -104,35 +109,40 @@ 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
+        to_pick_up.carried = True
 
 
 
 class Task_DROP(Task):
+    argtypes = 'string:direction+here'
 
     def check(self):
         if not self.thing.carrying:
             raise PlayError('nothing to drop')
+        target_position = self._get_move_target()
         if self.thing.carrying.type_ == 'Bottle' and self.thing.carrying.full:
             for t in [t for t in self.thing.game.things
                       if t.type_ == 'BottleDeposit'
-                      and t.position == self.thing.position]:
+                      and t.position == target_position]:
                 raise PlayError('cannot drop full bottle into bottle deposit')
 
     def do(self):
-        if self.thing.carrying.type_ == 'Bottle' and not self.thing.carrying.full:
+        target_position = self._get_move_target()
+        dropped = self.thing.uncarry()
+        dropped.position = target_position
+        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]:
+                      and t.position == dropped.position]:
                 t.accept()
-                self.thing.game.remove_thing(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)
+                      and t.position == dropped.position]:
+                t.accept(dropped)
                 break
-        self.thing.carrying = None
 
 
 
@@ -181,7 +191,6 @@ class Task_COMMAND(Task):
             raise PlayError('cannot command this item type')
 
     def do(self):
-        from plomrogue.misc import quote
         reply_lines = self.thing.carrying.interpret(self.args[0])
         for line in reply_lines:
             self.thing.send_msg('REPLY ' + quote(line))
@@ -207,8 +216,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()
@@ -240,8 +249,20 @@ class Task_WEAR(Task):
                 remixer.accept(t)
                 break
         else:
-            from plomrogue.misc import quote
             self.thing.game.hats[self.thing.name] = self.thing.carrying.design
             self.thing.game.remove_thing(self.thing.carrying)
             self.thing.carrying = None
             self.thing.send_msg('CHAT "You put on a hat."')
+
+
+
+class Task_SPIN(Task):
+
+    def check(self):
+        if not self.thing.carrying:
+            raise PlayError('holding nothing to spin')
+        if not hasattr(self.thing.carrying, 'spinnable'):
+            raise PlayError('held object not spinnable')
+
+    def do(self):
+        self.thing.carrying.spin()