From 016f6abe882c842734c4ed2c938466cdc9579580 Mon Sep 17 00:00:00 2001 From: Observer KRypt0n_ Date: Mon, 10 Jan 2022 12:20:15 +0200 Subject: [PATCH] Several changes - removed vi-vn locale because no one translate it - added 6 new splash screen messages - encoded file names for discord rpc icons - made preparations for env manager --- public/locales/de-de.yaml | 7 +- public/locales/en-us.yaml | 14 +- public/locales/es-es.yaml | 7 +- public/locales/fr-fr.yaml | 7 +- public/locales/it-it.yaml | 7 +- public/locales/ru-ru.yaml | 7 +- public/locales/uwu.yaml | 7 +- public/locales/vi-vn.yaml | 168 ------------------ .../discord/{gi-icon.jpg => anime-icon.jpg} | Bin .../discord/{baal1.webp => chr-in-rs-1.webp} | Bin .../{yaemiko1.webp => chr-in-ym-1.webp} | Bin .../discord/{yaemiko2.jpg => chr-in-ym-2.jpg} | Bin .../{beidougame.jpg => chr-ly-bd-1.jpg} | Bin .../discord/{artgame.jpg => chr-ms-ab-1.jpg} | Bin .../discord/{artgame3.jpg => chr-ms-ab-2.jpg} | Bin .../discord/{kleegame.jpg => chr-ms-kl-1.jpg} | Bin .../{kleegame2.jpg => chr-ms-kl-2.jpg} | Bin .../discord/{artgame2.jpg => chr-ms-kl-3.jpg} | Bin .../discord/{inazuma1.jpg => loc-in-1.jpg} | Bin .../discord/{inazuma2.jpg => loc-in-2.jpg} | Bin .../discord/{inazuma3.jpg => loc-in-3.jpg} | Bin .../discord/{inazuma4.jpg => loc-in-4.jpg} | Bin .../discord/{inazuma5.jpg => loc-in-5.jpg} | Bin .../discord/{liyuegame.jpg => loc-ly-1.jpg} | Bin src/components/DiscordSettings.svelte | 54 +++--- src/components/EnvironmentManager.svelte | 37 ++++ src/settings.svelte | 10 +- src/splash.svelte | 2 +- 28 files changed, 118 insertions(+), 209 deletions(-) delete mode 100644 public/locales/vi-vn.yaml rename src/assets/images/discord/{gi-icon.jpg => anime-icon.jpg} (100%) rename src/assets/images/discord/{baal1.webp => chr-in-rs-1.webp} (100%) rename src/assets/images/discord/{yaemiko1.webp => chr-in-ym-1.webp} (100%) rename src/assets/images/discord/{yaemiko2.jpg => chr-in-ym-2.jpg} (100%) rename src/assets/images/discord/{beidougame.jpg => chr-ly-bd-1.jpg} (100%) rename src/assets/images/discord/{artgame.jpg => chr-ms-ab-1.jpg} (100%) rename src/assets/images/discord/{artgame3.jpg => chr-ms-ab-2.jpg} (100%) rename src/assets/images/discord/{kleegame.jpg => chr-ms-kl-1.jpg} (100%) rename src/assets/images/discord/{kleegame2.jpg => chr-ms-kl-2.jpg} (100%) rename src/assets/images/discord/{artgame2.jpg => chr-ms-kl-3.jpg} (100%) rename src/assets/images/discord/{inazuma1.jpg => loc-in-1.jpg} (100%) rename src/assets/images/discord/{inazuma2.jpg => loc-in-2.jpg} (100%) rename src/assets/images/discord/{inazuma3.jpg => loc-in-3.jpg} (100%) rename src/assets/images/discord/{inazuma4.jpg => loc-in-4.jpg} (100%) rename src/assets/images/discord/{inazuma5.jpg => loc-in-5.jpg} (100%) rename src/assets/images/discord/{liyuegame.jpg => loc-ly-1.jpg} (100%) create mode 100644 src/components/EnvironmentManager.svelte diff --git a/public/locales/de-de.yaml b/public/locales/de-de.yaml index 8abd7fc..25af422 100644 --- a/public/locales/de-de.yaml +++ b/public/locales/de-de.yaml @@ -5,6 +5,12 @@ splash: - Bruder, lass uns Genshin Impact spielen... - Paimon am ärgern... - Versuche Yae zu ziehen... + - Farming materials... + - Passing Abyss... + - Collecting achievements... + - Building phys Qiqi... + - Making sacrifices for 5*... + - Finding friends for co-op... # Launcher window launcher: @@ -56,7 +62,6 @@ settings: fr-fr: Français es-es: Español it-it: Italiano - vi-vn: Tiếng Việt uwu: Engwish # Spiel sprachpaket auswahl diff --git a/public/locales/en-us.yaml b/public/locales/en-us.yaml index c693d59..bcdc3d5 100644 --- a/public/locales/en-us.yaml +++ b/public/locales/en-us.yaml @@ -5,6 +5,12 @@ splash: - Doing some important stuff... - Bullying Paimon... - Pulling for Yae... + - Farming materials... + - Passing Abyss... + - Collecting achievements... + - Building phys Qiqi... + - Making sacrifices for 5*... + - Finding friends for co-op... # Launcher window launcher: @@ -56,7 +62,6 @@ settings: fr-fr: Français es-es: Español it-it: Italiano - vi-vn: Tiếng Việt uwu: Engwish # Game voice pack language @@ -165,4 +170,9 @@ settings: custom: Custom author: 'Author: {author}' - no_images: No images added \ No newline at end of file + no_images: No images added + + # Environmantal variables manager + environment: + title: Environment + items: diff --git a/public/locales/es-es.yaml b/public/locales/es-es.yaml index c2ed54c..1253204 100644 --- a/public/locales/es-es.yaml +++ b/public/locales/es-es.yaml @@ -5,6 +5,12 @@ splash: - Doing some important stuff... - Bullying Paimon... - Pulling for Yae... + - Farming materials... + - Passing Abyss... + - Collecting achievements... + - Building phys Qiqi... + - Making sacrifices for 5*... + - Finding friends for co-op... # Launcher window launcher: @@ -56,7 +62,6 @@ settings: fr-fr: Français es-es: Español it-it: Italiano - vi-vn: Tiếng Việt uwu: Engwish # Game voice pack language diff --git a/public/locales/fr-fr.yaml b/public/locales/fr-fr.yaml index f546065..698c8d4 100644 --- a/public/locales/fr-fr.yaml +++ b/public/locales/fr-fr.yaml @@ -5,6 +5,12 @@ splash: - En train de faire des choses importantes... - Cuisson de Paimon en cours... - Invocation en masse pour Yae... + - Farming materials... + - Passing Abyss... + - Collecting achievements... + - Building phys Qiqi... + - Making sacrifices for 5*... + - Finding friends for co-op... # Launcher window launcher: @@ -57,7 +63,6 @@ settings: fr-fr: Français es-es: Español it-it: Italiano - vi-vn: Tiếng Việt uwu: Engwish # Game voice pack language diff --git a/public/locales/it-it.yaml b/public/locales/it-it.yaml index 95a7d54..d654946 100644 --- a/public/locales/it-it.yaml +++ b/public/locales/it-it.yaml @@ -5,6 +5,12 @@ splash: - Facendo attività molto importanti... - Bullizzando Paimon... - Pullando per Yae... + - Farmando materiali... + - Superando l'Abisso... + - Collezionando trofei... + - Buildando Qiqi fisico... + - Facendo sacrifici per un 5*... + - Cercando amici per co-op... # Launcher window launcher: @@ -56,7 +62,6 @@ settings: fr-fr: Français es-es: Español it-it: Italiano - vi-vn: Tiếng Việt uwu: Engwish # Game voice pack language diff --git a/public/locales/ru-ru.yaml b/public/locales/ru-ru.yaml index 82d14eb..17aac3d 100644 --- a/public/locales/ru-ru.yaml +++ b/public/locales/ru-ru.yaml @@ -5,6 +5,12 @@ splash: - Делаем всякие важные штуки... - Издеваемся над Паймон... - Пытаемся получить Яэ... + - Собираем материалы... + - Проходим бездну... + - Коллекционируем достижения... + - Собираем физ чичу... + - Делаем жертвоприношения ради 5*... + - Ищем друзем для коопа... # Окно лаунчера launcher: @@ -56,7 +62,6 @@ settings: fr-fr: Français es-es: Español it-it: Italiano - vi-vn: Tiếng Việt uwu: Engwish # Язык озвучки в игре diff --git a/public/locales/uwu.yaml b/public/locales/uwu.yaml index 745c20c..0d3e957 100644 --- a/public/locales/uwu.yaml +++ b/public/locales/uwu.yaml @@ -5,6 +5,12 @@ splash: - d-doing some i-impowtant s-stuff.. (≧◡≦) - buwwying p-paimon.. xD - p-puwwing fow yae.. (o^▽^o) + - Farming materials... + - Passing Abyss... + - Collecting achievements... + - Building phys Qiqi... + - Making sacrifices for 5*... + - Finding friends for co-op... # Launcher window launcher: @@ -56,7 +62,6 @@ settings: fr-fr: Français es-es: Español it-it: Italiano - vi-vn: Tiếng Việt uwu: Engwish # Game voice pack language diff --git a/public/locales/vi-vn.yaml b/public/locales/vi-vn.yaml deleted file mode 100644 index c2ed54c..0000000 --- a/public/locales/vi-vn.yaml +++ /dev/null @@ -1,168 +0,0 @@ -# Splash window -splash: - title: Loading launcher - phrases: - - Doing some important stuff... - - Bullying Paimon... - - Pulling for Yae... - -# Launcher window -launcher: - states: - # When the game should be installed or updated - installation: - install_wine: Install Wine - install_dxvk: Install DXVK - install: Install - update: Update - - # When the game should be patched - patching: - # Patch unavailable - unavailable: - title: Patch unavailable - hint: This game version has no anti-cheat patch. - Please, wait a few days before there will be a test or stable version - - # Patch is in testing - test: - title: Apply test patch - hint: This game version has an experimental anti-cheat patch. - You can wait a few days until it is stable or apply it at your own risk - - # Patch is stable - stable: Apply patch - - # When the game is ready for playing - ready: - launch: Launch - predownload: Pre-download update - -# Settings window -settings: - # General - general: - title: General - items: - # Language selection - lang: - # Launcher language - launcher: - title: Launcher - items: - en-us: English (US) - ru-ru: Русский - de-de: Deutsch - fr-fr: Français - es-es: Español - it-it: Italiano - vi-vn: Tiếng Việt - uwu: Engwish - - # Game voice pack language - voice: - title: Voice pack - tooltip: You will have to manually select the new voice pack in the game - items: - en-us: English (US) - ja-jp: Japanese - ko-kr: Korean - zn-cn: Chinese - - # Launcher theme - theme: - title: Theme - items: - system: System - light: Light - dark: Dark - - # Discord RPC - discord: - title: Discord RPC - settings: - title: Discord RPC settings - items: - timer: Display spent time - in-launcher: In-launcher text - in-game: In-game text - selectIcon: Select icon - - # Some buttons - buttons: - winetricks: winetricks - winecfg: winecfg - launcher: launcher folder - game: game folder - - # Enhancements - enhancements: - title: Enhancements - items: - # HUD - hud: - title: HUD - items: - none: None - dxvk: DXVK - mangohud: MangoHUD - - # GameMode - gamemode: - title: Use GameMode - tooltip: It is a software that can improve the game performance - - # Unlock FPS - fps_unlocker: - title: Unlock FPS - tooltip: This option will unlock maximum of the 60 fps limitation - - # Delete logs - purge_logs: - # Game logs (DXVK) - game: - title: Delete DXVK logs - tooltip: With this option enabled your launcher will automatically - delete DXVK log files - - # Launcher logs - launcher: - title: Delete launcher logs - tooltip: Amount of time after which launcher will delete its old log files - items: - 1d: 1 day - 3d: 3 days - 5d: 5 days - 7d: 1 week - 14d: 2 weeks - never: Never - - # Runners - runners: - title: Wine version - items: - recommended: - title: Show recommended only - tooltip: This option will hide unplayable wine versions - - # DXVKs - dxvks: - title: DXVK - items: - recommended: - title: Show recommended only - tooltip: This option will hide old DXVK versions - - # Shaders - shaders: - title: Shaders - items: - shaders: - title: Shaders - tooltip: Use Home button to toggle shaders in the game - items: - none: None - custom: Custom - - author: 'Author: {author}' - no_images: No images added \ No newline at end of file diff --git a/src/assets/images/discord/gi-icon.jpg b/src/assets/images/discord/anime-icon.jpg similarity index 100% rename from src/assets/images/discord/gi-icon.jpg rename to src/assets/images/discord/anime-icon.jpg diff --git a/src/assets/images/discord/baal1.webp b/src/assets/images/discord/chr-in-rs-1.webp similarity index 100% rename from src/assets/images/discord/baal1.webp rename to src/assets/images/discord/chr-in-rs-1.webp diff --git a/src/assets/images/discord/yaemiko1.webp b/src/assets/images/discord/chr-in-ym-1.webp similarity index 100% rename from src/assets/images/discord/yaemiko1.webp rename to src/assets/images/discord/chr-in-ym-1.webp diff --git a/src/assets/images/discord/yaemiko2.jpg b/src/assets/images/discord/chr-in-ym-2.jpg similarity index 100% rename from src/assets/images/discord/yaemiko2.jpg rename to src/assets/images/discord/chr-in-ym-2.jpg diff --git a/src/assets/images/discord/beidougame.jpg b/src/assets/images/discord/chr-ly-bd-1.jpg similarity index 100% rename from src/assets/images/discord/beidougame.jpg rename to src/assets/images/discord/chr-ly-bd-1.jpg diff --git a/src/assets/images/discord/artgame.jpg b/src/assets/images/discord/chr-ms-ab-1.jpg similarity index 100% rename from src/assets/images/discord/artgame.jpg rename to src/assets/images/discord/chr-ms-ab-1.jpg diff --git a/src/assets/images/discord/artgame3.jpg b/src/assets/images/discord/chr-ms-ab-2.jpg similarity index 100% rename from src/assets/images/discord/artgame3.jpg rename to src/assets/images/discord/chr-ms-ab-2.jpg diff --git a/src/assets/images/discord/kleegame.jpg b/src/assets/images/discord/chr-ms-kl-1.jpg similarity index 100% rename from src/assets/images/discord/kleegame.jpg rename to src/assets/images/discord/chr-ms-kl-1.jpg diff --git a/src/assets/images/discord/kleegame2.jpg b/src/assets/images/discord/chr-ms-kl-2.jpg similarity index 100% rename from src/assets/images/discord/kleegame2.jpg rename to src/assets/images/discord/chr-ms-kl-2.jpg diff --git a/src/assets/images/discord/artgame2.jpg b/src/assets/images/discord/chr-ms-kl-3.jpg similarity index 100% rename from src/assets/images/discord/artgame2.jpg rename to src/assets/images/discord/chr-ms-kl-3.jpg diff --git a/src/assets/images/discord/inazuma1.jpg b/src/assets/images/discord/loc-in-1.jpg similarity index 100% rename from src/assets/images/discord/inazuma1.jpg rename to src/assets/images/discord/loc-in-1.jpg diff --git a/src/assets/images/discord/inazuma2.jpg b/src/assets/images/discord/loc-in-2.jpg similarity index 100% rename from src/assets/images/discord/inazuma2.jpg rename to src/assets/images/discord/loc-in-2.jpg diff --git a/src/assets/images/discord/inazuma3.jpg b/src/assets/images/discord/loc-in-3.jpg similarity index 100% rename from src/assets/images/discord/inazuma3.jpg rename to src/assets/images/discord/loc-in-3.jpg diff --git a/src/assets/images/discord/inazuma4.jpg b/src/assets/images/discord/loc-in-4.jpg similarity index 100% rename from src/assets/images/discord/inazuma4.jpg rename to src/assets/images/discord/loc-in-4.jpg diff --git a/src/assets/images/discord/inazuma5.jpg b/src/assets/images/discord/loc-in-5.jpg similarity index 100% rename from src/assets/images/discord/inazuma5.jpg rename to src/assets/images/discord/loc-in-5.jpg diff --git a/src/assets/images/discord/liyuegame.jpg b/src/assets/images/discord/loc-ly-1.jpg similarity index 100% rename from src/assets/images/discord/liyuegame.jpg rename to src/assets/images/discord/loc-ly-1.jpg diff --git a/src/components/DiscordSettings.svelte b/src/components/DiscordSettings.svelte index 804ca7f..99b4c31 100644 --- a/src/components/DiscordSettings.svelte +++ b/src/components/DiscordSettings.svelte @@ -10,43 +10,35 @@ import Checkbox from './Checkbox.svelte'; - // TODO: maybe somehow encode these icons names - // Discord RPC icons imports // We must import them manually because otherwise // neutralino won't be able to load them because of its restrictions const icons = { - 'launcher': import('../../public/icons/256x256.png'), - 'gi-icon': import('../assets/images/discord/gi-icon.jpg'), - 'game': import('../assets/images/discord/game.jpg'), + 'bGF1bmNoZXI=': import('../../public/icons/256x256.png'), + 'Z2ktaWNvbg==': import('../assets/images/discord/anime-icon.jpg'), + 'Z2FtZQ==': import('../assets/images/discord/game.jpg'), - 'artgame': import('../assets/images/discord/artgame.jpg'), - 'artgame2': import('../assets/images/discord/artgame2.jpg'), - 'artgame3': import('../assets/images/discord/artgame3.jpg'), + 'YXJ0Z2FtZQ==': import('../assets/images/discord/chr-ms-ab-1.jpg'), + 'YXJ0Z2FtZTM=': import('../assets/images/discord/chr-ms-ab-2.jpg'), - // Beidou - 'beidougame': import('../assets/images/discord/beidougame.jpg'), + 'YmVpZG91Z2FtZQ==': import('../assets/images/discord/chr-ly-bd-1.jpg'), - // Klee - 'kleegame': import('../assets/images/discord/kleegame.jpg'), - 'kleegame2': import('../assets/images/discord/kleegame2.jpg'), + 'a2xlZWdhbWU=': import('../assets/images/discord/chr-ms-kl-1.jpg'), + 'a2xlZWdhbWUy': import('../assets/images/discord/chr-ms-kl-2.jpg'), + 'YXJ0Z2FtZTI=': import('../assets/images/discord/chr-ms-kl-3.jpg'), - // Baal - 'baal1': import('../assets/images/discord/baal1.webp'), + 'YmFhbDE=': import('../assets/images/discord/chr-in-rs-1.webp'), - // Yae Miko - 'yaemiko1': import('../assets/images/discord/yaemiko1.webp'), - 'yaemiko2': import('../assets/images/discord/yaemiko2.jpg'), + 'eWFlbWlrbzE=': import('../assets/images/discord/chr-in-ym-1.webp'), + 'eWFlbWlrbzI=': import('../assets/images/discord/chr-in-ym-2.jpg'), - // Liyue - 'liyuegame': import('../assets/images/discord/liyuegame.jpg'), + 'bGl5dWVnYW1l': import('../assets/images/discord/loc-ly-1.jpg'), - // Inazuma - 'inazuma1': import('../assets/images/discord/inazuma1.jpg'), - 'inazuma2': import('../assets/images/discord/inazuma2.jpg'), - 'inazuma3': import('../assets/images/discord/inazuma3.jpg'), - 'inazuma4': import('../assets/images/discord/inazuma4.jpg'), - 'inazuma5': import('../assets/images/discord/inazuma5.jpg') + 'aW5henVtYTE=': import('../assets/images/discord/loc-in-1.jpg'), + 'aW5henVtYTI=': import('../assets/images/discord/loc-in-2.jpg'), + 'aW5henVtYTM=': import('../assets/images/discord/loc-in-3.jpg'), + 'aW5henVtYTQ=': import('../assets/images/discord/loc-in-4.jpg'), + 'aW5henVtYTU=': import('../assets/images/discord/loc-in-5.jpg') }; let iconSelector: 'in-game' | 'in-launcher' | null = null; @@ -54,11 +46,11 @@ let states = { 'in-game': { text: '', - icon: 'game' + icon: 'Z2FtZQ==' }, 'in-launcher': { text: '', - icon: 'launcher' + icon: 'bGF1bmNoZXI=' } }; @@ -66,11 +58,11 @@ states = { 'in-game': { text: settings!['in-game']['details'], - icon: settings!['in-game']['icon'] + icon: btoa(settings!['in-game']['icon']) }, 'in-launcher': { text: settings!['in-launcher']['details'], - icon: settings!['in-launcher']['icon'] + icon: btoa(settings!['in-launcher']['icon']) } }; @@ -97,7 +89,7 @@ const selectIcon = (icon: string) => { states[iconSelector!]['icon'] = icon; - iconChanged(iconSelector!, icon); + iconChanged(iconSelector!, atob(icon)); iconSelector = null; }; diff --git a/src/components/EnvironmentManager.svelte b/src/components/EnvironmentManager.svelte new file mode 100644 index 0000000..2fc4c33 --- /dev/null +++ b/src/components/EnvironmentManager.svelte @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + +
NameValue
+ + + +
+ + + +
+ + + +
\ No newline at end of file diff --git a/src/settings.svelte b/src/settings.svelte index c66b0ee..4f9e459 100644 --- a/src/settings.svelte +++ b/src/settings.svelte @@ -23,6 +23,7 @@ import DXVKSelectionList from './components/DXVKSelectionList.svelte'; import RunnerSelectionList from './components/RunnerSelectionList.svelte'; import ShadersSelection from './components/ShadersSelection.svelte'; + import EnvironmentManager from './components/EnvironmentManager.svelte'; // TODO: somehow simplify all this variables definitions @@ -89,7 +90,8 @@ 'enhancements', 'runners', 'dxvks', - 'shaders' + 'shaders', + 'environment' ]; /** @@ -378,6 +380,12 @@ + +
+

{$_('settings.environment.title')}

+ + +
{/if} diff --git a/src/splash.svelte b/src/splash.svelte index b5025bb..6f9f7e4 100644 --- a/src/splash.svelte +++ b/src/splash.svelte @@ -16,7 +16,7 @@ const splash = Math.round(Math.random() * 100) < 100 ? Splash : SplashSecret; - let phrase = Math.round(Math.random() * 2); + let phrase = Math.round(Math.random() * 8); onMount(() => { Window.current.show();