misc: add the ability to ignore UI logs when using trace & debug log levels

src/Ryujinx/Assets/locales.json

@@ -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": ""
       }
     },
@@ -2768,7 +2768,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "",
+        "zh_CN": "显示兼容性项目",
         "zh_TW": ""
       }
     },
@@ -2793,7 +2793,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "",
+        "zh_CN": "在兼容性列表中显示选定的游戏,您通常可以通过帮助菜单访问。",
         "zh_TW": ""
       }
     },
@@ -2818,7 +2818,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "",
+        "zh_CN": "显示游戏信息",
         "zh_TW": ""
       }
     },
@@ -2843,7 +2843,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "",
+        "zh_CN": "显示当前选定游戏的状态与详细信息。",
         "zh_TW": ""
       }
     },
@@ -4493,7 +4493,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "",
+        "zh_CN": "与系统时间同步",
         "zh_TW": ""
       }
     },
@@ -5747,6 +5747,31 @@
         "zh_TW": "啟用客體日誌"
       }
     },
+    {
+      "ID": "SettingsTabLoggingEnableAvaloniaLogs",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Enable UI Logs",
+        "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": ""
+      }
+    },
     {
       "ID": "SettingsTabLoggingEnableFsAccessLogs",
       "Translations": {
@@ -6143,7 +6168,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "",
+        "zh_CN": "重置设置",
         "zh_TW": ""
       }
     },
@@ -6168,7 +6193,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "",
+        "zh_CN": "我要重置我的设置。",
         "zh_TW": ""
       }
     },
@@ -8143,7 +8168,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "",
+        "zh_CN": "彩虹滚动速度",
         "zh_TW": ""
       }
     },
@@ -13418,7 +13443,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "",
+        "zh_CN": "您正要清理 PPTC 数据:\n\n{0}\n\n您确实要继续吗?",
         "zh_TW": ""
       }
     },
@@ -16722,6 +16747,31 @@
         "zh_TW": "謹慎使用"
       }
     },
+    {
+      "ID": "AvaloniaLogTooltip",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Prints Avalonia (UI) log messages in the console.",
+        "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": ""
+      }
+    },
     {
       "ID": "OpenGlLogLevel",
       "Translations": {
@@ -23568,7 +23618,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "",
+        "zh_CN": "启动和游戏时不会出现任何崩溃或任何类型的 GPU bug 且速度足够快可以在一般 PC 上尽情游玩。",
         "zh_TW": ""
       }
     },
@@ -23593,7 +23643,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "",
+        "zh_CN": "可以成功启动并进入游戏但可能会遇到以下一种或多种问题: 崩溃、卡死、GPU bug、令人无法接受的音频,或者只是太慢。仍然可以继续进行游戏,但是可能无法达到预期。",
         "zh_TW": ""
       }
     },
@@ -23618,7 +23668,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "",
+        "zh_CN": "可以启动并通过标题画面但是无法进入到主要的游戏流程。",
         "zh_TW": ""
       }
     },
@@ -23643,7 +23693,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "",
+        "zh_CN": "可以启动但是无法通过标题画面。",
         "zh_TW": ""
       }
     },
@@ -23668,7 +23718,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "",
+        "zh_CN": "无法启动或显示无任何动静。",
         "zh_TW": ""
       }
     },
@@ -23718,7 +23768,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "",
+        "zh_CN": "Rich Presence 图像",
         "zh_TW": ""
       }
     },
@@ -23743,7 +23793,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "",
+        "zh_CN": "动态 Rich Presence",
         "zh_TW": ""
       }
     }

src/Ryujinx/UI/Controls/ApplicationDataView.axaml

@@ -55,9 +55,21 @@
                                 Tag="{Binding AppData.IdString}"
                                 Text="{Binding AppData.LocalizedStatus}"
                                 Foreground="{Binding AppData.PlayabilityStatus, Converter={x:Static helpers:PlayabilityStatusConverter.Shared}}"
-                                ToolTip.Tip="{Binding AppData.LocalizedStatusTooltip}"
                                 TextAlignment="Start"
