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

diff --git a/new/plomrogue/tasks.py b/new/plomrogue/tasks.py
index 5dc2f82..d97b923 100644
--- a/new/plomrogue/tasks.py
+++ b/new/plomrogue/tasks.py
@@ -1,5 +1,6 @@
 from plomrogue.errors import GameError
 from plomrogue.misc import quote
+from plomrogue.mapping import YX
 
 
 
@@ -19,6 +20,8 @@ class Task:
         for arg in self.args:
             if type(arg) == str:
                 stringed_args += [quote(arg)]
+            elif type(arg) == int:
+                stringed_args += [str(arg)]
             else:
                 raise GameError('stringifying arg type not implemented')
         return ' '.join(stringed_args)
@@ -35,20 +38,21 @@ class Task_WAIT(Task):
 class Task_MOVE(Task):
     argtypes = 'string:direction'
 
+    def get_move_target(self):
+        return self.thing.game.map_geometry.move(self.thing.position,
+                                                 self.args[0],
+                                                 self.thing.game.map_size)
+
     def check(self):
-        test_pos = self.thing.world.map_.move(self.thing.position, self.args[0])
-        if self.thing.world.map_[test_pos] != '.':
+        test_pos = self.get_move_target()
+        if self.thing.game.maps[test_pos[0]][test_pos[1]] != '.':
             raise GameError('%s would move into illegal terrain' % self.thing.id_)
-        for t in self.thing.world.things:
-            if t.blocking and t.position == test_pos:
+        for t in self.thing.game.things_at_pos(test_pos):
+            if t.blocking:
                 raise GameError('%s would move into other thing' % self.thing.id_)
 
     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
+        self.thing.position = self.get_move_target()
 
 
 
@@ -56,34 +60,61 @@ class Task_PICKUP(Task):
     argtypes = 'int:nonneg'
 
     def check(self):
-        to_pick_up = self.thing.world.get_thing(self.args[0],
-                                                create_unfound=False)
+        to_pick_up = self.thing.game.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])
 
     def do(self):
-        to_pick_up = self.thing.world.get_thing(self.args[0])
+        to_pick_up = self.thing.game.get_thing(self.args[0],
+                                               create_unfound=False)
         self.thing.inventory += [self.args[0]]
         to_pick_up.in_inventory = True
+        to_pick_up.position = self.thing.position
+
+
+
+class TaskOnInventoryItem(Task):
+    argtypes = 'int:nonneg'
+
+    def _basic_inventory_item_check(self):
+        item = self.thing.game.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.game.get_thing(self.args[0], create_unfound=False)
+        del self.thing.inventory[self.thing.inventory.index(item.id_)]
+        item.in_inventory = False
+        return item
 
 
-class Task_DROP(Task):
+
+class Task_DROP(TaskOnInventoryItem):
     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])
+        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.game.things[self.thing.game.things.index(to_eat)]
+        self.thing.health += 50