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

Merge branch 'develop' into olc

Browse source
This commit is contained in:
Griatch 2018-03-13 22:09:15 +01:00
commit 464c7400f5
3 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
evennia/contrib/README.md
View file

@ -16,7 +16,7 @@ things you want from here into your game folder and change them there.
## Contrib modules ## Contrib modules
* Barter system (Griatch 2012) - A safe and effective barter-system * 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. * CharGen (Griatch 2011) - A simple Character creator for OOC mode.
Meant as a starting point for a more fleshed-out system. Meant as a starting point for a more fleshed-out system.
* Clothing (FlutterSprite 2017) - A layered clothing system with * Clothing (FlutterSprite 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. on a character and access it in an emote with a custom marker.
* Mail (grungies1138 2016) - An in-game mail system for communication. * Mail (grungies1138 2016) - An in-game mail system for communication.
* Menu login (Griatch 2011) - A login system using menus asking * 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 * Map Builder (CloudKeeper 2016) - Build a game area based on a 2D
"graphical" unicode map. Supports assymmetric exits. "graphical" unicode map. Supports assymmetric exits.
* Menu Login (Vincent-lg 2016) - Alternate login system using EvMenu. * Menu Login (Vincent-lg 2016) - Alternate login system using EvMenu.
@ -60,7 +60,7 @@ things you want from here into your game folder and change them there.
## Contrib packages ## Contrib packages
* EGI_Client (gtaylor 2016) - Client for reporting game status * 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 * In-game Python (Vincent Le Goff 2017) - Allow trusted builders to script
objects and events using Python from in-game. objects and events using Python from in-game.
* Turnbattle (FlutterSprite 2017) - A turn-based combat engine meant * Turnbattle (FlutterSprite 2017) - A turn-based combat engine meant

13
evennia/contrib/rpsystem.py
View file

@ -708,12 +708,15 @@ class RecogHandler(object):
than `max_length`. than `max_length`.
""" """
if not obj.access(self.obj, "enable_recog", default=True):
raise SdescError("This person is unrecognizeable.")
# strip emote components from recog # strip emote components from recog
recog = _RE_REF.sub(r"\1", recog = _RE_REF.sub(
_RE_REF_LANG.sub(r"\1", r"\1", _RE_REF_LANG.sub(
_RE_SELF_REF.sub(r"", r"\1", _RE_SELF_REF.sub(
_RE_LANGUAGE.sub(r"", r"", _RE_LANGUAGE.sub(
_RE_OBJ_REF_START.sub(r"", recog))))) r"", _RE_OBJ_REF_START.sub(r"", recog)))))
# make an recog clean of ANSI codes # make an recog clean of ANSI codes
cleaned_recog = ansi.strip_ansi(recog) cleaned_recog = ansi.strip_ansi(recog)

2
evennia/typeclasses/attributes.py
View file

@ -245,7 +245,7 @@ class AttributeHandler(object):
found from cache or database. found from cache or database.
Notes: Notes:
When given a category only, a search for all objects 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 stored. This tells the system on subsequent calls that the
list of cached attributes of this category is up-to-date list of cached attributes of this category is up-to-date
and that the cache can be queried for category matches and that the cache can be queried for category matches