From b14554cb7fb49ab2d36a77f1521c0e1c1b06e162 Mon Sep 17 00:00:00 2001
From: UnknownX7 <UnknownX7@users.noreply.github.com>
Date: Sun, 30 Jun 2024 06:39:38 -0500
Subject: [PATCH] Add <pct> and <vpr>

---
 Configuration.cs  | 38 +-------------------------------------
 Hypostasis        |  2 +-
 PronounManager.cs | 24 ++++++++++++++++++++++--
 3 files changed, 24 insertions(+), 40 deletions(-)

diff --git a/Configuration.cs b/Configuration.cs
index 726ea9a..2f2a8c4 100644
--- a/Configuration.cs
+++ b/Configuration.cs
@@ -17,37 +17,6 @@ public class Action
     public class ActionStackItem
     {
         public uint ID = 0;
-
-        [Obsolete]
-        public uint Target
-        {
-            set
-            {
-                TargetID = value switch
-                {
-                    0 => 10_000,
-                    1 => 10_001,
-                    2 => (uint)PronounID.FocusTarget,
-                    3 => 10_002,
-                    4 => 10_003,
-                    5 => (uint)PronounID.TargetsTarget,
-                    6 => (uint)PronounID.Me,
-                    7 => (uint)PronounID.LastTarget,
-                    8 => (uint)PronounID.LastEnemy,
-                    9 => (uint)PronounID.LastAttacker,
-                    10 => (uint)PronounID.P2,
-                    11 => (uint)PronounID.P3,
-                    12 => (uint)PronounID.P4,
-                    13 => (uint)PronounID.P5,
-                    14 => (uint)PronounID.P6,
-                    15 => (uint)PronounID.P7,
-                    16 => (uint)PronounID.P8,
-                    17 => 10_010,
-                    _ => 10_000
-                };
-            }
-        }
-
         public uint TargetID = 10_000;
     }
 
@@ -115,7 +84,6 @@ public override void BindToName(Type serializedType, out string assemblyName, ou
     public bool EnableCameraRelativeDashes = false;
     public bool EnableNormalBackwardDashes = false;
     public bool EnableQueuingMore = false;
-    [Obsolete] public bool EnableFPSAlignment { internal get; set; } // TODO: Remove in 6.4
     public bool EnableFrameAlignment = false;
     public bool EnableAutoRefocusTarget = false;
     public bool EnableMacroQueue = false;
@@ -145,11 +113,7 @@ public override void BindToName(Type serializedType, out string assemblyName, ou
     public bool EnableDecomboMinorArcana = false;
     public bool EnableDecomboGeirskogul = false;
 
-    public override void Initialize()
-    {
-        if (EnableFPSAlignment)
-            EnableFrameAlignment = true;
-    }
+    public override void Initialize() { }
 
     private static readonly StackSerializer serializer = new ();
 
diff --git a/Hypostasis b/Hypostasis
index 2137039..7455f94 160000
--- a/Hypostasis
+++ b/Hypostasis
@@ -1 +1 @@
-Subproject commit 2137039e3360919cc7ec62c77ae4b2d01f2020d3
+Subproject commit 7455f94f35d36cb1318da788a4370b4515e2c293
diff --git a/PronounManager.cs b/PronounManager.cs
index e6661b7..ec5eb8a 100644
--- a/PronounManager.cs
+++ b/PronounManager.cs
@@ -342,6 +342,16 @@ public class ReaperPronoun : IGamePronoun
     public unsafe GameObject* GetGameObject() => PronounHelpers.GetPartyMemberByClassJobID(ClassJobID);
 }
 
+public class ViperPronoun : IGamePronoun
+{
+    private const byte ClassJobID = 41;
+
+    public string Name => "Viper";
+    public string Placeholder => "<vpr>";
+    public uint ID => 10_220 + ClassJobID;
+    public unsafe GameObject* GetGameObject() => PronounHelpers.GetPartyMemberByClassJobID(ClassJobID);
+}
+
 public class BardPronoun : IGamePronoun
 {
     private const byte ClassJobID = 23;
@@ -402,6 +412,16 @@ public class RedMagePronoun : IGamePronoun
     public unsafe GameObject* GetGameObject() => PronounHelpers.GetPartyMemberByClassJobID(ClassJobID);
 }
 
+public class PictomancerPronoun : IGamePronoun
+{
+    private const byte ClassJobID = 42;
+
+    public string Name => "Pictomancer";
+    public string Placeholder => "<pct>";
+    public uint ID => 10_220 + ClassJobID;
+    public unsafe GameObject* GetGameObject() => PronounHelpers.GetPartyMemberByClassJobID(ClassJobID);
+}
+
 public class BlueMagePronoun : IGamePronoun
 {
     private const byte ClassJobID = 36;
@@ -416,8 +436,8 @@ public static class PronounManager
 {
     public const int MinimumCustomPronounID = 10_000;
 
-    public static Dictionary<uint, IGamePronoun> CustomPronouns { get; set; } = new();
-    public static Dictionary<string, IGamePronoun> CustomPlaceholders { get; set; } = new();
+    public static Dictionary<uint, IGamePronoun> CustomPronouns { get; set; } = [];
+    public static Dictionary<string, IGamePronoun> CustomPlaceholders { get; set; } = [];
     public static List<uint> OrderedIDs { get; set; } =
     [
         10_000, // Target