From 56d72b44b3e5446155796399d133477c82bca6fd Mon Sep 17 00:00:00 2001
From: goaaats <16760685+goaaats@users.noreply.github.com>
Date: Thu, 9 Dec 2021 18:41:40 +0100
Subject: [PATCH] fix(gauges): MNK chakra + nadi, BLM Enochian flags

---
 .../ClientState/JobGauge/Types/BLMGauge.cs    | 20 +++++++++++++++----
 .../ClientState/JobGauge/Types/MNKGauge.cs    | 10 ++++++++--
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/Dalamud/Game/ClientState/JobGauge/Types/BLMGauge.cs b/Dalamud/Game/ClientState/JobGauge/Types/BLMGauge.cs
index 0e5516b7a..f1fcbd160 100644
--- a/Dalamud/Game/ClientState/JobGauge/Types/BLMGauge.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Types/BLMGauge.cs
@@ -1,4 +1,5 @@
 using System;
+using FFXIVClientStructs.FFXIV.Client.Game.Gauge;
 
 namespace Dalamud.Game.ClientState.JobGauge.Types
 {
@@ -47,21 +48,32 @@ namespace Dalamud.Game.ClientState.JobGauge.Types
         public byte AstralFireStacks => (byte)(this.InAstralFire ? this.Struct->ElementStance : 0);
 
         /// <summary>
-        /// Gets a value indicating whether if the player is in Umbral Ice.
+        /// Gets a value indicating whether or not the player is in Umbral Ice.
         /// </summary>
         /// <returns><c>true</c> or <c>false</c>.</returns>
         public bool InUmbralIce => this.Struct->ElementStance < 0;
 
         /// <summary>
-        /// Gets a value indicating whether if the player is in Astral fire.
+        /// Gets a value indicating whether or not the player is in Astral fire.
         /// </summary>
         /// <returns><c>true</c> or <c>false</c>.</returns>
         public bool InAstralFire => this.Struct->ElementStance > 0;
 
         /// <summary>
-        /// Gets a value indicating whether if Enochian is active.
+        /// Gets a value indicating whether or not Enochian is active.
         /// </summary>
         /// <returns><c>true</c> or <c>false</c>.</returns>
-        public bool IsEnochianActive => this.Struct->Enochian != 0;
+        public bool IsEnochianActive => this.Struct->EnochianActive;
+
+        /// <summary>
+        /// Gets a value indicating whether or not Paradox is active.
+        /// </summary>
+        /// <returns><c>true</c> or <c>false</c>.</returns>
+        public bool IsParadoxActive => this.Struct->ParadoxActive;
+
+        /// <summary>
+        /// Gets a value indicating which kind of Enochian is active.
+        /// </summary>
+        public EnochianFlags EnochianFlags => this.Struct->EnochianFlags;
     }
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Types/MNKGauge.cs b/Dalamud/Game/ClientState/JobGauge/Types/MNKGauge.cs
index 8de421541..dd8167597 100644
--- a/Dalamud/Game/ClientState/JobGauge/Types/MNKGauge.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Types/MNKGauge.cs
@@ -1,4 +1,5 @@
 using System;
+using FFXIVClientStructs.FFXIV.Client.Game.Gauge;
 
 namespace Dalamud.Game.ClientState.JobGauge.Types
 {
@@ -17,8 +18,13 @@ namespace Dalamud.Game.ClientState.JobGauge.Types
         }
 
         /// <summary>
-        /// Gets the number of Chakra available.
+        /// Gets the number of Chakra available, per Chakra type.
         /// </summary>
-        public byte Chakra => this.Struct->Chakra;
+        public ChakraType[] Chakra => this.Struct->CurrentChakra;
+
+        /// <summary>
+        /// Gets the kind of Nadi available.
+        /// </summary>
+        public NadiFlags Nadi => this.Struct->Nadi;
     }
 }