X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=plomrogue%2Ftasks.py;h=2e12e5a2ec3028f66b1ea7b8b8efbfb7e9196dcf;hb=3efcac66212325fecbbf28e3c19762821fb65d76;hp=6d1a32a75e65b4a5a7fe74a40634f260e85e4d1c;hpb=7abc6dcdbe60dce9b8efad07917fb274da06687a;p=plomrogue2

diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index 6d1a32a..2e12e5a 100644
--- a/plomrogue/tasks.py
+++ b/plomrogue/tasks.py
@@ -1,5 +1,4 @@
 from plomrogue.errors import PlayError, GameError
-from plomrogue.mapping import YX
 
 
 
@@ -29,18 +28,16 @@ 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])
+        return self.thing.game.map_geometry.move_yxyx(self.thing.position,
+                                                      self.args[0])
 
     def check(self):
-        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
-                          if t.blocking]:
+        test_yxyx = self.get_move_target()
+        if test_yxyx 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')
+        elif self.thing.game.maps[test_yxyx[0]][test_yxyx[1]] != '.':
+            raise PlayError('blocked by impassable tile')
 
     def do(self):
         self.thing.position = self.get_move_target()
@@ -54,12 +51,14 @@ class Task_WRITE(Task):
     argtypes = 'string:char string'
 
     def check(self):
-        if not self.thing.game.can_do_tile_with_pw(self.thing.position,
+        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]
+        big_yx = self.thing.position[0]
+        little_yx = self.thing.position[1]
+        self.thing.game.maps[big_yx][little_yx] = self.args[0]
 
 
 
@@ -71,12 +70,11 @@ class Task_FLATTEN_SURROUNDINGS(Task):
         pass
 
     def do(self):
-        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] = '.'
+        for yxyx in[self.thing.position] + \
+            list(self.thing.game.map_geometry.get_neighbors_yxyx(self.thing.position).values()):
+            if not self.thing.game.can_do_tile_with_pw(*yxyx, self.args[0]):
+                continue
+            self.thing.game.maps[yxyx[0]][yxyx[1]] = '.'
 
 
 
@@ -85,7 +83,7 @@ class Task_PICK_UP(Task):
 
     def check(self):
         if self.thing.carrying:
-            raise PlayError('already 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