From a5a7f5a8dd0b9e07238f0b20575c3fce75a9f400 Mon Sep 17 00:00:00 2001
From: Raymond <daemitus@gmail.com>
Date: Tue, 7 Dec 2021 14:21:10 -0500
Subject: [PATCH 1/2] feat: Add SAMGauge.Kaeshi and enum

---
 .../Game/ClientState/JobGauge/Enums/Kaeshi.cs | 33 +++++++++++++++++++
 .../ClientState/JobGauge/Types/SAMGauge.cs    |  5 +++
 2 files changed, 38 insertions(+)
 create mode 100644 Dalamud/Game/ClientState/JobGauge/Enums/Kaeshi.cs

diff --git a/Dalamud/Game/ClientState/JobGauge/Enums/Kaeshi.cs b/Dalamud/Game/ClientState/JobGauge/Enums/Kaeshi.cs
new file mode 100644
index 000000000..5f41dde48
--- /dev/null
+++ b/Dalamud/Game/ClientState/JobGauge/Enums/Kaeshi.cs
@@ -0,0 +1,33 @@
+namespace Dalamud.Game.ClientState.JobGauge.Enums
+{
+    /// <summary>
+    /// SAM Kaeshi types.
+    /// </summary>
+    public enum Kaeshi : byte
+    {
+        /// <summary>
+        /// No Kaeshi is active.
+        /// </summary>
+        NONE = 0,
+
+        /// <summary>
+        /// Kaeshi: Higanbana type.
+        /// </summary>
+        HIGANBANA = 1,
+
+        /// <summary>
+        /// Kaeshi: Goken type.
+        /// </summary>
+        GOKEN = 2,
+
+        /// <summary>
+        /// Kaeshi: Setsugekka type.
+        /// </summary>
+        SETSUGEKKA = 3,
+
+        /// <summary>
+        /// Kaeshi: Namikiri type.
+        /// </summary>
+        NAMIKIRI = 4,
+    }
+}
diff --git a/Dalamud/Game/ClientState/JobGauge/Types/SAMGauge.cs b/Dalamud/Game/ClientState/JobGauge/Types/SAMGauge.cs
index 64559e4e3..242e3f9f0 100644
--- a/Dalamud/Game/ClientState/JobGauge/Types/SAMGauge.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Types/SAMGauge.cs
@@ -18,6 +18,11 @@ namespace Dalamud.Game.ClientState.JobGauge.Types
         {
         }
 
+        /// <summary>
+        /// Gets the currently active Kaeshi ability.
+        /// </summary>
+        public Kaeshi Kaeshi => (Kaeshi)this.Struct->Kaeshi;
+
         /// <summary>
         /// Gets the current amount of Kenki available.
         /// </summary>

From 23e33127d182e100ea208ac3d12ecb77fa31514a Mon Sep 17 00:00:00 2001
From: Raymond <daemitus@gmail.com>
Date: Tue, 7 Dec 2021 14:22:07 -0500
Subject: [PATCH 2/2] bump client structs

---
 lib/FFXIVClientStructs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/FFXIVClientStructs b/lib/FFXIVClientStructs
index 648486952..6157e56b1 160000
--- a/lib/FFXIVClientStructs
+++ b/lib/FFXIVClientStructs
@@ -1 +1 @@
-Subproject commit 64848695224c25f5f459c42100a5ab75bf611d3f
+Subproject commit 6157e56b10511adf633b59cf43178ec3dbb873f7