From 9df7eb49b00f4b91ae55d8a96067204389db60b5 Mon Sep 17 00:00:00 2001 From: Griatch Date: Sat, 3 Mar 2018 19:56:16 +0100 Subject: [PATCH 1/3] Don't allow recog:ing a masked person --- evennia/contrib/rpsystem.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/evennia/contrib/rpsystem.py b/evennia/contrib/rpsystem.py index d469aff3d9..a56d2de731 100644 --- a/evennia/contrib/rpsystem.py +++ b/evennia/contrib/rpsystem.py @@ -708,12 +708,15 @@ class RecogHandler(object): than `max_length`. """ + if not obj.access(self.obj, "enable_recog", default=True): + raise SdescError("This person is unrecognizeable.") + # strip emote components from recog - recog = _RE_REF.sub(r"\1", - _RE_REF_LANG.sub(r"\1", - _RE_SELF_REF.sub(r"", - _RE_LANGUAGE.sub(r"", - _RE_OBJ_REF_START.sub(r"", recog))))) + recog = _RE_REF.sub( + r"\1", _RE_REF_LANG.sub( + r"\1", _RE_SELF_REF.sub( + r"", _RE_LANGUAGE.sub( + r"", _RE_OBJ_REF_START.sub(r"", recog))))) # make an recog clean of ANSI codes cleaned_recog = ansi.strip_ansi(recog) From 38eb6814f6d146d94156024ef9d664771f787ea1 Mon Sep 17 00:00:00 2001 From: maiki Date: Sat, 10 Mar 2018 20:42:17 -0800 Subject: [PATCH 2/3] Remove extra words --- evennia/typeclasses/attributes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evennia/typeclasses/attributes.py b/evennia/typeclasses/attributes.py index 3f8b4cd742..a97a81b1be 100644 --- a/evennia/typeclasses/attributes.py +++ b/evennia/typeclasses/attributes.py @@ -245,7 +245,7 @@ class AttributeHandler(object): found from cache or database. Notes: When given a category only, a search for all objects - of that cateogory is done and a the category *name* is is + of that cateogory is done and the category *name* is stored. This tells the system on subsequent calls that the list of cached attributes of this category is up-to-date and that the cache can be queried for category matches From 88d13bc6e64a996abf58b55fc9a7c1eb182a2659 Mon Sep 17 00:00:00 2001 From: maiki Date: Sat, 10 Mar 2018 20:52:06 -0800 Subject: [PATCH 3/3] Minor update --- evennia/contrib/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/evennia/contrib/README.md b/evennia/contrib/README.md index ed3c048c32..ace81db8e5 100644 --- a/evennia/contrib/README.md +++ b/evennia/contrib/README.md @@ -16,7 +16,7 @@ things you want from here into your game folder and change them there. ## Contrib modules * Barter system (Griatch 2012) - A safe and effective barter-system - for any game. Allows safe trading of any godds (including coin) + for any game. Allows safe trading of any goods (including coin). * CharGen (Griatch 2011) - A simple Character creator for OOC mode. Meant as a starting point for a more fleshed-out system. * Clothing (BattleJenkins 2017) - A layered clothing system with @@ -33,7 +33,7 @@ things you want from here into your game folder and change them there. on a character and access it in an emote with a custom marker. * Mail (grungies1138 2016) - An in-game mail system for communication. * Menu login (Griatch 2011) - A login system using menus asking - for name/password rather than giving them as one command + for name/password rather than giving them as one command. * Map Builder (CloudKeeper 2016) - Build a game area based on a 2D "graphical" unicode map. Supports assymmetric exits. * Menu Login (Vincent-lg 2016) - Alternate login system using EvMenu. @@ -59,7 +59,7 @@ things you want from here into your game folder and change them there. ## Contrib packages * EGI_Client (gtaylor 2016) - Client for reporting game status - to the Evennia game index (games.evennia.com) + to the Evennia game index (games.evennia.com). * In-game Python (Vincent Le Goff 2017) - Allow trusted builders to script objects and events using Python from in-game. * Tutorial examples (Griatch 2011, 2015) - A folder of basic