X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=plomrogue%2Fcommands.py;h=909d5bea68de4d2a50d669066343b79662847d02;hb=253f4ce3544c6e9982ba5296c4b28f5fc1888db5;hp=8ec6f524d22e8283ba13fc47424dc4e18352de2d;hpb=e67306357a830cabdd5ce86b2b333499d99da325;p=plomrogue2 diff --git a/plomrogue/commands.py b/plomrogue/commands.py index 8ec6f52..909d5be 100644 --- a/plomrogue/commands.py +++ b/plomrogue/commands.py @@ -1,118 +1,157 @@ from plomrogue.misc import quote -from plomrogue.errors import GameError -from plomrogue.mapping import YX, MapGeometrySquare, MapGeometryHex, Map +from plomrogue.errors import GameError, ArgError +from plomrogue.misc import Terrain +# TODO: instead of sending tasks, thing types etc. on request, send them on connection + def cmd_TASKS(game, connection_id): - tasks = [] game.io.send('TASKS ' + ','.join(game.tasks.keys()), connection_id) cmd_TASKS.argtypes = '' -def cmd_ALL(game, msg, connection_id): +def cmd_THING_TYPES(game, connection_id): + for t_t in game.thing_types.values(): + game.io.send('THING_TYPE %s %s' % (t_t.get_type(), quote(t_t.symbol_hint)), + connection_id) +cmd_THING_TYPES.argtypes = '' - def lower_msg_by_volume(msg, volume): - lowered_msg = '' - for c in msg: - c = c - while random.random() > volume * 8: - if c.isupper(): - c = c.lower() - elif c != '.' and c != ' ': - c = '.' - else: - c = ' ' - lowered_msg += c - return lowered_msg - - import random - if not connection_id in game.sessions: +def cmd_TERRAINS(game, connection_id): + for t in game.terrains.values(): + game.io.send('TERRAIN %s %s' % (quote(t.character), + quote(t.description)), connection_id) +cmd_TERRAINS.argtypes = '' + +def cmd_TERRAIN(game, character, description, + blocks_light, blocks_sound, blocks_movement): + game.terrains[character] = Terrain(character, description, blocks_light, + 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: raise GameError('need to be logged in for this') - speaker = game.get_thing(game.sessions[connection_id], False) - n_max = 255 - map_size = game.map.size_i - dijkstra_map = [n_max for i in range(game.map.size_i)] - dijkstra_map[game.map.get_position_index(speaker.position)] = 0 - shrunk = True - while shrunk: - shrunk = False - for i in range(map_size): - if game.map.terrain[i] == 'X': - continue - neighbors = game.map_geometry.get_neighbors_i(i) - for direction in [d for d in neighbors if neighbors[d]]: - j = neighbors[direction] - if dijkstra_map[j] < dijkstra_map[i] - 1: - dijkstra_map[i] = dijkstra_map[j] + 1 - shrunk = True - #print('DEBUG') - #line_to_print = [] - #x = 0 - #for n in dijkstra_map: - # line_to_print += ['%3s' % n] - # x += 1 - # if x >= game.map.size.x: - # x = 0 - # print(' '.join(line_to_print)) - for c_id in game.sessions: - listener = game.get_thing(game.sessions[c_id], create_unfound=False) - listener_vol = dijkstra_map[game.map.get_position_index(listener.position)] - volume = 1 / max(1, listener_vol) - lowered_msg = lower_msg_by_volume(msg, volume) - lowered_nick = lower_msg_by_volume(speaker.nickname, volume) - game.io.send('CHAT ' + - quote('(volume: %.2f) %s: %s' % (volume, lowered_nick, - lowered_msg)), - c_id) + if speaker.drunk > 0: + import random + drunken_msg = '' + for c in msg: + if random.random() > 0.85: + c = random.choice(['l', 'll', 'n', 'nhg', 'w', 'wl', 'bw']) + drunken_msg += c + msg = drunken_msg + speaker.sound(speaker.name, msg) cmd_ALL.argtypes = 'string' +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_points += [(big_yx, little_yx)] +cmd_SPAWN_POINT.argtypes = 'yx_tuple yx_tuple:nonneg' + def cmd_LOGIN(game, nick, connection_id): - for t in [t for t in game.things if t.type_ == 'player' and t.nickname == nick]: - raise GameError('name already in use') - if connection_id in game.sessions: + nick = nick.strip() + if len(nick) == 0: + raise GameError('empty name') + if game.get_player(connection_id): raise GameError('cannot log in twice') - 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('LOGIN_OK', connection_id) - t.nickname = nick - game.io.send('CHAT ' + quote(t.nickname + ' entered the map.')) - game.io.send('PLAYER_ID %s' % t.id_, connection_id) - game.changed = True + game.login_requests += [(nick, connection_id)] cmd_LOGIN.argtypes = 'string' +def cmd_BECOME_ADMIN(game, password, connection_id): + player = game.get_player(connection_id) + if not player: + raise GameError('need to be logged in for this') + if password in game.admin_passwords: + game.sessions[connection_id]['status'] = 'admin' + game.io.send('ADMIN_OK', connection_id) + else: + raise GameError('wrong password') +cmd_BECOME_ADMIN.argtypes = 'string' + +def cmd_ADMIN_PASSWORD(game, password): + game.admin_passwords += [password] +cmd_ADMIN_PASSWORD.argtypes = 'string' + +def cmd_SET_TILE_CONTROL(game, yx, control_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') + big_yx, little_yx = player.fov_stencil.source_yxyx(yx) + map_control = game.get_map(big_yx, 'control') + map_control[little_yx] = control_char + game.changed = True + game.record_change((big_yx, little_yx), 'fov') +cmd_SET_TILE_CONTROL.argtypes = 'yx_tuple:nonneg char' + +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') + if not player.carrying: + raise GameError('need to carry a thing to protect it') + player.carrying.protection = protection_char + game.changed = True + 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) + 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') + if tile_class == '.': + raise GameError('tile class "." must remain unprotected') + game.map_control_passwords[tile_class] = password +cmd_SET_MAP_CONTROL_PASSWORD.argtypes = 'char string' + def cmd_NICK(game, nick, connection_id): - for t in [t for t in game.things if t.type_ == 'player' and t.nickname == nick]: + 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 not connection_id in game.sessions: + t = game.get_player(connection_id) + if not t: raise GameError('can only rename when already logged in') - t_id = game.sessions[connection_id] - t = game.get_thing(t_id, False) - old_nick = t.nickname - t.nickname = nick + 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') cmd_NICK.argtypes = 'string' def cmd_GET_GAMESTATE(game, connection_id): game.send_gamestate(connection_id) cmd_GET_GAMESTATE.argtypes = '' -#def cmd_QUERY(game, target_nick, msg, connection_id): -# if not connection_id in game.sessions: -# raise GameError('can only query when logged in') -# t = game.get_thing(game.sessions[connection_id], False) -# source_nick = t.nickname -# for t in [t for t in game.things if t.type_ == 'player' and t.nickname == target_nick]: -# for c_id in game.sessions: -# if game.sessions[c_id] == t.id_: -# game.io.send('CHAT ' + quote(source_nick+ '->' + target_nick + ': ' + msg), c_id) -# game.io.send('CHAT ' + quote(source_nick+ '->' + target_nick + ': ' + msg), connection_id) -# return -# raise GameError('target user offline') -# raise GameError('can only query with registered nicknames') -#cmd_QUERY.argtypes = 'string string' +# def cmd_QUERY(game, target_nick, msg, connection_id): +# if not connection_id in game.sessions: +# raise GameError('can only query when logged in') +# t = game.get_thing(game.sessions[connection_id], False) +# source_nick = t.name +# for t in [t for t in game.things if t.type_ == 'Player' and t.name == target_nick]: +# for c_id in game.sessions: +# if game.sessions[c_id] == t.id_: +# game.io.send('CHAT ' + quote(source_nick+ '->' + target_nick + ': ' + msg), c_id) +# game.io.send('CHAT ' + quote(source_nick+ '->' + target_nick + ': ' + msg), connection_id) +# return +# raise GameError('target user offline') +# raise GameError('can only query with registered nicknames') +# cmd_QUERY.argtypes = 'string string' def cmd_PING(game, connection_id): game.io.send('PONG', connection_id) @@ -123,66 +162,308 @@ def cmd_TURN(game, n): cmd_TURN.argtypes = 'int:nonneg' def cmd_ANNOTATE(game, yx, msg, pw, connection_id): - player = game.get_thing(game.sessions[connection_id], False) - if player.fov_stencil[yx] != '.': + if len(msg) > 500: + raise ArgError('annotation text must be <= 500 characters') + player = game.get_player(connection_id) + big_yx, little_yx = player.fov_stencil.source_yxyx(yx) + if not player.fov_test(big_yx, little_yx): raise GameError('cannot annotate tile outside field of view') - if not game.can_do_tile_with_pw(yx, pw): + if not game.can_do_tile_with_pw(big_yx, little_yx, pw): raise GameError('wrong password for tile') if msg == ' ': - if yx in game.annotations: - del game.annotations[yx] + if big_yx in game.annotations: + if little_yx in game.annotations[big_yx]: + del game.annotations[big_yx][little_yx] else: - game.annotations[yx] = msg + if big_yx not in game.annotations: + game.annotations[big_yx] = {} + game.annotations[big_yx][little_yx] = msg + game.record_change([big_yx, little_yx], 'other') game.changed = True cmd_ANNOTATE.argtypes = 'yx_tuple:nonneg string string' def cmd_PORTAL(game, yx, msg, pw, connection_id): - player = game.get_thing(game.sessions[connection_id], False) - if player.fov_stencil[yx] != '.': + player = game.get_player(connection_id) + big_yx, little_yx = player.fov_stencil.source_yxyx(yx) + if not player.fov_test(big_yx, little_yx): raise GameError('cannot edit portal on tile outside field of view') - if not game.can_do_tile_with_pw(yx, pw): + if not game.can_do_tile_with_pw(big_yx, little_yx, pw): raise GameError('wrong password for tile') if msg == ' ': - if yx in game.portals: - del game.portals[yx] + if big_yx in game.portals: + if little_yx in game.portals[big_yx]: + del game.portals[big_yx][little_yx] else: - game.portals[yx] = msg + if big_yx not in game.portals: + game.portals[big_yx] = {} + game.portals[big_yx][little_yx] = msg + game.record_change([big_yx, little_yx], 'other') game.changed = True cmd_PORTAL.argtypes = 'yx_tuple:nonneg string string' -def cmd_GOD_ANNOTATE(game, yx, msg): - game.annotations[yx] = msg - game.changed = True -cmd_GOD_ANNOTATE.argtypes = 'yx_tuple:nonneg string' +def cmd_GOD_ANNOTATE(game, big_yx, little_yx, msg): + if big_yx not in game.annotations: + game.annotations[big_yx] = {} + game.annotations[big_yx][little_yx] = msg + #game.changed = True +cmd_GOD_ANNOTATE.argtypes = 'yx_tuple yx_tuple:nonneg string' -def cmd_GOD_PORTAL(game, yx, msg): - game.portals[yx] = msg - game.changed = True -cmd_GOD_PORTAL.argtypes = 'yx_tuple:nonneg string' - -def cmd_GET_ANNOTATION(game, yx, connection_id): - player = game.get_thing(game.sessions[connection_id], False) - annotation = '(unknown)'; - if player.fov_stencil[yx] == '.': - annotation = '(none)'; - if yx in game.annotations: - annotation = game.annotations[yx] - game.io.send('ANNOTATION %s %s' % (yx, quote(annotation))) -cmd_GET_ANNOTATION.argtypes = 'yx_tuple:nonneg' - -def cmd_MAP_LINE(game, y, line): - game.map.set_line(y, line) -cmd_MAP_LINE.argtypes = 'int:nonneg string' +def cmd_GOD_PORTAL(game, big_yx, little_yx, msg): + if big_yx not in game.portals: + game.portals[big_yx] = {} + game.portals[big_yx][little_yx] = msg + #game.changed = True +cmd_GOD_PORTAL.argtypes = 'yx_tuple yx_tuple:nonneg string' + +def cmd_MAP_LINE(game, big_yx, y, line): + map_ = game.get_map(big_yx) + map_.set_line(y, line) +cmd_MAP_LINE.argtypes = 'yx_tuple int:nonneg string' def cmd_MAP(game, geometry, size): - map_geometry_class = globals()['MapGeometry' + geometry] + from plomrogue.mapping import MapGeometryHex, MapGeometrySquare + map_geometry_class = MapGeometrySquare + if geometry == 'Hex': + map_geometry_class = MapGeometryHex game.new_world(map_geometry_class(size)) + game.terrains = {} cmd_MAP.argtypes = 'string:map_geometry yx_tuple:pos' -def cmd_MAP_CONTROL_LINE(game, y, line): - game.map_control.set_line(y, line) -cmd_MAP_CONTROL_LINE.argtypes = 'int:nonneg string' +def cmd_MAP_CONTROL_LINE(game, big_yx, y, line): + map_control = game.get_map(big_yx, 'control') + map_control.set_line(y, line) +cmd_MAP_CONTROL_LINE.argtypes = 'yx_tuple int:nonneg string' def cmd_MAP_CONTROL_PW(game, tile_class, password): game.map_control_passwords[tile_class] = password cmd_MAP_CONTROL_PW.argtypes = 'char string' + +def cmd_THING(game, big_yx, little_yx, thing_type, thing_id): + if thing_type not in game.thing_types: + 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) +cmd_THING.argtypes = 'yx_tuple yx_tuple:nonneg string:thing_type int:nonneg' + +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(player.carrying.__class__, 'name'): + raise GameError('cannot un-name things of this type') + if hasattr(player.carrying, 'name'): + del player.carrying.name + else: + player.carrying.name = name + game.changed = True + 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) + if not t: + raise GameError('thing of ID %s not found' % thing_id) + t.name = name +cmd_GOD_THING_NAME.argtypes = 'int:pos string' + +def cmd_GOD_THING_PROTECTION(game, thing_id, protection_char): + t = game.get_thing(thing_id) + if not t: + raise GameError('thing of ID %s not found' % thing_id) + t.protection = protection_char +cmd_GOD_THING_PROTECTION.argtypes = 'int:pos char' + +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() + 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) + if not t: + raise GameError('thing of ID %s not found' % thing_id) + if not t.type_ == 'MusicPlayer': + raise GameError('thing of ID %s not music player' % thing_id) + t.playing = playing + t.playlist_index = index + t.repeat = repeat +cmd_THING_MUSICPLAYER_SETTINGS.argtypes = 'int:pos bool int bool' + +def cmd_THING_MUSICPLAYER_PLAYLIST_ITEM(game, thing_id, title, length): + t = game.get_thing(thing_id) + if not t: + raise GameError('thing of ID %s not found' % thing_id) + if not t.type_ == 'MusicPlayer': + raise GameError('thing of ID %s not music player' % thing_id) + t.playlist += [(title, length)] +cmd_THING_MUSICPLAYER_PLAYLIST_ITEM.argtypes = 'int:pos string int:pos' + +def cmd_THING_BOTTLE_EMPTY(game, thing_id): + t = game.get_thing(thing_id) + if not t: + raise GameError('thing of ID %s not found' % thing_id) + if not t.type_ == 'Bottle': + raise GameError('thing of ID %s not bottle' % thing_id) + t.empty() +cmd_THING_BOTTLE_EMPTY.argtypes = 'int:pos' + +def cmd_THING_INSTALLED(game, thing_id): + t = game.get_thing(thing_id) + if not t: + raise GameError('thing of ID %s not found' % thing_id) + if not hasattr(t, 'installable'): + raise GameError('thing of ID %s not installable' % thing_id) + t.install() +cmd_THING_INSTALLED.argtypes = 'int:pos' + +def cmd_PLAYER_FACE(game, face, connection_id): + t = game.get_player(connection_id) + if not t: + raise GameError('can only draw face when already logged in') + if len(face) != 18: + raise GameError('wrong face string length') + game.faces[t.name] = face + game.changed = True + game.record_change(t.position, 'other') +cmd_PLAYER_FACE.argtypes = 'string' + +def cmd_GOD_PLAYER_FACE(game, name, face): + if len(face) != 18: + raise GameError('wrong face string length') + game.faces[name] = face +cmd_GOD_PLAYER_FACE.argtypes = 'string string' + +def cmd_GOD_PLAYER_HAT(game, name, hat): + if len(hat) != 18: + raise GameError('wrong hat string length') + 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_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 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_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'