-                                TextWrapping="Wrap" />
+                                TextWrapping="Wrap">
+                                <ToolTip.Tip>
+                                    <StackPanel Orientation="Vertical">
+                                        <TextBlock 
+                                            Text="{Binding AppData.LocalizedStatusTooltip}" />
+                                        <Separator 
+                                            Margin="0, 10, 0, 10" 
+                                            IsVisible="{Binding AppData.HasCompatibilityLabels}" />
+                                        <TextBlock 
+                                            IsVisible="{Binding AppData.HasCompatibilityLabels}"
+                                            Text="{Binding AppData.FormattedCompatibilityLabels}" />
+                                    </StackPanel>
+                                </ToolTip.Tip>
+                            </TextBlock>
                             <Button.Styles>
                                 <Style Selector="Button">
                                     <Setter Property="MinWidth"

src/Ryujinx/UI/Controls/ApplicationListView.axaml

@@ -93,8 +93,19 @@
                                             IsVisible="{Binding HasPlayabilityInfo}"
                                             Background="{DynamicResource AppListBackgroundColor}"
                                             Margin="-1, 0, 0, 0"
-                                            Padding="0"
-                                            ToolTip.Tip="{Binding LocalizedStatusTooltip}">
+                                            Padding="0">
+                                            <ToolTip.Tip>
+                                                <StackPanel Orientation="Vertical">
+                                                    <TextBlock 
+                                                        Text="{Binding LocalizedStatusTooltip}" />
+                                                    <Separator 
+                                                        Margin="0, 10, 0, 10" 
+                                                        IsVisible="{Binding HasCompatibilityLabels}" />
+                                                    <TextBlock 
+                                                        IsVisible="{Binding HasCompatibilityLabels}"
+                                                        Text="{Binding FormattedCompatibilityLabels}" />
+                                                </StackPanel>
+                                            </ToolTip.Tip>
                                             <TextBlock
                                                 Margin="1.5"
                                                 Tag="{Binding IdString}"

src/Ryujinx/UI/Helpers/LoggerAdapter.cs

@@ -1,6 +1,7 @@
 using Avalonia.Logging;
 using Avalonia.Utilities;
 using Gommon;
+using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common.Logging;
 using System;
 using System.Text;
