Replace GET_TURN with more useful GET_GAMESTATE.

[plomrogue2-experiments] / server.py

diff --git a/server.py b/server.py
index d9097650344571b4ce6713d9d412ea4537399660..98802642268545b728451051949ec81a0a065d71 100755 (executable)
--- 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."""
@@ -138,8 +138,9 @@ class CommandHandler(game_common.Commander, server_.game.Commander):
         for connection_id in self.queues_out:
             self.send_to(connection_id, msg)
 
-    def send_all_gamestate(self):
+    def send_gamestate(self, connection_id=None):
         """Send out game state data relevant to clients."""
+        from functools import partial
 
         def stringify_yx(tuple_):
             """Transform tuple (y,x) into string 'Y:'+str(y)+',X:'+str(x)."""
@@ -156,16 +157,19 @@ class CommandHandler(game_common.Commander, server_.game.Commander):
             quoted += ['"']
             return ''.join(quoted)
 
-        self.send_all('NEW_TURN ' + str(self.world.turn))
-        self.send_all('MAP_SIZE ' + stringify_yx(self.world.map_size))
+        send=self.send_all
+        if connection_id:
+            send=partial(self.send_to, connection_id)
+        send('NEW_TURN ' + str(self.world.turn))
+        send('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.terrain_map[y * width:(y + 1) * width]
-            self.send_all('TERRAIN_LINE %5s %s' % (y, quoted(terrain_line)))
+            send('TERRAIN_LINE %5s %s' % (y, quoted(terrain_line)))
         for thing in self.world.things:
-            self.send_all('THING_TYPE %s %s' % (thing.id_, thing.type_))
-            self.send_all('THING_POS %s %s' % (thing.id_,
-                                               stringify_yx(thing.position)))
+            send('THING_TYPE %s %s' % (thing.id_, thing.type_))
+            send('THING_POS %s %s' % (thing.id_,
+                                      stringify_yx(thing.position)))
 
     def proceed(self):
         """Send turn finish signal, run game world, send new world data.
@@ -175,7 +179,9 @@ class CommandHandler(game_common.Commander, server_.game.Commander):
         """
         self.send_all('TURN_FINISHED ' + str(self.world.turn))
         self.world.proceed_to_next_player_turn()
-        self.send_all_gamestate()
+        msg = str(self.world.get_player().last_task_result)
+        self.send_all('LAST_PLAYER_TASK_RESULT ' + msg)
+        self.send_gamestate()
 
     def cmd_FIB(self, numbers, connection_id):
         """Reply with n-th Fibonacci numbers, n taken from tokens[1:].
@@ -209,7 +215,7 @@ class CommandHandler(game_common.Commander, server_.game.Commander):
         self.send_all('TURN_FINISHED ' + str(self.world.turn))
         sleep(1)
         self.world.turn += 1
-        self.send_all_gamestate()
+        self.send_gamestate()
         self.pool_result = self.pool.map_async(fib, (35, 35))
 
 
@@ -247,7 +253,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 +263,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"')