Merge branch 'master' of https://github.com/goatcorp/Dalamud

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,
+    }
+}

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>

lib/FFXIVClientStructs

@@ -1 +1 @@
-Subproject commit 64848695224c25f5f459c42100a5ab75bf611d3f
+Subproject commit 6157e56b10511adf633b59cf43178ec3dbb873f7