X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/decks/%7B%7Bdeck_id%7D%7D/cards/%7B%7Bcard_id%7D%7D/form?a=blobdiff_plain;f=plomrogue%2Ftasks.py;h=841a0e663d0f343542dd7e0dd96476f37a5151e3;hb=0f7053c69a136af83d0517aa1241caa5b9c0268c;hp=9447cc6eecb2b8eb9135ec702a3426bdf8ad451e;hpb=497f9b478cdaf0ad1825d95d612caab33ba7c403;p=plomrogue2

diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index 9447cc6..841a0e6 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
@@ -111,29 +114,33 @@ class Task_PICK_UP(Task):
 
 
 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):
+        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(dropped)
                 break
         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]:
+                      and t.position == dropped.position]:
                 t.accept(dropped)
                 break
 
@@ -184,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))
@@ -228,8 +234,8 @@ class Task_WEAR(Task):
             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')
+        if self.thing.carrying.type_ not in {'Hat', 'Bottle'}:
+            raise PlayError('can not wear the kind of thing you hold')
 
     def do(self):
         if self.thing.name in self.thing.game.hats:
@@ -243,8 +249,27 @@ 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
+            if self.thing.carrying.type_ == 'Bottle':
+                self.thing.send_msg('CHAT "Your attempt to wear a bottle on '
+                                    'your head fails."')
+                self.thing.carrying.sound('BOTTLE', 'SMASH')
+            elif self.thing.carrying.type_ == 'Hat':
+                self.thing.game.hats[self.thing.name] =\
+                    self.thing.carrying.design
+                self.thing.send_msg('CHAT "You put on a hat."')
             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()
+        self.thing.send_msg('CHAT "You spin this object."')