Skip to content

Commit

Permalink
look, we'll get to them when we have the chance
Browse files Browse the repository at this point in the history
  • Loading branch information
@PrincessRTFM
PrincessRTFM committed Jul 8, 2024
1 parent 51d5c32 commit 59e6c12
Show file tree
Hide file tree
Showing 7 changed files with 193 additions and 513 deletions.
3 changes: 3 additions & 0 deletions XIVComboVX/Combos/BLM.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ public const byte
}
}

/* returning Soon™ (when we have the time to go over everything)
internal class BlackFireBlizzard4: CustomCombo {
public override CustomComboPreset Preset { get; } = CustomComboPreset.BlmAny;
public override uint[] ActionIDs => [BLM.Fire4, BLM.Blizzard4];
Expand Down Expand Up @@ -267,3 +269,4 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
return actionID;
}
}
*/
3 changes: 3 additions & 0 deletions XIVComboVX/Combos/DRG.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ public const byte
}
}

/* returning Soon™ (when we have the time to go over everything)
internal class DragoonCoerthanTorment: CustomCombo {
public override CustomComboPreset Preset => CustomComboPreset.DrgAny;
public override uint[] ActionIDs { get; } = [DRG.CoerthanTorment];
Expand Down Expand Up @@ -266,3 +268,4 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
return actionID;
}
}
*/
334 changes: 1 addition & 333 deletions XIVComboVX/Combos/MNK.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,336 +77,4 @@ public const byte
}
}

internal class MonkAoECombo: CustomCombo {
public override CustomComboPreset Preset { get; } = CustomComboPreset.MonkAoECombo;

protected override uint Invoke(uint actionID, uint lastComboMove, float comboTime, byte level) {

if (actionID is MNK.ArmOfTheDestroyer or MNK.ShadowOfTheDestroyer) {
if (!IsEnabled(CustomComboPreset.MonkAoECombo_Destroyers))
return actionID;
}
else if (actionID is MNK.MasterfulBlitz) {
if (!IsEnabled(CustomComboPreset.MonkAoECombo_MasterBlitz))
return actionID;
}
else if (actionID is MNK.Rockbreaker) {
if (!IsEnabled(CustomComboPreset.MonkAoECombo_Rockbreaker))
return actionID;
}
else {
return actionID;
}

if (level >= MNK.Levels.HowlingFist) {
if (InCombat && HasTarget && CanWeave(actionID) && SelfHasEffect(MNK.Buffs.FifthChakra)) {
uint real = OriginalHook(MNK.HowlingFist);
if (CanUse(real))
return real;
}
}

MNKGauge gauge = GetJobGauge<MNKGauge>();

// Blitz
if (level >= MNK.Levels.MasterfulBlitz && !gauge.BeastChakra.Contains(BeastChakra.NONE))
return OriginalHook(MNK.MasterfulBlitz);

if (level >= MNK.Levels.PerfectBalance && SelfHasEffect(MNK.Buffs.PerfectBalance)) {

// Solar
if (level >= MNK.Levels.EnhancedPerfectBalance && !gauge.Nadi.HasFlag(Nadi.SOLAR)) {
if (level >= MNK.Levels.FourPointFury && !gauge.BeastChakra.Contains(BeastChakra.RAPTOR))
return MNK.FourPointFury;

if (level >= MNK.Levels.Rockbreaker && !gauge.BeastChakra.Contains(BeastChakra.COEURL))
return MNK.Rockbreaker;

if (level >= MNK.Levels.ArmOfTheDestroyer && !gauge.BeastChakra.Contains(BeastChakra.OPOOPO))
// Shadow of the Destroyer
return OriginalHook(MNK.ArmOfTheDestroyer);

return level >= MNK.Levels.ShadowOfTheDestroyer
? MNK.ShadowOfTheDestroyer
: MNK.Rockbreaker;
}

// Lunar. Also used if we have both Nadi as Tornado Kick/Phantom Rush isn't picky, or under 60.
return level >= MNK.Levels.ShadowOfTheDestroyer
? MNK.ShadowOfTheDestroyer
: MNK.Rockbreaker;
}

// FPF with FormShift
if (level >= MNK.Levels.FormShift && SelfHasEffect(MNK.Buffs.FormlessFist)) {
if (level >= MNK.Levels.FourPointFury)
return MNK.FourPointFury;
}

// 1-2-3 combo
if (level >= MNK.Levels.FourPointFury && SelfHasEffect(MNK.Buffs.RaptorForm))
return MNK.FourPointFury;

if (level >= MNK.Levels.ArmOfTheDestroyer && SelfHasEffect(MNK.Buffs.OpoOpoForm))
// Shadow of the Destroyer
return OriginalHook(MNK.ArmOfTheDestroyer);

if (level >= MNK.Levels.Rockbreaker && SelfHasEffect(MNK.Buffs.CoerlForm))
return MNK.Rockbreaker;

// Shadow of the Destroyer
return OriginalHook(MNK.ArmOfTheDestroyer);
}
}

