more cleanup, done with both modules yippie

awgil · Jan 6, 2025 · 33db57f · 33db57f
1 parent c7f73ea
commit 33db57f
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 60 deletions.
diff --git a/BossMod/Autorotation/akechi/AkechiGNB.cs b/BossMod/Autorotation/akechi/AkechiGNB.cs
@@ -324,7 +324,31 @@ public static RotationModuleDefinition Definition()
     }
     #endregion
 
-    #region Placeholders for Variables
+    #region Upgrade Paths
+    private AID BestZone //Determine the best Zone to use
+        => Unlocked(AID.BlastingZone) //If Blasting Zone is unlocked
+        ? AID.BlastingZone //Use Blasting Zone
+        : AID.DangerZone; //Otherwise, use Danger Zone
+    private AID BestCartSpender //Determine the best cartridge spender to use
+        => ShouldUseFC //And we should use Fated Circle because of targets nearby
+        ? BestFatedCircle //Use Fated Circle
+        : canBS //Otherwise, if Burst Strike is available
+        ? AID.BurstStrike //Use Burst Strike
+        : NextBestRotation(); //Otherwise, use the next best rotation
+    private AID BestFatedCircle //for AOE cart spending Lv30-71
+        => Unlocked(AID.FatedCircle) //If Fated Circle is unlocked
+        ? AID.FatedCircle //Use Fated Circle
+        : AID.BurstStrike; //Otherwise, use Burst Strike
+    private AID BestContinuation //Determine the best Continuation to use
+        => hasRaze ? AID.FatedBrand //If we have Ready To Raze buff
+        : hasBlast ? AID.Hypervelocity //If we have Ready To Blast buff
+        : hasGouge ? AID.EyeGouge //If we have Ready To Gouge buff
+        : hasTear ? AID.AbdomenTear //If we have Ready To Tear buff
+        : hasRip ? AID.JugularRip //If we have Ready To Rip buff
+        : AID.Continuation; //Otherwise, default to original hook
+    #endregion
+
+    #region Module Variables
     //Gauge
     public byte Ammo; //Range: 0-2 or 0-3 max; this counts current ammo count
     public byte GunComboStep; //0 = Gnashing Fang & Reign of Beasts, 1 = Savage Claw, 2 = Wicked Talon, 4 = NobleBlood, 5 = LionHeart
@@ -386,30 +410,6 @@ public static RotationModuleDefinition Definition()
     public bool JustUsed(AID aid, float variance) => JustDid(aid) && DidWithin(variance); //Check if the last action used was the desired ability & was used within a certain timeframe
     #endregion
 
-    #region Upgrade Paths
-    private AID BestZone //Determine the best Zone to use
-        => Unlocked(AID.BlastingZone) //If Blasting Zone is unlocked
-        ? AID.BlastingZone //Use Blasting Zone
-        : AID.DangerZone; //Otherwise, use Danger Zone
-    private AID BestCartSpender //Determine the best cartridge spender to use
-        => ShouldUseFC //And we should use Fated Circle because of targets nearby
-        ? BestFatedCircle //Use Fated Circle
-        : canBS //Otherwise, if Burst Strike is available
-        ? AID.BurstStrike //Use Burst Strike
-        : NextBestRotation(); //Otherwise, use the next best rotation
-    private AID BestFatedCircle //for AOE cart spending Lv30-71
-        => Unlocked(AID.FatedCircle) //If Fated Circle is unlocked
-        ? AID.FatedCircle //Use Fated Circle
-        : AID.BurstStrike; //Otherwise, use Burst Strike
-    private AID BestContinuation //Determine the best Continuation to use
-        => hasRaze ? AID.FatedBrand //If we have Ready To Raze buff
-        : hasBlast ? AID.Hypervelocity //If we have Ready To Blast buff
-        : hasGouge ? AID.EyeGouge //If we have Ready To Gouge buff
-        : hasTear ? AID.AbdomenTear //If we have Ready To Tear buff
-        : hasRip ? AID.JugularRip //If we have Ready To Rip buff
-        : AID.Continuation; //Otherwise, default to original hook
-    #endregion
-
     public override void Execute(StrategyValues strategy, Actor? primaryTarget, float estimatedAnimLockDelay, bool isMoving) //Executes our actions
     {
         #region Variables
@@ -822,8 +822,6 @@ public bool QueueAction(AID aid, Actor? target, float priority, float delay)
         Hints.ActionsToExecute.Push(ActionID.MakeSpell(aid), target, priority, delay: delay, targetPos: targetPos);
         return true;
     }