@@ -14,13 +15,19 @@ namespace Ryujinx.Ava.UI.Helpers
 
     internal class LoggerAdapter : ILogSink
     {
+        private static bool _avaloniaLogsEnabled = ConfigurationState.Instance.Logger.EnableAvaloniaLog; 
+        
         public static void Register()
         {
             AvaLogger.Sink = new LoggerAdapter();
+            ConfigurationState.Instance.Logger.EnableAvaloniaLog.Event 
+                += (_, e) => _avaloniaLogsEnabled = e.NewValue;
         }
 
         private static RyuLogger.Log? GetLog(AvaLogLevel level, string area)
         {
+            if (!_avaloniaLogsEnabled) return null;
+            
             return level switch
             {
                 AvaLogLevel.Verbose => RyuLogger.Debug,

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -1147,10 +1147,10 @@ namespace Ryujinx.Ava.UI.ViewModels
                 List<string> dirs = result.Select(it => it.Path.LocalPath).ToList();
                 int numAdded = onDirsSelected(dirs, out int numRemoved);
 
-                string msg = String.Join("\r\n", new string[] {
+                string msg = string.Join("\n",
                     string.Format(LocaleManager.Instance[localeMessageRemovedKey], numRemoved),
                     string.Format(LocaleManager.Instance[localeMessageAddedKey], numAdded)
-                });
+                );
 
                 await Dispatcher.UIThread.InvokeAsync(async () =>
                 {

src/Ryujinx/UI/ViewModels/SettingsViewModel.cs

@@ -204,6 +204,7 @@ namespace Ryujinx.Ava.UI.ViewModels
         public bool EnableTrace { get; set; }
         public bool EnableGuest { get; set; }
         public bool EnableFsAccessLog { get; set; }
+        public bool EnableAvaloniaLog { get; set; }
         public bool EnableDebug { get; set; }
         public bool IsOpenAlEnabled { get; set; }
         public bool IsSoundIoEnabled { get; set; }
@@ -560,6 +561,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             EnableGuest = config.Logger.EnableGuest;
             EnableDebug = config.Logger.EnableDebug;
             EnableFsAccessLog = config.Logger.EnableFsAccessLog;
+            EnableAvaloniaLog = config.Logger.EnableAvaloniaLog;
             FsGlobalAccessLogMode = config.System.FsGlobalAccessLogMode;
             OpenglDebugLevel = (int)config.Logger.GraphicsDebugLevel.Value;
 
@@ -679,6 +681,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             config.Logger.EnableGuest.Value = EnableGuest;
             config.Logger.EnableDebug.Value = EnableDebug;
             config.Logger.EnableFsAccessLog.Value = EnableFsAccessLog;
+            config.Logger.EnableAvaloniaLog.Value = EnableAvaloniaLog;
             config.System.FsGlobalAccessLogMode.Value = FsGlobalAccessLogMode;
             config.Logger.GraphicsDebugLevel.Value = (GraphicsDebugLevel)OpenglDebugLevel;
 

src/Ryujinx/UI/Views/Settings/SettingsLoggingView.axaml

@@ -74,6 +74,10 @@
                                   ToolTip.Tip="{ext:Locale DebugLogTooltip}">
                             <TextBlock Text="{ext:Locale SettingsTabLoggingEnableDebugLogs}" />
                         </CheckBox>
+                        <CheckBox IsChecked="{Binding EnableAvaloniaLog}"
+                                  ToolTip.Tip="{ext:Locale AvaloniaLogTooltip}">
+                            <TextBlock Text="{ext:Locale SettingsTabLoggingEnableAvaloniaLogs}" />
+                        </CheckBox>
                         <StackPanel Margin="0,10,0,0" Orientation="Horizontal" VerticalAlignment="Stretch">
                             <TextBlock VerticalAlignment="Center"
                                     ToolTip.Tip="{ext:Locale FSAccessLogModeTooltip}"

src/Ryujinx/Utilities/AppLibrary/ApplicationData.cs

@@ -1,3 +1,4 @@
+using Gommon;
 using LibHac.Common;
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
@@ -14,6 +15,7 @@ using Ryujinx.HLE.FileSystem;
 using Ryujinx.HLE.Loaders.Processes.Extensions;
 using System;
 using System.IO;
+using System.Text;
 using System.Text.Json.Serialization;
 
 namespace Ryujinx.Ava.Utilities.AppLibrary
@@ -32,33 +34,12 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
             set
             {
                 _id = value;
-                PlayabilityStatus = CompatibilityCsv.GetStatus(Id);
+
+                Compatibility = CompatibilityCsv.Find(Id);
             }
         }
         public string Developer { get; set; } = "Unknown";
         public string Version { get; set; } = "0";
-
-        public bool HasPlayabilityInfo => PlayabilityStatus != null;
-
-        public string LocalizedStatus =>
-            PlayabilityStatus.HasValue 
-                ? LocaleManager.Instance[PlayabilityStatus!.Value] 
-                : string.Empty;
-
-        public LocaleKeys? PlayabilityStatus { get; set; }
-        public string LocalizedStatusTooltip =>
-            PlayabilityStatus.HasValue 
-#pragma warning disable CS8509 // It is exhaustive for any value this property can contain.
-                ? LocaleManager.Instance[PlayabilityStatus!.Value switch
-#pragma warning restore CS8509
-                {
-                    LocaleKeys.CompatibilityListPlayable => LocaleKeys.CompatibilityListPlayableTooltip,
-                    LocaleKeys.CompatibilityListIngame => LocaleKeys.CompatibilityListIngameTooltip,
-                    LocaleKeys.CompatibilityListMenus => LocaleKeys.CompatibilityListMenusTooltip,
-                    LocaleKeys.CompatibilityListBoots => LocaleKeys.CompatibilityListBootsTooltip,
-                    LocaleKeys.CompatibilityListNothing => LocaleKeys.CompatibilityListNothingTooltip,
-                }]
-                : string.Empty;
         public int PlayerCount { get; set; }
         public int GameCount { get; set; }
 
@@ -83,6 +64,53 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
         public string LastPlayedString => ValueFormatUtils.FormatDateTime(LastPlayed)?.Replace(" ", "\n");
 
         public string FileSizeString => ValueFormatUtils.FormatFileSize(FileSize);
+        
+        public Optional<CompatibilityEntry> Compatibility { get; private set; }
+        
+        public bool HasPlayabilityInfo => Compatibility.HasValue;
+
+        public string LocalizedStatus => Compatibility.Convert(x => x.LocalizedStatus);
+
+        public bool HasCompatibilityLabels => !FormattedCompatibilityLabels.Equals(string.Empty);
+        
+        public string FormattedCompatibilityLabels
+            => Compatibility.Convert(x => x.FormattedIssueLabels).OrElse(string.Empty);
+            
+        public LocaleKeys? PlayabilityStatus => Compatibility.Convert(x => x.Status).OrElse(null);
+
+        public string CompatibilityToolTip
+        {
+            get
+            {
+                StringBuilder sb = new(LocalizedStatusTooltip);
+                
+                string formattedCompatibilityLabels = FormattedCompatibilityLabels;
+                if (!string.IsNullOrEmpty(formattedCompatibilityLabels))
+                {
+                    sb.AppendLine()
+                        .AppendLine()
+                        .Append(formattedCompatibilityLabels);
+                }
+                
+                return sb.ToString();
+            }
+        }
+        
+
+        public string LocalizedStatusTooltip =>
+            Compatibility.Convert(x => 
+#pragma warning disable CS8509 It is exhaustive for all possible values this can contain.
+                LocaleManager.Instance[x.Status switch
+#pragma warning restore CS8509
+                {
+                    LocaleKeys.CompatibilityListPlayable => LocaleKeys.CompatibilityListPlayableTooltip,
+                    LocaleKeys.CompatibilityListIngame => LocaleKeys.CompatibilityListIngameTooltip,
+                    LocaleKeys.CompatibilityListMenus => LocaleKeys.CompatibilityListMenusTooltip,
+                    LocaleKeys.CompatibilityListBoots => LocaleKeys.CompatibilityListBootsTooltip,
+                    LocaleKeys.CompatibilityListNothing => LocaleKeys.CompatibilityListNothingTooltip,
+                }]
+            ).OrElse(string.Empty);
+        
 
         [JsonIgnore] public string IdString => Id.ToString("x16");
 

src/Ryujinx/Utilities/Compat/CompatibilityCsv.cs

@@ -60,10 +60,21 @@ namespace Ryujinx.Ava.Utilities.Compat
             }
         }
 
+        public static CompatibilityEntry Find(string titleId)
+            => Entries.FirstOrDefault(x => x.TitleId.HasValue && x.TitleId.Value.EqualsIgnoreCase(titleId));
+        
+        public static CompatibilityEntry Find(ulong titleId)
+            => Find(titleId.ToString("X16"));
+        
         public static LocaleKeys? GetStatus(string titleId)
-            => Entries.FirstOrDefault(x => x.TitleId.HasValue && x.TitleId.Value.EqualsIgnoreCase(titleId))?.Status;
+            => Find(titleId)?.Status;
         
         public static LocaleKeys? GetStatus(ulong titleId) => GetStatus(titleId.ToString("X16"));
+        
+        public static string GetLabels(string titleId)
+            => Find(titleId)?.FormattedIssueLabels;
+        
+        public static string GetLabels(ulong titleId) => GetLabels(titleId.ToString("X16"));
     }
 
     public class CompatibilityEntry

src/Ryujinx/Utilities/Configuration/ConfigurationFileFormat.cs

@@ -15,7 +15,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
         /// <summary>
         /// The current version of the file format
         /// </summary>
-        public const int CurrentVersion = 63;
+        public const int CurrentVersion = 64;
 
         /// <summary>
         /// Version of the configuration file format
@@ -111,6 +111,11 @@ namespace Ryujinx.Ava.Utilities.Configuration
         /// Enables printing FS access log messages
         /// </summary>
         public bool LoggingEnableFsAccessLog { get; set; }
+        
+        /// <summary>
+        /// Enables log messages from Avalonia
+        /// </summary>
+        public bool LoggingEnableAvalonia { get; set; }
 
         /// <summary>
         /// Controls which log messages are written to the log targets

src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs

@@ -430,7 +430,8 @@ namespace Ryujinx.Ava.Utilities.Configuration
                     }
                 }),
                 (62, static cff => cff.RainbowSpeed = 1f),
