def handle_input(self, input_, connection_id=None, abort_on_error=False):
"""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)
+ if 'connection_id' in list(signature(command).parameters):
+ command(connection_id=connection_id)
+ else:
+ command()
except ArgError as e:
self.send_to(connection_id, 'ARGUMENT ERROR: ' + str(e))
if abort_on_error:
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.terrain_map[y * width:(y + 1) * width]
- self.send_all('TERRAIN_LINE %5s %s' % (y, self.quoted(terrain_line)))
+ self.send_all('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_, self.stringify_yx(thing.position)))
+ 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.world.proceed_to_next_player_turn()
self.send_all_gamestate()
- def cmd_MOVE(self, direction, connection_id):
+ 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: '
self.proceed()
cmd_MOVE.argtypes = 'string'
- def cmd_WAIT(self, connection_id):
+ def cmd_WAIT(self):
"""Set player task to 'wait', finish player turn."""
self.world.get_player().set_task('wait')
self.proceed()
- def cmd_MAP_SIZE(self, yx, connection_id):
+ def cmd_MAP_SIZE(self, yx):
self.world.set_map_size(yx)
cmd_MAP_SIZE.argtypes = 'yx_tuple:nonneg'
- def cmd_TERRAIN_LINE(self, y, line, connection_id):
+ def cmd_TERRAIN_LINE(self, y, line):
self.world.set_map_line(y, line)
cmd_TERRAIN_LINE.argtypes = 'int:nonneg string'
- def cmd_THING_TYPE(self, i, type_, connection_id):
+ def cmd_THING_TYPE(self, i, type_):
t = self.world.get_thing(i)
t.type_ = type_
cmd_THING_TYPE.argtypes = 'int:nonneg string'
- def cmd_THING_POS(self, i, yx, connection_id):
+ def cmd_THING_POS(self, i, yx):
t = self.world.get_thing(i)
t.position = list(yx)
cmd_THING_POS.argtypes = 'int:nonneg yx_tuple:nonneg'