diff --git a/Pack/MKWFaraphel/essentials/_PATCH/files/Scene/UI/CommonLanguageMenu.d/message/Common.bmg.json b/Pack/MKWFaraphel/essentials/_PATCH/files/Scene/UI/CommonLanguageMenu.d/message/Common.bmg.json index 6b6cbd1..28e4fc0 100644 --- a/Pack/MKWFaraphel/essentials/_PATCH/files/Scene/UI/CommonLanguageMenu.d/message/Common.bmg.json +++ b/Pack/MKWFaraphel/essentials/_PATCH/files/Scene/UI/CommonLanguageMenu.d/message/Common.bmg.json @@ -6,11 +6,11 @@ "layers": [ { "mode": "ctfile", - "template": "{{ ('\\c{' + ['YOR2', 'YOR4', 'YOR6', 'blue1'][getattr(track, 'warning', 0)] +'}\\x'+hex(65296+getattr(track, 'score'))[2:]+'\\c{off} ') if hasattr(track, 'score') else '' }}{{ (prefix+' ') if prefix else '' }}{{ getattr(track, 'name', '') }}{{ (' ('+suffix +')') if suffix else '' }}" + "template": "{{ ## TRACK_TEXT_SCORE ## }}{{ ## TRACK_TEXT_PREFIX ## }}{{ ## TRACK_TEXT_NAME ## }}{{ ## TRACK_TEXT_SUFFIX ## }}" }, { "mode": "format-original-track", - "template": "{{ (prefix+' ') if prefix else '' }}{{ getattr(track, 'name', '') }}{{ (' ('+suffix +')') if suffix else '' }}" + "template": "{{ ## TRACK_TEXT_PREFIX ## }}{{ ## TRACK_TEXT_NAME ## }}{{ ## TRACK_TEXT_SUFFIX ## }}" }, { "mode": "patch", diff --git a/Pack/MKWFaraphel/essentials/_PATCH/files/Scene/UI/MultiplayerLanguage.d/message/Common.bmg.json b/Pack/MKWFaraphel/essentials/_PATCH/files/Scene/UI/MultiplayerLanguage.d/message/Common.bmg.json index 06f271e..b45a5ec 100644 --- a/Pack/MKWFaraphel/essentials/_PATCH/files/Scene/UI/MultiplayerLanguage.d/message/Common.bmg.json +++ b/Pack/MKWFaraphel/essentials/_PATCH/files/Scene/UI/MultiplayerLanguage.d/message/Common.bmg.json @@ -6,11 +6,11 @@ "layers": [ { "mode": "ctfile", - "template": "{{ '\\c{red3}/\\c{off}' if getattr(track, 'warning', 0) != 0 else '' }}{{ ('\\c{YOR2}\\x'+hex(65296+getattr(track, 'score'))[2:]+'\\c{off} ') if hasattr(track, 'score') and getattr(track, 'warning', 0) == 0 else '' }}{{ (prefix+' ') if prefix and getattr(track, 'warning', 0) == 0 else '' }}{{ getattr(track, 'name', '') if getattr(track, 'warning', 0) == 0 else '' }}{{ (' ('+suffix +')') if suffix and getattr(track, 'warning', 0) == 0 else '' }}" + "template": "{{ ## TRACK_TEXT_WARNING_IF_DISABLED ## }}{{ (## TRACK_TEXT_SCORE ##) ## IF_NO_WARNING ## }}{{ (## TRACK_TEXT_PREFIX ##) ## IF_NO_WARNING ## }}{{ (## TRACK_TEXT_NAME ##) ## IF_NO_WARNING ## }}{{ (## TRACK_TEXT_SUFFIX ##) ## IF_NO_WARNING ## }}" }, { "mode": "format-original-track", - "template": "{{ (prefix+' ') if prefix else '' }}{{ getattr(track, 'name', '') }}{{ (' ('+suffix +')') if suffix else '' }}" + "template": "{{ ## TRACK_TEXT_PREFIX ## }}{{ ## TRACK_TEXT_NAME ## }}{{ ## TRACK_TEXT_SUFFIX ## }}" }, { "mode": "patch", diff --git a/Pack/MKWFaraphel/essentials/_PATCH/files/Scene/UI/RaceLanguage.d/message/Common.bmg.json b/Pack/MKWFaraphel/essentials/_PATCH/files/Scene/UI/RaceLanguage.d/message/Common.bmg.json index 066c108..ba64c3d 100644 --- a/Pack/MKWFaraphel/essentials/_PATCH/files/Scene/UI/RaceLanguage.d/message/Common.bmg.json +++ b/Pack/MKWFaraphel/essentials/_PATCH/files/Scene/UI/RaceLanguage.d/message/Common.bmg.json @@ -6,11 +6,11 @@ "layers": [ { "mode": "ctfile", - "template": "{{ ('\\c{' + ['YOR2', 'YOR4', 'YOR6', 'blue1'][getattr(track, 'warning', 0)] +'}\\x'+hex(65296+getattr(track, 'score'))[2:]+'\\c{off} ') if hasattr(track, 'score') else '' }}{{ (prefix+' ') if prefix else '' }}{{ getattr(track, 'name', '') }}{{ (' ('+suffix +')') if suffix else '' }}\n{{ '\\n'.join(getattr(track, 'author')) if isinstance(getattr(track, 'author', ''), list) else getattr(track, 'author', '/') }}" + "template": "{{ ## TRACK_TEXT_SCORE ## }}{{ ## TRACK_TEXT_PREFIX ## }}{{ ## TRACK_TEXT_NAME ## }}{{ ## TRACK_TEXT_SUFFIX ## }}\n{{ ## TRACK_TEXT_AUTHORS ## }}" }, { "mode": "format-original-track", - "template": "{{ (prefix+' ') if prefix else '' }}{{ getattr(track, 'name', '') }}{{ (' ('+suffix +')') if suffix else '' }}\nNintendo" + "template": "{{ ## TRACK_TEXT_SCORE ## }}{{ ## TRACK_TEXT_PREFIX ## }}{{ ## TRACK_TEXT_NAME ## }}{{ ## TRACK_TEXT_SUFFIX ## }}\nNintendo" }, { "mode": "patch", diff --git a/Pack/MKWFaraphel/essentials/_PATCH/files/rel/lecode-JAP.bin.json b/Pack/MKWFaraphel/essentials/_PATCH/files/rel/lecode-JAP.bin.json index 0643fd9..f790dab 100644 --- a/Pack/MKWFaraphel/essentials/_PATCH/files/rel/lecode-JAP.bin.json +++ b/Pack/MKWFaraphel/essentials/_PATCH/files/rel/lecode-JAP.bin.json @@ -1,3 +1,3 @@ { - "if": "str(getattr(getattr(getattr(extracted_game, 'original_game'), 'wit_path'), 'region')) == 'Region.JAP'" + "if": "## GAME_REGION ## == 'Region.JAP'" } \ No newline at end of file diff --git a/Pack/MKWFaraphel/essentials/_PATCH/files/rel/lecode-KOR.bin.json b/Pack/MKWFaraphel/essentials/_PATCH/files/rel/lecode-KOR.bin.json index 1693c55..a23e64c 100644 --- a/Pack/MKWFaraphel/essentials/_PATCH/files/rel/lecode-KOR.bin.json +++ b/Pack/MKWFaraphel/essentials/_PATCH/files/rel/lecode-KOR.bin.json @@ -1,3 +1,3 @@ { - "if": "str(getattr(getattr(getattr(extracted_game, 'original_game'), 'wit_path'), 'region')) == 'Region.KOR'" + "if": "## GAME_REGION ## == 'Region.KOR'" } \ No newline at end of file diff --git a/Pack/MKWFaraphel/essentials/_PATCH/files/rel/lecode-PAL.bin.json b/Pack/MKWFaraphel/essentials/_PATCH/files/rel/lecode-PAL.bin.json index 7df6e25..b369e3d 100644 --- a/Pack/MKWFaraphel/essentials/_PATCH/files/rel/lecode-PAL.bin.json +++ b/Pack/MKWFaraphel/essentials/_PATCH/files/rel/lecode-PAL.bin.json @@ -1,3 +1,3 @@ { - "if": "str(getattr(getattr(getattr(extracted_game, 'original_game'), 'wit_path'), 'region')) == 'Region.PAL'" + "if": "##GAME_REGION## == 'Region.PAL'" } \ No newline at end of file diff --git a/Pack/MKWFaraphel/essentials/_PATCH/files/rel/lecode-USA.bin.json b/Pack/MKWFaraphel/essentials/_PATCH/files/rel/lecode-USA.bin.json index 550244a..fcb91cf 100644 --- a/Pack/MKWFaraphel/essentials/_PATCH/files/rel/lecode-USA.bin.json +++ b/Pack/MKWFaraphel/essentials/_PATCH/files/rel/lecode-USA.bin.json @@ -1,3 +1,3 @@ { - "if": "str(getattr(getattr(getattr(extracted_game, 'original_game'), 'wit_path'), 'region')) == 'Region.USA'" + "if": "## GAME_REGION ## == 'Region.USA'" } \ No newline at end of file diff --git a/Pack/MKWFaraphel/macros.json b/Pack/MKWFaraphel/macros.json new file mode 100644 index 0000000..cd01899 --- /dev/null +++ b/Pack/MKWFaraphel/macros.json @@ -0,0 +1,12 @@ +{ + "GAME_REGION": "str(getattr(getattr(getattr(extracted_game, 'original_game'), 'wit_path'), 'region'))", + + "TRACK_TEXT_SCORE": "('\\c{' + ['YOR2', 'YOR4', 'YOR6', 'blue1'][getattr(track, 'warning', 0)] +'}\\x'+hex(65296+getattr(track, 'score'))[2:]+'\\c{off} ') if hasattr(track, 'score') else ''", + "TRACK_TEXT_PREFIX": "(prefix+' ') if prefix else ''", + "TRACK_TEXT_SUFFIX": "(' ('+suffix +')') if suffix else ''", + "TRACK_TEXT_NAME": "getattr(track, 'name', '')", + "TRACK_TEXT_AUTHORS": "'\\n'.join(getattr(track, 'author')) if isinstance(getattr(track, 'author', ''), list) else getattr(track, 'author', '/')", + "TRACK_TEXT_WARNING_IF_DISABLED": "'\\c{red3}/\\c{off}' if getattr(track, 'warning', 0) != 0 else ''", + + "IF_NO_WARNING": "if getattr(track, 'warning', 0) == 0 else ''" +} \ No newline at end of file