X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=client-curses.py;h=a8add972df17428ae24e9ae87be7699353c6cc13;hb=77b74e4142ae2e8a3a5637af9856e26d86f8ec76;hp=ca907db013380f3da7d54b57a7f0dc73c8f11b2d;hpb=3ce85894ae195febfb4ab24a0ab4faccabf931fd;p=plomrogue2-experiments

diff --git a/client-curses.py b/client-curses.py
index ca907db..a8add97 100755
--- a/client-curses.py
+++ b/client-curses.py
@@ -77,7 +77,7 @@ class MapHex(Map):
         return map_lines
 
 
-map_manager = game_common.MapManager(globals())
+map_manager = game_common.MapManager((MapHex, MapSquare))
 
 
 class World(game_common.World):
@@ -108,20 +108,35 @@ class Game(game_common.CommonCommandsMixin):
             }
         self.do_quit = False
 
+    def get_command_signature(self, command_name):
+        method_candidate = 'cmd_' + command_name
+        method = None
+        argtypes = ''
+        if hasattr(self, method_candidate):
+            method = getattr(self, method_candidate)
+            if hasattr(method, 'argtypes'):
+                argtypes = method.argtypes
+        return method, argtypes
+
+    def get_string_options(self, string_option_type):
+        if string_option_type == 'geometry':
+            return self.map_manager.get_map_geometries()
+        return None
+
     def handle_input(self, msg):
         if msg == 'BYE':
             self.do_quit = True
             return
         try:
-            command = self.parser.parse(msg)
+            command, args = self.parser.parse(msg)
             if command is None:
                 self.log('UNHANDLED INPUT: ' + msg)
                 self.to_update['log'] = True
             else:
-                command()
+                command(*args)
         except ArgError as e:
-                self.log('ARGUMENT ERROR: ' + msg + '\n' + str(e))
-                self.to_update['log'] = True
+            self.log('ARGUMENT ERROR: ' + msg + '\n' + str(e))
+            self.to_update['log'] = True
 
     def log(self, msg):
         """Prefix msg plus newline to self.log_text."""
@@ -146,13 +161,13 @@ class Game(game_common.CommonCommandsMixin):
         pass
     cmd_TURN_FINISHED.argtypes = 'int:nonneg'
 
-    def cmd_NEW_TURN(self, n):
+    def cmd_TURN(self, n):
         """Set self.turn to n, empty self.things."""
         self.world.turn = n
         self.world.things = []
         self.to_update['turn'] = False
         self.to_update['map'] = False
-    cmd_NEW_TURN.argtypes = 'int:nonneg'
+    cmd_TURN.argtypes = 'int:nonneg'
 
     def cmd_VISIBLE_MAP_LINE(self, y, terrain_line):
         self.world.map_.set_line(y, terrain_line)
@@ -385,26 +400,26 @@ class TUI:
                 elif map_mode:
                     if type(self.game.world.map_) == MapSquare:
                         if key == 'a':
-                            plom_socket_io.send(self.socket, 'MOVE LEFT')
+                            plom_socket_io.send(self.socket, 'TASK:MOVE LEFT')
                         elif key == 'd':
-                            plom_socket_io.send(self.socket, 'MOVE RIGHT')
+                            plom_socket_io.send(self.socket, 'TASK:MOVE RIGHT')
                         elif key == 'w':
-                            plom_socket_io.send(self.socket, 'MOVE UP')
+                            plom_socket_io.send(self.socket, 'TASK:MOVE UP')
                         elif key == 's':
-                            plom_socket_io.send(self.socket, 'MOVE DOWN')
+                            plom_socket_io.send(self.socket, 'TASK:MOVE DOWN')
                     elif type(self.game.world.map_) == MapHex:
                         if key == 'w':
-                            plom_socket_io.send(self.socket, 'MOVE UPLEFT')
+                            plom_socket_io.send(self.socket, 'TASK:MOVE UPLEFT')
                         elif key == 'e':
-                            plom_socket_io.send(self.socket, 'MOVE UPRIGHT')
+                            plom_socket_io.send(self.socket, 'TASK:MOVE UPRIGHT')
                         if key == 's':
-                            plom_socket_io.send(self.socket, 'MOVE LEFT')
+                            plom_socket_io.send(self.socket, 'TASK:MOVE LEFT')
                         elif key == 'd':
-                            plom_socket_io.send(self.socket, 'MOVE RIGHT')
+                            plom_socket_io.send(self.socket, 'TASK:MOVE RIGHT')
                         if key == 'x':
-                            plom_socket_io.send(self.socket, 'MOVE DOWNLEFT')
+                            plom_socket_io.send(self.socket, 'TASK:MOVE DOWNLEFT')
                         elif key == 'c':
-                            plom_socket_io.send(self.socket, 'MOVE DOWNRIGHT')
+                            plom_socket_io.send(self.socket, 'TASK:MOVE DOWNRIGHT')
                 else:
                     if len(key) == 1 and key in ASCII_printable and \
                             len(self.to_send) < len(self.edit):