-
-
     #endregion
 
     #region Rotation Helpers

diff --git a/BossMod/Autorotation/akechi/AkechiPLD.cs b/BossMod/Autorotation/akechi/AkechiPLD.cs
@@ -260,7 +260,40 @@ public static RotationModuleDefinition Definition()
     }
     #endregion
 
-    #region Variables
+    #region Upgrade Paths
+    public AID BestSpirits
+        => Unlocked(AID.Expiacion) //if Expiacion is unlocked
+        ? AID.Expiacion //then use Expiacion
+        : AID.SpiritsWithin; //otherwise use Spirits Within
+    public AID BestRequiescat
+        => Unlocked(AID.Imperator) //if Imperator is unlocked
+        ? AID.Imperator //then use Imperator
+        : AID.Requiescat; //otherwise use Requiescat
+    public AID BestHoly
+        => ShouldUseDMHolyCircle || ShouldNormalHolyCircle //if Holy Circle should be used
+        ? BestHolyCircle //then use Holy Circle
+        : AID.HolySpirit; //otherwise use Holy Spirit
+    public AID BestHolyCircle //for AOE use from Lv64-Lv71
+        => HolyCircle.IsReady //if Holy Circle is ready
+        ? AID.HolyCircle //then use Holy Circle
+        : AID.HolySpirit; //then use Holy Spirit
+    public AID BestAtonement
+        => Sepulchre.IsReady //if Sepulchre is ready
+        ? AID.Sepulchre //then use Sepulchre
+        : Supplication.IsReady //if Supplication is ready
+        ? AID.Supplication //then use Supplication
+        : AID.Atonement; //otherwise use Atonement
+    public AID BestBlade
+        => BladeComboStep is 3 //if Confiteor combo is at step 3
+        ? AID.BladeOfValor //then use Blade of Valor
+        : BladeComboStep is 2 //if Confiteor combo is at step 2
+        ? AID.BladeOfTruth //then use Blade of Truth
+        : BladeComboStep is 1 //if Confiteor combo is at step 1
+        ? AID.BladeOfFaith //then use Blade of Faith
+        : AID.Confiteor; //otherwise use Confiteor
+    #endregion
+
+    #region Module Variables
     public int Oath; //Current value of the oath gauge
     public int BladeComboStep; //Current step in the Confiteor combo sequence
     public float GCDLength; //Length of the global cooldown, adjusted by skill speed and haste (baseline: 2.5s)
@@ -310,38 +343,6 @@ public static RotationModuleDefinition Definition()
     //public Actor? BestSplashTarget()
     #endregion
 
-    #region Upgrade Paths
-    public AID BestSpirits
-        => Unlocked(AID.Expiacion) //if Expiacion is unlocked
-        ? AID.Expiacion //then use Expiacion
-        : AID.SpiritsWithin; //otherwise use Spirits Within
-    public AID BestRequiescat
-        => Unlocked(AID.Imperator) //if Imperator is unlocked
-        ? AID.Imperator //then use Imperator
-        : AID.Requiescat; //otherwise use Requiescat
-    public AID BestHoly
-        => ShouldUseDMHolyCircle || ShouldNormalHolyCircle //if Holy Circle should be used
-        ? BestHolyCircle //then use Holy Circle
-        : AID.HolySpirit; //otherwise use Holy Spirit
-    public AID BestHolyCircle //for AOE use from Lv64-Lv71
-        => HolyCircle.IsReady //if Holy Circle is ready
-        ? AID.HolyCircle //then use Holy Circle
-        : AID.HolySpirit; //then use Holy Spirit
-    public AID BestAtonement
-        => Sepulchre.IsReady //if Sepulchre is ready
-        ? AID.Sepulchre //then use Sepulchre
-        : Supplication.IsReady //if Supplication is ready
-        ? AID.Supplication //then use Supplication
-        : AID.Atonement; //otherwise use Atonement
-    public AID BestBlade
-        => BladeComboStep is 3 //if Confiteor combo is at step 3
-        ? AID.BladeOfValor //then use Blade of Valor
-        : BladeComboStep is 2 //if Confiteor combo is at step 2
-        ? AID.BladeOfTruth //then use Blade of Truth
-        : BladeComboStep is 1 //if Confiteor combo is at step 1
-        ? AID.BladeOfFaith //then use Blade of Faith
-        : AID.Confiteor; //otherwise use Confiteor
-    #endregion
     public override void Execute(StrategyValues strategy, Actor? primaryTarget, float estimatedAnimLockDelay, bool isMoving) //Executes our actions
     {
         #region Variables