home
·
contact
·
privacy
projects
/
plomrogue2-experiments
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't abort initial save file replay on error.
[plomrogue2-experiments]
/
server.py
diff --git
a/server.py
b/server.py
index d9097650344571b4ce6713d9d412ea4537399660..f6dcd35e43d3a915560ab3b8d36fbac474876666 100755
(executable)
--- a/
server.py
+++ b/
server.py
@@
-95,17
+95,18
@@
def fib(n):
class CommandHandler(game_common.Commander, server_.game.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 = server_.game.World()
self.parser = parser.Parser(self)
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.
# 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
self.pool = Pool()
self.pool_result = None
- def handle_input(self, input_, connection_id=None,
abort_on_error=Fals
e):
+ def handle_input(self, input_, connection_id=None,
store=Tru
e):
"""Process input_ to command grammar, call command handler if found."""
from inspect import signature
try:
"""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()
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))
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))
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."""
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()
"""
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):
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]
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')
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='')
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=Tru
e)
+ commander.handle_input(line,
store=Fals
e)
else:
commander.handle_input('MAP_SIZE Y:5,X:5')
commander.handle_input('TERRAIN_LINE 0 "xxxxx"')
else:
commander.handle_input('MAP_SIZE Y:5,X:5')
commander.handle_input('TERRAIN_LINE 0 "xxxxx"')