Merge a3afebd3a2 into 2c8edaf89e

formatting pt.2

src/Ryujinx.Common/TitleIDs.cs

@@ -164,16 +164,15 @@ 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

src/Ryujinx.Horizon/HorizonStatic.cs

@@ -1,6 +1,5 @@
 using MsgPack;
 using Ryujinx.Horizon.Common;
-using Ryujinx.Horizon.Prepo.Types;
 using Ryujinx.Memory;
 using System;
 using System.Threading;
@@ -9,7 +8,7 @@ namespace Ryujinx.Horizon
 {
     public static class HorizonStatic
     {
-        internal static void HandlePlayReport(PlayReport report) => 
+        internal static void HandlePlayReport(MessagePackObject report) => 
             new Thread(() => PlayReport?.Invoke(report))
             {
                 Name = "HLE.PlayReportEvent", 
@@ -17,7 +16,7 @@ namespace Ryujinx.Horizon
                 Priority = ThreadPriority.AboveNormal
             }.Start();
         
-        public static event Action<PlayReport> PlayReport;
+        public static event Action<MessagePackObject> PlayReport;
 
         [field: ThreadStatic]
         public static HorizonOptions Options { get; private set; }

src/Ryujinx.Horizon/Prepo/Ipc/PrepoService.cs

@@ -1,3 +1,4 @@
+using Gommon;
 using MsgPack;
 using MsgPack.Serialization;
 using Ryujinx.Common.Logging;
@@ -11,12 +12,19 @@ using Ryujinx.Horizon.Sdk.Sf;
 using Ryujinx.Horizon.Sdk.Sf.Hipc;
 using System;
 using System.Text;
+using System.Threading;
 using ApplicationId = Ryujinx.Horizon.Sdk.Ncm.ApplicationId;
 
 namespace Ryujinx.Horizon.Prepo.Ipc
 {
     partial class PrepoService : IPrepoService
     {
+        enum PlayReportKind
+        {
+            Normal,
+            System,
+        }
+
         private readonly ArpApi _arp;
         private readonly PrepoServicePermissionLevel _permissionLevel;
         private ulong _systemSessionId;
@@ -188,17 +196,10 @@ namespace Ryujinx.Horizon.Prepo.Ipc
             {
                 return PrepoResult.InvalidBufferSize;
             }
-            
+
             StringBuilder builder = new();
             MessagePackObject deserializedReport = MessagePackSerializer.UnpackMessagePackObject(reportBuffer.ToArray());
 
-            PlayReport playReport = new()
-            {
-                Kind = playReportKind, 
-                Room = gameRoom,
-                ReportData = deserializedReport
-            };
-            
             builder.AppendLine();
             builder.AppendLine("PlayReport log:");
             builder.AppendLine($" Kind: {playReportKind}");
@@ -208,12 +209,10 @@ namespace Ryujinx.Horizon.Prepo.Ipc
             if (pid != 0)
             {
                 builder.AppendLine($" Pid: {pid}");
-                playReport.Pid = pid;
             }
             else
             {
                 builder.AppendLine($" ApplicationId: {applicationId}");
-                playReport.AppId = applicationId;
             }
 
             Result result = _arp.GetApplicationInstanceId(out ulong applicationInstanceId, pid);
@@ -224,20 +223,17 @@ namespace Ryujinx.Horizon.Prepo.Ipc
 
             _arp.GetApplicationLaunchProperty(out ApplicationLaunchProperty applicationLaunchProperty, applicationInstanceId).AbortOnFailure();
 
-            playReport.Version = applicationLaunchProperty.Version;
-            
             builder.AppendLine($" ApplicationVersion: {applicationLaunchProperty.Version}");
 
             if (!userId.IsNull)
             {
                 builder.AppendLine($" UserId: {userId}");
-                playReport.UserId = userId;
             }
 
             builder.AppendLine($" Room: {gameRoom}");
             builder.AppendLine($" Report: {MessagePackObjectFormatter.Format(deserializedReport)}");
             
-            HorizonStatic.HandlePlayReport(playReport);
+            HorizonStatic.HandlePlayReport(deserializedReport);
 
             Logger.Info?.Print(LogClass.ServicePrepo, builder.ToString());
 

src/Ryujinx.Horizon/Prepo/Types/PlayReport.cs

@@ -1,24 +0,0 @@
-using MsgPack;
-using Ryujinx.Horizon.Sdk.Account;
-using Ryujinx.Horizon.Sdk.Ncm;
-
-namespace Ryujinx.Horizon.Prepo.Types
-{
-    public struct PlayReport
-    {
-        public PlayReportKind Kind { get; init; }
-        public string Room { get; init; }
-        public MessagePackObject ReportData { get; init; }
-        
-        public ApplicationId? AppId;
-        public ulong? Pid;
-        public uint Version;
-        public Uid? UserId;
-    }
-    
-    public enum PlayReportKind
-    {
-        Normal,
-        System,
-    }
-}

src/Ryujinx/Assets/locales.json

@@ -1543,7 +1543,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "由 {0} 开发",
+        "zh_CN": "",
         "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": "标题 ID:",
+        "zh_CN": "",
         "zh_TW": ""
       }
     },
@@ -1893,7 +1893,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "服务的游戏: {0}",
+        "zh_CN": "",
         "zh_TW": ""
       }
     },
@@ -1918,7 +1918,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "在线玩家: {0}",
+        "zh_CN": "",
         "zh_TW": ""
       }
     },
@@ -2268,7 +2268,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "清理 PPTC 缓存",
+        "zh_CN": "",
         "zh_TW": ""
       }
     },
@@ -2293,7 +2293,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "删除应用程序的所有 PPTC 缓存",
+        "zh_CN": "",
         "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": ""
       }
     },
@@ -6143,7 +6143,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "重置设置",
+        "zh_CN": "",
         "zh_TW": ""
       }
     },
@@ -6168,7 +6168,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "我要重置我的设置。",
+        "zh_CN": "",
         "zh_TW": ""
       }
     },
@@ -8143,7 +8143,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "彩虹滚动速度",
+        "zh_CN": "",
         "zh_TW": ""
       }
     },
@@ -13418,7 +13418,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "您正要清理 PPTC 数据:\n\n{0}\n\n您确实要继续吗?",
+        "zh_CN": "",
         "zh_TW": ""
       }
     },
@@ -23568,7 +23568,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "启动和游戏时不会出现任何崩溃或任何类型的 GPU bug 且速度足够快可以在一般 PC 上尽情游玩。",
+        "zh_CN": "",
         "zh_TW": ""
       }
     },
@@ -23593,7 +23593,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "可以成功启动并进入游戏但可能会遇到以下一种或多种问题: 崩溃、卡死、GPU bug、令人无法接受的音频,或者只是太慢。仍然可以继续进行游戏,但是可能无法达到预期。",
+        "zh_CN": "",
         "zh_TW": ""
       }
     },
