Skip to content
This repository has been archived by the owner on Nov 21, 2024. It is now read-only.

Commit

Permalink
Fix merge
Browse files Browse the repository at this point in the history
  • Loading branch information
@Taurenkey
Taurenkey committed Jul 11, 2024
2 parents c6f3405 + 341415e commit 963463d
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 23 deletions.
44 changes: 32 additions & 12 deletions XIVSlothCombo/Combos/CustomComboPreset.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3732,55 +3732,75 @@ The three digets after RDM.JobID can be used to reorder items in the list

[ParentCombo(WAR_ST_StormsPath)]
[CustomComboInfo("Inner Beast / Fell Cleave Option", "Adds Inner Beast / Fell Cleave to Advanced Mode. Will use when you have the set minimum gauge, or under the effect of Inner Release. Will also use Nascent Chaos.", WAR.JobID, 2, "", "")]
WAR_ST_StormsPath_FellCleave = 18011,
WAR_ST_StormsPath_FellCleave = 18012,

[ParentCombo(WAR_ST_StormsPath)]
[CustomComboInfo("Infuriate Option", "Adds Infuriate to Advanced Mode.", WAR.JobID, 3, "", "")]
WAR_ST_StormsPath_Infuriate = 18021,

[ParentCombo(WAR_ST_StormsPath)]
[CustomComboInfo("Onslaught Option", "Adds Onslaught to Advanced Mode if you are under Surging Tempest Buff.", WAR.JobID, 4, "", "")]
WAR_ST_StormsPath_Onslaught = 18012,
WAR_ST_StormsPath_Onslaught = 18013,

[ParentCombo(WAR_ST_StormsPath)]
[CustomComboInfo("Upheaval Option", "Adds Upheaval to Advanced Mode if you have Surging Tempest.", WAR.JobID, 5, "", "")]
WAR_ST_StormsPath_Upheaval = 18007,

[ParentCombo(WAR_ST_StormsPath)]
[CustomComboInfo("Primal Wrath Option", "Adds Primal Wrath to Advanced Mode if you have Surging Tempest.", WAR.JobID, 5, "", "")]
WAR_ST_StormsPath_PrimalWrath = 18008,

[ParentCombo(WAR_ST_StormsPath)]
[CustomComboInfo("Primal Ruination Option", "Adds Primal Ruination to Advanced Mode if you have Surging Tempest.", WAR.JobID, 5, "", "")]
WAR_ST_StormsPath_PrimalRuination = 18009,

[ParentCombo(WAR_AoE_Overpower)]
[CustomComboInfo("Orogeny Option", "Adds Orogeny to Advanced Mode when you are buffed with Surging Tempest.", WAR.JobID, 6, "", "")]
WAR_AoE_Overpower_Orogeny = 18009,
WAR_AoE_Overpower_Orogeny = 18010,

[ParentCombo(WAR_ST_StormsPath)]
[CustomComboInfo("Primal Rend Option", "Adds Primal Rend to Advanced Mode.", WAR.JobID, 7, "", "")]
WAR_ST_StormsPath_PrimalRend = 18008,

[ReplaceSkill(WAR.StormsEye)]
[CustomComboInfo("Storm's Eye Combo Feature", "Replace Storm's Eye with its combo chain.", WAR.JobID, 3, "", "")]
War_ST_StormsEye = 18001,
WAR_ST_StormsPath_PrimalRend = 18011,

[ReplaceSkill(WAR.Overpower)]
[CustomComboInfo("Advanced Mode - AoE", "Replaces Overpower with a one-button full AoE rotation.\nThese features are ideal if you want to customize the rotation.", WAR.JobID, 2, "", "")]
WAR_AoE_Overpower = 18002,

[ReplaceSkill(WAR.StormsEye)]
[CustomComboInfo("Storm's Eye Combo Feature", "Replace Storm's Eye with its combo chain.", WAR.JobID, 3, "", "")]
War_ST_StormsEye = 18001,

[ReplaceSkill(WAR.NascentFlash)]
[CustomComboInfo("Nascent Flash Feature", "Replace Nascent Flash with Raw intuition when level synced below 76.", WAR.JobID, 5, "", "")]
WAR_NascentFlash = 18005,

