ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-01-03 14:23:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #714 from daemitus/gauge

Browse source
This commit is contained in:
goaaats 2021-12-11 03:18:27 +01:00 • committed by GitHub
commit b3083e25b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 27 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dalamud/Game/ClientState/ClientState.cs
View file

@ -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;

23
Dalamud/Game/ClientState/JobGauge/Enums/BOTDState.cs
View file

@ -1,23 +0,0 @@
namespace Dalamud.Game.ClientState.JobGauge.Enums
{
/// <summary>
/// DRG Blood of the Dragon state types.
/// </summary>
public enum BOTDState : byte
{
/// <summary>
/// Inactive type.
/// </summary>
NONE = 0,
/// <summary>
/// Blood of the Dragon is active.
/// </summary>
BOTD = 1,
/// <summary>
/// Life of the Dragon is active.
/// </summary>
LOTD = 2,
}
}

4
Dalamud/Game/ClientState/JobGauge/Enums/Chakra.cs → Dalamud/Game/ClientState/JobGauge/Enums/BeastChakra.cs
View file

@ -1,9 +1,9 @@
namespace Dalamud.Game.ClientState.JobGauge.Enums
{
/// <summary>
/// MNK Chakra types.
/// MNK Beast Chakra types.
/// </summary>
public enum Chakra : byte
public enum BeastChakra : byte
{
/// <summary>
/// No card.

2
Dalamud/Game/ClientState/JobGauge/Enums/Nadi.cs
View file

@ -1,4 +1,4 @@
using System;
using System;
namespace Dalamud.Game.ClientState.JobGauge.Enums
{

3
Dalamud/Game/ClientState/JobGauge/Types/BLMGauge.cs
View file

@ -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;
/// <summary>
/// Gets a value indicating whether or not Paradox is active.
/// Gets a value indicating whether Paradox is active.
/// </summary>
/// <returns><c>true</c> or <c>false</c>.</returns>
public bool IsParadoxActive => this.Struct->ParadoxActive;

13
Dalamud/Game/ClientState/JobGauge/Types/DRGGauge.cs
View file

@ -19,18 +19,23 @@ namespace Dalamud.Game.ClientState.JobGauge.Types
}
/// <summary>
/// Gets the time remaining for Blood of the Dragon in milliseconds.
/// Gets the time remaining for Life of the Dragon in milliseconds.
/// </summary>
public short BOTDTimer => this.Struct->BotdTimer;
public short LOTDTimer => this.Struct->LotdTimer;
/// <summary>
/// Gets the current state of Blood of the Dragon.
/// Gets a value indicating whether Life of the Dragon is active.
/// </summary>
public BOTDState BOTDState => (BOTDState)this.Struct->BotdState;
public bool IsLOTDActive => this.Struct->LotdState == 2;
/// <summary>
/// Gets the count of eyes opened during Blood of the Dragon.
/// </summary>
public byte EyeCount => this.Struct->EyeCount;
/// <summary>
/// Gets the amount of Firstminds' Focus available.
/// </summary>
public byte FirstmindsFocusCount => this.Struct->FirstmindsFocusCount;
}
}

11
Dalamud/Game/ClientState/JobGauge/Types/MNKGauge.cs
View file

@ -20,12 +20,17 @@ namespace Dalamud.Game.ClientState.JobGauge.Types
}
/// <summary>
/// Gets the types of Chakra available.
/// Gets the amount of Chakra available.
/// </summary>
public byte Chakra => this.Struct->Chakra;
/// <summary>
/// Gets the types of Beast Chakra available.
/// </summary>
/// <remarks>
/// This will always return an array of size 3, inactive Chakra are represented by <see cref="Chakra.NONE"/>.
/// This will always return an array of size 3, inactive Beast Chakra are represented by <see cref="BeastChakra.NONE"/>.
/// </remarks>
public Chakra[] Chakra => this.Struct->CurrentChakra.Select(c => (Chakra)c).ToArray();
public BeastChakra[] BeastChakra => this.Struct->BeastChakra.Select(c => (BeastChakra)c).ToArray();
/// <summary>
/// Gets the types of Nadi available.

4
Dalamud/Game/Gui/PartyFinder/Types/JobFlags.cs
View file

@ -142,12 +142,12 @@ namespace Dalamud.Game.Gui.PartyFinder.Types
/// Dancer (DNC).
/// </summary>
Dancer = 1 << 27,
/// <summary>
/// Reaper (RPR).
/// </summary>
Reaper = 1 << 28,
/// <summary>
/// Sage (SGE).
/// </summary>

3
Dalamud/Interface/Internal/Windows/DataWindow.cs
View file

@ -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;

2
Dalamud/Utility/Util.cs
View file

@ -447,7 +447,7 @@ namespace Dalamud.Utility
{
var process = new ProcessStartInfo(url)
{
UseShellExecute = true
UseShellExecute = true,
};
Process.Start(process);
}

2
lib/FFXIVClientStructs

@ -1 +1 @@
Subproject commit 224a4fa2ac4c0ae260b8ff4778c7fd6f1efb41b6
Subproject commit fdd9543dd06d8bb55a24149eef414c090c4139a2