Merge branch 'Ryubing:master' into master

WWE 2K18 is not playable.
remove notice for unusual core counts (#531 )
2025-01-17 19:04:14 +01:00 · 2025-01-17 11:37:08 -06:00 · 2025-01-17 05:50:42 -06:00 · 2025-01-16 10:02:33 -06:00 · 2025-01-16 09:52:35 -06:00 · 2025-01-16 09:52:01 -06:00
5 changed files with 91 additions and 35 deletions
--- a/docs/compatibility.csv
+++ b/docs/compatibility.csv
@@ -3348,7 +3348,7 @@
 01001C400482C000,"Wunderling DX",audio;crash,ingame,2022-09-10 13:20:12
 01003B401148E000,"Wurroom",,playable,2020-10-07 22:46:21
 010081700EDF4000,"WWE 2K Battlegrounds",nvdec;online-broken;UE4,playable,2022-10-07 12:44:40
-010009800203E000,"WWE 2K18",nvdec,playable,2023-10-21 17:22:01
+010009800203E000,"WWE 2K18",nvdec;online-broken,ingame,2025-01-17 11:36:56
 0100DF100B97C000,"X-Morph: Defense",,playable,2020-06-22 11:05:31
 0100D0B00FB74000,"XCOM® 2 Collection",gpu;crash,ingame,2022-10-04 09:38:30
 0100CC9015360000,"XEL",gpu,ingame,2022-10-03 10:19:39
@@ -3421,4 +3421,4 @@
 0100936018EB4000,"牧場物語 Welcome！ワンダフルライフ",crash,ingame,2023-04-25 19:43:52
 0100F4401940A000,"超探偵事件簿 レインコード  (Master Detective Archives: Rain Code)",crash,ingame,2024-02-12 20:58:31
 010064801A01C000,"超次元ゲイム ネプテューヌ GameMaker R:Evolution",crash,nothing,2023-10-30 22:37:40
-0100F3400332C000,"ゼノブレイド2",deadlock;amd-vendor-bug,ingame,2024-03-28 14:31:41
+0100F3400332C000,"ゼノブレイド2",deadlock;amd-vendor-bug,ingame,2024-03-28 14:31:41
--- a/src/Ryujinx.HLE/HOS/Kernel/Process/KProcessCapabilities.cs
+++ b/src/Ryujinx.HLE/HOS/Kernel/Process/KProcessCapabilities.cs
@@ -176,9 +176,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
                        AllowedCpuCoresMask = GetMaskFromMinMax(lowestCpuCore, highestCpuCore);
                        AllowedThreadPriosMask = GetMaskFromMinMax(lowestThreadPrio, highestThreadPrio);

-                        if (isApplication && lowestCpuCore == 0 && highestCpuCore != 2)
-                            Ryujinx.Common.Logging.Logger.Error?.Print(Ryujinx.Common.Logging.LogClass.Application, $"Application requested cores with index range {lowestCpuCore} to {highestCpuCore}! Report this to @LotP on the Ryujinx/Ryubing discord server (discord.gg/ryujinx)!");
-                        else if (isApplication)
+                        if (isApplication)
                            Ryujinx.Common.Logging.Logger.Info?.Print(Ryujinx.Common.Logging.LogClass.Application, $"Application requested cores with index range {lowestCpuCore} to {highestCpuCore}");

                        break;
--- a/src/Ryujinx/Assets/locales.json
+++ b/src/Ryujinx/Assets/locales.json
@@ -3946,6 +3946,54 @@
        "zh_CN": "繁体中文（推荐）",
        "zh_TW": "正體中文 (建議)"
      }
