Bump ClientStructs for 7.0hf1 (#1901)

* Update ASTGauge

* deps: bump CS

* fix: remove Huton from NIN gauge

---------

Co-authored-by: lazyrain <lazyrain@pm.me>

Dalamud/Game/ClientState/JobGauge/Enums/CardType.cs

@@ -43,10 +43,10 @@ public enum CardType : byte
     /// <summary>
     /// The Lord of Crowns card.
     /// </summary>
-    LORD = 0x70,
+    LORD = 7,
 
     /// <summary>
     /// The Lady of Crowns card.
     /// </summary>
-    LADY = 0x80,
+    LADY = 8,
 }

Dalamud/Game/ClientState/JobGauge/Enums/DrawType.cs

@@ -0,0 +1,17 @@
+namespace Dalamud.Game.ClientState.JobGauge.Enums;
+
+/// <summary>
+/// AST Draw types.
+/// </summary>
+public enum DrawType : byte
+{
+    /// <summary>
+    /// Astral Draw active.
+    /// </summary>
+    ASTRAL = 0,
+
+    /// <summary>
+    /// Umbral Draw active.
+    /// </summary>
+    UMBRAL = 1,
+}

Dalamud/Game/ClientState/JobGauge/Enums/SealType.cs

@@ -1,27 +0,0 @@
-namespace Dalamud.Game.ClientState.JobGauge.Enums;
-
-/// <summary>
-/// AST Divination seal types.
-/// </summary>
-public enum SealType : byte
-{
-    /// <summary>
-    /// No seal.
-    /// </summary>
-    NONE = 0,
-
-    /// <summary>
-    /// Sun seal.
-    /// </summary>
-    SUN = 1,
-
-    /// <summary>
-    /// Moon seal.
-    /// </summary>
-    MOON = 2,
-
-    /// <summary>
-    /// Celestial seal.
-    /// </summary>
-    CELESTIAL = 3,
-}

Dalamud/Game/ClientState/JobGauge/Types/ASTGauge.cs

@@ -22,23 +22,17 @@ public unsafe class ASTGauge : JobGaugeBase<FFXIVClientStructs.FFXIV.Client.Game
     /// Gets the currently drawn <see cref="CardType"/>.
     /// </summary>
     /// <returns>Currently drawn <see cref="CardType"/>.</returns>
-    public CardType DrawnCard => (CardType)(this.Struct->Card & 0xF);
+    public CardType[] DrawnCards => this.Struct->CurrentCards.Select(card => (CardType)card).ToArray();
 
     /// <summary>
     /// Gets the currently drawn crown <see cref="CardType"/>.
     /// </summary>
     /// <returns>Currently drawn crown <see cref="CardType"/>.</returns>
-    public CardType DrawnCrownCard => this.Struct->Card - this.DrawnCard;
+    public CardType DrawnCrownCard => (CardType)this.Struct->CurrentArcana;
 
     /// <summary>
-    /// Gets the <see cref="SealType"/>s currently active.
+    /// Gets the currently active draw type <see cref="DrawType"/>.
     /// </summary>
-    public SealType[] Seals => this.Struct->CurrentSeals.Select(seal => (SealType)seal).ToArray();
+    /// <returns>Currently active draw type.</returns>
-
+    public DrawType ActiveDraw => (DrawType)this.Struct->CurrentDraw;
-    /// <summary>
-    /// Check if a <see cref="SealType"/> is currently active on the divination gauge.
-    /// </summary>
-    /// <param name="seal">The <see cref="SealType"/> to check for.</param>
-    /// <returns>If the given Seal is currently divined.</returns>
-    public unsafe bool ContainsSeal(SealType seal) => this.Seals.Contains(seal);
 }

Dalamud/Game/ClientState/JobGauge/Types/NINGauge.cs

@@ -14,18 +14,8 @@ public unsafe class NINGauge : JobGaugeBase<FFXIVClientStructs.FFXIV.Client.Game
     {
     }
 
-    /// <summary>
-    /// Gets the time left on Huton in milliseconds.
-    /// </summary>
-    public int HutonTimer => this.Struct->HutonTimer;
-
     /// <summary>
     /// Gets the amount of Ninki available.
     /// </summary>
     public byte Ninki => this.Struct->Ninki;
-
-    /// <summary>
-    /// Gets the number of times Huton has been cast manually.
-    /// </summary>
-    public byte HutonManualCasts => this.Struct->HutonManualCasts;
 }

lib/FFXIVClientStructs

@@ -1 +1 @@
-Subproject commit 3469949faf9838cef0c47dfdef48b540a4c61b2f
+Subproject commit 572cfe861ff6b1bfc9b92a6e9fe1e96342f89ed4