libram 0.7.1 → 0.7.3

package/dist/ascend.d.ts

@@ -6,6 +6,7 @@ export declare enum Lifestyle {
     normal = 2,
     hardcore = 3
 }
+export declare function permedSkills(): Map<Skill, Lifestyle>;
 export declare class AscendError extends Error {
     cause?: Skill | Item | Class | Path | string;
     constructor(cause?: Skill | Item | Class | Path | string);
@@ -29,8 +30,12 @@ declare type MoonSign = number | "mongoose" | "wallaby" | "vole" | "platypus" |
  * @param moon Your moon sign as a string, or the zone you're looking for as a string
  * @param consumable From the astral deli. Pick the container item, not the product.
  * @param pet From the astral pet store.
+ * @param permSkills A Map<Skill, Lifestyle> of skills you'd like to perm, ordered by priority.
  */
-export declare function ascend(path: Path, playerClass: Class, lifestyle: Lifestyle, moon: MoonSign, consumable?: Item | undefined, pet?: Item | undefined, permSkills?: Map<Skill, Lifestyle> | undefined): void;
+export declare function ascend(path: Path, playerClass: Class, lifestyle: Lifestyle, moon: MoonSign, consumable?: Item | undefined, pet?: Item | undefined, permOptions?: {
+    permSkills: Map<Skill, Lifestyle>;
+    neverAbort: boolean;
+}): void;
 /**
  * Sets up various iotms you may want to use in the coming ascension
  * @param ascensionItems.workshed Workshed to switch to.

package/dist/ascend.js

@@ -1,4 +1,5 @@
-import { Skill, Class, containsText, eudoraItem, getCampground, getWorkshed, Item, Path, toInt, use, visitUrl, xpath, haveSkill, } from "kolmafia";
+import { Skill, Class, containsText, eudoraItem, getCampground, getWorkshed, 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";
 import { createStringUnionTypeGuardFunction } from "./utils";
@@ -9,6 +10,12 @@ export var Lifestyle;
     Lifestyle[Lifestyle["normal"] = 2] = "normal";
     Lifestyle[Lifestyle["hardcore"] = 3] = "hardcore";
 })(Lifestyle || (Lifestyle = {}));
+export function permedSkills() {
+    return new Map(Array.from(Object.entries(getPermedSkills())).map(([skillName, isHardcore]) => [
+        toSkill(skillName),
+        isHardcore ? Lifestyle.hardcore : Lifestyle.softcore,
+    ]));
+}
 export class AscendError extends Error {
     cause;
     constructor(cause) {
@@ -18,7 +25,7 @@ export class AscendError extends Error {
         else if (cause instanceof Skill) {
             const reason = cause.permable
                 ? haveSkill(cause)
-                    ? "invalid for mysterious reasons"
+                    ? "too karmaically expensive"
                     : "not a skill you currently know"
                 : "unpermable";
             super(`Skill ${cause} is ${reason}!`);
@@ -160,8 +167,9 @@ function toMoonId(moon, playerClass) {
  * @param moon Your moon sign as a string, or the zone you're looking for as a string
  * @param consumable From the astral deli. Pick the container item, not the product.
  * @param pet From the astral pet store.
+ * @param permSkills A Map<Skill, Lifestyle> of skills you'd like to perm, ordered by priority.
  */
-export function ascend(path, playerClass, lifestyle, moon, consumable = $item `astral six-pack`, pet = undefined, permSkills = undefined) {
+export function ascend(path, playerClass, lifestyle, moon, consumable = $item `astral six-pack`, pet = undefined, permOptions) {
     if (playerClass.path !== (path.avatar ? path : Path.none)) {
         throw new AscendError(playerClass);
     }
@@ -178,8 +186,8 @@ export function ascend(path, playerClass, lifestyle, moon, consumable = $item `a
         !$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
-        ? Array.from(permSkills.keys()).find((skill) => !skill.permable || !haveSkill(skill))
+    const illegalSkill = permOptions
+        ? Array.from(permOptions.permSkills.keys()).find((skill) => !skill.permable || !haveSkill(skill))
         : undefined;
     if (illegalSkill) {
         throw new AscendError(illegalSkill);
@@ -196,10 +204,20 @@ export function ascend(path, playerClass, lifestyle, moon, consumable = $item `a
     }
     if (pet)
         visitUrl(`afterlife.php?action=buyarmory&whichitem=${toInt(pet)}`);
-    if (permSkills) {
-        for (const [skill, permLevel] of permSkills.entries()) {
-            if (permLevel !== Lifestyle.casual) {
-                const permText = permLevel === Lifestyle.hardcore ? "hcperm" : "scperm";
+    if (permOptions) {
+        const currentPerms = permedSkills();
+        let karma = get("bankedKarma");
+        for (const [skill, prospectivePermLevel,] of permOptions.permSkills.entries()) {
+            const currentPermLevel = currentPerms.get(skill) ?? Lifestyle.casual;
+            if (prospectivePermLevel > currentPermLevel) {
+                const expectedKarma = 100 * (prospectivePermLevel - currentPermLevel);
+                if (karma < expectedKarma) {
+                    if (!permOptions.neverAbort)
+                        throw new AscendError(skill);
+                    continue;
+                }
+                karma -= expectedKarma;
+                const permText = prospectivePermLevel === Lifestyle.hardcore ? "hcperm" : "scperm";
                 visitUrl(`afterlife.php?action=${permText}&whichskill=${toInt(skill)}`);
             }
         }

package/dist/challengePaths/2016/NuclearAutumn.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Visits the Cooling Tank on level 8 of the Fallout shelter to gain 300 rads
+ */
+export declare function coolingTank(): void;
+/**
+ * Visits the Spa Simulation Chamber on level 4 of the Fallout shelter for 100 turns of "100% all stats"
+ */
+export declare function spa(): void;
+/**
+ * Visits the Chronodynamics Laboratory on level 5 of the Fallout shelter to permanently increase radiation level by 3
+ */
+export declare function chronoLab(): void;

package/dist/challengePaths/2016/NuclearAutumn.js

@@ -0,0 +1,19 @@
+import { visitUrl } from "kolmafia";
+/**
+ * Visits the Cooling Tank on level 8 of the Fallout shelter to gain 300 rads
+ */
+export function coolingTank() {
+    visitUrl("place.php?whichplace=falloutshelter&action=vault8");
+}
+/**
+ * Visits the Spa Simulation Chamber on level 4 of the Fallout shelter for 100 turns of "100% all stats"
+ */
+export function spa() {
+    visitUrl("place.php?whichplace=falloutshelter&action=vault3");
+}
+/**
+ * Visits the Chronodynamics Laboratory on level 5 of the Fallout shelter to permanently increase radiation level by 3
+ */
+export function chronoLab() {
+    visitUrl("place.php?whichplace=falloutshelter&action=vault5");
+}

package/dist/challengePaths/index.d.ts

@@ -1,2 +1,3 @@
 import CommunityService from "./2015/CommunityService";
-export { CommunityService };
+import * as NuclearAutumn from "./2016/NuclearAutumn";
+export { CommunityService, NuclearAutumn };

package/dist/challengePaths/index.js

@@ -1,2 +1,3 @@
 import CommunityService from "./2015/CommunityService";
-export { CommunityService };
+import * as NuclearAutumn from "./2016/NuclearAutumn";
+export { CommunityService, NuclearAutumn };

package/dist/combat.js

@@ -14,7 +14,7 @@ export function getMacroId(name = MACRO_NAME) {
     if (macroMatches.length === 0) {
         visitUrl("account_combatmacros.php?action=new");
         const newMacroText = visitUrl(`account_combatmacros.php?macroid=0&name=${name}&macrotext=abort&action=save`);
-        return parseInt(xpath(newMacroText, "//input[@name=macroid]/@value")[0], 10);
+        return parseInt(xpath(newMacroText, `//input[@name=${name}]/@value`)[0], 10);
     }
     else {
         return parseInt(macroMatches[0], 10);
@@ -167,6 +167,7 @@ export class Macro {
             const id = Macro.cachedMacroIds.get(name) ?? getMacroId(name);
             visitUrl(`account_combatmacros.php?macroid=${id}&action=edit&what=Delete&confirm=1`);
             Macro.cachedAutoAttacks.delete(name);
+            Macro.cachedMacroIds.delete(name);
         }
     }
     /**

package/dist/diet/index.js

@@ -15,7 +15,7 @@ function expectedAdventures(item, modifiers) {
     if (item.adventures === "")
         return 0;
     const [min, recordedMax] = item.adventures
-        .split(/[-–—]/)
+        .split(/[-]/)
         .map((s) => parseInt(s));
     const max = recordedMax ?? min;
     const interpolated = [...new Array(max - min + 1).keys()].map((n) => n + min);
@@ -23,6 +23,7 @@ function expectedAdventures(item, modifiers) {
         (itemType(item) === "booze" && item.notes?.includes("BEER"))
         ? 1.5
         : 1.3;
+    const seasoningAdventures = max - min <= 1 ? 1 : 0.5;
     const garish = modifiers.garish && item.notes?.includes("LASAGNA") && !isMonday();
     const refinedPalate = modifiers.refinedPalate && item.notes?.includes("WINE");
     const pinkyRing = modifiers.pinkyRing && item.notes?.includes("WINE");
@@ -46,7 +47,7 @@ function expectedAdventures(item, modifiers) {
         if (itemType(item) === "food" && modifiers.mayoflex)
             adventures++;
         if (itemType(item) === "food" && modifiers.seasoning)
-            adventures += 0.5;
+            adventures += seasoningAdventures;
         return adventures;
     }) / interpolated.length);
 }
@@ -223,11 +224,6 @@ class DietPlanner {
      */
     consumptionHelpersAndValue(menuItem, overrideModifiers) {
         const helpers = [];
-        if (this.seasoning &&
-            itemType(menuItem.item) === "food" &&
-            this.mpa * 0.5 > mallPrice($item `Special Seasoning`)) {
-            helpers.push(this.seasoning);
-        }
         if (itemType(menuItem.item) === "food" && this.mayoLookup.size) {
             const mayo = menuItem.mayo
                 ? this.mayoLookup.get(menuItem.mayo)
@@ -248,6 +244,20 @@ class DietPlanner {
             tuxedoShirt: have($item `tuxedo shirt`) && canEquip($item `tuxedo shirt`),
             ...overrideModifiers,
         };
+        if (this.seasoning &&
+            itemType(menuItem.item) === "food" &&
+            this.mpa *
+                (expectedAdventures(menuItem.item, {
+                    ...defaultModifiers,
+                    seasoning: true,
+                }) -
+                    expectedAdventures(menuItem.item, {
+                        ...defaultModifiers,
+                        seasoning: false,
+                    })) >
+                mallPrice($item `Special Seasoning`)) {
+            helpers.push(this.seasoning);
+        }
         const forkMug = itemType(menuItem.item) === "food"
             ? this.fork
             : itemType(menuItem.item) === "booze"
@@ -340,7 +350,7 @@ class DietPlanner {
         const [helpersAndItem, value] = this.consumptionHelpersAndValue(trialItem, {});
         return valueWithout > valueWith + value
             ? [valueWithout, planWithout]
-            : [valueWith, [...planWith, [helpersAndItem, 1]]];
+            : [valueWith + value, [...planWith, [helpersAndItem, 1]]];
     }
 }
 /**

package/dist/lib.js

@@ -327,6 +327,9 @@ export function getBanishedMonsters() {
         if (banisher.toLowerCase() === "saber force") {
             result.set($skill `Use the Force`, Monster.get(foe));
         }
+        else if (banisher.toLowerCase() === "nanorhino") {
+            result.set($skill `Unleash Nanites`, Monster.get(foe));
+        }
         else if ([
             Item.none,
             Item.get(`training scroll:  Snokebomb`),

package/dist/maximize.d.ts

@@ -9,6 +9,7 @@ export declare type MaximizeOptions = {
     onlySlot: Slot[];
     preventSlot: Slot[];
     forceUpdate: boolean;
+    modes: Modes;
 };
 /**
  *
@@ -20,6 +21,29 @@ export declare type MaximizeOptions = {
  * @param options.bonusEquip Equipment to apply a bonus to ("200 bonus X").
  */
 export declare function setDefaultMaximizeOptions(options: Partial<MaximizeOptions>): void;
+declare const modeableCommands: readonly ["backupcamera", "umbrella", "snowsuit", "edpiece", "retrocape", "parka"];
+export declare type Mode = typeof modeableCommands[number];
+export declare type Modes = Partial<{
+    [x in Mode]: string;
+}>;
+export declare const modeableItems: {
+    readonly backupcamera: Item;
+    readonly umbrella: Item;
+    readonly snowsuit: Item;
+    readonly edpiece: Item;
+    readonly retrocape: Item;
+    readonly parka: Item;
+};
+export declare const modeableState: {
+    readonly backupcamera: () => string;
+    readonly umbrella: () => string;
+    readonly snowsuit: () => string;
+    readonly edpiece: () => string;
+    readonly retrocape: () => string;
+    readonly parka: () => string;
+};
+export declare function getCurrentModes(): Modes;
+export declare function applyModes(modes: Modes): void;
 /**
  * Run the maximizer, but only if the objective and certain pieces of game state haven't changed since it was last run.
  * @param objectives Objectives to maximize for.
@@ -63,3 +87,4 @@ export declare class Requirement {
      */
     static maximize(...requirements: Requirement[]): void;
 }
+export {};

package/dist/maximize.js

@@ -1,4 +1,4 @@
-import { availableAmount, bjornifyFamiliar, canEquip, cliExecute, enthroneFamiliar, equip, equippedAmount, equippedItem, isWearingOutfit, Item, maximize, myBasestat, myBjornedFamiliar, myEnthronedFamiliar, myFamiliar, outfit, Slot, } from "kolmafia";
+import { availableAmount, bjornifyFamiliar, canEquip, cliExecute, enthroneFamiliar, equip, equippedAmount, equippedItem, getProperty, haveEquipped, isWearingOutfit, Item, maximize, myBasestat, myBjornedFamiliar, myEnthronedFamiliar, myFamiliar, outfit, Slot, } from "kolmafia";
 import logger from "./logger";
 import { $familiar, $item, $slot, $slots, $stats } from "./template-string";
 import { setEqual } from "./utils";
@@ -29,6 +29,7 @@ function mergeMaximizeOptions(defaultOptions, addendums) {
             ...(addendums.preventSlot ?? []),
         ],
         forceUpdate: addendums.forceUpdate ?? defaultOptions.forceUpdate,
+        modes: { ...defaultOptions.modes, ...(addendums.modes ?? {}) },
     };
 }
 const defaultMaximizeOptions = {
@@ -41,6 +42,7 @@ const defaultMaximizeOptions = {
     onlySlot: [],
     preventSlot: [],
     forceUpdate: false,
+    modes: {},
 };
 /**
  *
@@ -54,6 +56,50 @@ const defaultMaximizeOptions = {
 export function setDefaultMaximizeOptions(options) {
     Object.assign(defaultMaximizeOptions, options);
 }
+const modeableCommands = [
+    "backupcamera",
+    "umbrella",
+    "snowsuit",
+    "edpiece",
+    "retrocape",
+    "parka",
+];
+export const modeableItems = {
+    backupcamera: $item `backup camera`,
+    umbrella: $item `unbreakable umbrella`,
+    snowsuit: $item `Snow Suit`,
+    edpiece: $item `The Crown of Ed the Undying`,
+    retrocape: $item `unwrapped knock-off retro superhero cape`,
+    parka: $item `Jurassic Parka`,
+};
+export const modeableState = {
+    backupcamera: () => getProperty("backupCameraMode"),
+    umbrella: () => getProperty("umbrellaState"),
+    snowsuit: () => getProperty("snowsuit"),
+    edpiece: () => getProperty("edPiece"),
+    retrocape: () => getProperty("retroCapeSuperhero") +
+        " " +
+        getProperty("retroCapeWashingInstructions"),
+    parka: () => getProperty("parkaMode"),
+};
+export function getCurrentModes() {
+    const modes = {};
+    for (const key of modeableCommands) {
+        if (haveEquipped(modeableItems[key])) {
+            modes[key] = modeableState[key]();
+        }
+    }
+    return modes;
+}
+export function applyModes(modes) {
+    for (const command of modeableCommands) {
+        if (haveEquipped(modeableItems[command])) {
+            if (modeableState[command]() !== modes[command]) {
+                cliExecute(command + " " + modes[command]);
+            }
+        }
+    }
+}
 // Subset of slots that are valid for caching.
 const cachedSlots = $slots `hat, weapon, off-hand, back, shirt, pants, acc1, acc2, acc3, familiar`;
 class CacheEntry {
@@ -61,11 +107,13 @@ class CacheEntry {
     rider;
     familiar;
     canEquipItemCount;
-    constructor(equipment, rider, familiar, canEquipItemCount) {
+    modes;
+    constructor(equipment, rider, familiar, canEquipItemCount, modes) {
         this.equipment = equipment;
         this.rider = rider;
         this.familiar = familiar;
         this.canEquipItemCount = canEquipItemCount;
+        this.modes = modes;
     }
 }
 class OutfitLRUCache {
@@ -201,6 +249,7 @@ function applyCached(entry, options) {
         entry.rider.get($item `Buddy Bjorn`)) {
         bjornifyFamiliar(entry.rider.get($item `Buddy Bjorn`) || $familiar.none);
     }
+    applyModes({ ...entry.modes, ...options.modes });
 }
 const slotStructure = [
     $slots `hat`,
@@ -288,7 +337,7 @@ function saveCached(cacheKey, options) {
             rider.delete($item `Crown of Thrones`);
         }
     }
-    const entry = new CacheEntry(equipment, rider, myFamiliar(), canEquipItemCount());
+    const entry = new CacheEntry(equipment, rider, myFamiliar(), canEquipItemCount(), { ...getCurrentModes(), ...options.modes });
     cachedObjectives[cacheKey] = entry;
     if (options.useOutfitCaching) {
         const outfitName = outfitCache.insert(entry);