@@ -23618,7 +23618,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "可以启动并通过标题画面但是无法进入到主要的游戏流程。",
+        "zh_CN": "",
         "zh_TW": ""
       }
     },
@@ -23643,7 +23643,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "可以启动但是无法通过标题画面。",
+        "zh_CN": "",
         "zh_TW": ""
       }
     },
@@ -23668,7 +23668,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "无法启动或显示无任何动静。",
+        "zh_CN": "",
         "zh_TW": ""
       }
     },
@@ -23696,56 +23696,6 @@
         "zh_CN": "选择一个要解压的 DLC",
         "zh_TW": ""
       }
-    },
-    {
-      "ID": "GameInfoRpcImage",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Rich Presence Image",
-        "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": "Rich Presence 图像",
-        "zh_TW": ""
-      }
-    },
-    {
-      "ID": "GameInfoRpcDynamic",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Dynamic Rich Presence",
-        "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": "动态 Rich Presence",
-        "zh_TW": ""
-      }
     }
   ]
 }

src/Ryujinx/DiscordIntegrationModule.cs

@@ -10,8 +10,6 @@ using Ryujinx.Common.Logging;
 using Ryujinx.HLE;
 using Ryujinx.HLE.Loaders.Processes;
 using Ryujinx.Horizon;
-using Ryujinx.Horizon.Prepo.Types;
-using System.Linq;
 using System.Text;
 
 namespace Ryujinx.Ava
@@ -39,9 +37,6 @@ namespace Ryujinx.Ava
         private static RichPresence _discordPresencePlaying;
         private static ApplicationMetadata _currentApp;
 
-        public static bool HasAssetImage(string titleId) => TitleIDs.DiscordGameAssetKeys.ContainsIgnoreCase(titleId);
-        public static bool HasAnalyzer(string titleId) => PlayReports.Analyzer.TitleIds.ContainsIgnoreCase(titleId);
-
         public static void Initialize()
         {
             _discordPresenceMain = new RichPresence
@@ -125,7 +120,7 @@ namespace Ryujinx.Ava
             _currentApp = null;
         }
 
-        private static void HandlePlayReport(PlayReport playReport)
+        private static void HandlePlayReport(MessagePackObject playReport)
         {
             if (_discordClient is null) return;
             if (!TitleIDs.CurrentApplication.Value.HasValue) return;

src/Ryujinx/UI/Controls/ApplicationDataView.axaml

@@ -4,7 +4,6 @@
              xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
              xmlns:ext="using:Ryujinx.Ava.Common.Markup"
              xmlns:viewModels="using:Ryujinx.Ava.UI.ViewModels"
-             xmlns:ui="using:FluentAvalonia.UI.Controls"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="Ryujinx.Ava.UI.Controls.ApplicationDataView"
@@ -86,49 +85,6 @@
                 </StackPanel>
             </Grid>
             <Separator Margin="0, 10, 0, 10" Height="1" BorderBrush="Gray" Background="Gray" />
-            <StackPanel Orientation="Vertical" Spacing="5">
-                <StackPanel Orientation="Horizontal" Spacing="5">
-                    <ui:SymbolIcon Foreground="ForestGreen" Symbol="Checkmark" IsVisible="{Binding AppData.HasRichPresenceAsset}"/>
-                    <TextBlock
-                        Foreground="ForestGreen"
-                        HorizontalAlignment="Stretch"
-                        IsVisible="{Binding AppData.HasRichPresenceAsset}"
-                        Text="{ext:Locale GameInfoRpcImage}"
-                        TextAlignment="Start"
-                        TextWrapping="Wrap" >
-                    </TextBlock>
-                    <ui:SymbolIcon Foreground="Red" Symbol="Cancel" IsVisible="{Binding !AppData.HasRichPresenceAsset}"/>
-                    <TextBlock
-                        Foreground="Red"
-                        HorizontalAlignment="Stretch"
-                        IsVisible="{Binding !AppData.HasRichPresenceAsset}"
-                        Text="{ext:Locale GameInfoRpcImage}"
-                        TextAlignment="Start"
-                        TextWrapping="Wrap" >
-                    </TextBlock>
-                </StackPanel>
-                <StackPanel Orientation="Horizontal" Spacing="5">
-                    <ui:SymbolIcon Foreground="ForestGreen" Symbol="Checkmark" IsVisible="{Binding AppData.HasDynamicRichPresenceSupport}"/>
-                    <TextBlock
-                        Foreground="ForestGreen"
-                        HorizontalAlignment="Stretch"
-                        IsVisible="{Binding AppData.HasDynamicRichPresenceSupport}"
-                        Text="{ext:Locale GameInfoRpcDynamic}"
-                        TextAlignment="Start"
-                        TextWrapping="Wrap" >
-                    </TextBlock>
-                    <ui:SymbolIcon Foreground="Red" Symbol="Cancel" IsVisible="{Binding !AppData.HasDynamicRichPresenceSupport}"/>
-                    <TextBlock
-                        Foreground="Red"
-                        HorizontalAlignment="Stretch"
-                        IsVisible="{Binding !AppData.HasDynamicRichPresenceSupport}"
-                        Text="{ext:Locale GameInfoRpcDynamic}"
-                        TextAlignment="Start"
-                        TextWrapping="Wrap" >
-                    </TextBlock>
-                </StackPanel>
-            </StackPanel>
-            <Separator Margin="0, 10, 0, 10" Height="1" BorderBrush="Gray" Background="Gray" />
             <TextBlock
                 HorizontalAlignment="Stretch"
                 IsVisible="{Binding AppData.HasLdnGames}"

src/Ryujinx/UI/Helpers/Converters/PlayabilityStatusConverter.cs

@@ -18,7 +18,7 @@ namespace Ryujinx.Ava.UI.Helpers
                 LocaleKeys.CompatibilityListNothing or 
                     LocaleKeys.CompatibilityListBoots or 
                     LocaleKeys.CompatibilityListMenus => Brushes.Red,
-                LocaleKeys.CompatibilityListIngame => Brushes.DarkOrange,
+                LocaleKeys.CompatibilityListIngame => Brushes.Yellow,
                 _ => Brushes.ForestGreen
             };
 

src/Ryujinx/UI/Models/Input/StickVisualizer.cs

