Merge pull request #140 from FFXIV-CombatReborn/SGE-DT-first-pass

First pass at SGE DT support, tested in duty support. Also nuget bump
FFXIV-CombatReborn · Jul 25, 2024 · 4023a90 · 4023a90
2 parents ecd7f51 + 529aca1
commit 4023a90
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 4 deletions.
diff --git a/BasicRotations/Healer/SGE_Default.cs b/BasicRotations/Healer/SGE_Default.cs
@@ -1,6 +1,6 @@
 namespace DefaultRotations.Healer;
 
-[Rotation("Default", CombatType.PvE, GameVersion = "7.00")]
+[Rotation("Default", CombatType.PvE, GameVersion = "7.01")]
 [SourceCode(Path = "main/DefaultRotations/Healer/SGE_Default.cs")]
 [Api(2)]
 public sealed class SGE_Default : SageRotation
@@ -86,11 +86,18 @@ protected override bool EmergencyAbility(IAction nextGCD, out IAction? act)
             if (ZoePvE.CanUse(out act)) return true;
         }
 
-        if (nextGCD.IsTheSameTo(false, PneumaPvE))
+        if (nextGCD.IsTheSameTo(false, PneumaPvE, EukrasianDiagnosisPvE,
+             EukrasianPrognosisPvE, EukrasianPrognosisIiPvE, DiagnosisPvE, PrognosisPvE))
         {
             if (KrasisPvE.CanUse(out act)) return true;
         }
 
+        if (nextGCD.IsTheSameTo(false, PneumaPvE, EukrasianDiagnosisPvE,
+             EukrasianPrognosisPvE, EukrasianPrognosisIiPvE, DiagnosisPvE, PrognosisPvE))
+        {
+            if (PhilosophiaPvE.CanUse(out act)) return true;
+        }
+
         return base.EmergencyAbility(nextGCD, out act);
     }
 
@@ -261,6 +268,19 @@ protected override bool DefenseSingleGCD(out IAction? act)
 
     protected override bool GeneralGCD(out IAction? act)
     {
+        if (HostileTarget?.IsBossFromTTK() ?? false)
+        {
+            if (EukrasianDyskrasiaPvE.CanUse(out _, skipCastingCheck: true))
+            {
+                if (EukrasiaPvE.CanUse(out act, skipCastingCheck: true)) return true;
+                if (EukrasianDyskrasiaPvE.CanUse(out act))
+                {
+                    DosisPvE.Target = EukrasianDyskrasiaPvE.Target;
+                    return true;
+                }
+            }
+        }
+
         if (HostileTarget?.IsBossFromTTK() ?? false)
         {
             if (EukrasianDosisPvE.CanUse(out _, skipCastingCheck: true))
@@ -285,6 +305,16 @@ protected override bool GeneralGCD(out IAction? act)
 
         if (IsMoving && ToxikonPvE.CanUse(out act, skipAoeCheck: true)) return true;
 
+        if (EukrasianDyskrasiaPvE.CanUse(out _, skipCastingCheck: true))
+        {
+            if (EukrasiaPvE.CanUse(out act, skipCastingCheck: true)) return true;
+            if (DyskrasiaPvE.CanUse(out act))
+            {
+                DyskrasiaPvE.Target = EukrasianDyskrasiaPvE.Target;
+                return true;
+            }
+        }
+
         if (DyskrasiaPvE.CanUse(out act)) return true;
 
         if (EukrasianDosisPvE.CanUse(out _, skipCastingCheck: true))
@@ -322,7 +352,8 @@ protected override bool HealAreaGCD(out IAction? act)
             if (PrognosisPvE.CanUse(out act)) return true;
         }
 
-        if (EukrasianPrognosisIiPvE.CanUse(out _)) {
+        if (EukrasianPrognosisIiPvE.CanUse(out _))
+        {
             if (EukrasiaPvE.CanUse(out act)) return true;
             act = EukrasianPrognosisIiPvE;
             return true;

diff --git a/BasicRotations/RebornRotations.csproj b/BasicRotations/RebornRotations.csproj
@@ -9,7 +9,7 @@
     <None Remove="Duty\PVPRotations\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="RotationSolverReborn.Basic" Version="7.0.1.25" />
+    <PackageReference Include="RotationSolverReborn.Basic" Version="7.0.1.26" />
   </ItemGroup>
   <ItemGroup>
 	  <Reference Include="Dalamud">