From 6782f7d6358ded7ff826e6c8cae3cef40a2ead55 Mon Sep 17 00:00:00 2001 From: Chiizujin Date: Thu, 15 Dec 2022 11:49:46 +1100 Subject: [PATCH] Change get and drop to use funcparser embeds --- evennia/commands/default/general.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/evennia/commands/default/general.py b/evennia/commands/default/general.py index 8a73d49b2e..9fa6f52b22 100644 --- a/evennia/commands/default/general.py +++ b/evennia/commands/default/general.py @@ -426,8 +426,7 @@ class CmdGet(COMMAND_DEFAULT_CLASS): caller.msg("This can't be picked up.") else: singular, _ = obj.get_numbered_name(1, caller) - caller.msg(f"You pick up {singular}.") - caller.location.msg_contents(f"{caller.name} picks up {singular}.", exclude=caller) + caller.location.msg_contents(f"$You() $conj(pick) up {singular}.", from_obj=caller) # calling at_get hook method obj.at_get(caller) @@ -475,8 +474,7 @@ class CmdDrop(COMMAND_DEFAULT_CLASS): caller.msg("This couldn't be dropped.") else: singular, _ = obj.get_numbered_name(1, caller) - caller.msg(f"You drop {singular}.") - caller.location.msg_contents(f"{caller.name} drops {singular}.", exclude=caller) + caller.location.msg_contents(f"$You() $conj(drop) {singular}.", from_obj=caller) # Call the object script's at_drop() method. obj.at_drop(caller)