X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=new%2Fplomrogue%2Ftasks.py;h=1be5b6da40b2c757fccd08541fbea6002f6809aa;hb=65e83c99b95a619afc79e8984e6f5027bc7aac1b;hp=58ee46d616925d50c678aa1a0030b5f5d4fa4fa4;hpb=599f48bd1d9270cf154e885cf276adb05727507a;p=plomrogue2-experiments

diff --git a/new/plomrogue/tasks.py b/new/plomrogue/tasks.py
index 58ee46d..1be5b6d 100644
--- a/new/plomrogue/tasks.py
+++ b/new/plomrogue/tasks.py
@@ -48,7 +48,7 @@ class Task_MOVE(Task):
                                                          self.args[0])
         for id_ in self.thing.inventory:
             t = self.thing.world.get_thing(id_)
-            t.position[:] = self.thing.position
+            t.position = self.thing.position
 
 
 
@@ -58,11 +58,10 @@ class Task_PICKUP(Task):
     def check(self):
         to_pick_up = self.thing.world.get_thing(self.args[0],
                                                 create_unfound=False)
-        if to_pick_up is None:
-            raise GameError('no thing of ID %s to pick up' % self.args[0])
-        if not (self.thing.position == to_pick_up.position or
-                tuple(to_pick_up.position) in
-                self.thing.world.map_.get_neighbors(self.thing.position)):
+        if to_pick_up is None or \
+           to_pick_up.in_inventory or \
+           to_pick_up == self.thing or \
+           self.thing.position != to_pick_up.position:
             raise GameError('thing of ID %s not in reach to pick up'
                             % self.args[0])
 
@@ -77,11 +76,10 @@ class Task_DROP(Task):
     argtypes = 'int:nonneg'
 
     def check(self):
-        to_pick_up = self.thing.world.get_thing(self.args[0],
-                                                create_unfound=False)
-        if to_pick_up is None:
+        to_drop = self.thing.world.get_thing(self.args[0], create_unfound=False)
+        if to_drop is None:
             raise GameError('no thing of ID %s to drop' % self.args[0])
-        if to_pick_up.id_ not in self.thing.inventory:
+        if to_drop.id_ not in self.thing.inventory:
             raise GameError('no thing of ID %s to drop in inventory'
                             % self.args[0])