@@ -0,0 +1,260 @@
+using Ryujinx.Ava.UI.ViewModels;
+using Ryujinx.Ava.UI.ViewModels.Input;
+using Ryujinx.Input;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Ryujinx.Ava.UI.Models.Input
+{
+    public class StickVisualizer : BaseModel, IDisposable
+    {
+        public const int DrawStickPollRate = 50; // Milliseconds per poll.
+        public const int DrawStickCircumference = 5;
+        public const float DrawStickScaleFactor = DrawStickCanvasCenter;
+        public const int DrawStickCanvasSize = 100;
+        public const int DrawStickBorderSize = DrawStickCanvasSize + 5;
+        public const float DrawStickCanvasCenter = (DrawStickCanvasSize - DrawStickCircumference) / 2;
+        public const float MaxVectorLength = DrawStickCanvasSize / 2;
+
+        public CancellationTokenSource PollTokenSource;
+        public CancellationToken PollToken;
+
+        private static float _vectorLength;
+        private static float _vectorMultiplier;
+
+        private bool disposedValue;
+
+        private DeviceType _type;
+        public DeviceType Type
+        {
+            get => _type;
+            set
+            {
+                _type = value;
+
+                OnPropertyChanged();
+            }
+        }
+
+        private GamepadInputConfig _gamepadConfig;
+        public GamepadInputConfig GamepadConfig
+        {
+            get => _gamepadConfig;
+            set
+            {
+                _gamepadConfig = value;
+
+                OnPropertyChanged();
+            }
+        }
+
+        private KeyboardInputConfig _keyboardConfig;
+        public KeyboardInputConfig KeyboardConfig
+        {
+            get => _keyboardConfig;
+            set
+            {
+                _keyboardConfig = value;
+
+                OnPropertyChanged();
+            }
+        }
+
+        private (float, float) _uiStickLeft;
+        public (float, float) UiStickLeft
+        {
+            get => (_uiStickLeft.Item1 * DrawStickScaleFactor, _uiStickLeft.Item2 * DrawStickScaleFactor);
+            set
+            {
+                _uiStickLeft = value;
+
+                OnPropertyChanged();
+                OnPropertyChanged(nameof(UiStickRightX));
+                OnPropertyChanged(nameof(UiStickRightY));
+                OnPropertyChanged(nameof(UiDeadzoneRight));
+            }
+        }
+
+        private (float, float) _uiStickRight;
+        public (float, float) UiStickRight
+        {
+            get => (_uiStickRight.Item1 * DrawStickScaleFactor, _uiStickRight.Item2 * DrawStickScaleFactor);
+            set
+            {
+                _uiStickRight = value;
+
+                OnPropertyChanged();
+                OnPropertyChanged(nameof(UiStickLeftX));
+                OnPropertyChanged(nameof(UiStickLeftY));
+                OnPropertyChanged(nameof(UiDeadzoneLeft));
+            }
+        }
+
+        public float UiStickLeftX => ClampVector(UiStickLeft).Item1;
+        public float UiStickLeftY => ClampVector(UiStickLeft).Item2;
+        public float UiStickRightX => ClampVector(UiStickRight).Item1;
+        public float UiStickRightY => ClampVector(UiStickRight).Item2;
+
+        public int UiStickCircumference => DrawStickCircumference;
+        public int UiCanvasSize => DrawStickCanvasSize;
+        public int UiStickBorderSize => DrawStickBorderSize;
+
+        public float? UiDeadzoneLeft => _gamepadConfig?.DeadzoneLeft * DrawStickCanvasSize - DrawStickCircumference;
+        public float? UiDeadzoneRight => _gamepadConfig?.DeadzoneRight * DrawStickCanvasSize - DrawStickCircumference;
+
+        private InputViewModel Parent;
+
+        public StickVisualizer(InputViewModel parent)
+        {
+            Parent = parent;
+
+            PollTokenSource = new CancellationTokenSource();
+            PollToken = PollTokenSource.Token;
+
+            Task.Run(Initialize, PollToken);
+        }
+
+        public void UpdateConfig(object config)
+        {
+            if (config is ControllerInputViewModel padConfig)
+            {
+                GamepadConfig = padConfig.Config;
+                Type = DeviceType.Controller;
+
+                return;
+            }
+            else if (config is KeyboardInputViewModel keyConfig)
+            {
+                KeyboardConfig = keyConfig.Config;
+                Type = DeviceType.Keyboard;
+
+                return;
+            }
+
+            Type = DeviceType.None;
+        }
+
+        public async Task Initialize()
+        {
+            (float, float) leftBuffer;
+            (float, float) rightBuffer;
+
+            while (!PollToken.IsCancellationRequested)
+            {
+                leftBuffer = (0f, 0f);
+                rightBuffer = (0f, 0f);
+
+                switch (Type)
+                {
+                    case DeviceType.Keyboard:
+                        IKeyboard keyboard = (IKeyboard)Parent.AvaloniaKeyboardDriver.GetGamepad("0");
+
+                        if (keyboard != null)
+                        {
+                            KeyboardStateSnapshot snapshot = keyboard.GetKeyboardStateSnapshot();
+
+                            if (snapshot.IsPressed((Key)KeyboardConfig.LeftStickRight))
+                            {
+                                leftBuffer.Item1 += 1;
+                            }
+                            if (snapshot.IsPressed((Key)KeyboardConfig.LeftStickLeft))
+                            {
+                                leftBuffer.Item1 -= 1;
+                            }
+                            if (snapshot.IsPressed((Key)KeyboardConfig.LeftStickUp))
+                            {
+                                leftBuffer.Item2 += 1;
+                            }
+                            if (snapshot.IsPressed((Key)KeyboardConfig.LeftStickDown))
+                            {
+                                leftBuffer.Item2 -= 1;
+                            }
+
+                            if (snapshot.IsPressed((Key)KeyboardConfig.RightStickRight))
+                            {
+                                rightBuffer.Item1 += 1;
+                            }
+                            if (snapshot.IsPressed((Key)KeyboardConfig.RightStickLeft))
+                            {
+                                rightBuffer.Item1 -= 1;
+                            }
+                            if (snapshot.IsPressed((Key)KeyboardConfig.RightStickUp))
+                            {
+                                rightBuffer.Item2 += 1;
+                            }
+                            if (snapshot.IsPressed((Key)KeyboardConfig.RightStickDown))
+                            {
+                                rightBuffer.Item2 -= 1;
+                            }
+
+                            UiStickLeft = leftBuffer;
+                            UiStickRight = rightBuffer;
+                        }
+                        break;
+
+                    case DeviceType.Controller:
+                        IGamepad controller = Parent.SelectedGamepad;
+
+                        if (controller != null)
+                        {
+                            leftBuffer = controller.GetStick((StickInputId)GamepadConfig.LeftJoystick);
+                            rightBuffer = controller.GetStick((StickInputId)GamepadConfig.RightJoystick);
+                        }
+                        break;
+
+                    case DeviceType.None:
+                        break;
+                    default:
+                        throw new ArgumentException($"Unable to poll device type \"{Type}\"");
+                }
+
+                UiStickLeft = leftBuffer;
+                UiStickRight = rightBuffer;
+
+                await Task.Delay(DrawStickPollRate, PollToken);
+            }
+
+            PollTokenSource.Dispose();
+        }
+
+        public static (float, float) ClampVector((float, float) vect)
+        {
+            _vectorMultiplier = 1;
+            _vectorLength = MathF.Sqrt((vect.Item1 * vect.Item1) + (vect.Item2 * vect.Item2));
+
+            if (_vectorLength > MaxVectorLength)
+            {
+                _vectorMultiplier = MaxVectorLength / _vectorLength;
+            }
+
+            vect.Item1 = vect.Item1 * _vectorMultiplier + DrawStickCanvasCenter;
+            vect.Item2 = vect.Item2 * _vectorMultiplier + DrawStickCanvasCenter;
+
+            return vect;
+        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!disposedValue)
+            {
+                if (disposing)
+                {
+                    PollTokenSource.Cancel();
+                }
+
+                KeyboardConfig = null;
+                GamepadConfig = null;
+                Parent = null;
+
+                disposedValue = true;
+            }
+        }
+
+        public void Dispose()
+        {
+            Dispose(disposing: true);
+            GC.SuppressFinalize(this);
+        }
+    }
+}