[ParentCombo(WAR_AoE_Overpower)]
[CustomComboInfo("Infuriate Option", "Adds Infuriate to Advanced Mode when gauge is below 50 and not under Inner Release.", WAR.JobID)]
WAR_AoE_Overpower_Infuriate = 18013,
WAR_AoE_Overpower_Infuriate = 18014,

[ParentCombo(WAR_AoE_Overpower)]
[CustomComboInfo("Berserk / Inner Release Option", "Adds Berserk / Inner Release to Advanced Mode.", WAR.JobID)]
WAR_AoE_Overpower_InnerRelease = 18014,
WAR_AoE_Overpower_InnerRelease = 18015,

[ParentCombo(WAR_AoE_Overpower)]
[CustomComboInfo("Primal Wrath Option", "Adds Primal Wrath to Advanced Mode if you have Surging Tempest.", WAR.JobID, 5, "", "")]
WAR_AOE_Overpower_PrimalWrath = 18017,

[ParentCombo(WAR_AoE_Overpower)]
[CustomComboInfo("Primal Rend Option", "Adds Primal Rend to Advanced Mode if you have Surging Tempest.", WAR.JobID, 5, "", "")]
WAR_AOE_Overpower_PrimalRend = 18018,

[ParentCombo(WAR_AoE_Overpower)]
[CustomComboInfo("Primal Ruination Option", "Adds Primal Ruination to Advanced Mode if you have Surging Tempest.", WAR.JobID, 5, "", "")]
WAR_AOE_Overpower_PrimalRuination = 18019,

[ReplaceSkill(WAR.FellCleave, WAR.Decimate)]
[CustomComboInfo("Infuriate on Fell Cleave / Decimate Feature", "Turns Fell Cleave and Decimate into Infuriate if at or under set rage value.", WAR.JobID, 4, "", "")]
WAR_InfuriateFellCleave = 18018,
WAR_InfuriateFellCleave = 18031,

[ReplaceSkill(WAR.InnerRelease)]
[CustomComboInfo("Primal Rend Feature", "Turns Inner Release into Primal Rend on use.", WAR.JobID, 3, "", "")]
WAR_PrimalRend_InnerRelease = 18019,
WAR_PrimalRend_InnerRelease = 18032,

[ParentCombo(WAR_InfuriateFellCleave)]
[CustomComboInfo("Inner Release Priority Option", "Prevents the use of Infuriate while you have Inner Release stacks available.", WAR.JobID)]
Expand Down
31 changes: 21 additions & 10 deletions XIVSlothCombo/Combos/PvE/WAR.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ public const uint
InnerChaos = 16465,
Orogeny = 25752,
PrimalRend = 25753,
PrimalWrath = 36924,
PrimalRuination = 36925,
Onslaught = 7386;

public static class Buffs
Expand All @@ -42,6 +44,8 @@ public const ushort
SurgingTempest = 2677,
NascentChaos = 1897,
PrimalRendReady = 2624,
Wrathful = 3901,
PrimalRuinationReady = 3834,
Berserk = 86;
}

Expand Down Expand Up @@ -110,22 +114,27 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
return OriginalHook(Berserk);
if (IsEnabled(CustomComboPreset.WAR_ST_StormsPath_Upheaval) && IsOffCooldown(Upheaval) && LevelChecked(Upheaval))
return Upheaval;
if (IsEnabled(CustomComboPreset.WAR_ST_StormsPath_PrimalWrath) && HasEffect(Buffs.Wrathful) && LevelChecked(PrimalWrath))
return PrimalWrath;
if (IsEnabled(CustomComboPreset.WAR_ST_StormsPath_Onslaught) && LevelChecked(Onslaught) && GetRemainingCharges(Onslaught) > onslaughtChargesRemaining)
{
if (IsNotEnabled(CustomComboPreset.WAR_ST_StormsPath_Onslaught_MeleeSpender) ||
(IsEnabled(CustomComboPreset.WAR_ST_StormsPath_Onslaught_MeleeSpender) && !IsMoving && GetTargetDistance() <= 1 && (GetCooldownRemainingTime(InnerRelease) > 40 || !LevelChecked(InnerRelease))))
return Onslaught;
}
}

