From f56610d22cfbc54fbb8194402c06ad93eaf8e73a Mon Sep 17 00:00:00 2001 From: EGAMatsu <58616438+EGAMatsu@users.noreply.github.com> Date: Wed, 9 Jul 2025 23:12:02 -0500 Subject: [PATCH] Add more strings (Mostly translated to toki pona) and add N64 edgecase for Mipmap/Texture filtering --- android/gradlew | 0 misc/flatpak/zenity-wrapper | 0 misc/ps1/sounds/gen.sh | 0 misc/wiiu/assembler.sh | 0 src/MenuOptions.c | 42 +++++++++++-------- src/Strings.h | 80 +++++++++++++++++++++++++++++++++++++ 6 files changed, 106 insertions(+), 16 deletions(-) mode change 100755 => 100644 android/gradlew mode change 100755 => 100644 misc/flatpak/zenity-wrapper mode change 100755 => 100644 misc/ps1/sounds/gen.sh mode change 100755 => 100644 misc/wiiu/assembler.sh diff --git a/android/gradlew b/android/gradlew old mode 100755 new mode 100644 diff --git a/misc/flatpak/zenity-wrapper b/misc/flatpak/zenity-wrapper old mode 100755 new mode 100644 diff --git a/misc/ps1/sounds/gen.sh b/misc/ps1/sounds/gen.sh old mode 100755 new mode 100644 diff --git a/misc/wiiu/assembler.sh b/misc/wiiu/assembler.sh old mode 100755 new mode 100644 diff --git a/src/MenuOptions.c b/src/MenuOptions.c index 2d7f2e5e7..0ee7e2d5f 100644 --- a/src/MenuOptions.c +++ b/src/MenuOptions.c @@ -627,7 +627,7 @@ static void ClassicOptionsScreen_InitWidgets(struct MenuOptionsScreen* s) { MenuOptionsScreen_AddBool(s, ccString_SubOption_ClassicOptions[CC_CurrentLanguage][1], ClO_GetFPS, ClO_SetFPS, NULL); if (Game_ClassicHacks) { - MenuOptionsScreen_AddBool(s, "Hacks enabled", + MenuOptionsScreen_AddBool(s, ccString_SubOption_ClassicOptions[CC_CurrentLanguage][5], ClO_GetHacks,ClO_SetHacks, NULL); } } @@ -771,20 +771,20 @@ static void GrO_SetMipmaps(cc_bool v) { static void GraphicsOptionsScreen_InitWidgets(struct MenuOptionsScreen* s) { MenuOptionsScreen_BeginButtons(s); { - MenuOptionsScreen_AddEnum(s, "FPS mode", FpsLimit_Names, FPS_LIMIT_COUNT, + MenuOptionsScreen_AddEnum(s, ccString_SubOption_Graphics[CC_CurrentLanguage][0], FpsLimit_Names, FPS_LIMIT_COUNT, /* FPS Mode */ GrO_GetFPS, GrO_SetFPS, "&eVSync: &fNumber of frames rendered is at most the monitor's refresh rate.\n" \ "&e30/60/120/144 FPS: &fRenders 30/60/120/144 frames at most each second.\n" \ "&eNoLimit: &fRenders as many frames as possible each second.\n" \ "&cNoLimit is pointless - it wastefully renders frames that you don't even see!"); - MenuOptionsScreen_AddInt(s, "View distance", + MenuOptionsScreen_AddInt(s, ccString_SubOption_Graphics[CC_CurrentLanguage][1], /* View distance */ 8, 4096, 512, GrO_GetViewDist, GrO_SetViewDist, NULL); - MenuOptionsScreen_AddBool(s, "Smooth lighting", + MenuOptionsScreen_AddBool(s, ccString_SubOption_Graphics[CC_CurrentLanguage][2], /* Fancy lighting */ GrO_GetSmooth, GrO_SetSmooth, "&eSmooth lighting smooths lighting and adds a minor glow to bright blocks.\n" \ "&cNote: &eThis setting may reduce performance."); - MenuOptionsScreen_AddEnum(s, "Lighting mode", LightingMode_Names, LIGHTING_MODE_COUNT, + MenuOptionsScreen_AddEnum(s, ccString_SubOption_Graphics[CC_CurrentLanguage][3], LightingMode_Names, LIGHTING_MODE_COUNT, /* Light mode */ GrO_GetLighting, GrO_SetLighting, "&eClassic: &fTwo levels of light, sun and shadow.\n" \ " Good for performance.\n" \ @@ -792,14 +792,14 @@ static void GraphicsOptionsScreen_InitWidgets(struct MenuOptionsScreen* s) { " May heavily reduce performance.\n" \ "&cNote: &eIn multiplayer, this option may be changed or locked by the server."); - MenuOptionsScreen_AddEnum(s, "Names", NameMode_Names, NAME_MODE_COUNT, + MenuOptionsScreen_AddEnum(s, ccString_SubOption_Graphics[CC_CurrentLanguage][4], NameMode_Names, NAME_MODE_COUNT, /* Name render mode*/ GrO_GetNames, GrO_SetNames, "&eNone: &fNo names of players are drawn.\n" \ "&eHovered: &fName of the targeted player is drawn see-through.\n" \ "&eAll: &fNames of all other players are drawn normally.\n" \ "&eAllHovered: &fAll names of players are drawn see-through.\n" \ "&eAllUnscaled: &fAll names of players are drawn see-through without scaling."); - MenuOptionsScreen_AddEnum(s, "Shadows", ShadowMode_Names, SHADOW_MODE_COUNT, + MenuOptionsScreen_AddEnum(s, ccString_SubOption_Graphics[CC_CurrentLanguage][5], ShadowMode_Names, SHADOW_MODE_COUNT, /* Shadow Mode */ GrO_GetShadows, GrO_SetShadows, "&eNone: &fNo entity shadows are drawn.\n" \ "&eSnapToBlock: &fA square shadow is shown on block you are directly above.\n" \ @@ -807,11 +807,17 @@ static void GraphicsOptionsScreen_InitWidgets(struct MenuOptionsScreen* s) { "&eCircleAll: &fA circular shadow is shown underneath all entities."); if (!Gfx_GetUIOptions(s)) { - MenuOptionsScreen_AddBool(s, "Mipmaps", - GrO_GetMipmaps, GrO_SetMipmaps, NULL); - } + #ifndef CC_BUILD_N64 + MenuOptionsScreen_AddBool(s, ccString_SubOption_Graphics[CC_CurrentLanguage][6], /* Mipmapping/Texture Filtering (On N64) */ + GrO_GetMipmaps, GrO_SetMipmaps, NULL); + } + #else + MenuOptionsScreen_AddBool(s, ccString_SubOption_Graphics[CC_CurrentLanguage][7], /* Mipmapping/Texture Filtering (On N64) */ + GrO_GetMipmaps, GrO_SetMipmaps, NULL); + } + #endif - MenuOptionsScreen_AddBool(s, "3D anaglyph", + MenuOptionsScreen_AddBool(s, ccString_SubOption_Graphics[CC_CurrentLanguage][8], /* 3D Anaglyph mode */ ClO_GetAnaglyph, ClO_SetAnaglyph, NULL); }; MenuOptionsScreen_EndButtons(s, -1, Menu_SwitchOptions); @@ -868,18 +874,18 @@ static void ChO_SetClickable(cc_bool v) { static void ChatOptionsScreen_InitWidgets(struct MenuOptionsScreen* s) { MenuOptionsScreen_BeginButtons(s); { - MenuOptionsScreen_AddBool(s, "Scale with window", + MenuOptionsScreen_AddBool(s, ccString_SubOption_Chat[CC_CurrentLanguage][0], ChO_GetAutoScaleChat, ChO_SetAutoScaleChat, NULL); - MenuOptionsScreen_AddNum(s, "Chat scale", + MenuOptionsScreen_AddNum(s, ccString_SubOption_Chat[CC_CurrentLanguage][1], 0.25f, 4.00f, 1, ChO_GetChatScale, ChO_SetChatScale, NULL); - MenuOptionsScreen_AddInt(s, "Chat lines", + MenuOptionsScreen_AddInt(s, ccString_SubOption_Chat[CC_CurrentLanguage][2], 0, 30, Gui.DefaultLines, ChO_GetChatlines, ChO_SetChatlines, NULL); - MenuOptionsScreen_AddBool(s, "Log to disk", + MenuOptionsScreen_AddBool(s, ccString_SubOption_Chat[CC_CurrentLanguage][3], ChO_GetLogging, ChO_SetLogging, NULL); - MenuOptionsScreen_AddBool(s, "Clickable chat", + MenuOptionsScreen_AddBool(s, ccString_SubOption_Chat[CC_CurrentLanguage][4], ChO_GetClickable, ChO_SetClickable, NULL); } MenuOptionsScreen_EndButtons(s, -1, Menu_SwitchOptions); @@ -1202,6 +1208,10 @@ static void MiscSettingsScreen_InitWidgets(struct MenuOptionsScreen* s) { 1, 200, 30, #endif MiO_GetSensitivity, MiO_SetSensitivity, NULL); + + MenuOptionsScreen_AddNum(s, ccString_SubOption_Misc[CC_CurrentLanguage][0], + 0, CC_LANGUAGE_LANGCNT, 0, + MiO_GetLanguage, MiO_SetLanguage, NULL); } MenuOptionsScreen_EndButtons(s, -1, Menu_SwitchOptions); diff --git a/src/Strings.h b/src/Strings.h index 490c8ba6a..5076955b2 100644 --- a/src/Strings.h +++ b/src/Strings.h @@ -180,6 +180,54 @@ static char* csString_LanguageNames[CC_LANGUAGE_LANGCNT] = { "Deutsch" }; +/* Graphics Options */ +static char* ccString_SubOption_Graphics[CC_LANGUAGE_LANGCNT][11] = { + { + "FPS mode", + "View distance", + "Smooth lighting", + "Lighting mode", + "Names", + "Shadows", + "Mipmaps", + "Texture filtering", /* Filter textures on Nintendo 64. */ + "3D anaglyph" + }, + { + "FPS mode", + "View distance", + "Smooth lighting", + "Lighting mode", + "Names", + "Shadows", + "Mipmaps", + "Texture filtering", /* Filter textures on Nintendo 64. */ + "3D anaglyph" + }, + { + "nasin pi sitelen FPS", + "lukin wawa", + "pimeja pona", + "nasin pimeja", + "nimi", + "pimeja soweli", + "sitelen lili", + "sitelen pona", /* Filter textures on Nintendo 64. */ + "sitelen tu" + }, + { + "FPS mode", + "View distance", + "Smooth lighting", + "Lighting mode", + "Names", + "Shadows", + "Mipmaps", + "Texture filtering", /* Filter textures on Nintendo 64. */ + "3D anaglyph" + }, +}; + /* Misc Options */ static char* ccString_SubOption_Misc[CC_LANGUAGE_LANGCNT][11] = { { @@ -282,6 +330,38 @@ static char* ccString_SubOption_GUI[CC_LANGUAGE_LANGCNT][8] = { }, }; +/* Chat Options */ +static char* ccString_SubOption_Chat[CC_LANGUAGE_LANGCNT][5] = { + { + "Scale with window", + "Chat scale", + "Chat lines", + "Log to disk", + "Clickable chat" + }, + { + "Scale with window", + "Chat scale", + "Chat lines", + "Log to disk", + "Clickable chat" + }, + { + "suli tawa sitelen", + "toki suli", + "lipu nanpa", + "o awen tawa lipu sina", + "sina ken luka toki" + }, + { + "Scale with window", + "Chat scale", + "Chat lines", + "Log to disk", + "Clickable chat" + } +}; + /* Nostalgia Options (Appearance) */ static char* ccString_SubOption_NostalgicAppearance[CC_LANGUAGE_LANGCNT][7] = { {