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

diff --git a/new/plomrogue/tasks.py b/new/plomrogue/tasks.py
index 1be5b6d..6f2f1be 100644
--- a/new/plomrogue/tasks.py
+++ b/new/plomrogue/tasks.py
@@ -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