From ca3c0c4014a9784d32d93e1aa99a23d6fb02c058 Mon Sep 17 00:00:00 2001
From: pohky <otoriosu@gmail.com>
Date: Wed, 10 Jul 2024 09:41:50 +0200
Subject: [PATCH] BLM and MNK Gauge Update with CS bump (#1914)

---
 .../ClientState/JobGauge/Enums/BeastChakra.cs    | 16 ++++++++--------
 Dalamud/Game/ClientState/JobGauge/Enums/Nadi.cs  |  6 +++---
 .../Game/ClientState/JobGauge/Types/BLMGauge.cs  |  5 +++++
 .../Game/ClientState/JobGauge/Types/MNKGauge.cs  | 15 +++++++++++++++
 lib/FFXIVClientStructs                           |  2 +-
 5 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/Dalamud/Game/ClientState/JobGauge/Enums/BeastChakra.cs b/Dalamud/Game/ClientState/JobGauge/Enums/BeastChakra.cs
index 9c4d40700..bbe4ad70d 100644
--- a/Dalamud/Game/ClientState/JobGauge/Enums/BeastChakra.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Enums/BeastChakra.cs
@@ -6,22 +6,22 @@ namespace Dalamud.Game.ClientState.JobGauge.Enums;
 public enum BeastChakra : byte
 {
     /// <summary>
-    /// No card.
+    /// No chakra.
     /// </summary>
     NONE = 0,
 
-    /// <summary>
-    /// The Coeurl chakra.
-    /// </summary>
-    COEURL = 1,
-
     /// <summary>
     /// The Opo-Opo chakra.
     /// </summary>
-    OPOOPO = 2,
+    OPOOPO = 1,
 
     /// <summary>
     /// The Raptor chakra.
     /// </summary>
-    RAPTOR = 3,
+    RAPTOR = 2,
+
+    /// <summary>
+    /// The Coeurl chakra.
+    /// </summary>
+    COEURL = 3,
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Enums/Nadi.cs b/Dalamud/Game/ClientState/JobGauge/Enums/Nadi.cs
index dd3434389..8be5c739e 100644
--- a/Dalamud/Game/ClientState/JobGauge/Enums/Nadi.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Enums/Nadi.cs
@@ -7,17 +7,17 @@
 public enum Nadi : byte
 {
     /// <summary>
-    /// No card.
+    /// No nadi.
     /// </summary>
     NONE = 0,
 
     /// <summary>
     /// The Lunar nadi.
     /// </summary>
-    LUNAR = 2,
+    LUNAR = 1,
 
     /// <summary>
     /// The Solar nadi.
     /// </summary>
-    SOLAR = 4,
+    SOLAR = 2,
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Types/BLMGauge.cs b/Dalamud/Game/ClientState/JobGauge/Types/BLMGauge.cs
index 6b59aeef3..ebf70abe7 100644
--- a/Dalamud/Game/ClientState/JobGauge/Types/BLMGauge.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Types/BLMGauge.cs
@@ -44,6 +44,11 @@ public unsafe class BLMGauge : JobGaugeBase<FFXIVClientStructs.FFXIV.Client.Game
     /// </summary>
     public byte AstralFireStacks => (byte)(this.InAstralFire ? this.Struct->ElementStance : 0);
 
+    /// <summary>
+    /// Gets the amount of Astral Soul stacks.
+    /// </summary>
+    public int AstralSoulStacks => this.Struct->AstralSoulStacks;
+
     /// <summary>
     /// Gets a value indicating whether or not the player is in Umbral Ice.
     /// </summary>
diff --git a/Dalamud/Game/ClientState/JobGauge/Types/MNKGauge.cs b/Dalamud/Game/ClientState/JobGauge/Types/MNKGauge.cs
index 98189068e..803740f33 100644
--- a/Dalamud/Game/ClientState/JobGauge/Types/MNKGauge.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Types/MNKGauge.cs
@@ -36,6 +36,21 @@ public unsafe class MNKGauge : JobGaugeBase<FFXIVClientStructs.FFXIV.Client.Game
     /// </summary>
     public Nadi Nadi => (Nadi)this.Struct->Nadi;
 
+    /// <summary>
+    /// Gets the amount of available Opo-opo Fury stacks.
+    /// </summary>
+    public int OpoOpoFury => this.Struct->OpoOpoStacks;
+    
+    /// <summary>
+    /// Gets the amount of available Raptor Fury stacks.
+    /// </summary>
+    public int RaptorFury => this.Struct->RaptorStacks;
+
+    /// <summary>
+    /// Gets the amount of available Coeurl Fury stacks.
+    /// </summary>
+    public int CoeurlFury => this.Struct->CoeurlStacks;
+
     /// <summary>
     /// Gets the time remaining that Blitz is active.
     /// </summary>
diff --git a/lib/FFXIVClientStructs b/lib/FFXIVClientStructs
index 572cfe861..5b29e78f1 160000
--- a/lib/FFXIVClientStructs
+++ b/lib/FFXIVClientStructs
@@ -1 +1 @@
-Subproject commit 572cfe861ff6b1bfc9b92a6e9fe1e96342f89ed4
+Subproject commit 5b29e78f1b49afaa2a9102c52fbd68a245cab936