Merge a3afebd3a2 into aa8ba8b503

formatting pt.2

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

@@ -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": "",
-        "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": "",
-        "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,22 +120,20 @@ 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;
             if (_discordPresencePlaying is null) return;
 
-            FormattedValue formattedValue =
+            Analyzer.FormattedValue formattedValue =
                 PlayReports.Analyzer.Format(TitleIDs.CurrentApplication.Value, _currentApp, playReport);
 
             if (!formattedValue.Handled) return;
 
-            _discordPresencePlaying.Details = TruncateToByteLength(
-                formattedValue.Reset
-                    ? $"Playing {_currentApp.Title}"
-                    : formattedValue.FormattedString
-            );
+            _discordPresencePlaying.Details = formattedValue.Reset 
+                ? $"Playing {_currentApp.Title}" 
+                : formattedValue.FormattedString;
 
             if (_discordClient.CurrentPresence.Details.Equals(_discordPresencePlaying.Details))
                 return; //don't trigger an update if the set presence Details are identical to current

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>
@@ -83,9 +78,9 @@ namespace Ryujinx.Ava.Utilities.PlayReport
             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>
@@ -94,24 +89,270 @@ 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 (GameSpec.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.ValueFormatter(new Value
+                {
+                    Application = appMeta, PackedValue = valuePackObject
+                });
+            }
+            
+            foreach (GameSpec.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.ValueFormatter(packedObjects
+                    .Select(packObject => new Value { Application = appMeta, PackedValue = packObject })
+                    .ToArray());
             }
 
             return FormattedValue.Unhandled;
         }
+
+        /// <summary>
+        /// A potential formatted value returned by a <see cref="ValueFormatter"/>.
+        /// </summary>
+        public readonly struct FormattedValue
+        {
+            /// <summary>
+            /// Was any handler able to match anything in the Play Report?
+            /// </summary>
+            public bool Handled { get; private init; }
+
+            /// <summary>
+            /// Did the handler request the caller of the <see cref="Analyzer"/> to reset the existing value?
+            /// </summary>
+            public bool Reset { get; private init; }
+
+            /// <summary>
+            /// The formatted value, only present if <see cref="Handled"/> is true, and <see cref="Reset"/> is false.
+            /// </summary>
+            public string FormattedString { get; private init; }
+
+            /// <summary>
+            /// The intended path of execution for having a string to return: simply return the string.
+            /// This implicit conversion will make the struct for you.<br/><br/>
+            ///
+            /// If the input is null, <see cref="Unhandled"/> is returned.
+            /// </summary>
+            /// <param name="formattedValue">The formatted string value.</param>
+            /// <returns>The automatically constructed <see cref="FormattedValue"/> struct.</returns>
+            public static implicit operator FormattedValue(string formattedValue)
+                => formattedValue is not null 
+                    ? new FormattedValue { Handled = true, FormattedString = formattedValue }
+                    : Unhandled;
+
+            /// <summary>
+            /// Return this to tell the caller there is no value to return.
+            /// </summary>
+            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 FormattedValue ForceReset => new() { Handled = true, Reset = true };
+
+            /// <summary>
+            /// A delegate singleton you can use to always return <see cref="ForceReset"/> in a <see cref="ValueFormatter"/>.
+            /// </summary>
+            public static readonly ValueFormatter AlwaysResets = _ => ForceReset;
+
+            /// <summary>
+            /// A delegate factory you can use to always return the specified
+            /// <paramref name="formattedValue"/> in a <see cref="ValueFormatter"/>.
+            /// </summary>
+            /// <param name="formattedValue">The string to always return for this delegate instance.</param>
+            public static ValueFormatter AlwaysReturns(string formattedValue) => _ => formattedValue;
+        }
     }
