diff --git a/Pack/MKWFaraphel/macros.json b/Pack/MKWFaraphel/macros.json index 96c0e6a..cf0617d 100644 --- a/Pack/MKWFaraphel/macros.json +++ b/Pack/MKWFaraphel/macros.json @@ -1,12 +1,12 @@ { "GAME_REGION": "str(extracted_game.original_game.wit_path.region)", - "TRACK_TEXT_SCORE": "get_color(name=['yellow', 'orange', 'dark red', 'azure'][track.warning]).color_text(f'\\\\x{65296+track.score:x} ') if track.score else ''", - "TRACK_TEXT_PREFIX": "f'{prefix} ' if (prefix := track.get_tag_template('prefix', '')) else ''", - "TRACK_TEXT_SUFFIX": "f' ({suffix})' if (suffix := track.get_tag_template('suffix', '')) else ''", + "TRACK_TEXT_SCORE": "get_color(name=['yellow', 'orange', 'dark red', 'azure'][track.warning]) @ f'\\\\x{65296+track.score:x} ' if track.score else ''", + "TRACK_TEXT_PREFIX": "f'{prefix} ' if (prefix := get_tag_template(track, 'prefix')) else ''", + "TRACK_TEXT_SUFFIX": "f' ({suffix})' if (suffix := get_tag_template(track, 'suffix')) else ''", "TRACK_TEXT_NAME": "track.name", "TRACK_TEXT_AUTHORS": "'\\\\n'.join(track.author) if isinstance(track.author, list) else track.author", - "TRACK_TEXT_WARNING_IF_DISABLED": "get_color(name='red').color_text('/') if track.warning != 0 else ''", + "TRACK_TEXT_WARNING_IF_DISABLED": "get_color(name='red') @ '/' if track.warning != 0 else ''", "TRACK_TEXT_HIGHLIGHT_START": "get_color(name='azure').raw if eval(highlight_if if (highlight_if := mod_config.specific_settings['highlight_if'].value) is not None else 'False', env={'track': track, 'mod_config': mod_config}) is True else ''", "TRACK_TEXT_HIGHLIGHT_END": "get_color(name='off').raw", diff --git a/Pack/MKWFaraphel/mod_config.json b/Pack/MKWFaraphel/mod_config.json index cfbb835..ba714c0 100644 --- a/Pack/MKWFaraphel/mod_config.json +++ b/Pack/MKWFaraphel/mod_config.json @@ -55,59 +55,59 @@ "tags_templates": { "prefix": { - "MSRDS": "{{ get_color(name='green').color_text(tag) }}", - "CTR": "{{ get_color(name='orange').color_text(tag) }}", - "CTTR": "{{ get_color(name='dark orange').color_text(tag) }}", - "CNR": "{{ get_color(name='orange').color_text(tag) }}", - "DKR": "{{ get_color(name='dark red').color_text(tag) }}", - "LCP": "{{ get_color(name='green').color_text(tag) }}", - "LEGO-R": "{{ get_color(name='light red').color_text(tag) }}", - "MP9": "{{ get_color(name='neon yellow').color_text(tag) }}", - "MSUSA": "{{ get_color(name='green').color_text(tag) }}", - "FZMV": "{{ get_color(name='yellow').color_text(tag) }}", - "KAR": "{{ get_color(name='green').color_text(tag) }}", - "KO": "{{ get_color(name='dark orange').color_text(tag) }}", - "FZ": "{{ get_color(name='yellow').color_text(tag) }}", - "RV": "{{ get_color(name='white').color_text(tag) }}", - "SADX": "{{ get_color(name='dark blue').color_text(tag) }}", - "SCR": "{{ get_color(name='yellow').color_text(tag) }}", - "SH": "{{ get_color(name='pink').color_text(tag) }}", - "SM64": "{{ get_color(name='pink').color_text(tag) }}", - "SMB1": "{{ get_color(name='light red').color_text(tag) }}", - "SMB2": "{{ get_color(name='red').color_text(tag) }}", - "SSBB": "{{ get_color(name='vivid red').color_text(tag) }}", - "SMS": "{{ get_color(name='dark red').color_text(tag) }}", - "SMO": "{{ get_color(name='apple red').color_text(tag) }}", - "VVVVVV": "{{ get_color(name='azure').color_text(tag) }}", - "WF": "{{ get_color(name='green').color_text(tag) }}", - "WP": "{{ get_color(name='neon yellow 2').color_text(tag) }}", - "Zelda OoT": "{{ get_color(name='green').color_text(tag) }}", - "Zelda TP": "{{ get_color(name='green').color_text(tag) }}", - "Zelda WW": "{{ get_color(name='green').color_text(tag) }}", - "PMWR": "{{ get_color(name='neon yellow 2').color_text(tag) }}", - "SHR": "{{ get_color(name='green').color_text(tag) }}", - "SK64": "{{ get_color(name='green').color_text(tag) }}", - "SMG": "{{ get_color(name='light red').color_text(tag) }}", - "Spyro 1": "{{ get_color(name='azure').color_text(tag) }}", - "Switch": "{{ get_color(name='vivid red').color_text(tag) }}", - "Wii": "{{ get_color(name='azure').color_text(tag) }}", - "3DS": "{{ get_color(name='light orange').color_text(tag) }}", - "DS": "{{ get_color(name='white').color_text(tag) }}", - "GCN": "{{ get_color(name='azure').color_text(tag) }}", - "GBA": "{{ get_color(name='dark blue').color_text(tag) }}", - "N64": "{{ get_color(name='pink').color_text(tag) }}", - "SNES": "{{ get_color(name='green').color_text(tag) }}", - "RMX": "{{ get_color(name='orange').color_text(tag) }}", - "MKT": "{{ get_color(name='dark orange').color_text(tag) }}", - "GP": "{{ get_color(name='dark red').color_text(tag) }}", - "UT": "{{ get_color(name='red').color_text(tag) }}", - "GK2": "{{ get_color(name='green').color_text(tag) }}", - "GK3": "{{ get_color(name='green').color_text(tag) }}", - "GK7": "{{ get_color(name='green').color_text(tag) }}", - "FGKR": "{{ get_color(name='dark orange').color_text(tag) }}" + "MSRDS": "{{ get_color(name='green') @ tag }}", + "CTR": "{{ get_color(name='orange') @ tag }}", + "CTTR": "{{ get_color(name='dark orange') @ tag }}", + "CNR": "{{ get_color(name='orange') @ tag }}", + "DKR": "{{ get_color(name='dark red') @ tag }}", + "LCP": "{{ get_color(name='green') @ tag }}", + "LEGO-R": "{{ get_color(name='light red') @ tag }}", + "MP9": "{{ get_color(name='neon yellow') @ tag }}", + "MSUSA": "{{ get_color(name='green') @ tag }}", + "FZMV": "{{ get_color(name='yellow') @ tag }}", + "KAR": "{{ get_color(name='green') @ tag }}", + "KO": "{{ get_color(name='dark orange') @ tag }}", + "FZ": "{{ get_color(name='yellow') @ tag }}", + "RV": "{{ get_color(name='white') @ tag }}", + "SADX": "{{ get_color(name='dark blue') @ tag }}", + "SCR": "{{ get_color(name='yellow') @ tag }}", + "SH": "{{ get_color(name='pink') @ tag }}", + "SM64": "{{ get_color(name='pink') @ tag }}", + "SMB1": "{{ get_color(name='light red') @ tag }}", + "SMB2": "{{ get_color(name='red') @ tag }}", + "SSBB": "{{ get_color(name='vivid red') @ tag }}", + "SMS": "{{ get_color(name='dark red') @ tag }}", + "SMO": "{{ get_color(name='apple red') @ tag }}", + "VVVVVV": "{{ get_color(name='azure') @ tag }}", + "WF": "{{ get_color(name='green') @ tag }}", + "WP": "{{ get_color(name='neon yellow 2') @ tag }}", + "Zelda OoT": "{{ get_color(name='green') @ tag }}", + "Zelda TP": "{{ get_color(name='green') @ tag }}", + "Zelda WW": "{{ get_color(name='green') @ tag }}", + "PMWR": "{{ get_color(name='neon yellow 2') @ tag }}", + "SHR": "{{ get_color(name='green') @ tag }}", + "SK64": "{{ get_color(name='green') @ tag }}", + "SMG": "{{ get_color(name='light red') @ tag }}", + "Spyro 1": "{{ get_color(name='azure') @ tag }}", + "Switch": "{{ get_color(name='vivid red') @ tag }}", + "Wii": "{{ get_color(name='azure') @ tag }}", + "3DS": "{{ get_color(name='light orange') @ tag }}", + "DS": "{{ get_color(name='white') @ tag }}", + "GCN": "{{ get_color(name='azure') @ tag }}", + "GBA": "{{ get_color(name='dark blue') @ tag }}", + "N64": "{{ get_color(name='pink') @ tag }}", + "SNES": "{{ get_color(name='green') @ tag }}", + "RMX": "{{ get_color(name='orange') @ tag }}", + "MKT": "{{ get_color(name='dark orange') @ tag }}", + "GP": "{{ get_color(name='dark red') @ tag }}", + "UT": "{{ get_color(name='red') @ tag }}", + "GK2": "{{ get_color(name='green') @ tag }}", + "GK3": "{{ get_color(name='green') @ tag }}", + "GK7": "{{ get_color(name='green') @ tag }}", + "FGKR": "{{ get_color(name='dark orange') @ tag }}" }, "suffix": { - "Boost": "{{ get_color(name='orange').color_text(tag) }}" + "Boost": "{{ get_color(name='orange') @ tag }}" } }, "tags_cups": [ diff --git a/source/mkw/Track/AbstractTrack.py b/source/mkw/Track/AbstractTrack.py index 230f205..26a0fb7 100644 --- a/source/mkw/Track/AbstractTrack.py +++ b/source/mkw/Track/AbstractTrack.py @@ -99,4 +99,4 @@ class AbstractTrack(ABC): f'{filename!r}; ' # filename f'{name!r}; ' # name of the track in the menu f'{filename!r}\n' # unique identifier for each track - ) \ No newline at end of file + ) diff --git a/source/mkw/Track/RealArenaTrack.py b/source/mkw/Track/RealArenaTrack.py index 069e977..95d1a9e 100644 --- a/source/mkw/Track/RealArenaTrack.py +++ b/source/mkw/Track/RealArenaTrack.py @@ -30,7 +30,13 @@ class RealArenaTrack: return default def repr_format(self, template: "TemplateMultipleSafeEval") -> str: - return self.mod_config.multiple_safe_eval(template=template, args=["track"])(track=self) + return self.mod_config.multiple_safe_eval( + template=template, + env={ + "get_tag_template": lambda track, *args, **kwargs: track.get_tag_template(*args, **kwargs), + }, + args=["track"], + )(track=self) @property def filename(self) -> str: