X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;ds=sidebyside;f=plomrogue%2Ftasks.py;h=ff1cc7ea613d721eec2ffa7c7368b48fa62117fc;hb=baab532ba5125527bdc7061864f7cc7db8d7abc3;hp=2c0c3fce395c05011a114b3227e01843f58640f2;hpb=34856a61dd6b52c506aafa2dfd7de9d1ab07ced7;p=plomrogue2

diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index 2c0c3fc..ff1cc7e 100644
--- a/plomrogue/tasks.py
+++ b/plomrogue/tasks.py
@@ -20,7 +20,7 @@ class Task_WAIT(Task):
     todo = 1
 
     def do(self):
-        return 'success'
+        pass
 
 
 
@@ -36,13 +36,16 @@ class Task_MOVE(Task):
         test_pos = self.get_move_target()
         if test_pos is None:
             raise PlayError('would move out of map')
-        elif test_pos in [t.position for t in self.thing.game.things]:
-            raise PlayError('would collide with other things')
+        elif test_pos in [t.position for t in self.thing.game.things
+                          if t.blocking]:
+            raise PlayError('blocked by other thing')
         elif self.thing.game.map[test_pos] != '.':
-            raise PlayError('would move into illegal territory')
+            raise PlayError('blocked by impassable tile')
 
     def do(self):
         self.thing.position = self.get_move_target()
+        if self.thing.carrying:
+            self.thing.carrying.position = self.thing.position
 
 
 
@@ -74,3 +77,37 @@ class Task_FLATTEN_SURROUNDINGS(Task):
                 if not self.thing.game.can_do_tile_with_pw(yx, self.args[0]):
                     continue
                 self.thing.game.map[yx] = '.'
+
+
+
+class Task_PICK_UP(Task):
+    todo = 1
+
+    def check(self):
+        if self.thing.carrying:
+            raise PlayError('already carrying something')
+        nothing_to_pick_up = True
+        for t in [t for t in self.thing.game.things
+                  if t != self.thing and t.position == self.thing.position
+                  and t.type_ != 'Player']:
+            nothing_to_pick_up = False
+            break
+        if nothing_to_pick_up:
+            raise PlayError('nothing to pick up')
+
+    def do(self):
+        to_pick_up = [t for t in self.thing.game.things
+                      if t != self.thing and t.position == self.thing.position][0]
+        self.thing.carrying = to_pick_up
+
+
+
+class Task_DROP(Task):
+    todo = 1
+
+    def check(self):
+        if not self.thing.carrying:
+            raise PlayError('nothing to drop')
+
+    def do(self):
+        self.thing.carrying = None