Merge pull request #70 from FFXIV-CombatReborn/IcWaDev

Updated SMN issues around Phoenix spell not triggering and timings around for EnergyDrain/EnergySiphon, also added a settings for CrimsonCyclone while moving
FFXIV-CombatReborn · Jul 11, 2024 · 65d7709 · 65d7709
2 parents ad72e87 + 73ab2c7
commit 65d7709
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/BasicRotations/Magical/SMN_Default.cs b/BasicRotations/Magical/SMN_Default.cs
@@ -28,6 +28,9 @@ public enum SummonOrderType : byte
 
 	[RotationConfig(CombatType.PvE, Name = "Use Crimson Cyclone. Will use at any range, regardless of saftey use with caution.")]
 	public bool AddCrimsonCyclone { get; set; } = true;
+
+	[RotationConfig(CombatType.PvE, Name = "Use Crimson Cyclone. Even When MOVING")]
+	public bool AddCrimsonCycloneMoving { get; set; } = false;
 
 	// [RotationConfig(CombatType.PvE, Name = "Use Swiftcast")]
 	// public SwiftType AddSwiftcast { get; set; } = SwiftType.No;
@@ -102,8 +105,8 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)
 		bool elapsedChargesAfterGCDNormalBaha = SummonBahamutPvE.Cooldown.ElapsedOneChargeAfterGCD();
 		bool elapsed2ChargesAfterGCDSolar = SummonSolarBahamutPvE.Cooldown.ElapsedOneChargeAfterGCD(2);
 		bool elapsed2ChargesAfterGCDNormalBaha = SummonBahamutPvE.Cooldown.ElapsedOneChargeAfterGCD(2);
-		bool elapsed3ChargesAfterGcdSolar = SummonSolarBahamutPvE.Cooldown.ElapsedOneChargeAfterGCD(3);
-		bool elapsed3ChargesAfterGcdNormalBaha = SummonBahamutPvE.Cooldown.ElapsedOneChargeAfterGCD(3);
+		//bool elapsed3ChargesAfterGcdSolar = SummonSolarBahamutPvE.Cooldown.ElapsedOneChargeAfterGCD(3);
+		//bool elapsed3ChargesAfterGcdNormalBaha = SummonBahamutPvE.Cooldown.ElapsedOneChargeAfterGCD(3);
 		bool elapsed4ChargesAfterGcdNormalBaha = SummonBahamutPvE.Cooldown.ElapsedOneChargeAfterGCD(4);
 		bool elapsed4ChargesAfterGcdSolar = SummonSolarBahamutPvE.Cooldown.ElapsedOneChargeAfterGCD(4);
 		bool elapsed5ChargesAfterGcdNormalBaha = SummonBahamutPvE.Cooldown.ElapsedOneChargeAfterGCD(5);
@@ -121,10 +124,11 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)
 		}
 
 
-		if ((InBahamut || InSolarBahamut) && (elapsed3ChargesAfterGcdSolar || elapsed3ChargesAfterGcdNormalBaha || TargetIsBossAndDying) && EnergySiphonPvE.CanUse(out act)) return true;
-		if ((InBahamut || InSolarBahamut) && (elapsed3ChargesAfterGcdSolar || elapsed3ChargesAfterGcdNormalBaha || TargetIsBossAndDying) && EnergyDrainPvE.CanUse(out act)) return true;
+		if ((InBahamut || InSolarBahamut || InPhoenix) && (elapsed2ChargesAfterGCDSolar || elapsed2ChargesAfterGCDNormalBaha || TargetIsBossAndDying) && EnergySiphonPvE.CanUse(out act)) return true;
+		if ((InBahamut || InSolarBahamut || InPhoenix) && (elapsed2ChargesAfterGCDSolar || elapsed2ChargesAfterGCDNormalBaha || TargetIsBossAndDying) && EnergyDrainPvE.CanUse(out act)) return true;
 		if (InBahamut && (elapsed4ChargesAfterGcdNormalBaha || InPhoenix || TargetIsBossAndDying) && EnkindleBahamutPvE.CanUse(out act)) return true;
 		if (InSolarBahamut && (elapsed4ChargesAfterGcdSolar || TargetIsBossAndDying) && EnkindleSolarBahamutPvE.CanUse(out act)) return true;
+		if (InPhoenix && (SummonPhoenixPvE.Cooldown.ElapsedOneChargeAfterGCD(2) || TargetIsBossAndDying) && EnkindlePhoenixPvE.CanUse(out act)) return true;
 		if (InBahamut && (elapsed4ChargesAfterGcdNormalBaha || TargetIsBossAndDying) && DeathflarePvE.CanUse(out act, skipAoeCheck: true)) return true;
 		if (InSolarBahamut && (elapsed4ChargesAfterGcdSolar || TargetIsBossAndDying) && SunflarePvE.CanUse(out act, skipAoeCheck: true)) return true;
 
@@ -160,7 +164,7 @@ protected override bool GeneralGCD(out IAction? act)
 
 		if (GemshinePvE.CanUse(out act)) return true;
 
-		if (!IsMoving && AddCrimsonCyclone && CrimsonCyclonePvE.CanUse(out act, skipAoeCheck: true)) return true;
+		if ((!IsMoving || AddCrimsonCycloneMoving) && AddCrimsonCyclone && CrimsonCyclonePvE.CanUse(out act, skipAoeCheck: true)) return true;
 
 		if ((Player.HasStatus(false, StatusID.SearingLight) || SearingLightPvE.Cooldown.IsCoolingDown) && SummonBahamutPvE.CanUse(out act)) return true;
 
@@ -212,7 +216,7 @@ protected override bool GeneralGCD(out IAction? act)
 
 	public bool DoesAnyPlayerNeedHeal()
 	{
-		return PartyMembersAverHP < 80.0f;
+		return PartyMembersAverHP > 80.0f;
 	}
 	#endregion