internal class MonkSTCombo: CustomCombo {
public override CustomComboPreset Preset { get; } = CustomComboPreset.MonkSTCombo;
public override uint[] ActionIDs => [MNK.Bootshine];

// All credit to Evolutious on the github - they wrote the code themselves and sent it to me.
// All I did was adjust the style to better fit the rest of the plugin, and change a few hardcoded values to adjustable ones.
// Update post-6.2: I've also integrated a few other combos better and added one that was missing.
protected override uint Invoke(uint actionID, uint lastComboMove, float comboTime, byte level) {
MNKGauge gauge = GetJobGauge<MNKGauge>();

// *** oGCD Rotation ***
if (CanWeave(MNK.Bootshine)) {

// Bloodbath
if (level >= MNK.Levels.Bloodbath) {
if (IsOffCooldown(MNK.Bloodbath) && PlayerHealthPercentage < Service.Configuration.MonkBloodbathHealthPercentage)
return MNK.Bloodbath;
}

// Riddle of Earth
if (level >= MNK.Levels.RiddleOfEarth) {
if (IsOffCooldown(MNK.RiddleOfEarth) && PlayerHealthPercentage < Service.Configuration.MonkRiddleOfEarthHealthPercentage)
return MNK.RiddleOfEarth;
}

// Steel Peak/The Forbidden Chakra
if (level >= MNK.Levels.Meditation) {
if (gauge.Chakra == 5 && InCombat)
return OriginalHook(MNK.Meditation);
}

// Perfect Balance
if (level >= MNK.Levels.PerfectBalance && !SelfHasEffect(MNK.Buffs.PerfectBalance)) {
// These all go to the same codepath, but combining them would be some eldritch frankencondition, so they're kept separate for readability. -PrincessRTFM
if (level >= MNK.Levels.Brotherhood) {
if (SelfHasEffect(MNK.Buffs.RiddleOfFire) && SelfEffectDuration(MNK.Buffs.RiddleOfFire) < 10.0 && !SelfHasEffect(MNK.Buffs.FormlessFist) && SelfHasEffect(MNK.Buffs.DisciplinedFist) && SelfHasEffect(MNK.Buffs.Brotherhood))
return MNK.PerfectBalance;
}
else if (level >= MNK.Levels.RiddleOfFire) {
if (SelfHasEffect(MNK.Buffs.RiddleOfFire) && SelfEffectDuration(MNK.Buffs.RiddleOfFire) >= 10.0 && !SelfHasEffect(MNK.Buffs.FormlessFist) && SelfHasEffect(MNK.Buffs.DisciplinedFist))
return MNK.PerfectBalance;
}
else if (level >= MNK.Levels.FormShift) {
if (level < MNK.Levels.RiddleOfFire && !SelfHasEffect(MNK.Buffs.FormlessFist) && SelfHasEffect(MNK.Buffs.DisciplinedFist))
return MNK.PerfectBalance;
}
else if (level < MNK.Levels.FormShift) {
if (SelfHasEffect(MNK.Buffs.DisciplinedFist))
return MNK.PerfectBalance;
}
}

// Riddle of Fire
if (level >= MNK.Levels.RiddleOfFire) {
if (!IsOnCooldown(MNK.RiddleOfFire) && SelfHasEffect(MNK.Buffs.DisciplinedFist))
return MNK.RiddleOfFire;
}

// Brotherhood
if (level >= MNK.Levels.Brotherhood) {
if (SelfHasEffect(MNK.Buffs.PerfectBalance) && !IsOnCooldown(MNK.Brotherhood) && (gauge.BeastChakra.Contains(BeastChakra.RAPTOR) || gauge.BeastChakra.Contains(BeastChakra.COEURL) || gauge.BeastChakra.Contains(BeastChakra.OPOOPO)))
return MNK.Brotherhood;
}

// Riddle of Wind
if (level >= MNK.Levels.RiddleOfWind) {
if (!IsOnCooldown(MNK.RiddleOfWind) && IsOnCooldown(MNK.RiddleOfFire))
return MNK.RiddleOfWind;
}

}

// Masterful Blitz
if (level >= MNK.Levels.MasterfulBlitz) {
if (!gauge.BeastChakra.Contains(BeastChakra.NONE))
return OriginalHook(MNK.MasterfulBlitz);
}

// Master's Gauge
if (level >= MNK.Levels.PerfectBalance) {
if (SelfHasEffect(MNK.Buffs.PerfectBalance)) {

// Solar
if (level >= MNK.Levels.EnhancedPerfectBalance) {
if (!gauge.Nadi.HasFlag(Nadi.SOLAR)) {

if (!gauge.BeastChakra.Contains(BeastChakra.RAPTOR)) {
return IsEnabled(CustomComboPreset.MonkTwinSnakesFeature) && SelfEffectDuration(MNK.Buffs.DisciplinedFist) > Service.Configuration.MonkTwinSnakesBuffTime
? MNK.TrueStrike
: MNK.TwinSnakes;
}

if (!gauge.BeastChakra.Contains(BeastChakra.COEURL)) {
return level < MNK.Levels.Demolish || (IsEnabled(CustomComboPreset.MonkDemolishFeature) && TargetOwnEffectDuration(MNK.Debuffs.Demolish) > Service.Configuration.MonkDemolishDebuffTime)
? MNK.SnapPunch
: MNK.Demolish;
}

if (!gauge.BeastChakra.Contains(BeastChakra.OPOOPO)) {
return level < MNK.Levels.DragonKick || SelfHasEffect(MNK.Buffs.LeadenFist)
? MNK.Bootshine
: MNK.DragonKick;
}

return level >= MNK.Levels.DragonKick
? MNK.DragonKick
: MNK.Bootshine;
}
}

// Lunar. Also used if we have both Nadi as Tornado Kick/Phantom Rush isn't picky, or under 60.
return level < MNK.Levels.DragonKick || SelfHasEffect(MNK.Buffs.LeadenFist)
? MNK.Bootshine
: MNK.DragonKick;
}
}

// 1-2-3 combo
if (level >= MNK.Levels.TrueStrike) {
if (SelfHasEffect(MNK.Buffs.RaptorForm) || SelfHasEffect(MNK.Buffs.FormlessFist)) {
return level < MNK.Levels.TwinSnakes || (IsEnabled(CustomComboPreset.MonkTwinSnakesFeature) && SelfEffectDuration(MNK.Buffs.DisciplinedFist) > Service.Configuration.MonkTwinSnakesBuffTime)
? MNK.TrueStrike
: MNK.TwinSnakes;
}
}

if (level >= MNK.Levels.SnapPunch) {
if (SelfHasEffect(MNK.Buffs.CoerlForm)) {
return level < MNK.Levels.Demolish || (IsEnabled(CustomComboPreset.MonkDemolishFeature) && TargetOwnEffectDuration(MNK.Debuffs.Demolish) > Service.Configuration.MonkDemolishDebuffTime)
? MNK.SnapPunch
: MNK.Demolish;
}
}

if (SelfHasEffect(MNK.Buffs.OpoOpoForm)) {
return level < MNK.Levels.DragonKick || SelfHasEffect(MNK.Buffs.LeadenFist)
? MNK.Bootshine
: MNK.DragonKick;
}

// Dragon Kick
return level < MNK.Levels.DragonKick || SelfHasEffect(MNK.Buffs.LeadenFist)
? MNK.Bootshine
: MNK.DragonKick;
}
}