src/Ryujinx/UI/ViewModels/Input/ControllerInputViewModel.cs

@@ -1,5 +1,9 @@
 using Avalonia.Svg.Skia;
 using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using FluentAvalonia.UI.Controls;
+using Ryujinx.Ava.Input;
+using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Models.Input;
 using Ryujinx.Ava.UI.Views.Input;
 using Ryujinx.Common.Utilities;
@@ -10,8 +14,30 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 {
     public partial class ControllerInputViewModel : BaseModel
     {
-        [ObservableProperty] private GamepadInputConfig _config;
+        private GamepadInputConfig _config;
+        public GamepadInputConfig Config
+        {
+            get => _config;
+            set
+            {
+                _config = value;
 
+                OnPropertyChanged();
+            }
+        }
+
+        private StickVisualizer _visualizer;
+        public StickVisualizer Visualizer
+        {
+            get => _visualizer;
+            set
+            {
+                _visualizer = value;
+
+                OnPropertyChanged();
+            }
+        }
+        
         private bool _isLeft;
         public bool IsLeft
         {
@@ -37,14 +63,15 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         }
 
         public bool HasSides => IsLeft ^ IsRight;
-
+        
         [ObservableProperty] private SvgImage _image;
-
+        
         public InputViewModel ParentModel { get; }
-
-        public ControllerInputViewModel(InputViewModel model, GamepadInputConfig config)
+        
+        public ControllerInputViewModel(InputViewModel model, GamepadInputConfig config, StickVisualizer visualizer)
         {
             ParentModel = model;
+            Visualizer = visualizer;
             model.NotifyChangesEvent += OnParentModelChanged;
             OnParentModelChanged();
             config.PropertyChanged += (_, args) =>

src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs

@@ -49,7 +49,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         private int _controller;
         private string _controllerImage;
         private int _device;
-        [ObservableProperty] private object _configViewModel;
+        private object _configViewModel;
         [ObservableProperty] private string _profileName;
         private bool _isLoaded;
 
@@ -74,6 +74,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                 OnPropertiesChanged(nameof(HasLed), nameof(CanClearLed));
             }
         }
+        public StickVisualizer VisualStick { get; private set; }
 
         public ObservableCollection<PlayerModel> PlayerIndexes { get; set; }
         public ObservableCollection<(DeviceType Type, string Id, string Name)> Devices { get; set; }
@@ -94,6 +95,19 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         public bool IsModified { get; set; }
         public event Action NotifyChangesEvent;
 
+        public object ConfigViewModel
+        {
+            get => _configViewModel;
+            set
+            {
+                _configViewModel = value;
+
+                VisualStick.UpdateConfig(value);
+
+                OnPropertyChanged();
+            }
+        }
+
         public PlayerIndex PlayerIdChoose
         {
             get => _playerIdChoose;
@@ -269,6 +283,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             Devices = [];
             ProfilesList = [];
             DeviceList = [];
+            VisualStick = new StickVisualizer(this);
 
             ControllerImage = ProControllerResource;
 
@@ -289,12 +304,12 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
             if (Config is StandardKeyboardInputConfig keyboardInputConfig)
             {
-                ConfigViewModel = new KeyboardInputViewModel(this, new KeyboardInputConfig(keyboardInputConfig));
+                ConfigViewModel = new KeyboardInputViewModel(this, new KeyboardInputConfig(keyboardInputConfig), VisualStick);
             }
 
             if (Config is StandardControllerInputConfig controllerInputConfig)
             {
-                ConfigViewModel = new ControllerInputViewModel(this, new GamepadInputConfig(controllerInputConfig));
+                ConfigViewModel = new ControllerInputViewModel(this, new GamepadInputConfig(controllerInputConfig), VisualStick);
             }
         }
 
@@ -893,6 +908,8 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
             _mainWindow.ViewModel.AppHost?.NpadManager.UnblockInputUpdates();
 
+            VisualStick.Dispose();
+
             SelectedGamepad?.Dispose();
 
             AvaloniaKeyboardDriver.Dispose();

src/Ryujinx/UI/ViewModels/Input/KeyboardInputViewModel.cs

@@ -6,7 +6,29 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 {
     public partial class KeyboardInputViewModel : BaseModel
     {
-        [ObservableProperty] private KeyboardInputConfig _config;
+        private KeyboardInputConfig _config;
+        public KeyboardInputConfig Config
+        {
+            get => _config;
+            set
+            {
+                _config = value;
+
+                OnPropertyChanged();
+            }
+        }
+
+        private StickVisualizer _visualizer;
+        public StickVisualizer Visualizer
+        {
+            get => _visualizer;
+            set
+            {
+                _visualizer = value;
+
+                OnPropertyChanged();
+            }
+        }
 
         private bool _isLeft;
         public bool IsLeft
@@ -38,9 +60,10 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
         public readonly InputViewModel ParentModel;
 
-        public KeyboardInputViewModel(InputViewModel model, KeyboardInputConfig config)
+        public KeyboardInputViewModel(InputViewModel model, KeyboardInputConfig config, StickVisualizer visualizer)
         {
             ParentModel = model;
+            Visualizer = visualizer;
             model.NotifyChangesEvent += OnParentModelChanged;
             OnParentModelChanged();
             Config = config;

src/Ryujinx/UI/Views/Input/ControllerInputView.axaml

@@ -316,17 +316,103 @@
                 HorizontalAlignment="Stretch"
                 VerticalAlignment="Stretch">
                 <!-- Controller Picture -->
-                <Image
-                    Margin="0,10"
-                    MaxHeight="300"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Stretch"
-                    Source="{Binding Image}" />
                 <Border
                     BorderBrush="{DynamicResource ThemeControlBorderColor}"
                     BorderThickness="1"
                     CornerRadius="5"
+                    Margin="0,10"
                     MinHeight="90">
+                    <StackPanel Orientation="Vertical">
+                        <Image
+                            Margin="5,10"
+                            MaxHeight="300"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Stretch"
+                            Source="{Binding Image}" />
+                        <StackPanel
+                            Margin="10"
+                            Orientation="Horizontal"
+                            Spacing="20"
+                            HorizontalAlignment="Center">
+                            <Border
+                                BorderBrush="{DynamicResource ThemeControlBorderColor}"
+                                BorderThickness="1"
+                                CornerRadius="5"
+                                Height="{Binding Visualizer.UiStickBorderSize}"
+                                Width="{Binding Visualizer.UiStickBorderSize}"
+                                IsVisible="{Binding IsLeft}">
+                                <Canvas
+                                    Background="{DynamicResource ThemeBackgroundColor}"
+                                    Height="{Binding Visualizer.UiCanvasSize}"
+                                    Width="{Binding Visualizer.UiCanvasSize}">
+                                    <Grid
+                                        Height="{Binding Visualizer.UiCanvasSize}"
+                                        Width="{Binding Visualizer.UiCanvasSize}"
+                                        Background="{DynamicResource ThemeBackgroundColor}">
+                                        <Ellipse
+                                            HorizontalAlignment="Center"
+                                            Stroke="Black"
+                                            StrokeThickness="1"
+                                            Width="{Binding Visualizer.UiCanvasSize}"
+                                            Height="{Binding Visualizer.UiCanvasSize}" />
+                                        <Ellipse
+                                            HorizontalAlignment="Center"
+                                            Fill="Gray"
+                                            Opacity="100"
+                                            Height="{Binding Visualizer.UiDeadzoneLeft}"
+                                            Width="{Binding Visualizer.UiDeadzoneLeft}" />
+                                    </Grid>
+                                    <Ellipse
+                                        Fill="Red"
+                                        Width="{Binding Visualizer.UiStickCircumference}"
+                                        Height="{Binding Visualizer.UiStickCircumference}"
+                                        Canvas.Bottom="{Binding Visualizer.UiStickLeftY}"
+                                        Canvas.Left="{Binding Visualizer.UiStickLeftX}" />
+                                </Canvas>
+                            </Border>
+                            <Border
+                                BorderBrush="{DynamicResource ThemeControlBorderColor}"
+                                BorderThickness="1"
+                                CornerRadius="5"
+                                Height="{Binding Visualizer.UiStickBorderSize}"
+                                Width="{Binding Visualizer.UiStickBorderSize}"
+                                IsVisible="{Binding IsRight}">
+                                <Canvas
+                                    Background="{DynamicResource ThemeBackgroundColor}"
+                                    Height="{Binding Visualizer.UiCanvasSize}"
+                                    Width="{Binding Visualizer.UiCanvasSize}">
+                                    <Grid
+                                        Height="{Binding Visualizer.UiCanvasSize}"
+                                        Width="{Binding Visualizer.UiCanvasSize}"
+                                        Background="{DynamicResource ThemeBackgroundColor}">
+                                        <Ellipse
+                                            HorizontalAlignment="Center"
+                                            Stroke="Black"
+                                            StrokeThickness="1"
+                                            Width="{Binding Visualizer.UiCanvasSize}"
+                                            Height="{Binding Visualizer.UiCanvasSize}" />
+                                        <Ellipse
+                                            HorizontalAlignment="Center"
+                                            Fill="Gray"
+                                            Opacity="100"
+                                            Height="{Binding Visualizer.UiDeadzoneRight}"
+                                            Width="{Binding Visualizer.UiDeadzoneRight}" />
+                                    </Grid>
+                                    <Ellipse
+                                        Fill="Red"
+                                        Width="{Binding Visualizer.UiStickCircumference}"
+                                        Height="{Binding Visualizer.UiStickCircumference}"
+                                        Canvas.Bottom="{Binding Visualizer.UiStickRightY}"
+                                        Canvas.Left="{Binding Visualizer.UiStickRightX}" />
+                                </Canvas>
+                            </Border>
+                        </StackPanel>
+                    </StackPanel>
+                </Border>
+                <Border
+                    BorderBrush="{DynamicResource ThemeControlBorderColor}"
+                    BorderThickness="1"
+                    CornerRadius="5">
                     <StackPanel
                         Margin="8"
                         Orientation="Vertical">
@@ -345,8 +431,8 @@
                                 Minimum="0"
                                 Value="{Binding Config.TriggerThreshold, Mode=TwoWay}" />
                             <TextBlock
-                              Width="25"
-                              Text="{Binding Config.TriggerThreshold, StringFormat=\{0:0.00\}}" />
+                                Width="25"
+                                Text="{Binding Config.TriggerThreshold, StringFormat=\{0:0.00\}}" />
                         </StackPanel>
                         <StackPanel
                             Orientation="Vertical"

src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml

@@ -309,12 +309,79 @@
                 HorizontalAlignment="Stretch"
                 VerticalAlignment="Stretch">
                 <!-- Controller Picture -->
-                <Image
+                <Border
+                    BorderBrush="{DynamicResource ThemeControlBorderColor}"
+                    BorderThickness="1"
+                    CornerRadius="5"
                     Margin="0,10"
-                    MaxHeight="300"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Stretch"
-                    Source="{Binding Image}" />
+                    MinHeight="90">
+                    <StackPanel
+                        Margin="10"
+                        Orientation="Horizontal"
+                        Spacing="20"
+                        HorizontalAlignment="Center">
+                        <Border
+                            BorderBrush="{DynamicResource ThemeControlBorderColor}"
+                            BorderThickness="1"
+                            CornerRadius="5"
+                            Height="{Binding Visualizer.UiStickBorderSize}"
+                            Width="{Binding Visualizer.UiStickBorderSize}"
+                            IsVisible="{Binding IsLeft}">
+                            <Canvas
+                                Background="{DynamicResource ThemeBackgroundColor}"
+                                Height="{Binding Visualizer.UiCanvasSize}"
+                                Width="{Binding Visualizer.UiCanvasSize}">
+                                <Grid
+                                    Height="{Binding Visualizer.UiCanvasSize}"
+                                    Width="{Binding Visualizer.UiCanvasSize}"
+                                    Background="{DynamicResource ThemeBackgroundColor}">
+                                    <Ellipse
+                                        HorizontalAlignment="Center"
+                                        Stroke="Black"
+                                        StrokeThickness="1"
+                                        Width="{Binding Visualizer.UiCanvasSize}"
+                                        Height="{Binding Visualizer.UiCanvasSize}"/>
+                                </Grid>
+                                <Ellipse
+                                        Fill="Red" 
+                                        Width="{Binding Visualizer.UiStickCircumference}" 
+                                        Height="{Binding Visualizer.UiStickCircumference}" 
+                                        Canvas.Bottom="{Binding Visualizer.UiStickLeftY}" 
+                                        Canvas.Left="{Binding Visualizer.UiStickLeftX}" />
+                            </Canvas>
+                        </Border>        
+                        <Border
+                            BorderBrush="{DynamicResource ThemeControlBorderColor}"
+                            BorderThickness="1"
+                            CornerRadius="5"
+                            Height="{Binding Visualizer.UiStickBorderSize}"
+                            Width="{Binding Visualizer.UiStickBorderSize}"
+                            IsVisible="{Binding IsRight}">
+                            <Canvas
+                                Background="{DynamicResource ThemeBackgroundColor}"
+                                Height="{Binding Visualizer.UiCanvasSize}"
+                                Width="{Binding Visualizer.UiCanvasSize}">
+                                <Grid
+                                    Height="{Binding Visualizer.UiCanvasSize}"
+                                    Width="{Binding Visualizer.UiCanvasSize}"
+                                    Background="{DynamicResource ThemeBackgroundColor}">
+                                    <Ellipse
+                                        HorizontalAlignment="Center"
+                                        Stroke="Black"
+                                        StrokeThickness="1"
+                                        Width="{Binding Visualizer.UiCanvasSize}"
+                                        Height="{Binding Visualizer.UiCanvasSize}"/>
+                                </Grid>
+                                <Ellipse
+                                        Fill="Red" 
+                                        Width="{Binding Visualizer.UiStickCircumference}" 
+                                        Height="{Binding Visualizer.UiStickCircumference}" 
+                                        Canvas.Bottom="{Binding Visualizer.UiStickRightY}" 
+                                        Canvas.Left="{Binding Visualizer.UiStickRightX}" />
+                            </Canvas>
+                        </Border>        
+                    </StackPanel>
+                </Border>
                 <Border
                     BorderBrush="{DynamicResource ThemeControlBorderColor}"
                     BorderThickness="1"

src/Ryujinx/UI/Windows/SettingsWindow.axaml

@@ -12,7 +12,7 @@
     xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
     xmlns:helper="clr-namespace:Ryujinx.Common.Helper;assembly=Ryujinx.Common"
     Width="1100"
-    Height="768"
+    Height="850"
     MinWidth="800"
     MinHeight="480"
     WindowStartupLocation="CenterOwner"

src/Ryujinx/Utilities/AppLibrary/ApplicationData.cs

@@ -63,9 +63,6 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
         public int GameCount { get; set; }
 
         public bool HasLdnGames => PlayerCount != 0 && GameCount != 0;
-
-        public bool HasRichPresenceAsset => DiscordIntegrationModule.HasAssetImage(IdString);
-        public bool HasDynamicRichPresenceSupport => DiscordIntegrationModule.HasAnalyzer(IdString);
         
         public TimeSpan TimePlayed { get; set; }
         public DateTime? LastPlayed { get; set; }

src/Ryujinx/Utilities/PlayReport/Analyzer.cs

@@ -3,7 +3,6 @@ using MsgPack;
 using Ryujinx.Ava.Utilities.AppLibrary;
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Globalization;
 using System.Linq;
 
@@ -16,10 +15,6 @@ namespace Ryujinx.Ava.Utilities.PlayReport
     {
         private readonly List<GameSpec> _specs = [];
 
-        public string[] TitleIds => Specs.SelectMany(x => x.TitleIds).ToArray();
-
-        public IReadOnlyList<GameSpec> Specs => new ReadOnlyCollection<GameSpec>(_specs);
-
         /// <summary>
         /// Add an analysis spec matching a specific game by title ID, with the provided spec configuration.
         /// </summary>
@@ -31,7 +26,8 @@ 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)}.");
 
-            return AddSpec(transform(GameSpec.Create(titleId)));
+            _specs.Add(transform(new GameSpec { TitleIds = [titleId] }));
+            return this;
         }
 
         /// <summary>
@@ -45,7 +41,8 @@ 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)}.");
 