+
+    /// <summary>
+    /// A mapping of title IDs to value formatter specs.
+    ///
+    /// <remarks>Generally speaking, use the <see cref="Analyzer"/>.AddSpec(...) methods instead of creating this class yourself.</remarks>
+    /// </summary>
+    public class GameSpec
+    {
+        public required string[] TitleIds { get; init; }
+        public List<FormatterSpec> SimpleValueFormatters { get; } = [];
+        public List<MultiFormatterSpec> MultiValueFormatters { get; } = [];
+
+        /// <summary>
+        /// Add a value formatter to the current <see cref="GameSpec"/>
+        /// matching a specific key that could exist in a Play Report for the previously specified title IDs.
+        /// </summary>
+        /// <param name="reportKey">The key name to match.</param>
+        /// <param name="valueFormatter">The function which can return a potential formatted value.</param>
+        /// <returns>The current <see cref="GameSpec"/>, for chaining convenience.</returns>
+        public GameSpec AddValueFormatter(string reportKey, ValueFormatter valueFormatter)
+        {
+            SimpleValueFormatters.Add(new FormatterSpec
+            {
+                Priority = SimpleValueFormatters.Count, ReportKey = reportKey, ValueFormatter = valueFormatter
+            });
+            return this;
+        }
+
+        /// <summary>
+        /// Add a value formatter at a specific priority to the current <see cref="GameSpec"/>
+        /// matching a specific key that could exist in a Play Report for the previously specified title IDs.
+        /// </summary>
+        /// <param name="priority">The resolution priority of this value formatter. Higher resolves sooner.</param>
+        /// <param name="reportKey">The key name to match.</param>
+        /// <param name="valueFormatter">The function which can return a potential formatted value.</param>
+        /// <returns>The current <see cref="GameSpec"/>, for chaining convenience.</returns>
+        public GameSpec AddValueFormatter(int priority, string reportKey,
+            ValueFormatter valueFormatter)
+        {
+            SimpleValueFormatters.Add(new FormatterSpec
+            {
+                Priority = priority, ReportKey = reportKey, ValueFormatter = valueFormatter
+            });
+            return this;
+        }
+        
+        /// <summary>
+        /// Add a multi-value formatter to the current <see cref="GameSpec"/>
+        /// matching a specific set of keys that could exist in a Play Report for the previously specified title IDs.
+        /// </summary>
+        /// <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)
+        {
+            MultiValueFormatters.Add(new MultiFormatterSpec
+            {
+                Priority = SimpleValueFormatters.Count, ReportKeys = reportKeys, ValueFormatter = valueFormatter
+            });
+            return this;
+        }
+        
+        /// <summary>
+        /// Add a multi-value formatter at a specific priority to the current <see cref="GameSpec"/>
+        /// matching a specific set of keys that could exist in a Play Report for the previously specified title IDs.
+        /// </summary>
+        /// <param name="priority">The resolution priority of this value formatter. Higher resolves sooner.</param>
+        /// <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)
+        {
+            MultiValueFormatters.Add(new MultiFormatterSpec
+            {
+                Priority = priority, ReportKeys = reportKeys, ValueFormatter = valueFormatter
+            });
+            return this;
+        }
+
+        /// <summary>
+        /// A struct containing the data for a mapping of a key in a Play Report to a formatter for its potential value.
+        /// </summary>
+        public struct FormatterSpec
+        {
+            public required int Priority { get; init; }
+            public required string ReportKey { get; init; }
+            public ValueFormatter ValueFormatter { 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 struct MultiFormatterSpec
+        {
+            public required int Priority { get; init; }
+            public required string[] ReportKeys { get; init; }
+            public MultiValueFormatter ValueFormatter { get; init; }
+        }
+    }
+
+    /// <summary>
+    /// 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 class Value
+    {
+        /// <summary>
+        /// The currently running application's <see cref="ApplicationMetadata"/>.
+        /// </summary>
+        public ApplicationMetadata Application { get; init; }
+
+        /// <summary>
+        /// The matched value from the Play Report.
+        /// </summary>
+        public MessagePackObject PackedValue { get; init; }
+
+        /// <summary>
+        /// Access the <see cref="PackedValue"/> as its underlying .NET type.<br/>
+        /// 
+        /// Does not seem to work well with comparing numeric types,
+        /// so use XValue properties for that.
+        /// </summary>
+        public object BoxedValue => PackedValue.ToObject();
+
+        #region AsX accessors
+
+        public bool BooleanValue => PackedValue.AsBoolean();
+        public byte ByteValye => PackedValue.AsByte();
+        public sbyte SByteValye => PackedValue.AsSByte();
+        public short ShortValye => PackedValue.AsInt16();
+        public ushort UShortValye => PackedValue.AsUInt16();
+        public int IntValye => PackedValue.AsInt32();
+        public uint UIntValye => PackedValue.AsUInt32();
+        public long LongValye => PackedValue.AsInt64();
+        public ulong ULongValye => PackedValue.AsUInt64();
+        public float FloatValue => PackedValue.AsSingle();
+        public double DoubleValue => PackedValue.AsDouble();
+        public string StringValue => PackedValue.AsString();
+        public Span<byte> BinaryValue => PackedValue.AsBinary();
+
+        #endregion
+    }
+
+    /// <summary>
+    /// The delegate type that powers single value formatters.<br/>
+    /// Takes in the result value from the Play Report, and outputs:
+    /// <br/>
+    /// a formatted string,
+    /// <br/>
+    /// a signal that nothing was available to handle it,
+    /// <br/>
+    /// OR a signal to reset the value that the caller is using the <see cref="Analyzer"/> for. 
+    /// </summary>
+    public delegate Analyzer.FormattedValue ValueFormatter(Value value);
+    
+    /// <summary>
+    /// The delegate type that powers multiple value formatters.<br/>
+    /// Takes in the result value from the Play Report, and outputs:
+    /// <br/>
+    /// a formatted string,
+    /// <br/>
+    /// a signal that nothing was available to handle it,
+    /// <br/>
+    /// OR a signal to reset the value that the caller is using the <see cref="Analyzer"/> for. 
+    /// </summary>
+    public delegate Analyzer.FormattedValue MultiValueFormatter(Value[] value);
 }

src/Ryujinx/Utilities/PlayReport/Delegates.cs

@@ -1,40 +0,0 @@
-namespace Ryujinx.Ava.Utilities.PlayReport
-{
-    /// <summary>
-    /// The delegate type that powers single value formatters.<br/>
-    /// Takes in the result value from the Play Report, and outputs:
-    /// <br/>
-    /// a formatted string,
-    /// <br/>
-    /// a signal that nothing was available to handle it,
-    /// <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);
-
-    /// <summary>
-    /// The delegate type that powers multiple value formatters.<br/>
-    /// Takes in the result values from the Play Report, and outputs:
-    /// <br/>
-    /// a formatted string,
-    /// <br/>
-    /// a signal that nothing was available to handle it,
-    /// <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);
-
-    /// <summary>
-    /// The delegate type that powers multiple value formatters.
-    /// The dictionary passed to this delegate is sparsely populated;
-    /// that is, not every key specified in the Play Report needs to match for this to be used.<br/>
-    /// Takes in the result values from the Play Report, and outputs:
-    /// <br/>
-    /// a formatted string,
-    /// <br/>
-    /// a signal that nothing was available to handle it,
-    /// <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);
-}

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,296 +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 => "🥉",
-                _ => ""
-            };
-        }
-    }
-}

