From 8f39c49aea0efea895ed2361030c911a429eb2d5 Mon Sep 17 00:00:00 2001 From: Griatch Date: Tue, 1 Nov 2022 23:27:33 +0100 Subject: [PATCH] Apply formatter --- evennia/contrib/rpg/rpsystem/rpsystem.py | 18 +++++++++++------- evennia/contrib/rpg/rpsystem/tests.py | 2 +- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/evennia/contrib/rpg/rpsystem/rpsystem.py b/evennia/contrib/rpg/rpsystem/rpsystem.py index aff8996d47..25a4a9f13b 100644 --- a/evennia/contrib/rpg/rpsystem/rpsystem.py +++ b/evennia/contrib/rpg/rpsystem/rpsystem.py @@ -150,11 +150,12 @@ Extra Installation Instructions: """ import re from string import punctuation + from django.conf import settings -from evennia.objects.objects import DefaultObject, DefaultCharacter -from evennia.objects.models import ObjectDB -from evennia.commands.command import Command from evennia.commands.cmdset import CmdSet +from evennia.commands.command import Command +from evennia.objects.models import ObjectDB +from evennia.objects.objects import DefaultCharacter, DefaultObject from evennia.utils import ansi, logger from evennia.utils.utils import lazy_property, make_iter, variable_from_module @@ -319,7 +320,9 @@ def parse_language(speaker, emote): return emote, mapping -def parse_sdescs_and_recogs(sender, candidates, string, search_mode=False, case_sensitive=True, fallback=None): +def parse_sdescs_and_recogs( + sender, candidates, string, search_mode=False, case_sensitive=True, fallback=None +): """ Read a raw emote and parse it into an intermediary format for distributing to all observers. @@ -338,7 +341,8 @@ def parse_sdescs_and_recogs(sender, candidates, string, search_mode=False, case_ a little more to learn for players. If disabled, the original sdesc case is always kept and are inserted as-is. fallback (string, optional): If set, any references that don't match a target - will be replaced with the fallback string. + will be replaced with the fallback string. If `None` (default), the + parsing will fail and give a warning about the missing reference. Returns: (emote, mapping) (tuple): If `search_mode` is `False` @@ -1131,7 +1135,7 @@ class CmdRecog(RPCommand): # assign personal alias to object in room all_recogs = caller.recog.all() if not all_recogs: caller.msg( - "You recognize no-one. " "(Use 'recog as ' to recognize people." + "You recognize no-one. (Use 'recog as ' to recognize people." ) else: # note that we don't skip those failing enable_recog lock here, @@ -1141,7 +1145,7 @@ class CmdRecog(RPCommand): # assign personal alias to object in room for key, obj in all_recogs.items() ) caller.msg( - f"Currently recognized (use 'recog as ' to add " + "Currently recognized (use 'recog as ' to add " f"new and 'forget ' to remove):\n{lst}" ) return diff --git a/evennia/contrib/rpg/rpsystem/tests.py b/evennia/contrib/rpg/rpsystem/tests.py index 8e13289cfa..178b195bd9 100644 --- a/evennia/contrib/rpg/rpsystem/tests.py +++ b/evennia/contrib/rpg/rpsystem/tests.py @@ -96,7 +96,7 @@ recog01 = "Mr Receiver" recog02 = "Mr Receiver2" recog10 = "Mr Sender" emote = 'With a flair, /me looks at /first and /colliding sdesc-guy. She says "This is a test."' -fallback_emote = '/Me is distracted from /first by /nomatch.' +fallback_emote = "/Me is distracted from /first by /nomatch." case_emote = "/Me looks at /first. Then, /me looks at /FIRST, /First and /Colliding twice." poss_emote = "/Me frowns at /first for trying to steal /me's test."