diff --git a/Dalamud/Game/ClientState/JobGauge/Enums/CardType.cs b/Dalamud/Game/ClientState/JobGauge/Enums/CardType.cs index 1b367a93e..24ffc2b19 100644 --- a/Dalamud/Game/ClientState/JobGauge/Enums/CardType.cs +++ b/Dalamud/Game/ClientState/JobGauge/Enums/CardType.cs @@ -43,10 +43,10 @@ public enum CardType : byte /// /// The Lord of Crowns card. /// - LORD = 0x70, + LORD = 7, /// /// The Lady of Crowns card. /// - LADY = 0x80, + LADY = 8, } diff --git a/Dalamud/Game/ClientState/JobGauge/Enums/DrawType.cs b/Dalamud/Game/ClientState/JobGauge/Enums/DrawType.cs new file mode 100644 index 000000000..f8833d6d0 --- /dev/null +++ b/Dalamud/Game/ClientState/JobGauge/Enums/DrawType.cs @@ -0,0 +1,17 @@ +namespace Dalamud.Game.ClientState.JobGauge.Enums; + +/// +/// AST Draw types. +/// +public enum DrawType : byte +{ + /// + /// Astral Draw active. + /// + ASTRAL = 0, + + /// + /// Umbral Draw active. + /// + UMBRAL = 1, +} diff --git a/Dalamud/Game/ClientState/JobGauge/Enums/SealType.cs b/Dalamud/Game/ClientState/JobGauge/Enums/SealType.cs deleted file mode 100644 index eacef91fc..000000000 --- a/Dalamud/Game/ClientState/JobGauge/Enums/SealType.cs +++ /dev/null @@ -1,27 +0,0 @@ -namespace Dalamud.Game.ClientState.JobGauge.Enums; - -/// -/// AST Divination seal types. -/// -public enum SealType : byte -{ - /// - /// No seal. - /// - NONE = 0, - - /// - /// Sun seal. - /// - SUN = 1, - - /// - /// Moon seal. - /// - MOON = 2, - - /// - /// Celestial seal. - /// - CELESTIAL = 3, -} diff --git a/Dalamud/Game/ClientState/JobGauge/Types/ASTGauge.cs b/Dalamud/Game/ClientState/JobGauge/Types/ASTGauge.cs index ae75aae3d..e3999b77a 100644 --- a/Dalamud/Game/ClientState/JobGauge/Types/ASTGauge.cs +++ b/Dalamud/Game/ClientState/JobGauge/Types/ASTGauge.cs @@ -22,23 +22,17 @@ public unsafe class ASTGauge : JobGaugeBase. /// /// Currently drawn . - public CardType DrawnCard => (CardType)(this.Struct->Card & 0xF); + public CardType[] DrawnCards => this.Struct->CurrentCards.Select(card => (CardType)card).ToArray(); /// /// Gets the currently drawn crown . /// /// Currently drawn crown . - public CardType DrawnCrownCard => this.Struct->Card - this.DrawnCard; + public CardType DrawnCrownCard => (CardType)this.Struct->CurrentArcana; /// - /// Gets the s currently active. + /// Gets the currently active draw type . /// - public SealType[] Seals => this.Struct->CurrentSeals.Select(seal => (SealType)seal).ToArray(); - - /// - /// Check if a is currently active on the divination gauge. - /// - /// The to check for. - /// If the given Seal is currently divined. - public unsafe bool ContainsSeal(SealType seal) => this.Seals.Contains(seal); + /// Currently active draw type. + public DrawType ActiveDraw => (DrawType)this.Struct->CurrentDraw; } diff --git a/Dalamud/Game/ClientState/JobGauge/Types/NINGauge.cs b/Dalamud/Game/ClientState/JobGauge/Types/NINGauge.cs index 1e3b6df3c..4d0b08556 100644 --- a/Dalamud/Game/ClientState/JobGauge/Types/NINGauge.cs +++ b/Dalamud/Game/ClientState/JobGauge/Types/NINGauge.cs @@ -14,18 +14,8 @@ public unsafe class NINGauge : JobGaugeBase - /// Gets the time left on Huton in milliseconds. - /// - public int HutonTimer => this.Struct->HutonTimer; - /// /// Gets the amount of Ninki available. /// public byte Ninki => this.Struct->Ninki; - - /// - /// Gets the number of times Huton has been cast manually. - /// - public byte HutonManualCasts => this.Struct->HutonManualCasts; } diff --git a/lib/FFXIVClientStructs b/lib/FFXIVClientStructs index 3469949fa..572cfe861 160000 --- a/lib/FFXIVClientStructs +++ b/lib/FFXIVClientStructs @@ -1 +1 @@ -Subproject commit 3469949faf9838cef0c47dfdef48b540a4c61b2f +Subproject commit 572cfe861ff6b1bfc9b92a6e9fe1e96342f89ed4