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

Fix msg_contents to not interfere with extra brackets in input (and {-style colors). Resolve #2696

Browse source
This commit is contained in:
Griatch 2022-10-29 17:06:13 +02:00
parent d3ebd3d642
commit a92f84bd58
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
evennia/contrib/base_systems/color_markups/README.md
View file

@ -41,7 +41,7 @@ COLOR_XTERM256_EXTRA_FG = color_markups.CURLY_COLOR_XTERM256_EXTRA_FG
COLOR_XTERM256_EXTRA_BG = color_markups.CURLY_COLOR_XTERM256_EXTRA_BG COLOR_XTERM256_EXTRA_BG = color_markups.CURLY_COLOR_XTERM256_EXTRA_BG
COLOR_XTERM256_EXTRA_GFG = color_markups.CURLY_COLOR_XTERM256_EXTRA_GFG COLOR_XTERM256_EXTRA_GFG = color_markups.CURLY_COLOR_XTERM256_EXTRA_GFG
COLOR_XTERM256_EXTRA_GBG = color_markups.CURLY_COLOR_XTERM256_EXTRA_GBG COLOR_XTERM256_EXTRA_GBG = color_markups.CURLY_COLOR_XTERM256_EXTRA_GBG
COLOR_ANSI_BRIGHT_BG_EXTRA_MAP = color_markups.CURLY_COLOR_ANSI_BRIGHT_BG_EXTRA_MAP COLOR_ANSI_XTERM256_BRIGHT_BG_EXTRA_MAP = color_markups.CURLY_COLOR_ANSI_XTERM256_BRIGHT_BG_EXTRA_MAP
``` ```
To add the `%c-` "mux/mush" style, add the following to your settings file, then To add the `%c-` "mux/mush" style, add the following to your settings file, then
@ -54,5 +54,5 @@ COLOR_XTERM256_EXTRA_FG = color_markups.MUX_COLOR_XTERM256_EXTRA_FG
COLOR_XTERM256_EXTRA_BG = color_markups.MUX_COLOR_XTERM256_EXTRA_BG COLOR_XTERM256_EXTRA_BG = color_markups.MUX_COLOR_XTERM256_EXTRA_BG
COLOR_XTERM256_EXTRA_GFG = color_markups.MUX_COLOR_XTERM256_EXTRA_GFG COLOR_XTERM256_EXTRA_GFG = color_markups.MUX_COLOR_XTERM256_EXTRA_GFG
COLOR_XTERM256_EXTRA_GBG = color_markups.MUX_COLOR_XTERM256_EXTRA_GBG COLOR_XTERM256_EXTRA_GBG = color_markups.MUX_COLOR_XTERM256_EXTRA_GBG
COLOR_ANSI_BRIGHT_BGS_EXTRA_MAP = color_markups.CURLY_COLOR_ANSI_BRIGHT_BGS_EXTRA_MAP COLOR_ANSI_XTERM256_BRIGHT_BG_EXTRA_MAP = color_markups.MUX_COLOR_ANSI_XTERM256_BRIGHT_BG_EXTRA_MAP
``` ```

4
evennia/objects/objects.py
View file

@ -760,6 +760,10 @@ class DefaultObject(ObjectDB, metaclass=TypeclassBase):
exclude = make_iter(exclude) exclude = make_iter(exclude)
contents = [obj for obj in contents if obj not in exclude] contents = [obj for obj in contents if obj not in exclude]
# escape existing { in the input to not interfere with mapping
inmessage = inmessage.replace("{", "{{")
inmessage = inmessage.replace("}", "}}")
for receiver in contents: for receiver in contents:
# actor-stance replacements # actor-stance replacements