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

[fix] The @desc command was erroneously still named @setdesc, this was not the intention. Relates to #1450.

Browse source
This commit is contained in:
Griatch 2017-09-30 10:12:46 +02:00
parent b3c6e9d2cc
commit 0ba913332a
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
evennia/commands/default/building.py
View file

@ -543,7 +543,7 @@ class CmdDesc(COMMAND_DEFAULT_CLASS):
describe an object or the current room. describe an object or the current room.
Usage: Usage:
@setdesc [<obj> =] <description> @desc [<obj> =] <description>
Switches: Switches:
edit - Open up a line editor for more advanced editing. edit - Open up a line editor for more advanced editing.
@ -551,7 +551,7 @@ class CmdDesc(COMMAND_DEFAULT_CLASS):
Sets the "desc" attribute on an object. If an object is not given, Sets the "desc" attribute on an object. If an object is not given,
describe the current room. describe the current room.
""" """
key = "@setdesc" key = "@desc"
aliases = "@describe" aliases = "@describe"
locks = "cmd:perm(desc) or perm(Builder)" locks = "cmd:perm(desc) or perm(Builder)"
help_category = "Building" help_category = "Building"
@ -706,10 +706,10 @@ class CmdDestroy(COMMAND_DEFAULT_CLASS):
else: else:
confirm += ", ".join(["#{}".format(obj.id) for obj in objs]) confirm += ", ".join(["#{}".format(obj.id) for obj in objs])
confirm += " [yes]/no?" if self.default_confirm == 'yes' else " yes/[no]" confirm += " [yes]/no?" if self.default_confirm == 'yes' else " yes/[no]"
answer = yield(confirm) answer = ""
answer = self.default_confirm if answer == '' else answer
while answer.strip().lower() not in ("y", "yes", "n", "no"): while answer.strip().lower() not in ("y", "yes", "n", "no"):
answer = yield(confirm) answer = yield(confirm)
answer = self.default_confirm if answer == '' else answer
if answer.strip().lower() in ("n", "no"): if answer.strip().lower() in ("n", "no"):
caller.msg("Cancelled: no object was destroyed.") caller.msg("Cancelled: no object was destroyed.")