-            return AddSpec(GameSpec.Create(titleId).Apply(transform));
+            _specs.Add(new GameSpec { TitleIds = [titleId] }.Apply(transform));
+            return this;
         }
 
         /// <summary>
@@ -61,7 +58,8 @@ 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)}.");
 
-            return AddSpec(transform(GameSpec.Create(tids)));
+            _specs.Add(transform(new GameSpec { TitleIds = [..tids] }));
+            return this;
         }
 
         /// <summary>
@@ -76,23 +74,13 @@ 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)}.");
 
-            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);
+            _specs.Add(new GameSpec { TitleIds = [..tids] }.Apply(transform));
             return this;
         }
 
 
         /// <summary>
-        /// Runs the configured <see cref="FormatterSpec"/> for the specified game title ID.
+        /// Runs the configured <see cref="GameSpec.FormatterSpec"/> for the specified game title ID.
         /// </summary>
         /// <param name="runningGameId">The game currently running.</param>
         /// <param name="appMeta">The Application metadata information, including localized game name and play time information.</param>
@@ -101,21 +89,54 @@ namespace Ryujinx.Ava.Utilities.PlayReport
         public FormattedValue Format(
             string runningGameId,
             ApplicationMetadata appMeta,
-            Horizon.Prepo.Types.PlayReport playReport
+            MessagePackObject playReport
         )
         {
-            if (!playReport.ReportData.IsDictionary)
+            if (!playReport.IsDictionary)
                 return FormattedValue.Unhandled;
 
             if (!_specs.TryGetFirst(s => runningGameId.EqualsAnyIgnoreCase(s.TitleIds), out GameSpec spec))
                 return FormattedValue.Unhandled;
 
-            foreach (FormatterSpecBase formatSpec in spec.ValueFormatters.OrderBy(x => x.Priority))
+            foreach (FormatterSpec formatSpec in spec.SimpleValueFormatters.OrderBy(x => x.Priority))
             {
-                if (!formatSpec.Format(appMeta, playReport, out FormattedValue value))
+                if (!playReport.AsDictionary().TryGetValue(formatSpec.ReportKey, out MessagePackObject valuePackObject))
                     continue;
 
-                return value;
+                return formatSpec.Formatter(new Value { Application = appMeta, PackedValue = valuePackObject });
+            }
+
+            foreach (MultiFormatterSpec formatSpec in spec.MultiValueFormatters.OrderBy(x => x.Priority))
+            {
+                List<MessagePackObject> packedObjects = [];
+                foreach (var reportKey in formatSpec.ReportKeys)
+                {
+                    if (!playReport.AsDictionary().TryGetValue(reportKey, out MessagePackObject valuePackObject))
+                        continue;
+
+                    packedObjects.Add(valuePackObject);
+                }
+
+                if (packedObjects.Count != formatSpec.ReportKeys.Length)
+                    return FormattedValue.Unhandled;
+
+                return formatSpec.Formatter(packedObjects
+                    .Select(packObject => new Value { Application = appMeta, PackedValue = packObject })
+                    .ToArray());
+            }
+
+            foreach (SparseMultiFormatterSpec formatSpec in spec.SparseMultiValueFormatters.OrderBy(x => x.Priority))
+            {
+                Dictionary<string, Value> packedObjects = [];
+                foreach (var reportKey in formatSpec.ReportKeys)
+                {
+                    if (!playReport.AsDictionary().TryGetValue(reportKey, out MessagePackObject valuePackObject))
+                        continue;
+
+                    packedObjects.Add(reportKey, new Value { Application = appMeta, PackedValue = valuePackObject });
+                }
+
+                return formatSpec.Formatter(packedObjects);
             }
 
             return FormattedValue.Unhandled;

src/Ryujinx/Utilities/PlayReport/Delegates.cs

@@ -1,4 +1,6 @@
-namespace Ryujinx.Ava.Utilities.PlayReport
+using System.Collections.Generic;
+
+namespace Ryujinx.Ava.Utilities.PlayReport
 {
     /// <summary>
     /// The delegate type that powers single value formatters.<br/>
@@ -10,7 +12,7 @@
     /// <br/>
     /// OR a signal to reset the value that the caller is using the <see cref="Analyzer"/> for. 
     /// </summary>
-    public delegate FormattedValue SingleValueFormatter(SingleValue value);
+    public delegate FormattedValue ValueFormatter(Value value);
 
     /// <summary>
     /// The delegate type that powers multiple value formatters.<br/>
@@ -22,7 +24,7 @@
     /// <br/>
     /// OR a signal to reset the value that the caller is using the <see cref="Analyzer"/> for. 
     /// </summary>
-    public delegate FormattedValue MultiValueFormatter(MultiValue value);
+    public delegate FormattedValue MultiValueFormatter(Value[] value);
 
     /// <summary>
     /// The delegate type that powers multiple value formatters.
@@ -36,5 +38,5 @@
     /// <br/>
     /// OR a signal to reset the value that the caller is using the <see cref="Analyzer"/> for. 
     /// </summary>
-    public delegate FormattedValue SparseMultiValueFormatter(SparseMultiValue value);
+    public delegate FormattedValue SparseMultiValueFormatter(Dictionary<string, Value> values);
 }

src/Ryujinx/Utilities/PlayReport/MatchedValues.cs

@@ -1,74 +0,0 @@
-using MsgPack;
-using Ryujinx.Ava.Utilities.AppLibrary;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Ryujinx.Ava.Utilities.PlayReport
-{
-    public abstract class MatchedValue<T>
-    {
-        protected MatchedValue(T matched)
-        {
-            Matched = matched;
-        }
-        
-        /// <summary>
-        /// The currently running application's <see cref="ApplicationMetadata"/>.
-        /// </summary>
-        public ApplicationMetadata Application { get; init; }
-        
-        /// <summary>
-        /// The entire play report.
-        /// </summary>
-        public Horizon.Prepo.Types.PlayReport PlayReport { get; init; }
-
-        /// <summary>
-        /// The matched value from the Play Report.
-        /// </summary>
-        public T Matched { get; init; }
-    }
-    
-    /// <summary>
-    /// 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>
-    public class SingleValue : MatchedValue<Value>
-    {
-        public SingleValue(Value matched) : base(matched)
-        {
-        }
-    }
-
-    /// <summary>
-    /// The input data to a <see cref="MultiValueFormatter"/>,
-    /// containing the currently running application's <see cref="ApplicationMetadata"/>,
-    /// and the matched <see cref="MessagePackObject"/>s from the Play Report.
-    /// </summary>
-    public class MultiValue : MatchedValue<Value[]>
-    {
-        public MultiValue(Value[] matched) : base(matched)
-        {
-        }
-
-        public MultiValue(IEnumerable<MessagePackObject> matched) : base(Value.ConvertPackedObjects(matched))
-        {
-        }
-    }
-
-    /// <summary>
-    /// The input data to a <see cref="SparseMultiValueFormatter"/>,
-    /// containing the currently running application's <see cref="ApplicationMetadata"/>,
-    /// and the matched <see cref="MessagePackObject"/>s from the Play Report.
-    /// </summary>
-    public class SparseMultiValue : MatchedValue<Dictionary<string, Value>>
-    {
-        public SparseMultiValue(Dictionary<string, Value> matched) : base(matched)
-        {
-        }
-        
-        public SparseMultiValue(Dictionary<string, MessagePackObject> matched) : base(Value.ConvertPackedObjectMap(matched))
-        {
-        }
-    }
-}

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

@@ -1,626 +0,0 @@
-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
-        };
-    }
-}