src/Ryujinx/Utilities/PlayReport/PlayReports.cs

@@ -1,11 +1,8 @@
-using System;
-using System.Buffers.Binary;
-using System.Collections.Generic;
-using System.Linq;
+using static Ryujinx.Ava.Utilities.PlayReport.Analyzer;
 
 namespace Ryujinx.Ava.Utilities.PlayReport
 {
-    public static partial class PlayReports
+    public static class PlayReports
     {
         public static Analyzer Analyzer { get; } = new Analyzer()
             .AddSpec(
@@ -13,7 +10,7 @@ namespace Ryujinx.Ava.Utilities.PlayReport
                 spec => spec
                     .AddValueFormatter("IsHardMode", BreathOfTheWild_MasterMode)
                     // reset to normal status when switching between normal & master mode in title screen
-                    .AddValueFormatter("AoCVer", FormattedValue.SingleAlwaysResets)
+                    .AddValueFormatter("AoCVer", FormattedValue.AlwaysResets)
             )
             .AddSpec(
                 "0100f2c0115b6000",
@@ -42,23 +39,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
-                    )
             );
+
+        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,215 +0,0 @@
-using FluentAvalonia.Core;
-using MsgPack;
-using Ryujinx.Ava.Utilities.AppLibrary;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Ryujinx.Ava.Utilities.PlayReport
-{
-    /// <summary>
-    /// A mapping of title IDs to value formatter specs.
-    ///
-    /// <remarks>Generally speaking, use the <see cref="Analyzer"/>.AddSpec(...) methods instead of creating this class yourself.</remarks>
-    /// </summary>
-    public class GameSpec
-    {
-        private int _lastPriority;
-        
-        public required string[] TitleIds { get; init; }
-
-        public List<FormatterSpecBase> ValueFormatters { get; } = [];
-
-
-        /// <summary>
-        /// Add a value formatter to the current <see cref="GameSpec"/>
-        /// matching a specific key that could exist in a Play Report for the previously specified title IDs.
-        /// </summary>
-        /// <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);
-
-        /// <summary>
-        /// Add a value formatter at a specific priority to the current <see cref="GameSpec"/>
-        /// matching a specific key that could exist in a Play Report for the previously specified title IDs.
-        /// </summary>
-        /// <param name="priority">The resolution priority of this value formatter. Higher resolves sooner.</param>
-        /// <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)
-        {
-            ValueFormatters.Add(new FormatterSpec
-            {
-                Priority = priority, ReportKeys = [reportKey], Formatter = valueFormatter
-            });
-            return this;
-        }
-
-        /// <summary>
-        /// Add a multi-value formatter to the current <see cref="GameSpec"/>
-        /// matching a specific set of keys that could exist in a Play Report for the previously specified title IDs.
-        /// </summary>
-        /// <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);
-
-        /// <summary>
-        /// Add a multi-value formatter at a specific priority to the current <see cref="GameSpec"/>
-        /// matching a specific set of keys that could exist in a Play Report for the previously specified title IDs.
-        /// </summary>
-        /// <param name="priority">The resolution priority of this value formatter. Higher resolves sooner.</param>
-        /// <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)
-        {
-            ValueFormatters.Add(new MultiFormatterSpec
-            {
-                Priority = priority, ReportKeys = reportKeys, Formatter = valueFormatter
-            });
-            return this;
-        }
-
-        /// <summary>
-        /// Add a multi-value formatter to the current <see cref="GameSpec"/>
-        /// matching a specific set of keys that could exist in a Play Report for the previously specified title IDs.
-        /// <br/><br/>
-        /// The 'Sparse' multi-value formatters do not require every key to be present.
-        /// If you need this requirement, use <see cref="AddMultiValueFormatter(string[], Ryujinx.Ava.Utilities.PlayReport.MultiValueFormatter)"/>.
-        /// </summary>
-        /// <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);
-
-        /// <summary>
-        /// Add a multi-value formatter at a specific priority to the current <see cref="GameSpec"/>
-        /// matching a specific set of keys that could exist in a Play Report for the previously specified title IDs.
-        /// <br/><br/>
-        /// The 'Sparse' multi-value formatters do not require every key to be present.
-        /// If you need this requirement, use <see cref="AddMultiValueFormatter(int, string[], Ryujinx.Ava.Utilities.PlayReport.MultiValueFormatter)"/>.
-        /// </summary>
-        /// <param name="priority">The resolution priority of this value formatter. Higher resolves sooner.</param>
-        /// <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)
-        {
-            ValueFormatters.Add(new SparseMultiFormatterSpec
-            {
-                Priority = priority, ReportKeys = reportKeys, Formatter = valueFormatter
-            });
-            return this;
-        }
-    }
-
-    /// <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 override bool GetData(Horizon.Prepo.Types.PlayReport playReport, out object result)
-        {
-            if (!playReport.ReportData.AsDictionary().TryGetValue(ReportKeys[0], out MessagePackObject valuePackObject))
-            {
-                result = null;
-                return false;
-            }
-
-            result = valuePackObject;
-            return true;
-        }
-    }
-
-    /// <summary>
-    /// A struct containing the data for a mapping of an arbitrary key set in a Play Report to a formatter for their potential values.
-    /// </summary>
-    public class MultiFormatterSpec : FormatterSpecBase
-    {
-        public override bool GetData(Horizon.Prepo.Types.PlayReport playReport, out object result)
-        {
-            List<MessagePackObject> packedObjects = [];
-            foreach (var reportKey in ReportKeys)
-            {
-                if (!playReport.ReportData.AsDictionary().TryGetValue(reportKey, out MessagePackObject valuePackObject))
-                {
-                    result = null;
-                    return false;
-                }
-
-                packedObjects.Add(valuePackObject);
-            }
-
-            result = packedObjects;
-            return true;
-        }
-    }
-
-    /// <summary>
-    /// A struct containing the data for a mapping of an arbitrary key set in a Play Report to a formatter for their sparsely populated potential values.
-    /// </summary>
-    public class SparseMultiFormatterSpec : FormatterSpecBase
-    {
-        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!");
-            }
-        }
-    }
-}

