X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=plomrogue%2Fcommands.py;h=ed7d3ddeb2b041181a14fdd3ef29f09d50d9b3f1;hb=f0f0c01c001fef0bdc6bf8d60da329e4c7b55223;hp=229285fb8c7f291ff02458367b11e40f89cdb6a9;hpb=884b4b8d9c18896569c5e741f90a6ee67f8db8b2;p=plomrogue2 diff --git a/plomrogue/commands.py b/plomrogue/commands.py index 229285f..ed7d3dd 100644 --- a/plomrogue/commands.py +++ b/plomrogue/commands.py @@ -1,10 +1,10 @@ from plomrogue.misc import quote from plomrogue.errors import GameError -from plomrogue.mapping import YX, MapGeometrySquare, MapGeometryHex, Map +from plomrogue.mapping import YX, MapGeometrySquare, MapGeometryHex, DijkstraMap -# TODO: instead of sending tasks and thing types on request, send them on connection +# TODO: instead of sending tasks, thing types etc. on request, send them on connection def cmd_TASKS(game, connection_id): tasks = [] @@ -13,17 +13,25 @@ cmd_TASKS.argtypes = '' 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(), t_t.symbol_hint), + game.io.send('THING_TYPE %s %s' % (t_t.get_type(), quote(t_t.symbol_hint)), connection_id) cmd_THING_TYPES.argtypes = '' +def cmd_TERRAINS(game, connection_id): + for t in game.terrains.keys(): + game.io.send('TERRAIN %s %s' % (quote(t), quote(game.terrains[t])), + connection_id) +cmd_TERRAINS.argtypes = '' + def cmd_ALL(game, msg, connection_id): - def lower_msg_by_volume(msg, volume): + def lower_msg_by_volume(msg, volume, largest_audible_distance): + import random + factor = largest_audible_distance / 8 lowered_msg = '' for c in msg: c = c - while random.random() > volume * 8: + while random.random() > volume * factor: if c.isupper(): c = c.lower() elif c != '.' and c != ' ': @@ -33,41 +41,25 @@ def cmd_ALL(game, msg, connection_id): lowered_msg += c return lowered_msg - import random if not connection_id in game.sessions: raise GameError('need to be logged in for this') speaker = game.get_thing(game.sessions[connection_id]) - 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)) + largest_audible_distance = 20 + dijkstra_map_class = game.map_geometry.dijkstra_map_class + dijkstra_map = dijkstra_map_class(game.map, speaker.position, + largest_audible_distance) for c_id in game.sessions: listener = game.get_thing(game.sessions[c_id]) - 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) + target_yx = dijkstra_map.target_yx(listener.position, True) + if not target_yx: + continue + listener_distance = dijkstra_map[target_yx] + if listener_distance > largest_audible_distance: + continue + volume = 1 / max(1, listener_distance) + lowered_msg = lower_msg_by_volume(msg, volume, largest_audible_distance) + lowered_nick = lower_msg_by_volume(speaker.name, volume, + largest_audible_distance) game.io.send('CHAT ' + quote('(volume: %.2f) %s: %s' % (volume, lowered_nick, lowered_msg)), @@ -75,7 +67,7 @@ def cmd_ALL(game, msg, connection_id): cmd_ALL.argtypes = 'string' def cmd_LOGIN(game, nick, connection_id): - for t in [t for t in game.things if t.type_ == 'Player' and t.nickname == nick]: + for t in [t for t in game.things if t.type_ == 'Player' and t.name == nick]: raise GameError('name already in use') if connection_id in game.sessions: raise GameError('cannot log in twice') @@ -85,21 +77,21 @@ def cmd_LOGIN(game, nick, connection_id): t.player_char = game.get_next_player_char() 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.')) + t.name = nick + game.io.send('CHAT ' + quote(t.name + ' entered the map.')) game.io.send('PLAYER_ID %s' % t.id_, connection_id) game.changed = True cmd_LOGIN.argtypes = '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]: + 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: raise GameError('can only rename when already logged in') t_id = game.sessions[connection_id] t = game.get_thing(t_id) - old_nick = t.nickname - t.nickname = nick + old_nick = t.name + t.name = nick game.io.send('CHAT ' + quote(old_nick + ' renamed themselves to ' + nick)) game.changed = True cmd_NICK.argtypes = 'string' @@ -112,8 +104,8 @@ cmd_GET_GAMESTATE.argtypes = '' # 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]: +# 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) @@ -133,29 +125,31 @@ cmd_TURN.argtypes = 'int:nonneg' def cmd_ANNOTATE(game, yx, msg, pw, connection_id): player = game.get_thing(game.sessions[connection_id]) - if player.fov_stencil[yx] != '.': + source_yx = player.fov_stencil.source_yx(yx) + if not player.fov_test(source_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(source_yx, pw): raise GameError('wrong password for tile') if msg == ' ': - if yx in game.annotations: - del game.annotations[yx] + if source_yx in game.annotations: + del game.annotations[source_yx] else: - game.annotations[yx] = msg + game.annotations[source_yx] = msg 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]) - if player.fov_stencil[yx] != '.': + source_yx = player.fov_stencil.source_yx(yx) + if not player.fov_test(source_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(source_yx, pw): raise GameError('wrong password for tile') if msg == ' ': - if yx in game.portals: - del game.portals[yx] + if source_yx in game.portals: + del game.portals[source_yx] else: - game.portals[yx] = msg + game.portals[source_yx] = msg game.changed = True cmd_PORTAL.argtypes = 'yx_tuple:nonneg string string' @@ -171,11 +165,12 @@ cmd_GOD_PORTAL.argtypes = 'yx_tuple:nonneg string' def cmd_GET_ANNOTATION(game, yx, connection_id): player = game.get_thing(game.sessions[connection_id]) + source_yx = player.fov_stencil.source_yx(yx) annotation = '(unknown)'; - if player.fov_stencil[yx] == '.': + if player.fov_test(source_yx): annotation = '(none)'; - if yx in game.annotations: - annotation = game.annotations[yx] + if source_yx in game.annotations: + annotation = game.annotations[source_yx] game.io.send('ANNOTATION %s %s' % (yx, quote(annotation))) cmd_GET_ANNOTATION.argtypes = 'yx_tuple:nonneg' @@ -199,7 +194,7 @@ cmd_MAP_CONTROL_PW.argtypes = 'char string' def cmd_THING(game, yx, thing_type, thing_id): if not thing_type in game.thing_types: raise GameError('illegal thing type %s' % thing_type) - if yx.y < 0 or yx.x < 0 or yx.y >= game.map.size.y or yx.x >= game.map.size.x: + if not game.map.inside(yx): raise GameError('illegal position %s' % yx) t_old = None if thing_id > 0: @@ -211,3 +206,10 @@ def cmd_THING(game, yx, thing_type, thing_id): game.things += [t_new] game.changed = True cmd_THING.argtypes = 'yx_tuple:nonneg string:thing_type int:nonneg' + +def cmd_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_THING_NAME.argtypes = 'int:pos string'