ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-14 12:44:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Update bard gauge for Coda, underlying changes

Browse source
This commit is contained in:
Raymond 2021-12-07 11:25:13 -05:00
parent 8d8b64e25c
commit 6eed8935f8
3 changed files with 60 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Dalamud/Game/ClientState/JobGauge/Enums/Song.cs
View file

@ -13,16 +13,16 @@ namespace Dalamud.Game.ClientState.JobGauge.Enums
/// <summary> /// <summary>
/// Mage's Ballad type. /// Mage's Ballad type.
/// </summary> /// </summary>
MAGE = 5, MAGE = 1,
/// <summary> /// <summary>
/// Army's Paeon type. /// Army's Paeon type.
/// </summary> /// </summary>
ARMY = 10, ARMY = 2,
/// <summary> /// <summary>
/// The Wanderer's Minuet type. /// The Wanderer's Minuet type.
/// </summary> /// </summary>
WANDERER = 15, WANDERER = 3,
} }
} }

57
Dalamud/Game/ClientState/JobGauge/Types/BRDGauge.cs
View file

@ -1,6 +1,7 @@
using System; using System;
using Dalamud.Game.ClientState.JobGauge.Enums; using Dalamud.Game.ClientState.JobGauge.Enums;
using FFXIVClientStructs.FFXIV.Client.Game.Gauge;
namespace Dalamud.Game.ClientState.JobGauge.Types namespace Dalamud.Game.ClientState.JobGauge.Types
{ {
@ -36,6 +37,60 @@ namespace Dalamud.Game.ClientState.JobGauge.Types
/// <summary> /// <summary>
/// Gets the type of song that is active. /// Gets the type of song that is active.
/// </summary> /// </summary>
public Song Song => (Song)this.Struct->Song; public Song Song
{
get
{
if (this.Struct->SongFlags.HasFlag(SongFlags.WanderersMinuet))
return Song.WANDERER;
if (this.Struct->SongFlags.HasFlag(SongFlags.ArmysPaeon))
return Song.ARMY;
if (this.Struct->SongFlags.HasFlag(SongFlags.MagesBallad))
return Song.MAGE;
return Song.NONE;
}
}
/// <summary>
/// Gets the type of song that was last played.
/// </summary>
public Song LastSong
{
get
{
if (this.Struct->SongFlags.HasFlag(SongFlags.WanderersMinuetLastPlayed))
return Song.WANDERER;
if (this.Struct->SongFlags.HasFlag(SongFlags.ArmysPaeonLastPlayed))
return Song.ARMY;
if (this.Struct->SongFlags.HasFlag(SongFlags.MagesBalladLastPlayed))
return Song.MAGE;
return Song.NONE;
}
}
/// <summary>
/// Gets the song Coda that are currently active.
/// </summary>
/// <remarks>
/// This will always return an array of size 3, inactive Coda are represented by <see cref="Song.NONE"/>.
/// </remarks>
public Song[] Coda
{
get
{
return new[]
{
this.Struct->SongFlags.HasFlag(SongFlags.MagesBalladCoda) ? Song.MAGE : Song.NONE,
this.Struct->SongFlags.HasFlag(SongFlags.ArmysPaeonCoda) ? Song.ARMY : Song.NONE,
this.Struct->SongFlags.HasFlag(SongFlags.WanderersMinuetCoda) ? Song.WANDERER : Song.NONE,
};
}
}
} }
} }

2
lib/FFXIVClientStructs

@ -1 +1 @@
Subproject commit f1c535062c315b055b05c35f9f4b25fd960712ee Subproject commit 64848695224c25f5f459c42100a5ab75bf611d3f