Change defaults for SAM/NIN

xiv-gear-planner · Oct 13, 2024 · 358e448 · 358e448
1 parent 4c29200
commit 358e448
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/packages/core/src/sims/melee/nin/nin_lv100_sim.ts b/packages/core/src/sims/melee/nin/nin_lv100_sim.ts
@@ -1,6 +1,6 @@
 import {Ability, Buff, OgcdAbility, SimSettings, SimSpec} from "@xivgear/core/sims/sim_types";
 import {
-    AbilityUseResult,
+    AbilityUseResult, CutoffMode,
     CycleProcessor,
     CycleSimResult,
     ExternalCycleSettings,
@@ -441,14 +441,18 @@ export class NinSim extends BaseMultiCycleSim<NinSimResult, NinSettings, NINCycl
 
     override defaultCycleSettings(): CycleSettings {
         return {
-            useAutos: true,
+            ...super.defaultCycleSettings(),
             totalTime: (6 * 60) + 32,
             cycles: 0,
             which: 'totalTime',
-            cutoffMode: 'prorate-gcd',
         };
     }
 
+    override get defaultCutoffMode(): CutoffMode {
+        return 'prorate-application';
+    }
+
+
     protected createCycleProcessor(settings: MultiCycleSettings): NINCycleProcessor {
         return new NINCycleProcessor({
             ...settings,

diff --git a/packages/core/src/sims/melee/sam/sam_lv100_sim.ts b/packages/core/src/sims/melee/sam/sam_lv100_sim.ts
@@ -1,6 +1,6 @@
 import {Ability, SimSettings, SimSpec} from "@xivgear/core/sims/sim_types";
 import {
-    AbilityUseResult,
+    AbilityUseResult, CutoffMode,
     CycleProcessor,
     CycleSimResult,
     ExternalCycleSettings,
@@ -103,14 +103,17 @@ export class SamSim extends BaseMultiCycleSim<SamSimResult, SamSettings, SAMCycl
 
     override defaultCycleSettings(): CycleSettings {
         return {
-            useAutos: true,
+            ...super.defaultCycleSettings(),
             totalTime: (8 * 60) + 35,
             cycles: 0,
             which: 'totalTime',
-            cutoffMode: 'prorate-gcd'
         };
     }
 
+    override get defaultCutoffMode(): CutoffMode {
+        return 'prorate-application';
+    }
+
     protected createCycleProcessor(settings: MultiCycleSettings): SAMCycleProcessor {
         return new SAMCycleProcessor({
             ...settings,