X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;ds=sidebyside;f=plomrogue%2Ftasks.py;h=6d1a32a75e65b4a5a7fe74a40634f260e85e4d1c;hb=7abc6dcdbe60dce9b8efad07917fb274da06687a;hp=55669eccb85e6f4ae738f566d8c96b9761debe03;hpb=ff01e1b466c1df7c938d1281ca34718e555bcf67;p=plomrogue2

diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index 55669ec..6d1a32a 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')
 
     def do(self):
         self.thing.position = self.get_move_target()
+        if self.thing.carrying:
+            self.thing.carrying.position = self.thing.position
 
 
 
@@ -51,11 +54,9 @@ class Task_WRITE(Task):
     argtypes = 'string:char string'
 
     def check(self):
-        tile_class = self.thing.game.map_control[self.thing.position]
-        if tile_class in self.thing.game.map_control_passwords:
-            tile_pw = self.thing.game.map_control_passwords[tile_class]
-            if self.args[1] != tile_pw:
-                raise GameError('wrong password for tile')
+        if not self.thing.game.can_do_tile_with_pw(self.thing.position,
+                                                   self.args[1]):
+            raise GameError('wrong password for tile')
 
     def do(self):
         self.thing.game.map[self.thing.position] = self.args[0]
@@ -64,12 +65,49 @@ class Task_WRITE(Task):
 
 class Task_FLATTEN_SURROUNDINGS(Task):
     todo = 10
+    argtypes = 'string'
 
     def check(self):
         pass
 
     def do(self):
-        self.thing.game.map[self.thing.position] = '.'
-        for yx in self.thing.game.map_geometry.get_neighbors(self.thing.position).values():
+        for yx in[self.thing.position] + \
+            list(self.thing.game.map_geometry.get_neighbors(self.thing.position).values()):
             if yx is not None:
+                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')
+        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