X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=plomrogue%2Fcommands.py;h=a9bd7938facafcdff695608567b9bd28ac4cf3c8;hb=7385c037c0acb54c06fc7919b5b85548c09f8d65;hp=603e0d32414c5eb8fa756633123d2434f014f499;hpb=75157d7506ff0bee2e1e0020681cdc9c7a19b801;p=plomrogue2 diff --git a/plomrogue/commands.py b/plomrogue/commands.py index 603e0d3..a9bd793 100644 --- a/plomrogue/commands.py +++ b/plomrogue/commands.py @@ -1,13 +1,11 @@ from plomrogue.misc import quote from plomrogue.errors import GameError -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 = '' @@ -24,10 +22,11 @@ def cmd_TERRAINS(game, connection_id): cmd_TERRAINS.argtypes = '' def cmd_ALL(game, msg, connection_id): + from plomrogue.mapping import DijkstraMap def lower_msg_by_volume(msg, volume, largest_audible_distance): import random - factor = largest_audible_distance / 8 + factor = largest_audible_distance / 4 lowered_msg = '' for c in msg: c = c @@ -65,17 +64,26 @@ def cmd_ALL(game, msg, connection_id): c_id) 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_point = 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.name == nick]: raise GameError('name already in use') if game.get_player(connection_id): raise GameError('cannot log in twice') t = game.thing_types['Player'](game) - t.position = (YX(0,0), - YX(game.map_geometry.size.y // 2, game.map_geometry.size.x // 2)) + t.position = game.spawn_point game.things += [t] # TODO refactor into Thing.__init__? t.player_char = game.get_next_player_char() - game.sessions[connection_id] = {'thing_id': t.id_} + game.sessions[connection_id] = { + 'thing_id': t.id_, + 'status': 'player' + } game.io.send('LOGIN_OK', connection_id) t.name = nick game.io.send('CHAT ' + quote(t.name + ' entered the map.')) @@ -83,6 +91,45 @@ def cmd_LOGIN(game, nick, connection_id): game.changed = True cmd_LOGIN.argtypes = 'string' +def cmd_BECOME_ADMIN(game, password, connection_id): + player = game.thing_types['Player'](game) + 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 +cmd_SET_TILE_CONTROL.argtypes = 'yx_tuple:nonneg 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 + game.changed = True +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.name == nick]: raise GameError('name already in use') @@ -99,20 +146,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.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_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) @@ -134,7 +181,7 @@ def cmd_ANNOTATE(game, yx, msg, pw, connection_id): if little_yx in game.annotations[big_yx]: del game.annotations[big_yx][little_yx] else: - if not big_yx in game.annotations: + if big_yx not in game.annotations: game.annotations[big_yx] = {} game.annotations[big_yx][little_yx] = msg game.changed = True @@ -150,23 +197,23 @@ def cmd_PORTAL(game, yx, msg, pw, connection_id): if msg == ' ': if big_yx in game.portals: if little_yx in game.portals[big_yx]: - del game.portals[big_yx][little_xy] + del game.portals[big_yx][little_yx] else: - if not big_yx in game.portals: + if big_yx not in game.portals: game.portals[big_yx] = {} game.portals[big_yx][little_yx] = msg game.changed = True cmd_PORTAL.argtypes = 'yx_tuple:nonneg string string' def cmd_GOD_ANNOTATE(game, big_yx, little_yx, msg): - if not big_yx in game.annotations: + 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, big_yx, little_yx, msg): - if not big_yx in game.portals: + if big_yx not in game.portals: game.portals[big_yx] = {} game.portals[big_yx][little_yx] = msg game.changed = True @@ -175,9 +222,9 @@ cmd_GOD_PORTAL.argtypes = 'yx_tuple yx_tuple:nonneg string' def cmd_GET_ANNOTATION(game, yx, connection_id): player = game.get_player(connection_id) big_yx, little_yx = player.fov_stencil.source_yxyx(yx) - annotation = '(unknown)'; + annotation = '(unknown)' if player.fov_test(big_yx, little_yx): - annotation = '(none)'; + annotation = '(none)' if big_yx in game.annotations: if little_yx in game.annotations[big_yx]: annotation = game.annotations[big_yx][little_yx] @@ -190,7 +237,10 @@ def cmd_MAP_LINE(game, big_yx, 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)) cmd_MAP.argtypes = 'string:map_geometry yx_tuple:pos' @@ -204,9 +254,9 @@ def cmd_MAP_CONTROL_PW(game, tile_class, password): cmd_MAP_CONTROL_PW.argtypes = 'char string' def cmd_THING(game, big_yx, little_yx, thing_type, thing_id): - if not thing_type in game.thing_types: + if thing_type not in game.thing_types: raise GameError('illegal thing type %s' % thing_type) - map_ = game.get_map(big_yx) + _ = game.get_map(big_yx) t_old = None if thing_id > 0: t_old = game.get_thing(thing_id)