Make thing dropping directional.

[plomrogue2] / plomrogue / tasks.py

diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index 9447cc6eecb2b8eb9135ec702a3426bdf8ad451e..d8d118a78108eb9fce1cad108816ac8509c8dd94 100644 (file)
--- a/plomrogue/tasks.py
+++ b/plomrogue/tasks.py
@@ -10,6 +10,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 +31,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 +41,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 +113,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