Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MNK] Various #192

Merged
merged 6 commits into from
Dec 15, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
better wording meikyo option
  • Loading branch information
Kagekazu committed Dec 13, 2024
commit 331a2ff91bf0cb9fc60ee682efbaeb5972781c59
8 changes: 4 additions & 4 deletions WrathCombo/Combos/CustomComboPreset.cs
Original file line number Diff line number Diff line change
@@ -4882,12 +4882,12 @@ [Variant] [CustomComboInfo("Cure on Vercure Option", "Replaces Vercure with Vari

[ReplaceSkill(SAM.MeikyoShisui)]
[ConflictingCombos(SAM_MeikyoShisuiProtection)]
[CustomComboInfo("Jinpu/Shifu Feature",
"Replace Meikyo Shisui with Jinpu, Shifu, and Yukikaze depending on what is needed.", SAM.JobID)]
SAM_JinpuShifu = 15200,
[CustomComboInfo("Sens Feature",
"Replace Meikyo Shisui with Gekko, Kasha, and Yukikaze depending on what is needed.", SAM.JobID)]
SAM_MeikyoSens = 15200,

[ReplaceSkill(SAM.MeikyoShisui)]
[ConflictingCombos(SAM_JinpuShifu)]
[ConflictingCombos(SAM_MeikyoSens)]
[CustomComboInfo("Meikyo Shisui Protection",
"Replaces Meikyo Shisui with Savage Blade when u already have Meikyo Shisui active.", SAM.JobID)]
SAM_MeikyoShisuiProtection = 15214,
27 changes: 13 additions & 14 deletions WrathCombo/Combos/PvE/SAM/SAM.cs
Original file line number Diff line number Diff line change
@@ -773,26 +773,25 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
}
}

internal class SAM_JinpuShifu : CustomCombo
internal class SAM_MeikyoSens : CustomCombo
{
protected internal override CustomComboPreset Preset => CustomComboPreset.SAM_JinpuShifu;
protected internal override CustomComboPreset Preset => CustomComboPreset.SAM_MeikyoSens;

protected override uint Invoke(uint actionID, uint lastComboMove, float comboTime, byte level)
{
if (actionID is MeikyoShisui)
if (HasEffect(Buffs.MeikyoShisui))
{
if (!HasEffect(Buffs.Fugetsu) ||
!gauge.Sen.HasFlag(Sen.GETSU))
return Gekko;
if (actionID is MeikyoShisui && HasEffect(Buffs.MeikyoShisui))
{
if (!HasEffect(Buffs.Fugetsu) ||
!gauge.Sen.HasFlag(Sen.GETSU))
return Gekko;

if (!HasEffect(Buffs.Fuka) ||
!gauge.Sen.HasFlag(Sen.KA))
return Kasha;
if (!HasEffect(Buffs.Fuka) ||
!gauge.Sen.HasFlag(Sen.KA))
return Kasha;

if (!gauge.Sen.HasFlag(Sen.SETSU))
return Yukikaze;
}
if (!gauge.Sen.HasFlag(Sen.SETSU))
return Yukikaze;
}

return actionID;
}