internal class MonkHowlingFistEnlightenment: CustomCombo {
public override CustomComboPreset Preset { get; } = CustomComboPreset.MonkHowlingFistMeditationFeature;
public override uint[] ActionIDs => [MNK.HowlingFist, MNK.Enlightenment];

protected override uint Invoke(uint actionID, uint lastComboMove, float comboTime, byte level) {
MNKGauge gauge = GetJobGauge<MNKGauge>();

if (level >= MNK.Levels.Meditation && gauge.Chakra < 5)
return MNK.Meditation;

return actionID;
}
}

internal class MonkDragonKick: CustomCombo {
public override CustomComboPreset Preset { get; } = CustomComboPreset.MnkAny;
public override uint[] ActionIDs => [MNK.DragonKick];

protected override uint Invoke(uint actionID, uint lastComboMove, float comboTime, byte level) {
MNKGauge gauge = GetJobGauge<MNKGauge>();

if (IsEnabled(CustomComboPreset.MonkDragonKickMeditationFeature)) {
if (level >= MNK.Levels.Meditation && gauge.Chakra < 5 && !InCombat)
return MNK.Meditation;
}

if (IsEnabled(CustomComboPreset.MonkDragonKickSteelPeakFeature)) {
if (level >= MNK.Levels.Meditation && gauge.Chakra == 5 && InCombat)
return OriginalHook(MNK.Meditation);
}

if (IsEnabled(CustomComboPreset.MonkDragonKickBalanceFeature)) {
if (level >= MNK.Levels.MasterfulBlitz && !gauge.BeastChakra.Contains(BeastChakra.NONE))
return OriginalHook(MNK.MasterfulBlitz);
}

if (IsEnabled(CustomComboPreset.MonkBootshineFeature)) {
if (level < MNK.Levels.DragonKick || SelfHasEffect(MNK.Buffs.LeadenFist))
return MNK.Bootshine;
}

return actionID;
}
}

