Merge commit 'refs/pull/1786/head' of https://github.com/Nik-Potokar/…

…XIVSlothCombo
Nik-Potokar · Sep 14, 2024 · 51b31bb · 51b31bb
2 parents 60d4362 + c576a86
commit 51b31bb
Show file tree

Hide file tree

Showing 3 changed files with 157 additions and 102 deletions.
diff --git a/XIVSlothCombo/Combos/CustomComboPreset.cs b/XIVSlothCombo/Combos/CustomComboPreset.cs
@@ -1,7 +1,6 @@
 using XIVSlothCombo.Attributes;
 using XIVSlothCombo.Combos.PvE;
 using XIVSlothCombo.Combos.PvP;
-using static XIVSlothCombo.Combos.PvE.BRD;
 
 namespace XIVSlothCombo.Combos
 {

diff --git a/XIVSlothCombo/Combos/JobHelpers/SAM.cs b/XIVSlothCombo/Combos/JobHelpers/SAM.cs
@@ -1,7 +1,6 @@
 using Dalamud.Game.ClientState.JobGauge.Types;
 using ECommons.DalamudServices;
 using FFXIVClientStructs.FFXIV.Client.Game;
-using System.Linq;
 using XIVSlothCombo.Combos.JobHelpers.Enums;
 using XIVSlothCombo.Combos.PvE;
 using XIVSlothCombo.CustomComboNS.Functions;
@@ -22,48 +21,14 @@ private static int GetSenCount()
 
             return senCount;
         }
-        internal static bool ComboStarted => GetComboStarted(); 
+        internal static bool ComboStarted => GetComboStarted();
         private unsafe static bool GetComboStarted()
         {
             var comboAction = ActionManager.Instance()->Combo.Action;
             if (comboAction == CustomComboFunctions.OriginalHook(Hakaze) || comboAction == CustomComboFunctions.OriginalHook(Jinpu) || comboAction == CustomComboFunctions.OriginalHook(Shifu))
                 return true;
             return false;
         }
-
-        internal static bool UseTsubame => GetUseTsubame();
-
-        private static bool GetUseTsubame()
-        {
-            int MeikyoUsed = ActionWatching.CombatActions.Count(x => x == MeikyoShisui);
-
-            if (CustomComboFunctions.ActionReady(TsubameGaeshi))
-            {
-                //Tendo
-                if (CustomComboFunctions.HasEffect(Buffs.TendoKaeshiSetsugekkaReady))
-                    return true;
-
-                if (CustomComboFunctions.HasEffect(Buffs.TsubameReady))
-                {
-                    var meikyoModulo = MeikyoUsed % 15;
-                    //1 and 2 min
-                    if ((meikyoModulo is 0 or 1 or 2 or 3 or 4 or 9 or 10))
-                        return true;
-
-                    // 3 and 4 min
-                    if ((meikyoModulo is 5 or 6 or 11 or 12) &&
-                        CustomComboFunctions.GetBuffStacks(Buffs.MeikyoShisui) is 2)
-                        return true;
-
-                    // 5 and 6 min
-                    if ((meikyoModulo is 7 or 8 or 13 or 14) &&
-                        CustomComboFunctions.GetBuffStacks(Buffs.MeikyoShisui) is 1)
-                        return true;
-                }
-            }
-            return false;
-        }
-
     }