X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=client.py;h=7e9f18e9f50cb2f74c37ac1f6a8dd92473c22522;hb=31831b9e6147a89b20a97a52f4fe5e01acc283d0;hp=2e30fe08452dc90fa51723e212a57fb80e315c43;hpb=dfe6e66bd00ad9b80799d36126c44d72507fe3a3;p=plomrogue2-experiments

diff --git a/client.py b/client.py
index 2e30fe0..7e9f18e 100755
--- a/client.py
+++ b/client.py
@@ -6,6 +6,10 @@ import socket
 import threading
 
 
+class ArgumentError(Exception):
+    pass
+
+
 class UrwidSetup:
 
     def __init__(self, socket):
@@ -72,31 +76,70 @@ class UrwidSetup:
 
     class MapWidget(urwid.Text):
         """Stores/updates/draws game map."""
+        map_size = (5, 5)
         terrain_map = ' ' * 25
-        position = [0, 0]
+        position = (0, 0)
 
         def draw_map(self):
-            """Draw map view from .terrain_map, .position."""
+            """Draw map view from .map_size, .terrain_map, .position."""
             whole_map = []
             for c in self.terrain_map:
                 whole_map += [c]
-            pos_i = self.position[0] * (5 + 1) + self.position[1]
+            pos_i = self.position[0] * (self.map_size[1] + 1) + self.position[1]
             whole_map[pos_i] = '@'
             self.set_text(''.join(whole_map))
 
+        def get_yx(self, yx_string):
+
+            def get_axis_position_from_argument(axis, token):
+                if len(token) < 3 or token[:2] != axis + ':' or \
+                        not token[2:].isdigit():
+                    raise ArgumentError('Bad arg for ' + axis + ' position.')
+                return int(token[2:])
+
+            tokens = yx_string.split(',')
+            if len(tokens) != 2:
+                raise ArgumentError('wrong number of ","-separated arguments')
+            y = get_axis_position_from_argument('Y', tokens[0])
+            x = get_axis_position_from_argument('X', tokens[1])
+            return (y, x)
+
+        def update_map_size(self, size_string):
+            """Set map size, redo self.terrain_map in new size, '?'-filled."""
+            new_map_size = self.get_yx(size_string)
+            if 0 in new_map_size:
+                raise ArgumentError('size value for either axis must be >0')
+            self.map_size = new_map_size
+            self.terrain_map = ''
+            for y in range(self.map_size[0]):
+                self.terrain_map += '?' * self.map_size[1] + '\n'
+            self.draw_map()
+
         def update_terrain(self, terrain_map):
-            """Update self.terrain_map."""
+            """Update self.terrain_map. Ensure size matching self.map_size."""
+            lines = terrain_map.split('\n')
+            if len(lines) != self.map_size[0]:
+                raise ArgumentError('wrong map height')
+            for line in lines:
+                if len(line) != self.map_size[1]:
+                    raise ArgumentError('wrong map width')
             self.terrain_map = terrain_map
             self.draw_map()
 
-        def update_position_y(self, position_y_string):
-            """Update self.position[0]."""
-            self.position[0] = int(position_y_string)
-            self.draw_map()
+        def update_position(self, position_string):
+            """Update self.position, ensure it's within map bounds."""
+
+            def get_axis_position_from_argument(axis, token):
+                if len(token) < 3 or token[:2] != axis + ':' or \
+                        not token[2:].isdigit():
+                    raise ArgumentError('Bad arg for ' + axis + ' position.')
+                return int(token[2:])
 
-        def update_position_x(self, position_x_string):
-            """Update self.position[1]."""
-            self.position[1] = int(position_x_string)
+            new_position = self.get_yx(position_string)
+            if new_position[0] >= self.map_size[0] or \
+                    new_position[1] >= self.map_size[1]:
+                raise ArgumentError('Position outside of map size bounds.')
+            self.position = new_position
             self.draw_map()
 
     class InputHandler:
@@ -144,10 +187,10 @@ class UrwidSetup:
             try:
                 found_command = (
                     mapdraw_command('TERRAIN\n', 'update_terrain') or
-                    mapdraw_command('POSITION_Y ', 'update_position_y') or
-                    mapdraw_command('POSITION_X ', 'update_position_x'))
-            except Exception as e:
-                self.widget1.set_text('TROUBLESOME ARGUMENT: ' + msg + '\n' +
+                    mapdraw_command('POSITION ', 'update_position') or
+                    mapdraw_command('MAP_SIZE ', 'update_map_size'))
+            except ArgumentError as e:
+                self.widget1.set_text('BAD ARGUMENT: ' + msg + '\n' +
                                       str(e))
             else:
                 if not found_command: