import queue
import sys
import os
-from parser import ArgError, Parser
-from server_.game import World, GameError
+import parser
+import server_.game
+import game_common
# Avoid "Address already in use" errors.
return fib(n-1) + fib(n-2)
-class CommandHandler:
+class CommandHandler(game_common.Commander, server_.game.Commander):
- def __init__(self, queues_out={}):
- from multiprocessing import Pool
- self.queues_out = queues_out
- self.world = World()
- self.parser = Parser(self)
+ 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, abort_on_error=False,
+ store=True):
"""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)
- except ArgError as e:
+ if 'connection_id' in list(signature(command).parameters):
+ 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 GameError as e:
+ except server_.game.GameError as e:
self.send_to(connection_id, 'GAME ERROR: ' + str(e))
if abort_on_error:
exit(1)
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.
"""
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, connection_id):
- """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.proceed()
- cmd_MOVE.argtypes = 'string'
-
- def cmd_WAIT(self, connection_id):
- """Set player task to 'wait', finish player turn."""
- self.world.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:].
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')
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"')
+ 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()
projects / plomrogue2-experiments / blobdiff