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

Change get, drop, inv to use get_numbered_name()

Browse source
This commit is contained in:
Chiizujin 2022-12-10 12:48:48 +11:00
parent b637afa8cf
commit a6947bfda0
1 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -371,8 +371,9 @@ class CmdInventory(COMMAND_DEFAULT_CLASS):
table = self.styled_table(border="header") table = self.styled_table(border="header")
for item in items: for item in items:
singular, _ = item.get_numbered_name(1, self.caller)
table.add_row( table.add_row(
f"|C{item.name}|n", f"|C{singular}|n",
"{}|n".format(utils.crop(raw_ansi(item.db.desc or ""), width=50) or ""), "{}|n".format(utils.crop(raw_ansi(item.db.desc or ""), width=50) or ""),
) )
string = f"|wYou are carrying:\n{table}" string = f"|wYou are carrying:\n{table}"
@ -424,8 +425,9 @@ class CmdGet(COMMAND_DEFAULT_CLASS):
if not success: if not success:
caller.msg("This can't be picked up.") caller.msg("This can't be picked up.")
else: else:
caller.msg(f"You pick up {obj.name}.") singular, _ = obj.get_numbered_name(1, caller)
caller.location.msg_contents(f"{caller.name} picks up {obj.name}.", exclude=caller) caller.msg(f"You pick up {singular}.")
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)
@ -472,8 +474,9 @@ class CmdDrop(COMMAND_DEFAULT_CLASS):
if not success: if not success:
caller.msg("This couldn't be dropped.") caller.msg("This couldn't be dropped.")
else: else:
caller.msg("You drop %s." % (obj.name,)) singular, _ = obj.get_numbered_name(1, caller)
caller.location.msg_contents(f"{caller.name} drops {obj.name}.", exclude=caller) caller.msg(f"You drop {singular}.")
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)
@ -510,11 +513,13 @@ class CmdGive(COMMAND_DEFAULT_CLASS):
target = caller.search(self.rhs) target = caller.search(self.rhs)
if not (to_give and target): if not (to_give and target):
return return
singular, _ = to_give.get_numbered_name(1, caller)
if target == caller: if target == caller:
caller.msg(f"You keep {to_give.key} to yourself.") caller.msg(f"You keep {singular} to yourself.")
return return
if not to_give.location == caller: if not to_give.location == caller:
caller.msg(f"You are not holding {to_give.key}.") caller.msg(f"You are not holding {singular}.")
return return
# calling at_pre_give hook method # calling at_pre_give hook method
@ -524,10 +529,10 @@ class CmdGive(COMMAND_DEFAULT_CLASS):
# give object # give object
success = to_give.move_to(target, quiet=True, move_type="give") success = to_give.move_to(target, quiet=True, move_type="give")
if not success: if not success:
caller.msg(f"You could not give {to_give.key}.") caller.msg(f"You could not give {singular} to {target.key}.")
else: else:
caller.msg(f"You give {to_give.key} to {target.key}.") caller.msg(f"You give {singular} to {target.key}.")
target.msg(f"{caller.key} gives you {to_give.key}.") target.msg(f"{caller.key} gives you {singular}.")
# Call the object script's at_give() method. # Call the object script's at_give() method.
to_give.at_give(caller, target) to_give.at_give(caller, target)