libram 0.7.5 → 0.7.7

package/dist/ascend.d.ts

@@ -11,8 +11,6 @@ export declare class AscendError extends Error {
     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"];
@@ -38,13 +36,11 @@ export declare function ascend(path: Path, playerClass: Class, lifestyle: Lifest
 }): void;
 /**
  * Sets up various iotms you may want to use in the coming ascension
- * @param ascensionItems.workshed Workshed to switch to.
  * @param ascensionItems.garden Garden to switch to.
  * @param ascensionItems An object potentially containing your workshed, garden, chateau, and eudora, all as strings
  * @param throwOnFail If true, this will throw an error when it fails to switch something
  */
-export declare function prepareAscension({ workshed, garden, eudora, chateau, throwOnFail, }?: {
-    workshed?: Workshed;
+export declare function prepareAscension({ garden, eudora, chateau, throwOnFail, }?: {
     garden?: Garden;
     eudora?: Eudora;
     chateau?: {

package/dist/ascend.js

@@ -1,4 +1,4 @@
-import { Skill, Class, containsText, eudoraItem, getCampground, getWorkshed, Item, Path, toInt, use, visitUrl, xpath, haveSkill, getPermedSkills, toSkill, } from "kolmafia";
+import { Skill, Class, eudoraItem, getCampground, Item, Path, toInt, use, visitUrl, xpath, haveSkill, getPermedSkills, toSkill, } from "kolmafia";
 import { get } from "./property";
 import { ChateauMantegna } from "./resources";
 import { $item, $items, $stat } from "./template-string";
@@ -44,21 +44,6 @@ export class AscendError extends Error {
         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",
@@ -76,7 +61,6 @@ const eudorae = [
     "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);
@@ -85,10 +69,7 @@ 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)) {
+        if (isGarden(cause)) {
             super(`Unable to swap garden to ${cause}; garden is currently ${original}.`);
         }
         else if (isEudora(cause)) {
@@ -160,7 +141,12 @@ function toMoonId(moon, playerClass) {
     }
 }
 function isInValhalla() {
-    return containsText(visitUrl("charpane.php"), "Karma:");
+    const charPaneText = visitUrl("charpane.php");
+    // Match the infinity images (inf_small.gif, inf_large.gif)
+    // At time of writing, the full img tag used is:
+    // <img src="https://d2uyhvukfffg5a.cloudfront.net/otherimages/inf_small.gif">
+    const matches = charPaneText.match(/<img src="[^"]*\/otherimages\/inf_\w+\.gif">/);
+    return matches !== null;
 }
 /**
  * Hops the gash, perming no skills
@@ -229,19 +215,12 @@ export function ascend(path, playerClass, lifestyle, moon, consumable = $item `a
 }
 /**
  * Sets up various iotms you may want to use in the coming ascension
- * @param ascensionItems.workshed Workshed to switch to.
  * @param ascensionItems.garden Garden to switch to.
  * @param ascensionItems An object potentially containing your workshed, garden, chateau, and eudora, all as strings
  * @param throwOnFail If true, this will throw an error when it fails to switch something
  */
-export function prepareAscension({ workshed, garden, eudora, chateau, throwOnFail, } = {}) {
+export function prepareAscension({ garden, eudora, chateau, throwOnFail, } = {}) {
     throwOnFail = throwOnFail ?? true;
-    if (workshed && getWorkshed() !== Item.get(workshed)) {
-        use(Item.get(workshed));
-        if (getWorkshed().name !== workshed && throwOnFail) {
-            throw new AscensionPrepError(workshed, getWorkshed());
-        }
-    }
     if (garden && !Object.getOwnPropertyNames(getCampground()).includes(garden)) {
         use(Item.get(garden));
         const gardenName = Object.getOwnPropertyNames(getCampground()).find(isGarden);

package/dist/maximize.d.ts

@@ -87,4 +87,8 @@ export declare class Requirement {
      */
     static maximize(...requirements: Requirement[]): void;
 }
+/**
+ * Clear all outfits cached by the maximizer.
+ */
+export declare function clearMaximizerCache(): void;
 export {};

package/dist/maximize.js

@@ -93,7 +93,7 @@ export function getCurrentModes() {
 }
 export function applyModes(modes) {
     for (const command of modeableCommands) {
-        if (haveEquipped(modeableItems[command])) {
+        if (haveEquipped(modeableItems[command]) && modes[command] !== undefined) {
             if (modeableState[command]() !== modes[command]) {
                 cliExecute(command + " " + modes[command]);
             }
@@ -162,6 +162,10 @@ class OutfitLRUCache {
             return `${OutfitLRUCache.OUTFIT_PREFIX} ${index}`;
         }
     }
+    clear() {
+        this.#outfitSlots = [];
+        this.#useHistory = [];
+    }
 }
 /**
  * Save current equipment as KoL-native outfit.
@@ -384,6 +388,8 @@ export function maximizeCached(objectives, options = {}) {
     ].join("; ");
     const cacheEntry = checkCache(cacheKey, fullOptions);
     if (cacheEntry && !forceUpdate) {
+        if (verifyCached(cacheEntry))
+            return true;
         logger.info("Equipment found in maximize cache, equipping...");
         applyCached(cacheEntry, fullOptions);
         if (verifyCached(cacheEntry)) {
@@ -468,3 +474,11 @@ export class Requirement {
         Requirement.merge(requirements).maximize();
     }
 }
+/**
+ * Clear all outfits cached by the maximizer.
+ */
+export function clearMaximizerCache() {
+    outfitCache.clear();
+    for (const member in cachedObjectives)
+        delete cachedObjectives[member];
+}