X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=plomrogue%2Fcommands.py;h=909d5bea68de4d2a50d669066343b79662847d02;hb=253f4ce3544c6e9982ba5296c4b28f5fc1888db5;hp=50445e7f9c62f557b098d7e4781723679c11c74d;hpb=1ff4078be77dba8b4c4a5213490233a7642c2b6e;p=plomrogue2 diff --git a/plomrogue/commands.py b/plomrogue/commands.py index 50445e7..909d5be 100644 --- a/plomrogue/commands.py +++ b/plomrogue/commands.py @@ -28,6 +28,12 @@ def cmd_TERRAIN(game, character, description, blocks_sound, blocks_movement) cmd_TERRAIN.argtypes = 'char string bool bool bool' +def cmd_TERRAIN_TAG(game, character, tag): + if not character in game.terrains: + raise GameError('terrain does not exist: %s' % character) + game.terrains[character].tags.add(tag) +cmd_TERRAIN_TAG.argtypes = 'char string' + def cmd_ALL(game, msg, connection_id): speaker = game.get_player(connection_id) if not speaker: @@ -47,32 +53,16 @@ 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): nick = nick.strip() if len(nick) == 0: raise GameError('empty name') - for t in [t for t in game.things if t.type_ == 'Player' and t.name == nick]: - raise GameError('name already in use') if game.get_player(connection_id): raise GameError('cannot log in twice') - t = game.add_thing('Player', game.spawn_point) - t.name = nick - t.thing_char = game.get_next_player_char() - game.sessions[connection_id] = { - 'thing_id': t.id_, - 'status': 'player' - } - game.io.send('PLAYER_ID %s' % t.id_, connection_id) - game.io.send('LOGIN_OK', connection_id) - game.io.send('CHAT ' + quote(t.name + ' entered the map.')) - for s in [s for s in game.things - if s.type_ == 'SpawnPoint' and s.name == t.name]: - t.position = s.position - break - # game.changed = True # handled by game.add_thing + game.login_requests += [(nick, connection_id)] cmd_LOGIN.argtypes = 'string' def cmd_BECOME_ADMIN(game, password, connection_id): @@ -138,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') @@ -287,14 +278,16 @@ def cmd_GOD_THING_PROTECTION(game, thing_id, protection_char): t.protection = protection_char cmd_GOD_THING_PROTECTION.argtypes = 'int:pos char' -def cmd_THING_DOOR_CLOSED(game, thing_id): +def cmd_THING_DOOR_CLOSED(game, thing_id, locked): t = game.get_thing(thing_id) if not t: 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.close() -cmd_THING_DOOR_CLOSED.argtypes = 'int:pos' + if locked: + t.lock() +cmd_THING_DOOR_CLOSED.argtypes = 'int:pos bool' def cmd_THING_MUSICPLAYER_SETTINGS(game, thing_id, playing, index, repeat): t = game.get_thing(thing_id) @@ -345,25 +338,6 @@ def cmd_PLAYER_FACE(game, face, connection_id): 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') @@ -380,13 +354,116 @@ 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') +def cmd_THING_DESIGN(game, design, 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': + legal_chars = player.get_cookie_chars() + for c in design: + if c not in legal_chars: + raise GameError('used illegal character: "%s" – ' + 'allowed characters: %s' + % (c, legal_chars)) + size = player.carrying.design_size + if len(design) != size.y * size.x: + raise GameError('design for carried thing of wrong length') + player.carrying.design = design + game.changed = True + 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: raise GameError('thing of ID %s not found' % thing_id) - if t.type_ != 'Hat': - raise GameError('thing of ID %s not a hat' % thing_id) + if not hasattr(t, 'design'): + raise GameError('thing of ID %s not designable' % thing_id) + if len(design) != t.design_size.y * t.design_size.x: + raise GameError('design for thing of ID %s of wrong length' % thing_id) t.design = design -cmd_THING_HAT_DESIGN.argtypes = 'int:pos string' +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): + key = game.get_thing(key_id) + if not key: + raise GameError('thing of ID %s not found' % key_id) + if key.type_ != 'DoorKey': + raise GameError('thing of ID %s not a door key' % key_id) + door = game.get_thing(door_id) + if not door: + raise GameError('thing of ID %s not found' % door_id) + if door.type_ != 'Door': + raise GameError('thing of ID %s not a door' % key_id) + key.door = door +cmd_THING_DOOR_KEY.argtypes = 'int:pos int:pos' + +def cmd_THING_CRATE_ITEM(game, crate_id, item_id): + crate = game.get_thing(crate_id) + if not crate: + raise GameError('thing of ID %s not found' % crate_id) + if crate.type_ != 'Crate': + raise GameError('thing of ID %s not a crate' % crate_id) + item = game.get_thing(item_id) + if not item: + raise GameError('thing of ID %s not found' % item_id) + if item.type_ == 'Crate': + raise GameError('thing of ID %s is a crate' % item_id) + crate.accept(item) +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 = 'int:nonneg' + +def cmd_THING_SPAWNPOINT_CREATED(game, spawnpoint_id, timestamp): + import datetime + spawnpoint = game.get_thing(spawnpoint_id) + if not spawnpoint: + raise GameError('thing of ID %s not found' % spawnpoint_id) + if spawnpoint.type_ != 'SpawnPoint': + raise GameError('thing of ID %s not a SpawnPoint' % spawnpoint_id) + if timestamp == 0: + spawnpoint.temporary = False + else: + 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'