src/Ryujinx/Utilities/PlayReport/PlayReports.cs

@@ -1,11 +1,6 @@
-using System;
-using System.Buffers.Binary;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Ryujinx.Ava.Utilities.PlayReport
+namespace Ryujinx.Ava.Utilities.PlayReport
 {
-    public static partial class PlayReports
+    public static class PlayReports
     {
         public static Analyzer Analyzer { get; } = new Analyzer()
             .AddSpec(
@@ -42,32 +37,91 @@ namespace Ryujinx.Ava.Utilities.PlayReport
                 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 string Playing(string game) => $"Playing {game}";
+        private static FormattedValue BreathOfTheWild_MasterMode(Value value)
+            => value.BoxedValue is 1 ? "Playing Master Mode" : FormattedValue.ForceReset;
+
+        private static FormattedValue TearsOfTheKingdom_CurrentField(Value value) =>
+            value.DoubleValue switch
+            {
+                > 800d => "Exploring the Sky Islands",
+                < -201d => "Exploring the Depths",
+                _ => "Roaming Hyrule"
+            };
+
+        private static FormattedValue SuperMarioOdyssey_AssistMode(Value value)
+            => value.BoxedValue is 1 ? "Playing in Assist Mode" : "Playing in Regular Mode";
+
+        private static FormattedValue SuperMarioOdysseyChina_AssistMode(Value value)
+            => value.BoxedValue is 1 ? "Playing in 帮助模式" : "Playing in 普通模式";
+
+        private static FormattedValue SuperMario3DWorldOrBowsersFury(Value value)
+            => value.BoxedValue is 0 ? "Playing Super Mario 3D World" : "Playing Bowser's Fury";
+        
+        private static FormattedValue MarioKart8Deluxe_Mode(Value value) 
+            => value.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(Value value)
+            => value.BoxedValue is 0 ? "Playing Alone" : "Playing in a group";
+
+        private static FormattedValue PokemonSVArea(Value value) 
+            => value.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
+            };
     }
 }

