From 2363e8a1a0ce1cfc89e00b09d398199273a12261 Mon Sep 17 00:00:00 2001 From: Khayle Date: Fri, 15 Nov 2024 05:52:13 +0100 Subject: [PATCH] PRs Changelog + GNB/DNC changes - Covering PRs #438 #437 #434 #428 - Added GNB's Brutal Shell Combo - Removed DNC's Devilment into Starfall Combo as 7.1 made this native --- XIVComboExpanded/Combos/DNC.cs | 8 ++---- XIVComboExpanded/Combos/GNB.cs | 15 +++++++++++ XIVComboExpanded/CustomComboPreset.cs | 15 ++++++++--- XIVComboExpanded/Interface/Changelog.cs | 34 +++++++++++++++++++++++-- 4 files changed, 60 insertions(+), 12 deletions(-) diff --git a/XIVComboExpanded/Combos/DNC.cs b/XIVComboExpanded/Combos/DNC.cs index 772db48a..7cf3f80f 100644 --- a/XIVComboExpanded/Combos/DNC.cs +++ b/XIVComboExpanded/Combos/DNC.cs @@ -371,14 +371,13 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim internal class DancerDevilment : CustomCombo { - protected internal override CustomComboPreset Preset { get; } = CustomComboPreset.DancerDevilmentFeature; + protected internal override CustomComboPreset Preset { get; } = CustomComboPreset.DancerPartnerFeature; protected override uint Invoke(uint actionID, uint lastComboMove, float comboTime, byte level) { if (actionID == DNC.Devilment) { - if (IsEnabled(CustomComboPreset.DancerPartnerFeature) && level >= DNC.Levels.ClosedPosition && - (!HasEffect(DNC.Buffs.ClosedPosition))) + if (level >= DNC.Levels.ClosedPosition && (!HasEffect(DNC.Buffs.ClosedPosition))) { if (IsEnabled(CustomComboPreset.DancerChocoboPartnerFeature) && HasCompanionPresent()) { @@ -388,9 +387,6 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim if (IsInParty() && IsInInstance()) return DNC.ClosedPosition; } - - if (level >= DNC.Levels.StarfallDance && HasEffect(DNC.Buffs.FlourishingStarfall)) - return DNC.StarfallDance; } return actionID; diff --git a/XIVComboExpanded/Combos/GNB.cs b/XIVComboExpanded/Combos/GNB.cs index 21a66078..20c92a4d 100644 --- a/XIVComboExpanded/Combos/GNB.cs +++ b/XIVComboExpanded/Combos/GNB.cs @@ -130,6 +130,21 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim } } +internal class GunbreakerBrutalShell : CustomCombo +{ + protected internal override CustomComboPreset Preset { get; } = CustomComboPreset.GunbreakerBrutalShellCombo; + + protected override uint Invoke(uint actionID, uint lastComboMove, float comboTime, byte level) + { + if (actionID == GNB.BrutalShell && lastComboMove != GNB.KeenEdge) + { + return GNB.KeenEdge; + } + + return actionID; + } +} + internal class GunbreakerGnashingFang : CustomCombo { protected internal override CustomComboPreset Preset { get; } = CustomComboPreset.GunbreakerGnashingFangCont; diff --git a/XIVComboExpanded/CustomComboPreset.cs b/XIVComboExpanded/CustomComboPreset.cs index 3b36e00c..8a946f5c 100644 --- a/XIVComboExpanded/CustomComboPreset.cs +++ b/XIVComboExpanded/CustomComboPreset.cs @@ -647,10 +647,11 @@ public enum CustomComboPreset [CustomComboInfo("Chocobo Partner Feature", "Also applies if you are out of duty and that your Chocobo is summoned.", DNC.JobID)] DancerChocoboPartnerFeature = 3816, - [IconsCombo([DNC.Devilment, UTL.ArrowLeft, DNC.StarfallDance, UTL.Blank, DNC.Buffs.FlourishingStarfall, UTL.Checkmark])] - [SectionCombo("Dances features")] - [CustomComboInfo("Devilment Feature", "Replace Devilment with Starfall Dance when active.", DNC.JobID)] - DancerDevilmentFeature = 3807, + // Retired! + //[IconsCombo([DNC.Devilment, UTL.ArrowLeft, DNC.StarfallDance, UTL.Blank, DNC.Buffs.FlourishingStarfall, UTL.Checkmark])] + //[SectionCombo("Dances features")] + //[CustomComboInfo("Devilment Feature", "Replace Devilment with Starfall Dance when active.", DNC.JobID)] + //DancerDevilmentFeature = 3807, [IconsCombo([DNC.StandardStep, UTL.ArrowLeft, DNC.LastDance, UTL.Blank, DNC.Buffs.LastDanceReady, UTL.Checkmark])] [SectionCombo("Dances features")] @@ -877,6 +878,12 @@ public enum CustomComboPreset [CustomComboInfo("Burst Strike Feature", "Replace Solid Barrel with Burst Strike when charges are full.", GNB.JobID)] GunbreakerBurstStrikeFeature = 3710, + [SectionCombo("Single Target")] + [IconsCombo([GNB.BrutalShell, UTL.ArrowLeft, GNB.KeenEdge])] + [SecretCustomCombo] + [CustomComboInfo("Brutal Shell Combo", "Replace Brutal Shell with Keen Edge but doesn't change to Solid Barrel, for sustaining purposes.", GNB.JobID)] + GunbreakerBrutalShellCombo = 3727, + [SectionCombo("Single Target")] [IconsCombo([GNB.BurstStrike, UTL.ArrowLeft, GNB.DoubleDown])] [AccessibilityCustomCombo] diff --git a/XIVComboExpanded/Interface/Changelog.cs b/XIVComboExpanded/Interface/Changelog.cs index e17c9e8d..62219712 100644 --- a/XIVComboExpanded/Interface/Changelog.cs +++ b/XIVComboExpanded/Interface/Changelog.cs @@ -12,16 +12,46 @@ public static Dictionary GetChangelog() { return new Dictionary() { + { + "v2.0.1.1", + [ + "Added BLM's Enochian Umbral Ice Feature by @lhn1703.", + "Added BRD's Automatic Iron Jaws Apex Feature by @kaedys", + "Added BRD's Battle Finale Feature by @kaedys.", + "Added BRD's Radiant Strikes feature by @kaedys.", + "Added DNC's Tillana Overcap Prevention Feature by @kaedys.", + "Added DRK's Souleater Overcap Optimized Feature by @lhn1703.", + "Added DRK's Stalwart Soul Overcap Optimized Feature by @lhn1703.", + "Added DRK's Disesteem Feature & Disesteem Souleater Feature by @lhn1703.", + "Added GNB's Brutal Shell Combo for sustaining purposes.", + "Added NIN's various Aeolian Edge|Armor Crush / Fleeting Raiju|Forked Raiju Features by @kaedys.", + "Added RPR's Soul Scythe Guillotine Feature by @kaedys.", + "Added VPR's Serpent's Fang Feature & Include all oGCDs Option by @kaedys.", + "Fixed BLM's Enochian Timer feature where it could try to cast Despair even if you lack the MP by @kaedys.", + "Fixed DNC's Automatic Saber Dance features for AoE that were using the single target feature instead by @kaedys.", + "Fixed NIN's Kazematoi feature conflicting with (or requiring) the Aeolian Edge combo feature by @kaedys.", + "Fixed VPR's combos when the player has neither Honed buff so that the combo buttons are left alone, rather than \nboth being replaced with Steel Fangs/Maw by @kaedys.", + "Removed BLM's Enochian active conditional for replacing Transpose and Umbral Soul by @kaedys.", + "Removed DNC's Devilment into Starfall Combo as 7.1 made this native.", + "Removed MNK's conflicts for Coeurl Feature and Raptor Feature with Monke Mode by @kaedys.", + "Reworked SAM's Shoha features to prioritize it over Zanshin if both are available when replacing Shinten by @kaedys.", + "Reworked SGE's Sectioning by @kaedys.", + "Reworked DRG's Geirskogul to Wyrmwind Thrust feature to prioritize it over Nastrond, since the latter has effectively no cooldown during LotD.\n The priority for usage is now Geirskogal > Wyrmwind > Nastrond.", + "Added level check for NIN's Trick Attack in the Kassatsu Trick feature by @kaedys.", + "Added level check for RPR's Automatic Soul Slice/Scythe features by @kaedys.", + ] + }, { "v2.0.1.0", [ - "API 11 update. Things may still be broken, good luck testing this!" + "API 11 update. Things are still partially broken, please do not post issues on GitHub for now." ] }, { "v2.0.0.12", [ - "Fixed ADV's Swift Raise Feature. Sorry about that!" + "Fixed ADV's Swift Raise Feature. Sorry about that!", + "Added GNB's Empty Blood Reign Feature by @aldros-ffxi." ] }, {