Prohibit movement over non-dot map cells

[plomrogue2-experiments] / new2 / plomrogue / tasks.py

diff --git a/new2/plomrogue/tasks.py b/new2/plomrogue/tasks.py
index a75352625fba3ee7042091de2fa88874caf57296..e60012250baed701d8c99f61e6508d90a5980dcd 100644 (file)
--- a/new2/plomrogue/tasks.py
+++ b/new2/plomrogue/tasks.py
@@ -25,6 +25,7 @@ class Task_WAIT(Task):
 
 
 class Task_MOVE(Task):
+    todo = 1
     argtypes = 'string:direction'
 
     def get_move_target(self):
@@ -33,8 +34,22 @@ class Task_MOVE(Task):
 
     def check(self):
         test_pos = self.get_move_target()
-        if test_pos.y < 0 or test_pos.x < 0 or test_pos.y >= 24 or test_pos.x >= 40: 
+        if test_pos is None:
             raise GameError('would move out of map')
+        elif self.thing.game.map[test_pos] != '.':
+            raise GameError('would move into illegal territory')
 
     def do(self):
         self.thing.position = self.get_move_target()
+
+
+
+class Task_WRITE(Task):
+    todo = 1
+    argtypes = 'string:char'
+
+    def check(self):
+        pass
+
+    def do(self):
+        self.thing.game.map[self.thing.position] = self.args[0]