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

diff --git a/new/plomrogue/tasks.py b/new/plomrogue/tasks.py
index 58ee46d..c9ce45e 100644
--- a/new/plomrogue/tasks.py
+++ b/new/plomrogue/tasks.py
@@ -37,6 +37,8 @@ class Task_MOVE(Task):
 
     def check(self):
         test_pos = self.thing.world.map_.move(self.thing.position, self.args[0])
+        if test_pos is None:
+            raise GameError('would move outside map bounds')
         if self.thing.world.map_[test_pos] != '.':
             raise GameError('%s would move into illegal terrain' % self.thing.id_)
         for t in self.thing.world.things:
@@ -48,7 +50,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 +60,8 @@ 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.id_ not in self.thing.get_pickable_items():
             raise GameError('thing of ID %s not in reach to pick up'
                             % self.args[0])
 
@@ -70,22 +69,49 @@ 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
 
 
 
-class Task_DROP(Task):
+class TaskOnInventoryItem(Task):
+    argtypes = 'int:nonneg'
+
+    def _basic_inventory_item_check(self):
+        item = self.thing.world.get_thing(self.args[0], create_unfound=False)
+        if item is None:
+            raise GameError('no thing of ID %s' % self.args[0])
+        if item.id_ not in self.thing.inventory:
+            raise GameError('no thing of ID %s in inventory' % self.args[0])
+        return item
+
+    def _eliminate_from_inventory(self):
+        item = self.thing.world.get_thing(self.args[0])
+        del self.thing.inventory[self.thing.inventory.index(item.id_)]
+        item.in_inventory = False
+        return item
+
+
+
+class Task_DROP(TaskOnInventoryItem):
     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:
-            raise GameError('no thing of ID %s to drop' % self.args[0])
-        if to_pick_up.id_ not in self.thing.inventory:
-            raise GameError('no thing of ID %s to drop in inventory'
-                            % self.args[0])
+        self._basic_inventory_item_check()
+
+    def do(self):
+        self._eliminate_from_inventory()
+
+
+
+class Task_EAT(TaskOnInventoryItem):
+    argtypes = 'int:nonneg'
+
+    def check(self):
+        to_eat = self._basic_inventory_item_check()
+        if to_eat.type_ != 'food':
+            raise GameError('thing of ID %s s not food' % 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
+        to_eat = self._eliminate_from_inventory()
+        del self.thing.world.things[self.thing.world.things.index(to_eat)]
+        self.thing.health += 50