From e3c0fe29da3af9739520ae4052cdd832ea79b787 Mon Sep 17 00:00:00 2001 From: Agent X <44549182+Agent-11@users.noreply.github.com> Date: Wed, 22 Nov 2023 18:45:21 -0500 Subject: [PATCH] Update DJUI Themes, fix warnings and update inis --- lang/Czech.ini | 17 +--- lang/Dutch.ini | 17 +--- lang/English.ini | 17 +--- lang/French.ini | 16 +--- lang/German.ini | 17 +--- lang/Italian.ini | 18 +--- lang/Polish.ini | 42 ++++++--- lang/Portuguese.ini | 17 +--- lang/Russian.ini | 17 +--- lang/SpanishES.ini | 20 ++--- lang/SpanishUS.ini | 17 +--- src/pc/configfile.c | 4 +- src/pc/configfile.h | 1 + src/pc/djui/djui_button.c | 4 +- src/pc/djui/djui_panel_info.c | 3 +- src/pc/djui/djui_panel_menu.c | 6 +- src/pc/djui/djui_panel_misc.c | 2 + src/pc/djui/djui_panel_player.c | 1 + src/pc/djui/djui_theme.c | 149 ++++++++++---------------------- src/pc/djui/djui_theme.h | 9 +- src/pc/pc_main.c | 4 +- tools/check_matching_langs.py | 8 +- 22 files changed, 134 insertions(+), 272 deletions(-) diff --git a/lang/Czech.ini b/lang/Czech.ini index ca466291..7174d6ca 100644 --- a/lang/Czech.ini +++ b/lang/Czech.ini @@ -75,17 +75,6 @@ AGGRESSION = "Agrese" PAN_LEVEL = "Přejezd" DECELERATION = "Zpomalení" -[CHEATS] -CHEATS = "CHEATY" -MOON_JUMP = "Nekonečný skok" -GOD_MODE = "Nedostávat zranení" -INFINITE_LIVES = "Nekonečně životů" -SUPER_SPEED = "Super rychlost" -RESPONSIVE_CONTROLS = "Citlivé ovládání" -RAPID_FIRE = "Rychle mačkat tlačítko (A)" -BLJ_ANYWHERE = "BLJ Všude" -ALWAYS_TRIPLE_JUMP = "Vždy trojitý skok" - [CONTROLS] CONTROLS = "OVLADANI" @@ -146,7 +135,6 @@ D3X = "3x" D10X = "10x" D100X = "100x" DRAW_DISTANCE = "Vzdálenost vykreslování" -DJUI_THEMES = "Témata DJUI" DYNOS_PACKS = "DynOS packy" ANTIALIASING = "Anti-aliasing" OFF = "Vypnuto" @@ -154,11 +142,12 @@ MUST_RESTART = "Musíte restartovat hru pro aplikování změn." [DJUI_THEMES] DJUI_THEMES = "TÉMATA DJUI" +CENTER = "Střed" DJUI_THEME = "Téma DJUI" +CENTER = "Střed" LIGHT_THEME = "Světlo" DARK_THEME = "Tmavý" -LIGHT_THEME_CENTERED = "Světlo (uprostřed)" -DARK_THEME_CENTERED = "Tmavý (uprostřed)" +MARIO_THEME = "Mario" FILE_SELECT_THEME = "Výběr souboru" [DYNOS] diff --git a/lang/Dutch.ini b/lang/Dutch.ini index f4518932..2f70a446 100644 --- a/lang/Dutch.ini +++ b/lang/Dutch.ini @@ -75,17 +75,6 @@ AGGRESSION = "Agressie" PAN_LEVEL = "Pan niveau" DECELERATION = "Vertraging" -[CHEATS] -CHEATS = "CHEATS" -MOON_JUMP = "Maan sprong" -GOD_MODE = "God modus" -INFINITE_LIVES = "Oneindige levens" -SUPER_SPEED = "Super Snelheid" -RESPONSIVE_CONTROLS = "Snel reagerende controles" -RAPID_FIRE = "Snel vuur (A)" -BLJ_ANYWHERE = "BLJ Overal" -ALWAYS_TRIPLE_JUMP = "Altijd drievoudige sprong" - [CONTROLS] CONTROLS = "CONTROLES" @@ -146,7 +135,6 @@ D3X = "3x" D10X = "10x" D100X = "100x" DRAW_DISTANCE = "Teken afstand" -DJUI_THEMES = "DJUI Thema's" DYNOS_PACKS = "DynOS Packs" ANTIALIASING = "Anti-aliasing" OFF = "UIT" @@ -154,11 +142,12 @@ MUST_RESTART = "Je moet de game opnieuw opstarten voor sommige veranderingen om [DJUI_THEMES] DJUI_THEMES = "DJUI THEMA'S" +CENTER = "Centreren" DJUI_THEME = "DJUI Thema" +CENTER = "Centreren" LIGHT_THEME = "Licht" DARK_THEME = "Donker" -LIGHT_THEME_CENTERED = "Licht (gecentreerd)" -DARK_THEME_CENTERED = "Donker (gecentreerd)". +MARIO_THEME = "Mario" FILE_SELECT_THEME = "Bestand selecteren" [DYNOS] diff --git a/lang/English.ini b/lang/English.ini index b664c73b..f1c9ec3d 100644 --- a/lang/English.ini +++ b/lang/English.ini @@ -75,17 +75,6 @@ AGGRESSION = "Aggression" PAN_LEVEL = "Pan Level" DECELERATION = "Deceleration" -[CHEATS] -CHEATS = "CHEATS" -MOON_JUMP = "Moon Jump" -GOD_MODE = "God Mode" -INFINITE_LIVES = "Infinite Lives" -SUPER_SPEED = "Super Speed" -RESPONSIVE_CONTROLS = "Responsive Controls" -RAPID_FIRE = "Rapid Fire (A)" -BLJ_ANYWHERE = "BLJ Anywhere" -ALWAYS_TRIPLE_JUMP = "Always Triple Jump" - [CONTROLS] CONTROLS = "CONTROLS" @@ -146,7 +135,6 @@ D3X = "3x" D10X = "10x" D100X = "100x" DRAW_DISTANCE = "Draw Distance" -DJUI_THEMES = "DJUI Themes" DYNOS_PACKS = "DynOS Packs" ANTIALIASING = "Anti-aliasing" OFF = "Off" @@ -154,11 +142,12 @@ MUST_RESTART = "Restart the game to apply changes." [DJUI_THEMES] DJUI_THEMES = "DJUI THEMES" +CENTER = "Center" DJUI_THEME = "DJUI Theme" +CENTER = "Center" LIGHT_THEME = "Light" DARK_THEME = "Dark" -LIGHT_THEME_CENTERED = "Light (Centered)" -DARK_THEME_CENTERED = "Dark (Centered)" +MARIO_THEME = "Mario" FILE_SELECT_THEME = "File Select" [DYNOS] diff --git a/lang/French.ini b/lang/French.ini index e98052c1..f75d0f97 100644 --- a/lang/French.ini +++ b/lang/French.ini @@ -75,17 +75,6 @@ AGGRESSION = "Aggression" PAN_LEVEL = "Niveau de centrage" DECELERATION = "Décélération" -[CHEATS] -CHEATS = "CODES DE TRICHE" -MOON_JUMP = "Saut Antigravité" -GOD_MODE = "Mode Invincible" -INFINITE_LIVES = "Vies Infinies" -SUPER_SPEED = "Super Vitesse" -RESPONSIVE_CONTROLS = "Contrôles Réactifs" -RAPID_FIRE = "Tir Rapide (A)" -BLJ_ANYWHERE = "BLJ N'importe Où" -ALWAYS_TRIPLE_JUMP = "Triple Sauts Infinis" - [CONTROLS] CONTROLS = "CONTRÔLES" @@ -154,11 +143,12 @@ MUST_RESTART = "Vous devez relancer le jeu pour que certains changements prennen [DJUI_THEMES] DJUI_THEMES = "THÈMES DJUI" +CENTER = "Centrer" DJUI_THEME = "Thème DJUI" +CENTER = "Centrer" LIGHT_THEME = "Lumière" DARK_THEME = "Sombre" -LIGHT_THEME_CENTERED = "Lumière (centré)" -DARK_THEME_CENTERED = "Sombre (centré)" +MARIO_THEME = "Mario" FILE_SELECT_THEME = "Sélection de fichier" [DYNOS] diff --git a/lang/German.ini b/lang/German.ini index 0e2eb33e..0e0ec76c 100644 --- a/lang/German.ini +++ b/lang/German.ini @@ -75,17 +75,6 @@ AGGRESSION = "Aggressivität" PAN_LEVEL = "Schwenk-Level" DECELERATION = "Abbremsen" -[CHEATS] -CHEATS = "CHEATS" -MOON_JUMP = "Mondsprung" -GOD_MODE = "Gott-Modus" -INFINITE_LIVES = "Unendlich Leben" -SUPER_SPEED = "Übergeschwindigkeit" -RESPONSIVE_CONTROLS = "Reaktive Steuerung" -RAPID_FIRE = "Schnellfeuer (A)" -BLJ_ANYWHERE = "Überall Rückwärts-Langsprung" -ALWAYS_TRIPLE_JUMP = "Ständiger Dreifachsprung" - [CONTROLS] CONTROLS = "STEUERUNG" @@ -146,7 +135,6 @@ D3X = "3x" D10X = "10x" D100X = "100x" DRAW_DISTANCE = "Zeichenentfernung" -DJUI_THEMES = "DJUI-Themen" DYNOS_PACKS = "DynOS-Pakete" ANTIALIASING = "Kantenglättung" OFF = "Aus" @@ -154,11 +142,12 @@ MUST_RESTART = "Um einige Änderungen zu übernehmen, muss das Spiel neugestarte [DJUI_THEMES] DJUI_THEMES = "DJUI-THEMEN" +CENTER = "Zentrieren" DJUI_THEME = "DJUI-Thema" +CENTER = "Zentrieren" LIGHT_THEME = "Litch" DARK_THEME = "Dunkel" -LIGHT_THEME_CENTERED = "Licht (zentriert)" -DARK_THEME_CENTERED = "Dunkel (zentriert)" +MARIO_THEME = "Mario" FILE_SELECT_THEME = "Dateiauswahl" [DYNOS] diff --git a/lang/Italian.ini b/lang/Italian.ini index 60c1585a..7b8c3268 100644 --- a/lang/Italian.ini +++ b/lang/Italian.ini @@ -75,17 +75,6 @@ AGGRESSION = "Aggressività" PAN_LEVEL = "Livello di panoramica" DECELERATION = "Decelerazione" -[CHEATS] -CHEATS = "TRUCCHI" -MOON_JUMP = "Moon Jump" -GOD_MODE = "God Mode" -INFINITE_LIVES = "Vite infinite" -SUPER_SPEED = "Super Velocità" -RESPONSIVE_CONTROLS = "Controlli reattivi" -RAPID_FIRE = "Fuoco Rapido (A)" -BLJ_ANYWHERE = "BLJ Ovunque" -ALWAYS_TRIPLE_JUMP = "Sempre Salto triplo" - [CONTROLS] CONTROLS = "CONTROLLI" N64_BINDS = "Comandi N64" @@ -144,7 +133,6 @@ D3X = "3x" D10X = "10x" D100X = "100x" DRAW_DISTANCE = "Distanza di simulazione" -DJUI_THEMES = "Temi DJUI" DYNOS_PACKS = "Pacchetti DynOS" ANTIALIASING = "Anti-aliasing" OFF = "Off" @@ -152,11 +140,12 @@ MUST_RESTART = "You must restart the game for some changes to take effect." [DJUI_THEMES] DJUI_THEMES = "TEMI DJUI" +CENTER = "Centrare" DJUI_THEME = "Tema DJUI" +CENTER = "Centrare" LIGHT_THEME = "Luce" DARK_THEME = "Scuro" -LIGHT_THEME_CENTERED = "Luce (Centrata)" -DARK_THEME_CENTERED = "Scuro (Centrato)" +MARIO_THEME = "Mario" FILE_SELECT_THEME = "Selezione file" [DYNOS] @@ -210,6 +199,7 @@ SERVER_TITLE = "SERVER" HOST_TITLE = "OSPITA" DISCORD = "Discord" DIRECT_CONNECTION = "Connessione diretta" +COOPNET = "CoopNet" NETWORK_SYSTEM = "Sistema di connessione" PORT = "Porta" PASSWORD = "Password" diff --git a/lang/Polish.ini b/lang/Polish.ini index b2974b9a..e4b40a2a 100644 --- a/lang/Polish.ini +++ b/lang/Polish.ini @@ -39,6 +39,7 @@ ADD_MODERATOR = "Dodawanie gracza '@' jako Moderatora!" PLAYERS = "Gracze" NO_PERMS = "Nie masz uprawnien na korzystanie z tego polecenia." PLAYER_NOT_FOUND = "Nie znaleziono gracza." +NAMETAGS_MISSING_PARAMETERS = "Brakujące parametry: [OPTION]" SELF_KICK = "Nie mozna wyrzucic samego siebie." SELF_BAN = "Nie mozna zbanowac samego siebie." SELF_MOD = "Nie mozna dodac samego siebie jako moderatora." @@ -51,6 +52,7 @@ KICK_DESC = "/kick [NAME|ID] - Wyrzuca tego gracza z obecnej gry" BAN_DESC = "/ban [NAME|ID] - Banuje tego gracza z obecnej gry" PERM_BAN_DESC = "/permban [NAME|ID] - Banuje tego gracza z kazdej gry hostowanej przez ciebie" MOD_DESC = "/moderator [NAME|ID] - Umozliwia temu graczowi korzystanie z polecen takich jak /kick, /ban, /permban w kazdej grze hostowanej przez ciebie" +NAMETAGS_DESC = "/nametags [show-tag|show-health] - Zmień, czy widzisz swój identyfikator i czy widzisz zdrowie" UNRECOGNIZED = "Nieznane polecenie czatu." MOD_GRANTED = "\\#fff982\\Jestes teraz moderatorem." @@ -73,17 +75,6 @@ AGGRESSION = "Agresja" PAN_LEVEL = "Poziom Przesuniecia" DECELERATION = "Zwalnianie" -[CHEATS] -CHEATS = "OSZUSTWA" -MOON_JUMP = "Skok Ksiezycowy" -GOD_MODE = "Tryb Boga" -INFINITE_LIVES = "Nieskonczone Zycia" -SUPER_SPEED = "Super Szybkosc" -RESPONSIVE_CONTROLS = "Responsywne Sterowanie" -RAPID_FIRE = "Szybkostrzelnosc (A)" -BLJ_ANYWHERE = "BLJ Gdziekolwiek" -ALWAYS_TRIPLE_JUMP = "Potrojny Skok Zawsze" - [CONTROLS] CONTROLS = "STEROWANIE" @@ -102,6 +93,10 @@ D_LEFT = "D W Lewo" D_RIGHT = "D W Prawo" X = "X" Y = "Y" +CONSOLE = "Konsola" +PREV = "Poprzednia Strona" +NEXT = "Następna Strona" +DISCONNECT = "Rozłączenie" UP = "Gora" DOWN = "Dol" @@ -145,6 +140,16 @@ ANTIALIASING = "Anti-aliasing" OFF = "Wylaczone" MUST_RESTART = "Musisz zrestartowac gre, aby zmiany zaczely obowiazywac." +[DJUI_THEMES] +DJUI_THEMES = "TEMATY DJUI" +CENTER = "Środek" +DJUI_THEME = "Motyw DJUI" +CENTER = "Środek" +LIGHT_THEME = "Światło" +DARK_THEME = "Ciemny" +MARIO_THEME = "Mario" +FILE_SELECT_THEME = "Wybór Pliku" + [DYNOS] DYNOS = "DYNOS" @@ -184,6 +189,11 @@ SKIP_INTRO_CUTSCENE = "Pomin intro" SHARE_LIVES = "Wspolne zycia" ENABLE_CHEATS = "Wlacz oszustwa" BUBBLE_ON_DEATH = "Banka na smierci" +NAMETAGS = "Identyfikatory \\#ffff00\\(NOWOŚĆ!)" +BOUNCY_BOUNDS_ON_CAP = "Na (Zamknięty)" +BOUNCY_BOUNDS_ON = "Na" +BOUNCY_BOUNDS_OFF = "Wył" +BOUNCY_LEVEL_BOUNDS = "Odbijane Granice Poziomów \\#ffff00\\(NOWOŚĆ!)" AMOUNT_OF_PLAYERS = "Liczba Graczy" [HOST] @@ -241,8 +251,16 @@ MISC_TITLE = "ROZNE" PAUSE_IN_SINGLEPLAYER = "Pauza w Trybie Pojedynczego Gracza" DISABLE_POPUPS = "Wylacz Popupy" MENU_OPTIONS = "Opcje Menu" +INFORMATION = "Info" DEBUG = "Debugowanie" LANGUAGE = "Jezyk" +COOP_COMPATIBILITY = "Włącz kompatybilność sm64ex-coop" + +[INFORMATION] +INFORMATION_TITLE = "INFO" + +[CONSOLE] +CONSOLE = "KONSOLA" [MODLIST] MODS = "MODS" @@ -324,6 +342,7 @@ RASPBERRY = "Malina" BUBBLEGUM = "Guma Balonowa" ICE_MARIO = "Lodowy Mario" ICE_LUIGI = "Lodowy Luigi" +TOAD = "Toad" CUSTOM = "Wlasny" [PLAYER_LIST] @@ -338,6 +357,7 @@ MASTER_VOLUME = "Glowna Glosnosc" MUSIC_VOLUME = "Glosnosc Muzyki" SFX_VOLUME = "Glosnosc Sfx" ENV_VOLUME = "Glosnosc Srodowiska" +FADEOUT = "Zanikanie Odległych Dźwięków" [LANGUAGE] LANGUAGE = "JEZYK" diff --git a/lang/Portuguese.ini b/lang/Portuguese.ini index a28c0671..1a439a12 100644 --- a/lang/Portuguese.ini +++ b/lang/Portuguese.ini @@ -75,17 +75,6 @@ AGGRESSION = "Agressão" PAN_LEVEL = "Nível Pan" DECELERATION = "Desaceleração" -[CHEATS] -CHEATS = "Cheats" -MOON_JUMP = "Pulo da Lua" -GOD_MODE = "Modo Deus" -INFINITE_LIVES = "Vidas Infinitas" -SUPER_SPEED = "Super Velocidade" -RESPONSIVE_CONTROLS = "Controle Responsivos" -RAPID_FIRE = "Rapid fire (A)" -BLJ_ANYWHERE = "BLJ Em Qualquer Lugar" -ALWAYS_TRIPLE_JUMP = "Sempre Fazer Triple Jump" - [CONTROLS] CONTROLS = "CONTROLES" @@ -146,7 +135,6 @@ D3X = "3x" D10X = "10x" D100X = "100x" DRAW_DISTANCE = "Distância de Renderização" -DJUI_THEMES = "Temas DJUI" DYNOS_PACKS = "DynOS Packs" ANTIALIASING = "Anti-aliasing" OFF = "Desligado" @@ -154,11 +142,12 @@ MUST_RESTART = "Você precisará reiniciar o jogo para algumas alterações sere [DJUI_THEMES] DJUI_THEMES = "TEMAS DJUI" +CENTER = "Centralizar" DJUI_THEME = "Tema DJUI" +CENTER = "Centralizar" LIGHT_THEME = "Claro" DARK_THEME = "Escuro" -LIGHT_THEME_CENTERED = "Claro (centrado)" -DARK_THEME_CENTERED = "Escuro (centrado)" +MARIO_THEME = "Mario" FILE_SELECT_THEME = "Seleção de arquivo" [DYNOS] diff --git a/lang/Russian.ini b/lang/Russian.ini index dbaeabc5..0d203031 100644 --- a/lang/Russian.ini +++ b/lang/Russian.ini @@ -75,17 +75,6 @@ AGGRESSION = "Агрессия" PAN_LEVEL = "Панорамирование" DECELERATION = "Замедление" -[CHEATS] -CHEATS = "CHEATS" -MOON_JUMP = "Супер прыжок" -GOD_MODE = "Режим бога" -INFINITE_LIVES = "Бесконечные жизни" -SUPER_SPEED = "Супер скорость" -RESPONSIVE_CONTROLS = "Отзывчивое управление" -RAPID_FIRE = "Быстрое нажатие (A)" -BLJ_ANYWHERE = "BLJ в любом месте" -ALWAYS_TRIPLE_JUMP = "Всегда тройной прыжок" - [CONTROLS] CONTROLS = "CONTROLS" N64_BINDS = "Кнопки N64" @@ -145,7 +134,6 @@ D3X = "3x" D10X = "10x" D100X = "100x" DRAW_DISTANCE = "Дальность прорисовки" -DJUI_THEMES = "Темы DJUI" DYNOS_PACKS = "Пакеты DynOS" ANTIALIASING = "Анизотропная фильтрация" OFF = "Выкл" @@ -153,11 +141,12 @@ MUST_RESTART = "Перезапустите игру, чтобы изменени [DJUI_THEMES] DJUI_THEMES = "ТЕМЫ DJUI" +CENTER = "Центр" DJUI_THEME = "Темы DJUI" +CENTER = "Центр" LIGHT_THEME = "Свет" DARK_THEME = "Темный" -LIGHT_THEME_CENTERED = "Свет (по центру)" -DARK_THEME_CENTERED = "Темный (по центру)" +MARIO_THEME = "Mario" FILE_SELECT_THEME = "Выбор файла" [DYNOS] diff --git a/lang/SpanishES.ini b/lang/SpanishES.ini index 1492a9ce..970d4d28 100644 --- a/lang/SpanishES.ini +++ b/lang/SpanishES.ini @@ -75,17 +75,6 @@ AGGRESSION = "Agresión" PAN_LEVEL = "Nivel de seguimiento" DECELERATION = "Deceleración" -[CHEATS] -CHEATS = "TRUCOS" -MOON_JUMP = "Salto lunar" -GOD_MODE = "Modo Dios" -INFINITE_LIVES = "Vidas infinitas" -SUPER_SPEED = "Super velocidad" -RESPONSIVE_CONTROLS = "Controles responsivos" -RAPID_FIRE = "Pulsación rápida (A)" -BLJ_ANYWHERE = "BLJ donde sea" -ALWAYS_TRIPLE_JUMP = "Siempre hacer triple salto" - [CONTROLS] CONTROLS = "CONTROLES" @@ -146,7 +135,6 @@ D3X = "3x" D10X = "10x" D100X = "100x" DRAW_DISTANCE = "Distancia de dibujado" -DJUI_THEMES = "Temas de DJUI" DYNOS_PACKS = "Packs de DynOS" ANTIALIASING = "Anti-aliasing" OFF = "Desactivado" @@ -154,11 +142,12 @@ MUST_RESTART = "Tienes que reiniciar el juego para que algunos cambios surtan ef [DJUI_THEMES] DJUI_THEMES = "TEMAS de DJUI" +CENTER = "Centrar" DJUI_THEME = "Tema de DJUI" +CENTER = "Centrar" LIGHT_THEME = "Claro" DARK_THEME = "Oscuro" -LIGHT_THEME_CENTERED = "Claro (Centrado)" -DARK_THEME_CENTERED = "Oscuro (Centrado)" +MARIO_THEME = "Mario" FILE_SELECT_THEME = "Selección de archivo" [DYNOS] @@ -270,6 +259,9 @@ COOP_COMPATIBILITY = "Habilitar la compatibilidad de sm64ex-coop" [INFORMATION] INFORMATION_TITLE = "INFORMACIÓN" +[CONSOLE] +CONSOLE = "CONSOLA" + [MODLIST] MODS = "MODS" diff --git a/lang/SpanishUS.ini b/lang/SpanishUS.ini index 7d5bb46a..afb434d7 100644 --- a/lang/SpanishUS.ini +++ b/lang/SpanishUS.ini @@ -75,17 +75,6 @@ AGGRESSION = "Agresión" PAN_LEVEL = "Nivel de seguimiento" DECELERATION = "Deceleración" -[CHEATS] -CHEATS = "TRUCOS" -MOON_JUMP = "Salto lunar" -GOD_MODE = "Modo Dios" -INFINITE_LIVES = "Vidas infinitas" -SUPER_SPEED = "Super velocidad" -RESPONSIVE_CONTROLS = "Controles responsivos" -RAPID_FIRE = "Pulsación rápida (A)" -BLJ_ANYWHERE = "BLJ donde sea" -ALWAYS_TRIPLE_JUMP = "Siempre hacer triple salto" - [CONTROLS] CONTROLS = "CONTROLES" @@ -146,7 +135,6 @@ D3X = "3x" D10X = "10x" D100X = "100x" DRAW_DISTANCE = "Distancia de dibujado" -DJUI_THEMES = "Temas de DJUI" DYNOS_PACKS = "Packs de DynOS" ANTIALIASING = "Anti-aliasing" OFF = "Desactivado" @@ -154,11 +142,12 @@ MUST_RESTART = "Tienes que reiniciar el juego para que algunos cambios surtan ef [DJUI_THEMES] DJUI_THEMES = "TEMAS de DJUI" +CENTER = "Centrar" DJUI_THEME = "Tema de DJUI" +CENTER = "Centrar" LIGHT_THEME = "Claro" DARK_THEME = "Oscuro" -LIGHT_THEME_CENTERED = "Claro (Centrado)" -DARK_THEME_CENTERED = "Oscuro (Centrado)" +MARIO_THEME = "Mario" FILE_SELECT_THEME = "Selección de archivo" [DYNOS] diff --git a/src/pc/configfile.c b/src/pc/configfile.c index 45593798..a1fbd4b4 100644 --- a/src/pc/configfile.c +++ b/src/pc/configfile.c @@ -159,7 +159,8 @@ unsigned int configCoopNetPort = DEFAULT_COOPNET_PORT; char configPassword[MAX_CONFIG_STRING] = ""; char configDestId[MAX_CONFIG_STRING] = "0"; bool configFadeoutDistantSounds = false; -unsigned int configDjuiTheme = DJUI_THEME_DARK_CENTERED; +unsigned int configDjuiTheme = DJUI_THEME_DARK; +bool configDjuiThemeCenter = true; bool configCoopCompatibility = true; static const struct ConfigOption options[] = { @@ -274,6 +275,7 @@ static const struct ConfigOption options[] = { {.name = "coopnet_dest", .type = CONFIG_TYPE_STRING, .stringValue = (char*)&configDestId, .maxStringLength = MAX_CONFIG_STRING}, {.name = "fade_distant_sounds", .type = CONFIG_TYPE_BOOL , .boolValue = &configFadeoutDistantSounds}, {.name = "djui_theme", .type = CONFIG_TYPE_UINT , .uintValue = &configDjuiTheme}, + {.name = "djui_theme_center", .type = CONFIG_TYPE_BOOL , .boolValue = &configDjuiThemeCenter} }; // FunctionConfigOption functions diff --git a/src/pc/configfile.h b/src/pc/configfile.h index 2275e918..e4adfd08 100644 --- a/src/pc/configfile.h +++ b/src/pc/configfile.h @@ -117,6 +117,7 @@ extern char configPassword[]; extern char configDestId[]; extern bool configFadeoutDistantSounds; extern unsigned int configDjuiTheme; +extern bool configDjuiThemeCenter; extern bool configCoopCompatibility; void enable_queued_mods(); diff --git a/src/pc/djui/djui_button.c b/src/pc/djui/djui_button.c index 377aeccf..6288514a 100644 --- a/src/pc/djui/djui_button.c +++ b/src/pc/djui/djui_button.c @@ -51,7 +51,7 @@ struct DjuiButton* djui_button_create(struct DjuiBase* parent, const char* messa struct DjuiBase* base = &button->base; djui_base_init(parent, base, NULL, djui_button_destroy); - djui_base_set_size(base, 200, gDjuiThemes[configDjuiTheme]->panels.center ? 50 : 64); + djui_base_set_size(base, 200, configDjuiThemeCenter ? 50 : 64); djui_base_set_border_width(base, 2); djui_interactable_create(base, djui_button_update_style); button->style = 0; @@ -72,7 +72,7 @@ struct DjuiButton* djui_button_create(struct DjuiBase* parent, const char* messa button->text = text; djui_base_set_size_type(base, DJUI_SVT_RELATIVE, DJUI_SVT_ABSOLUTE); - djui_base_set_size(base, 1.0f, gDjuiThemes[configDjuiTheme]->panels.center ? 50 : 64); + djui_base_set_size(base, 1.0f, configDjuiThemeCenter ? 50 : 64); djui_interactable_hook_click(base, on_click); button->style = style; djui_button_update_style(base); diff --git a/src/pc/djui/djui_panel_info.c b/src/pc/djui/djui_panel_info.c index 52c095dc..71c06bcf 100644 --- a/src/pc/djui/djui_panel_info.c +++ b/src/pc/djui/djui_panel_info.c @@ -37,9 +37,8 @@ Build Type: %s", ); struct DjuiText* text = djui_text_create(body, sInfo); - struct DjuiTheme* theme = gDjuiThemes[configDjuiTheme]; djui_base_set_location(&text->base, 0, 0); - djui_base_set_size(&text->base, (DJUI_DEFAULT_PANEL_WIDTH * theme->panels.widthMultiplier) - 64, 480); + djui_base_set_size(&text->base, (DJUI_DEFAULT_PANEL_WIDTH * (configDjuiThemeCenter ? DJUI_THEME_CENTERED_WIDTH : 1)) - 64, 480); djui_base_set_color(&text->base, 220, 220, 220, 255); djui_text_set_drop_shadow(text, 64, 64, 64, 100); djui_text_set_alignment(text, DJUI_HALIGN_CENTER, DJUI_VALIGN_TOP); diff --git a/src/pc/djui/djui_panel_menu.c b/src/pc/djui/djui_panel_menu.c index a5823071..99a664af 100644 --- a/src/pc/djui/djui_panel_menu.c +++ b/src/pc/djui/djui_panel_menu.c @@ -50,14 +50,14 @@ struct DjuiThreePanel* djui_panel_menu_create(char* headerText) { struct DjuiThreePanel* panel = djui_three_panel_create(&gDjuiRoot->base, 64, 0, 0); struct DjuiTheme* theme = gDjuiThemes[configDjuiTheme]; struct DjuiThreePanelTheme three = theme->threePanels; - bool center = theme->panels.center && + bool center = configDjuiThemeCenter && strcmp(headerText, DLANG(HOST_MODS, MODS)) && strcmp(headerText, DLANG(HOST_MODS, ROMHACKS)) && strcmp(headerText, DLANG(LOBBIES, PUBLIC_LOBBIES)) && strcmp(headerText, DLANG(LOBBIES, PRIVATE_LOBBIES)) && strcmp(headerText, DLANG(JOIN_MESSAGE, JOINING)); - f32 widthMultiplier = center ? theme->panels.widthMultiplier : 1.0f; - f32 heightMultiplier = center ? theme->panels.heightMultiplier : 1.0f; + f32 widthMultiplier = center ? DJUI_THEME_CENTERED_WIDTH : 1.0f; + f32 heightMultiplier = center ? DJUI_THEME_CENTERED_HEIGHT : 1.0f; djui_base_set_size_type(&panel->base, DJUI_SVT_ABSOLUTE, DJUI_SVT_RELATIVE); djui_base_set_size(&panel->base, DJUI_DEFAULT_PANEL_WIDTH * widthMultiplier, heightMultiplier); diff --git a/src/pc/djui/djui_panel_misc.c b/src/pc/djui/djui_panel_misc.c index aa027a52..7e493520 100644 --- a/src/pc/djui/djui_panel_misc.c +++ b/src/pc/djui/djui_panel_misc.c @@ -80,6 +80,8 @@ void djui_panel_misc_create(struct DjuiBase* caller) { } djui_selectionbox_create(body, DLANG(DJUI_THEMES, DJUI_THEME), themeChoices, DJUI_THEME_MAX, &configDjuiTheme, djui_panel_misc_djui_theme_change); + djui_checkbox_create(body, DLANG(DJUI_THEMES, CENTER), &configDjuiThemeCenter, djui_panel_misc_djui_theme_change); + djui_checkbox_create(body, DLANG(MISC, COOP_COMPATIBILITY), &configCoopCompatibility, djui_panel_compatibility_checkbox_on_value_change); djui_button_create(body, DLANG(MISC, LANGUAGE), DJUI_BUTTON_STYLE_NORMAL, djui_panel_language_create); diff --git a/src/pc/djui/djui_panel_player.c b/src/pc/djui/djui_panel_player.c index d02d9f4b..23ce11d5 100644 --- a/src/pc/djui/djui_panel_player.c +++ b/src/pc/djui/djui_panel_player.c @@ -246,6 +246,7 @@ void djui_panel_player_create(struct DjuiBase* caller) { djui_base_set_color(&text1->base, 220, 220, 220, 255); djui_base_set_size(&text1->base, 0.585f, 64); djui_base_set_alignment(&text1->base, DJUI_HALIGN_LEFT, DJUI_VALIGN_TOP); + djui_text_set_drop_shadow(text1, 64, 64, 64, 100); struct DjuiInputbox* inputbox1 = djui_inputbox_create(&rect1->base, MAX_PLAYER_STRING); djui_base_set_size_type(&inputbox1->base, DJUI_SVT_RELATIVE, DJUI_SVT_ABSOLUTE); diff --git a/src/pc/djui/djui_theme.c b/src/pc/djui/djui_theme.c index 396a9488..64fec02c 100644 --- a/src/pc/djui/djui_theme.c +++ b/src/pc/djui/djui_theme.c @@ -37,9 +37,6 @@ static struct DjuiTheme sDjuiThemeLight = { } }, .panels = { - .widthMultiplier = 1.0f, - .heightMultiplier = 1.0f, - .center = false, .hudFontHeader = false } }; @@ -81,97 +78,6 @@ static struct DjuiTheme sDjuiThemeDark = { } }, .panels = { - .widthMultiplier = 1.0f, - .heightMultiplier = 1.0f, - .center = false, - .hudFontHeader = false - } -}; - -static struct DjuiTheme sDjuiThemeLightCentered = { - .id = "LIGHT_THEME_CENTERED", - .name = "LIGHT_THEME_CENTERED", - .interactables = { - .textColor = { - 11, 11, 11, 255 - }, - - .defaultRectColor = { - 222, 222, 222, 255 - }, - .cursorDownRectColor = { - 204, 228, 247, 255 - }, - .hoveredRectColor = { - 229, 241, 251, 255 - }, - - .defaultBorderColor = { - 75, 75, 75, 255 - }, - .cursorDownBorderColor = { - 0, 84, 153, 255 - }, - .hoveredBorderColor = { - 0, 120, 215, 255 - } - }, - .threePanels = { - .rectColor = { - 0, 0, 0, 235 - }, - .borderColor = { - 0, 0, 0, 200 - } - }, - .panels = { - .widthMultiplier = 1.25f, - .heightMultiplier = 0.88f, - .center = true, - .hudFontHeader = false - } -}; - -static struct DjuiTheme sDjuiThemeDarkCentered = { - .id = "DARK_THEME_CENTERED", - .name = "DARK_THEME_CENTERED", - .interactables = { - .textColor = { - 220, 220, 220, 255 - }, - - .defaultRectColor = { - 22, 22, 22, 255 - }, - .cursorDownRectColor = { - 100, 100, 100, 255 - }, - .hoveredRectColor = { - 80, 80, 80, 255 - }, - - .defaultBorderColor = { - 75, 75, 75, 255 - }, - .cursorDownBorderColor = { - 0, 84, 153, 255 - }, - .hoveredBorderColor = { - 0, 120, 215, 255 - } - }, - .threePanels = { - .rectColor = { - 0, 0, 0, 235 - }, - .borderColor = { - 0, 0, 0, 200 - } - }, - .panels = { - .widthMultiplier = 1.25f, - .heightMultiplier = 0.88f, - .center = true, .hudFontHeader = false } }; @@ -213,25 +119,62 @@ static struct DjuiTheme sDjuiThemeFileSelect = { } }, .panels = { - .widthMultiplier = 1.5f, - .heightMultiplier = 0.88f, - .center = true, .hudFontHeader = true } }; +static struct DjuiTheme sDjuiThemeMario = { + .id = "MARIO_THEME", + .name = "MARIO_THEME", + .interactables = { + .textColor = { + 11, 11, 11, 255 + }, + + .defaultRectColor = { + 255, 227, 0, 255 + }, + .cursorDownRectColor = { + 204, 228, 247, 255 + }, + .hoveredRectColor = { + 229, 241, 251, 255 + }, + + .defaultBorderColor = { + 196, 165, 0, 255 + }, + .cursorDownBorderColor = { + 0, 84, 153, 255 + }, + .hoveredBorderColor = { + 0, 120, 215, 255 + } + }, + .threePanels = { + .rectColor = { + 76, 116, 201, 235 + }, + .borderColor = { + 255, 82, 82, 200 + } + }, + .panels = { + .hudFontHeader = false + } +}; + struct DjuiTheme* gDjuiThemes[] = { &sDjuiThemeLight, &sDjuiThemeDark, - &sDjuiThemeLightCentered, - &sDjuiThemeDarkCentered, - &sDjuiThemeFileSelect + &sDjuiThemeFileSelect, + &sDjuiThemeMario }; struct DjuiColor djui_theme_shade_color(struct DjuiColor color) { - color.r *= 0.5f; - color.g *= 0.5f; - color.b *= 0.5f; + color.r *= 0.75f; + color.g *= 0.75f; + color.b *= 0.75f; return color; } diff --git a/src/pc/djui/djui_theme.h b/src/pc/djui/djui_theme.h index 3bee89c5..d07a4edb 100644 --- a/src/pc/djui/djui_theme.h +++ b/src/pc/djui/djui_theme.h @@ -1,12 +1,14 @@ #pragma once #include "djui.h" +#define DJUI_THEME_CENTERED_WIDTH 1.25f +#define DJUI_THEME_CENTERED_HEIGHT 0.88f + enum DjuiThemeType { DJUI_THEME_LIGHT, DJUI_THEME_DARK, - DJUI_THEME_LIGHT_CENTERED, - DJUI_THEME_DARK_CENTERED, DJUI_THEME_FILE_SELECT, + DJUI_THEME_MARIO, DJUI_THEME_MAX }; @@ -28,9 +30,6 @@ struct DjuiThreePanelTheme { }; struct DjuiPanelTheme { - f32 widthMultiplier; - f32 heightMultiplier; - bool center; bool hudFontHeader; }; diff --git a/src/pc/pc_main.c b/src/pc/pc_main.c index d5aab109..ce67cfd0 100644 --- a/src/pc/pc_main.c +++ b/src/pc/pc_main.c @@ -193,10 +193,10 @@ void produce_interpolation_frames_and_delay(void) { u64 sCurrentFpsUpdateTime = (u64)clock_elapsed_f64(); if (sLastFpsUpdateTime != sCurrentFpsUpdateTime) { - u32 fps = sFramesSinceFpsUpdate / ((f32)(sCurrentFpsUpdateTime - sLastFpsUpdateTime)); + // u32 fps = sFramesSinceFpsUpdate / ((f32)(sCurrentFpsUpdateTime - sLastFpsUpdateTime)); sLastFpsUpdateTime = sCurrentFpsUpdateTime; sFramesSinceFpsUpdate = 0; - //printf("fps: %u\n", fps); + // printf("fps: %u\n", fps); } sFrameTimeStart = sFrameTargetTime; diff --git a/tools/check_matching_langs.py b/tools/check_matching_langs.py index 2fc58961..3a23cff0 100644 --- a/tools/check_matching_langs.py +++ b/tools/check_matching_langs.py @@ -40,10 +40,10 @@ for filename in os.listdir("lang"): if not missing_sections and not extra_sections and not any(missing_keys.values()): print(f"{filename} is matching to English.ini.") else: - # if missing_sections: - # print(f"Missing sections: {', '.join(missing_sections)}") - # if extra_sections: - # print(f"Extra sections: {', '.join(extra_sections)}") + if missing_sections: + print(f"Missing sections: {', '.join(missing_sections)}") + if extra_sections: + print(f"Extra sections: {', '.join(extra_sections)}") for section, keys in missing_keys.items(): if keys: print(f"Missing keys in section '{section}': {', '.join(keys)}") \ No newline at end of file