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

Add unittest for typeclass/prototype, some cleanup

Browse source
This commit is contained in:
Griatch 2020-02-24 08:32:49 +01:00
parent 9743275f80
commit 2d3f28822b
2 changed files with 25 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1913,8 +1913,8 @@ class CmdTypeclass(COMMAND_DEFAULT_CLASS):
Usage:
typeclass[/switch] <object> [= typeclass.path]
type ''
parent ''
typeclass/prototype <object> = prototype_key
typeclass/list/show [typeclass.path]
swap - this is a shorthand for using /force/reset flags.
update - this is a shorthand for using the /force/reload flag.
@ -2110,15 +2110,11 @@ class CmdTypeclass(COMMAND_DEFAULT_CLASS):
prompt += "\n|yWARNING:|n Use the /reset switch to apply the prototype over a blank state."
prompt += "\nAre you sure you want to apply these changes [yes]/no?"
answer = yield (prompt)
answer = "yes" if answer == "" else answer
if answer and answer not in ("yes", "y", "no", "n"):
if answer and answer in ("no", "n"):
caller.msg(
"Canceled: Either accept the default by pressing return or specify yes/no."
"Canceled: No changes were applied."
)
return
elif answer.strip().lower() in ("n", "no"):
caller.msg("Canceled: No object was modified.")
return
# we let this raise exception if needed
obj.swap_typeclass(