X-Git-Url: https://plomlompom.com/repos//%22https:/validator.w3.org/check?a=blobdiff_plain;f=client.py;h=2acd7bc9e209a95e1523716f57ccc126882d111f;hb=0aaa22e9e7c123fb0eda849136c5b69659ba7abc;hp=7e9f18e9f50cb2f74c37ac1f6a8dd92473c22522;hpb=31831b9e6147a89b20a97a52f4fe5e01acc283d0;p=plomrogue2-experiments

diff --git a/client.py b/client.py
index 7e9f18e..2acd7bc 100755
--- a/client.py
+++ b/client.py
@@ -54,7 +54,7 @@ class UrwidSetup:
         - self.reply_widget, a urwid.Text widget printing self.socket replies
         """
         edit_widget = self.EditToSocketWidget(self.socket, 'SEND: ')
-        self.reply_widget = urwid.Text('')
+        self.reply_widget = self.LogWidget('')
         self.map_widget = self.MapWidget('', wrap='clip')
         map_box = urwid.Padding(self.map_widget, width=50)
         widget_pile = urwid.Pile([edit_widget, map_box, self.reply_widget])
@@ -74,19 +74,33 @@ class UrwidSetup:
             plom_socket_io.send(self.socket, self.edit_text)
             self.edit_text = ''
 
+    class LogWidget(urwid.Text):
+        """Display client log, newest message on top."""
+
+        def add(self, text):
+            """Add text to (top of) log."""
+            self.set_text(text + '\n' + self.text)
+
     class MapWidget(urwid.Text):
         """Stores/updates/draws game map."""
         map_size = (5, 5)
         terrain_map = ' ' * 25
         position = (0, 0)
+        things = []
+
+        class Thing:
+            def __init__(self, position, symbol):
+                self.position = position
+                self.symbol = symbol
 
         def draw_map(self):
             """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] * (self.map_size[1] + 1) + self.position[1]
-            whole_map[pos_i] = '@'
+            for t in self.things:
+                pos_i = t.position[0] * (self.map_size[1] + 1) + t.position[1]
+                whole_map[pos_i] = t.symbol
             self.set_text(''.join(whole_map))
 
         def get_yx(self, yx_string):
@@ -126,22 +140,30 @@ class UrwidSetup:
             self.terrain_map = terrain_map
             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:])
-
-            new_position = self.get_yx(position_string)
-            if new_position[0] >= self.map_size[0] or \
-                    new_position[1] >= self.map_size[1]:
+        def update_things(self, thing_description):
+            """Append thing of thing_description to self.things."""
+            thing_types = {'human': '@', 'monster': 'M'}
+            tokens = thing_description.split()
+            if len(tokens) != 2:
+                raise ArgumentError('Wrong number of tokens.')
+            yx = self.get_yx(tokens[1])
+            if yx[0] >= self.map_size[0] or yx[1] >= self.map_size[1]:
                 raise ArgumentError('Position outside of map size bounds.')
-            self.position = new_position
+            type_token = tokens[0]
+            prefix = 'TYPE:'
+            type_ = '?'
+            if len(type_token) <= len(prefix) or \
+                    type_token[:len(prefix)] != prefix:
+                raise ArgumentError('Invalid type token.')
+            type_ = type_token[len(prefix):]
+            if type_ not in thing_types:
+                raise ArgumentError('Unknown thing type.')
+            self.things += [self.Thing(yx, thing_types[type_])]
             self.draw_map()
 
+        def clear_things(self, _):
+            self.things = []
+
     class InputHandler:
         """Delivers data from other thread to widget via message_container.
 
@@ -152,9 +174,9 @@ class UrwidSetup:
         urwid-external thread.
         """
 
-        def __init__(self, widget1, widget2, message_container):
-            self.widget1 = widget1
-            self.widget2 = widget2
+        def __init__(self, log_widget, map_widget, message_container):
+            self.log_widget = log_widget
+            self.map_widget = map_widget
             self.message_container = message_container
 
         def handle_input(self, trigger):
@@ -174,7 +196,7 @@ class UrwidSetup:
             def mapdraw_command(prefix, func):
                 n = len(prefix)
                 if len(msg) > n and msg[:n] == prefix:
-                    m = getattr(self.widget2, func)
+                    m = getattr(self.map_widget, func)
                     m(msg[n:])
                     return True
                 return False
@@ -186,15 +208,15 @@ class UrwidSetup:
             found_command = False
             try:
                 found_command = (
+                    mapdraw_command('NEW_TURN ', 'clear_things') or
                     mapdraw_command('TERRAIN\n', 'update_terrain') or
-                    mapdraw_command('POSITION ', 'update_position') or
+                    mapdraw_command('THING ', 'update_things') or
                     mapdraw_command('MAP_SIZE ', 'update_map_size'))
             except ArgumentError as e:
-                self.widget1.set_text('BAD ARGUMENT: ' + msg + '\n' +
-                                      str(e))
+                self.log_widget.add('ARGUMENT ERROR: ' + msg + '\n' + str(e))
             else:
                 if not found_command:
-                    self.widget1.set_text('UNKNOWN COMMAND: ' + msg)
+                    self.log_widget.add('UNHANDLED INPUT: ' + msg)
             del self.message_container[0]
 
     def recv_loop(self):