home
·
contact
·
privacy
projects
/
plomrogue2
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor client connection code.
[plomrogue2]
/
plomrogue
/
commands.py
diff --git
a/plomrogue/commands.py
b/plomrogue/commands.py
index 9f7bfff6604bb7c3223d5798a526d7e4947f8553..909d5bea68de4d2a50d669066343b79662847d02 100644
(file)
--- a/
plomrogue/commands.py
+++ b/
plomrogue/commands.py
@@
-53,7
+53,7
@@
def cmd_SPAWN_POINT(game, big_yx, little_yx):
if little_yx.y >= game.map_geometry.size.y or \
little_yx.x >= game.map_geometry.size.x:
raise GameError('illegal spawn point')
if little_yx.y >= game.map_geometry.size.y or \
little_yx.x >= game.map_geometry.size.x:
raise GameError('illegal spawn point')
- game.spawn_point
= big_yx, little_yx
+ game.spawn_point
s += [(big_yx, little_yx)]
cmd_SPAWN_POINT.argtypes = 'yx_tuple yx_tuple:nonneg'
def cmd_LOGIN(game, nick, connection_id):
cmd_SPAWN_POINT.argtypes = 'yx_tuple yx_tuple:nonneg'
def cmd_LOGIN(game, nick, connection_id):
@@
-448,7
+448,7
@@
cmd_THING_CRATE_ITEM.argtypes = 'int:pos int:pos'
def cmd_MAP_CONTROL_PRESETS(game, draw_control_presets):
game.draw_control_presets = draw_control_presets
def cmd_MAP_CONTROL_PRESETS(game, draw_control_presets):
game.draw_control_presets = draw_control_presets
-cmd_MAP_CONTROL_PRESETS.argtypes = '
bool
'
+cmd_MAP_CONTROL_PRESETS.argtypes = '
int:nonneg
'
def cmd_THING_SPAWNPOINT_CREATED(game, spawnpoint_id, timestamp):
import datetime
def cmd_THING_SPAWNPOINT_CREATED(game, spawnpoint_id, timestamp):
import datetime
@@
-463,3
+463,7
@@
def cmd_THING_SPAWNPOINT_CREATED(game, spawnpoint_id, timestamp):
spawnpoint.temporary = True
spawnpoint.created_at = datetime.datetime.fromtimestamp(timestamp)
cmd_THING_SPAWNPOINT_CREATED.argtypes = 'int:pos int:nonneg'
spawnpoint.temporary = True
spawnpoint.created_at = datetime.datetime.fromtimestamp(timestamp)
cmd_THING_SPAWNPOINT_CREATED.argtypes = 'int:pos int:nonneg'
+
+def cmd_INTRO_MSG(game, msg):
+ game.intro_messages += [msg]
+cmd_INTRO_MSG.argtypes = 'string'