From 4fe92a59a0a1b990ec113ecd365a3493d2b88cbf Mon Sep 17 00:00:00 2001
From: goaaats <16760685+goaaats@users.noreply.github.com>
Date: Thu, 9 Dec 2021 18:49:40 +0100
Subject: [PATCH] merge #709

---
 .../Game/ClientState/JobGauge/Enums/Chakra.cs | 28 +++++++++++++++++++
 .../Game/ClientState/JobGauge/Enums/Nadi.cs   | 26 +++++++++++++++++
 .../ClientState/JobGauge/Types/BLMGauge.cs    |  5 ----
 .../ClientState/JobGauge/Types/MNKGauge.cs    | 20 +++++++++----
 .../ClientState/JobGauge/Types/RPRGauge.cs    | 20 +++++++++++++
 5 files changed, 89 insertions(+), 10 deletions(-)
 create mode 100644 Dalamud/Game/ClientState/JobGauge/Enums/Chakra.cs
 create mode 100644 Dalamud/Game/ClientState/JobGauge/Enums/Nadi.cs

diff --git a/Dalamud/Game/ClientState/JobGauge/Enums/Chakra.cs b/Dalamud/Game/ClientState/JobGauge/Enums/Chakra.cs
new file mode 100644
index 000000000..33e544633
--- /dev/null
+++ b/Dalamud/Game/ClientState/JobGauge/Enums/Chakra.cs
@@ -0,0 +1,28 @@
+namespace Dalamud.Game.ClientState.JobGauge.Enums
+{
+    /// <summary>
+    /// MNK Chakra types.
+    /// </summary>
+    public enum Chakra : byte
+    {
+        /// <summary>
+        /// No card.
+        /// </summary>
+        NONE = 0,
+
+        /// <summary>
+        /// The Coeurl chakra.
+        /// </summary>
+        COEURL = 1,
+
+        /// <summary>
+        /// The Raptor chakra.
+        /// </summary>
+        RAPTOR = 2,
+
+        /// <summary>
+        /// The Opo-Opo chakra.
+        /// </summary>
+        OPOOPO = 3,
+    }
+}
diff --git a/Dalamud/Game/ClientState/JobGauge/Enums/Nadi.cs b/Dalamud/Game/ClientState/JobGauge/Enums/Nadi.cs
new file mode 100644
index 000000000..80994907d
--- /dev/null
+++ b/Dalamud/Game/ClientState/JobGauge/Enums/Nadi.cs
@@ -0,0 +1,26 @@
+using System;
+
+namespace Dalamud.Game.ClientState.JobGauge.Enums
+{
+    /// <summary>
+    /// MNK Nadi types.
+    /// </summary>
+    [Flags]
+    public enum Nadi : byte
+    {
+        /// <summary>
+        /// No card.
+        /// </summary>
+        NONE = 0,
+
+        /// <summary>
+        /// The Lunar nadi.
+        /// </summary>
+        LUNAR = 2,
+
+        /// <summary>
+        /// The Solar nadi.
+        /// </summary>
+        SOLAR = 4,
+    }
+}
diff --git a/Dalamud/Game/ClientState/JobGauge/Types/BLMGauge.cs b/Dalamud/Game/ClientState/JobGauge/Types/BLMGauge.cs
index f1fcbd160..445f4615a 100644
--- a/Dalamud/Game/ClientState/JobGauge/Types/BLMGauge.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Types/BLMGauge.cs
@@ -70,10 +70,5 @@ namespace Dalamud.Game.ClientState.JobGauge.Types
         /// </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 dd8167597..a1c8365d7 100644
--- a/Dalamud/Game/ClientState/JobGauge/Types/MNKGauge.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Types/MNKGauge.cs
@@ -1,5 +1,7 @@
 using System;
-using FFXIVClientStructs.FFXIV.Client.Game.Gauge;
+using System.Linq;
+
+using Dalamud.Game.ClientState.JobGauge.Enums;
 
 namespace Dalamud.Game.ClientState.JobGauge.Types
 {
@@ -18,13 +20,21 @@ namespace Dalamud.Game.ClientState.JobGauge.Types
         }
 
         /// <summary>
-        /// Gets the number of Chakra available, per Chakra type.
+        /// Gets the types of Chakra available.
         /// </summary>
-        public ChakraType[] Chakra => this.Struct->CurrentChakra;
+        /// <remarks>
+        /// This will always return an array of size 3, inactive Chakra are represented by <see cref="Chakra.NONE"/>.
+        /// </remarks>
+        public Chakra[] Chakra => this.Struct->CurrentChakra.Select(c => (Chakra)c).ToArray();
 
         /// <summary>
-        /// Gets the kind of Nadi available.
+        /// Gets the types of Nadi available.
         /// </summary>
-        public NadiFlags Nadi => this.Struct->Nadi;
+        public Nadi Nadi => (Nadi)this.Struct->Nadi;
+
+        /// <summary>
+        /// Gets the time remaining that Blitz is active.
+        /// </summary>
+        public ushort BlitzTimeRemaining => this.Struct->BlitzTimeRemaining;
     }
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Types/RPRGauge.cs b/Dalamud/Game/ClientState/JobGauge/Types/RPRGauge.cs
index b423691c8..f08d0bbe0 100644
--- a/Dalamud/Game/ClientState/JobGauge/Types/RPRGauge.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Types/RPRGauge.cs
@@ -20,5 +20,25 @@ namespace Dalamud.Game.ClientState.JobGauge.Types
         /// Gets the amount of Soul available.
         /// </summary>
         public byte Soul => this.Struct->Soul;
+
+        /// <summary>
+        /// Gets the amount of Shroud available.
+        /// </summary>
+        public byte Shroud => this.Struct->Shroud;
+
+        /// <summary>
+        /// Gets the time remaining that Enshrouded is active.
+        /// </summary>
+        public ushort EnshroudedTimeRemaining => this.Struct->EnshroudedTimeRemaining;
+
+        /// <summary>
+        /// Gets the amount of Lemure Shroud available.
+        /// </summary>
+        public byte LemureShroud => this.Struct->LemureShroud;
+
+        /// <summary>
+        /// Gets the amount of Void Shroud available.
+        /// </summary>
+        public byte VoidShroud => this.Struct->VoidShroud;
     }
 }