Skip to content

Commit d5b3278

Browse files
authored
Merge pull request #42 from Kagekazu/bugfixes
various class fixes
2 parents 7f845b1 + 1e3aa9a commit d5b3278

File tree

17 files changed

+3946
-3985
lines changed

17 files changed

+3946
-3985
lines changed

XIVSlothCombo/Combos/CustomComboPreset.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2168,7 +2168,8 @@ public enum CustomComboPreset
21682168
MNK_AOE_SimpleMode = 9003,
21692169

21702170
#region Monk Advanced ST
2171-
2171+
2172+
[AutoAction(false, false)]
21722173
[ReplaceSkill([MNK.Bootshine])]
21732174
[ConflictingCombos(MNK_ST_BeastChakras, MNK_ST_SimpleMode)]
21742175
[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
22302231

22312232
#region Monk Advanced AOE
22322233

2234+
[AutoAction(true, false)]
22332235
[ReplaceSkill([MNK.ArmOfTheDestroyer, MNK.ShadowOfTheDestroyer])]
22342236
[ConflictingCombos(MNK_AOE_SimpleMode)]
22352237
[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)]

XIVSlothCombo/Combos/PvE/BLM/BLM.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
using XIVSlothCombo.Data;
55
using XIVSlothCombo.Extensions;
66
using static XIVSlothCombo.CustomComboNS.Functions.CustomComboFunctions;
7-
using static XIVSlothCombo.Combos.JobHelpers.BLM;
87

98
namespace XIVSlothCombo.Combos.PvE;
109

XIVSlothCombo/Combos/PvE/BLM/BLM_Helper.cs

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,21 @@
55
using Dalamud.Game.ClientState.Statuses;
66
using ECommons.DalamudServices;
77
using XIVSlothCombo.Combos.JobHelpers.Enums;
8-
using XIVSlothCombo.Combos.PvE;
98
using XIVSlothCombo.Data;
10-
using static XIVSlothCombo.Combos.PvE.BLM;
119
using static XIVSlothCombo.CustomComboNS.Functions.CustomComboFunctions;
1210

13-
namespace XIVSlothCombo.Combos.JobHelpers;
11+
namespace XIVSlothCombo.Combos.PvE;
1412

15-
internal class BLM
13+
internal partial class BLM
1614
{
1715
// BLM Gauge & Extensions
1816
public static BLMGauge Gauge = GetJobGauge<BLMGauge>();
1917

2018
public static bool canWeave = CanSpellWeave(ActionWatching.LastSpell);
21-
22-
public static uint curMp = LocalPlayer.CurrentMp;
2319
public static BLMOpenerLogic BLMOpener = new();
2420

21+
public static uint curMp => LocalPlayer.CurrentMp;
22+
2523
public static int maxPolyglot => TraitLevelChecked(Traits.EnhancedPolyglotII) ? 3 :
2624
TraitLevelChecked(Traits.EnhancedPolyglot) ? 2 : 1;
2725

@@ -43,7 +41,10 @@ internal class BLM
4341
public static bool canSwiftF => TraitLevelChecked(Traits.AspectMasteryIII) &&
4442
IsOffCooldown(All.Swiftcast);
4543

46-
public static bool HasPolyglotStacks(BLMGauge gauge) => gauge.PolyglotStacks > 0;
44+
public static bool HasPolyglotStacks(BLMGauge gauge)
45+
{
46+
return gauge.PolyglotStacks > 0;
47+
}
4748

4849
internal class BLMOpenerLogic
4950
{
@@ -283,25 +284,25 @@ public static bool DoubleBlizz()
283284
switch (firstSpell)
284285
{
285286
case Blizzard or Blizzard2 or Blizzard3 or Blizzard4 or Freeze or HighBlizzard2:
286-
{
287-
uint castedSpell = LocalPlayer.CastActionId;
287+
{
288+
uint castedSpell = LocalPlayer.CastActionId;
288289

289-
if (castedSpell is Blizzard or Blizzard2 or Blizzard3 or Blizzard4 or Freeze or HighBlizzard2)
290-
return true;
290+
if (castedSpell is Blizzard or Blizzard2 or Blizzard3 or Blizzard4 or Freeze or HighBlizzard2)
291+
return true;
291292

292-
if (spells.Count >= 2)
293-
{
294-
uint secondSpell = spells[^2];
293+
if (spells.Count >= 2)
294+
{
295+
uint secondSpell = spells[^2];
295296

296-
switch (secondSpell)
297-
{
298-
case Blizzard or Blizzard2 or Blizzard3 or Blizzard4 or Freeze or HighBlizzard2:
299-
return true;
300-
}
297+
switch (secondSpell)
298+
{
299+
case Blizzard or Blizzard2 or Blizzard3 or Blizzard4 or Freeze or HighBlizzard2:
300+
return true;
301301
}
302-
303-
break;
304302
}
303+
304+
break;
305+
}
305306
}
306307

307308
return false;

0 commit comments

Comments
 (0)