-                (63, static cff => cff.MatchSystemTime = false)
+                (63, static cff => cff.MatchSystemTime = false),
+                (64, static cff => cff.LoggingEnableAvalonia = false)
             );
     }
 }

src/Ryujinx/Utilities/Configuration/ConfigurationState.Model.cs

@@ -254,6 +254,11 @@ namespace Ryujinx.Ava.Utilities.Configuration
             /// Enables printing FS access log messages
             /// </summary>
             public ReactiveObject<bool> EnableFsAccessLog { get; private set; }
+            
+            /// <summary>
+            /// Enables log messages from Avalonia
+            /// </summary>
+            public ReactiveObject<bool> EnableAvaloniaLog { get; private set; }
 
             /// <summary>
             /// Controls which log messages are written to the log targets
@@ -281,6 +286,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
                 EnableTrace = new ReactiveObject<bool>();
                 EnableGuest = new ReactiveObject<bool>();
                 EnableFsAccessLog = new ReactiveObject<bool>();
+                EnableAvaloniaLog = new ReactiveObject<bool>();
                 FilteredClasses = new ReactiveObject<LogClass[]>();
                 EnableFileLog = new ReactiveObject<bool>();
                 EnableFileLog.LogChangesToValue(nameof(EnableFileLog));

src/Ryujinx/Utilities/Configuration/ConfigurationState.cs