src/Ryujinx/Utilities/PlayReport/Specs.cs

@@ -1,7 +1,4 @@
 using FluentAvalonia.Core;
-using MsgPack;
-using Ryujinx.Ava.Utilities.AppLibrary;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -14,17 +11,10 @@ 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; } = [];
+        public List<FormatterSpec> SimpleValueFormatters { get; } = [];
+        public List<MultiFormatterSpec> MultiValueFormatters { get; } = [];
+        public List<SparseMultiFormatterSpec> SparseMultiValueFormatters { get; } = [];
 
 
         /// <summary>
@@ -34,10 +24,8 @@ 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, ValueFormatter valueFormatter)
+            => AddValueFormatter(SimpleValueFormatters.Count, reportKey, valueFormatter);
 
         /// <summary>
         /// Add a value formatter at a specific priority to the current <see cref="GameSpec"/>
@@ -47,14 +35,15 @@ 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
-        ) => AddValueFormatter(new FormatterSpec
+        public GameSpec AddValueFormatter(int priority, string reportKey,
+            ValueFormatter valueFormatter)
         {
-            Priority = priority, ReportKeys = [reportKey], Formatter = valueFormatter
-        });
+            SimpleValueFormatters.Add(new FormatterSpec
+            {
+                Priority = priority, ReportKey = reportKey, Formatter = valueFormatter
+            });
+            return this;
+        }
 
         /// <summary>
         /// Add a multi-value formatter to the current <see cref="GameSpec"/>