src/Ryujinx/Utilities/PlayReport/Value.cs

@@ -1,160 +0,0 @@
-using MsgPack;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Ryujinx.Ava.Utilities.PlayReport
-{
-    /// <summary>
-    /// The base input data to a ValueFormatter delegate,
-    /// and the matched <see cref="MessagePackObject"/> from the Play Report.
-    /// </summary>
-    public readonly struct Value
-    {
-        public Value(MessagePackObject packedValue)
-        {
-            PackedValue = packedValue;
-        }
-
-        /// <summary>
-        /// The matched value from the Play Report.
-        /// </summary>
-        public MessagePackObject PackedValue { get; init; }
-
-        /// <summary>
-        /// Access the <see cref="PackedValue"/> as its underlying .NET type.<br/>
-        /// 
-        /// Does not seem to work well with comparing numeric types,
-        /// so use XValue properties for that.
-        /// </summary>
-        public object BoxedValue => PackedValue.ToObject();
-
-        public override string ToString()
-        {
-            object boxed = BoxedValue;
-            return boxed == null
-                ? "null"
-                : 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();
-        public byte ByteValue => PackedValue.AsByte();
-        public sbyte SByteValue => PackedValue.AsSByte();
-        public short ShortValue => PackedValue.AsInt16();
-        public ushort UShortValue => PackedValue.AsUInt16();
-        public int IntValue => PackedValue.AsInt32();
-        public uint UIntValue => PackedValue.AsUInt32();
-        public long LongValue => PackedValue.AsInt64();
-        public ulong ULongValue => PackedValue.AsUInt64();
-        public float FloatValue => PackedValue.AsSingle();
-        public double DoubleValue => PackedValue.AsDouble();
-        public string StringValue => PackedValue.AsString();
-        public Span<byte> BinaryValue => PackedValue.AsBinary();
-
-        #endregion
-    }
-
-    /// <summary>
-    /// A potential formatted value returned by a ValueFormatter delegate.
-    /// </summary>
-    public readonly struct FormattedValue
-    {
-        /// <summary>
-        /// Was any handler able to match anything in the Play Report?
-        /// </summary>
-        public bool Handled { get; private init; }
-
-        /// <summary>
-        /// Did the handler request the caller of the <see cref="Analyzer"/> to reset the existing value?
-        /// </summary>
-        public bool Reset { get; private init; }
-
-        /// <summary>
-        /// The formatted value, only present if <see cref="Handled"/> is true, and <see cref="Reset"/> is false.
-        /// </summary>
-        public string FormattedString { get; private init; }
-
-        /// <summary>
-        /// The intended path of execution for having a string to return: simply return the string.
-        /// This implicit conversion will make the struct for you.<br/><br/>
-        ///
-        /// If the input is null, <see cref="Unhandled"/> is returned.
-        /// </summary>
-        /// <param name="formattedValue">The formatted string value.</param>
-        /// <returns>The automatically constructed <see cref="FormattedValue"/> struct.</returns>
-        public static implicit operator FormattedValue(string formattedValue)
-            => formattedValue is not null
-                ? new FormattedValue { Handled = true, FormattedString = formattedValue }
-                : Unhandled;
-
-        public override string ToString()
-        {
-            if (!Handled)
-                return "<Unhandled>";
-
-            if (Reset)
-                return "<Reset>";
-
-            return FormattedString;
-        }
-
-        /// <summary>
-        /// Return this to tell the caller there is no value to return.
-        /// </summary>
-        public static readonly FormattedValue Unhandled = default;
-
-        /// <summary>
-        /// Return this to suggest the caller reset the value it's using the <see cref="Analyzer"/> for.
-        /// </summary>
-        public static readonly FormattedValue ForceReset = new() { Handled = true, Reset = true };
-
-        /// <summary>
-        /// A delegate singleton you can use to always return <see cref="ForceReset"/> in a <see cref="SingleValueFormatter"/>.
-        /// </summary>
-        public static readonly SingleValueFormatter SingleAlwaysResets = _ => ForceReset;
-
-        /// <summary>
-        /// A delegate singleton you can use to always return <see cref="ForceReset"/> in a <see cref="MultiValueFormatter"/>.
-        /// </summary>
-        public static readonly MultiValueFormatter MultiAlwaysResets = _ => ForceReset;
-        
-        /// <summary>
-        /// A delegate singleton you can use to always return <see cref="ForceReset"/> in a <see cref="SparseMultiValueFormatter"/>.
-        /// </summary>
-        public static readonly SparseMultiValueFormatter SparseMultiAlwaysResets = _ => ForceReset;
-
-        /// <summary>
-        /// A delegate factory you can use to always return the specified
-        /// <paramref name="formattedValue"/> in a <see cref="SingleValueFormatter"/>.
-        /// </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;
-    }
-}