Make some things block movement, and others not.

[plomrogue2] / plomrogue / tasks.py

diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index 55669eccb85e6f4ae738f566d8c96b9761debe03..e73b174a1fed351c03cf8c22bd791900e4f76cb9 100644 (file)
--- a/plomrogue/tasks.py
+++ b/plomrogue/tasks.py
@@ -36,8 +36,9 @@ 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')
 
@@ -51,11 +52,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 +63,15 @@ 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] = '.'