X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=plomrogue%2Fcommands.py;h=909d5bea68de4d2a50d669066343b79662847d02;hb=7f7742ecc229f9f6b5ab5c28daf11ea2a67ad29a;hp=9c34a1c98058043027e9cf9766c7ac9eeaedacfe;hpb=ee83c5baaf2a207a0e1c025985f59797db7cdf7a;p=plomrogue2
diff --git a/plomrogue/commands.py b/plomrogue/commands.py
index 9c34a1c..909d5be 100644
--- 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')
- game.spawn_point = big_yx, little_yx
+ game.spawn_points += [(big_yx, little_yx)]
cmd_SPAWN_POINT.argtypes = 'yx_tuple yx_tuple:nonneg'
def cmd_LOGIN(game, nick, connection_id):
@@ -128,6 +128,7 @@ def cmd_NICK(game, nick, connection_id):
raise GameError('can only rename when already logged in')
old_nick = t.name
t.name = nick
+ print('DEBUG RENAME %s %s' % (old_nick, nick))
game.io.send('CHAT ' + quote(old_nick + ' renamed themselves to ' + nick))
game.changed = True
game.record_change(t.position, 'other')
@@ -378,6 +379,21 @@ def cmd_THING_DESIGN(game, design, pw, connection_id):
game.record_change(player.carrying.position, 'other')
cmd_THING_DESIGN.argtypes = 'string string'
+def cmd_THING_DESIGN_SIZE(game, size, pw, connection_id):
+ player = game.get_player(connection_id)
+ if not player:
+ raise GameError('need to be logged in for this')
+ if not player.carrying:
+ raise GameError('need to carry a thing to re-draw it')
+ if not game.can_do_thing_with_pw(player.carrying, pw):
+ raise GameError('wrong password for thing')
+ if not hasattr(player.carrying, 'design'):
+ raise GameError('carried thing not designable')
+ if player.carrying.type_ == 'Hat':
+ raise GameError('may not change Hat size')
+ player.carrying.design_size = size
+cmd_THING_DESIGN_SIZE.argtypes = 'yx_tuple:nonneg string'
+
def cmd_GOD_THING_DESIGN(game, thing_id, design):
t = game.get_thing(thing_id)
if not t:
@@ -389,6 +405,17 @@ def cmd_GOD_THING_DESIGN(game, thing_id, design):
t.design = design
cmd_GOD_THING_DESIGN.argtypes = 'int:pos string'
+def cmd_GOD_THING_DESIGN_SIZE(game, thing_id, size):
+ t = game.get_thing(thing_id)
+ if not t:
+ raise GameError('thing of ID %s not found' % thing_id)
+ if not hasattr(t, 'design'):
+ raise GameError('thing of ID %s not designable' % thing_id)
+ if t.type_ == 'Hat':
+ raise GameError('may not change Hat size')
+ t.design_size = size
+cmd_GOD_THING_DESIGN_SIZE.argtypes = 'int:pos yx_tuple:nonneg'
+
# TODO: refactor similar god and player commands
def cmd_THING_DOOR_KEY(game, key_id, door_id):
@@ -421,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
-cmd_MAP_CONTROL_PRESETS.argtypes = 'bool'
+cmd_MAP_CONTROL_PRESETS.argtypes = 'int:nonneg'
def cmd_THING_SPAWNPOINT_CREATED(game, spawnpoint_id, timestamp):
import datetime
@@ -436,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'
+
+def cmd_INTRO_MSG(game, msg):
+ game.intro_messages += [msg]
+cmd_INTRO_MSG.argtypes = 'string'