if (IsEnabled(CustomComboPreset.WAR_ST_StormsPath_PrimalRend) && HasEffect(Buffs.PrimalRendReady) && LevelChecked(PrimalRend))
if (IsEnabled(CustomComboPreset.WAR_ST_StormsPath_PrimalRend) && HasEffect(Buffs.PrimalRendReady) && LevelChecked(PrimalRend) && !JustUsed(InnerRelease, GetCooldown(actionID).CooldownTotal))
{
if (IsEnabled(CustomComboPreset.WAR_ST_StormsPath_PrimalRend_CloseRange) && !IsMoving && (GetTargetDistance() <= 1 || GetBuffRemainingTime(Buffs.PrimalRendReady) <= 10))
return PrimalRend;
if (IsNotEnabled(CustomComboPreset.WAR_ST_StormsPath_PrimalRend_CloseRange))
return PrimalRend;
}

if (IsEnabled(CustomComboPreset.WAR_ST_StormsPath_PrimalRuination) && HasEffect(Buffs.PrimalRuinationReady) && LevelChecked(PrimalRuination) && WasLastWeaponskill(PrimalRend))
return PrimalRuination;

if (IsEnabled(CustomComboPreset.WAR_ST_StormsPath_FellCleave) && LevelChecked(InnerBeast))
{
if (HasEffect(Buffs.InnerRelease) || (HasEffect(Buffs.NascentChaos) && InnerChaos.LevelChecked()))
Expand Down Expand Up @@ -225,16 +234,21 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
return OriginalHook(Berserk);
if (IsEnabled(CustomComboPreset.WAR_AoE_Overpower_Orogeny) && IsOffCooldown(Orogeny) && LevelChecked(Orogeny) && HasEffect(Buffs.SurgingTempest))
return Orogeny;
if (IsEnabled(CustomComboPreset.WAR_AOE_Overpower_PrimalWrath) && HasEffect(Buffs.Wrathful) && LevelChecked(PrimalWrath))
return PrimalWrath;
}

if (IsEnabled(CustomComboPreset.WAR_ST_StormsPath_PrimalRend) && HasEffect(Buffs.PrimalRendReady) && LevelChecked(PrimalRend))
if (IsEnabled(CustomComboPreset.WAR_AOE_Overpower_PrimalRend) && HasEffect(Buffs.PrimalRendReady) && LevelChecked(PrimalRend) && GetCooldownRemainingTime(InnerRelease) < 57.5)
{
if (IsEnabled(CustomComboPreset.WAR_ST_StormsPath_PrimalRend_CloseRange) && (GetTargetDistance() <= 3 || GetBuffRemainingTime(Buffs.PrimalRendReady) <= 10))
return PrimalRend;
if (IsNotEnabled(CustomComboPreset.WAR_ST_StormsPath_PrimalRend_CloseRange))
return PrimalRend;
}

if (IsEnabled(CustomComboPreset.WAR_AOE_Overpower_PrimalRuination) && HasEffect(Buffs.PrimalRuinationReady) && LevelChecked(PrimalRuination) && WasLastWeaponskill(PrimalRend))
return PrimalRuination;

if (IsEnabled(CustomComboPreset.WAR_AoE_Overpower_Decimate) && LevelChecked(SteelCyclone) && (gauge >= decimateGaugeSpend || HasEffect(Buffs.InnerRelease) || HasEffect(Buffs.NascentChaos)))
return OriginalHook(SteelCyclone);
}
Expand Down Expand Up @@ -280,17 +294,14 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
{
if (actionID == InnerBeast || actionID == SteelCyclone)
{

if (LevelChecked(PrimalRend) && HasEffect(Buffs.PrimalRendReady))
return PrimalRend;

// Fell Cleave or Decimate
return OriginalHook(actionID);


if (LevelChecked(PrimalRuination) && HasEffect(Buffs.PrimalRuinationReady) && WasLastWeaponskill(PrimalRend))
return PrimalRuination;
}

return actionID;
// fell cleave or decimate
return OriginalHook(actionID);
}
}

Expand Down
2 changes: 1 addition & 1 deletion XIVSlothCombo/XIVSlothCombo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public sealed partial class XIVSlothCombo : IDalamudPlugin
//SGE.JobID,
//SMN.JobID,
//VPR.JobID,
WAR.JobID,
//WAR.JobID,
//WHM.JobID
};

Expand Down

0 comments on commit 963463d

Please sign in to comment.