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

diff --git a/new/plomrogue/tasks.py b/new/plomrogue/tasks.py
index 2625762..6f2f1be 100644
--- a/new/plomrogue/tasks.py
+++ b/new/plomrogue/tasks.py
@@ -46,3 +46,43 @@ class Task_MOVE(Task):
     def do(self):
         self.thing.position = self.thing.world.map_.move(self.thing.position,
                                                          self.args[0])
+        for id_ in self.thing.inventory:
+            t = self.thing.world.get_thing(id_)
+            t.position = self.thing.position
+
+
+
+class Task_PICKUP(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 or \
+           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])
+
+    def do(self):
+        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
+
+
+
+class Task_DROP(Task):
+    argtypes = 'int:nonneg'
+
+    def check(self):
+        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_drop.id_ not in self.thing.inventory:
+            raise GameError('no thing of ID %s to drop in inventory'
+                            % self.args[0])
+
+    def do(self):
+        to_drop = self.thing.world.get_thing(self.args[0])
+        del self.thing.inventory[self.thing.inventory.index(to_drop.id_)]
+        to_drop.in_inventory = False