X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=plomrogue%2Fcommands.py;h=e40f5306585ad0541811fb89ff137be389672ff7;hb=70b12aa9c1fe6933cfc7e19775b67673d2e93768;hp=12389c653d9584da3f4260bf4f59dbb92ed19f85;hpb=d5f31d8172456933650aee47f8fe730d98839181;p=plomrogue2 diff --git a/plomrogue/commands.py b/plomrogue/commands.py index 12389c6..e40f530 100644 --- a/plomrogue/commands.py +++ b/plomrogue/commands.py @@ -1,46 +1,97 @@ from plomrogue.misc import quote from plomrogue.errors import GameError -from plomrogue.mapping import YX, MapGeometrySquare, MapGeometryHex +from plomrogue.mapping import YX, MapGeometrySquare, MapGeometryHex, DijkstraMap +# 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_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 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, largest_audible_distance): + import random + factor = largest_audible_distance / 8 + lowered_msg = '' + for c in msg: + c = c + while random.random() > volume * factor: + if c.isupper(): + c = c.lower() + elif c != '.' and c != ' ': + c = '.' + else: + c = ' ' + lowered_msg += c + return lowered_msg + if not connection_id in game.sessions: raise GameError('need to be logged in for this') - t = game.get_thing(game.sessions[connection_id], False) - game.io.send('CHAT ' + quote(t.nickname + ': ' + msg)) + speaker = game.get_thing(game.sessions[connection_id]) + 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]) + 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)), + c_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') - t = game.thing_types['player'](game) + 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__? + 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, False) - old_nick = t.nickname - t.nickname = nick + t = game.get_thing(t_id) + 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' @@ -49,20 +100,20 @@ 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) @@ -73,26 +124,34 @@ def cmd_TURN(game, n): cmd_TURN.argtypes = 'int:nonneg' def cmd_ANNOTATE(game, yx, msg, pw, connection_id): - if not game.can_do_tile_with_pw(yx, pw): + player = game.get_thing(game.sessions[connection_id]) + 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(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): - if not game.can_do_tile_with_pw(yx, pw): + player = game.get_thing(game.sessions[connection_id]) + 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(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_GOD_PORTAL.argtypes = 'yx_tuple:nonneg string string' +cmd_PORTAL.argtypes = 'yx_tuple:nonneg string string' def cmd_GOD_ANNOTATE(game, yx, msg): game.annotations[yx] = msg @@ -105,9 +164,13 @@ def cmd_GOD_PORTAL(game, yx, msg): cmd_GOD_PORTAL.argtypes = 'yx_tuple:nonneg string' def cmd_GET_ANNOTATION(game, yx, connection_id): - annotation = '(none)'; - if yx in game.annotations: - annotation = game.annotations[yx] + player = game.get_thing(game.sessions[connection_id]) + source_yx = player.fov_stencil.source_yx(yx) + annotation = '(unknown)'; + if player.fov_test(source_yx): + annotation = '(none)'; + 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' @@ -127,3 +190,26 @@ cmd_MAP_CONTROL_LINE.argtypes = '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, 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: + raise GameError('illegal position %s' % yx) + t_old = None + if thing_id > 0: + t_old = game.get_thing(thing_id) + t_new = game.thing_types[thing_type](game, id_=thing_id, position=yx) + if t_old: + game.things[game.things.index(t_old)] = t_new + else: + 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'