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

Clean up default command names and aliases to avoid multimatches with new prefix-ignorer. Chane desc->setdesc, alias->nick, @home->@sethome.

Browse source
This commit is contained in:
Griatch 2016-12-20 22:58:13 +01:00
parent 596efe4c72
commit fd3d6aee9a
5 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1033,8 +1033,7 @@ class CmdSetHome(CmdLink):
If no location is given, just view the object's home location. If no location is given, just view the object's home location.
""" """
key = "@home" key = "@sethome"
aliases = "@sethome"
locks = "cmd:perm(@home) or perm(Builders)" locks = "cmd:perm(@home) or perm(Builders)"
help_category = "Building" help_category = "Building"
@ -1751,7 +1750,7 @@ class CmdLock(ObjManipCommand):
'get:id(25);delete:perm(Builders)' 'get:id(25);delete:perm(Builders)'
""" """
key = "@lock" key = "@lock"
aliases = ["@locks", "lock", "locks"] aliases = ["@locks"]
locks = "cmd: perm(locks) or perm(Builders)" locks = "cmd: perm(locks) or perm(Builders)"
help_category = "Building" help_category = "Building"
@ -1844,7 +1843,7 @@ class CmdExamine(ObjManipCommand):
""" """
key = "@examine" key = "@examine"
aliases = ["@ex","ex", "exam", "examine"] aliases = ["@ex","exam"]
locks = "cmd:perm(examine) or perm(Builders)" locks = "cmd:perm(examine) or perm(Builders)"
help_category = "Building" help_category = "Building"
arg_regex = r"(/\w+?(\s|$))|\s|$" arg_regex = r"(/\w+?(\s|$))|\s|$"
@ -2113,7 +2112,7 @@ class CmdFind(COMMAND_DEFAULT_CLASS):
""" """
key = "@find" key = "@find"
aliases = "find, @search, search, @locate, locate" aliases = "@search, @locate"
locks = "cmd:perm(find) or perm(Builders)" locks = "cmd:perm(find) or perm(Builders)"
help_category = "Building" help_category = "Building"
@ -2585,7 +2584,6 @@ class CmdSpawn(COMMAND_DEFAULT_CLASS):
""" """
key = "@spawn" key = "@spawn"
aliases = ["spawn"]
locks = "cmd:perm(spawn) or perm(Builders)" locks = "cmd:perm(spawn) or perm(Builders)"
help_category = "Building" help_category = "Building"

2
evennia/commands/default/comms.py
View file

@ -268,7 +268,7 @@ class CmdChannels(COMMAND_DEFAULT_CLASS):
Use addcom/delcom to join and leave channels Use addcom/delcom to join and leave channels
""" """
key = "@channels" key = "@channels"
aliases = ["@clist", "channels", "comlist", "chanlist", "channellist", "all channels"] aliases = ["@clist", "comlist", "chanlist", "channellist", "all channels"]
help_category = "Comms" help_category = "Comms"
locks = "cmd: not pperm(channel_banned)" locks = "cmd: not pperm(channel_banned)"

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

@ -112,7 +112,7 @@ class CmdNick(COMMAND_DEFAULT_CLASS):
""" """
key = "nick" key = "nick"
aliases = ["nickname", "nicks", "@nick", "@nicks", "alias"] aliases = ["nickname", "nicks", "alias"]
locks = "cmd:all()" locks = "cmd:all()"
def func(self): def func(self):
@ -361,13 +361,13 @@ class CmdDesc(COMMAND_DEFAULT_CLASS):
describe yourself describe yourself
Usage: Usage:
desc <description> setdesc <description>
Add a description to yourself. This Add a description to yourself. This
will be visible to people when they will be visible to people when they
look at you. look at you.
""" """
key = "desc" key = "setdesc"
locks = "cmd:all()" locks = "cmd:all()"
arg_regex = r"\s|$" arg_regex = r"\s|$"

3
evennia/commands/default/help.py
View file

@ -292,8 +292,7 @@ class CmdSetHelp(COMMAND_DEFAULT_CLASS):
is to let everyone read the help file. is to let everyone read the help file.
""" """
key = "@help" key = "@sethelp"
aliases = "@sethelp"
locks = "cmd:perm(PlayerHelpers)" locks = "cmd:perm(PlayerHelpers)"
help_category = "Building" help_category = "Building"

2
evennia/commands/default/player.py
View file

@ -648,7 +648,6 @@ class CmdQuit(COMMAND_DEFAULT_CLASS):
game. Use the /all switch to disconnect from all sessions. game. Use the /all switch to disconnect from all sessions.
""" """
key = "@quit" key = "@quit"
aliases = "quit"
locks = "cmd:all()" locks = "cmd:all()"
# this is used by the parent # this is used by the parent
@ -689,7 +688,6 @@ class CmdColorTest(COMMAND_DEFAULT_CLASS):
color - if not you will see rubbish appear. color - if not you will see rubbish appear.
""" """
key = "@color" key = "@color"
aliases = "color"
locks = "cmd:all()" locks = "cmd:all()"
help_category = "General" help_category = "General"