from plomrogue.misc import quote
from plomrogue.errors import GameError
-from plomrogue.mapping import YX
+from plomrogue.mapping import YX, MapGeometrySquare, MapGeometryHex
game.io.send('CHAT ' + quote(t.nickname + ': ' + msg))
cmd_ALL.argtypes = 'string'
+# TOOD split into two commands
def cmd_LOGIN(game, nick, connection_id):
for t in [t for t in game.things if t.type_ == 'player' and t.nickname == nick]:
raise GameError('name already in use')
t.position = YX(game.map.size.y // 2, game.map.size.x // 2)
game.things += [t] # TODO refactor into Thing.__init__?
game.sessions[connection_id] = t.id_
- game.io.send('LOGIN_OK')
+ game.io.send('LOGIN_OK', connection_id)
t.nickname = nick
game.io.send('CHAT ' + quote(t.nickname + ' entered the map.'))
game.io.send('PLAYER_ID %s' % t.id_, connection_id)
cmd_QUERY.argtypes = 'string string'
def cmd_PING(game, connection_id):
- game.io.send('PONG')
+ game.io.send('PONG', connection_id)
cmd_PING.argtypes = ''
def cmd_TURN(game, n):
game.changed = True
cmd_ANNOTATE.argtypes = 'yx_tuple:nonneg string'
+def cmd_PORTAL(game, yx, msg, connection_id):
+ if msg == ' ':
+ if yx in game.portals:
+ del game.portals[yx]
+ else:
+ game.portals[yx] = msg
+ game.changed = True
+cmd_PORTAL.argtypes = 'yx_tuple:nonneg string'
+
def cmd_GET_ANNOTATION(game, yx, connection_id):
annotation = '(none)';
if yx in game.annotations:
game.map.set_line(y, line)
cmd_MAP_LINE.argtypes = 'int:nonneg string'
-def cmd_MAP(game, size):
- game.new_world(size)
-cmd_MAP.argtypes = 'yx_tuple:pos'
+def cmd_MAP(game, geometry, size):
+ map_geometry_class = globals()['MapGeometry' + geometry]
+ game.new_world(map_geometry_class(size))
+cmd_MAP.argtypes = 'string:map_geometry yx_tuple:pos'