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 +{ + /// + /// MNK Chakra types. + /// + public enum Chakra : byte + { + /// + /// No card. + /// + NONE = 0, + + /// + /// The Coeurl chakra. + /// + COEURL = 1, + + /// + /// The Raptor chakra. + /// + RAPTOR = 2, + + /// + /// The Opo-Opo chakra. + /// + 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 +{ + /// + /// MNK Nadi types. + /// + [Flags] + public enum Nadi : byte + { + /// + /// No card. + /// + NONE = 0, + + /// + /// The Lunar nadi. + /// + LUNAR = 2, + + /// + /// The Solar nadi. + /// + 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 /// /// true or false. public bool IsParadoxActive => this.Struct->ParadoxActive; - - /// - /// Gets a value indicating which kind of Enochian is active. - /// - 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 } /// - /// Gets the number of Chakra available, per Chakra type. + /// Gets the types of Chakra available. /// - public ChakraType[] Chakra => this.Struct->CurrentChakra; + /// + /// This will always return an array of size 3, inactive Chakra are represented by . + /// + public Chakra[] Chakra => this.Struct->CurrentChakra.Select(c => (Chakra)c).ToArray(); /// - /// Gets the kind of Nadi available. + /// Gets the types of Nadi available. /// - public NadiFlags Nadi => this.Struct->Nadi; + public Nadi Nadi => (Nadi)this.Struct->Nadi; + + /// + /// Gets the time remaining that Blitz is active. + /// + 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. /// public byte Soul => this.Struct->Soul; + + /// + /// Gets the amount of Shroud available. + /// + public byte Shroud => this.Struct->Shroud; + + /// + /// Gets the time remaining that Enshrouded is active. + /// + public ushort EnshroudedTimeRemaining => this.Struct->EnshroudedTimeRemaining; + + /// + /// Gets the amount of Lemure Shroud available. + /// + public byte LemureShroud => this.Struct->LemureShroud; + + /// + /// Gets the amount of Void Shroud available. + /// + public byte VoidShroud => this.Struct->VoidShroud; } }