diff --git a/Dalamud/Game/ClientState/ClientState.cs b/Dalamud/Game/ClientState/ClientState.cs
index cda6d7c9b..0e8a3a58c 100644
--- a/Dalamud/Game/ClientState/ClientState.cs
+++ b/Dalamud/Game/ClientState/ClientState.cs
@@ -1,6 +1,7 @@
using System;
using System.Runtime.InteropServices;
+using Dalamud.Game.ClientState.Aetherytes;
using Dalamud.Game.ClientState.Buddy;
using Dalamud.Game.ClientState.Conditions;
using Dalamud.Game.ClientState.Fates;
@@ -10,7 +11,6 @@ using Dalamud.Game.ClientState.Keys;
using Dalamud.Game.ClientState.Objects;
using Dalamud.Game.ClientState.Objects.SubKinds;
using Dalamud.Game.ClientState.Party;
-using Dalamud.Game.ClientState.Aetherytes;
using Dalamud.Game.Network.Internal;
using Dalamud.Hooking;
using Dalamud.IoC;
diff --git a/Dalamud/Game/ClientState/JobGauge/Enums/BOTDState.cs b/Dalamud/Game/ClientState/JobGauge/Enums/BOTDState.cs
deleted file mode 100644
index 0c32755fd..000000000
--- a/Dalamud/Game/ClientState/JobGauge/Enums/BOTDState.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace Dalamud.Game.ClientState.JobGauge.Enums
-{
- ///
- /// DRG Blood of the Dragon state types.
- ///
- public enum BOTDState : byte
- {
- ///
- /// Inactive type.
- ///
- NONE = 0,
-
- ///
- /// Blood of the Dragon is active.
- ///
- BOTD = 1,
-
- ///
- /// Life of the Dragon is active.
- ///
- LOTD = 2,
- }
-}
diff --git a/Dalamud/Game/ClientState/JobGauge/Enums/Chakra.cs b/Dalamud/Game/ClientState/JobGauge/Enums/BeastChakra.cs
similarity index 87%
rename from Dalamud/Game/ClientState/JobGauge/Enums/Chakra.cs
rename to Dalamud/Game/ClientState/JobGauge/Enums/BeastChakra.cs
index 33e544633..00e71d1a4 100644
--- a/Dalamud/Game/ClientState/JobGauge/Enums/Chakra.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Enums/BeastChakra.cs
@@ -1,9 +1,9 @@
namespace Dalamud.Game.ClientState.JobGauge.Enums
{
///
- /// MNK Chakra types.
+ /// MNK Beast Chakra types.
///
- public enum Chakra : byte
+ public enum BeastChakra : byte
{
///
/// No card.
diff --git a/Dalamud/Game/ClientState/JobGauge/Enums/Nadi.cs b/Dalamud/Game/ClientState/JobGauge/Enums/Nadi.cs
index 80994907d..f84a7e55e 100644
--- a/Dalamud/Game/ClientState/JobGauge/Enums/Nadi.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Enums/Nadi.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
namespace Dalamud.Game.ClientState.JobGauge.Enums
{
diff --git a/Dalamud/Game/ClientState/JobGauge/Types/BLMGauge.cs b/Dalamud/Game/ClientState/JobGauge/Types/BLMGauge.cs
index 445f4615a..e195225d8 100644
--- a/Dalamud/Game/ClientState/JobGauge/Types/BLMGauge.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Types/BLMGauge.cs
@@ -1,5 +1,4 @@
using System;
-using FFXIVClientStructs.FFXIV.Client.Game.Gauge;
namespace Dalamud.Game.ClientState.JobGauge.Types
{
@@ -66,7 +65,7 @@ namespace Dalamud.Game.ClientState.JobGauge.Types
public bool IsEnochianActive => this.Struct->EnochianActive;
///
- /// Gets a value indicating whether or not Paradox is active.
+ /// Gets a value indicating whether Paradox is active.
///
/// true or false.
public bool IsParadoxActive => this.Struct->ParadoxActive;
diff --git a/Dalamud/Game/ClientState/JobGauge/Types/DRGGauge.cs b/Dalamud/Game/ClientState/JobGauge/Types/DRGGauge.cs
index dd89b069a..26b9137c2 100644
--- a/Dalamud/Game/ClientState/JobGauge/Types/DRGGauge.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Types/DRGGauge.cs
@@ -19,18 +19,23 @@ namespace Dalamud.Game.ClientState.JobGauge.Types
}
///
- /// Gets the time remaining for Blood of the Dragon in milliseconds.
+ /// Gets the time remaining for Life of the Dragon in milliseconds.
///
- public short BOTDTimer => this.Struct->BotdTimer;
+ public short LOTDTimer => this.Struct->LotdTimer;
///
- /// Gets the current state of Blood of the Dragon.
+ /// Gets a value indicating whether Life of the Dragon is active.
///
- public BOTDState BOTDState => (BOTDState)this.Struct->BotdState;
+ public bool IsLOTDActive => this.Struct->LotdState == 2;
///
/// Gets the count of eyes opened during Blood of the Dragon.
///
public byte EyeCount => this.Struct->EyeCount;
+
+ ///
+ /// Gets the amount of Firstminds' Focus available.
+ ///
+ public byte FirstmindsFocusCount => this.Struct->FirstmindsFocusCount;
}
}
diff --git a/Dalamud/Game/ClientState/JobGauge/Types/MNKGauge.cs b/Dalamud/Game/ClientState/JobGauge/Types/MNKGauge.cs
index a1c8365d7..752e0dc42 100644
--- a/Dalamud/Game/ClientState/JobGauge/Types/MNKGauge.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Types/MNKGauge.cs
@@ -20,12 +20,17 @@ namespace Dalamud.Game.ClientState.JobGauge.Types
}
///
- /// Gets the types of Chakra available.
+ /// Gets the amount of Chakra available.
+ ///
+ public byte Chakra => this.Struct->Chakra;
+
+ ///
+ /// Gets the types of Beast Chakra available.
///
///
- /// This will always return an array of size 3, inactive Chakra are represented by .
+ /// This will always return an array of size 3, inactive Beast Chakra are represented by .
///
- public Chakra[] Chakra => this.Struct->CurrentChakra.Select(c => (Chakra)c).ToArray();
+ public BeastChakra[] BeastChakra => this.Struct->BeastChakra.Select(c => (BeastChakra)c).ToArray();
///
/// Gets the types of Nadi available.
diff --git a/Dalamud/Game/Gui/PartyFinder/Types/JobFlags.cs b/Dalamud/Game/Gui/PartyFinder/Types/JobFlags.cs
index a89398a88..b79e374d9 100644
--- a/Dalamud/Game/Gui/PartyFinder/Types/JobFlags.cs
+++ b/Dalamud/Game/Gui/PartyFinder/Types/JobFlags.cs
@@ -142,12 +142,12 @@ namespace Dalamud.Game.Gui.PartyFinder.Types
/// Dancer (DNC).
///
Dancer = 1 << 27,
-
+
///
/// Reaper (RPR).
///
Reaper = 1 << 28,
-
+
///
/// Sage (SGE).
///
diff --git a/Dalamud/Interface/Internal/Windows/DataWindow.cs b/Dalamud/Interface/Internal/Windows/DataWindow.cs
index b6e9db296..741ba46f4 100644
--- a/Dalamud/Interface/Internal/Windows/DataWindow.cs
+++ b/Dalamud/Interface/Internal/Windows/DataWindow.cs
@@ -11,19 +11,18 @@ using Dalamud.Configuration.Internal;
using Dalamud.Data;
using Dalamud.Game;
using Dalamud.Game.ClientState;
+using Dalamud.Game.ClientState.Aetherytes;
using Dalamud.Game.ClientState.Buddy;
using Dalamud.Game.ClientState.Conditions;
using Dalamud.Game.ClientState.Fates;
using Dalamud.Game.ClientState.GamePad;
using Dalamud.Game.ClientState.JobGauge;
-using Dalamud.Game.ClientState.JobGauge.Enums;
using Dalamud.Game.ClientState.JobGauge.Types;
using Dalamud.Game.ClientState.Keys;
using Dalamud.Game.ClientState.Objects;
using Dalamud.Game.ClientState.Objects.SubKinds;
using Dalamud.Game.ClientState.Objects.Types;
using Dalamud.Game.ClientState.Party;
-using Dalamud.Game.ClientState.Aetherytes;
using Dalamud.Game.Command;
using Dalamud.Game.Gui;
using Dalamud.Game.Gui.FlyText;
diff --git a/Dalamud/Utility/Util.cs b/Dalamud/Utility/Util.cs
index 447a51f7a..ba7822f5e 100644
--- a/Dalamud/Utility/Util.cs
+++ b/Dalamud/Utility/Util.cs
@@ -447,7 +447,7 @@ namespace Dalamud.Utility
{
var process = new ProcessStartInfo(url)
{
- UseShellExecute = true
+ UseShellExecute = true,
};
Process.Start(process);
}
diff --git a/lib/FFXIVClientStructs b/lib/FFXIVClientStructs
index 224a4fa2a..fdd9543dd 160000
--- a/lib/FFXIVClientStructs
+++ b/lib/FFXIVClientStructs
@@ -1 +1 @@
-Subproject commit 224a4fa2ac4c0ae260b8ff4778c7fd6f1efb41b6
+Subproject commit fdd9543dd06d8bb55a24149eef414c090c4139a2