2024

package.json

@@ -12,9 +12,10 @@
     "install-mafia": "create-kolmafia-script --install"
   },
   "dependencies": {
+    "garbo-lib": "^1.0.0",
     "grimoire-kolmafia": "^0.3.26",
     "kolmafia": "^5.27735.0",
-    "libram": "^0.8.18"
+    "libram": "^0.9.27"
   },
   "devDependencies": {
     "@babel/core": "^7.18.10",
@@ -33,9 +34,10 @@
     "esbuild-plugin-babel": "^0.2.3",
     "eslint": "^8.56.0",
     "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-libram": "^0.4.0",
+    "eslint-plugin-libram": "^0.4.18",
     "eslint-plugin-prettier": "^4.2.1",
     "prettier": "^2.7.1",
     "typescript": "^4.7.4"
-  }
+  },
+  "packageManager": "[email protected]+sha1.ac34549e6aa8e7ead463a7407e1c7390f61a6610"
 }

src/engine.ts

@@ -6,24 +6,20 @@ import {
   equippedAmount,
   haveEquipped,
   itemAmount,
-  Location,
   setAutoAttack,
 } from "kolmafia";
 import { $familiar, $item, CrownOfThrones, get, JuneCleaver, PropertiesManager } from "libram";
 
 import { bestJuneCleaverOption, shouldSkip } from "./juneCleaver";
-import { printd, sober, unsupportedChoices } from "./lib";
+import { printd, sober } from "./lib";
 import Macro from "./macro";
 import * as OrbManager from "./orbmanager";
 
 export type CrimboTask = Task & {
   sobriety: "sober" | "drunk" | "either";
-  forced?: boolean;
 };
 
