From 344a7244795405714b39d6db0597547355ec9bde Mon Sep 17 00:00:00 2001 From: CloudKeeper1 Date: Sun, 26 Mar 2017 13:58:10 +1100 Subject: [PATCH] Changed option entry to msg output kwarg. Griatch - "That way it can still be parsed by the protocol if so needed, but it is also be passed on so the client can do custom stuff with it if it can." --- evennia/commands/default/general.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/evennia/commands/default/general.py b/evennia/commands/default/general.py index 2dc431243..e6f0a5f7e 100644 --- a/evennia/commands/default/general.py +++ b/evennia/commands/default/general.py @@ -417,8 +417,8 @@ class CmdSay(COMMAND_DEFAULT_CLASS): # Build the string to emit to neighbors. emit_string = '%s says, "%s|n"' % (caller.name, speech) - caller.location.msg_contents(emit_string, exclude=caller, - from_obj=caller, options={"type": "say"}) + caller.location.msg_contents(text=(emit_string, {"type": "say"}), + exclude=caller, from_obj=caller) class CmdWhisper(COMMAND_DEFAULT_CLASS): @@ -460,7 +460,7 @@ class CmdWhisper(COMMAND_DEFAULT_CLASS): # Build the string to emit to receiver. emit_string = '%s whispers, "%s|n"' % (caller.name, speech) - receiver.msg(emit_string, from_obj=caller, options={"type": "whisper"}) + receiver.msg(text=(emit_string, {"type": "Whisper"}), from_obj=caller) class CmdPose(COMMAND_DEFAULT_CLASS): @@ -503,8 +503,8 @@ class CmdPose(COMMAND_DEFAULT_CLASS): self.caller.msg(msg) else: msg = "%s%s" % (self.caller.name, self.args) - self.caller.location.msg_contents(msg, from_obj=self.caller, - options={"type": "pose"}) + self.caller.location.msg_contents(text=(msg, {"type": "pose"}), + from_obj=self.caller) class CmdAccess(COMMAND_DEFAULT_CLASS):