Merge pull request #503 from FFXIV-CombatReborn/tendo

Fix oversight on SAM due to ability names being stupid
FFXIV-CombatReborn · Jan 1, 2025 · 4c090af · 4c090af
2 parents fb9dc04 + f1bb0f6
commit 4c090af
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 19 deletions.
diff --git a/BasicRotations/Melee/SAM_Default.cs b/BasicRotations/Melee/SAM_Default.cs
@@ -144,30 +144,38 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)
     protected override bool GeneralGCD(out IAction? act)
     {
         act = null;
+        var isTargetBoss = HostileTarget?.IsBossFromTTK() ?? false;
+        var isTargetDying = HostileTarget?.IsDying() ?? false;
+
         if (EnableTEAChecker && Target.Name.ToString() == "Jagd Doll" && Target.GetHealthRatio() < 0.25)
         {
             return false;
         }
 
         if ((!HiganbanaTargets || (HiganbanaTargets && NumberOfAllHostilesInRange < 2)) && (HostileTarget?.WillStatusEnd(18, true, StatusID.Higanbana) ?? false) && HiganbanaPvE.CanUse(out act, skipStatusProvideCheck: true)) return true;
 
+        if (TendoKaeshiGokenPvE.CanUse(out act)) return true;
+        if (TendoGokenPvE.CanUse(out act)) return true;
+        if (KaeshiGokenPvE.CanUse(out act)) return true;
+        if (TenkaGokenPvE.CanUse(out act)) return true;
+
+        // aoe 12 combo's 2
+        if ((!HasMoon || IsMoonTimeLessThanFlower || !OkaPvE.EnoughLevel) && MangetsuPvE.CanUse(out act, skipComboCheck: HaveMeikyoShisui && !HasGetsu)) return true;
+        if ((!HasFlower || !IsMoonTimeLessThanFlower) && OkaPvE.CanUse(out act, skipComboCheck: HaveMeikyoShisui && !HasKa)) return true;
+
+        // initiate aoe
+        if (FukoPvE.CanUse(out act, skipComboCheck: true)) return true;
+        if (!FukoPvE.EnoughLevel && FugaPvE.CanUse(out act, skipComboCheck: true)) return true;
+
         if (MidareSetsugekkaPvE.CanUse(out act)) return true;
 
-        if (TenkaGokenPvE.CanUse(out act)) return true;
-        if (TendoGokenPvE.CanUse(out act)) return true;
         if (TendoSetsugekkaPvE.CanUse(out act)) return true;
-        if (TendoKaeshiGokenPvE.CanUse(out act)) return true;
         if (TendoKaeshiSetsugekkaPvE.CanUse(out act)) return true;
         // use 2nd finisher combo spell first
         if (KaeshiNamikiriPvE.CanUse(out act, usedUp: true)) return true;
 
-        var isTargetBoss = HostileTarget?.IsBossFromTTK() ?? false;
-        var isTargetDying = HostileTarget?.IsDying() ?? false;
-
         // use 2nd finisher combo spell first
-        if (KaeshiGokenPvE.CanUse(out act, usedUp: true)) return true;
         if (KaeshiSetsugekkaPvE.CanUse(out act, usedUp: true)) return true;
-        if (TendoKaeshiGokenPvE.CanUse(out act, usedUp: true)) return true;
         if (TendoKaeshiSetsugekkaPvE.CanUse(out act, usedUp: true)) return true;
 
         // burst finisher
@@ -177,10 +185,6 @@ protected override bool GeneralGCD(out IAction? act)
         if (TendoSetsugekkaPvE.CanUse(out act)) return true;
         if (MidareSetsugekkaPvE.CanUse(out act)) return true;
 
-        // aoe 12 combo's 2
-        if ((!HasMoon || IsMoonTimeLessThanFlower || !OkaPvE.EnoughLevel) && MangetsuPvE.CanUse(out act, skipComboCheck: HaveMeikyoShisui && !HasGetsu)) return true;
-        if ((!HasFlower || !IsMoonTimeLessThanFlower) && OkaPvE.CanUse(out act, skipComboCheck: HaveMeikyoShisui && !HasKa)) return true;
-
         if (!HasSetsu && SamBuffs.All(buff => Player.HasStatus(true, buff)) &&
             YukikazePvE.CanUse(out act, skipComboCheck: HaveMeikyoShisui && HasGetsu && HasKa)) return true;
 
@@ -198,10 +202,6 @@ protected override bool GeneralGCD(out IAction? act)
         if ((!HasMoon || IsMoonTimeLessThanFlower || !ShifuPvE.EnoughLevel) && JinpuPvE.CanUse(out act)) return true;
         if ((!HasFlower || !IsMoonTimeLessThanFlower) && ShifuPvE.CanUse(out act)) return true;
 
-        // initiate aoe
-        if (FukoPvE.CanUse(out act, skipComboCheck: true)) return true; // fuga doesn't becomes fuko automatically
-        if (!FukoPvE.EnoughLevel && FugaPvE.CanUse(out act, skipComboCheck: true)) return true;
-
         // MeikyoShisui buff is not active - not bursting - single target 123 combo's 1
         if (!HaveMeikyoShisui)
         {

diff --git a/RotationSolver.Basic/Rotations/Basic/SamuraiRotation.cs b/RotationSolver.Basic/Rotations/Basic/SamuraiRotation.cs
@@ -375,6 +375,7 @@ static partial void ModifyMidareSetsugekkaPvE(ref ActionSetting setting)
     static partial void ModifyKaeshiGokenPvE(ref ActionSetting setting)
     {
         setting.ActionCheck = () => KaeshiGokenReady;
+        setting.IsFriendly = false;
         setting.CreateConfig = () => new ActionConfig()
         {
             AoeCount = 3,
@@ -399,8 +400,6 @@ static partial void ModifyKaeshiNamikiriPvE(ref ActionSetting setting)
     static partial void ModifyTendoGokenPvE(ref ActionSetting setting)
     {
         setting.ActionCheck = () => TendoGokenReady;
-        setting.StatusProvide = [StatusID.Tsubamegaeshi];
-        setting.StatusNeed = [StatusID.Tendo];
         setting.IsFriendly = false;
         setting.CreateConfig = () => new ActionConfig()
         {
@@ -419,7 +418,6 @@ static partial void ModifyTendoKaeshiGokenPvE(ref ActionSetting setting)
     {
         setting.ActionCheck = () => TendoKaeshiGokenReady;
         setting.IsFriendly = false;
-        setting.StatusNeed = [StatusID.Tendo];
         setting.CreateConfig = () => new ActionConfig()
         {
             AoeCount = 3,