Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change get and drop to use funcparser embeds

Browse source
This commit is contained in:
Chiizujin 2022-12-15 11:49:46 +11:00
parent a331e059be
commit 6782f7d635
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
evennia/commands/default/general.py
View file

@ -426,8 +426,7 @@ class CmdGet(COMMAND_DEFAULT_CLASS):
caller.msg("This can't be picked up.") caller.msg("This can't be picked up.")
else: else:
singular, _ = obj.get_numbered_name(1, caller) singular, _ = obj.get_numbered_name(1, caller)
caller.msg(f"You pick up {singular}.") caller.location.msg_contents(f"$You() $conj(pick) up {singular}.", from_obj=caller)
caller.location.msg_contents(f"{caller.name} picks up {singular}.", exclude=caller)
# calling at_get hook method # calling at_get hook method
obj.at_get(caller) obj.at_get(caller)
@ -475,8 +474,7 @@ class CmdDrop(COMMAND_DEFAULT_CLASS):
caller.msg("This couldn't be dropped.") caller.msg("This couldn't be dropped.")
else: else:
singular, _ = obj.get_numbered_name(1, caller) singular, _ = obj.get_numbered_name(1, caller)
caller.msg(f"You drop {singular}.") caller.location.msg_contents(f"$You() $conj(drop) {singular}.", from_obj=caller)
caller.location.msg_contents(f"{caller.name} drops {singular}.", exclude=caller)
# Call the object script's at_drop() method. # Call the object script's at_drop() method.
obj.at_drop(caller) obj.at_drop(caller)