X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=server.py;h=7e2d80dc67b2d2f8cd5f1f332b1755588a1cdf8f;hb=54019ea9f12da4e51a25d52f5f89a1668967363d;hp=e289e0a73a03ea123aa4ab1524cef8ea792a2616;hpb=7a02f223961c532d9423433427c0e1b3e1cdb871;p=plomrogue2-experiments

diff --git a/server.py b/server.py
index e289e0a..7e2d80d 100755
--- a/server.py
+++ b/server.py
@@ -5,9 +5,9 @@ import threading
 import queue
 import sys
 import os
-from parser import ArgError, Parser
-from server_.game import World, GameError
-from game_common import Commander
+import parser
+import server_.game
+import game_common
 
 
 # Avoid "Address already in use" errors.
@@ -93,19 +93,21 @@ def fib(n):
         return fib(n-1) + fib(n-2)
 
 
-class CommandHandler(Commander):
+class CommandHandler(game_common.Commander, server_.game.Commander):
 
-    def __init__(self):
-        from multiprocessing import Pool
+    def __init__(self, game_file_name):
         self.queues_out = {}
-        self.world = World()
-        self.parser = Parser(self)
+        self.world = server_.game.World()
+        self.parser = parser.Parser(self)
+        self.game_file_name = game_file_name
         # self.pool and self.pool_result are currently only needed by the FIB
         # command and the demo of a parallelized game loop in cmd_inc_p.
+        from multiprocessing import Pool
         self.pool = Pool()
         self.pool_result = None
 
-    def handle_input(self, input_, connection_id=None, abort_on_error=False):
+    def handle_input(self, input_, connection_id=None, abort_on_error=False,
+                     store=True):
         """Process input_ to command grammar, call command handler if found."""
         from inspect import signature
         try:
@@ -117,11 +119,14 @@ class CommandHandler(Commander):
                     command(connection_id=connection_id)
                 else:
                     command()
-        except ArgError as e:
+                    if store:
+                        with open(self.game_file_name, 'a') as f:
+                            f.write(input_ + '\n')
+        except parser.ArgError as e:
             self.send_to(connection_id, 'ARGUMENT ERROR: ' + str(e))
             if abort_on_error:
                 exit(1)
-        except GameError as e:
+        except server_.game.GameError as e:
             self.send_to(connection_id, 'GAME ERROR: ' + str(e))
             if abort_on_error:
                 exit(1)
@@ -175,36 +180,10 @@ class CommandHandler(Commander):
         """
         self.send_all('TURN_FINISHED ' + str(self.world.turn))
         self.world.proceed_to_next_player_turn()
+        msg = str(self.world.get_player().last_task_result)
+        self.send_all('LAST_PLAYER_TASK_RESULT ' + msg)
         self.send_all_gamestate()
 
-    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.get_player().set_task('move', direction=direction)
-        self.proceed()
-    cmd_MOVE.argtypes = 'string'
-
-    def cmd_WAIT(self):
-        """Set player task to 'wait', finish player turn."""
-        self.world.get_player().set_task('wait')
-        self.proceed()
-
-    def cmd_GET_TURN(self, connection_id):
-        """Send world.turn to caller."""
-        self.send_to(connection_id, str(self.world.turn))
-
-    def cmd_ECHO(self, msg, connection_id):
-        """Send msg to caller."""
-        self.send_to(connection_id, msg)
-    cmd_ECHO.argtypes = 'string'
-
-    def cmd_ALL(self, msg, connection_id):
-        """Send msg to all clients."""
-        self.send_all(msg)
-    cmd_ALL.argtypes = 'string'
-
     def cmd_FIB(self, numbers, connection_id):
         """Reply with n-th Fibonacci numbers, n taken from tokens[1:].
 
@@ -275,7 +254,7 @@ if len(sys.argv) != 2:
     print('wrong number of arguments, expected one (game file)')
     exit(1)
 game_file_name = sys.argv[1]
-commander = CommandHandler()
+commander = CommandHandler(game_file_name)
 if os.path.exists(game_file_name):
     if not os.path.isfile(game_file_name):
         print('game file name does not refer to a valid game file')
@@ -285,7 +264,7 @@ if os.path.exists(game_file_name):
         for i in range(len(lines)):
             line = lines[i]
             print("FILE INPUT LINE %s: %s" % (i, line), end='')
-            commander.handle_input(line, abort_on_error=True)
+            commander.handle_input(line, abort_on_error=True, store=False)
 else:
     commander.handle_input('MAP_SIZE Y:5,X:5')
     commander.handle_input('TERRAIN_LINE 0 "xxxxx"')