X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=new%2Fplomrogue%2Ftasks.py;h=6f2f1be9ee4397630059c35eece39ebd48bda99f;hb=1d7fb343a49306dae505b66c423810fcdd5d7fec;hp=5dc2f82a1db6b206827f2b6a1c23be5daaf8cf2d;hpb=cffcecff2e4bb085305b9ef0f7cf4b5b20445f44;p=plomrogue2-experiments

diff --git a/new/plomrogue/tasks.py b/new/plomrogue/tasks.py
index 5dc2f82..6f2f1be 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
 
 
 
@@ -59,9 +59,7 @@ class Task_PICKUP(Task):
         to_pick_up = self.thing.world.get_thing(self.args[0],
                                                 create_unfound=False)
         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:
+           to_pick_up.id_ not in self.thing.get_pickable_items():
             raise GameError('thing of ID %s not in reach to pick up'
                             % self.args[0])
 
@@ -69,6 +67,7 @@ class Task_PICKUP(Task):
         to_pick_up = self.thing.world.get_thing(self.args[0])
         self.thing.inventory += [self.args[0]]
         to_pick_up.in_inventory = True
+        to_pick_up.position = self.thing.position