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

Merge branch 'master' into develop

Browse source
This commit is contained in:
Griatch 2021-05-30 09:15:49 +02:00
commit 52ada8fa80
5 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CODING_STYLE.md
View file

@ -10,7 +10,7 @@ on your sources.
## A quick list of code style points ## A quick list of code style points
* 4-space indendation, NO TABS! * 4-space indentation, NO TABS!
* Unix line endings. * Unix line endings.
* CamelCase is only used for classes, nothing else. * CamelCase is only used for classes, nothing else.
* All non-global variable names and all function names are to be * All non-global variable names and all function names are to be

2
evennia/commands/cmdhandler.py
View file

@ -572,7 +572,7 @@ def cmdhandler(
cmd.raw_string = unformatted_raw_string cmd.raw_string = unformatted_raw_string
# cmd.obj # set via on-object cmdset handler for each command, # cmd.obj # set via on-object cmdset handler for each command,
# since this may be different for every command when # since this may be different for every command when
# merging multuple cmdsets # merging multiple cmdsets
if _testing: if _testing:
# only return the command instance # only return the command instance

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

@ -70,7 +70,7 @@ class SystemNoMatch(COMMAND_DEFAULT_CLASS):
# #
# Command called when there were mulitple matches to the command. # Command called when there were multiple matches to the command.
# #
class SystemMultimatch(COMMAND_DEFAULT_CLASS): class SystemMultimatch(COMMAND_DEFAULT_CLASS):
""" """

2
evennia/contrib/building_menu.py
View file

@ -577,7 +577,7 @@ class BuildingMenu(object):
keys_go_back = ["@"] # The keys allowing to go back in the menu tree keys_go_back = ["@"] # The keys allowing to go back in the menu tree
sep_keys = "." # The key separator for menus with more than 2 levels sep_keys = "." # The key separator for menus with more than 2 levels
joker_key = "*" # The special key meaning "anything" in a choice key joker_key = "*" # The special key meaning "anything" in a choice key
min_shortcut = 1 # The minimum length of shorcuts when `key` is not set min_shortcut = 1 # The minimum length of shortcuts when `key` is not set
def __init__( def __init__(
self, self,

2
evennia/prototypes/prototypes.py
View file

@ -691,7 +691,7 @@ def validate_prototype(
err=err, protkey=protkey, typeclass=typeclass) err=err, protkey=protkey, typeclass=typeclass)
) )
# recursively traverese prototype_parent chain # recursively traverse prototype_parent chain
for protstring in make_iter(prototype_parent): for protstring in make_iter(prototype_parent):
protstring = protstring.lower() protstring = protstring.lower()