@@ -63,10 +52,8 @@ 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(MultiValueFormatters.Count, reportKeys, valueFormatter);
 
         /// <summary>
         /// Add a multi-value formatter at a specific priority to the current <see cref="GameSpec"/>
@@ -76,14 +63,15 @@ 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
-        ) => AddValueFormatter(new MultiFormatterSpec
+        public GameSpec AddMultiValueFormatter(int priority, string[] reportKeys,
+            MultiValueFormatter valueFormatter)
         {
-            Priority = priority, ReportKeys = reportKeys, Formatter = valueFormatter
-        });
+            MultiValueFormatters.Add(new MultiFormatterSpec
+            {
+                Priority = priority, ReportKeys = reportKeys, Formatter = valueFormatter
+            });
+            return this;
+        }
 
         /// <summary>
         /// Add a multi-value formatter to the current <see cref="GameSpec"/>
@@ -95,10 +83,8 @@ 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(SparseMultiValueFormatters.Count, reportKeys, valueFormatter);
 
         /// <summary>
         /// Add a multi-value formatter at a specific priority to the current <see cref="GameSpec"/>
@@ -111,18 +97,13 @@ 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
-        ) => AddValueFormatter(new SparseMultiFormatterSpec
+        public GameSpec AddSparseMultiValueFormatter(int priority, string[] reportKeys,
+            SparseMultiValueFormatter valueFormatter)
         {
-            Priority = priority, ReportKeys = reportKeys, Formatter = valueFormatter
-        });
-
-        private GameSpec AddValueFormatter<T>(T formatterSpec) where T : FormatterSpecBase
-        {
-            ValueFormatters.Add(formatterSpec);
+            SparseMultiValueFormatters.Add(new SparseMultiFormatterSpec
+            {
+                Priority = priority, ReportKeys = reportKeys, Formatter = valueFormatter
+            });
             return this;
         }
     }
@@ -130,107 +111,30 @@ 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 class FormatterSpec : FormatterSpecBase
+    public struct FormatterSpec
     {
-        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;
-        }
+        public required int Priority { get; init; }
+        public required string ReportKey { get; init; }
+        public ValueFormatter Formatter { get; init; }
     }
 
     /// <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 class MultiFormatterSpec : FormatterSpecBase
+    public struct MultiFormatterSpec
     {
-        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;
-        }
+        public required int Priority { get; init; }
+        public required string[] ReportKeys { get; init; }
+        public MultiValueFormatter Formatter { get; init; }
     }
 
     /// <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 class SparseMultiFormatterSpec : FormatterSpecBase
+    public struct SparseMultiFormatterSpec
     {
-        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 mpo:
-                    formattedValue = svf(new SingleValue(mpo) { Application = appMeta, PlayReport = playReport });
-                    return true;
-                case MultiValueFormatter mvf when data is List<MessagePackObject> messagePackObjects:
-                    formattedValue =
-                        mvf(new MultiValue(messagePackObjects) { 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
-                        });
-                    return true;
-                default:
-                    throw new InvalidOperationException("Formatter delegate is not of a known type!");
-            }
-        }
+        public required int Priority { get; init; }
+        public required string[] ReportKeys { get; init; }
+        public SparseMultiValueFormatter Formatter { get; init; }
     }
 }

src/Ryujinx/Utilities/PlayReport/Value.cs

@@ -1,20 +1,20 @@
 using MsgPack;
+using Ryujinx.Ava.Utilities.AppLibrary;
 using System;
-using System.Collections.Generic;
-using System.Linq;
 
 namespace Ryujinx.Ava.Utilities.PlayReport
 {
     /// <summary>
-    /// The base input data to a ValueFormatter delegate,
+    /// The input data to a <see cref="ValueFormatter"/>,
+    /// containing the currently running application's <see cref="ApplicationMetadata"/>,
     /// and the matched <see cref="MessagePackObject"/> from the Play Report.
     /// </summary>
-    public readonly struct Value
+    public class Value
     {
-        public Value(MessagePackObject packedValue)
-        {
-            PackedValue = packedValue;
-        }
+        /// <summary>
+        /// The currently running application's <see cref="ApplicationMetadata"/>.
+        /// </summary>
+        public ApplicationMetadata Application { get; init; }
 
         /// <summary>
         /// The matched value from the Play Report.
@@ -37,17 +37,6 @@ namespace Ryujinx.Ava.Utilities.PlayReport
                 : boxed.ToString();
         }
 
-        public static implicit operator Value(MessagePackObject matched) => new(matched);
-
-        public static Value[] ConvertPackedObjects(IEnumerable<MessagePackObject> packObjects)
-            => packObjects.Select(packObject => new Value(packObject)).ToArray();
-
-        public static Dictionary<string, Value> ConvertPackedObjectMap(Dictionary<string, MessagePackObject> packObjects)
-            => packObjects.ToDictionary(
-                x => x.Key,
-                x => new Value(x.Value)
-            );
-
         #region AsX accessors
 
         public bool BooleanValue => PackedValue.AsBoolean();
@@ -68,7 +57,7 @@ namespace Ryujinx.Ava.Utilities.PlayReport
     }
 
     /// <summary>
-    /// A potential formatted value returned by a ValueFormatter delegate.
+    /// A potential formatted value returned by a <see cref="ValueFormatter"/>.
     /// </summary>
     public readonly struct FormattedValue
     {
@@ -114,47 +103,28 @@ namespace Ryujinx.Ava.Utilities.PlayReport
         /// <summary>
         /// Return this to tell the caller there is no value to return.
         /// </summary>
-        public static readonly FormattedValue Unhandled = default;
+        public static FormattedValue Unhandled => default;
 
         /// <summary>
         /// Return this to suggest the caller reset the value it's using the <see cref="Analyzer"/> for.
         /// </summary>
-        public static readonly FormattedValue ForceReset = new() { Handled = true, Reset = true };
+        public static FormattedValue ForceReset => new() { Handled = true, Reset = true };
 
         /// <summary>
-        /// A delegate singleton you can use to always return <see cref="ForceReset"/> in a <see cref="SingleValueFormatter"/>.
+        /// A delegate singleton you can use to always return <see cref="ForceReset"/> in a <see cref="ValueFormatter"/>.
         /// </summary>
-        public static readonly SingleValueFormatter SingleAlwaysResets = _ => ForceReset;
+        public static readonly ValueFormatter 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="SingleValueFormatter"/>.
+        /// <paramref name="formattedValue"/> in a <see cref="ValueFormatter"/>.
         /// </summary>
         /// <param name="formattedValue">The string to always return for this delegate instance.</param>
-        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;
+        public static ValueFormatter AlwaysReturns(string formattedValue) => _ => formattedValue;
     }
 }