Merge pull request #101 from loathers/more-nc-force

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

src/capsule.ts

@@ -1,7 +1,6 @@
 import { $item, $location, getKramcoWandererChance } from "libram";
 
 import { ChronerQuest, ChronerStrategy } from "./engine";
-import { sober } from "./lib";
 import Macro from "./macro";
 import { chooseQuestOutfit, ifHave } from "./outfit";
 
@@ -15,17 +14,13 @@ export const capsule: ChronerQuest = {
       completed: () => false,
       do: $location`The Cave Before Time`,
       outfit: () => {
-        const drunkSpec = sober()
-          ? {}
-          : { offhand: $item`Drunkula's wineglass` };
         const sausageSpec =
           getKramcoWandererChance() >= 1
             ? ifHave("offhand", $item`Kramco Sausage-o-Matic™`)
             : {};
         return chooseQuestOutfit(
           { location, isFree: getKramcoWandererChance() >= 1 },
           sausageSpec,
-          drunkSpec,
         );
       },
       combat: new ChronerStrategy(() => Macro.standardCombat()),

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) {

src/future.ts

@@ -1,7 +1,6 @@
 import { $item, $location, $monster, getKramcoWandererChance } from "libram";
 
 import { ChronerQuest, ChronerStrategy } from "./engine";
-import { sober } from "./lib";
 import Macro from "./macro";
 import { chooseQuestOutfit, ifHave } from "./outfit";
 
@@ -19,17 +18,13 @@ export const future: ChronerQuest = {
       completed: () => false,
       do: location,
       outfit: () => {
-        const drunkSpec = sober()
-          ? {}
-          : { offhand: $item`Drunkula's wineglass` };
         const sausageSpec =
           getKramcoWandererChance() >= 1
             ? ifHave("offhand", $item`Kramco Sausage-o-Matic™`)
             : {};
         return chooseQuestOutfit(
           { location, isFree: getKramcoWandererChance() >= 1 },
           sausageSpec,
-          drunkSpec,
         );
       },
       combat: new ChronerStrategy(() =>

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,20 @@ export function main(command?: string) {
         },
         sobriety: "either",
       },
+      {
+        name: "Fiesta Exit",
+        ready: () => CinchoDeMayo.totalAvailableCinch() > 60,
+        completed: () => get("noncombatForcerActive"),
+        do: () => {
+          const turns = totalTurnsPlayed();
+          while (CinchoDeMayo.currentCinch() < 60) {
+            cliExecute("rest");
+            if (totalTurnsPlayed() > turns) break;
+          }
+          useSkill(1, $skill`Cincho: Fiesta Exit`);
+        },
+        sobriety: "either",
+      },
       {
         name: "Proton Ghost",
         ready: () =>
@@ -206,20 +220,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,

src/outfit.ts

@@ -63,6 +63,7 @@ export function chooseQuestOutfit(
       p: get("_voidFreeFights") < 5 ? 1 / 13 : 0,
     },
   ].filter(({ i }) => have(i) && canEquip(i));
+
   const offhands = freeChance.length
     ? { offhand: maxBy(freeChance, "p").i }
     : {};
@@ -105,6 +106,11 @@ export function chooseQuestOutfit(
     spec[`acc${i + 1}` as OutfitSlot] = accessory;
   }
   const mergedSpec = mergeSpecs(...outfits, spec);
+
+  if (!sober()) {
+    mergedSpec.offhand = $item`Drunkula's wineglass`;
+  }
+
   if (
     !have($item`Crown of Thrones`) &&
     have($item`Buddy Bjorn`) &&

src/rose.ts

@@ -7,7 +7,6 @@ import {
 } from "libram";
 
 import { ChronerQuest, ChronerStrategy } from "./engine";
-import { sober } from "./lib";
 import Macro from "./macro";
 import { chooseQuestOutfit, ifHave } from "./outfit";
 
@@ -38,17 +37,13 @@ export const rose: ChronerQuest = {
       completed: () => false,
       do: $location`Globe Theatre Main Stage`,
       outfit: () => {
-        const drunkSpec = sober()
-          ? {}
-          : { offhand: $item`Drunkula's wineglass` };
         const sausageSpec =
           getKramcoWandererChance() >= 1
             ? ifHave("offhand", $item`Kramco Sausage-o-Matic™`)
             : {};
         return chooseQuestOutfit(
           { location, isFree: getKramcoWandererChance() >= 1 },
           sausageSpec,
-          drunkSpec,
         );
       },
       combat: new ChronerStrategy(() => Macro.standardCombat()),

src/setup.ts

@@ -132,7 +132,7 @@ export const setup: Quest<ChronerTask> = {
       completed: () => AutumnAton.currentlyIn() !== null,
       do: (): void => {
         AutumnAton.sendTo(
-          $locations`Moonshiners' Woods, The Cave Before Time, The Sleazy Back Alley`,
+          $locations`The Post-Mall, Moonshiners' Woods, The Cave Before Time, The Sleazy Back Alley`,
         );
       },
       ready: () => AutumnAton.available(),