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

Ran black on branc

Browse source
This commit is contained in:
Griatch 2019-12-16 20:31:42 +01:00
parent 6effb6f456
commit 4ea6209123
230 changed files with 7108 additions and 2395 deletions
Download patch file Download diff file Expand all files Collapse all files

19
evennia/contrib/extended_room.py
View file

@ -94,7 +94,9 @@ from evennia import utils
from evennia import CmdSet
# error return function, needed by Extended Look command
_AT_SEARCH_RESULT = utils.variable_from_module(*settings.SEARCH_AT_RESULT.rsplit(".", 1))
_AT_SEARCH_RESULT = utils.variable_from_module(
*settings.SEARCH_AT_RESULT.rsplit(".", 1)
)
# regexes for in-desc replacements
RE_MORNING = re.compile(r"<morning>(.*?)</morning>", re.IGNORECASE)
@ -444,7 +446,12 @@ class CmdExtendedRoomDesc(default_cmds.CmdDesc):
string += " |wgeneral:|n %s" % location.db.general_desc
caller.msg(string)
return
if self.switches and self.switches[0] in ("spring", "summer", "autumn", "winter"):
if self.switches and self.switches[0] in (
"spring",
"summer",
"autumn",
"winter",
):
# a seasonal switch was given
if self.rhs:
caller.msg("Seasonal descs only work with rooms, not objects.")
@ -519,9 +526,13 @@ class CmdExtendedRoomDetail(default_cmds.MuxCommand):
if not self.args:
details = location.db.details
if not details:
self.msg("|rThe room {} doesn't have any detail set.|n".format(location))
self.msg(
"|rThe room {} doesn't have any detail set.|n".format(location)
)
else:
details = sorted(["|y{}|n: {}".format(key, desc) for key, desc in details.items()])
details = sorted(
["|y{}|n: {}".format(key, desc) for key, desc in details.items()]
)
self.msg("Details on Room:\n" + "\n".join(details))
return