internal class MonkTwinSnakes: CustomCombo {
public override CustomComboPreset Preset { get; } = CustomComboPreset.MonkTwinSnakesFeature;
public override uint[] ActionIDs => [MNK.TwinSnakes];

protected override uint Invoke(uint actionID, uint lastComboMove, float comboTime, byte level) {

if (level < MNK.Levels.TwinSnakes || SelfEffectDuration(MNK.Buffs.DisciplinedFist) > Service.Configuration.MonkTwinSnakesBuffTime)
return MNK.TrueStrike;

return actionID;
}
}

internal class MonkDemolish: CustomCombo {
public override CustomComboPreset Preset { get; } = CustomComboPreset.MonkDemolishFeature;
public override uint[] ActionIDs => [MNK.Demolish];

protected override uint Invoke(uint actionID, uint lastComboMove, float comboTime, byte level) {

if (level < MNK.Levels.Demolish || TargetOwnEffectDuration(MNK.Debuffs.Demolish) > Service.Configuration.MonkDemolishDebuffTime)
return MNK.SnapPunch;

return actionID;
}
}

internal class MonkPerfectBalance: CustomCombo {
public override CustomComboPreset Preset { get; } = CustomComboPreset.MonkPerfectBalanceFeature;
public override uint[] ActionIDs => [MNK.PerfectBalance];

protected override uint Invoke(uint actionID, uint lastComboMove, float comboTime, byte level) {

if (level >= MNK.Levels.MasterfulBlitz && (!GetJobGauge<MNKGauge>().BeastChakra.Contains(BeastChakra.NONE) || SelfHasEffect(MNK.Buffs.PerfectBalance)))
// Chakra actions
return OriginalHook(MNK.MasterfulBlitz);

return actionID;
}
}

internal class MonkRiddleOfFire: CustomCombo {
public override CustomComboPreset Preset { get; } = CustomComboPreset.MnkAny;
public override uint[] ActionIDs => [MNK.RiddleOfFire];

protected override uint Invoke(uint actionID, uint lastComboMove, float comboTime, byte level) {

if (IsEnabled(CustomComboPreset.MonkBrotherlyFire)) {
if (level >= MNK.Levels.Brotherhood && IsOffCooldown(MNK.Brotherhood) && IsOnCooldown(MNK.RiddleOfFire))
return MNK.Brotherhood;
}

if (IsEnabled(CustomComboPreset.MonkFireWind)) {
if (level >= MNK.Levels.RiddleOfWind && IsOffCooldown(MNK.RiddleOfWind) && IsOnCooldown(MNK.RiddleOfFire))
return MNK.RiddleOfWind;
}

return actionID;
}
}
// apparently MNK had some big changes, and neither of the devs plays, cares for, or even understands MNK, so guess what doesn't have combos until someone else writes them?
3 changes: 3 additions & 0 deletions XIVComboVX/Combos/SAM.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ public const byte
}
}

/* returning Soon™ (when we have the time to go over everything)
internal class SamuraiGurenSeneiLevelSyncFeature: CustomCombo {
public override CustomComboPreset Preset { get; } = CustomComboPreset.SamuraiGurenSeneiLevelSyncFeature;
public override uint[] ActionIDs { get; } = [SAM.HissatsuSenei];
Expand Down Expand Up @@ -302,3 +304,4 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
return actionID;
}
}
*/
3 changes: 3 additions & 0 deletions XIVComboVX/Combos/SMN.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ internal class SummonerSwiftcastRaiserFeature: SwiftRaiseCombo {
public override CustomComboPreset Preset => CustomComboPreset.SummonerSwiftcastRaiserFeature;
}

/* returning Soon™ (when we have the time to go over everything)
internal class SummonerEDFesterCombo: CustomCombo {
public override CustomComboPreset Preset => CustomComboPreset.SummonerEDFesterCombo;
public override uint[] ActionIDs { get; } = [SMN.Fester];
Expand Down Expand Up @@ -195,3 +197,4 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
return OriginalHook(actionID);
}
}
*/
Loading

0 comments on commit 59e6c12

Please sign in to comment.