Add map terrain.

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

diff --git a/new2/plomrogue/tasks.py b/new2/plomrogue/tasks.py
index 402dfcb47c191ea86d9cc133c55813683b3f117e..01084166635e6fba149f2763ed3b7a1ac182f6a3 100644 (file)
--- a/new2/plomrogue/tasks.py
+++ b/new2/plomrogue/tasks.py
@@ -1,5 +1,4 @@
 from plomrogue.errors import GameError
-#from plomrogue.misc import quote
 from plomrogue.mapping import YX
 
 
@@ -29,17 +28,12 @@ class Task_MOVE(Task):
     argtypes = 'string:direction'
 
     def get_move_target(self):
-        moves = {
-            'UP': YX(-1, 0),
-            'DOWN': YX(1, 0),
-            'LEFT': YX(0, -1),
-            'RIGHT': YX(0, 1),
-        }
-        return self.thing.position + moves[self.args[0]]
+        return self.thing.game.map_geometry.move(self.thing.position,
+                                                 self.args[0])
 
     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')
 
     def do(self):