Rely on mafia reporting NC forcing being active, use fiesta exits

loathers · Nov 30, 2023 · 9745ce4 · 9745ce4
1 parent 4f3977d
commit 9745ce4
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 37 deletions.
diff --git a/src/engine.ts b/src/engine.ts
@@ -36,15 +36,6 @@ export class ChronerStrategy extends CombatStrategy {
   }
 }
 
-function countAvailableNcForces() {
-  return (get("_claraBellUsed") ? 0 : 1) + (5 - get("_spikolodonSpikeUses"));
-}
-
-let ncForced = false;
-export function resetNcForced() {
-  printd("Reset NC forcing");
-  ncForced = false;
-}
 CrownOfThrones.createRiderMode("default", {});
 const chooseRider = () => CrownOfThrones.pickRider("default");
 export class ChronerEngine extends Engine<never, ChronerTask> {
@@ -55,7 +46,7 @@ export class ChronerEngine extends Engine<never, ChronerTask> {
       (!sober() && task.sobriety === "drunk");
 
     if (task.forced) {
-      return sobriety && ncForced && super.available(task);
+      return sobriety && get("noncombatForcerActive") && super.available(task);
     }
     return sobriety && super.available(task);
   }
@@ -72,16 +63,6 @@ export class ChronerEngine extends Engine<never, ChronerTask> {
     return outfit;
   }
 
-  execute(task: ChronerTask): void {
-    const ncBefore = countAvailableNcForces();
-    super.execute(task);
-    const ncAfter = countAvailableNcForces();
-
-    if (ncBefore > ncAfter) {
-      ncForced = true;
-    }
-  }
-
   setChoices(task: ChronerTask, manager: PropertiesManager): void {
     super.setChoices(task, manager);
     if (equippedAmount($item`June cleaver`) > 0) {

diff --git a/src/main.ts b/src/main.ts
@@ -3,12 +3,12 @@ import {
   adv1,
   canAdventure,
   cliExecute,
-  getLocationMonsters,
   myAdventures,
   myClass,
   myTurncount,
   totalTurnsPlayed,
   use,
+  useSkill,
   visitUrl,
 } from "kolmafia";
 import {
@@ -20,6 +20,7 @@ import {
   $monsters,
   $skill,
   AsdonMartin,
+  CinchoDeMayo,
   Counter,
   get,
   have,
@@ -34,9 +35,8 @@ import {
   ChronerQuest,
   ChronerStrategy,
   ChronerTask,
-  resetNcForced,
 } from "./engine";
-import { args, printd, printh } from "./lib";
+import { args, printh } from "./lib";
 import Macro from "./macro";
 import { chooseQuestOutfit } from "./outfit";
 import { rose } from "./rose";
@@ -114,6 +114,19 @@ export function main(command?: string) {
         },
         sobriety: "either",
       },
+      {
+        name: "Fiesta Exit",
+        completed: () =>
+          CinchoDeMayo.totalAvailableCinch() > 60 &&
+          !get("noncombatForcerActive"),
+        do: () => {
+          while (CinchoDeMayo.currentCinch() < 60) {
+            cliExecute("rest");
+          }
+          useSkill(1, $skill`Cincho: Fiesta Exit`);
+        },
+        sobriety: "either",
+      },
       {
         name: "Proton Ghost",
         ready: () =>
@@ -206,20 +219,8 @@ export function main(command?: string) {
         name: "Time Capsule",
         do: () => {
           adv1($location`The Cave Before Time`, 0, "");
-          if (get("lastEncounter") === "Time Cave.  Period.") {
-            printd("Forced noncombat!");
-            resetNcForced();
-          } else {
-            printd("Uh oh, we didn't force the NC");
-            const possibleEncouters = Object.keys(
-              getLocationMonsters($location`The Cave Before Time`),
-            );
-            if (possibleEncouters.includes(get("lastEncounter"))) {
-              printd("We hit a normal monster, so reset the noncombat forcing");
-              resetNcForced();
-            } else {
-              printd("We hit something else, so keep trying for the noncombat");
-            }
+          if (get("lastEncounter") !== "Time Cave.  Period.") {
+            throw "We expeted to force the NC";
           }
         },
         forced: true,