From f53c98b08787e03283f5d0b9d139ba3e7b097472 Mon Sep 17 00:00:00 2001 From: Raymond Date: Fri, 3 Dec 2021 23:51:13 -0500 Subject: [PATCH 1/6] ASTGauge: split drawn card --- Dalamud/Game/ClientState/JobGauge/Types/ASTGauge.cs | 8 +++++++- lib/FFXIVClientStructs | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Dalamud/Game/ClientState/JobGauge/Types/ASTGauge.cs b/Dalamud/Game/ClientState/JobGauge/Types/ASTGauge.cs index 45175344f..14b2ff19f 100644 --- a/Dalamud/Game/ClientState/JobGauge/Types/ASTGauge.cs +++ b/Dalamud/Game/ClientState/JobGauge/Types/ASTGauge.cs @@ -22,7 +22,13 @@ namespace Dalamud.Game.ClientState.JobGauge.Types /// Gets the currently drawn . /// /// Currently drawn . - public CardType DrawnCard => (CardType)this.Struct->Card; + public CardType DrawnCard => (CardType)(this.Struct->Card & 0xF); + + /// + /// Gets the currently drawn crown . + /// + /// Currently drawn crown . + public CardType DrawnCrownCard => (CardType)(this.Struct->Card - (this.Struct->Card % 10)); /// /// Check if a is currently active on the divination gauge. diff --git a/lib/FFXIVClientStructs b/lib/FFXIVClientStructs index d578045be..306695be6 160000 --- a/lib/FFXIVClientStructs +++ b/lib/FFXIVClientStructs @@ -1 +1 @@ -Subproject commit d578045bea85822bdf7853d3182c5b28d6fffd1c +Subproject commit 306695be6ad489d1f596c1d5fa8db9206b742189 From 9b84c52401c2d13db8dd22eaa517659b15ff9ee1 Mon Sep 17 00:00:00 2001 From: Raymond Date: Sat, 4 Dec 2021 08:49:54 -0500 Subject: [PATCH 2/6] Docstring fix --- Dalamud/Game/Network/Structures/MarketTaxRates.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dalamud/Game/Network/Structures/MarketTaxRates.cs b/Dalamud/Game/Network/Structures/MarketTaxRates.cs index bdca8fe7d..0cb21e5d8 100644 --- a/Dalamud/Game/Network/Structures/MarketTaxRates.cs +++ b/Dalamud/Game/Network/Structures/MarketTaxRates.cs @@ -14,7 +14,7 @@ namespace Dalamud.Game.Network.Structures } /// - /// Category of this ResultDialog packet. + /// Gets the category of this ResultDialog packet. /// public uint Category { get; private set; } From 858bc40907e034ec5d53992de200956d9507947a Mon Sep 17 00:00:00 2001 From: Raymond Date: Sat, 4 Dec 2021 22:11:34 -0500 Subject: [PATCH 3/6] RDMGauge: add ManaStacks --- Dalamud/Game/ClientState/JobGauge/Types/RDMGauge.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Dalamud/Game/ClientState/JobGauge/Types/RDMGauge.cs b/Dalamud/Game/ClientState/JobGauge/Types/RDMGauge.cs index 63c8b6a20..af16ee031 100644 --- a/Dalamud/Game/ClientState/JobGauge/Types/RDMGauge.cs +++ b/Dalamud/Game/ClientState/JobGauge/Types/RDMGauge.cs @@ -25,5 +25,10 @@ namespace Dalamud.Game.ClientState.JobGauge.Types /// Gets the level of the Black gauge. /// public byte BlackMana => this.Struct->BlackMana; + + /// + /// Gets the amount of mana stacks. + /// + public byte ManaStacks => this.Struct->ManaStacks; } } From 2fecf0d0556a0f31715aba47c5c7b3ff14b35064 Mon Sep 17 00:00:00 2001 From: Raymond Date: Sat, 4 Dec 2021 22:11:42 -0500 Subject: [PATCH 4/6] RPRGauge: add Soul --- .../ClientState/JobGauge/Types/RPRGauge.cs | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 Dalamud/Game/ClientState/JobGauge/Types/RPRGauge.cs diff --git a/Dalamud/Game/ClientState/JobGauge/Types/RPRGauge.cs b/Dalamud/Game/ClientState/JobGauge/Types/RPRGauge.cs new file mode 100644 index 000000000..b423691c8 --- /dev/null +++ b/Dalamud/Game/ClientState/JobGauge/Types/RPRGauge.cs @@ -0,0 +1,24 @@ +using System; + +namespace Dalamud.Game.ClientState.JobGauge.Types +{ + /// + /// In-memory RPR job gauge. + /// + public unsafe class RPRGauge : JobGaugeBase + { + /// + /// Initializes a new instance of the class. + /// + /// Address of the job gauge. + internal RPRGauge(IntPtr address) + : base(address) + { + } + + /// + /// Gets the amount of Soul available. + /// + public byte Soul => this.Struct->Soul; + } +} From f9e71c0023fda3b89eb1f213a66d9d721daad69a Mon Sep 17 00:00:00 2001 From: Raymond Date: Sat, 4 Dec 2021 22:11:56 -0500 Subject: [PATCH 5/6] SGEGauge: add a Addersgall/Eukrasia --- .../ClientState/JobGauge/Types/SGEGauge.cs | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 Dalamud/Game/ClientState/JobGauge/Types/SGEGauge.cs diff --git a/Dalamud/Game/ClientState/JobGauge/Types/SGEGauge.cs b/Dalamud/Game/ClientState/JobGauge/Types/SGEGauge.cs new file mode 100644 index 000000000..e1a09bf7b --- /dev/null +++ b/Dalamud/Game/ClientState/JobGauge/Types/SGEGauge.cs @@ -0,0 +1,40 @@ +using System; + +namespace Dalamud.Game.ClientState.JobGauge.Types +{ + /// + /// In-memory SGE job gauge. + /// + public unsafe class SGEGauge : JobGaugeBase + { + /// + /// Initializes a new instance of the class. + /// + /// Address of the job gauge. + internal SGEGauge(IntPtr address) + : base(address) + { + } + + /// + /// Gets the amount of milliseconds elapsed until the next Addersgall is available. + /// This counts from 0 to 20_000. + /// + public short AddersgallTimer => this.Struct->AddersgallTimer; + + /// + /// Gets the amount of Addersgall available. + /// + public byte Addersgall => this.Struct->Addersgall; + + /// + /// Gets the amount of Addersting available. + /// + public byte Addersting => this.Struct->Addersting; + + /// + /// Gets a value indicating whether Eukrasia is activated. + /// + public bool Eukrasia => this.Struct->Eukrasia == 1; + } +} From f0cb71ecadf05dfa769f2fe983d1269898e85322 Mon Sep 17 00:00:00 2001 From: Raymond Date: Sat, 4 Dec 2021 22:13:04 -0500 Subject: [PATCH 6/6] Bump client structs --- lib/FFXIVClientStructs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/FFXIVClientStructs b/lib/FFXIVClientStructs index 306695be6..b4b577fce 160000 --- a/lib/FFXIVClientStructs +++ b/lib/FFXIVClientStructs @@ -1 +1 @@ -Subproject commit 306695be6ad489d1f596c1d5fa8db9206b742189 +Subproject commit b4b577fce3710e03db6cf50724b1b3f39b60f368