Merge pull request #953 from FFXIV-CombatReborn/ACNrework

Rework of low level SMN/ACN actions

Author: LTS-FFXIV

RotationSolver.Basic/Rotations/Basic/SummonerRotation.cs

@@ -335,7 +335,34 @@ static partial void ModifySummonRubyPvE(ref ActionSetting setting)
 
     static partial void ModifyGemshinePvE(ref ActionSetting setting)
     {
-        setting.ActionCheck = () => Attunement > 0 && !AttunmentTimeEndAfter(ActionID.GemshinePvE.GetCastTime());
+        
+    }
+
+    static partial void ModifyRubyRuinPvE(ref ActionSetting setting)
+    {
+        setting.ActionCheck = () => Attunement > 0 && !AttunmentTimeEndAfter(ActionID.RubyRuinPvE.GetCastTime()) && InIfrit;
+        setting.CreateConfig = () => new ActionConfig()
+        {
+            AoeCount = 3,
+        };
+    }
+
+    static partial void ModifyEmeraldRuinPvE(ref ActionSetting setting)
+    {
+        setting.ActionCheck = () => Attunement > 0 && !AttunmentTimeEndAfter(ActionID.EmeraldRuinPvE.GetCastTime()) && InGaruda;
+        setting.CreateConfig = () => new ActionConfig()
+        {
+            AoeCount = 3,
+        };
+    }
+
+    static partial void ModifyTopazRuinPvE(ref ActionSetting setting)
+    {
+        setting.ActionCheck = () => Attunement > 0 && !AttunmentTimeEndAfter(ActionID.TopazRuinPvE.GetCastTime()) && InTitan;
+        setting.CreateConfig = () => new ActionConfig()
+        {
+            AoeCount = 3,
+        };
     }
 
     static partial void ModifyFesterPvE(ref ActionSetting setting)
@@ -374,9 +401,31 @@ static partial void ModifyOutburstPvE(ref ActionSetting setting)
         };
     }
 
-    static partial void ModifyPreciousBrilliancePvE(ref ActionSetting setting)
+    static partial void ModifyRubyOutburstPvE(ref ActionSetting setting)
+    {
+        setting.ActionCheck = () => Attunement > 0 && !AttunmentTimeEndAfter(ActionID.RubyOutburstPvE.GetCastTime()) && InIfrit;
+        setting.CreateConfig = () => new ActionConfig()
+        {
+            AoeCount = 3,
+        };
+    }
+
+    static partial void ModifyEmeraldOutburstPvE(ref ActionSetting setting)
     {
-        setting.ActionCheck = () => Attunement > 0 && !AttunmentTimeEndAfter(ActionID.PreciousBrilliancePvE.GetCastTime());
+        setting.ActionCheck = () => Attunement > 0 && !AttunmentTimeEndAfter(ActionID.EmeraldOutburstPvE.GetCastTime()) && InGaruda;
+        setting.CreateConfig = () => new ActionConfig()
+        {
+            AoeCount = 3,
+        };
+    }
+
+    static partial void ModifyTopazOutburstPvE(ref ActionSetting setting)
+    {
+        setting.ActionCheck = () => Attunement > 0 && !AttunmentTimeEndAfter(ActionID.TopazOutburstPvE.GetCastTime()) && InTitan;
+        setting.CreateConfig = () => new ActionConfig()
+        {
+            AoeCount = 3,
+        };
     }
 
     static partial void ModifyRuinIiPvE(ref ActionSetting setting)

RotationSolver/RebornRotations/Magical/SMN_Reborn.cs

@@ -33,6 +33,15 @@ public enum SummonOrderType : byte
     [RotationConfig(CombatType.PvE, Name = "Use Crimson Cyclone when moving")]
     public bool AddCrimsonCycloneMoving { get; set; } = false;
 
+    [RotationConfig(CombatType.PvE, Name = "Use Swiftcast on ressurection")]
+    public bool AddSwiftcastOnRaise { get; set; } = true;
+
+    [RotationConfig(CombatType.PvE, Name = "Use Swiftcast on Ruby Ruin when not enough level for Ruby Rite")]
+    public bool AddSwiftcastOnLowST { get; set; } = true;
+
+    [RotationConfig(CombatType.PvE, Name = "Use Swiftcast on Ruby Outburst when not enough level for Ruby Rite")]
+    public bool AddSwiftcastOnLowAOE { get; set; } = true;
+
     [RotationConfig(CombatType.PvE, Name = "Use Swiftcast on Garuda")]
     public bool AddSwiftcastOnGaruda { get; set; } = false;
 
@@ -297,17 +306,25 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)
 
     protected override bool EmergencyAbility(IAction nextGCD, out IAction? act)
     {
-        if (AddSwiftcastOnGaruda && nextGCD.IsTheSameTo(false, SlipstreamPvE) && ElementalMasteryTrait.EnoughLevel && !InBahamut && !InPhoenix && !InSolarBahamut)
+        if (SwiftcastPvE.CanUse(out act))
         {
-            if (SwiftcastPvE.CanUse(out act))
+            if (AddSwiftcastOnRaise && nextGCD.IsTheSameTo(false, ResurrectionPvE))
             {
                 return true;
             }
-        }
-
-        if (AddSwiftcastOnRuby && nextGCD.IsTheSameTo(false, RubyRitePvE) && !ElementalMasteryTrait.EnoughLevel)
-        {
-            if (SwiftcastPvE.CanUse(out act))
+            if (AddSwiftcastOnLowST && !RubyRitePvE.EnoughLevel && nextGCD.IsTheSameTo(false, RubyRuinPvE, RubyRuinIiPvE, RubyRuinIiiPvE))
+            {
+                return true;
+            }
+            if (AddSwiftcastOnLowAOE && !RubyRitePvE.EnoughLevel && nextGCD.IsTheSameTo(false, RubyOutburstPvE))
+            {
+                return true;
+            }
+            if (AddSwiftcastOnRuby && nextGCD.IsTheSameTo(false, RubyRitePvE) && !ElementalMasteryTrait.EnoughLevel)
+            {
+                return true;
+            }
+            if (AddSwiftcastOnGaruda && nextGCD.IsTheSameTo(false, SlipstreamPvE) && ElementalMasteryTrait.EnoughLevel && !InBahamut && !InPhoenix && !InSolarBahamut)
             {
                 return true;
             }
@@ -371,12 +388,28 @@ protected override bool GeneralGCD(out IAction? act)
             return true;
         }
 
-        if (PreciousBrilliancePvE.CanUse(out act))
+        if (RubyOutburstPvE.CanUse(out act))
+        {
+            return true;
+        }
+        if (EmeraldOutburstPvE.CanUse(out act))
+        {
+            return true;
+        }
+        if (TopazOutburstPvE.CanUse(out act))
         {
             return true;
         }
 
-        if (GemshinePvE.CanUse(out act))
+        if (RubyRuinPvE.CanUse(out act))
+        {
+            return true;
+        }
+        if (EmeraldRuinPvE.CanUse(out act))
+        {
+            return true;
+        }
+        if (TopazRuinPvE.CanUse(out act))
         {
             return true;
         }