X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;ds=sidebyside;f=server.py;h=e289e0a73a03ea123aa4ab1524cef8ea792a2616;hb=7a02f223961c532d9423433427c0e1b3e1cdb871;hp=e688f2cf41f7d903207d5e2d4d226a4af35b78b3;hpb=523a3f079075159a16fa172ec99084c17e120044;p=plomrogue2-experiments

diff --git a/server.py b/server.py
index e688f2c..e289e0a 100755
--- a/server.py
+++ b/server.py
@@ -7,6 +7,7 @@ import sys
 import os
 from parser import ArgError, Parser
 from server_.game import World, GameError
+from game_common import Commander
 
 
 # Avoid "Address already in use" errors.
@@ -92,11 +93,11 @@ def fib(n):
         return fib(n-1) + fib(n-2)
 
 
-class CommandHandler:
+class CommandHandler(Commander):
 
-    def __init__(self, queues_out={}):
+    def __init__(self):
         from multiprocessing import Pool
-        self.queues_out = queues_out
+        self.queues_out = {}
         self.world = World()
         self.parser = Parser(self)
         # self.pool and self.pool_result are currently only needed by the FIB
@@ -106,12 +107,16 @@ class CommandHandler:
 
     def handle_input(self, input_, connection_id=None, abort_on_error=False):
         """Process input_ to command grammar, call command handler if found."""
+        from inspect import signature
         try:
             command = self.parser.parse(input_)
             if command is None:
                 self.send_to(connection_id, 'UNHANDLED INPUT')
             else:
-                command(connection_id=connection_id)
+                if 'connection_id' in list(signature(command).parameters):
+                    command(connection_id=connection_id)
+                else:
+                    command()
         except ArgError as e:
             self.send_to(connection_id, 'ARGUMENT ERROR: ' + str(e))
             if abort_on_error:
@@ -133,32 +138,34 @@ class CommandHandler:
         for connection_id in self.queues_out:
             self.send_to(connection_id, msg)
 
-    def stringify_yx(self, tuple_):
-        """Transform tuple (y,x) into string 'Y:'+str(y)+',X:'+str(x)."""
-        return 'Y:' + str(tuple_[0]) + ',X:' + str(tuple_[1])
-
-    def quoted(self, string):
-        """Quote and escape string so client interprets it as single token."""
-        quoted = []
-        quoted += ['"']
-        for c in string:
-            if c in {'"', '\\'}:
-                quoted += ['\\']
-            quoted += [c]
-        quoted += ['"']
-        return ''.join(quoted)
-
     def send_all_gamestate(self):
         """Send out game state data relevant to clients."""
+
+        def stringify_yx(tuple_):
+            """Transform tuple (y,x) into string 'Y:'+str(y)+',X:'+str(x)."""
+            return 'Y:' + str(tuple_[0]) + ',X:' + str(tuple_[1])
+
+        def quoted(string):
+            """Quote & escape string so client interprets it as single token."""
+            quoted = []
+            quoted += ['"']
+            for c in string:
+                if c in {'"', '\\'}:
+                    quoted += ['\\']
+                quoted += [c]
+            quoted += ['"']
+            return ''.join(quoted)
+
         self.send_all('NEW_TURN ' + str(self.world.turn))
-        self.send_all('MAP_SIZE ' + self.stringify_yx(self.world.map_size))
+        self.send_all('MAP_SIZE ' + stringify_yx(self.world.map_size))
         for y in range(self.world.map_size[0]):
             width = self.world.map_size[1]
-            terrain_line = self.world.map_[y * width:(y + 1) * width]
-            self.send_all('TERRAIN_LINE %5s %s' % (y, self.quoted(terrain_line)))
+            terrain_line = self.world.terrain_map[y * width:(y + 1) * width]
+            self.send_all('TERRAIN_LINE %5s %s' % (y, quoted(terrain_line)))
         for thing in self.world.things:
-            self.send_all('THING TYPE:' + thing.type_ + ' '
-                          + self.stringify_yx(thing.position))
+            self.send_all('THING_TYPE %s %s' % (thing.id_, thing.type_))
+            self.send_all('THING_POS %s %s' % (thing.id_,
+                                               stringify_yx(thing.position)))
 
     def proceed(self):
         """Send turn finish signal, run game world, send new world data.
@@ -170,18 +177,18 @@ class CommandHandler:
         self.world.proceed_to_next_player_turn()
         self.send_all_gamestate()
 
-    def cmd_MOVE(self, direction, connection_id):
+    def cmd_MOVE(self, direction):
         """Set player task to 'move' with direction arg, finish player turn."""
         if direction not in {'UP', 'DOWN', 'RIGHT', 'LEFT'}:
             raise ArgError('Move argument must be one of: '
                            'UP, DOWN, RIGHT, LEFT')
-        self.world.player.set_task('move', direction=direction)
+        self.world.get_player().set_task('move', direction=direction)
         self.proceed()
     cmd_MOVE.argtypes = 'string'
 
-    def cmd_WAIT(self, connection_id):
+    def cmd_WAIT(self):
         """Set player task to 'wait', finish player turn."""
-        self.world.player.set_task('wait')
+        self.world.get_player().set_task('wait')
         self.proceed()
 
     def cmd_GET_TURN(self, connection_id):
@@ -279,6 +286,17 @@ if os.path.exists(game_file_name):
             line = lines[i]
             print("FILE INPUT LINE %s: %s" % (i, line), end='')
             commander.handle_input(line, abort_on_error=True)
+else:
+    commander.handle_input('MAP_SIZE Y:5,X:5')
+    commander.handle_input('TERRAIN_LINE 0 "xxxxx"')
+    commander.handle_input('TERRAIN_LINE 1 "x...x"')
+    commander.handle_input('TERRAIN_LINE 2 "x.X.x"')
+    commander.handle_input('TERRAIN_LINE 3 "x...x"')
+    commander.handle_input('TERRAIN_LINE 4 "xxxxx"')
+    commander.handle_input('THING_TYPE 0 human')
+    commander.handle_input('THING_POS 0 Y:3,X:3')
+    commander.handle_input('THING_TYPE 1 monster')
+    commander.handle_input('THING_POS 1 Y:1,X:1')
 q = queue.Queue()
 c = threading.Thread(target=io_loop, daemon=True, args=(q, commander))
 c.start()