X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=new2%2Fplomrogue%2Fcommands.py;h=a80731da48336af7db5dbd9359a00ad56a4ad05f;hb=HEAD;hp=8aec89b6583f3376e7acdeebf61fc12fd25e8c89;hpb=59a3670b274793215fbea550d2ec7f90527ad53c;p=plomrogue2-experiments
diff --git a/new2/plomrogue/commands.py b/new2/plomrogue/commands.py
index 8aec89b..a80731d 100644
--- a/new2/plomrogue/commands.py
+++ b/new2/plomrogue/commands.py
@@ -1,6 +1,6 @@
from plomrogue.misc import quote
from plomrogue.errors import GameError
-from plomrogue.mapping import YX
+from plomrogue.mapping import YX, MapGeometrySquare, MapGeometryHex
@@ -11,21 +11,26 @@ def cmd_ALL(game, msg, connection_id):
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')
if connection_id in game.sessions:
t_id = game.sessions[connection_id]
t = game.get_thing(t_id, False)
- game.io.send('META ' + quote('you rename yourself to: ' + nick), connection_id)
+ old_nick = t.nickname
+ t.nickname = nick
+ game.io.send('CHAT ' + quote(old_nick + ' renamed themselves to ' + nick))
else:
t = game.thing_types['player'](game)
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 ' + quote('you are now: ' + nick), connection_id)
- t.nickname = nick
- game.io.send('PLAYER_ID %s' % t.id_, connection_id)
+ 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)
+ game.changed = True
cmd_LOGIN.argtypes = 'string'
def cmd_GET_GAMESTATE(game, connection_id):
@@ -48,7 +53,7 @@ def cmd_QUERY(game, target_nick, msg, 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):
@@ -64,6 +69,15 @@ def cmd_ANNOTATE(game, yx, msg, connection_id):
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:
@@ -75,6 +89,7 @@ def cmd_MAP_LINE(game, y, line):
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'