@@ -46,6 +46,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
                 LoggingEnableTrace = Logger.EnableTrace,
                 LoggingEnableGuest = Logger.EnableGuest,
                 LoggingEnableFsAccessLog = Logger.EnableFsAccessLog,
+                LoggingEnableAvalonia = Logger.EnableAvaloniaLog,
                 LoggingFilteredClasses = Logger.FilteredClasses,
                 LoggingGraphicsDebugLevel = Logger.GraphicsDebugLevel,
                 SystemLanguage = System.Language,
@@ -165,6 +166,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
             Logger.EnableTrace.Value = false;
             Logger.EnableGuest.Value = true;
             Logger.EnableFsAccessLog.Value = false;
+            Logger.EnableAvaloniaLog.Value = false;
             Logger.FilteredClasses.Value = [];
             Logger.GraphicsDebugLevel.Value = GraphicsDebugLevel.None;
             System.Language.Value = Language.AmericanEnglish;

src/Ryujinx/Utilities/PlayReport/Analyzer.cs

@@ -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;
         }
 

src/Ryujinx/Utilities/PlayReport/PlayReports.Formatters.cs

@@ -1,4 +1,5 @@
-using System;
+using Gommon;
+using System;
 using System.Buffers.Binary;
 using System.Collections.Generic;
 using System.Linq;
@@ -281,9 +282,14 @@ namespace Ryujinx.Ava.Utilities.PlayReport
             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)}"));
+                ? $"{players.Count} Players - {
+                    players.Take(3)
+                        .Select(p => $"{p.Character}({p.PlayerNumber}){RankMedal(p.Rank)}")
+                        .JoinToString(", ")
+                }"
+                : players
+                    .Select(p => $"{p.Character}({p.PlayerNumber}){RankMedal(p.Rank)}")
+                    .JoinToString(", ");
 
             string RankMedal(int? rank) => rank switch
             {
@@ -294,8 +300,67 @@ namespace Ryujinx.Ava.Utilities.PlayReport
             };
         }
 
-        private static FormattedValue N64_LaunchedGame(SingleValue value) => value.Matched.StringValue switch
+        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™"),
@@ -331,11 +396,11 @@ namespace Ryujinx.Ava.Utilities.PlayReport
             "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™"),
-            _ => FormattedValue.ForceReset
-        };
 
-        private static FormattedValue NES_LaunchedGame(SingleValue value) => value.Matched.StringValue switch
-        {
+            #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"),
@@ -415,11 +480,11 @@ namespace Ryujinx.Ava.Utilities.PlayReport
             "clv_p_najre" => Playing("COBRA TRIANGLE™"),
             "clv_p_najse" => Playing("SNAKE RATTLE N ROLL™"),
             "clv_p_najte" => Playing("SOLAR® JETMAN"),
-            _ => FormattedValue.ForceReset
-        };
 
-        private static FormattedValue SNES_LaunchedGame(SingleValue value) => value.Matched.StringValue switch
-        {
+            #endregion
+
+            #region SNES
+
             "s_2180_e" => Playing("BATTLETOADS™ DOUBLE DRAGON™"),
             "s_2179_e" => Playing("BATTLETOADS™ IN BATTLEMANIACS"),
             "s_2182_e" => Playing("BIG RUN"),
@@ -490,98 +555,11 @@ namespace Ryujinx.Ava.Utilities.PlayReport
             "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™"),
-            _ => FormattedValue.ForceReset
-        };
 
