diff --git a/data/resources/fonts/promptfont.otf b/data/resources/fonts/promptfont.otf index cb4f05466..e2e99b0fa 100644 Binary files a/data/resources/fonts/promptfont.otf and b/data/resources/fonts/promptfont.otf differ diff --git a/dep/imgui/include/IconsPromptFont.h b/dep/imgui/include/IconsPromptFont.h index 63e85c974..85181dedc 100644 --- a/dep/imgui/include/IconsPromptFont.h +++ b/dep/imgui/include/IconsPromptFont.h @@ -353,3 +353,5 @@ #define ICON_PF_POPN_WR "\xE2\x8B\x87" #define ICON_PF_POPN_R "\xE2\x8B\x88" #define ICON_PF_NAVIGATION_BACK "\xE2\x8F\x8C" +#define ICON_PF_CHEATS "\xE2\xAC\xB3" +#define ICON_PF_SPARKLING "\xE2\xAC\xB4" diff --git a/extras/fonts/promptfont.sfd b/extras/fonts/promptfont.sfd index b7f669065..6ca7b2f3f 100644 --- a/extras/fonts/promptfont.sfd +++ b/extras/fonts/promptfont.sfd @@ -23,7 +23,7 @@ OS2Version: 0 OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 0 CreationTime: 1544355305 -ModificationTime: 1749831361 +ModificationTime: 1750521294 PfmFamily: 33 TTFWeight: 400 TTFWidth: 5 @@ -65,7 +65,7 @@ NameList: AGL For New Fonts DisplaySize: -48 AntiAlias: 1 FitToEm: 0 -WinInfo: 17141 61 20 +WinInfo: 10370 61 20 BeginPrivate: 8 BlueValues 29 [0 0 380 380 490 490 660 660] OtherBlues 39 [-210 -210 -180 -180 -160 -160 280 280] @@ -77,7 +77,7 @@ StemSnapV 13 [140 180 200] ForceBold 4 true EndPrivate TeXData: 1 0 0 335544 167772 111848 513802 1048576 111848 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 -BeginChars: 1114112 380 +BeginChars: 1114112 382 StartChar: arrowleft Encoding: 8592 8592 0 @@ -20890,7 +20890,7 @@ SplineSet 141.044921875 493.823242188 m 0 145.946289062 494.323242188 150.928710938 493.22265625 155.774414062 490.069335938 c 2 429.236328125 312.094726562 l 2 - 455.078125 295.276367188 484.896484375 275.176757812 484.896484375 256.442382812 c 2 + 455.078125 295.276367188 484.896484375 275.176757812 484.896484375 256.442382812 c 6 484.896484375 -106.005859375 l 2 484.896484375 -136.838867188 455.078125 -178.485351562 429.236328125 -161.666015625 c 2 155.774414062 16.3076171875 l 2 @@ -20903,7 +20903,7 @@ SplineSet 899.876953125 41.134765625 870.067382812 33.1259765625 844.225585938 16.3076171875 c 2 570.763671875 -161.666015625 l 2 544.921875 -178.485351562 515.103515625 -136.838867188 515.103515625 -106.005859375 c 2 - 515.103515625 256.442382812 l 2 + 515.103515625 256.442382812 l 6 515.103515625 276.270507812 544.921875 295.276367188 570.763671875 312.094726562 c 2 844.225585938 490.069335938 l 2 849.071289062 493.22265625 854.053710938 494.322265625 858.955078125 493.823242188 c 0 @@ -24116,7 +24116,7 @@ EndChar StartChar: uni23CA Encoding: 9162 9162 378 Width: 1000 -Flags: HW +Flags: W LayerCount: 2 Fore SplineSet @@ -24198,6 +24198,7 @@ SplineSet 234.375976562 -127.456054688 223.53125 -125.655273438 210.741210938 -120.9921875 c 0 186.5859375 -112.198242188 160.764648438 -94.8388671875 138.03515625 -72.1201171875 c 0 EndSplineSet +Validated: 524321 EndChar StartChar: uni23CB @@ -24323,6 +24324,124 @@ SplineSet 699.697265625 -188.733398438 616.124023438 -105.161132812 616.124023438 -2.427734375 c 0 616.124023438 100.305664062 699.703125 183.87890625 802.430664062 183.87890625 c 0 EndSplineSet +Validated: 524329 +EndChar + +StartChar: uni2B33 +Encoding: 11059 11059 380 +Width: 1000 +Flags: H +LayerCount: 2 +Fore +SplineSet +705.333007812 207.666992188 m 0 + 730.333007812 182.400390625 743.06640625 151.799804688 743.06640625 116 c 0 + 743.06640625 80.2001953125 730.333007812 49.6669921875 705.333007812 24.3330078125 c 0 + 680.333007812 -1 649.93359375 -13.8662109375 614.666992188 -13.8662109375 c 0 + 573.466796875 -13.8662109375 535.799804688 7.6669921875 500 50.1337890625 c 1 + 464.733398438 7.1337890625 426.466796875 -13.8662109375 385.333007812 -13.8662109375 c 0 + 350.06640625 -13.8662109375 319.666992188 -1 294.666992188 24.3330078125 c 0 + 269.666992188 49.599609375 256.93359375 80.2001953125 256.93359375 116 c 0 + 256.93359375 151.799804688 269.666992188 182.333007812 294.666992188 207.666992188 c 0 + 319.666992188 233 350.06640625 245.866210938 385.333007812 245.866210938 c 0 + 426.533203125 245.866210938 464.200195312 224.333007812 500 181.866210938 c 1 + 535.266601562 224.866210938 573.533203125 245.866210938 614.666992188 245.866210938 c 0 + 649.93359375 245.866210938 680.333007812 233 705.333007812 207.666992188 c 0 +385.866210938 63.93359375 m 1 + 385.799804688 63.93359375 l 1 + 409.333007812 63.93359375 433.333007812 81.1337890625 456.866210938 116 c 1 + 433.333007812 150.866210938 409.333007812 168.06640625 385.799804688 168.06640625 c 0 + 375.466796875 168.06640625 366.666992188 165.666992188 358.333007812 161.400390625 c 0 + 350 157.06640625 343.133789062 150.400390625 338.266601562 142.266601562 c 0 + 333.400390625 134.133789062 330.93359375 125.533203125 330.93359375 116.466796875 c 0 + 330.93359375 102.133789062 336.333007812 90.2001953125 347.133789062 79.6669921875 c 0 + 357.93359375 69.2001953125 371.133789062 64.400390625 386.333007812 64.400390625 c 1 + 385.866210938 63.93359375 l 1 +667.599609375 99.7333984375 m 1 + 667.533203125 99.7333984375 l 1 + 669 105.466796875 670 110.733398438 670 116 c 0 + 670 130.333007812 664.599609375 142.266601562 653.799804688 152.799804688 c 0 + 643 163.266601562 629.799804688 168.06640625 614.599609375 168.06640625 c 0 + 591.06640625 168.06640625 567.06640625 150.866210938 543.533203125 116 c 1 + 567.06640625 81.1337890625 591.06640625 63.93359375 614.599609375 63.93359375 c 0 + 620.533203125 63.93359375 626.400390625 64.93359375 632.266601562 66.3330078125 c 0 + 638.133789062 67.7333984375 643.06640625 70.599609375 647.466796875 73.466796875 c 0 + 651.866210938 76.3330078125 656.333007812 80.6669921875 659.733398438 84.93359375 c 0 + 663.200195312 89.2001953125 666.133789062 94 667.599609375 99.7333984375 c 1 +344.866210938 323.799804688 m 2 + 244.866210938 323.799804688 l 1 + 244.866210938 618 l 2 + 244.866210938 690.200195312 305.93359375 748.93359375 380.93359375 748.93359375 c 2 + 619.06640625 748.93359375 l 2 + 694.06640625 748.93359375 755.133789062 690.200195312 755.133789062 618 c 2 + 755.133789062 468 l 1 + 655.133789062 468 l 1 + 655.133789062 618 l 2 + 655.133789062 633.93359375 638.599609375 647.333007812 619.06640625 647.333007812 c 2 + 380.93359375 647.333007812 l 2 + 361.400390625 647.333007812 344.866210938 633.866210938 344.866210938 618 c 2 + 344.866210938 323.799804688 l 2 +769.93359375 -167.799804688 m 2 + 230.06640625 -167.799804688 l 2 + 164.733398438 -167.799804688 111.533203125 -114.599609375 111.533203125 -49.2666015625 c 2 + 111.533203125 281.133789062 l 2 + 111.533203125 346.466796875 164.733398438 399.666992188 230.06640625 399.666992188 c 2 + 769.93359375 399.666992188 l 2 + 835.266601562 399.666992188 888.466796875 346.466796875 888.466796875 281.133789062 c 2 + 888.466796875 -49.2666015625 l 2 + 888.466796875 -114.599609375 835.266601562 -167.799804688 769.93359375 -167.799804688 c 2 +230.06640625 319.666992188 m 1 + 208.799804688 319.666992188 191.533203125 302.400390625 191.533203125 281.133789062 c 2 + 191.533203125 -49.2666015625 l 2 + 191.533203125 -70.533203125 208.799804688 -87.7998046875 230.06640625 -87.7998046875 c 2 + 769.93359375 -87.7998046875 l 2 + 791.200195312 -87.7998046875 808.466796875 -70.533203125 808.466796875 -49.2666015625 c 2 + 808.466796875 281.133789062 l 2 + 808.466796875 302.400390625 791.200195312 319.666992188 769.93359375 319.666992188 c 2 + 230.06640625 319.666992188 l 1 +EndSplineSet +EndChar + +StartChar: uni2B34 +Encoding: 11060 11060 381 +Width: 1000 +Flags: H +LayerCount: 2 +Fore +SplineSet +583.333007812 605.104492188 m 1 + 583.333007812 558.229492188 l 1 + 639.424804688 558.229492188 684.895507812 512.7578125 684.895507812 456.666992188 c 1 + 731.770507812 456.666992188 l 1 + 731.770507812 512.7578125 777.241210938 558.229492188 833.333007812 558.229492188 c 1 + 833.333007812 605.104492188 l 1 + 777.241210938 605.104492188 731.770507812 650.575195312 731.770507812 706.666992188 c 1 + 684.895507812 706.666992188 l 1 + 684.895507812 650.575195312 639.424804688 605.104492188 583.333007812 605.104492188 c 1 +41.6669921875 331.666992188 m 1 + 41.6669921875 248.333007812 l 1 + 179.73828125 248.333007812 291.666992188 136.404296875 291.666992188 -1.6669921875 c 1 + 375 -1.6669921875 l 1 + 375 136.404296875 486.928710938 248.333007812 625 248.333007812 c 1 + 625 331.666992188 l 1 + 486.928710938 331.666992188 375 443.595703125 375 581.666992188 c 1 + 291.666992188 581.666992188 l 1 + 291.666992188 443.595703125 179.73828125 331.666992188 41.6669921875 331.666992188 c 1 +203.166992188 290 m 1 + 257.798828125 320.31640625 303.017578125 365.533203125 333.333007812 420.166015625 c 1 + 363.6484375 365.533203125 408.868164062 320.31640625 463.5 290 c 1 + 408.868164062 259.68359375 363.6484375 214.466796875 333.333007812 159.833007812 c 1 + 303.017578125 214.466796875 257.798828125 259.68359375 203.166992188 290 c 1 +718.75 206.666992188 m 1 + 718.75 131.87890625 658.12109375 71.25 583.333007812 71.25 c 1 + 583.333007812 8.75 l 1 + 658.12109375 8.75 718.75 -51.87890625 718.75 -126.666992188 c 1 + 781.25 -126.666992188 l 1 + 781.25 -51.87890625 841.87890625 8.75 916.666992188 8.75 c 1 + 916.666992188 71.25 l 1 + 841.87890625 71.25 781.25 131.87890625 781.25 206.666992188 c 1 + 718.75 206.666992188 l 1 +EndSplineSet EndChar EndChars EndSplineFont diff --git a/src/core/fullscreen_ui.cpp b/src/core/fullscreen_ui.cpp index cee285736..cd6d8f69f 100644 --- a/src/core/fullscreen_ui.cpp +++ b/src/core/fullscreen_ui.cpp @@ -3885,8 +3885,8 @@ void FullscreenUI::DrawSettingsWindow() {FSUI_NSTR("Audio Settings"), ICON_PF_SOUND}, {FSUI_NSTR("Achievements Settings"), ICON_FA_TROPHY}, {FSUI_NSTR("Advanced Settings"), ICON_FA_TRIANGLE_EXCLAMATION}, - {FSUI_NSTR("Patches"), ICON_FA_BANDAGE}, - {FSUI_NSTR("Cheats"), ICON_FA_FLASK}}}; + {FSUI_NSTR("Patches"), ICON_PF_SPARKLING}, + {FSUI_NSTR("Cheats"), ICON_PF_CHEATS}}}; const bool game_settings = IsEditingGameSettings(GetEditingSettingsInterface()); const u32 count = @@ -6870,7 +6870,7 @@ void FullscreenUI::DrawPatchesOrCheatsSettingsPage(bool cheats) MenuHeading(FSUI_VSTR("Settings")); bool enable_cheats = bsi->GetBoolValue("Cheats", "EnableCheats", false); - if (ToggleButton(FSUI_ICONVSTR(ICON_FA_FLASK, "Enable Cheats"), + if (ToggleButton(FSUI_ICONVSTR(ICON_PF_CHEATS, "Enable Cheats"), FSUI_VSTR("Enables the cheats that are selected below."), &enable_cheats)) { if (enable_cheats)