diff --git a/cmdhandler.py b/cmdhandler.py index 46d194c701..87f2a09d60 100755 --- a/cmdhandler.py +++ b/cmdhandler.py @@ -63,12 +63,32 @@ def handle(cdat): return # If it's prefixed by an '@', it's a staff command. if parsed_input['root_cmd'][0] != '@': + # Shortened say alias. + if parsed_input['root_cmd'][0] == '"': + parsed_input['splitted'].insert(0, "say") + parsed_input['splitted'][1] = parsed_input['splitted'][1][1:] + parsed_input['root_cmd'] = 'say' + # Shortened pose alias. + elif parsed_input['root_cmd'][0] == ':': + parsed_input['splitted'].insert(0, "pose") + parsed_input['splitted'][1] = parsed_input['splitted'][1][1:] + parsed_input['root_cmd'] = 'pose' + # Pose without space alias. + elif parsed_input['root_cmd'][0] == ';': + parsed_input['splitted'].insert(0, "pose/nospace") + parsed_input['root_chunk'] = ['pose', 'nospace'] + parsed_input['splitted'][1] = parsed_input['splitted'][1][1:] + parsed_input['root_cmd'] = 'pose' cmd = getattr(commands_general, 'cmd_%s' % (parsed_input['root_cmd'],), None ) else: parsed_input['root_cmd'] = parsed_input['root_cmd'][1:] cmd = getattr(commands_privileged, 'cmd_%s' % (parsed_input['root_cmd'],), None ) else: cmd = getattr(commands_unloggedin, 'cmd_%s' % (parsed_input['root_cmd'],), None ) + + # Debugging stuff. + #session.msg("ROOT : %s" % (parsed_input['root_cmd'],)) + #session.msg("SPLIT: %s" % (parsed_input['splitted'],)) if callable(cmd): cdat['uinput'] = parsed_input diff --git a/commands_general.py b/commands_general.py index 6fd83e9c59..59f4d60dea 100644 --- a/commands_general.py +++ b/commands_general.py @@ -355,6 +355,7 @@ def cmd_pose(cdat): Pose/emote command. """ session = cdat['session'] + switches = cdat['uinput']['root_chunk'][1:] if not functions_general.cmd_check_num_args(session, cdat['uinput']['splitted'], 1, errortext="Do what?"): return @@ -363,10 +364,15 @@ def cmd_pose(cdat): pobject = session.get_pobject() speech = ' '.join(cdat['uinput']['splitted'][1:]) + if "nospace" in switches: + sent_msg = "%s%s" % (pobject.get_name(show_dbref=False), speech) + else: + sent_msg = "%s %s" % (pobject.get_name(show_dbref=False), speech) + players_present = [player for player in session_list if player.get_pobject().get_location() == session.get_pobject().get_location()] for player in players_present: - player.msg("%s %s" % (pobject.get_name(show_dbref=False), speech)) + player.msg(sent_msg) def cmd_help(cdat): """