X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/edit?a=blobdiff_plain;f=server.py;h=f6dcd35e43d3a915560ab3b8d36fbac474876666;hb=6671611f0d5416d2b4f6f54aa40a44034865376a;hp=d9097650344571b4ce6713d9d412ea4537399660;hpb=8c827d2cce8c69c55bcf9154ec7c8fc12732c3bf;p=plomrogue2-experiments

diff --git a/server.py b/server.py
index d909765..f6dcd35 100755
--- a/server.py
+++ b/server.py
@@ -95,17 +95,18 @@ def fib(n):
 
 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 = 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, store=True):
         """Process input_ to command grammar, call command handler if found."""
         from inspect import signature
         try:
@@ -117,14 +118,13 @@ class CommandHandler(game_common.Commander, server_.game.Commander):
                     command(connection_id=connection_id)
                 else:
                     command()
+                    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 server_.game.GameError as e:
             self.send_to(connection_id, 'GAME ERROR: ' + str(e))
-            if abort_on_error:
-                exit(1)
 
     def send_to(self, connection_id, msg):
         """Send msg to client of connection_id; if no later, print instead."""
@@ -175,6 +175,8 @@ class CommandHandler(game_common.Commander, server_.game.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_FIB(self, numbers, connection_id):
@@ -247,7 +249,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')
@@ -257,7 +259,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, store=False)
 else:
     commander.handle_input('MAP_SIZE Y:5,X:5')
     commander.handle_input('TERRAIN_LINE 0 "xxxxx"')