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
Start new players in middle of map instead of topleft corner.
[plomrogue2-experiments]
/
new2
/
plomrogue
/
commands.py
diff --git
a/new2/plomrogue/commands.py
b/new2/plomrogue/commands.py
index 9e67ce02600682eaa12823c3d63bf7c6ffaed6a8..4daf0ba5b8365cc19fd98efc6b208407fa2b48f6 100644
(file)
--- a/
new2/plomrogue/commands.py
+++ b/
new2/plomrogue/commands.py
@@
-1,5
+1,6
@@
from plomrogue.misc import quote
from plomrogue.errors import GameError
from plomrogue.misc import quote
from plomrogue.errors import GameError
+from plomrogue.mapping import YX
@@
-19,6
+20,7
@@
def cmd_LOGIN(game, nick, connection_id):
game.io.send('META ' + quote('you rename yourself to: ' + nick), connection_id)
else:
t = game.thing_types['player'](game)
game.io.send('META ' + quote('you rename yourself to: ' + nick), connection_id)
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('META ' + quote('you are now: ' + nick), connection_id)
game.things += [t] # TODO refactor into Thing.__init__?
game.sessions[connection_id] = t.id_
game.io.send('META ' + quote('you are now: ' + nick), connection_id)
@@
-49,8
+51,7
@@
def cmd_TURN(game, n):
game.turn = n
cmd_TURN.argtypes = 'int:nonneg'
game.turn = n
cmd_TURN.argtypes = 'int:nonneg'
-#def cmd_ANNOTATE(game, yx, connection_id):
-def cmd_ANNOTATE(game, yx, msg):
+def cmd_ANNOTATE(game, yx, msg, connection_id):
if msg == ' ':
if yx in game.annotations:
del game.annotations[yx]
if msg == ' ':
if yx in game.annotations:
del game.annotations[yx]
@@
-66,7
+67,6
@@
def cmd_GET_ANNOTATION(game, yx, connection_id):
game.io.send('ANNOTATION %s %s' % (yx, quote(annotation)))
cmd_GET_ANNOTATION.argtypes = 'yx_tuple:nonneg'
game.io.send('ANNOTATION %s %s' % (yx, quote(annotation)))
cmd_GET_ANNOTATION.argtypes = 'yx_tuple:nonneg'
-# TODO: disallow these commands from clients? (maybe by failing on connection_id?)
def cmd_MAP_LINE(game, y, line):
game.map.set_line(y, line)
cmd_MAP_LINE.argtypes = 'int:nonneg string'
def cmd_MAP_LINE(game, y, line):
game.map.set_line(y, line)
cmd_MAP_LINE.argtypes = 'int:nonneg string'