Updated GNB/MCH base rotations and allow for Dalamud API 10 deployment

FFXIV-CombatReborn · Jun 30, 2024 · a50bf37 · a50bf37
1 parent 8b827fa
commit a50bf37
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 3 deletions.
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -33,7 +33,7 @@ jobs:
 
       - name: Download Dalamud Latest
         run: |
-          Invoke-WebRequest -Uri https://goatcorp.github.io/dalamud-distrib/latest.zip -OutFile latest.zip
+          Invoke-WebRequest -Uri https://goatcorp.github.io/dalamud-distrib/apiX/latest.zip -OutFile latest.zip
           Expand-Archive -Force latest.zip "$env:AppData\XIVLauncher\addon\Hooks\dev"
 
       - name: Restore Nuget Packages

diff --git a/RotationSolver.Basic/Rotations/Basic/GunbreakerRotation.cs b/RotationSolver.Basic/Rotations/Basic/GunbreakerRotation.cs
@@ -139,6 +139,7 @@ static partial void ModifyNoMercyPvE(ref ActionSetting setting)
 
     static partial void ModifyBloodfestPvE(ref ActionSetting setting)
     {
+        setting.StatusProvide = [StatusID.ReadyToReign];
         setting.ActionCheck = () => MaxAmmo - Ammo > 1;
     }
 

diff --git a/RotationSolver.Basic/Rotations/Basic/MachinistRotation.cs b/RotationSolver.Basic/Rotations/Basic/MachinistRotation.cs
@@ -94,6 +94,7 @@ static partial void ModifyReassemblePvE(ref ActionSetting setting)
 
     static partial void ModifyChainSawPvE(ref ActionSetting setting)
     {
+        setting.StatusProvide = [StatusID.ExcavatorReady];
         setting.CreateConfig = () => new()
         {
             AoeCount = 1,
@@ -145,7 +146,26 @@ static partial void ModifySpreadShotPvE(ref ActionSetting setting)
 
     static partial void ModifyBarrelStabilizerPvE(ref ActionSetting setting)
     {
-        setting.ActionCheck = () => Heat <= 50 && InCombat;
+        setting.StatusProvide = [StatusID.Hypercharged, StatusID.FullMetalMachinist];
+        setting.ActionCheck = () => InCombat;
+    }
+
+    static partial void ModifyExcavatorPvE(ref ActionSetting setting)
+    {
+        setting.StatusNeed = [StatusID.ExcavatorReady];
+        setting.CreateConfig = () => new ActionConfig()
+        {
+            AoeCount = 1,
+        };
+    }
+
+    static partial void ModifyFullMetalFieldPvE(ref ActionSetting setting)
+    {
+        setting.StatusNeed = [StatusID.FullMetalMachinist];
+        setting.CreateConfig = () => new ActionConfig()
+        {
+            AoeCount = 1,
+        };
     }
 
     static partial void ModifyTacticianPvE(ref ActionSetting setting)

diff --git a/RotationSolver.DummyRotations/HonkBreaker.cs b/RotationSolver.DummyRotations/HonkBreaker.cs
@@ -113,6 +113,8 @@ protected override bool GeneralGCD(out IAction? act)
         if (DemonSlicePvE.CanUse(out act)) return true;
 
         if (Player.HasStatus(true, StatusID.NoMercy) && CanUseSonicBreak(out act)) return true;
+
+        if (Player.HasStatus(true, StatusID.ReadyToRaze) && FatedBrandPvE.CanUse(out act)) return true;
 
         if (Player.HasStatus(true, StatusID.NoMercy) && CanUseDoubleDown(out act)) return true;
 

diff --git a/RotationSolver.sln b/RotationSolver.sln
@@ -12,6 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		manifest.json = manifest.json
 		UpdateDownloads.ts = UpdateDownloads.ts
 		Resources\UsersHash.json = Resources\UsersHash.json
+		.github\workflows\publish.yaml = .github\workflows\publish.yaml
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RotationSolver", "RotationSolver\RotationSolver.csproj", "{99EA3D95-33DC-424F-A9E6-FE6064F11592}"

diff --git a/manifest.json b/manifest.json
@@ -15,7 +15,7 @@
   "CategoryTags": [
     "jobs"
   ],
-  "DalamudApiLevel": 9,
+  "DalamudApiLevel": 10,
   "LoadRequiredState": 0,
   "LoadSync": false,
   "CanUnloadAsync": false,
-Original file line number
+Diff line change
@@ Expand Up @@
         static partial void ModifyBloodfestPvE(ref ActionSetting setting)
         {
+            setting.StatusProvide = [StatusID.ReadyToReign];
             setting.ActionCheck = () => MaxAmmo - Ammo > 1;
         }
@@ Expand Down @@