Merge pull request #85 from FFXIV-CombatReborn/The-gang-farms-Emanation

nuget bump and emanationdefault
FFXIV-CombatReborn · May 13, 2024 · 507aaf8 · 507aaf8
2 parents f43b0b4 + 1e1c161
commit 507aaf8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/BasicRotations/DefaultRotations.csproj b/BasicRotations/DefaultRotations.csproj
@@ -8,13 +8,7 @@
     <None Remove="Duty\PVPRotations\**" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Remove="Duty\EmanationDefault.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Duty\EmanationDefault.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="RotationSolverReborn.Basic" Version="4.1.0.4" />
+    <PackageReference Include="RotationSolverReborn.Basic" Version="4.1.1.1" />
   </ItemGroup>
   <ItemGroup>
 	  <Reference Include="Dalamud">

diff --git a/BasicRotations/Duty/EmanationDefault.cs b/BasicRotations/Duty/EmanationDefault.cs
@@ -1,21 +1,26 @@
-namespace DefaultRotations.Duty;
+using RotationSolver.Basic.Rotations.Duties;
+
+namespace DefaultRotations.Duty;
 
 [Rotation("Emanation Default", CombatType.PvE)]
-[DutyTerritory(263, 264)]
-internal class EmanationDefault : DutyRotation
+
+internal class EmanationDefault : EmanationRotation
 {
-    protected override bool EmergencyAbility(IAction nextGCD, out IAction? act)
+    public override bool EmergencyAbility(IAction nextGCD, out IAction? act)
     {
         // 8521 8522 8523
-        bool Lol1 = HostileTarget?.CastActionId == 8521
-        bool Lol2 = HostileTarget?.CastActionId == 8522
-        bool Lol3 = HostileTarget?.CastActionId == 8523
+        bool Lol1 = HostileTarget?.CastActionId == 8521;
+        bool Lol2 = HostileTarget?.CastActionId == 8522;
+        bool Lol3 = HostileTarget?.CastActionId == 8523;
 
         if (Lol1 || Lol2 || Lol3)
         {
             if (VrilPvE.CanUse(out act)) return true; // Normal
             if (VrilPvE_9345.CanUse(out act)) return true; // Extreme
             return base.EmergencyAbility(nextGCD, out act);
         }
+
+        act = null;
+        return base.EmergencyAbility(nextGCD, out act);
     }
 }