-        private static FormattedValue Genesis_LaunchedGame(SingleValue value) => value.Matched.StringValue switch
-        {
-            "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"),
-            _ => FormattedValue.ForceReset
-        };
-        
-        private static FormattedValue GBA_LaunchedGame(SingleValue value) => value.Matched.StringValue switch
-        {
-            "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"),
-            _ => FormattedValue.ForceReset
-        };
-        
-        private static FormattedValue GB_LaunchedGame(SingleValue value) => value.Matched.StringValue switch
-        {
+            #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"),
@@ -615,6 +593,39 @@ namespace Ryujinx.Ava.Utilities.PlayReport
             "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
         };
     }

src/Ryujinx/Utilities/PlayReport/PlayReports.cs

@@ -62,25 +62,10 @@ namespace Ryujinx.Ava.Utilities.PlayReport
                     )
             )
             .AddSpec(
-                "0100c9a00ece6000",
-                spec => spec.AddValueFormatter("launch_title_id", N64_LaunchedGame)
-            )
-            .AddSpec(
-                "01008d300c50c000",
-                spec => spec.AddValueFormatter("launch_title_id", SNES_LaunchedGame)
-            )
-            .AddSpec(
-                "0100d870045b6000",
-                spec => spec.AddValueFormatter("launch_title_id", NES_LaunchedGame)
-            ).AddSpec(
-                "010012f017576000",
-                spec => spec.AddValueFormatter("launch_title_id", GBA_LaunchedGame)
-            ).AddSpec(
-                "0100c62011050000",
-                spec => spec.AddValueFormatter("launch_title_id", GB_LaunchedGame)
-            ).AddSpec(
-                "0100b3c014bda000",
-                spec => spec.AddValueFormatter("launch_title_id", Genesis_LaunchedGame)
+                [
+                    "0100c9a00ece6000", "01008d300c50c000", "0100d870045b6000", 
+                    "010012f017576000", "0100c62011050000", "0100b3c014bda000"],
+                spec => spec.AddValueFormatter("launch_title_id", NsoEmulator_LaunchedGame)
             );
 
         private static string Playing(string game) => $"Playing {game}";

src/Ryujinx/Utilities/PlayReport/Specs.cs

@@ -14,8 +14,14 @@ 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<FormatterSpecBase> ValueFormatters { get; } = [];
@@ -28,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, SingleValueFormatter valueFormatter)
-            => AddValueFormatter(_lastPriority++, 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"/>
@@ -39,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,
-            SingleValueFormatter valueFormatter)
+        public GameSpec AddValueFormatter(
+            int priority,
+            string reportKey,
+            SingleValueFormatter valueFormatter
+        ) => AddValueFormatter(new FormatterSpec
         {
-            ValueFormatters.Add(new FormatterSpec
-            {
-                Priority = priority, ReportKeys = [reportKey], Formatter = valueFormatter
-            });
-            return this;
-        }
+            Priority = priority, ReportKeys = [reportKey], Formatter = valueFormatter
+        });
 
         /// <summary>
         /// Add a multi-value formatter to the current <see cref="GameSpec"/>
@@ -56,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(_lastPriority++, 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"/>
@@ -67,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
         {
-            ValueFormatters.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"/>
@@ -87,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(_lastPriority++, 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"/>
@@ -101,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
         {
-            ValueFormatters.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;
         }
     }
@@ -174,16 +189,17 @@ namespace Ryujinx.Ava.Utilities.PlayReport
             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)
+        public bool Format(ApplicationMetadata appMeta, Horizon.Prepo.Types.PlayReport playReport,
+            out FormattedValue formattedValue)
         {
             formattedValue = default;
             if (!GetData(playReport, out object data))
@@ -197,15 +213,20 @@ namespace Ryujinx.Ava.Utilities.PlayReport
 
             switch (Formatter)
             {
-                case SingleValueFormatter svf when data is MessagePackObject mpo:
-                    formattedValue = svf(new SingleValue(mpo) { Application = appMeta, PlayReport = playReport });
+                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> messagePackObjects:
-                    formattedValue = mvf(new MultiValue(messagePackObjects) { Application = appMeta, PlayReport = playReport });
+                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> sparseMessagePackObjects:
-                    formattedValue = smvf(new SparseMultiValue(sparseMessagePackObjects) { Application = appMeta, PlayReport = playReport });
+                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!");