+    },    {
+      "ID": "SettingsTabSystemSystemLanguageSwedish",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Swedish",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "Svenska",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },    {
+      "ID": "SettingsTabSystemSystemLanguageNorwegian",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Norwegian",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "Norsk",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "Norska",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
    },
    {
      "ID": "SettingsTabSystemSystemTimeZone",
@@ -10435,7 +10483,7 @@
        "it_IT": "Finestra di input",
        "ja_JP": "入力ダイアログ",
        "ko_KR": "대화 상자 입력",
-        "no_NO": "",
+        "no_NO": "Dialogboksen Inndata",
        "pl_PL": "Okno Dialogowe Wprowadzania",
        "pt_BR": "Diálogo de texto",
        "ru_RU": "Диалоговое окно ввода",
@@ -22614,7 +22662,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "",
-        "sv_SE": "",
+        "sv_SE": "Senast uppdaterad: {0}",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -22635,11 +22683,11 @@
        "it_IT": "",
        "ja_JP": "",
        "ko_KR": "이 호환성 목록에는 오래된 항목이 포함되어 있을 수 있습니다.\n\"게임 내\" 상태에서 게임을 테스트하는 것을 반대하지 마십시오.",
-        "no_NO": "",
+        "no_NO": "Denne kompatibilitetslisten kan inneholde oppføringer som er tomme for data.\nVær ikke imot å teste spill i statusen «Ingame».",
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "",
-        "sv_SE": "",
+        "sv_SE": "Denna kompatibilitetslista kan innehålla utdaterade poster.\nTesta gärna spelen som listas med \"Spelproblem\"-status.",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -22660,11 +22708,11 @@
        "it_IT": "",
        "ja_JP": "",
        "ko_KR": "호환성 항목 검색...",
-        "no_NO": "",
+        "no_NO": "Søk i kompatibilitetsoppføringer...",
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "",
-        "sv_SE": "",
+        "sv_SE": "Sök i kompatibilitetsposter...",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -22685,11 +22733,11 @@
        "it_IT": "",
        "ja_JP": "",
        "ko_KR": "호환성 목록 열기",
-        "no_NO": "",
+        "no_NO": "Åpne kompatibilitetslisten",
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "",
-        "sv_SE": "",
+        "sv_SE": "Öppna kompatibilitetslistan",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -22710,11 +22758,11 @@
        "it_IT": "",
        "ja_JP": "",
        "ko_KR": "보유 게임만 표시",
-        "no_NO": "",
+        "no_NO": "Vis bare eide spill",
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "",
-        "sv_SE": "",
+        "sv_SE": "Visa endast ägda spel",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -22735,11 +22783,11 @@
        "it_IT": "",
        "ja_JP": "",
        "ko_KR": "플레이 가능",
-        "no_NO": "",
+        "no_NO": "Spillbar",
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "",
-        "sv_SE": "",
+        "sv_SE": "Spelbart",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -22764,7 +22812,7 @@
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "",
-        "sv_SE": "",
+        "sv_SE": "Spelproblem",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -22785,11 +22833,11 @@
        "it_IT": "",
        "ja_JP": "",
        "ko_KR": "메뉴",
-        "no_NO": "",
+        "no_NO": "Menyer",
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "",
-        "sv_SE": "",
+        "sv_SE": "Menyer",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -22810,11 +22858,11 @@
        "it_IT": "",
        "ja_JP": "",
        "ko_KR": "부츠",
-        "no_NO": "",
+        "no_NO": "Starter",
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "",
-        "sv_SE": "",
+        "sv_SE": "Startar",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
@@ -22835,11 +22883,11 @@
        "it_IT": "",
        "ja_JP": "",
        "ko_KR": "없음",
-        "no_NO": "",
+        "no_NO": "Ingenting",
        "pl_PL": "",
        "pt_BR": "",
        "ru_RU": "",
-        "sv_SE": "",
+        "sv_SE": "Ingenting",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
--- a/src/Ryujinx/DiscordIntegrationModule.cs
+++ b/src/Ryujinx/DiscordIntegrationModule.cs
@@ -1,4 +1,5 @@
 using DiscordRPC;
+using Gommon;
 using Humanizer;
 using Humanizer.Localisation;
 using Ryujinx.Ava.Utilities.AppLibrary;
@@ -45,16 +46,7 @@ namespace Ryujinx.Ava
            };

            ConfigurationState.Instance.EnableDiscordIntegration.Event += Update;
-            TitleIDs.CurrentApplication.Event += (_, e) =>
-            {
-                if (e.NewValue)
-                    SwitchToPlayingState(
-                        ApplicationLibrary.LoadAndSaveMetaData(e.NewValue),
-                        Switch.Shared.Processes.ActiveApplication
-                    );
-                else 
-                    SwitchToMainState();
-            };
+            TitleIDs.CurrentApplication.Event += (_, e) => Use(e.NewValue);
        }

        private static void Update(object sender, ReactiveEventArgs<bool> evnt)
@@ -75,11 +67,23 @@ namespace Ryujinx.Ava
                    _discordClient = new DiscordRpcClient(ApplicationId);

                    _discordClient.Initialize();
-                    _discordClient.SetPresence(_discordPresenceMain);
+
+                    Use(TitleIDs.CurrentApplication);
                }
            }
        }

+        public static void Use(Optional<string> titleId)
+        {
+            if (titleId.TryGet(out string tid))
+                SwitchToPlayingState(
+                    ApplicationLibrary.LoadAndSaveMetaData(tid), 
+                    Switch.Shared.Processes.ActiveApplication
+                );
+            else 
+                SwitchToMainState();
+        }
+
        private static void SwitchToPlayingState(ApplicationMetadata appMeta, ProcessResult procRes)
        {
            _discordClient?.SetPresence(new RichPresence
--- a/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml
@@ -136,6 +136,12 @@
                            <ComboBoxItem>
                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageBrazilianPortuguese}" />
                            </ComboBoxItem>
+                            <ComboBoxItem>
+                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageSwedish}" />
+                            </ComboBoxItem>
+                            <ComboBoxItem>
+                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageNorwegian}" />
+                            </ComboBoxItem>
                        </ComboBox>
                    </StackPanel>
                    <StackPanel
Author	SHA1	Message	Date
Daniel Nylander	2c34117957	Merge branch 'Ryubing:master' into master	2025-01-17 19:04:14 +01:00
Evan Husted	1728b0f20c	WWE 2K18 is not playable.	2025-01-17 11:37:08 -06:00
LotP1	5aa071c59b	remove notice for unusual core counts (#531 )	2025-01-17 05:50:42 -06:00
Daenorth	1018c9db8b	Update Norwegian Translation (#503 ) Norwegian translation updated with the Compatibility list addition	2025-01-16 10:02:33 -06:00
Evan Husted	01ccd18726	UI: Meant to use that method in another place [ci-skip]	2025-01-16 09:52:35 -06:00
Evan Husted	abfbc6f4bc	UI: Prevent desynced RPC when toggling it off/on while in-game	2025-01-16 09:52:01 -06:00
Daniel Nylander	ebeac1f4aa	Merge branch 'Ryubing:master' into master	2025-01-13 15:30:57 +01:00
Daniel Nylander	92b6756d24	Update locales.json with Swedish and Norwegian Adding SettingsTabSystemSystemLanguageSwedish SettingsTabSystemSystemLanguageNorwegian	2025-01-11 13:32:56 +01:00
Daniel Nylander	a93adad50b	Update SettingsSystemView.axaml adding Swedish and Norwegian This list should be in alphabetical order?	2025-01-11 13:29:12 +01:00
Daniel Nylander	8ff24506fb	Merge branch 'Ryubing:master' into master	2025-01-11 13:25:07 +01:00
Daniel Nylander	f05b3cdd53	Updated sv_SE in locales.json	2025-01-11 12:22:20 +01:00