-export type CrimboQuest = Quest<CrimboTask> & {
-  location: Location;
-};
+export type CrimboQuest = Quest<CrimboTask>;
 
 const introAdventures: string[] = [];
 export class CrimboStrategy extends CombatStrategy {
@@ -33,15 +29,6 @@ export class CrimboStrategy 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 CrimboEngine extends Engine<never, CrimboTask> {
@@ -56,15 +43,11 @@ export class CrimboEngine extends Engine<never, CrimboTask> {
       (sober() && task.sobriety === "sober") ||
       (!sober() && task.sobriety === "drunk");
 
-    if (task.forced) {
-      return sobriety && ncForced && super.available(task);
-    }
     return sobriety && super.available(task);
   }
 
   initPropertiesManager(manager: PropertiesManager): void {
     super.initPropertiesManager(manager);
-    for (const choices of unsupportedChoices.values()) manager.setChoices(choices);
   }
 
   dress(task: CrimboTask, outfit: Outfit): void {
@@ -82,13 +65,7 @@ export class CrimboEngine extends Engine<never, CrimboTask> {
   }
 
   execute(task: CrimboTask): void {
-    const ncBefore = countAvailableNcForces();
     super.execute(task);
-    const ncAfter = countAvailableNcForces();
-
-    if (ncBefore > ncAfter) {
-      ncForced = true;
-    }
   }
 
   setChoices(task: CrimboTask, manager: PropertiesManager): void {

src/familiar/constantValueFamiliars.ts

@@ -12,7 +12,7 @@ import {
   Robortender,
 } from "libram";
 
-import { garboAverageValue, garboValue } from "../garboValue";
+import { garboValue } from "../value";
 
 import { GeneralFamiliar, MenuOptions } from "./lib";
 
@@ -29,16 +29,14 @@ const standardFamiliars: ConstantValueFamiliar[] = [
   {
     familiar: $familiar`Stocking Mimic`,
     value: ({ allowEquipment }) =>
-      (allowEquipment
-        ? garboAverageValue(...$items`Polka Pop, BitterSweetTarts, Piddles`) / 6
-        : 0) +
+      (allowEquipment ? garboValue(...$items`Polka Pop, BitterSweetTarts, Piddles`) / 6 : 0) +
       (1 / 3 + (have($effect`Jingle Jangle Jingle`) ? 0.1 : 0)) *
         (familiarWeight($familiar`Stocking Mimic`) + weightAdjustment()),
   },
   {
     familiar: $familiar`Shorter-Order Cook`,
     value: ({ allowEquipment }) =>
-      garboAverageValue(
+      garboValue(
         ...$items`short beer, short stack of pancakes, short stick of butter, short glass of water, short white`
       ) / (allowEquipment ? 9 : 11),
   },
@@ -75,10 +73,7 @@ const standardFamiliars: ConstantValueFamiliar[] = [
   {
     familiar: $familiar`Cookbookbat`,
     value: () =>
-      (3 *
-        garboAverageValue(
-          ...$items`Vegetable of Jarlsberg, Yeast of Boris, St. Sneaky Pete's Whey`
-        )) /
+      (3 * garboValue(...$items`Vegetable of Jarlsberg, Yeast of Boris, St. Sneaky Pete's Whey`)) /
       11,
   },
   {

src/familiar/dropFamiliars.ts

@@ -1,7 +1,7 @@
 import { Familiar, Item } from "kolmafia";
 import { $familiar, $item, $items, findLeprechaunMultiplier, have } from "libram";
 
-import { garboAverageValue, garboValue } from "../garboValue";
+import { garboValue } from "../value";
 
 import { GeneralFamiliar } from "./lib";
 
@@ -13,7 +13,7 @@ type StandardDropFamiliar = {
 };
 
 function dropValue(drop: Item | Item[]): number {
-  return drop instanceof Item ? garboValue(drop) : garboAverageValue(...drop);
+  return drop instanceof Item ? garboValue(drop) : garboValue(...drop);
 }
 
 function valueStandardDropFamiliar({
@@ -146,10 +146,7 @@ const rotatingFamiliars: StandardDropFamiliar[] = [
       $item`Recipe of Before Yore: St. Pete's sneaky smoothie`,
     ],
     additionalValue: () =>
-      (3 *
-        garboAverageValue(
-          ...$items`Vegetable of Jarlsberg, Yeast of Boris, St. Sneaky Pete's Whey`
-        )) /
+      (3 * garboValue(...$items`Vegetable of Jarlsberg, Yeast of Boris, St. Sneaky Pete's Whey`)) /
       11,
   },
 ];

src/familiar/freeFightFamiliar.ts

@@ -2,8 +2,8 @@ import { canOpenRedPresent } from ".";
 import { Familiar, familiarWeight } from "kolmafia";
 import { $familiar, $item, $location, clamp, get, have } from "libram";
 
-import { garboValue } from "../garboValue";
 import { sober } from "../lib";
+import { garboValue } from "../value";
 
 import getConstantValueFamiliars from "./constantValueFamiliars";
 import getDropFamiliars from "./dropFamiliars";

src/islands.ts

@@ -0,0 +1,54 @@
+import { Element, Item, Location, Monster } from "kolmafia";
+import { $element, $item, $location, $monster } from "libram";
+
+export type HolidayIsland = {
+  location: Location;
+  orbTarget: Monster;
+  element: Element;
+  choice: number;
+  currency: Item;
+};
+
+const Easter: HolidayIsland = {
+  location: $location`Easter Island`,
+  element: $element`Stench`,
+  orbTarget: $monster`moai`,
+  choice: 1538,
+  currency: $item`Spirit of Easter`,
+};
+
+const StPatricksDay: HolidayIsland = {
+  location: $location`St. Patrick's Day Island`,
+  element: $element`Sleaze`,
+  orbTarget: $monster`giant potato`,
+  choice: 1539,
+  currency: $item`Spirit of St. Patrick's Day`,
+};
+
+const VeteransDay: HolidayIsland = {
+  location: $location`Veterans Day Island`,
+  element: $element`Hot`,
+  orbTarget: $monster`Section 11`,
+  choice: 1540,
+  currency: $item`Spirit of Veteran's Day`,
+};
+
+const Thanksgiving: HolidayIsland = {
+  location: $location`Thanksgiving Island`,
+  element: $element`Cold`,
+  orbTarget: $monster`pumpkin spice wraith`,
+  choice: 1541,
+  currency: $item`Spirit of Thanksgiving`,
+};
+
+const Christmas: HolidayIsland = {
+  // eslint-disable-next-line libram/verify-constants
+  location: $location`Christmas Island`,
+  element: $element`spooky`,
+  // eslint-disable-next-line libram/verify-constants
+  orbTarget: $monster`magically-animated snowman`,
+  choice: 1542,
+  currency: $item`Spirit of Christmas`,
+};
+
+export default { Easter, StPatricksDay, VeteransDay, Thanksgiving, Christmas };