Merge pull request #42 from Kagekazu/bugfixes

various class fixes
PunishXIV · Nov 19, 2024 · d5b3278 · d5b3278
2 parents 7f845b1 + 1e3aa9a
commit d5b3278
Show file tree

Hide file tree

Showing 17 changed files with 3,946 additions and 3,985 deletions.
diff --git a/XIVSlothCombo/Combos/CustomComboPreset.cs b/XIVSlothCombo/Combos/CustomComboPreset.cs
@@ -2168,7 +2168,8 @@ public enum CustomComboPreset
         MNK_AOE_SimpleMode = 9003,
 
         #region Monk Advanced ST
-
+
+        [AutoAction(false, false)]
         [ReplaceSkill([MNK.Bootshine])]
         [ConflictingCombos(MNK_ST_BeastChakras, MNK_ST_SimpleMode)]
         [CustomComboInfo("Advanced Mode - Single Target", "Replaces Bootshine with a one-button full single target rotation.\nThese features are ideal if you want to customize the rotation.", MNK.JobID)]
@@ -2230,6 +2231,7 @@ public enum CustomComboPreset
 
         #region Monk Advanced AOE
 
+        [AutoAction(true, false)]
         [ReplaceSkill([MNK.ArmOfTheDestroyer, MNK.ShadowOfTheDestroyer])]
         [ConflictingCombos(MNK_AOE_SimpleMode)]
         [CustomComboInfo("Advanced Mode - AoE", "Replaces Arm of the Destroyer with a one-button full single target rotation.\nThese features are ideal if you want to customize the rotation.", MNK.JobID)]

diff --git a/XIVSlothCombo/Combos/PvE/BLM/BLM.cs b/XIVSlothCombo/Combos/PvE/BLM/BLM.cs
@@ -4,7 +4,6 @@
 using XIVSlothCombo.Data;
 using XIVSlothCombo.Extensions;
 using static XIVSlothCombo.CustomComboNS.Functions.CustomComboFunctions;
-using static XIVSlothCombo.Combos.JobHelpers.BLM;
 
 namespace XIVSlothCombo.Combos.PvE;
 

diff --git a/XIVSlothCombo/Combos/PvE/BLM/BLM_Helper.cs b/XIVSlothCombo/Combos/PvE/BLM/BLM_Helper.cs
@@ -5,23 +5,21 @@
 using Dalamud.Game.ClientState.Statuses;
 using ECommons.DalamudServices;
 using XIVSlothCombo.Combos.JobHelpers.Enums;
-using XIVSlothCombo.Combos.PvE;
 using XIVSlothCombo.Data;
-using static XIVSlothCombo.Combos.PvE.BLM;
 using static XIVSlothCombo.CustomComboNS.Functions.CustomComboFunctions;
 
-namespace XIVSlothCombo.Combos.JobHelpers;
+namespace XIVSlothCombo.Combos.PvE;
 
-internal class BLM
+internal partial class BLM
 {
     // BLM Gauge & Extensions
     public static BLMGauge Gauge = GetJobGauge<BLMGauge>();
 
     public static bool canWeave = CanSpellWeave(ActionWatching.LastSpell);
-
-    public static uint curMp = LocalPlayer.CurrentMp;
     public static BLMOpenerLogic BLMOpener = new();
 
+    public static uint curMp => LocalPlayer.CurrentMp;
+
     public static int maxPolyglot => TraitLevelChecked(Traits.EnhancedPolyglotII) ? 3 :
         TraitLevelChecked(Traits.EnhancedPolyglot) ? 2 : 1;
 
@@ -43,7 +41,10 @@ internal class BLM
     public static bool canSwiftF => TraitLevelChecked(Traits.AspectMasteryIII) &&
                                     IsOffCooldown(All.Swiftcast);
 
-    public static bool HasPolyglotStacks(BLMGauge gauge) => gauge.PolyglotStacks > 0;
+    public static bool HasPolyglotStacks(BLMGauge gauge)
+    {
+        return gauge.PolyglotStacks > 0;
+    }
 
     internal class BLMOpenerLogic
     {
@@ -283,25 +284,25 @@ public static bool DoubleBlizz()
             switch (firstSpell)
             {
                 case Blizzard or Blizzard2 or Blizzard3 or Blizzard4 or Freeze or HighBlizzard2:
-                    {
-                        uint castedSpell = LocalPlayer.CastActionId;
+                {
+                    uint castedSpell = LocalPlayer.CastActionId;
 
-                        if (castedSpell is Blizzard or Blizzard2 or Blizzard3 or Blizzard4 or Freeze or HighBlizzard2)
-                            return true;
+                    if (castedSpell is Blizzard or Blizzard2 or Blizzard3 or Blizzard4 or Freeze or HighBlizzard2)
+                        return true;
 
-                        if (spells.Count >= 2)
-                        {
-                            uint secondSpell = spells[^2];
+                    if (spells.Count >= 2)
+                    {
+                        uint secondSpell = spells[^2];
 
-                            switch (secondSpell)
-                            {
-                                case Blizzard or Blizzard2 or Blizzard3 or Blizzard4 or Freeze or HighBlizzard2:
-                                    return true;
-                            }
+                        switch (secondSpell)
+                        {
+                            case Blizzard or Blizzard2 or Blizzard3 or Blizzard4 or Freeze or HighBlizzard2:
+                                return true;
                         }
-
-                        break;
                     }
+
+                    break;
+                }
             }
 
             return false;