libram 0.6.14 → 0.6.17

package/dist/actions/ActionSource.js

@@ -142,9 +142,9 @@ function filterAction(action, constraints) {
  */
 export function findActionSource(actions, constraints = {}) {
     const validActions = actions.filter((actions) => filterAction(actions, constraints));
-    return validActions.length
-        ? validActions.reduce((a, b) => (a.cost() > b.cost() ? a : b))
-        : null;
+    if (validActions.length < 1)
+        return null;
+    return validActions.reduce((a, b) => (a.cost() <= b.cost() ? a : b));
 }
 /**
  * Count available action sources subject to constraints. Note that, if

package/dist/ascend.d.ts

@@ -1,6 +1,6 @@
-import { Skill, Class, Item } from "kolmafia";
+import { Skill, Class, Item, MafiaClass } from "kolmafia";
 import { Path } from "./Path";
-import { Ceiling, Desk, Nightstand } from "./resources/2015/ChateauMantegna";
+import { ChateauMantegna } from "./resources";
 export declare enum Lifestyle {
     casual = 1,
     softcore = 2,
@@ -8,8 +8,18 @@ export declare enum Lifestyle {
     hardcore = 3
 }
 export declare class AscendError extends Error {
-    cause?: Skill | Item | Class | Path;
-    constructor(cause?: Skill | Item | Class | Path);
+    cause?: Skill | Item | Class | Path | string;
+    constructor(cause?: Skill | Item | Class | Path | string);
+}
+declare const worksheds: readonly ["warbear LP-ROM burner", "warbear jackhammer drill press", "warbear induction oven", "warbear high-efficiency still", "warbear chemistry lab", "warbear auto-anvil", "spinning wheel", "snow machine", "Little Geneticist DNA-Splicing Lab", "portable Mayo Clinic", "Asdon Martin keyfob", "diabolic pizza cube", "cold medicine cabinet"];
+declare type Workshed = typeof worksheds[number];
+declare const gardens: readonly ["packet of pumpkin seeds", "Peppermint Pip Packet", "packet of dragon's teeth", "packet of beer seeds", "packet of winter seeds", "packet of thanksgarden seeds", "packet of tall grass seeds", "packet of mushroom spores"];
+declare type Garden = typeof gardens[number];
+declare const eudorae: readonly ["My Own Pen Pal kit", "GameInformPowerDailyPro subscription card", "Xi Receiver Unit", "New-You Club Membership Form", "Our Daily Candles™ order form"];
+declare type Eudora = typeof eudorae[number];
+export declare class AscensionPrepError extends Error {
+    cause: string;
+    constructor(cause: string, original?: MafiaClass | string);
 }
 declare type MoonSign = number | "mongoose" | "wallaby" | "vole" | "platypus" | "opossum" | "marmot" | "wombat" | "blender" | "packrat" | "degrassi" | "degrassi knoll" | "friendly degrassi knoll" | "knoll" | "canada" | "canadia" | "little canadia" | "gnomads" | "gnomish" | "gnomish gnomads camp";
 /**
@@ -22,12 +32,6 @@ declare type MoonSign = number | "mongoose" | "wallaby" | "vole" | "platypus" |
  * @param pet From the astral pet store.
  */
 export declare function ascend(path: Path, playerClass: Class, lifestyle: Lifestyle, moon: MoonSign, consumable?: Item | undefined, pet?: Item | undefined, permSkills?: Map<Skill, Lifestyle> | undefined): void;
-declare const worksheds: readonly ["warbear LP-ROM burner", "warbear jackhammer drill press", "warbear induction oven", "warbear high-efficiency still", "warbear chemistry lab", "warbear auto-anvil", "spinning wheel", "snow machine", "Little Geneticist DNA-Splicing Lab", "portable Mayo Clinic", "Asdon Martin keyfob", "diabolic pizza cube", "cold medicine cabinet"];
-declare type Workshed = typeof worksheds[number];
-declare const gardens: readonly ["packet of pumpkin seeds", "Peppermint Pip Packet", "packet of dragon's teeth", "packet of beer seeds", "packet of winter seeds", "packet of thanksgarden seeds", "packet of tall grass seeds", "packet of mushroom spores"];
-declare type Garden = typeof gardens[number];
-declare const eudorae: readonly ["My Own Pen Pal kit", "GameInformPowerDailyPro subscription card", "Xi Receiver Unit", "New-You Club Membership Form", "Our Daily Candles™ order form"];
-declare type Eudora = typeof eudorae[number];
 /**
  * Sets up various iotms you may want to use in the coming ascension
  * @param ascensionItems.workshed Workshed to switch to.
@@ -40,9 +44,9 @@ export declare function prepareAscension({ workshed, garden, eudora, chateau, th
     garden?: Garden;
     eudora?: Eudora;
     chateau?: {
-        desk?: Desk;
-        ceiling?: Ceiling;
-        nightstand?: Nightstand;
+        desk?: ChateauMantegna.Desk;
+        ceiling?: ChateauMantegna.Ceiling;
+        nightstand?: ChateauMantegna.Nightstand;
     };
     throwOnFail?: boolean;
 }): void;

package/dist/ascend.js

@@ -1,6 +1,8 @@
 import { Skill, Class, containsText, eudoraItem, getCampground, getWorkshed, Item, toInt, use, visitUrl, xpath, haveSkill, } from "kolmafia";
+import { Path } from "./Path";
 import { ChateauMantegna } from "./resources";
 import { $item, $items, $stat } from "./template-string";
+import { createStringUnionTypeGuardFunction } from "./utils";
 export var Lifestyle;
 (function (Lifestyle) {
     Lifestyle[Lifestyle["casual"] = 1] = "casual";
@@ -28,9 +30,75 @@ export class AscendError extends Error {
         else if (cause instanceof Class) {
             super(`Invalid class ${cause} for this path!`);
         }
-        else {
+        else if (cause instanceof Path) {
             super(`Invalid path ${cause}!`);
         }
+        else
+            super(cause);
+        this.cause = cause;
+    }
+}
+const worksheds = [
+    "warbear LP-ROM burner",
+    "warbear jackhammer drill press",
+    "warbear induction oven",
+    "warbear high-efficiency still",
+    "warbear chemistry lab",
+    "warbear auto-anvil",
+    "spinning wheel",
+    "snow machine",
+    "Little Geneticist DNA-Splicing Lab",
+    "portable Mayo Clinic",
+    "Asdon Martin keyfob",
+    "diabolic pizza cube",
+    "cold medicine cabinet",
+];
+const gardens = [
+    "packet of pumpkin seeds",
+    "Peppermint Pip Packet",
+    "packet of dragon's teeth",
+    "packet of beer seeds",
+    "packet of winter seeds",
+    "packet of thanksgarden seeds",
+    "packet of tall grass seeds",
+    "packet of mushroom spores",
+];
+const eudorae = [
+    "My Own Pen Pal kit",
+    "GameInformPowerDailyPro subscription card",
+    "Xi Receiver Unit",
+    "New-You Club Membership Form",
+    "Our Daily Candles™ order form",
+];
+const isWorkshed = createStringUnionTypeGuardFunction(worksheds);
+const isGarden = createStringUnionTypeGuardFunction(gardens);
+const isEudora = createStringUnionTypeGuardFunction(eudorae);
+const isDesk = createStringUnionTypeGuardFunction(ChateauMantegna.desks);
+const isNightstand = createStringUnionTypeGuardFunction(ChateauMantegna.nightstands);
+const isCeiling = createStringUnionTypeGuardFunction(ChateauMantegna.ceilings);
+export class AscensionPrepError extends Error {
+    cause;
+    constructor(cause, original) {
+        if (isWorkshed(cause)) {
+            super(`Unable to swap workshed to ${cause}; workshed is currently ${original}.`);
+        }
+        else if (isGarden(cause)) {
+            super(`Unable to swap garden to ${cause}; garden is currently ${original}.`);
+        }
+        else if (isEudora(cause)) {
+            super(`Unable to swap eudora to ${cause}; eudora is currently ${original}.`);
+        }
+        else if (isDesk(cause)) {
+            super(`Unable to swap chateau desk to ${cause}; desk is currently ${original}.`);
+        }
+        else if (isNightstand(cause)) {
+            super(`Unable to swap chateau nightstand to ${cause}; nightstand is currently ${original}.`);
+        }
+        else if (isCeiling(cause)) {
+            super(`Unable to swap chateau ceiling to ${cause}; ceiling is currently ${original}.`);
+        }
+        else
+            super(cause);
         this.cause = cause;
     }
 }
@@ -46,7 +114,7 @@ function toMoonId(moon, playerClass) {
             case $stat `Moxie`:
                 return 2;
             default:
-                throw new Error(`unknown prime stat for ${playerClass}`);
+                throw new AscendError(`unknown prime stat for ${playerClass}`);
         }
     };
     switch (moon.toLowerCase()) {
@@ -82,7 +150,7 @@ function toMoonId(moon, playerClass) {
         case "gnomish gnomads camp":
             return 7 + offset();
         default:
-            return -1;
+            throw new AscendError("Invalid moon sign!");
     }
 }
 /**
@@ -108,7 +176,7 @@ export function ascend(path, playerClass, lifestyle, moon, consumable = $item `a
         throw new AscendError(consumable);
     }
     if (pet &&
-        !$items `astral bludgeon, astral shield, astral chapeau, astral bracer, astral longbow, astral shorts, astral mace, astral ring, astral statuette, astral pistol, astral mask, astral pet sweater, astral shirt, astral belt`.includes(pet)) {
+        !$items `astral bludgeon, astral shield, astral chapeau, astral bracer, astral longbow, astral shorts, astral mace, astral trousers, astral ring, astral statuette, astral pistol, astral mask, astral pet sweater, astral shirt, astral belt`.includes(pet)) {
         throw new AscendError(pet);
     }
     const illegalSkill = permSkills
@@ -139,38 +207,6 @@ export function ascend(path, playerClass, lifestyle, moon, consumable = $item `a
     }
     visitUrl(`afterlife.php?action=ascend&confirmascend=1&whichsign=${moonId}&gender=2&whichclass=${toInt(playerClass)}&whichpath=${path.id}&asctype=${lifestyle}&nopetok=1&noskillsok=1&lamepathok=1&lamesignok=1&pwd`, true);
 }
-const worksheds = [
-    "warbear LP-ROM burner",
-    "warbear jackhammer drill press",
-    "warbear induction oven",
-    "warbear high-efficiency still",
-    "warbear chemistry lab",
-    "warbear auto-anvil",
-    "spinning wheel",
-    "snow machine",
-    "Little Geneticist DNA-Splicing Lab",
-    "portable Mayo Clinic",
-    "Asdon Martin keyfob",
-    "diabolic pizza cube",
-    "cold medicine cabinet",
-];
-const gardens = [
-    "packet of pumpkin seeds",
-    "Peppermint Pip Packet",
-    "packet of dragon's teeth",
-    "packet of beer seeds",
-    "packet of winter seeds",
-    "packet of thanksgarden seeds",
-    "packet of tall grass seeds",
-    "packet of mushroom spores",
-];
-const eudorae = [
-    "My Own Pen Pal kit",
-    "GameInformPowerDailyPro subscription card",
-    "Xi Receiver Unit",
-    "New-You Club Membership Form",
-    "Our Daily Candles™ order form",
-];
 /**
  * Sets up various iotms you may want to use in the coming ascension
  * @param ascensionItems.workshed Workshed to switch to.
@@ -183,44 +219,44 @@ export function prepareAscension({ workshed, garden, eudora, chateau, throwOnFai
     if (workshed && getWorkshed() !== Item.get(workshed)) {
         use(Item.get(workshed));
         if (getWorkshed().name !== workshed && throwOnFail) {
-            throw new Error(`Failed to switch workshed to ${workshed}; it is currently still ${getWorkshed()}.`);
+            throw new AscensionPrepError(workshed, getWorkshed());
         }
     }
     if (garden && !Object.getOwnPropertyNames(getCampground()).includes(garden)) {
         use(Item.get(garden));
-        if (!Object.getOwnPropertyNames(getCampground()).includes(garden) &&
-            throwOnFail) {
-            throw new Error(`We really thought we changed your garden to a ${garden}, but Mafia is saying otherwise.`);
+        const gardenName = Object.getOwnPropertyNames(getCampground()).find(isGarden);
+        if (gardenName !== garden && throwOnFail) {
+            throw new AscensionPrepError(garden, gardenName);
         }
     }
     if (eudora && eudoraItem().name !== eudora) {
         const eudoraNumber = 1 + eudorae.indexOf(eudora);
         if (!xpath(visitUrl("account.php?tab=correspondence"), `//select[@name="whichpenpal"]/option/@value`).includes(eudoraNumber.toString()) &&
             throwOnFail) {
-            throw new Error(`I'm sorry buddy, but you don't seem to be subscribed to ${eudora}. Which makes it REALLY hard to correspond with them.`);
+            throw new AscensionPrepError(`Unable to swap eudora to ${eudora} because you are not subscribed to it.`);
         }
         else {
             visitUrl(`account.php?actions[]=whichpenpal&whichpenpal=${eudoraNumber}&action=Update`, true);
         }
         if (eudoraItem() !== Item.get(eudora) && throwOnFail) {
-            throw new Error(`We really thought we changed your eudora to a ${eudora}, but Mafia is saying otherwise.`);
+            throw new AscensionPrepError(eudora, eudoraItem());
         }
     }
     if (chateau && ChateauMantegna.have()) {
         const { desk, ceiling, nightstand } = chateau;
         if (ceiling && ChateauMantegna.getCeiling() !== ceiling) {
             if (!ChateauMantegna.changeCeiling(ceiling) && throwOnFail) {
-                throw new Error(`We tried, but were unable to change your chateau ceiling to ${ceiling}. Probably.`);
+                throw new AscensionPrepError(ceiling, ChateauMantegna.getCeiling() ?? "unknown");
             }
         }
         if (desk && ChateauMantegna.getDesk() !== desk) {
             if (!ChateauMantegna.changeDesk(desk) && throwOnFail) {
-                throw new Error(`We tried, but were unable to change your chateau desk to ${desk}. Probably.`);
+                throw new AscensionPrepError(desk, ChateauMantegna.getDesk() ?? "unknown");
             }
         }
         if (nightstand && ChateauMantegna.getNightstand() !== nightstand) {
             if (!ChateauMantegna.changeNightstand(nightstand) && throwOnFail) {
-                throw new Error(`We tried, but were unable to change your chateau nightstand to ${nightstand}. Probably.`);
+                throw new AscensionPrepError(nightstand, ChateauMantegna.getNightstand() ?? "unknown");
             }
         }
     }

package/dist/maximize.d.ts

@@ -8,6 +8,7 @@ export declare type MaximizeOptions = {
     bonusEquip: Map<Item, number>;
     onlySlot: Slot[];
     preventSlot: Slot[];
+    forceUpdate: boolean;
 };
 /**
  *

package/dist/maximize.js

@@ -28,6 +28,7 @@ function mergeMaximizeOptions(defaultOptions, addendums) {
             ...defaultOptions.preventSlot,
             ...(addendums.preventSlot ?? []),
         ],
+        forceUpdate: addendums.forceUpdate ?? defaultOptions.forceUpdate,
     };
 }
 const defaultMaximizeOptions = {
@@ -39,6 +40,7 @@ const defaultMaximizeOptions = {
     bonusEquip: new Map(),
     onlySlot: [],
     preventSlot: [],
+    forceUpdate: false,
 };
 /**
  *
@@ -307,7 +309,7 @@ function saveCached(cacheKey, options) {
  */
 export function maximizeCached(objectives, options = {}) {
     const fullOptions = mergeMaximizeOptions(defaultMaximizeOptions, options);
-    const { forceEquip, preventEquip, bonusEquip, onlySlot, preventSlot, } = fullOptions;
+    const { forceEquip, preventEquip, bonusEquip, onlySlot, preventSlot, forceUpdate, } = fullOptions;
     // Sort each group in objective to ensure consistent ordering in string
     const objective = [
         ...objectives.sort(),
@@ -321,7 +323,7 @@ export function maximizeCached(objectives, options = {}) {
             .sort(),
     ].join(", ");
     const cacheEntry = checkCache(objective, fullOptions);
-    if (cacheEntry) {
+    if (cacheEntry && !forceUpdate) {
         logger.info("Equipment found in maximize cache, equipping...");
         applyCached(cacheEntry, fullOptions);
         if (verifyCached(cacheEntry)) {
@@ -381,6 +383,7 @@ export class Requirement {
                 ...(optionsA.preventSlot ?? []),
                 ...(optionsB.preventSlot ?? []),
             ],
+            forceUpdate: optionsA.forceUpdate || optionsB.forceUpdate,
         });
     }
     /**

package/dist/mood.d.ts

@@ -25,6 +25,7 @@ declare type MoodOptions = {
     songSlots: Effect[][];
     mpSources: MpSource[];
     reserveMp: number;
+    useNativeRestores: boolean;
 };
 declare abstract class MoodElement {
     mpCostPerTurn(): number;

package/dist/mood.js

@@ -1,5 +1,5 @@
 import "core-js/modules/es.object.values";
-import { availableAmount, buy, cliExecute, eat, effectModifier, haveEffect, haveSkill, hpCost, mallPrice, mpCost, myHp, myMaxmp, myMp, numericModifier, retrieveItem, toEffect, toSkill, turnsPerCast, use, useSkill, } from "kolmafia";
+import { availableAmount, buy, cliExecute, eat, effectModifier, haveEffect, haveSkill, hpCost, mallPrice, mpCost, myHp, myMaxmp, myMp, numericModifier, restoreMp, retrieveItem, toEffect, toSkill, turnsPerCast, use, useSkill, } from "kolmafia";
 import { getActiveSongs, have, isSong } from "./lib";
 import { get } from "./property";
 import { AsdonMartin } from "./resources";
@@ -92,8 +92,10 @@ class SkillMoodElement extends MoodElement {
             const activeSongs = getActiveSongs();
             for (const song of activeSongs) {
                 const slot = mood.options.songSlots.find((slot) => slot.includes(song));
-                if (!slot || slot.includes(effect))
+                if (!slot || slot.includes(effect)) {
                     cliExecute(`shrug ${song}`);
+                    break;
+                }
             }
         }
         let oldRemainingCasts = -1;
@@ -107,8 +109,9 @@ class SkillMoodElement extends MoodElement {
             else {
                 const cost = mpCost(this.skill);
                 maxCasts = Math.floor(Math.min(mood.availableMp(), myMp()) / cost);
-                if (maxCasts === 0) {
-                    mood.moreMp(cost);
+                if (maxCasts < remainingCasts) {
+                    const bestMp = Math.min(remainingCasts * mpCost(this.skill), myMaxmp());
+                    mood.moreMp(bestMp);
                     maxCasts = Math.floor(Math.min(mood.availableMp(), myMp()) / cost);
                 }
             }
@@ -216,6 +219,7 @@ export class Mood {
         songSlots: [],
         mpSources: [MagicalSausages.instance, OscusSoda.instance],
         reserveMp: 0,
+        useNativeRestores: false,
     };
     /**
      * Set default options for new Mood instances.
@@ -237,7 +241,9 @@ export class Mood {
      * Get the MP available for casting skills.
      */
     availableMp() {
-        return (sum(this.options.mpSources, (mpSource) => mpSource.availableMpMin()) + Math.max(myMp() - this.options.reserveMp, 0));
+        return this.options.useNativeRestores
+            ? Infinity
+            : sum(this.options.mpSources, (mpSource) => mpSource.availableMpMin()) + Math.max(myMp() - this.options.reserveMp, 0);
     }
     moreMp(minimumTarget) {
         if (myMp() >= minimumTarget)
@@ -249,6 +255,9 @@ export class Mood {
                     break;
             }
         }
+        if (this.options.useNativeRestores) {
+            restoreMp(minimumTarget);
+        }
     }
     /**
      * Add a skill to the mood.