Compare commits
37 Commits
Canary-1.2
...
021b39c49f
| Author | SHA1 | Date | |
|---|---|---|---|
|
021b39c49f | ||
|
|
b9982c02e3 | ||
|
1c0813d09d | ||
|
|
a301a14074 | ||
|
|
8bec09d7ff | ||
|
|
e4b4e94b56 | ||
|
|
764c9e9d4e | ||
|
|
05e991db87 | ||
|
|
7568dd4d7a | ||
|
|
4bbcec2076 | ||
|
|
57ac90a55b | ||
|
2cd876b1cb | ||
|
|
cdc4557d82 | ||
|
|
93a298523f | ||
|
253cbb2810 | ||
|
|
ae16360685 | ||
|
|
45b1794a45 | ||
|
|
39fbbb39e0 | ||
|
|
11a68a204f | ||
|
|
e4e38c4bdd | ||
|
|
5f5c76107c | ||
|
|
9c226dcc7a | ||
|
|
30a534edcd | ||
|
|
a92475b8fd | ||
|
|
4d5ae23b0b | ||
|
|
4cb2170ad1 | ||
|
|
fc01f7b58f | ||
|
|
fa463c51f8 | ||
|
|
3a8e6e3117 | ||
|
|
7f4a161ca5 | ||
|
|
df1c7613e8 | ||
|
|
6d37d79cc7 | ||
|
|
afdfcc1720 | ||
|
|
fe94224d01 | ||
|
|
fbe1a7d966 | ||
|
|
5dc7fb4495 | ||
|
|
2640f083b6 |
@@ -164,15 +164,16 @@ namespace Ryujinx.Common
|
||||
"0100ba0018500000", // Splatoon 3: Splatfest World Premiere
|
||||
|
||||
//NSO Membership games
|
||||
"0100ccf019c8c000", // F-ZERO 99
|
||||
"0100c62011050000", // GB - Nintendo Switch Online
|
||||
"010012f017576000", // GBA - Nintendo Switch Online
|
||||
"0100c9a00ece6000", // N64 - Nintendo Switch Online
|
||||
"0100e0601c632000", // N64 - Nintendo Switch Online 18+
|
||||
"0100d870045b6000", // NES - Nintendo Switch Online
|
||||
"0100b3c014bda000", // SEGA Genesis - Nintendo Switch Online
|
||||
"01008d300c50c000", // SNES - Nintendo Switch Online
|
||||
"0100ccf019c8c000", // F-ZERO 99
|
||||
"0100ad9012510000", // PAC-MAN 99
|
||||
"010040600c5ce000", // Tetris 99
|
||||
"01008d300c50c000", // SNES - Nintendo Switch Online
|
||||
"0100277011f1a000", // Super Mario Bros. 35
|
||||
|
||||
//Misc Nintendo 1st party games
|
||||
|
||||
@@ -582,6 +582,13 @@ namespace Ryujinx.Ava
|
||||
Rainbow.Disable();
|
||||
Rainbow.Reset();
|
||||
|
||||
// Reload settings when the game is turned off
|
||||
// (resets custom settings if there were any)
|
||||
Program.ReloadConfig();
|
||||
|
||||
//Updates the gameList (changes the status of the user setting if it was added or removed during the game)
|
||||
RyujinxApp.MainWindow.GameListUpdate();
|
||||
|
||||
_isStopped = true;
|
||||
Stop();
|
||||
}
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
<Styles
|
||||
<Styles
|
||||
xmlns="https://github.com/avaloniaui"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
|
||||
xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
|
||||
xmlns:windowing="clr-namespace:FluentAvalonia.UI.Windowing;assembly=FluentAvalonia">
|
||||
<Design.PreviewWith>
|
||||
<Border Height="2000"
|
||||
@@ -30,7 +31,8 @@
|
||||
<Button
|
||||
Name="btnRem"
|
||||
HorizontalAlignment="Right"
|
||||
Content="Add" />
|
||||
Content="Add"
|
||||
Classes="red"/>
|
||||
<TextBox
|
||||
Width="100"
|
||||
VerticalAlignment="Center"
|
||||
@@ -41,7 +43,11 @@
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
<ui:NumberBox Value="1" />
|
||||
<MenuItem
|
||||
Header="123 0000"
|
||||
ToolTip.Tip="What this"/>
|
||||
</StackPanel>
|
||||
|
||||
</Border>
|
||||
</Design.PreviewWith>
|
||||
<Style Selector="DropDownButton">
|
||||
@@ -373,6 +379,16 @@
|
||||
<Setter Property="Background"
|
||||
Value="{DynamicResource AppListHoverBackgroundColor}" />
|
||||
</Style>
|
||||
<Style Selector="Button.red /template/ ContentPresenter">
|
||||
<Setter Property="CornerRadius" Value="4"/>
|
||||
<Setter Property="Background" Value="red"/>
|
||||
<Setter Property="Foreground" Value="White"/>
|
||||
</Style>
|
||||
<Style Selector="Button.red:pointerover /template/ ContentPresenter">
|
||||
<Setter Property="CornerRadius" Value="4"/>
|
||||
<Setter Property="Background" Value="{DynamicResource WarningBackgroundColor}" />
|
||||
<Setter Property="Foreground" Value="White"/>
|
||||
</Style>
|
||||
<Styles.Resources>
|
||||
<SolidColorBrush x:Key="ThemeAccentColorBrush"
|
||||
Color="{DynamicResource SystemAccentColor}" />
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<ResourceDictionary xmlns="https://github.com/avaloniaui"
|
||||
<ResourceDictionary xmlns="https://github.com/avaloniaui"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
||||
<ResourceDictionary.ThemeDictionaries>
|
||||
<ResourceDictionary x:Key="Default">
|
||||
@@ -12,11 +12,13 @@
|
||||
<Color x:Key="MenuFlyoutPresenterBorderColor">#C1C1C1</Color>
|
||||
<Color x:Key="AppListBackgroundColor">#b3ffffff</Color>
|
||||
<Color x:Key="AppListHoverBackgroundColor">#80cccccc</Color>
|
||||
<Color x:Key="WarningBackgroundColor">#FF6347</Color>
|
||||
<Color x:Key="SecondaryTextColor">#A0000000</Color>
|
||||
<Color x:Key="FavoriteApplicationIconColor">#fffcd12a</Color>
|
||||
<Color x:Key="Switch">#FF2EEAC9</Color>
|
||||
<Color x:Key="Unbounded">#FFFF4554</Color>
|
||||
<Color x:Key="Custom">#6483F5</Color>
|
||||
<Color x:Key="Warning">#800080</Color>
|
||||
</ResourceDictionary>
|
||||
<ResourceDictionary x:Key="Light">
|
||||
<SolidColorBrush x:Key="DataGridSelectionBackgroundBrush"
|
||||
@@ -29,11 +31,13 @@
|
||||
<Color x:Key="MenuFlyoutPresenterBorderColor">#C1C1C1</Color>
|
||||
<Color x:Key="AppListBackgroundColor">#b3ffffff</Color>
|
||||
<Color x:Key="AppListHoverBackgroundColor">#80cccccc</Color>
|
||||
<Color x:Key="WarningBackgroundColor">#FF6347</Color>
|
||||
<Color x:Key="SecondaryTextColor">#A0000000</Color>
|
||||
<Color x:Key="FavoriteApplicationIconColor">#fffcd12a</Color>
|
||||
<Color x:Key="Switch">#13c3a4</Color>
|
||||
<Color x:Key="Unbounded">#FFFF4554</Color>
|
||||
<Color x:Key="Custom">#6483F5</Color>
|
||||
<Color x:Key="Warning">#800080</Color>
|
||||
</ResourceDictionary>
|
||||
<ResourceDictionary x:Key="Dark">
|
||||
<SolidColorBrush x:Key="DataGridSelectionBackgroundBrush"
|
||||
@@ -46,11 +50,13 @@
|
||||
<Color x:Key="MenuFlyoutPresenterBorderColor">#3D3D3D</Color>
|
||||
<Color x:Key="AppListBackgroundColor">#0FFFFFFF</Color>
|
||||
<Color x:Key="AppListHoverBackgroundColor">#1EFFFFFF</Color>
|
||||
<Color x:Key="WarningBackgroundColor">#FF6347</Color>
|
||||
<Color x:Key="SecondaryTextColor">#A0FFFFFF</Color>
|
||||
<Color x:Key="FavoriteApplicationIconColor">#fffcd12a</Color>
|
||||
<Color x:Key="Switch">#FF2EEAC9</Color>
|
||||
<Color x:Key="Unbounded">#FFFF4554</Color>
|
||||
<Color x:Key="Custom">#6483F5</Color>
|
||||
<Color x:Key="Warning">#FFA500</Color>
|
||||
</ResourceDictionary>
|
||||
</ResourceDictionary.ThemeDictionaries>
|
||||
</ResourceDictionary>
|
||||
|
||||
@@ -1543,7 +1543,7 @@
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
"zh_CN": "",
|
||||
"zh_CN": "由 {0} 开发",
|
||||
"zh_TW": ""
|
||||
}
|
||||
},
|
||||
@@ -1843,7 +1843,7 @@
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
"zh_CN": "",
|
||||
"zh_CN": "兼容性:",
|
||||
"zh_TW": ""
|
||||
}
|
||||
},
|
||||
@@ -1868,7 +1868,7 @@
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
"zh_CN": "",
|
||||
"zh_CN": "标题 ID:",
|
||||
"zh_TW": ""
|
||||
}
|
||||
},
|
||||
@@ -1893,7 +1893,7 @@
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
"zh_CN": "",
|
||||
"zh_CN": "服务的游戏: {0}",
|
||||
"zh_TW": ""
|
||||
}
|
||||
},
|
||||
@@ -1918,7 +1918,7 @@
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
"zh_CN": "",
|
||||
"zh_CN": "在线玩家: {0}",
|
||||
"zh_TW": ""
|
||||
}
|
||||
},
|
||||
@@ -2268,7 +2268,7 @@
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
"zh_CN": "",
|
||||
"zh_CN": "清理 PPTC 缓存",
|
||||
"zh_TW": ""
|
||||
}
|
||||
},
|
||||
@@ -2293,7 +2293,7 @@
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
"zh_CN": "",
|
||||
"zh_CN": "删除应用程序的所有 PPTC 缓存",
|
||||
"zh_TW": ""
|
||||
}
|
||||
},
|
||||
@@ -2722,6 +2722,31 @@
|
||||
"zh_TW": "建立桌面捷徑，啟動選取的應用程式"
|
||||
}
|
||||
},
|
||||
{
|
||||
"ID": "GameListContextMenuEditGameConfiguration",
|
||||
"Translations": {
|
||||
"ar_SA": "تعديل تكوين اللعبة",
|
||||
"de_DE": "Spielkonfiguration bearbeiten",
|
||||
"el_GR": "Επεξεργασία ρυθμίσεων παιχνιδιού",
|
||||
"en_US": "Edit Game Configuration",
|
||||
"es_ES": "Editar configuración del juego",
|
||||
"fr_FR": "Modifier la configuration du jeu",
|
||||
"he_IL": "ערוך את הגדרת המשחק",
|
||||
"it_IT": "Modifica configurazione gioco",
|
||||
"ja_JP": "ゲーム設定を編集",
|
||||
"ko_KR": "게임 설정 편집",
|
||||
"no_NO": "Rediger spillkonfig.",
|
||||
"pl_PL": "Edytuj konfigurację gry",
|
||||
"pt_BR": "Editar configuração do jogo",
|
||||
"ru_RU": "Редактировать конфигурацию игры",
|
||||
"sv_SE": "Redigera spelkonfiguration",
|
||||
"th_TH": "แก้ไขการตั้งค่าเกม",
|
||||
"tr_TR": "Oyunun yapılandırmasını düzenle",
|
||||
"uk_UA": "Редагувати конфігурацію гри",
|
||||
"zh_CN": "编辑游戏配置",
|
||||
"zh_TW": "編輯遊戲設定"
|
||||
}
|
||||
},
|
||||
{
|
||||
"ID": "GameListContextMenuCreateShortcutToolTipMacOS",
|
||||
"Translations": {
|
||||
@@ -2747,6 +2772,31 @@
|
||||
"zh_TW": "在 macOS 的應用程式資料夾中建立捷徑，啟動選取的應用程式"
|
||||
}
|
||||
},
|
||||
{
|
||||
"ID": "EditGameConfigurationToolTip",
|
||||
"Translations": {
|
||||
"ar_SA": "ينشئ تكوينًا مستقلًا للعبة الحالية",
|
||||
"de_DE": "Erstellt eine unabhängige Konfiguration für das aktuelle Spiel",
|
||||
"el_GR": "Δημιουργεί μια ανεξάρτητη διαμόρφωση για το τρέχον παιχνίδι",
|
||||
"en_US": "Creates an independent configuration for the current game",
|
||||
"es_ES": "Crea una configuración independiente para el juego actual",
|
||||
"fr_FR": "Crée une configuration indépendante pour le jeu en cours",
|
||||
"he_IL": "יוצר תצורה עצמאית למשחק הנוכחי",
|
||||
"it_IT": "Crea una configurazione indipendente per il gioco attuale",
|
||||
"ja_JP": "現在のゲーム用の独立した設定を作成します",
|
||||
"ko_KR": "현재 게임에 대한 독립적인 설정을 생성합니다",
|
||||
"no_NO": "Oppretter en uavhengig konfigurasjon for det gjeldende spillet",
|
||||
"pl_PL": "Tworzy niezależną konfigurację dla bieżącej gry",
|
||||
"pt_BR": "Cria uma configuração independente para o jogo atual",
|
||||
"ru_RU": "Создает независимую конфигурацию для текущей игры",
|
||||
"sv_SE": "Skapar en oberoende konfiguration för det aktuella spelet",
|
||||
"th_TH": "สร้างการกำหนดค่าที่เป็นอิสระสำหรับเกมปัจจุบัน",
|
||||
"tr_TR": "Mevcut oyun için bağımsız bir yapılandırma oluşturur",
|
||||
"uk_UA": "Створює незалежну конфігурацію для поточної гри",
|
||||
"zh_CN": "为当前游戏创建独立的配置",
|
||||
"zh_TW": "為當前遊戲創建獨立的配置"
|
||||
}
|
||||
},
|
||||
{
|
||||
"ID": "GameListContextMenuShowCompatEntry",
|
||||
"Translations": {
|
||||
@@ -2768,7 +2818,7 @@
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
"zh_CN": "",
|
||||
"zh_CN": "显示兼容性项目",
|
||||
"zh_TW": ""
|
||||
}
|
||||
},
|
||||
@@ -2793,7 +2843,7 @@
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
"zh_CN": "",
|
||||
"zh_CN": "在兼容性列表中显示选定的游戏,您通常可以通过帮助菜单访问。",
|
||||
"zh_TW": ""
|
||||
}
|
||||
},
|
||||
@@ -2818,7 +2868,7 @@
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
"zh_CN": "",
|
||||
"zh_CN": "显示游戏信息",
|
||||
"zh_TW": ""
|
||||
}
|
||||
},
|
||||
@@ -2843,7 +2893,7 @@
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
"zh_CN": "",
|
||||
"zh_CN": "显示当前选定游戏的状态与详细信息。",
|
||||
"zh_TW": ""
|
||||
}
|
||||
},
|
||||
@@ -3272,6 +3322,31 @@
|
||||
"zh_TW": "設定"
|
||||
}
|
||||
},
|
||||
{
|
||||
"ID": "SettingsWithInfo",
|
||||
"Translations": {
|
||||
"ar_SA": "{0} - إعدادات",
|
||||
"de_DE": "Einstellungen - {0}",
|
||||
"el_GR": "Ρυθμίσεις - {0}",
|
||||
"en_US": "Settings - {0}",
|
||||
"es_ES": "Configuración - {0}",
|
||||
"fr_FR": "Paramètres - {0}",
|
||||
"he_IL": "{0} - הגדרות",
|
||||
"it_IT": "Impostazioni - {0}",
|
||||
"ja_JP": "設定 - {0}",
|
||||
"ko_KR": "설정 - {0}",
|
||||
"no_NO": "Innstillinger - {0}",
|
||||
"pl_PL": "Ustawienia - {0}",
|
||||
"pt_BR": "Configurações - {0}",
|
||||
"ru_RU": "Параметры - {0}",
|
||||
"sv_SE": "Inställningar - {0}",
|
||||
"th_TH": "ตั้งค่า - {0}",
|
||||
"tr_TR": "Ayarlar - {0}",
|
||||
"uk_UA": "Налаштування - {0}",
|
||||
"zh_CN": "设置 - {0}",
|
||||
"zh_TW": "設定 - {0}"
|
||||
}
|
||||
},
|
||||
{
|
||||
"ID": "SettingsTabGeneral",
|
||||
"Translations": {
|
||||
@@ -4493,7 +4568,7 @@
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
"zh_CN": "",
|
||||
"zh_CN": "与系统时间同步",
|
||||
"zh_TW": ""
|
||||
}
|
||||
},
|
||||
@@ -6143,7 +6218,7 @@
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
"zh_CN": "",
|
||||
"zh_CN": "重置设置",
|
||||
"zh_TW": ""
|
||||
}
|
||||
},
|
||||
@@ -6168,7 +6243,7 @@
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
"zh_CN": "",
|
||||
"zh_CN": "我要重置我的设置。",
|
||||
"zh_TW": ""
|
||||
}
|
||||
},
|
||||
@@ -8143,7 +8218,7 @@
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
"zh_CN": "",
|
||||
"zh_CN": "彩虹滚动速度",
|
||||
"zh_TW": ""
|
||||
}
|
||||
},
|
||||
@@ -13418,7 +13493,7 @@
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
"zh_CN": "",
|
||||
"zh_CN": "您正要清理 PPTC 数据:\n\n{0}\n\n您确实要继续吗?",
|
||||
"zh_TW": ""
|
||||
}
|
||||
},
|
||||
@@ -23568,7 +23643,7 @@
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
"zh_CN": "",
|
||||
"zh_CN": "启动和游戏时不会出现任何崩溃或任何类型的 GPU bug 且速度足够快可以在一般 PC 上尽情游玩。",
|
||||
"zh_TW": ""
|
||||
}
|
||||
},
|
||||
@@ -23593,7 +23668,7 @@
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
"zh_CN": "",
|
||||
"zh_CN": "可以成功启动并进入游戏但可能会遇到以下一种或多种问题: 崩溃、卡死、GPU bug、令人无法接受的音频,或者只是太慢。仍然可以继续进行游戏,但是可能无法达到预期。",
|
||||
"zh_TW": ""
|
||||
}
|
||||
},
|
||||
@@ -23618,7 +23693,7 @@
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
"zh_CN": "",
|
||||
"zh_CN": "可以启动并通过标题画面但是无法进入到主要的游戏流程。",
|
||||
"zh_TW": ""
|
||||
}
|
||||
},
|
||||
@@ -23643,7 +23718,7 @@
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
"zh_CN": "",
|
||||
"zh_CN": "可以启动但是无法通过标题画面。",
|
||||
"zh_TW": ""
|
||||
}
|
||||
},
|
||||
@@ -23668,6 +23743,31 @@
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
"zh_CN": "无法启动或显示无任何动静。",
|
||||
"zh_TW": ""
|
||||
}
|
||||
},
|
||||
{
|
||||
"ID": "UserConfigurationHeader",
|
||||
"Translations": {
|
||||
"ar_SA": "",
|
||||
"de_DE": "",
|
||||
"el_GR": "",
|
||||
"en_US": "User Config",
|
||||
"es_ES": "",
|
||||
"fr_FR": "",
|
||||
"he_IL": "",
|
||||
"it_IT": "",
|
||||
"ja_JP": "",
|
||||
"ko_KR": "",
|
||||
"no_NO": "",
|
||||
"pl_PL": "",
|
||||
"pt_BR": "",
|
||||
"ru_RU": "",
|
||||
"sv_SE": "",
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
"zh_CN": "",
|
||||
"zh_TW": ""
|
||||
}
|
||||
@@ -23718,7 +23818,7 @@
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
"zh_CN": "",
|
||||
"zh_CN": "Rich Presence 图像",
|
||||
"zh_TW": ""
|
||||
}
|
||||
},
|
||||
@@ -23743,7 +23843,7 @@
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
"zh_CN": "",
|
||||
"zh_CN": "动态 Rich Presence",
|
||||
"zh_TW": ""
|
||||
}
|
||||
}
|
||||
|
||||
@@ -32,6 +32,7 @@ namespace Ryujinx.Ava
|
||||
public static double DesktopScaleFactor { get; set; } = 1.0;
|
||||
public static string Version { get; private set; }
|
||||
public static string ConfigurationPath { get; private set; }
|
||||
public static string GlobalConfigurationPath { get; private set; }
|
||||
public static bool PreviewerDetached { get; private set; }
|
||||
public static bool UseHardwareAcceleration { get; private set; }
|
||||
|
||||
@@ -155,11 +156,43 @@ namespace Ryujinx.Ava
|
||||
}
|
||||
}
|
||||
|
||||
public static bool FindGameConfig(string gameDir)
|
||||
{
|
||||
if (File.Exists(gameDir))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
public static string GetDirGameUserConfig(string gameId, bool rememberGlobalDir = false, bool changeFolderForGame = false)
|
||||
{
|
||||
string gameDir = Path.Combine(AppDataManager.GamesDirPath, gameId, ReleaseInformation.ConfigName);
|
||||
|
||||
// Should load with the game if there is a custom setting for the game
|
||||
if (rememberGlobalDir)
|
||||
{
|
||||
GlobalConfigurationPath = ConfigurationPath;
|
||||
}
|
||||
|
||||
if (changeFolderForGame)
|
||||
{
|
||||
ConfigurationPath = gameDir;
|
||||
}
|
||||
|
||||
return gameDir;
|
||||
}
|
||||
|
||||
public static void ReloadConfig()
|
||||
{
|
||||
//It is necessary that when a user setting appears, the global setting remains available
|
||||
GlobalConfigurationPath = null;
|
||||
|
||||
string localConfigurationPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, ReleaseInformation.ConfigName);
|
||||
string appDataConfigurationPath = Path.Combine(AppDataManager.BaseDirPath, ReleaseInformation.ConfigName);
|
||||
|
||||
|
||||
// Now load the configuration as the other subsystems are now registered
|
||||
if (File.Exists(localConfigurationPath))
|
||||
{
|
||||
@@ -232,8 +265,35 @@ namespace Ryujinx.Ava
|
||||
_ => ConfigurationState.Instance.HideCursor,
|
||||
};
|
||||
|
||||
// Check if memoryManagerMode was overridden.
|
||||
if (CommandLineState.OverrideMemoryManagerMode is not null)
|
||||
if (Enum.TryParse(CommandLineState.OverrideMemoryManagerMode, true, out MemoryManagerMode result))
|
||||
{
|
||||
ConfigurationState.Instance.System.MemoryManagerMode.Value = result;
|
||||
}
|
||||
|
||||
// Check if hardware-acceleration was overridden.
|
||||
// Check if PPTC was overridden.
|
||||
if (CommandLineState.OverridePPTC is not null)
|
||||
if (Enum.TryParse(CommandLineState.OverridePPTC, true, out bool result))
|
||||
{
|
||||
ConfigurationState.Instance.System.EnablePtc.Value = result;
|
||||
}
|
||||
|
||||
// Check if region was overridden.
|
||||
if (CommandLineState.OverrideSystemRegion is not null)
|
||||
if (Enum.TryParse(CommandLineState.OverrideSystemRegion, true, out Ryujinx.HLE.HOS.SystemState.RegionCode result))
|
||||
{
|
||||
ConfigurationState.Instance.System.Region.Value = (Utilities.Configuration.System.Region)result;
|
||||
}
|
||||
|
||||
//Check if language was overridden.
|
||||
if (CommandLineState.OverrideSystemLanguage is not null)
|
||||
if (Enum.TryParse(CommandLineState.OverrideSystemLanguage, true, out Ryujinx.HLE.HOS.SystemState.SystemLanguage result))
|
||||
{
|
||||
ConfigurationState.Instance.System.Language.Value = (Utilities.Configuration.System.Language)result;
|
||||
}
|
||||
|
||||
// Check if hardware-acceleration was overridden. MemoryManagerMode ( outdated! )
|
||||
if (CommandLineState.OverrideHardwareAcceleration != null)
|
||||
UseHardwareAcceleration = CommandLineState.OverrideHardwareAcceleration.Value;
|
||||
}
|
||||
|
||||
@@ -19,6 +19,11 @@
|
||||
Header="{ext:Locale GameListContextMenuCreateShortcut}"
|
||||
Icon="{ext:Icon fa-solid fa-bookmark}"
|
||||
ToolTip.Tip="{OnPlatform Default={ext:Locale GameListContextMenuCreateShortcutToolTip}, macOS={ext:Locale GameListContextMenuCreateShortcutToolTipMacOS}}" />
|
||||
<MenuItem
|
||||
Click="EditGameConfiguration_Click"
|
||||
Header="{ext:Locale GameListContextMenuEditGameConfiguration}"
|
||||
Icon="{ext:Icon fa-solid fa-gear}"
|
||||
ToolTip.Tip="{ext:Locale EditGameConfigurationToolTip}" />
|
||||
<MenuItem
|
||||
IsVisible="{Binding HasCompatibilityEntry}"
|
||||
Click="OpenApplicationCompatibility_Click"
|
||||
|
||||
@@ -386,13 +386,26 @@ namespace Ryujinx.Ava.UI.Controls
|
||||
viewModel.SelectedApplication.Icon
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
public async void EditGameConfiguration_Click(object sender, RoutedEventArgs args)
|
||||
{
|
||||
if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
|
||||
{
|
||||
await new UserConfigWindows(viewModel).ShowDialog((Window)viewModel.TopLevel);
|
||||
|
||||
//just checking for file presence
|
||||
viewModel.SelectedApplication.UserConfig = File.Exists(Program.GetDirGameUserConfig(viewModel.SelectedApplication.IdString,false,false));
|
||||
|
||||
viewModel.RefreshView();
|
||||
}
|
||||
}
|
||||
|
||||
public async void OpenApplicationCompatibility_Click(object sender, RoutedEventArgs args)
|
||||
{
|
||||
if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
|
||||
await CompatibilityList.Show(viewModel.SelectedApplication.IdString);
|
||||
}
|
||||
|
||||
|
||||
public async void OpenApplicationData_Click(object sender, RoutedEventArgs args)
|
||||
{
|
||||
if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
|
||||
xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
|
||||
d:DesignHeight="450"
|
||||
d:DesignWidth="800"
|
||||
Focusable="True"
|
||||
@@ -73,12 +74,18 @@
|
||||
HorizontalAlignment="Stretch"
|
||||
VerticalAlignment="Stretch"
|
||||
IsVisible="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).ShowNames}">
|
||||
<TextBlock
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
Text="{Binding Name}"
|
||||
TextAlignment="Center"
|
||||
TextWrapping="Wrap" />
|
||||
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
|
||||
<TextBlock
|
||||
Text="{Binding Name}"
|
||||
TextAlignment="Center"
|
||||
TextWrapping="Wrap" />
|
||||
<TextBlock
|
||||
IsVisible="{Binding UserConfig}"
|
||||
Text="{ext:Locale UserConfigurationHeader}"
|
||||
TextAlignment="Center"
|
||||
TextWrapping="Wrap"
|
||||
Foreground="{DynamicResource Warning}" />
|
||||
</StackPanel>
|
||||
</Panel>
|
||||
</Grid>
|
||||
</Border>
|
||||
@@ -86,10 +93,28 @@
|
||||
Margin="5,5,0,0"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Top"
|
||||
FontSize="16"
|
||||
FontSize="18"
|
||||
Foreground="{DynamicResource FavoriteApplicationIconColor}"
|
||||
IsVisible="{Binding Favorite}"
|
||||
Symbol="StarFilled" />
|
||||
<Grid IsVisible="{Binding !$parent[UserControl].((viewModels:MainWindowViewModel)DataContext).ShowNames}">
|
||||
<Border
|
||||
Margin="15,35,5,15"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Bottom"
|
||||
Width="90"
|
||||
Height="20"
|
||||
CornerRadius="4"
|
||||
IsVisible="{Binding UserConfig}"
|
||||
Background="{DynamicResource ThemeContentBackgroundColor}">
|
||||
<TextBlock
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
Text="{ext:Locale UserConfigurationHeader}"
|
||||
TextAlignment="Center"
|
||||
TextWrapping="Wrap" />
|
||||
</Border>
|
||||
</Grid>
|
||||
</Grid>
|
||||
</DataTemplate>
|
||||
</ListBox.ItemTemplate>
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
|
||||
xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
|
||||
d:DesignHeight="450"
|
||||
d:DesignWidth="800"
|
||||
Focusable="True"
|
||||
@@ -145,6 +146,13 @@
|
||||
Text="{Binding Converter={x:Static helpers:MultiplayerInfoConverter.Instance}}"
|
||||
TextAlignment="Start"
|
||||
TextWrapping="Wrap"/>
|
||||
<TextBlock
|
||||
HorizontalAlignment="Stretch"
|
||||
IsVisible="{Binding UserConfig}"
|
||||
Text="{ext:Locale UserConfigurationHeader}"
|
||||
TextAlignment="Start"
|
||||
TextWrapping="Wrap"
|
||||
Foreground="{DynamicResource Warning}" />
|
||||
</StackPanel>
|
||||
<StackPanel
|
||||
Grid.Column="4"
|
||||
|
||||
@@ -1076,7 +1076,7 @@ namespace Ryujinx.Ava.UI.ViewModels
|
||||
_rendererWaitEvent.WaitOne();
|
||||
|
||||
AppHost?.Start();
|
||||
|
||||
|
||||
AppHost?.DisposeContext();
|
||||
}
|
||||
|
||||
@@ -1541,6 +1541,13 @@ namespace Ryujinx.Ava.UI.ViewModels
|
||||
await PerformanceCheck();
|
||||
#endif
|
||||
|
||||
// If a configuration is found in the "/games/xxxxxxxxxxxxxx" folder, the program will load the user setting.
|
||||
if (ConfigurationFileFormat.TryLoad(Program.GetDirGameUserConfig(application.IdBaseString), out ConfigurationFileFormat configurationFileFormat))
|
||||
{
|
||||
// Loads the user configuration, having previously changed the global configuration to the user configuration
|
||||
ConfigurationState.Instance.Load(configurationFileFormat, Program.GetDirGameUserConfig(application.IdBaseString, true, true), application.IdBaseString);
|
||||
}
|
||||
|
||||
Logger.RestartTime();
|
||||
|
||||
SelectedIcon ??= ApplicationLibrary.GetApplicationIcon(application.Path, ConfigurationState.Instance.System.Language, application.Id);
|
||||
@@ -1585,6 +1592,7 @@ namespace Ryujinx.Ava.UI.ViewModels
|
||||
|
||||
Thread gameThread = new(InitializeGame) { Name = "GUI.WindowThread" };
|
||||
gameThread.Start();
|
||||
|
||||
}
|
||||
|
||||
public void SwitchToRenderer(bool startFullscreen) =>
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
using Avalonia.Collections;
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.Media.Imaging;
|
||||
using Avalonia.Threading;
|
||||
using CommunityToolkit.Mvvm.ComponentModel;
|
||||
using CommunityToolkit.Mvvm.Input;
|
||||
using Humanizer;
|
||||
using LibHac.Tools.FsSystem;
|
||||
using Ryujinx.Audio.Backends.OpenAL;
|
||||
using Ryujinx.Audio.Backends.SDL2;
|
||||
@@ -26,6 +28,7 @@ using Ryujinx.HLE.HOS.Services.Time.TimeZone;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.ObjectModel;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Net.NetworkInformation;
|
||||
using System.Threading.Tasks;
|
||||
@@ -68,6 +71,46 @@ namespace Ryujinx.Ava.UI.ViewModels
|
||||
|
||||
public SettingsHacksViewModel DirtyHacks { get; }
|
||||
|
||||
private Bitmap _gameIcon;
|
||||
private string _gameTitle;
|
||||
private string _gameId;
|
||||
public Bitmap GameIcon
|
||||
{
|
||||
get => _gameIcon;
|
||||
set
|
||||
{
|
||||
if (_gameIcon != value)
|
||||
{
|
||||
_gameIcon = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public string GameTitle
|
||||
{
|
||||
get => _gameTitle;
|
||||
set
|
||||
{
|
||||
if (_gameTitle != value)
|
||||
{
|
||||
_gameTitle = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public string GameId
|
||||
{
|
||||
get => _gameId;
|
||||
set
|
||||
{
|
||||
if (_gameId != value)
|
||||
{
|
||||
_gameId = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public int ResolutionScale
|
||||
{
|
||||
get => _resolutionScale;
|
||||
@@ -329,7 +372,7 @@ namespace Ryujinx.Ava.UI.ViewModels
|
||||
|
||||
public bool IsInvalidLdnPassphraseVisible { get; set; }
|
||||
|
||||
public SettingsViewModel(VirtualFileSystem virtualFileSystem, ContentManager contentManager) : this()
|
||||
public SettingsViewModel(VirtualFileSystem virtualFileSystem, ContentManager contentManager) : this(false)
|
||||
{
|
||||
_virtualFileSystem = virtualFileSystem;
|
||||
_contentManager = contentManager;
|
||||
@@ -342,7 +385,48 @@ namespace Ryujinx.Ava.UI.ViewModels
|
||||
}
|
||||
}
|
||||
|
||||
public SettingsViewModel()
|
||||
public SettingsViewModel(VirtualFileSystem virtualFileSystem,
|
||||
ContentManager contentManager,
|
||||
string gamePath,
|
||||
string gameName,
|
||||
string gameId,
|
||||
byte[] gameIconData,
|
||||
bool enableToLoadCustomConfig) : this(enableToLoadCustomConfig)
|
||||
{
|
||||
_virtualFileSystem = virtualFileSystem;
|
||||
_contentManager = contentManager;
|
||||
|
||||
if (gameIconData != null && gameIconData.Length > 0)
|
||||
{
|
||||
using (var ms = new MemoryStream(gameIconData))
|
||||
{
|
||||
GameIcon = new Bitmap(ms);
|
||||
}
|
||||
}
|
||||
|
||||
GameTitle = gameName;
|
||||
GameId = gameId;
|
||||
|
||||
if (enableToLoadCustomConfig) // During the game. If there is no user config, then load the global config window
|
||||
{
|
||||
string gameDir = Program.GetDirGameUserConfig(gameId, false, true);
|
||||
if (ConfigurationFileFormat.TryLoad(gameDir, out ConfigurationFileFormat configurationFileFormat))
|
||||
{
|
||||
ConfigurationState.Instance.Load(configurationFileFormat, gameDir, gameId);
|
||||
}
|
||||
|
||||
LoadCurrentConfiguration(); // Needed to load custom configuration
|
||||
}
|
||||
|
||||
if (Program.PreviewerDetached)
|
||||
{
|
||||
Task.Run(LoadTimeZones);
|
||||
|
||||
DirtyHacks = new SettingsHacksViewModel(this);
|
||||
}
|
||||
}
|
||||
|
||||
public SettingsViewModel(bool noLoadGlobalConfig = false)
|
||||
{
|
||||
GameDirectories = [];
|
||||
AutoloadDirectories = [];
|
||||
@@ -357,7 +441,11 @@ namespace Ryujinx.Ava.UI.ViewModels
|
||||
if (Program.PreviewerDetached)
|
||||
{
|
||||
Task.Run(LoadAvailableGpus);
|
||||
LoadCurrentConfiguration();
|
||||
|
||||
if (!noLoadGlobalConfig)// Default is false, but loading custom config avoids double call
|
||||
{
|
||||
LoadCurrentConfiguration();
|
||||
}
|
||||
|
||||
DirtyHacks = new SettingsHacksViewModel(this);
|
||||
}
|
||||
@@ -468,27 +556,32 @@ namespace Ryujinx.Ava.UI.ViewModels
|
||||
{
|
||||
ConfigurationState config = ConfigurationState.Instance;
|
||||
|
||||
// User Interface
|
||||
EnableDiscordIntegration = config.EnableDiscordIntegration;
|
||||
CheckUpdatesOnStart = config.CheckUpdatesOnStart;
|
||||
ShowConfirmExit = config.ShowConfirmExit;
|
||||
RememberWindowState = config.RememberWindowState;
|
||||
ShowTitleBar = config.ShowTitleBar;
|
||||
HideCursor = (int)config.HideCursor.Value;
|
||||
|
||||
GameDirectories.Clear();
|
||||
GameDirectories.AddRange(config.UI.GameDirs.Value);
|
||||
|
||||
AutoloadDirectories.Clear();
|
||||
AutoloadDirectories.AddRange(config.UI.AutoloadDirs.Value);
|
||||
|
||||
BaseStyleIndex = config.UI.BaseStyle.Value switch
|
||||
//It is necessary that the data is used from the global configuration file
|
||||
if (string.IsNullOrEmpty(GameId))
|
||||
{
|
||||
"Auto" => 0,
|
||||
"Light" => 1,
|
||||
"Dark" => 2,
|
||||
_ => 0
|
||||
};
|
||||
// User Interface
|
||||
EnableDiscordIntegration = config.EnableDiscordIntegration;
|
||||
CheckUpdatesOnStart = config.CheckUpdatesOnStart;
|
||||
ShowConfirmExit = config.ShowConfirmExit;
|
||||
RememberWindowState = config.RememberWindowState;
|
||||
ShowTitleBar = config.ShowTitleBar;
|
||||
HideCursor = (int)config.HideCursor.Value;
|
||||
|
||||
GameDirectories.Clear();
|
||||
GameDirectories.AddRange(config.UI.GameDirs.Value);
|
||||
|
||||
AutoloadDirectories.Clear();
|
||||
AutoloadDirectories.AddRange(config.UI.AutoloadDirs.Value);
|
||||
|
||||
BaseStyleIndex = config.UI.BaseStyle.Value switch
|
||||
{
|
||||
"Auto" => 0,
|
||||
"Light" => 1,
|
||||
"Dark" => 2,
|
||||
_ => 0
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
// Input
|
||||
EnableDockedMode = config.System.EnableDockedMode;
|
||||
@@ -508,7 +601,6 @@ namespace Ryujinx.Ava.UI.ViewModels
|
||||
DateTime currentDateTime = currentHostDateTime.Add(systemDateTimeOffset);
|
||||
CurrentDate = currentDateTime.Date;
|
||||
CurrentTime = currentDateTime.TimeOfDay;
|
||||
|
||||
MatchSystemTime = config.System.MatchSystemTime;
|
||||
|
||||
EnableCustomVSyncInterval = config.Graphics.EnableCustomVSyncInterval;
|
||||
@@ -568,37 +660,41 @@ namespace Ryujinx.Ava.UI.ViewModels
|
||||
LdnPassphrase = config.Multiplayer.LdnPassphrase;
|
||||
LdnServer = config.Multiplayer.LdnServer;
|
||||
}
|
||||
|
||||
|
||||
public void SaveSettings()
|
||||
{
|
||||
ConfigurationState config = ConfigurationState.Instance;
|
||||
bool userConfigFile = string.IsNullOrEmpty(GameId);
|
||||
|
||||
// User Interface
|
||||
config.EnableDiscordIntegration.Value = EnableDiscordIntegration;
|
||||
config.CheckUpdatesOnStart.Value = CheckUpdatesOnStart;
|
||||
config.ShowConfirmExit.Value = ShowConfirmExit;
|
||||
config.RememberWindowState.Value = RememberWindowState;
|
||||
config.ShowTitleBar.Value = ShowTitleBar;
|
||||
config.HideCursor.Value = (HideCursorMode)HideCursor;
|
||||
|
||||
if (GameDirectoryChanged)
|
||||
if (userConfigFile)
|
||||
{
|
||||
config.UI.GameDirs.Value = [..GameDirectories];
|
||||
// User Interface
|
||||
config.EnableDiscordIntegration.Value = EnableDiscordIntegration;
|
||||
config.CheckUpdatesOnStart.Value = CheckUpdatesOnStart;
|
||||
config.ShowConfirmExit.Value = ShowConfirmExit;
|
||||
config.RememberWindowState.Value = RememberWindowState;
|
||||
config.ShowTitleBar.Value = ShowTitleBar;
|
||||
config.HideCursor.Value = (HideCursorMode)HideCursor;
|
||||
|
||||
if (GameDirectoryChanged)
|
||||
{
|
||||
config.UI.GameDirs.Value = [.. GameDirectories];
|
||||
}
|
||||
|
||||
if (AutoloadDirectoryChanged)
|
||||
{
|
||||
config.UI.AutoloadDirs.Value = [.. AutoloadDirectories];
|
||||
}
|
||||
|
||||
config.UI.BaseStyle.Value = BaseStyleIndex switch
|
||||
{
|
||||
0 => "Auto",
|
||||
1 => "Light",
|
||||
2 => "Dark",
|
||||
_ => "Auto"
|
||||
};
|
||||
}
|
||||
|
||||
if (AutoloadDirectoryChanged)
|
||||
{
|
||||
config.UI.AutoloadDirs.Value = [..AutoloadDirectories];
|
||||
}
|
||||
|
||||
config.UI.BaseStyle.Value = BaseStyleIndex switch
|
||||
{
|
||||
0 => "Auto",
|
||||
1 => "Light",
|
||||
2 => "Dark",
|
||||
_ => "Auto"
|
||||
};
|
||||
|
||||
// Input
|
||||
config.System.EnableDockedMode.Value = EnableDockedMode;
|
||||
config.Hid.EnableKeyboard.Value = EnableKeyboard;
|
||||
@@ -693,7 +789,9 @@ namespace Ryujinx.Ava.UI.ViewModels
|
||||
config.Hacks.EnableShaderTranslationDelay.Value = DirtyHacks.ShaderTranslationDelayEnabled;
|
||||
config.Hacks.ShaderTranslationDelay.Value = DirtyHacks.ShaderTranslationDelay;
|
||||
|
||||
config.ToFileFormat().SaveConfig(Program.ConfigurationPath);
|
||||
|
||||
config.ToFileFormat().SaveConfig(Program.ConfigurationPath);
|
||||
|
||||
|
||||
MainWindow.UpdateGraphicsConfig();
|
||||
RyujinxApp.MainWindow.ViewModel.VSyncModeSettingChanged();
|
||||
@@ -706,7 +804,11 @@ namespace Ryujinx.Ava.UI.ViewModels
|
||||
|
||||
private static void RevertIfNotSaved()
|
||||
{
|
||||
Program.ReloadConfig();
|
||||
// maybe this is an unnecessary check(all options need to be tested)
|
||||
if (string.IsNullOrEmpty(Program.GlobalConfigurationPath))
|
||||
{
|
||||
Program.ReloadConfig();
|
||||
}
|
||||
}
|
||||
|
||||
public void ApplyButton()
|
||||
@@ -714,6 +816,26 @@ namespace Ryujinx.Ava.UI.ViewModels
|
||||
SaveSettings();
|
||||
}
|
||||
|
||||
public void DeleteConfigGame()
|
||||
{
|
||||
string gameDir = Program.GetDirGameUserConfig(GameId,false,false);
|
||||
|
||||
if (File.Exists(gameDir))
|
||||
{
|
||||
File.Delete(gameDir);
|
||||
}
|
||||
|
||||
RevertIfNotSaved();
|
||||
CloseWindow?.Invoke();
|
||||
}
|
||||
|
||||
public void SaveUserConfig()
|
||||
{
|
||||
SaveSettings();
|
||||
RevertIfNotSaved(); // Revert global configuration after saving user configuration
|
||||
CloseWindow?.Invoke();
|
||||
}
|
||||
|
||||
public void OkButton()
|
||||
{
|
||||
SaveSettings();
|
||||
|
||||
@@ -134,9 +134,26 @@ namespace Ryujinx.Ava.UI.Views.Main
|
||||
Window.SettingsWindow = new(Window.VirtualFileSystem, Window.ContentManager);
|
||||
|
||||
Rainbow.Enable();
|
||||
|
||||
await Window.SettingsWindow.ShowDialog(Window);
|
||||
|
||||
|
||||
if (ViewModel.SelectedApplication is null) // Checks if game data exists
|
||||
{
|
||||
await Window.SettingsWindow.ShowDialog(Window);
|
||||
}
|
||||
else
|
||||
{
|
||||
bool userConfigExist = Program.FindGameConfig(Program.GetDirGameUserConfig(ViewModel.SelectedApplication.IdString, false, false));
|
||||
|
||||
if (!ViewModel.IsGameRunning || !userConfigExist)
|
||||
{
|
||||
await Window.SettingsWindow.ShowDialog(Window); // The game is not running, or if the user configuration does not exist
|
||||
}
|
||||
else
|
||||
{
|
||||
// If there is a custom configuration in the folder
|
||||
await new UserConfigWindows(ViewModel, userConfigExist).ShowDialog((Window)ViewModel.TopLevel);
|
||||
}
|
||||
}
|
||||
|
||||
Rainbow.Disable();
|
||||
Rainbow.Reset();
|
||||
|
||||
|
||||
@@ -645,6 +645,11 @@ namespace Ryujinx.Ava.UI.Windows
|
||||
ReloadGameList();
|
||||
}
|
||||
|
||||
public void GameListUpdate()
|
||||
{
|
||||
ReloadGameList();
|
||||
}
|
||||
|
||||
public void ToggleFileType(string fileType)
|
||||
{
|
||||
switch (fileType)
|
||||
|
||||
144
src/Ryujinx/UI/Windows/UserConfigWindows.axaml
Normal file
144
src/Ryujinx/UI/Windows/UserConfigWindows.axaml
Normal file
@@ -0,0 +1,144 @@
|
||||
<window:StyleableAppWindow
|
||||
x:Class="Ryujinx.Ava.UI.Windows.UserConfigWindows"
|
||||
xmlns="https://github.com/avaloniaui"
|
||||
xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:window="clr-namespace:Ryujinx.Ava.UI.Windows"
|
||||
xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
|
||||
xmlns:settings="clr-namespace:Ryujinx.Ava.UI.Views.Settings"
|
||||
xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
|
||||
xmlns:helper="clr-namespace:Ryujinx.Common.Helper;assembly=Ryujinx.Common"
|
||||
Width="1100"
|
||||
Height="768"
|
||||
MinWidth="800"
|
||||
MinHeight="480"
|
||||
WindowStartupLocation="CenterOwner"
|
||||
x:DataType="viewModels:SettingsViewModel"
|
||||
mc:Ignorable="d"
|
||||
Focusable="True">
|
||||
<Design.DataContext>
|
||||
<viewModels:SettingsViewModel />
|
||||
</Design.DataContext>
|
||||
<Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" MinWidth="600" RowDefinitions="Auto,*,Auto">
|
||||
<ContentPresenter
|
||||
x:Name="ContentPresenter"
|
||||
Grid.Row="1"
|
||||
IsVisible="False"
|
||||
KeyboardNavigation.IsTabStop="False"/>
|
||||
<Grid Name="Pages" IsVisible="False" Grid.Row="2">
|
||||
<settings:SettingsInputView Name="InputPage" />
|
||||
<settings:SettingsSystemView Name="SystemPage" />
|
||||
<settings:SettingsCPUView Name="CpuPage" />
|
||||
<settings:SettingsGraphicsView Name="GraphicsPage" />
|
||||
<settings:SettingsAudioView Name="AudioPage" />
|
||||
<settings:SettingsNetworkView Name="NetworkPage" />
|
||||
<settings:SettingsLoggingView Name="LoggingPage" />
|
||||
<settings:SettingsHacksView Name="HacksPage" />
|
||||
</Grid>
|
||||
<ui:NavigationView
|
||||
Grid.Row="1"
|
||||
IsSettingsVisible="False"
|
||||
Name="NavPanel"
|
||||
IsBackEnabled="False"
|
||||
PaneDisplayMode="Left"
|
||||
Margin="2,10,10,0"
|
||||
VerticalAlignment="Stretch"
|
||||
HorizontalAlignment="Stretch"
|
||||
OpenPaneLength="200"
|
||||
IsPaneToggleButtonVisible="False">
|
||||
|
||||
<!-- For image -->
|
||||
<ui:NavigationView.PaneHeader>
|
||||
<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="5"/>
|
||||
</Grid.RowDefinitions>
|
||||
<TextBlock Text="{Binding GameId}"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
Margin="0,0,0,10"
|
||||
TextAlignment="Center" Grid.Row="0" />
|
||||
<Image Source="{Binding GameIcon}"
|
||||
Width="160"
|
||||
Height="160"
|
||||
Grid.Row="1"
|
||||
Margin="0,0,0,10"
|
||||
HorizontalAlignment="Center" />
|
||||
<TextBlock Text="{Binding GameTitle}"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
Margin="0,0,0,10"
|
||||
TextAlignment="Center" Grid.Row="2" />
|
||||
<Separator Height="1" Grid.Row="3" Margin="0,0,0,10" HorizontalAlignment="Stretch"/>
|
||||
</Grid>
|
||||
</ui:NavigationView.PaneHeader>
|
||||
|
||||
<ui:NavigationView.MenuItems>
|
||||
<ui:NavigationViewItem
|
||||
Content="{ext:Locale SettingsTabInput}"
|
||||
Tag="InputPage"
|
||||
IconSource="Games" />
|
||||
<ui:NavigationViewItem
|
||||
Content="{ext:Locale SettingsTabSystem}"
|
||||
Tag="SystemPage"
|
||||
IconSource="Settings" />
|
||||
<ui:NavigationViewItem
|
||||
Content="{ext:Locale SettingsTabCpu}"
|
||||
Tag="CpuPage">
|
||||
<ui:NavigationViewItem.IconSource>
|
||||
<ui:FontIconSource
|
||||
FontFamily="avares://Ryujinx/Assets/Fonts#Segoe Fluent Icons"
|
||||
Glyph="{helpers:GlyphValueConverter Chip}" />
|
||||
</ui:NavigationViewItem.IconSource>
|
||||
</ui:NavigationViewItem>
|
||||
<ui:NavigationViewItem
|
||||
Content="{ext:Locale SettingsTabGraphics}"
|
||||
Tag="GraphicsPage"
|
||||
IconSource="Image" />
|
||||
<ui:NavigationViewItem
|
||||
Content="{ext:Locale SettingsTabAudio}"
|
||||
IconSource="Audio"
|
||||
Tag="AudioPage" />
|
||||
<ui:NavigationViewItem
|
||||
Content="{ext:Locale SettingsTabNetwork}"
|
||||
Tag="NetworkPage"
|
||||
IconSource="Globe" />
|
||||
<ui:NavigationViewItem
|
||||
Content="{ext:Locale SettingsTabLogging}"
|
||||
Tag="LoggingPage"
|
||||
IconSource="Document" />
|
||||
<ui:NavigationViewItem
|
||||
IsVisible="{Binding ShowDirtyHacks}"
|
||||
Content="Dirty Hacks"
|
||||
Tag="HacksPage"
|
||||
IconSource="Code" />
|
||||
</ui:NavigationView.MenuItems>
|
||||
</ui:NavigationView>
|
||||
|
||||
<ReversibleStackPanel
|
||||
Grid.Row="2"
|
||||
Margin="10"
|
||||
Spacing="10"
|
||||
Orientation="Horizontal"
|
||||
HorizontalAlignment="Right"
|
||||
ReverseOrder="{x:Static helper:RunningPlatform.IsMacOS}">
|
||||
<Button
|
||||
Content="{ext:Locale SettingsButtonSave}"
|
||||
Command="{Binding SaveUserConfig}" />
|
||||
<Button
|
||||
HotKey="Escape"
|
||||
Content="{ext:Locale SettingsButtonClose}"
|
||||
Command="{Binding CancelButton}" />
|
||||
<Button
|
||||
Content="{ext:Locale UserProfilesDelete}"
|
||||
Command="{Binding DeleteConfigGame}"
|
||||
Classes="red"/>
|
||||
</ReversibleStackPanel>
|
||||
</Grid>
|
||||
</window:StyleableAppWindow>
|
||||
116
src/Ryujinx/UI/Windows/UserConfigWindows.axaml.cs
Normal file
116
src/Ryujinx/UI/Windows/UserConfigWindows.axaml.cs
Normal file
@@ -0,0 +1,116 @@
|
||||
using Avalonia;
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.Controls.Shapes;
|
||||
using Avalonia.Input;
|
||||
using Avalonia.Media.Imaging;
|
||||
using FluentAvalonia.Core;
|
||||
using FluentAvalonia.UI.Controls;
|
||||
using Projektanker.Icons.Avalonia;
|
||||
using Ryujinx.Ava.Common.Locale;
|
||||
using Ryujinx.Ava.UI.Models;
|
||||
using Ryujinx.Ava.UI.ViewModels;
|
||||
using Ryujinx.Ava.UI.ViewModels.Input;
|
||||
using Ryujinx.Ava.Utilities;
|
||||
using Ryujinx.Ava.Utilities.Configuration;
|
||||
using Ryujinx.Common.Configuration;
|
||||
using Ryujinx.HLE.FileSystem;
|
||||
using Ryujinx.HLE.HOS.SystemState;
|
||||
using Ryujinx.Input;
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using Key = Avalonia.Input.Key;
|
||||
|
||||
|
||||
namespace Ryujinx.Ava.UI.Windows
|
||||
{
|
||||
public partial class UserConfigWindows : StyleableAppWindow
|
||||
{
|
||||
internal readonly SettingsViewModel ViewModel;
|
||||
|
||||
public UserConfigWindows(MainWindowViewModel viewModel, bool findUserConfigDir = true)
|
||||
{
|
||||
Title = string.Format(LocaleManager.Instance[LocaleKeys.SettingsWithInfo], viewModel.SelectedApplication.Name, viewModel.SelectedApplication.IdString);
|
||||
|
||||
DataContext = ViewModel = new SettingsViewModel(
|
||||
viewModel.VirtualFileSystem,
|
||||
viewModel.ContentManager,
|
||||
viewModel.SelectedApplication.Path,
|
||||
viewModel.SelectedApplication.Name,
|
||||
viewModel.SelectedApplication.IdString,
|
||||
viewModel.SelectedApplication.Icon,
|
||||
findUserConfigDir);
|
||||
|
||||
ViewModel.CloseWindow += Close;
|
||||
ViewModel.SaveSettingsEvent += SaveSettings;
|
||||
|
||||
InitializeComponent();
|
||||
Load();
|
||||
|
||||
#if DEBUG
|
||||
this.AttachDevTools(new KeyGesture(Key.F12, KeyModifiers.Alt));
|
||||
#endif
|
||||
|
||||
}
|
||||
|
||||
public void SaveSettings()
|
||||
{
|
||||
InputPage.InputView?.SaveCurrentProfile();
|
||||
}
|
||||
|
||||
|
||||
private void Load()
|
||||
{
|
||||
Pages.Children.Clear();
|
||||
NavPanel.SelectionChanged += NavPanelOnSelectionChanged;
|
||||
NavPanel.SelectedItem = NavPanel.MenuItems.ElementAt(0);
|
||||
|
||||
}
|
||||
|
||||
private void NavPanelOnSelectionChanged(object sender, NavigationViewSelectionChangedEventArgs e)
|
||||
{
|
||||
|
||||
if (e.SelectedItem is NavigationViewItem navItem && navItem.Tag is not null)
|
||||
{
|
||||
switch (navItem.Tag.ToString())
|
||||
{
|
||||
case nameof(InputPage):
|
||||
NavPanel.Content = InputPage;
|
||||
break;
|
||||
case nameof(SystemPage):
|
||||
SystemPage.ViewModel = ViewModel;
|
||||
NavPanel.Content = SystemPage;
|
||||
break;
|
||||
case nameof(CpuPage):
|
||||
NavPanel.Content = CpuPage;
|
||||
break;
|
||||
case nameof(GraphicsPage):
|
||||
NavPanel.Content = GraphicsPage;
|
||||
break;
|
||||
case nameof(AudioPage):
|
||||
NavPanel.Content = AudioPage;
|
||||
break;
|
||||
case nameof(NetworkPage):
|
||||
NetworkPage.ViewModel = ViewModel;
|
||||
NavPanel.Content = NetworkPage;
|
||||
break;
|
||||
case nameof(LoggingPage):
|
||||
NavPanel.Content = LoggingPage;
|
||||
break;
|
||||
case nameof(HacksPage):
|
||||
HacksPage.DataContext = ViewModel;
|
||||
NavPanel.Content = HacksPage;
|
||||
break;
|
||||
default:
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected override void OnClosing(WindowClosingEventArgs e)
|
||||
{
|
||||
InputPage.Dispose(); // You need to unload the gamepad settings, otherwise the controls will be blocked
|
||||
base.OnClosing(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -21,6 +21,7 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
|
||||
public class ApplicationData
|
||||
{
|
||||
public bool Favorite { get; set; }
|
||||
public bool UserConfig { get; set; }
|
||||
public byte[] Icon { get; set; }
|
||||
public string Name { get; set; } = "Unknown";
|
||||
|
||||
|
||||
@@ -505,7 +505,7 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
|
||||
if (data.Id != 0)
|
||||
{
|
||||
ApplicationMetadata appMetadata = LoadAndSaveMetaData(data.IdString, appMetadata =>
|
||||
{
|
||||
{
|
||||
appMetadata.Title = data.Name;
|
||||
|
||||
// Only do the migration if time_played has a value and timespan_played hasn't been updated yet.
|
||||
@@ -529,10 +529,11 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
data.Favorite = appMetadata.Favorite;
|
||||
data.TimePlayed = appMetadata.TimePlayed;
|
||||
data.LastPlayed = appMetadata.LastPlayed;
|
||||
data.UserConfig = File.Exists(Program.GetDirGameUserConfig(data.IdBaseString, false, false)); // Just check user config
|
||||
}
|
||||
|
||||
data.FileExtension = Path.GetExtension(applicationPath).TrimStart('.').ToUpper();
|
||||
|
||||
@@ -6,11 +6,15 @@ namespace Ryujinx.Ava.Utilities
|
||||
public static class CommandLineState
|
||||
{
|
||||
public static string[] Arguments { get; private set; }
|
||||
|
||||
public static int CountArguments { get; private set; }
|
||||
public static bool? OverrideDockedMode { get; private set; }
|
||||
public static bool? OverrideHardwareAcceleration { get; private set; }
|
||||
public static string OverrideGraphicsBackend { get; private set; }
|
||||
public static string OverrideBackendThreading { get; private set; }
|
||||
public static string OverridePPTC { get; private set; }
|
||||
public static string OverrideMemoryManagerMode { get; private set; }
|
||||
public static string OverrideSystemRegion { get; private set; }
|
||||
public static string OverrideSystemLanguage { get; private set; }
|
||||
public static string OverrideHideCursor { get; private set; }
|
||||
public static string BaseDirPathArg { get; private set; }
|
||||
public static string Profile { get; private set; }
|
||||
@@ -19,6 +23,11 @@ namespace Ryujinx.Ava.Utilities
|
||||
public static bool StartFullscreenArg { get; private set; }
|
||||
public static bool HideAvailableUpdates { get; private set; }
|
||||
|
||||
public static void ArgumentsClean()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public static void ParseArguments(string[] args)
|
||||
{
|
||||
List<string> arguments = [];
|
||||
@@ -28,6 +37,11 @@ namespace Ryujinx.Ava.Utilities
|
||||
{
|
||||
string arg = args[i];
|
||||
|
||||
if (arg.Contains("-") || arg.Contains("--"))
|
||||
{
|
||||
CountArguments++;
|
||||
}
|
||||
|
||||
switch (arg)
|
||||
{
|
||||
case "-r":
|
||||
@@ -85,6 +99,47 @@ namespace Ryujinx.Ava.Utilities
|
||||
|
||||
OverrideBackendThreading = args[++i];
|
||||
break;
|
||||
case "--pptc":
|
||||
if (i + 1 >= args.Length)
|
||||
{
|
||||
Logger.Error?.Print(LogClass.Application, $"Invalid option '{arg}'");
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
OverridePPTC = args[++i];
|
||||
break;
|
||||
case "-m":
|
||||
case "--memory-manager-mode":
|
||||
if (i + 1 >= args.Length)
|
||||
{
|
||||
Logger.Error?.Print(LogClass.Application, $"Invalid option '{arg}'");
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
OverrideMemoryManagerMode = args[++i];
|
||||
break;
|
||||
case "--system-region":
|
||||
if (i + 1 >= args.Length)
|
||||
{
|
||||
Logger.Error?.Print(LogClass.Application, $"Invalid option '{arg}'");
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
OverrideSystemRegion = args[++i];
|
||||
break;
|
||||
case "--system-language":
|
||||
if (i + 1 >= args.Length)
|
||||
{
|
||||
Logger.Error?.Print(LogClass.Application, $"Invalid option '{arg}'");
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
OverrideSystemLanguage = args[++i];
|
||||
break;
|
||||
case "-i":
|
||||
case "--application-id":
|
||||
LaunchApplicationId = args[++i];
|
||||
|
||||
@@ -18,9 +18,15 @@ namespace Ryujinx.Ava.Utilities.Configuration
|
||||
{
|
||||
public partial class ConfigurationState
|
||||
{
|
||||
public void Load(ConfigurationFileFormat cff, string configurationFilePath)
|
||||
public void Load(ConfigurationFileFormat cff, string configurationFilePath, string gameId="")
|
||||
{
|
||||
bool configurationFileUpdated = false;
|
||||
bool LoadSetting = true;
|
||||
|
||||
if (!string.IsNullOrEmpty(gameId))
|
||||
{
|
||||
LoadSetting = false;
|
||||
}
|
||||
|
||||
if (cff.Version is < 0 or > ConfigurationFileFormat.CurrentVersion)
|
||||
{
|
||||
@@ -43,14 +49,14 @@ namespace Ryujinx.Ava.Utilities.Configuration
|
||||
configurationFileUpdated = true;
|
||||
}
|
||||
|
||||
EnableDiscordIntegration.Value = cff.EnableDiscordIntegration;
|
||||
CheckUpdatesOnStart.Value = cff.CheckUpdatesOnStart;
|
||||
ShowConfirmExit.Value = cff.ShowConfirmExit;
|
||||
RememberWindowState.Value = cff.RememberWindowState;
|
||||
ShowTitleBar.Value = cff.ShowTitleBar;
|
||||
EnableHardwareAcceleration.Value = cff.EnableHardwareAcceleration;
|
||||
HideCursor.Value = cff.HideCursor;
|
||||
|
||||
EnableDiscordIntegration.Value = LoadSetting ? cff.EnableDiscordIntegration : EnableDiscordIntegration.Value; // Get from global config only
|
||||
CheckUpdatesOnStart.Value = LoadSetting ? cff.CheckUpdatesOnStart : CheckUpdatesOnStart.Value; // Get from global config only
|
||||
ShowConfirmExit.Value = LoadSetting ? cff.ShowConfirmExit : ShowConfirmExit.Value; // Get from global config only
|
||||
RememberWindowState.Value = LoadSetting ? cff.RememberWindowState : RememberWindowState.Value; // Get from global config only
|
||||
ShowTitleBar.Value = LoadSetting ? cff.ShowTitleBar : ShowTitleBar.Value; // Get from global config only
|
||||
EnableHardwareAcceleration.Value = LoadSetting ? cff.EnableHardwareAcceleration : EnableHardwareAcceleration.Value; // Get from global config only
|
||||
HideCursor.Value = LoadSetting ? cff.HideCursor : HideCursor.Value; // Get from global config only
|
||||
|
||||
Logger.EnableFileLog.Value = cff.EnableFileLog;
|
||||
Logger.EnableDebug.Value = cff.LoggingEnableDebug;
|
||||
Logger.EnableStub.Value = cff.LoggingEnableStub;
|
||||
@@ -85,7 +91,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
|
||||
System.Language.Value = cff.SystemLanguage;
|
||||
System.Region.Value = cff.SystemRegion;
|
||||
System.TimeZone.Value = cff.SystemTimeZone;
|
||||
System.SystemTimeOffset.Value = cff.SystemTimeOffset;
|
||||
System.SystemTimeOffset.Value = LoadSetting ? cff.SystemTimeOffset : System.SystemTimeOffset.Value; // Get from global config only
|
||||
System.EnableDockedMode.Value = cff.DockedMode;
|
||||
System.EnablePtc.Value = cff.EnablePtc;
|
||||
System.EnableLowPowerPtc.Value = cff.EnableLowPowerPtc;
|
||||
@@ -99,46 +105,47 @@ namespace Ryujinx.Ava.Utilities.Configuration
|
||||
System.IgnoreMissingServices.Value = cff.IgnoreMissingServices;
|
||||
System.IgnoreApplet.Value = cff.IgnoreApplet;
|
||||
System.UseHypervisor.Value = cff.UseHypervisor;
|
||||
|
||||
UI.GuiColumns.FavColumn.Value = cff.GuiColumns.FavColumn;
|
||||
UI.GuiColumns.IconColumn.Value = cff.GuiColumns.IconColumn;
|
||||
UI.GuiColumns.AppColumn.Value = cff.GuiColumns.AppColumn;
|
||||
UI.GuiColumns.DevColumn.Value = cff.GuiColumns.DevColumn;
|
||||
UI.GuiColumns.VersionColumn.Value = cff.GuiColumns.VersionColumn;
|
||||
UI.GuiColumns.TimePlayedColumn.Value = cff.GuiColumns.TimePlayedColumn;
|
||||
UI.GuiColumns.LastPlayedColumn.Value = cff.GuiColumns.LastPlayedColumn;
|
||||
UI.GuiColumns.FileExtColumn.Value = cff.GuiColumns.FileExtColumn;
|
||||
UI.GuiColumns.FileSizeColumn.Value = cff.GuiColumns.FileSizeColumn;
|
||||
UI.GuiColumns.PathColumn.Value = cff.GuiColumns.PathColumn;
|
||||
UI.ColumnSort.SortColumnId.Value = cff.ColumnSort.SortColumnId;
|
||||
UI.ColumnSort.SortAscending.Value = cff.ColumnSort.SortAscending;
|
||||
UI.GameDirs.Value = cff.GameDirs;
|
||||
UI.AutoloadDirs.Value = cff.AutoloadDirs ?? [];
|
||||
UI.ShownFileTypes.NSP.Value = cff.ShownFileTypes.NSP;
|
||||
UI.ShownFileTypes.PFS0.Value = cff.ShownFileTypes.PFS0;
|
||||
UI.ShownFileTypes.XCI.Value = cff.ShownFileTypes.XCI;
|
||||
UI.ShownFileTypes.NCA.Value = cff.ShownFileTypes.NCA;
|
||||
UI.ShownFileTypes.NRO.Value = cff.ShownFileTypes.NRO;
|
||||
UI.ShownFileTypes.NSO.Value = cff.ShownFileTypes.NSO;
|
||||
UI.LanguageCode.Value = cff.LanguageCode;
|
||||
UI.BaseStyle.Value = cff.BaseStyle;
|
||||
UI.GameListViewMode.Value = cff.GameListViewMode;
|
||||
UI.ShowNames.Value = cff.ShowNames;
|
||||
UI.IsAscendingOrder.Value = cff.IsAscendingOrder;
|
||||
UI.GridSize.Value = cff.GridSize;
|
||||
UI.ApplicationSort.Value = cff.ApplicationSort;
|
||||
UI.StartFullscreen.Value = cff.StartFullscreen;
|
||||
UI.StartNoUI.Value = cff.StartNoUI;
|
||||
UI.ShowConsole.Value = cff.ShowConsole;
|
||||
UI.WindowStartup.WindowSizeWidth.Value = cff.WindowStartup.WindowSizeWidth;
|
||||
UI.WindowStartup.WindowSizeHeight.Value = cff.WindowStartup.WindowSizeHeight;
|
||||
UI.WindowStartup.WindowPositionX.Value = cff.WindowStartup.WindowPositionX;
|
||||
UI.WindowStartup.WindowPositionY.Value = cff.WindowStartup.WindowPositionY;
|
||||
UI.WindowStartup.WindowMaximized.Value = cff.WindowStartup.WindowMaximized;
|
||||
|
||||
|
||||
UI.GuiColumns.FavColumn.Value = LoadSetting ? cff.GuiColumns.FavColumn : UI.GuiColumns.FavColumn.Value;
|
||||
UI.GuiColumns.IconColumn.Value = LoadSetting ? cff.GuiColumns.IconColumn : UI.GuiColumns.IconColumn.Value;
|
||||
UI.GuiColumns.AppColumn.Value = LoadSetting ? cff.GuiColumns.AppColumn : UI.GuiColumns.AppColumn.Value;
|
||||
UI.GuiColumns.DevColumn.Value = LoadSetting ? cff.GuiColumns.DevColumn : UI.GuiColumns.DevColumn.Value;
|
||||
UI.GuiColumns.VersionColumn.Value = LoadSetting ? cff.GuiColumns.VersionColumn : UI.GuiColumns.VersionColumn.Value;
|
||||
UI.GuiColumns.TimePlayedColumn.Value = LoadSetting ? cff.GuiColumns.TimePlayedColumn : UI.GuiColumns.TimePlayedColumn.Value;
|
||||
UI.GuiColumns.LastPlayedColumn.Value = LoadSetting ? cff.GuiColumns.LastPlayedColumn : UI.GuiColumns.LastPlayedColumn.Value;
|
||||
UI.GuiColumns.FileExtColumn.Value = LoadSetting ? cff.GuiColumns.FileExtColumn : UI.GuiColumns.FileExtColumn.Value;
|
||||
UI.GuiColumns.FileSizeColumn.Value = LoadSetting ? cff.GuiColumns.FileSizeColumn : UI.GuiColumns.FileSizeColumn.Value;
|
||||
UI.GuiColumns.PathColumn.Value = LoadSetting ? cff.GuiColumns.PathColumn : UI.GuiColumns.PathColumn.Value;
|
||||
UI.ColumnSort.SortColumnId.Value = LoadSetting ? cff.ColumnSort.SortColumnId : UI.ColumnSort.SortColumnId.Value;
|
||||
UI.ColumnSort.SortAscending.Value = LoadSetting ? cff.ColumnSort.SortAscending : UI.ColumnSort.SortAscending.Value;
|
||||
UI.GameDirs.Value = LoadSetting ? cff.GameDirs : UI.GameDirs.Value;
|
||||
UI.AutoloadDirs.Value = LoadSetting ? (cff.AutoloadDirs ?? []) : UI.AutoloadDirs.Value;
|
||||
UI.ShownFileTypes.NSP.Value = LoadSetting ? cff.ShownFileTypes.NSP : UI.ShownFileTypes.NSP.Value;
|
||||
UI.ShownFileTypes.PFS0.Value = LoadSetting ? cff.ShownFileTypes.PFS0 : UI.ShownFileTypes.PFS0.Value;
|
||||
UI.ShownFileTypes.XCI.Value = LoadSetting ? cff.ShownFileTypes.XCI : UI.ShownFileTypes.XCI.Value;
|
||||
UI.ShownFileTypes.NCA.Value = LoadSetting ? cff.ShownFileTypes.NCA : UI.ShownFileTypes.NCA.Value;
|
||||
UI.ShownFileTypes.NRO.Value = LoadSetting ? cff.ShownFileTypes.NRO : UI.ShownFileTypes.NRO.Value;
|
||||
UI.ShownFileTypes.NSO.Value = LoadSetting ? cff.ShownFileTypes.NSO : UI.ShownFileTypes.NSO.Value;
|
||||
UI.LanguageCode.Value = LoadSetting ? cff.LanguageCode : UI.LanguageCode.Value;
|
||||
UI.BaseStyle.Value = LoadSetting ? cff.BaseStyle : UI.BaseStyle.Value;
|
||||
UI.GameListViewMode.Value = LoadSetting ? cff.GameListViewMode : UI.GameListViewMode.Value;
|
||||
UI.ShowNames.Value = LoadSetting ? cff.ShowNames : UI.ShowNames.Value;
|
||||
UI.IsAscendingOrder.Value = LoadSetting ? cff.IsAscendingOrder : UI.IsAscendingOrder.Value;
|
||||
UI.GridSize.Value = LoadSetting ? cff.GridSize : UI.GridSize.Value;
|
||||
UI.ApplicationSort.Value = LoadSetting ? cff.ApplicationSort : UI.ApplicationSort.Value;
|
||||
UI.StartFullscreen.Value = LoadSetting ? cff.StartFullscreen : UI.StartFullscreen.Value;
|
||||
UI.StartNoUI.Value = LoadSetting ? cff.StartNoUI : UI.StartNoUI.Value;
|
||||
UI.ShowConsole.Value = LoadSetting ? cff.ShowConsole : UI.ShowConsole.Value;
|
||||
UI.WindowStartup.WindowSizeWidth.Value = LoadSetting ? cff.WindowStartup.WindowSizeWidth : UI.WindowStartup.WindowSizeWidth.Value;
|
||||
UI.WindowStartup.WindowSizeHeight.Value = LoadSetting ? cff.WindowStartup.WindowSizeHeight : UI.WindowStartup.WindowSizeHeight.Value;
|
||||
UI.WindowStartup.WindowPositionX.Value = LoadSetting ? cff.WindowStartup.WindowPositionX : UI.WindowStartup.WindowPositionX.Value;
|
||||
UI.WindowStartup.WindowPositionY.Value = LoadSetting ? cff.WindowStartup.WindowPositionY : UI.WindowStartup.WindowPositionY.Value;
|
||||
UI.WindowStartup.WindowMaximized.Value = LoadSetting ? cff.WindowStartup.WindowMaximized : UI.WindowStartup.WindowMaximized.Value;
|
||||
|
||||
|
||||
Hid.EnableKeyboard.Value = cff.EnableKeyboard;
|
||||
Hid.EnableMouse.Value = cff.EnableMouse;
|
||||
Hid.Hotkeys.Value = cff.Hotkeys;
|
||||
Hid.Hotkeys.Value = LoadSetting ? cff.Hotkeys : Hid.Hotkeys.Value; // Get from global config only
|
||||
Hid.InputConfig.Value = cff.InputConfig ?? [];
|
||||
Hid.RainbowSpeed.Value = cff.RainbowSpeed;
|
||||
|
||||
|
||||
@@ -31,8 +31,7 @@ namespace Ryujinx.Ava.Utilities.PlayReport
|
||||
Guard.Ensure(ulong.TryParse(titleId, NumberStyles.HexNumber, null, out _),
|
||||
$"Cannot use a non-hexadecimal string as the Title ID for a {nameof(GameSpec)}.");
|
||||
|
||||
_specs.Add(transform(new GameSpec { TitleIds = [titleId] }));
|
||||
return this;
|
||||
return AddSpec(transform(GameSpec.Create(titleId)));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -46,8 +45,7 @@ namespace Ryujinx.Ava.Utilities.PlayReport
|
||||
Guard.Ensure(ulong.TryParse(titleId, NumberStyles.HexNumber, null, out _),
|
||||
$"Cannot use a non-hexadecimal string as the Title ID for a {nameof(GameSpec)}.");
|
||||
|
||||
_specs.Add(new GameSpec { TitleIds = [titleId] }.Apply(transform));
|
||||
return this;
|
||||
return AddSpec(GameSpec.Create(titleId).Apply(transform));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -63,8 +61,7 @@ namespace Ryujinx.Ava.Utilities.PlayReport
|
||||
Guard.Ensure(tids.All(x => ulong.TryParse(x, NumberStyles.HexNumber, null, out _)),
|
||||
$"Cannot use a non-hexadecimal string as the Title ID for a {nameof(GameSpec)}.");
|
||||
|
||||
_specs.Add(transform(new GameSpec { TitleIds = [..tids] }));
|
||||
return this;
|
||||
return AddSpec(transform(GameSpec.Create(tids)));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -79,7 +76,17 @@ namespace Ryujinx.Ava.Utilities.PlayReport
|
||||
Guard.Ensure(tids.All(x => ulong.TryParse(x, NumberStyles.HexNumber, null, out _)),
|
||||
$"Cannot use a non-hexadecimal string as the Title ID for a {nameof(GameSpec)}.");
|
||||
|
||||
_specs.Add(new GameSpec { TitleIds = [..tids] }.Apply(transform));
|
||||
return AddSpec(GameSpec.Create(tids).Apply(transform));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Add an analysis spec matching a specific game by title ID, with the provided pre-configured spec.
|
||||
/// </summary>
|
||||
/// <param name="spec">The <see cref="GameSpec"/> to add.</param>
|
||||
/// <returns>The current <see cref="Analyzer"/>, for chaining convenience.</returns>
|
||||
public Analyzer AddSpec(GameSpec spec)
|
||||
{
|
||||
_specs.Add(spec);
|
||||
return this;
|
||||
}
|
||||
|
||||
@@ -103,56 +110,12 @@ namespace Ryujinx.Ava.Utilities.PlayReport
|
||||
if (!_specs.TryGetFirst(s => runningGameId.EqualsAnyIgnoreCase(s.TitleIds), out GameSpec spec))
|
||||
return FormattedValue.Unhandled;
|
||||
|
||||
foreach (FormatterSpec formatSpec in spec.SimpleValueFormatters.OrderBy(x => x.Priority))
|
||||
foreach (FormatterSpecBase formatSpec in spec.ValueFormatters.OrderBy(x => x.Priority))
|
||||
{
|
||||
if (!playReport.ReportData.AsDictionary().TryGetValue(formatSpec.ReportKey, out MessagePackObject valuePackObject))
|
||||
if (!formatSpec.Format(appMeta, playReport, out FormattedValue value))
|
||||
continue;
|
||||
|
||||
return formatSpec.Formatter(new SingleValue(valuePackObject)
|
||||
{
|
||||
Application = appMeta,
|
||||
PlayReport = playReport
|
||||
});
|
||||
}
|
||||
|
||||
foreach (MultiFormatterSpec formatSpec in spec.MultiValueFormatters.OrderBy(x => x.Priority))
|
||||
{
|
||||
List<MessagePackObject> packedObjects = [];
|
||||
foreach (var reportKey in formatSpec.ReportKeys)
|
||||
{
|
||||
if (!playReport.ReportData.AsDictionary().TryGetValue(reportKey, out MessagePackObject valuePackObject))
|
||||
continue;
|
||||
|
||||
packedObjects.Add(valuePackObject);
|
||||
}
|
||||
|
||||
if (packedObjects.Count != formatSpec.ReportKeys.Length)
|
||||
return FormattedValue.Unhandled;
|
||||
|
||||
return formatSpec.Formatter(new MultiValue(packedObjects)
|
||||
{
|
||||
Application = appMeta,
|
||||
PlayReport = playReport
|
||||
});
|
||||
}
|
||||
|
||||
foreach (SparseMultiFormatterSpec formatSpec in spec.SparseMultiValueFormatters.OrderBy(x => x.Priority))
|
||||
{
|
||||
Dictionary<string, MessagePackObject> packedObjects = [];
|
||||
foreach (var reportKey in formatSpec.ReportKeys)
|
||||
{
|
||||
if (!playReport.ReportData.AsDictionary().TryGetValue(reportKey, out MessagePackObject valuePackObject))
|
||||
continue;
|
||||
|
||||
packedObjects.Add(reportKey, valuePackObject);
|
||||
}
|
||||
|
||||
return formatSpec.Formatter(
|
||||
new SparseMultiValue(packedObjects)
|
||||
{
|
||||
Application = appMeta,
|
||||
PlayReport = playReport
|
||||
});
|
||||
return value;
|
||||
}
|
||||
|
||||
return FormattedValue.Unhandled;
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
/// <br/>
|
||||
/// OR a signal to reset the value that the caller is using the <see cref="Analyzer"/> for.
|
||||
/// </summary>
|
||||
public delegate FormattedValue ValueFormatter(SingleValue value);
|
||||
public delegate FormattedValue SingleValueFormatter(SingleValue value);
|
||||
|
||||
/// <summary>
|
||||
/// The delegate type that powers multiple value formatters.<br/>
|
||||
|
||||
@@ -7,7 +7,7 @@ namespace Ryujinx.Ava.Utilities.PlayReport
|
||||
{
|
||||
public abstract class MatchedValue<T>
|
||||
{
|
||||
public MatchedValue(T matched)
|
||||
protected MatchedValue(T matched)
|
||||
{
|
||||
Matched = matched;
|
||||
}
|
||||
@@ -29,7 +29,7 @@ namespace Ryujinx.Ava.Utilities.PlayReport
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// The input data to a <see cref="ValueFormatter"/>,
|
||||
/// The input data to a <see cref="SingleValueFormatter"/>,
|
||||
/// containing the currently running application's <see cref="ApplicationMetadata"/>,
|
||||
/// and the matched <see cref="MessagePackObject"/> from the Play Report.
|
||||
/// </summary>
|
||||
@@ -38,8 +38,6 @@ namespace Ryujinx.Ava.Utilities.PlayReport
|
||||
public SingleValue(Value matched) : base(matched)
|
||||
{
|
||||
}
|
||||
|
||||
public static implicit operator SingleValue(MessagePackObject mpo) => new(mpo);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -56,9 +54,6 @@ namespace Ryujinx.Ava.Utilities.PlayReport
|
||||
public MultiValue(IEnumerable<MessagePackObject> matched) : base(Value.ConvertPackedObjects(matched))
|
||||
{
|
||||
}
|
||||
|
||||
public static implicit operator MultiValue(List<MessagePackObject> matched)
|
||||
=> new(matched.Select(x => new Value(x)).ToArray());
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -75,13 +70,5 @@ namespace Ryujinx.Ava.Utilities.PlayReport
|
||||
public SparseMultiValue(Dictionary<string, MessagePackObject> matched) : base(Value.ConvertPackedObjectMap(matched))
|
||||
{
|
||||
}
|
||||
|
||||
public static implicit operator SparseMultiValue(Dictionary<string, MessagePackObject> matched)
|
||||
=> new(matched
|
||||
.ToDictionary(
|
||||
x => x.Key,
|
||||
x => new Value(x.Value)
|
||||
)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
626
src/Ryujinx/Utilities/PlayReport/PlayReports.Formatters.cs
Normal file
626
src/Ryujinx/Utilities/PlayReport/PlayReports.Formatters.cs
Normal file
@@ -0,0 +1,626 @@
|
||||
using System;
|
||||
using System.Buffers.Binary;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
||||
namespace Ryujinx.Ava.Utilities.PlayReport
|
||||
{
|
||||
public partial class PlayReports
|
||||
{
|
||||
private static FormattedValue BreathOfTheWild_MasterMode(SingleValue value)
|
||||
=> value.Matched.BoxedValue is 1 ? "Playing Master Mode" : FormattedValue.ForceReset;
|
||||
|
||||
private static FormattedValue TearsOfTheKingdom_CurrentField(SingleValue value) =>
|
||||
value.Matched.DoubleValue switch
|
||||
{
|
||||
> 800d => "Exploring the Sky Islands",
|
||||
< -201d => "Exploring the Depths",
|
||||
_ => "Roaming Hyrule"
|
||||
};
|
||||
|
||||
private static FormattedValue SuperMarioOdyssey_AssistMode(SingleValue value)
|
||||
=> value.Matched.BoxedValue is 1 ? "Playing in Assist Mode" : "Playing in Regular Mode";
|
||||
|
||||
private static FormattedValue SuperMarioOdysseyChina_AssistMode(SingleValue value)
|
||||
=> value.Matched.BoxedValue is 1 ? "Playing in 帮助模式" : "Playing in 普通模式";
|
||||
|
||||
private static FormattedValue SuperMario3DWorldOrBowsersFury(SingleValue value)
|
||||
=> value.Matched.BoxedValue is 0 ? "Playing Super Mario 3D World" : "Playing Bowser's Fury";
|
||||
|
||||
private static FormattedValue MarioKart8Deluxe_Mode(SingleValue value)
|
||||
=> value.Matched.StringValue switch
|
||||
{
|
||||
// Single Player
|
||||
"Single" => "Single Player",
|
||||
// Multiplayer
|
||||
"Multi-2players" => "Multiplayer 2 Players",
|
||||
"Multi-3players" => "Multiplayer 3 Players",
|
||||
"Multi-4players" => "Multiplayer 4 Players",
|
||||
// Wireless/LAN Play
|
||||
"Local-Single" => "Wireless/LAN Play",
|
||||
"Local-2players" => "Wireless/LAN Play 2 Players",
|
||||
// CC Classes
|
||||
"50cc" => "50cc",
|
||||
"100cc" => "100cc",
|
||||
"150cc" => "150cc",
|
||||
"Mirror" => "Mirror (150cc)",
|
||||
"200cc" => "200cc",
|
||||
// Modes
|
||||
"GrandPrix" => "Grand Prix",
|
||||
"TimeAttack" => "Time Trials",
|
||||
"VS" => "VS Races",
|
||||
"Battle" => "Battle Mode",
|
||||
"RaceStart" => "Selecting a Course",
|
||||
"Race" => "Racing",
|
||||
_ => FormattedValue.ForceReset
|
||||
};
|
||||
|
||||
private static FormattedValue PokemonSVUnionCircle(SingleValue value)
|
||||
=> value.Matched.BoxedValue is 0 ? "Playing Alone" : "Playing in a group";
|
||||
|
||||
private static FormattedValue PokemonSVArea(SingleValue value)
|
||||
=> value.Matched.StringValue switch
|
||||
{
|
||||
// Base Game Locations
|
||||
"a_w01" => "South Area One",
|
||||
"a_w02" => "Mesagoza",
|
||||
"a_w03" => "The Pokemon League",
|
||||
"a_w04" => "South Area Two",
|
||||
"a_w05" => "South Area Four",
|
||||
"a_w06" => "South Area Six",
|
||||
"a_w07" => "South Area Five",
|
||||
"a_w08" => "South Area Three",
|
||||
"a_w09" => "West Area One",
|
||||
"a_w10" => "Asado Desert",
|
||||
"a_w11" => "West Area Two",
|
||||
"a_w12" => "Medali",
|
||||
"a_w13" => "Tagtree Thicket",
|
||||
"a_w14" => "East Area Three",
|
||||
"a_w15" => "Artazon",
|
||||
"a_w16" => "East Area Two",
|
||||
"a_w18" => "Casseroya Lake",
|
||||
"a_w19" => "Glaseado Mountain",
|
||||
"a_w20" => "North Area Three",
|
||||
"a_w21" => "North Area One",
|
||||
"a_w22" => "North Area Two",
|
||||
"a_w23" => "The Great Crater of Paldea",
|
||||
"a_w24" => "South Paldean Sea",
|
||||
"a_w25" => "West Paldean Sea",
|
||||
"a_w26" => "East Paldean Sea",
|
||||
"a_w27" => "Nouth Paldean Sea",
|
||||
//TODO DLC Locations
|
||||
_ => FormattedValue.ForceReset
|
||||
};
|
||||
|
||||
private static FormattedValue SuperSmashBrosUltimate_Mode(SparseMultiValue values)
|
||||
{
|
||||
// Check if the PlayReport is for a challenger approach or an achievement.
|
||||
if (values.Matched.TryGetValue("fighter", out Value fighter) && values.Matched.ContainsKey("reason"))
|
||||
{
|
||||
return $"Challenger Approaches - {SuperSmashBrosUltimate_Character(fighter)}";
|
||||
}
|
||||
|
||||
if (values.Matched.TryGetValue("fighter", out fighter) && values.Matched.ContainsKey("challenge_count"))
|
||||
{
|
||||
return $"Fighter Unlocked - {SuperSmashBrosUltimate_Character(fighter)}";
|
||||
}
|
||||
|
||||
if (values.Matched.TryGetValue("anniversary", out Value anniversary))
|
||||
{
|
||||
return $"Achievement Unlocked - ID: {anniversary}";
|
||||
}
|
||||
|
||||
if (values.Matched.ContainsKey("adv_slot"))
|
||||
{
|
||||
return
|
||||
"Playing Adventure Mode"; // Doing this as it can be a placeholder until we can grab the character.
|
||||
}
|
||||
|
||||
// Check if we have a match_mode at this point, if not, go to default.
|
||||
if (!values.Matched.TryGetValue("match_mode", out Value matchMode))
|
||||
{
|
||||
return "Smashing";
|
||||
}
|
||||
|
||||
return matchMode.BoxedValue switch
|
||||
{
|
||||
0 when values.Matched.TryGetValue("player_1_fighter", out Value player) &&
|
||||
values.Matched.TryGetValue("player_2_fighter", out Value challenger)
|
||||
=> $"Last Smashed: {SuperSmashBrosUltimate_Character(challenger)}'s Fighter Challenge - {SuperSmashBrosUltimate_Character(player)}",
|
||||
1 => $"Last Smashed: Normal Battle - {SuperSmashBrosUltimate_PlayerListing(values)}",
|
||||
2 when values.Matched.TryGetValue("player_1_rank", out Value team)
|
||||
=> team.BoxedValue is 0
|
||||
? "Last Smashed: Squad Strike - Red Team Wins"
|
||||
: "Last Smashed: Squad Strike - Blue Team Wins",
|
||||
3 => $"Last Smashed: Custom Smash - {SuperSmashBrosUltimate_PlayerListing(values)}",
|
||||
4 => $"Last Smashed: Super Sudden Death - {SuperSmashBrosUltimate_PlayerListing(values)}",
|
||||
5 => $"Last Smashed: Smashdown - {SuperSmashBrosUltimate_PlayerListing(values)}",
|
||||
6 => $"Last Smashed: Tourney Battle - {SuperSmashBrosUltimate_PlayerListing(values)}",
|
||||
7 when values.Matched.TryGetValue("player_1_fighter", out Value player)
|
||||
=> $"Last Smashed: Spirit Board Battle as {SuperSmashBrosUltimate_Character(player)}",
|
||||
8 when values.Matched.TryGetValue("player_1_fighter", out Value player)
|
||||
=> $"Playing Adventure Mode as {SuperSmashBrosUltimate_Character(player)}",
|
||||
10 when values.Matched.TryGetValue("match_submode", out Value battle) &&
|
||||
values.Matched.TryGetValue("player_1_fighter", out Value player)
|
||||
=> $"Last Smashed: Classic Mode, Battle {(int)battle.BoxedValue + 1}/8 as {SuperSmashBrosUltimate_Character(player)}",
|
||||
12 => $"Last Smashed: Century Smash - {SuperSmashBrosUltimate_PlayerListing(values)}",
|
||||
13 => $"Last Smashed: All-Star Smash - {SuperSmashBrosUltimate_PlayerListing(values)}",
|
||||
14 => $"Last Smashed: Cruel Smash - {SuperSmashBrosUltimate_PlayerListing(values)}",
|
||||
15 when values.Matched.TryGetValue("player_1_fighter", out Value player)
|
||||
=> $"Last Smashed: Home-Run Contest - {SuperSmashBrosUltimate_Character(player)}",
|
||||
16 when values.Matched.TryGetValue("player_1_fighter", out Value player1) &&
|
||||
values.Matched.TryGetValue("player_2_fighter", out Value player2)
|
||||
=> $"Last Smashed: Home-Run Content (Co-op) - {SuperSmashBrosUltimate_Character(player1)} and {SuperSmashBrosUltimate_Character(player2)}",
|
||||
17 => $"Last Smashed: Home-Run Contest (Versus) - {SuperSmashBrosUltimate_PlayerListing(values)}",
|
||||
18 when values.Matched.TryGetValue("player_1_fighter", out Value player1) &&
|
||||
values.Matched.TryGetValue("player_2_fighter", out Value player2)
|
||||
=> $"Fresh out of Training mode - {SuperSmashBrosUltimate_Character(player1)} with {SuperSmashBrosUltimate_Character(player2)}",
|
||||
58 => $"Last Smashed: LDN Battle - {SuperSmashBrosUltimate_PlayerListing(values)}",
|
||||
63 when values.Matched.TryGetValue("player_1_fighter", out Value player)
|
||||
=> $"Last Smashed: DLC Spirit Board Battle as {SuperSmashBrosUltimate_Character(player)}",
|
||||
_ => "Smashing"
|
||||
};
|
||||
}
|
||||
|
||||
private static string SuperSmashBrosUltimate_Character(Value value) =>
|
||||
BinaryPrimitives.ReverseEndianness(
|
||||
BitConverter.ToInt64(((MsgPack.MessagePackExtendedTypeObject)value.BoxedValue).GetBody(), 0)) switch
|
||||
{
|
||||
0x0 => "Mario",
|
||||
0x1 => "Donkey Kong",
|
||||
0x2 => "Link",
|
||||
0x3 => "Samus",
|
||||
0x4 => "Dark Samus",
|
||||
0x5 => "Yoshi",
|
||||
0x6 => "Kirby",
|
||||
0x7 => "Fox",
|
||||
0x8 => "Pikachu",
|
||||
0x9 => "Luigi",
|
||||
0xA => "Ness",
|
||||
0xB => "Captain Falcon",
|
||||
0xC => "Jigglypuff",
|
||||
0xD => "Peach",
|
||||
0xE => "Daisy",
|
||||
0xF => "Bowser",
|
||||
0x10 => "Ice Climbers",
|
||||
0x11 => "Sheik",
|
||||
0x12 => "Zelda",
|
||||
0x13 => "Dr. Mario",
|
||||
0x14 => "Pichu",
|
||||
0x15 => "Falco",
|
||||
0x16 => "Marth",
|
||||
0x17 => "Lucina",
|
||||
0x18 => "Young Link",
|
||||
0x19 => "Ganondorf",
|
||||
0x1A => "Mewtwo",
|
||||
0x1B => "Roy",
|
||||
0x1C => "Chrom",
|
||||
0x1D => "Mr Game & Watch",
|
||||
0x1E => "Meta Knight",
|
||||
0x1F => "Pit",
|
||||
0x20 => "Dark Pit",
|
||||
0x21 => "Zero Suit Samus",
|
||||
0x22 => "Wario",
|
||||
0x23 => "Snake",
|
||||
0x24 => "Ike",
|
||||
0x25 => "Pokémon Trainer",
|
||||
0x26 => "Diddy Kong",
|
||||
0x27 => "Lucas",
|
||||
0x28 => "Sonic",
|
||||
0x29 => "King Dedede",
|
||||
0x2A => "Olimar",
|
||||
0x2B => "Lucario",
|
||||
0x2C => "R.O.B.",
|
||||
0x2D => "Toon Link",
|
||||
0x2E => "Wolf",
|
||||
0x2F => "Villager",
|
||||
0x30 => "Mega Man",
|
||||
0x31 => "Wii Fit Trainer",
|
||||
0x32 => "Rosalina & Luma",
|
||||
0x33 => "Little Mac",
|
||||
0x34 => "Greninja",
|
||||
0x35 => "Palutena",
|
||||
0x36 => "Pac-Man",
|
||||
0x37 => "Robin",
|
||||
0x38 => "Shulk",
|
||||
0x39 => "Bowser Jr.",
|
||||
0x3A => "Duck Hunt",
|
||||
0x3B => "Ryu",
|
||||
0x3C => "Ken",
|
||||
0x3D => "Cloud",
|
||||
0x3E => "Corrin",
|
||||
0x3F => "Bayonetta",
|
||||
0x40 => "Richter",
|
||||
0x41 => "Inkling",
|
||||
0x42 => "Ridley",
|
||||
0x43 => "King K. Rool",
|
||||
0x44 => "Simon",
|
||||
0x45 => "Isabelle",
|
||||
0x46 => "Incineroar",
|
||||
0x47 => "Mii Brawler",
|
||||
0x48 => "Mii Swordfighter",
|
||||
0x49 => "Mii Gunner",
|
||||
0x4A => "Piranha Plant",
|
||||
0x4B => "Joker",
|
||||
0x4C => "Hero",
|
||||
0x4D => "Banjo",
|
||||
0x4E => "Terry",
|
||||
0x4F => "Byleth",
|
||||
0x50 => "Min Min",
|
||||
0x51 => "Steve",
|
||||
0x52 => "Sephiroth",
|
||||
0x53 => "Pyra/Mythra",
|
||||
0x54 => "Kazuya",
|
||||
0x55 => "Sora",
|
||||
0xFE => "Random",
|
||||
0xFF => "Scripted Entity",
|
||||
_ => "Unknown"
|
||||
};
|
||||
|
||||
private static string SuperSmashBrosUltimate_PlayerListing(SparseMultiValue values)
|
||||
{
|
||||
List<(string Character, int PlayerNumber, int? Rank)> players = [];
|
||||
|
||||
foreach (KeyValuePair<string, Value> player in values.Matched)
|
||||
{
|
||||
if (player.Key.StartsWith("player_") && player.Key.EndsWith("_fighter") &&
|
||||
player.Value.BoxedValue is not null)
|
||||
{
|
||||
if (!int.TryParse(player.Key.Split('_')[1], out int playerNumber))
|
||||
continue;
|
||||
|
||||
string character = SuperSmashBrosUltimate_Character(player.Value);
|
||||
int? rank = values.Matched.TryGetValue($"player_{playerNumber}_rank", out Value rankValue)
|
||||
? rankValue.IntValue
|
||||
: null;
|
||||
|
||||
players.Add((character, playerNumber, rank));
|
||||
}
|
||||
}
|
||||
|
||||
players = players.OrderBy(p => p.Rank ?? int.MaxValue).ToList();
|
||||
|
||||
return players.Count > 4
|
||||
? $"{players.Count} Players - " + string.Join(", ",
|
||||
players.Take(3).Select(p => $"{p.Character}({p.PlayerNumber}){RankMedal(p.Rank)}"))
|
||||
: string.Join(", ", players.Select(p => $"{p.Character}({p.PlayerNumber}){RankMedal(p.Rank)}"));
|
||||
|
||||
string RankMedal(int? rank) => rank switch
|
||||
{
|
||||
0 => "🥇",
|
||||
1 => "🥈",
|
||||
2 => "🥉",
|
||||
_ => ""
|
||||
};
|
||||
}
|
||||
|
||||
private static FormattedValue NsoEmulator_LaunchedGame(SingleValue value) => value.Matched.StringValue switch
|
||||
{
|
||||
#region SEGA Genesis
|
||||
|
||||
"m_0054_e" => Playing("Alien Soldier"),
|
||||
"m_3978_e" => Playing("Alien Storm"),
|
||||
"m_5234_e" => Playing("ALISIA DRAGOON"),
|
||||
"m_5003_e" => Playing("Streets of Rage 2"),
|
||||
"m_4843_e" => Playing("Kid Chameleon"),
|
||||
"m_2874_e" => Playing("Columns"),
|
||||
"m_3167_e" => Playing("Comix Zone"),
|
||||
"m_5007_e" => Playing("Contra: Hard Corps"),
|
||||
"m_0865_e" => Playing("Ghouls 'n Ghosts"),
|
||||
"m_0935_e" => Playing("Dynamite Headdy"),
|
||||
"m_8314_e" => Playing("Earthworm Jim"),
|
||||
"m_5012_e" => Playing("Ecco the Dolphin"),
|
||||
"m_2207_e" => Playing("Flicky"),
|
||||
"m_9432_e" => Playing("Golden Axe II"),
|
||||
"m_5015_e" => Playing("Golden Axe"),
|
||||
"m_5017_e" => Playing("Gunstar Heroes"),
|
||||
"m_0732_e" => Playing("Altered Beast"),
|
||||
"m_2245_e" or "m_2245_pd" or "m_2245_pf" => Playing("Landstalker"),
|
||||
"m_1654_e" => Playing("Target Earth"),
|
||||
"m_7050_e" => Playing("Light Crusader"),
|
||||
"m_5027_e" => Playing("M.U.S.H.A."),
|
||||
"m_5028_e" => Playing("Phantasy Star IV"),
|
||||
"m_9155_e" => Playing("Pulseman"),
|
||||
"m_5030_e" => Playing("Dr. Robotnik's Mean Bean Machine"),
|
||||
"m_0098_e" => Playing("Crusader of Centy"),
|
||||
"m_0098_k" => Playing("신창세기 라그나센티"),
|
||||
"m_0098_pd" or "m_0098_pf" or "m_0098_ps" => Playing("Soleil"),
|
||||
"m_5033_e" => Playing("Ristar"),
|
||||
"m_1987_e" => Playing("MEGA MAN: THE WILY WARS"),
|
||||
"m_2609_e" => Playing("WOLF OF THE BATTLEFIELD: MERCS"),
|
||||
"m_3353_e" => Playing("Shining Force II"),
|
||||
"m_5036_e" => Playing("Shining Force"),
|
||||
"m_9866_e" => Playing("Sonic The Hedgehog Spinball"),
|
||||
"m_5041_e" => Playing("Sonic The Hedgehog 2"),
|
||||
"m_5523_e" => Playing("Space Harrier II"),
|
||||
"m_0041_e" => Playing("STREET FIGHTER II' : SPECIAL CHAMPION EDITION"),
|
||||
"m_5044_e" => Playing("STRIDER"),
|
||||
"m_6353_e" => Playing("Super Fantasy Zone"),
|
||||
"m_9569_e" => Playing("Beyond Oasis"),
|
||||
"m_9569_k" => Playing("스토리 오브 도어"),
|
||||
"m_9569_pd" or "m_9569_ps" => Playing("The Story of Thor"),
|
||||
"m_9569_pf" => Playing("La Légende de Thor"),
|
||||
"m_5049_e" => Playing("Shinobi III: Return of the Ninja Master"),
|
||||
"m_6811_e" => Playing("The Revenge of Shinobi"),
|
||||
"m_4372_e" => Playing("Thunder Force II"),
|
||||
"m_1535_e" => Playing("ToeJam & Earl in Panic on Funkotron"),
|
||||
"m_0432_e" => Playing("ToeJam & Earl"),
|
||||
"m_5052_e" => Playing("Castlevania: BLOODLINES"),
|
||||
"m_3626_e" => Playing("VectorMan"),
|
||||
"m_7955_e" => Playing("Sword of Vermilion"),
|
||||
"m_0394_e" => Playing("Virtua Fighter 2"),
|
||||
"m_9417_e" => Playing("Zero Wing"),
|
||||
|
||||
#endregion
|
||||
|
||||
#region Nintendo 64
|
||||
|
||||
"n_1653_e" or "n_1653_p" => Playing("1080º ™ Snowboarding"),
|
||||
"n_4868_e" or "n_4868_p" => Playing("Banjo Kazooie™"),
|
||||
"n_1226_e" or "n_1226_p" => Playing("Banjo-Tooie™"),
|
||||
"n_3083_e" or "n_3083_p" => Playing("Blast Corps"),
|
||||
"n_3007_e" => Playing("Dr. Mario™ 64"),
|
||||
"n_4238_e" => Playing("Excitebike™ 64"),
|
||||
"n_1870_e" => Playing("Extreme G"),
|
||||
"n_2456_e" => Playing("F-Zero™ X"),
|
||||
"n_4631_e" => Playing("GoldenEye 007"),
|
||||
"n_1635_e" => Playing("Harvest Moon 64"),
|
||||
"n_2225_e" => Playing("Iggy’s Reckin’ Balls"),
|
||||
"n_1625_e" or "n_1625_p" => Playing("JET FORCE GEMINI™"),
|
||||
"n_3052_e" => Playing("Kirby 64™: The Crystal Shards"),
|
||||
"n_4371_e" => Playing("Mario Golf™"),
|
||||
"n_3013_e" => Playing("Mario Kart™ 64"),
|
||||
"n_1053_e" or "n_1053_p" => Playing("Mario Party™ 2"),
|
||||
"n_2965_e" or "n_2965_p" => Playing("Mario Party™ 3"),
|
||||
"n_4737_e" or "n_4737_p" => Playing("Mario Party™"),
|
||||
"n_3017_e" => Playing("Mario Tennis™"),
|
||||
"n_2992_e" or "n_2992_p" => Playing("Paper Mario™"),
|
||||
"n_3783_e" or "n_3783_p" => Playing("Pilotwings™ 64"),
|
||||
"n_1848_e" or "n_1848_pd" or "n_1848_pf" => Playing("Pokémon™ Puzzle League"),
|
||||
"n_3240_e" or "n_3240_pd" or "n_3240_pf" or "n_3240_pi" or "n_3240_ps" => Playing("Pokémon Snap™"),
|
||||
"n_4590_e" or "n_4590_pd" or "n_4590_pf" or "n_4590_pi" or "n_4590_ps" => Playing("Pokémon Stadium™"),
|
||||
"n_3309_e" or "n_3309_pd" or "n_3309_pf" or "n_3309_pi" or "n_3309_ps" => Playing("Pokémon Stadium 2™"),
|
||||
"n_3029_e" => Playing("Sin & Punishment™"),
|
||||
"n_3030_e" => Playing("Star Fox™ 64"),
|
||||
"n_3030_p" => Playing("Lylat Wars™"),
|
||||
"n_3031_e" or "n_3031_p" => Playing("Super Mario 64™"),
|
||||
"n_4813_e" or "n_4813_p" => Playing("Wave Race™ 64"),
|
||||
"n_3034_e" => Playing("WIN BACK: COVERT OPERATIONS"),
|
||||
"n_3034_p" => Playing("OPERATION: WIN BACK"),
|
||||
"n_3036_e" or "n_3036_p" => Playing("Yoshi's Story™"),
|
||||
"n_1407_e" or "n_1407_p" => Playing("The Legend of Zelda™: Majora's Mask™"),
|
||||
"n_3038_e" or "n_3038_p" => Playing("The Legend of Zelda™: Ocarina of Time™"),
|
||||
|
||||
#endregion
|
||||
|
||||
#region NES
|
||||
|
||||
"clv_p_naaae" => Playing("Super Mario Bros.™"),
|
||||
"clv_p_naabe" => Playing("Super Mario Bros.™: The Lost Levels"),
|
||||
"clv_p_naace" or "clv_p_naace_sp1" => Playing("Super Mario Bros.™ 3"),
|
||||
"clv_p_naade" => Playing("Super Mario Bros.™ 2"),
|
||||
"clv_p_naaee" => Playing("Donkey Kong™"),
|
||||
"clv_p_naafe" => Playing("Donkey Kong Jr.™"),
|
||||
"clv_p_naage" => Playing("Donkey Kong™ 3"),
|
||||
"clv_p_naahe" => Playing("Excitebike™"),
|
||||
"clv_p_naaje" => Playing("EarthBound Beginnings"),
|
||||
"clv_p_naame" => Playing("NES™ Open Tournament Golf"),
|
||||
"clv_p_naane" or "clv_p_naane_sp1" => Playing("The Legend of Zelda™"),
|
||||
"clv_p_naape" or "clv_p_naape_sp1" => Playing("Kirby's Adventure™"),
|
||||
"clv_p_naaqe" or "clv_p_naaqe_sp1" or "clv_p_naaqe_sp2" => Playing("Metroid™"),
|
||||
"clv_p_naare" => Playing("Balloon Fight™"),
|
||||
"clv_p_naase" or "clv_p_naase_sp1" => Playing("Zelda II - The Adventure of Link™"),
|
||||
"clv_p_naate" => Playing("Punch-Out!!™ Featuring Mr. Dream"),
|
||||
"clv_p_naaue" => Playing("Ice Climber™"),
|
||||
"clv_p_naave" or "clv_p_naave_sp1" => Playing("Kid Icarus™"),
|
||||
"clv_p_naawe" => Playing("Mario Bros.™"),
|
||||
"clv_p_naaxe" or "clv_p_naaxe_sp1" => Playing("Dr. Mario™"),
|
||||
"clv_p_naaye" => Playing("Yoshi™"),
|
||||
"clv_p_naaze" => Playing("StarTropics™"),
|
||||
"clv_p_nabce" or "clv_p_nabce_sp1" => Playing("Ghosts'n Goblins™"),
|
||||
"clv_p_nabre" or "clv_p_nabre_sp1" or "clv_p_nabre_sp2" => Playing("Gradius"),
|
||||
"clv_p_nacbe" or "clv_p_nacbe_sp1" => Playing("Ninja Gaiden"),
|
||||
"clv_p_nacce" => Playing("Solomon's Key"),
|
||||
"clv_p_nacde" => Playing("Tecmo Bowl"),
|
||||
"clv_p_nacfe" => Playing("Double Dragon"),
|
||||
"clv_p_nache" => Playing("Double Dragon II: The Revenge"),
|
||||
"clv_p_nacje" => Playing("River City Ransom"),
|
||||
"clv_p_nacke" => Playing("Super Dodge Ball"),
|
||||
"clv_p_nacle" => Playing("Downtown Nekketsu March Super-Awesome Field Day!"),
|
||||
"clv_p_nacpe" => Playing("The Mystery of Atlantis"),
|
||||
"clv_p_nacre" => Playing("Soccer"),
|
||||
"clv_p_nacse" or "clv_p_nacse_sp1" => Playing("Ninja JaJaMaru-kun"),
|
||||
"clv_p_nacte" => Playing("Ice Hockey"),
|
||||
"clv_p_nacue" or "clv_p_nacue_sp1" => Playing("Blaster Master"),
|
||||
"clv_p_nacwe" => Playing("ADVENTURES OF LOLO"),
|
||||
"clv_p_nacxe" => Playing("Wario's Woods™"),
|
||||
"clv_p_nacye" => Playing("Tennis"),
|
||||
"clv_p_nacze" => Playing("Wrecking Crew™"),
|
||||
"clv_p_nadbe" => Playing("Joy Mech Fight™"),
|
||||
"clv_p_nadde" or "clv_p_nadde_sp1" => Playing("Star Soldier"),
|
||||
"clv_p_nadke" => Playing("Tetris®"),
|
||||
"clv_p_nadle" => Playing("Pro Wrestling"),
|
||||
"clv_p_nadpe" => Playing("Baseball"),
|
||||
"clv_p_nadte" or "clv_p_nadte_sp1" => Playing("TwinBee"),
|
||||
"clv_p_nadue" or "clv_p_nadue_sp1" => Playing("Mighty Bomb Jack"),
|
||||
"clv_p_nadve" => Playing("Kung-Fu Heroes"),
|
||||
"clv_p_nadxe" => Playing("City Connection"),
|
||||
"clv_p_nadye" => Playing("Rygar"),
|
||||
"clv_p_naeae" => Playing("Crystalis"),
|
||||
"clv_p_naece" => Playing("Vice: Project Doom"),
|
||||
"clv_p_naehe" => Playing("Clu Clu Land™"),
|
||||
"clv_p_naeie" => Playing("VS. Excitebike™"),
|
||||
"clv_p_naeje" => Playing("Volleyball™"),
|
||||
"clv_p_naeke" => Playing("JOURNEY TO SILIUS"),
|
||||
"clv_p_naele" => Playing("S.C.A.T.: Special Cybernetic Attack Team"),
|
||||
"clv_p_naeme" => Playing("Shadow of the Ninja"),
|
||||
"clv_p_naene" => Playing("Nightshade"),
|
||||
"clv_p_naepe" => Playing("The Immortal"),
|
||||
"clv_p_naeqe" => Playing("Eliminator Boat Duel"),
|
||||
"clv_p_naere" => Playing("Fire 'n Ice"),
|
||||
"clv_p_nafce" => Playing("XEVIOUS"),
|
||||
"clv_p_nagpe" => Playing("DAIVA STORY 6 IMPERIAL OF NIRSARTIA"),
|
||||
"clv_p_nagqe" => Playing("DIG DUGⅡ"),
|
||||
"clv_p_nague" => Playing("MAPPY-LAND"),
|
||||
"clv_p_nahhe" => Playing("Mach Rider™"),
|
||||
"clv_p_nahje" => Playing("Pinball"),
|
||||
"clv_p_nahre" => Playing("Mystery Tower"),
|
||||
"clv_p_nahte" => Playing("Urban Champion™"),
|
||||
"clv_p_nahue" => Playing("Donkey Kong Jr.™ Math"),
|
||||
"clv_p_nahve" => Playing("The Mysterious Murasame Castle"),
|
||||
"clv_p_najae" => Playing("DEVIL WORLD™"),
|
||||
"clv_p_najbe" => Playing("Golf"),
|
||||
"clv_p_najpe" => Playing("R.C. PRO-AM™"),
|
||||
"clv_p_najre" => Playing("COBRA TRIANGLE™"),
|
||||
"clv_p_najse" => Playing("SNAKE RATTLE N ROLL™"),
|
||||
"clv_p_najte" => Playing("SOLAR® JETMAN"),
|
||||
|
||||
#endregion
|
||||
|
||||
#region SNES
|
||||
|
||||
"s_2180_e" => Playing("BATTLETOADS™ DOUBLE DRAGON™"),
|
||||
"s_2179_e" => Playing("BATTLETOADS™ IN BATTLEMANIACS"),
|
||||
"s_2182_e" => Playing("BIG RUN"),
|
||||
"s_2156_e" => Playing("Bombuzal"),
|
||||
"s_2002_e" => Playing("BRAWL BROTHERS"),
|
||||
"s_2025_e" => Playing("Breath of Fire II"),
|
||||
"s_2003_e" => Playing("Breath Of Fire"),
|
||||
"s_2163_e" => Playing("Claymates"),
|
||||
"s_2150_e" => Playing("Congo's Caper"),
|
||||
"s_2171_e" => Playing("COSMO GANG THE PUZZLE"),
|
||||
"s_2004_e" => Playing("Demon's Crest"),
|
||||
"s_2026_e" => Playing("Kunio-kun no Dodgeball da yo Zen'in Shūgō!"),
|
||||
"s_2060_e" => Playing("Donkey Kong Country 2: Diddy's Kong Quest"),
|
||||
"s_2061_e" => Playing("Donkey Kong Country 3: Dixie Kong's Double Trouble!"),
|
||||
"s_2055_e" => Playing("Donkey Kong Country"),
|
||||
"s_2139_e" => Playing("DOOMSDAY WARRIOR"),
|
||||
"s_2051_e" => Playing("EarthBound"),
|
||||
"s_2162_e" => Playing("Earthworm Jim™ 2"),
|
||||
"s_2005_e" => Playing("F-ZERO™"),
|
||||
"s_2183_e" => Playing("FATAL FURY 2"),
|
||||
"s_2174_e" => Playing("Fighter's History"),
|
||||
"s_2037_e" => Playing("Harvest Moon"),
|
||||
"s_2161_e" => Playing("Jelly Boy"),
|
||||
"s_2006_e" => Playing("Joe & Mac 2: Lost in the Tropics"),
|
||||
"s_2169_e" => Playing("Caveman Ninja"),
|
||||
"s_2181_e" => Playing("KILLER INSTINCT™"),
|
||||
"s_2029_e" or "s_2029_e_sp1" => Playing("Kirby Super Star™"),
|
||||
"s_2121_e" => Playing("Kirby's Avalanche™"),
|
||||
"s_2007_e" or "s_2007_e_sp1" => Playing("Kirby's Dream Course™"),
|
||||
"s_2008_e" or "s_2008_e_sp1" => Playing("Kirby's Dream Land™ 3"),
|
||||
"s_2172_e" => Playing("Kirby’s Star Stacker™"),
|
||||
"s_2151_e" => Playing("Magical Drop2"),
|
||||
"s_2044_e" => Playing("Mario's Super Picross"),
|
||||
"s_2038_e" => Playing("Natsume Championship Wrestling"),
|
||||
"s_2140_e" => Playing("Operation Logic Bomb"),
|
||||
"s_2034_e" => Playing("Panel de Pon"),
|
||||
"s_2009_e" => Playing("Pilotwings™"),
|
||||
"s_2010_e" => Playing("Pop'n TwinBee"),
|
||||
"s_2157_e" => Playing("Prehistorik Man"),
|
||||
"s_2145_e" => Playing("Psycho Dream"),
|
||||
"s_2141_e" => Playing("Rival Turf!"),
|
||||
"s_2152_e" => Playing("SIDE POCKET"),
|
||||
"s_2158_e" => Playing("Spanky’s™ Quest"),
|
||||
"s_2031_e" => Playing("Star Fox™ 2"),
|
||||
"s_2011_e" => Playing("Star Fox™"),
|
||||
"s_2012_e" => Playing("Stunt Race FX™"),
|
||||
"s_2032_e" => Playing("Amazing Hebereke"),
|
||||
"s_2159_e" => Playing("Super Baseball Simulator 1.000"),
|
||||
"s_2013_e" => Playing("SUPER E.D.F. EARTH DEFENSE FORCE"),
|
||||
"s_2014_e" => Playing("Smash Tennis"),
|
||||
"s_2015_e" => Playing("Super Ghouls'n Ghosts™"),
|
||||
"s_2033_e" => Playing("Super Mario All-Stars™"),
|
||||
"s_2016_e" or "s_2016_e_sp1" => Playing("Super Mario Kart™"),
|
||||
"s_2017_e" or "s_2017_e_sp1" => Playing("Super Mario World™"),
|
||||
"s_2018_e" or "s_2018_e_sp1" => Playing("Super Metroid™"),
|
||||
"s_2184_e" => Playing("Super Ninja Boy"),
|
||||
"s_2019_e" or "s_2019_e_sp1" => Playing("Super Punch-Out!!™"),
|
||||
"s_2020_e" => Playing("Super Puyo Puyo 2"),
|
||||
"s_2133_e" => Playing("SUPER R-TYPE"),
|
||||
"s_2021_e" => Playing("Super Soccer"),
|
||||
"s_2022_e" => Playing("Super Tennis"),
|
||||
"s_2136_e" => Playing("Sutte Hakkun"),
|
||||
"s_2142_e" => Playing("The Ignition Factor"),
|
||||
"s_2143_e" => Playing("The Peace Keepers"),
|
||||
"s_2146_e" => Playing("Tuff E Nuff"),
|
||||
"s_2144_e" => Playing("SUPER VALIS Ⅳ"),
|
||||
"s_2049_e" => Playing("Wild Guns"),
|
||||
"s_2096_e" => Playing("Wrecking Crew™ '98"),
|
||||
"s_2023_e" => Playing("Super Mario World™ 2: Yoshi's Island™"),
|
||||
"s_2024_e" => Playing("The Legend of Zelda™: A Link to the Past™"),
|
||||
|
||||
#endregion
|
||||
|
||||
#region GameBoy
|
||||
|
||||
"c_7224_e" or "c_7224_p" => Playing("Alone in the Dark: The New Nightmare"),
|
||||
"c_5022_e" => Playing("Blaster Master: Enemy Below"),
|
||||
"c_3381_e" => Playing("Game & Watch™ Gallery 3"),
|
||||
"c_0282_e" => Playing("Kirby Tilt ‘n’ Tumble™"),
|
||||
"c_4471_e" or "c_4471_p" => Playing("Mario Golf™"),
|
||||
"c_9947_e" => Playing("Mario Tennis™"),
|
||||
"c_3191_e" or "c_3191_p" or "c_3191_x" => Playing("Pokémon™ Trading Card Game"),
|
||||
"c_8914_e" or "c_8914_p" => Playing("Quest for Camelot™"),
|
||||
"c_2648_e" => Playing("Tetris® DX"),
|
||||
"c_5928_e" => Playing("Wario Land™ 3"),
|
||||
"c_3996_e" or "c_3996_pd" or "c_3996_pf" => Playing("The Legend of Zelda™: Link's Awakening DX™"),
|
||||
"c_8852_e" or "c_8852_p" => Playing("The Legend of Zelda™: Oracle of Ages™"),
|
||||
"c_9130_e" or "c_9130_p" => Playing("The Legend of Zelda™: Oracle of Seasons™"),
|
||||
"d_6879_e" => Playing("Alleyway™"),
|
||||
"d_7618_e" => Playing("Baseball"),
|
||||
"d_6005_e" => Playing("BurgerTime Deluxe"),
|
||||
"d_7120_e" => Playing("Castlevania Legends"),
|
||||
"d_2744_e" => Playing("Dr. Mario™"),
|
||||
"d_1593_e" => Playing("Donkey Kong Land 2™"),
|
||||
"d_7216_e" => Playing("Donkey Kong Land III™"),
|
||||
"d_4971_e" => Playing("Donkey Kong Land™"),
|
||||
"d_7984_e" => Playing("GARGOYLE'S QUEST"),
|
||||
"d_8212_e" => Playing("Kirby's Dream Land™ 2"),
|
||||
"d_5661_e" => Playing("Kirby's Dream Land™"),
|
||||
"d_3837_e" => Playing("MEGA MAN II"),
|
||||
"d_1965_e" => Playing("MEGA MAN III"),
|
||||
"d_0194_e" => Playing("MEGA MAN IV"),
|
||||
"d_1425_e" => Playing("MEGA MAN V"),
|
||||
"d_9324_e" => Playing("MEGA MAN: DR. WILY'S REVENGE"),
|
||||
"d_1577_e" => Playing("Metroid™ II - Return of Samus™"),
|
||||
"d_5124_e" => Playing("Super Mario Land™ 2 - 6 Golden Coins™"),
|
||||
"d_7970_e" => Playing("Super Mario Land™"),
|
||||
"d_8484_e" => Playing("Tetris®"),
|
||||
|
||||
#endregion
|
||||
|
||||
#region GameBoy Advance
|
||||
|
||||
"a_9694_e" => Playing("Densetsu no Starfy 1"),
|
||||
"a_5600_e" => Playing("Densetsu no Starfy 2"),
|
||||
"a_7565_e" => Playing("Densetsu no Starfy 3"),
|
||||
"a_6553_e" => Playing("F-ZERO CLIMAX"),
|
||||
"a_7842_e" or "a_7842_p" => Playing("F-Zero™- GP Legend"),
|
||||
"a_9283_e" => Playing("F-Zero™ Maximum Velocity"),
|
||||
"a_3744_e" or "a_3744_x" or "a_3744_y" => Playing("Fire Emblem™"),
|
||||
"a_8978_d" or "a_8978_e" or "a_8978_f" or "a_8978_i" or "a_8978_s" => Playing("Golden Sun™: The Lost Age"),
|
||||
"a_3108_d" or "a_3108_e" or "a_3108_f" or "a_3108_i" or "a_3108_s" => Playing("Golden Sun™"),
|
||||
"a_3654_e" or "a_3654_p" => Playing("Kirby™ & The Amazing Mirror"),
|
||||
"a_7279_p" => Playing("Kuru Kuru Kururin™"),
|
||||
"a_7311_e" or "a_7311_p" => Playing("Mario & Luigi™: Superstar Saga"),
|
||||
"a_6845_e" => Playing("Mario Kart™: Super Circuit™"),
|
||||
"a_4139_e" or "a_4139_p" => Playing("Metroid™ Fusion"),
|
||||
"a_6834_e" or "a_6834_p" => Playing("Metroid™: Zero Mission"),
|
||||
"a_8989_e" or "a_8989_p" => Playing("Pokémon™ Mystery Dungeon: Red Rescue Team"),
|
||||
"a_9444_e" => Playing("Super Mario™ Advance"),
|
||||
"a_9901_e" or "a_9901_p" => Playing("Super Mario™ Advance 4: Super Mario Bros.™ 3"),
|
||||
"a_2939_e" => Playing("Super Mario World™: Super Mario Advance 2"),
|
||||
"a_2939_p" => Playing("Super Mario World™: Super Mario Advance 2™"),
|
||||
"a_1302_e" => Playing("WarioWare™, Inc.: Mega Microgame$!"),
|
||||
"a_1302_p" => Playing("WarioWare™, Inc.: Minigame Mania."),
|
||||
"a_6960_e" or "a_6960_p" => Playing("Yoshi's Island™: Super Mario™ Advance 3"),
|
||||
"a_5190_e" or "a_5190_p" => Playing("The Legend of Zelda™: A Link to the Past™ Four Swords"),
|
||||
"a_8665_e" or "a_8665_p" => Playing("The Legend of Zelda™: The Minish Cap"),
|
||||
|
||||
#endregion
|
||||
|
||||
_ => FormattedValue.ForceReset
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,11 @@
|
||||
namespace Ryujinx.Ava.Utilities.PlayReport
|
||||
using System;
|
||||
using System.Buffers.Binary;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
||||
namespace Ryujinx.Ava.Utilities.PlayReport
|
||||
{
|
||||
public static class PlayReports
|
||||
public static partial class PlayReports
|
||||
{
|
||||
public static Analyzer Analyzer { get; } = new Analyzer()
|
||||
.AddSpec(
|
||||
@@ -37,91 +42,32 @@
|
||||
spec => spec
|
||||
.AddValueFormatter("area_no", PokemonSVArea)
|
||||
.AddValueFormatter("team_circle", PokemonSVUnionCircle)
|
||||
)
|
||||
.AddSpec(
|
||||
"01006a800016e000",
|
||||
spec => spec
|
||||
.AddSparseMultiValueFormatter(
|
||||
[
|
||||
// Metadata to figure out what PlayReport we have.
|
||||
"match_mode", "match_submode", "anniversary", "fighter", "reason", "challenge_count",
|
||||
"adv_slot",
|
||||
// List of Fighters
|
||||
"player_1_fighter", "player_2_fighter", "player_3_fighter", "player_4_fighter",
|
||||
"player_5_fighter", "player_6_fighter", "player_7_fighter", "player_8_fighter",
|
||||
// List of rankings/placements
|
||||
"player_1_rank", "player_2_rank", "player_3_rank", "player_4_rank", "player_5_rank",
|
||||
"player_6_rank", "player_7_rank", "player_8_rank"
|
||||
],
|
||||
SuperSmashBrosUltimate_Mode
|
||||
)
|
||||
)
|
||||
.AddSpec(
|
||||
[
|
||||
"0100c9a00ece6000", "01008d300c50c000", "0100d870045b6000",
|
||||
"010012f017576000", "0100c62011050000", "0100b3c014bda000"],
|
||||
spec => spec.AddValueFormatter("launch_title_id", NsoEmulator_LaunchedGame)
|
||||
);
|
||||
|
||||
private static FormattedValue BreathOfTheWild_MasterMode(SingleValue value)
|
||||
=> value.Matched.BoxedValue is 1 ? "Playing Master Mode" : FormattedValue.ForceReset;
|
||||
|
||||
private static FormattedValue TearsOfTheKingdom_CurrentField(SingleValue value) =>
|
||||
value.Matched.DoubleValue switch
|
||||
{
|
||||
> 800d => "Exploring the Sky Islands",
|
||||
< -201d => "Exploring the Depths",
|
||||
_ => "Roaming Hyrule"
|
||||
};
|
||||
|
||||
private static FormattedValue SuperMarioOdyssey_AssistMode(SingleValue value)
|
||||
=> value.Matched.BoxedValue is 1 ? "Playing in Assist Mode" : "Playing in Regular Mode";
|
||||
|
||||
private static FormattedValue SuperMarioOdysseyChina_AssistMode(SingleValue value)
|
||||
=> value.Matched.BoxedValue is 1 ? "Playing in 帮助模式" : "Playing in 普通模式";
|
||||
|
||||
private static FormattedValue SuperMario3DWorldOrBowsersFury(SingleValue value)
|
||||
=> value.Matched.BoxedValue is 0 ? "Playing Super Mario 3D World" : "Playing Bowser's Fury";
|
||||
|
||||
private static FormattedValue MarioKart8Deluxe_Mode(SingleValue value)
|
||||
=> value.Matched.StringValue switch
|
||||
{
|
||||
// Single Player
|
||||
"Single" => "Single Player",
|
||||
// Multiplayer
|
||||
"Multi-2players" => "Multiplayer 2 Players",
|
||||
"Multi-3players" => "Multiplayer 3 Players",
|
||||
"Multi-4players" => "Multiplayer 4 Players",
|
||||
// Wireless/LAN Play
|
||||
"Local-Single" => "Wireless/LAN Play",
|
||||
"Local-2players" => "Wireless/LAN Play 2 Players",
|
||||
// CC Classes
|
||||
"50cc" => "50cc",
|
||||
"100cc" => "100cc",
|
||||
"150cc" => "150cc",
|
||||
"Mirror" => "Mirror (150cc)",
|
||||
"200cc" => "200cc",
|
||||
// Modes
|
||||
"GrandPrix" => "Grand Prix",
|
||||
"TimeAttack" => "Time Trials",
|
||||
"VS" => "VS Races",
|
||||
"Battle" => "Battle Mode",
|
||||
"RaceStart" => "Selecting a Course",
|
||||
"Race" => "Racing",
|
||||
_ => FormattedValue.ForceReset
|
||||
};
|
||||
|
||||
private static FormattedValue PokemonSVUnionCircle(SingleValue value)
|
||||
=> value.Matched.BoxedValue is 0 ? "Playing Alone" : "Playing in a group";
|
||||
|
||||
private static FormattedValue PokemonSVArea(SingleValue value)
|
||||
=> value.Matched.StringValue switch
|
||||
{
|
||||
// Base Game Locations
|
||||
"a_w01" => "South Area One",
|
||||
"a_w02" => "Mesagoza",
|
||||
"a_w03" => "The Pokemon League",
|
||||
"a_w04" => "South Area Two",
|
||||
"a_w05" => "South Area Four",
|
||||
"a_w06" => "South Area Six",
|
||||
"a_w07" => "South Area Five",
|
||||
"a_w08" => "South Area Three",
|
||||
"a_w09" => "West Area One",
|
||||
"a_w10" => "Asado Desert",
|
||||
"a_w11" => "West Area Two",
|
||||
"a_w12" => "Medali",
|
||||
"a_w13" => "Tagtree Thicket",
|
||||
"a_w14" => "East Area Three",
|
||||
"a_w15" => "Artazon",
|
||||
"a_w16" => "East Area Two",
|
||||
"a_w18" => "Casseroya Lake",
|
||||
"a_w19" => "Glaseado Mountain",
|
||||
"a_w20" => "North Area Three",
|
||||
"a_w21" => "North Area One",
|
||||
"a_w22" => "North Area Two",
|
||||
"a_w23" => "The Great Crater of Paldea",
|
||||
"a_w24" => "South Paldean Sea",
|
||||
"a_w25" => "West Paldean Sea",
|
||||
"a_w26" => "East Paldean Sea",
|
||||
"a_w27" => "Nouth Paldean Sea",
|
||||
//TODO DLC Locations
|
||||
_ => FormattedValue.ForceReset
|
||||
};
|
||||
private static string Playing(string game) => $"Playing {game}";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
using FluentAvalonia.Core;
|
||||
using MsgPack;
|
||||
using Ryujinx.Ava.Utilities.AppLibrary;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
||||
@@ -11,10 +14,17 @@ namespace Ryujinx.Ava.Utilities.PlayReport
|
||||
/// </summary>
|
||||
public class GameSpec
|
||||
{
|
||||
public static GameSpec Create(string requiredTitleId, params IEnumerable<string> otherTitleIds)
|
||||
=> new() { TitleIds = otherTitleIds.Prepend(requiredTitleId).ToArray() };
|
||||
|
||||
public static GameSpec Create(IEnumerable<string> titleIds)
|
||||
=> new() { TitleIds = titleIds.ToArray() };
|
||||
|
||||
private int _lastPriority;
|
||||
|
||||
public required string[] TitleIds { get; init; }
|
||||
public List<FormatterSpec> SimpleValueFormatters { get; } = [];
|
||||
public List<MultiFormatterSpec> MultiValueFormatters { get; } = [];
|
||||
public List<SparseMultiFormatterSpec> SparseMultiValueFormatters { get; } = [];
|
||||
|
||||
public List<FormatterSpecBase> ValueFormatters { get; } = [];
|
||||
|
||||
|
||||
/// <summary>
|
||||
@@ -24,8 +34,10 @@ namespace Ryujinx.Ava.Utilities.PlayReport
|
||||
/// <param name="reportKey">The key name to match.</param>
|
||||
/// <param name="valueFormatter">The function which can return a potential formatted value.</param>
|
||||
/// <returns>The current <see cref="GameSpec"/>, for chaining convenience.</returns>
|
||||
public GameSpec AddValueFormatter(string reportKey, ValueFormatter valueFormatter)
|
||||
=> AddValueFormatter(SimpleValueFormatters.Count, reportKey, valueFormatter);
|
||||
public GameSpec AddValueFormatter(
|
||||
string reportKey,
|
||||
SingleValueFormatter valueFormatter
|
||||
) => AddValueFormatter(_lastPriority++, reportKey, valueFormatter);
|
||||
|
||||
/// <summary>
|
||||
/// Add a value formatter at a specific priority to the current <see cref="GameSpec"/>
|
||||
@@ -35,15 +47,14 @@ namespace Ryujinx.Ava.Utilities.PlayReport
|
||||
/// <param name="reportKey">The key name to match.</param>
|
||||
/// <param name="valueFormatter">The function which can return a potential formatted value.</param>
|
||||
/// <returns>The current <see cref="GameSpec"/>, for chaining convenience.</returns>
|
||||
public GameSpec AddValueFormatter(int priority, string reportKey,
|
||||
ValueFormatter valueFormatter)
|
||||
public GameSpec AddValueFormatter(
|
||||
int priority,
|
||||
string reportKey,
|
||||
SingleValueFormatter valueFormatter
|
||||
) => AddValueFormatter(new FormatterSpec
|
||||
{
|
||||
SimpleValueFormatters.Add(new FormatterSpec
|
||||
{
|
||||
Priority = priority, ReportKey = reportKey, Formatter = valueFormatter
|
||||
});
|
||||
return this;
|
||||
}
|
||||
Priority = priority, ReportKeys = [reportKey], Formatter = valueFormatter
|
||||
});
|
||||
|
||||
/// <summary>
|
||||
/// Add a multi-value formatter to the current <see cref="GameSpec"/>
|
||||
@@ -52,8 +63,10 @@ namespace Ryujinx.Ava.Utilities.PlayReport
|
||||
/// <param name="reportKeys">The key names to match.</param>
|
||||
/// <param name="valueFormatter">The function which can format the values.</param>
|
||||
/// <returns>The current <see cref="GameSpec"/>, for chaining convenience.</returns>
|
||||
public GameSpec AddMultiValueFormatter(string[] reportKeys, MultiValueFormatter valueFormatter)
|
||||
=> AddMultiValueFormatter(MultiValueFormatters.Count, reportKeys, valueFormatter);
|
||||
public GameSpec AddMultiValueFormatter(
|
||||
string[] reportKeys,
|
||||
MultiValueFormatter valueFormatter
|
||||
) => AddMultiValueFormatter(_lastPriority++, reportKeys, valueFormatter);
|
||||
|
||||
/// <summary>
|
||||
/// Add a multi-value formatter at a specific priority to the current <see cref="GameSpec"/>
|
||||
@@ -63,15 +76,14 @@ namespace Ryujinx.Ava.Utilities.PlayReport
|
||||
/// <param name="reportKeys">The key names to match.</param>
|
||||
/// <param name="valueFormatter">The function which can format the values.</param>
|
||||
/// <returns>The current <see cref="GameSpec"/>, for chaining convenience.</returns>
|
||||
public GameSpec AddMultiValueFormatter(int priority, string[] reportKeys,
|
||||
MultiValueFormatter valueFormatter)
|
||||
public GameSpec AddMultiValueFormatter(
|
||||
int priority,
|
||||
string[] reportKeys,
|
||||
MultiValueFormatter valueFormatter
|
||||
) => AddValueFormatter(new MultiFormatterSpec
|
||||
{
|
||||
MultiValueFormatters.Add(new MultiFormatterSpec
|
||||
{
|
||||
Priority = priority, ReportKeys = reportKeys, Formatter = valueFormatter
|
||||
});
|
||||
return this;
|
||||
}
|
||||
Priority = priority, ReportKeys = reportKeys, Formatter = valueFormatter
|
||||
});
|
||||
|
||||
/// <summary>
|
||||
/// Add a multi-value formatter to the current <see cref="GameSpec"/>
|
||||
@@ -83,8 +95,10 @@ namespace Ryujinx.Ava.Utilities.PlayReport
|
||||
/// <param name="reportKeys">The key names to match.</param>
|
||||
/// <param name="valueFormatter">The function which can format the values.</param>
|
||||
/// <returns>The current <see cref="GameSpec"/>, for chaining convenience.</returns>
|
||||
public GameSpec AddSparseMultiValueFormatter(string[] reportKeys, SparseMultiValueFormatter valueFormatter)
|
||||
=> AddSparseMultiValueFormatter(SparseMultiValueFormatters.Count, reportKeys, valueFormatter);
|
||||
public GameSpec AddSparseMultiValueFormatter(
|
||||
string[] reportKeys,
|
||||
SparseMultiValueFormatter valueFormatter
|
||||
) => AddSparseMultiValueFormatter(_lastPriority++, reportKeys, valueFormatter);
|
||||
|
||||
/// <summary>
|
||||
/// Add a multi-value formatter at a specific priority to the current <see cref="GameSpec"/>
|
||||
@@ -97,13 +111,18 @@ namespace Ryujinx.Ava.Utilities.PlayReport
|
||||
/// <param name="reportKeys">The key names to match.</param>
|
||||
/// <param name="valueFormatter">The function which can format the values.</param>
|
||||
/// <returns>The current <see cref="GameSpec"/>, for chaining convenience.</returns>
|
||||
public GameSpec AddSparseMultiValueFormatter(int priority, string[] reportKeys,
|
||||
SparseMultiValueFormatter valueFormatter)
|
||||
public GameSpec AddSparseMultiValueFormatter(
|
||||
int priority,
|
||||
string[] reportKeys,
|
||||
SparseMultiValueFormatter valueFormatter
|
||||
) => AddValueFormatter(new SparseMultiFormatterSpec
|
||||
{
|
||||
SparseMultiValueFormatters.Add(new SparseMultiFormatterSpec
|
||||
{
|
||||
Priority = priority, ReportKeys = reportKeys, Formatter = valueFormatter
|
||||
});
|
||||
Priority = priority, ReportKeys = reportKeys, Formatter = valueFormatter
|
||||
});
|
||||
|
||||
private GameSpec AddValueFormatter<T>(T formatterSpec) where T : FormatterSpecBase
|
||||
{
|
||||
ValueFormatters.Add(formatterSpec);
|
||||
return this;
|
||||
}
|
||||
}
|
||||
@@ -111,30 +130,107 @@ namespace Ryujinx.Ava.Utilities.PlayReport
|
||||
/// <summary>
|
||||
/// A struct containing the data for a mapping of a key in a Play Report to a formatter for its potential value.
|
||||
/// </summary>
|
||||
public struct FormatterSpec
|
||||
public class FormatterSpec : FormatterSpecBase
|
||||
{
|
||||
public required int Priority { get; init; }
|
||||
public required string ReportKey { get; init; }
|
||||
public ValueFormatter Formatter { get; init; }
|
||||
public override bool GetData(Horizon.Prepo.Types.PlayReport playReport, out object result)
|
||||
{
|
||||
if (!playReport.ReportData.AsDictionary().TryGetValue(ReportKeys[0], out MessagePackObject valuePackObject))
|
||||
{
|
||||
result = null;
|
||||
return false;
|
||||
}
|
||||
|
||||
result = valuePackObject;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// A struct containing the data for a mapping of an arbitrary key set in a Play Report to a formatter for their potential values.
|
||||
/// </summary>
|
||||
public struct MultiFormatterSpec
|
||||
public class MultiFormatterSpec : FormatterSpecBase
|
||||
{
|
||||
public required int Priority { get; init; }
|
||||
public required string[] ReportKeys { get; init; }
|
||||
public MultiValueFormatter Formatter { get; init; }
|
||||
public override bool GetData(Horizon.Prepo.Types.PlayReport playReport, out object result)
|
||||
{
|
||||
List<MessagePackObject> packedObjects = [];
|
||||
foreach (var reportKey in ReportKeys)
|
||||
{
|
||||
if (!playReport.ReportData.AsDictionary().TryGetValue(reportKey, out MessagePackObject valuePackObject))
|
||||
{
|
||||
result = null;
|
||||
return false;
|
||||
}
|
||||
|
||||
packedObjects.Add(valuePackObject);
|
||||
}
|
||||
|
||||
result = packedObjects;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// A struct containing the data for a mapping of an arbitrary key set in a Play Report to a formatter for their sparsely populated potential values.
|
||||
/// </summary>
|
||||
public struct SparseMultiFormatterSpec
|
||||
public class SparseMultiFormatterSpec : FormatterSpecBase
|
||||
{
|
||||
public required int Priority { get; init; }
|
||||
public required string[] ReportKeys { get; init; }
|
||||
public SparseMultiValueFormatter Formatter { get; init; }
|
||||
public override bool GetData(Horizon.Prepo.Types.PlayReport playReport, out object result)
|
||||
{
|
||||
Dictionary<string, MessagePackObject> packedObjects = [];
|
||||
foreach (var reportKey in ReportKeys)
|
||||
{
|
||||
if (!playReport.ReportData.AsDictionary().TryGetValue(reportKey, out MessagePackObject valuePackObject))
|
||||
continue;
|
||||
|
||||
packedObjects.Add(reportKey, valuePackObject);
|
||||
}
|
||||
|
||||
result = packedObjects;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
public abstract class FormatterSpecBase
|
||||
{
|
||||
public abstract bool GetData(Horizon.Prepo.Types.PlayReport playReport, out object data);
|
||||
|
||||
public int Priority { get; init; }
|
||||
public string[] ReportKeys { get; init; }
|
||||
public Delegate Formatter { get; init; }
|
||||
|
||||
public bool Format(ApplicationMetadata appMeta, Horizon.Prepo.Types.PlayReport playReport,
|
||||
out FormattedValue formattedValue)
|
||||
{
|
||||
formattedValue = default;
|
||||
if (!GetData(playReport, out object data))
|
||||
return false;
|
||||
|
||||
if (data is FormattedValue fv)
|
||||
{
|
||||
formattedValue = fv;
|
||||
return true;
|
||||
}
|
||||
|
||||
switch (Formatter)
|
||||
{
|
||||
case SingleValueFormatter svf when data is MessagePackObject match:
|
||||
formattedValue = svf(
|
||||
new SingleValue(match) { Application = appMeta, PlayReport = playReport }
|
||||
);
|
||||
return true;
|
||||
case MultiValueFormatter mvf when data is List<MessagePackObject> matches:
|
||||
formattedValue = mvf(
|
||||
new MultiValue(matches) { Application = appMeta, PlayReport = playReport }
|
||||
);
|
||||
return true;
|
||||
case SparseMultiValueFormatter smvf when data is Dictionary<string, MessagePackObject> sparseMatches:
|
||||
formattedValue = smvf(
|
||||
new SparseMultiValue(sparseMatches) { Application = appMeta, PlayReport = playReport }
|
||||
);
|
||||
return true;
|
||||
default:
|
||||
throw new InvalidOperationException("Formatter delegate is not of a known type!");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
using MsgPack;
|
||||
using Ryujinx.Ava.Utilities.AppLibrary;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
@@ -7,8 +6,7 @@ using System.Linq;
|
||||
namespace Ryujinx.Ava.Utilities.PlayReport
|
||||
{
|
||||
/// <summary>
|
||||
/// The input data to a <see cref="ValueFormatter"/>,
|
||||
/// containing the currently running application's <see cref="ApplicationMetadata"/>,
|
||||
/// The base input data to a ValueFormatter delegate,
|
||||
/// and the matched <see cref="MessagePackObject"/> from the Play Report.
|
||||
/// </summary>
|
||||
public readonly struct Value
|
||||
@@ -70,7 +68,7 @@ namespace Ryujinx.Ava.Utilities.PlayReport
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// A potential formatted value returned by a <see cref="ValueFormatter"/>.
|
||||
/// A potential formatted value returned by a ValueFormatter delegate.
|
||||
/// </summary>
|
||||
public readonly struct FormattedValue
|
||||
{
|
||||
@@ -116,28 +114,47 @@ namespace Ryujinx.Ava.Utilities.PlayReport
|
||||
/// <summary>
|
||||
/// Return this to tell the caller there is no value to return.
|
||||
/// </summary>
|
||||
public static FormattedValue Unhandled => default;
|
||||
public static readonly FormattedValue Unhandled = default;
|
||||
|
||||
/// <summary>
|
||||
/// Return this to suggest the caller reset the value it's using the <see cref="Analyzer"/> for.
|
||||
/// </summary>
|
||||
public static FormattedValue ForceReset => new() { Handled = true, Reset = true };
|
||||
public static readonly FormattedValue ForceReset = new() { Handled = true, Reset = true };
|
||||
|
||||
/// <summary>
|
||||
/// A delegate singleton you can use to always return <see cref="ForceReset"/> in a <see cref="ValueFormatter"/>.
|
||||
/// A delegate singleton you can use to always return <see cref="ForceReset"/> in a <see cref="SingleValueFormatter"/>.
|
||||
/// </summary>
|
||||
public static readonly ValueFormatter SingleAlwaysResets = _ => ForceReset;
|
||||
public static readonly SingleValueFormatter SingleAlwaysResets = _ => ForceReset;
|
||||
|
||||
/// <summary>
|
||||
/// A delegate singleton you can use to always return <see cref="ForceReset"/> in a <see cref="MultiValueFormatter"/>.
|
||||
/// </summary>
|
||||
public static readonly MultiValueFormatter MultiAlwaysResets = _ => ForceReset;
|
||||
|
||||
/// <summary>
|
||||
/// A delegate singleton you can use to always return <see cref="ForceReset"/> in a <see cref="SparseMultiValueFormatter"/>.
|
||||
/// </summary>
|
||||
public static readonly SparseMultiValueFormatter SparseMultiAlwaysResets = _ => ForceReset;
|
||||
|
||||
/// <summary>
|
||||
/// A delegate factory you can use to always return the specified
|
||||
/// <paramref name="formattedValue"/> in a <see cref="ValueFormatter"/>.
|
||||
/// <paramref name="formattedValue"/> in a <see cref="SingleValueFormatter"/>.
|
||||
/// </summary>
|
||||
/// <param name="formattedValue">The string to always return for this delegate instance.</param>
|
||||
public static ValueFormatter AlwaysReturns(string formattedValue) => _ => formattedValue;
|
||||
public static SingleValueFormatter SingleAlwaysReturns(string formattedValue) => _ => formattedValue;
|
||||
|
||||
/// <summary>
|
||||
/// A delegate factory you can use to always return the specified
|
||||
/// <paramref name="formattedValue"/> in a <see cref="MultiValueFormatter"/>.
|
||||
/// </summary>
|
||||
/// <param name="formattedValue">The string to always return for this delegate instance.</param>
|
||||
public static MultiValueFormatter MultiAlwaysReturns(string formattedValue) => _ => formattedValue;
|
||||
|
||||
/// <summary>
|
||||
/// A delegate factory you can use to always return the specified
|
||||
/// <paramref name="formattedValue"/> in a <see cref="SparseMultiValueFormatter"/>.
|
||||
/// </summary>
|
||||
/// <param name="formattedValue">The string to always return for this delegate instance.</param>
|
||||
public static SparseMultiValueFormatter SparseMultiAlwaysReturns(string formattedValue) => _ => formattedValue;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@ namespace Ryujinx.Ava.Utilities
|
||||
public static class ShortcutHelper
|
||||
{
|
||||
[SupportedOSPlatform("windows")]
|
||||
private static void CreateShortcutWindows(string applicationFilePath, string applicationId, byte[] iconData, string iconPath, string cleanedAppName, string desktopPath)
|
||||
private static void CreateShortcutWindows(string applicationFilePath, string applicationId, byte[] iconData, string iconPath, string cleanedAppName, string desktopPath, string args = "")
|
||||
{
|
||||
string basePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, AppDomain.CurrentDomain.FriendlyName + ".exe");
|
||||
iconPath += ".ico";
|
||||
@@ -22,13 +22,13 @@ namespace Ryujinx.Ava.Utilities
|
||||
image.Resize(new SKImageInfo(128, 128), SKFilterQuality.High);
|
||||
SaveBitmapAsIcon(image, iconPath);
|
||||
|
||||
Shortcut shortcut = Shortcut.CreateShortcut(basePath, GetArgsString(applicationFilePath, applicationId), iconPath, 0);
|
||||
Shortcut shortcut = Shortcut.CreateShortcut(basePath, GetArgsString(applicationFilePath, applicationId, args), iconPath, 0);
|
||||
shortcut.StringData.NameString = cleanedAppName;
|
||||
shortcut.WriteToFile(Path.Combine(desktopPath, cleanedAppName + ".lnk"));
|
||||
}
|
||||
|
||||
[SupportedOSPlatform("linux")]
|
||||
private static void CreateShortcutLinux(string applicationFilePath, string applicationId, byte[] iconData, string iconPath, string desktopPath, string cleanedAppName)
|
||||
private static void CreateShortcutLinux(string applicationFilePath, string applicationId, byte[] iconData, string iconPath, string desktopPath, string cleanedAppName, string args = "")
|
||||
{
|
||||
string basePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Ryujinx.sh");
|
||||
string desktopFile = EmbeddedResources.ReadAllText("Ryujinx/Assets/ShortcutFiles/shortcut-template.desktop");
|
||||
@@ -40,11 +40,11 @@ namespace Ryujinx.Ava.Utilities
|
||||
data.SaveTo(file);
|
||||
|
||||
using StreamWriter outputFile = new(Path.Combine(desktopPath, cleanedAppName + ".desktop"));
|
||||
outputFile.Write(desktopFile, cleanedAppName, iconPath, $"{basePath} {GetArgsString(applicationFilePath, applicationId)}");
|
||||
outputFile.Write(desktopFile, cleanedAppName, iconPath, $"{basePath} {GetArgsString(applicationFilePath, applicationId, args)}");
|
||||
}
|
||||
|
||||
[SupportedOSPlatform("macos")]
|
||||
private static void CreateShortcutMacos(string appFilePath, string applicationId, byte[] iconData, string desktopPath, string cleanedAppName)
|
||||
private static void CreateShortcutMacos(string appFilePath, string applicationId, byte[] iconData, string desktopPath, string cleanedAppName, string args = "")
|
||||
{
|
||||
string basePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Ryujinx");
|
||||
string plistFile = EmbeddedResources.ReadAllText("Ryujinx/Assets/ShortcutFiles/shortcut-template.plist");
|
||||
@@ -63,7 +63,7 @@ namespace Ryujinx.Ava.Utilities
|
||||
string scriptPath = Path.Combine(scriptFolderPath, ScriptName);
|
||||
using StreamWriter scriptFile = new(scriptPath);
|
||||
|
||||
scriptFile.Write(shortcutScript, basePath, GetArgsString(appFilePath, applicationId));
|
||||
scriptFile.Write(shortcutScript, basePath, GetArgsString(appFilePath, applicationId, args));
|
||||
|
||||
// Set execute permission
|
||||
FileInfo fileInfo = new(scriptPath);
|
||||
@@ -87,7 +87,7 @@ namespace Ryujinx.Ava.Utilities
|
||||
outputFile.Write(plistFile, ScriptName, cleanedAppName, IconName);
|
||||
}
|
||||
|
||||
public static void CreateAppShortcut(string applicationFilePath, string applicationName, string applicationId, byte[] iconData)
|
||||
public static void CreateAppShortcut(string applicationFilePath, string applicationName, string applicationId, byte[] iconData, string args = "")
|
||||
{
|
||||
string desktopPath = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory);
|
||||
string cleanedAppName = string.Join("_", applicationName.Split(Path.GetInvalidFileNameChars()));
|
||||
@@ -96,7 +96,7 @@ namespace Ryujinx.Ava.Utilities
|
||||
{
|
||||
string iconPath = Path.Combine(AppDataManager.BaseDirPath, "games", applicationId, "app");
|
||||
|
||||
CreateShortcutWindows(applicationFilePath, applicationId, iconData, iconPath, cleanedAppName, desktopPath);
|
||||
CreateShortcutWindows(applicationFilePath, applicationId, iconData, iconPath, cleanedAppName, desktopPath, args);
|
||||
|
||||
return;
|
||||
}
|
||||
@@ -106,14 +106,14 @@ namespace Ryujinx.Ava.Utilities
|
||||
string iconPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".local", "share", "icons", "Ryujinx");
|
||||
|
||||
Directory.CreateDirectory(iconPath);
|
||||
CreateShortcutLinux(applicationFilePath, applicationId, iconData, Path.Combine(iconPath, applicationId), desktopPath, cleanedAppName);
|
||||
CreateShortcutLinux(applicationFilePath, applicationId, iconData, Path.Combine(iconPath, applicationId), desktopPath, cleanedAppName, args);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
if (OperatingSystem.IsMacOS())
|
||||
{
|
||||
CreateShortcutMacos(applicationFilePath, applicationId, iconData, desktopPath, cleanedAppName);
|
||||
CreateShortcutMacos(applicationFilePath, applicationId, iconData, desktopPath, cleanedAppName, args);
|
||||
|
||||
return;
|
||||
}
|
||||
@@ -121,7 +121,7 @@ namespace Ryujinx.Ava.Utilities
|
||||
throw new NotImplementedException("Shortcut support has not been implemented yet for this OS.");
|
||||
}
|
||||
|
||||
private static string GetArgsString(string appFilePath, string applicationId)
|
||||
private static string GetArgsString(string appFilePath, string applicationId, string config = "")
|
||||
{
|
||||
// args are first defined as a list, for easier adjustments in the future
|
||||
List<string> argsList = [];
|
||||
@@ -132,6 +132,11 @@ namespace Ryujinx.Ava.Utilities
|
||||
argsList.Add($"\"{CommandLineState.BaseDirPathArg}\"");
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(config))
|
||||
{
|
||||
argsList.Add(config);
|
||||
}
|
||||
|
||||
if (appFilePath.ToLower().EndsWith(".xci"))
|
||||
{
|
||||
argsList.Add("--application-id");
|
||||
|
||||
Reference in New Issue
Block a user