X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=plomrogue%2Fcommands.py;h=24e991c8f89e4c2b2605f9c29aef4d170fd36dd1;hb=feb0ffb7c7523ddee0cbd685cbc9c2e768a56cbd;hp=df4b7e204a26b353c8e46db71281e7b9d345717e;hpb=a789724e6b1b5eb514f82ac4d7092f7575180c31;p=plomrogue2 diff --git a/plomrogue/commands.py b/plomrogue/commands.py index df4b7e2..24e991c 100644 --- a/plomrogue/commands.py +++ b/plomrogue/commands.py @@ -68,7 +68,7 @@ def cmd_LOGIN(game, nick, connection_id): cmd_LOGIN.argtypes = 'string' def cmd_BECOME_ADMIN(game, password, connection_id): - player = game.thing_types['Player'](game) + player = game.get_player(connection_id) if not player: raise GameError('need to be logged in for this') if password in game.admin_passwords: @@ -92,23 +92,21 @@ def cmd_SET_TILE_CONTROL(game, yx, control_char, connection_id): map_control = game.get_map(big_yx, 'control') map_control[little_yx] = control_char game.changed = True - game.record_fov_change((big_yx, little_yx)) + game.record_change((big_yx, little_yx), 'fov') cmd_SET_TILE_CONTROL.argtypes = 'yx_tuple:nonneg char' -def cmd_THING_PROTECTION(game, thing_id, protection_char, connection_id): +def cmd_THING_PROTECTION(game, protection_char, connection_id): player = game.get_player(connection_id) if not player: raise GameError('need to be logged in for this') if not game.sessions[connection_id]['status'] == 'admin': raise GameError('need to be admin for this') - t = game.get_thing(thing_id) - if not t: - raise GameError('thing of ID %s not found' % thing_id) - t.protection = protection_char + if not player.carrying: + raise GameError('need to carry a thing to protect it') + player.carrying.protection = protection_char game.changed = True - # FIXME: pseudo-FOV-change actually - game.record_fov_change(t.position) -cmd_THING_PROTECTION.argtypes = 'int:pos char' + game.record_change(player.carrying.position, 'other') +cmd_THING_PROTECTION.argtypes = 'char' def cmd_SET_MAP_CONTROL_PASSWORD(game, tile_class, password, connection_id): player = game.get_player(connection_id) @@ -119,7 +117,6 @@ def cmd_SET_MAP_CONTROL_PASSWORD(game, tile_class, password, connection_id): if tile_class == '.': raise GameError('tile class "." must remain unprotected') game.map_control_passwords[tile_class] = password - #game.changed = True cmd_SET_MAP_CONTROL_PASSWORD.argtypes = 'char string' def cmd_NICK(game, nick, connection_id): @@ -135,8 +132,7 @@ def cmd_NICK(game, nick, connection_id): t.name = nick game.io.send('CHAT ' + quote(old_nick + ' renamed themselves to ' + nick)) game.changed = True - # FIXME: pseudo-FOV-change actually - game.record_fov_change(t.position) + game.record_change(t.position, 'other') cmd_NICK.argtypes = 'string' def cmd_GET_GAMESTATE(game, connection_id): @@ -183,8 +179,7 @@ def cmd_ANNOTATE(game, yx, msg, pw, connection_id): if big_yx not in game.annotations: game.annotations[big_yx] = {} game.annotations[big_yx][little_yx] = msg - # FIXME: pseudo-FOV-change actually - game.record_fov_change([big_yx, little_yx]) + game.record_change([big_yx, little_yx], 'other') game.changed = True cmd_ANNOTATE.argtypes = 'yx_tuple:nonneg string string' @@ -203,8 +198,7 @@ def cmd_PORTAL(game, yx, msg, pw, connection_id): if big_yx not in game.portals: game.portals[big_yx] = {} game.portals[big_yx][little_yx] = msg - # FIXME: pseudo-FOV-change actually - game.record_fov_change([big_yx, little_yx]) + game.record_change([big_yx, little_yx], 'other') game.changed = True cmd_PORTAL.argtypes = 'yx_tuple:nonneg string string' @@ -250,27 +244,26 @@ def cmd_THING(game, big_yx, little_yx, thing_type, thing_id): raise GameError('illegal thing type %s' % thing_type) _ = game.get_map(big_yx) game.add_thing(thing_type, (big_yx, little_yx), id_=thing_id) - # game.changed = True handled by add_thing cmd_THING.argtypes = 'yx_tuple yx_tuple:nonneg string:thing_type int:nonneg' -def cmd_THING_NAME(game, thing_id, name, pw, connection_id): - # TODO check if thing in FOV - t = game.get_thing(thing_id) - if not t: - raise GameError('thing of ID %s not found' % thing_id) - if not game.can_do_thing_with_pw(t, pw): +def cmd_THING_NAME(game, name, 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 rename it') + if not game.can_do_thing_with_pw(player.carrying, pw): raise GameError('wrong password for thing') if name == ' ': - if hasattr(t.__class__, 'name'): + if hasattr(player.carrying.__class__, 'name'): raise GameError('cannot un-name things of this type') - if hasattr(t, 'name'): - del t.name + if hasattr(player.carrying, 'name'): + del player.carrying.name else: - t.name = name + player.carrying.name = name game.changed = True - # FIXME: pseudo-FOV-change actually - game.record_fov_change(t.position) -cmd_THING_NAME.argtypes = 'int:pos string string' + game.record_change(player.carrying.position, 'other') +cmd_THING_NAME.argtypes = 'string string' def cmd_GOD_THING_NAME(game, thing_id, name): t = game.get_thing(thing_id) @@ -292,9 +285,7 @@ def cmd_THING_DOOR_CLOSED(game, thing_id): raise GameError('thing of ID %s not found' % thing_id) if not t.type_ == 'Door': raise GameError('thing of ID %s not door' % thing_id) - t.blocking = True - t.portable = False - t.thing_char = '#' + t.close() cmd_THING_DOOR_CLOSED.argtypes = 'int:pos' def cmd_THING_MUSICPLAYER_SETTINGS(game, thing_id, playing, index, repeat): @@ -343,10 +334,28 @@ def cmd_PLAYER_FACE(game, face, connection_id): raise GameError('wrong face string length') game.faces[t.name] = face game.changed = True - # FIXME: pseudo-FOV-change actually - game.record_fov_change(t.position) + game.record_change(t.position, 'other') cmd_PLAYER_FACE.argtypes = 'string' +def cmd_PLAYER_HAT(game, hat, connection_id): + t = game.get_player(connection_id) + if not t: + raise GameError('can only edit hat when already logged in') + if not t.name in game.hats: + raise GameError('not currently wearing an editable hat') + if len(hat) != 18: + raise GameError('wrong hat string length') + legal_chars = t.get_cookie_chars() + for c in hat: + if c not in legal_chars: + raise GameError('used illegal character: "%s" – ' + 'allowed characters: %s' + % (c, legal_chars)) + game.hats[t.name] = hat + game.changed = True + game.record_change(t.position, 'other') +cmd_PLAYER_HAT.argtypes = 'string' + def cmd_GOD_PLAYER_FACE(game, name, face): if len(face) != 18: raise GameError('wrong face string length') @@ -359,6 +368,10 @@ def cmd_GOD_PLAYER_HAT(game, name, hat): game.hats[name] = hat cmd_GOD_PLAYER_HAT.argtypes = 'string string' +def cmd_GOD_PLAYERS_HAT_CHARS(game, name, hat_chars): + game.players_hat_chars[name] = hat_chars +cmd_GOD_PLAYERS_HAT_CHARS.argtypes = 'string string' + def cmd_THING_HAT_DESIGN(game, thing_id, design): if len(design) != 18: raise GameError('hat design of wrong length')