libram 0.7.2 → 0.7.3

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/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

@@ -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: {},
 };
 /**
  *
@@ -62,7 +64,7 @@ const modeableCommands = [
     "retrocape",
     "parka",
 ];
-const modeableItems = {
+export const modeableItems = {
     backupcamera: $item `backup camera`,
     umbrella: $item `unbreakable umbrella`,
     snowsuit: $item `Snow Suit`,
@@ -70,7 +72,7 @@ const modeableItems = {
     retrocape: $item `unwrapped knock-off retro superhero cape`,
     parka: $item `Jurassic Parka`,
 };
-const modeableState = {
+export const modeableState = {
     backupcamera: () => getProperty("backupCameraMode"),
     umbrella: () => getProperty("umbrellaState"),
     snowsuit: () => getProperty("snowsuit"),
@@ -80,7 +82,7 @@ const modeableState = {
         getProperty("retroCapeWashingInstructions"),
     parka: () => getProperty("parkaMode"),
 };
-function getCurrentModes() {
+export function getCurrentModes() {
     const modes = {};
     for (const key of modeableCommands) {
         if (haveEquipped(modeableItems[key])) {
@@ -89,7 +91,7 @@ function getCurrentModes() {
     }
     return modes;
 }
-function applyModes(modes) {
+export function applyModes(modes) {
     for (const command of modeableCommands) {
         if (haveEquipped(modeableItems[command])) {
             if (modeableState[command]() !== modes[command]) {
@@ -247,7 +249,7 @@ function applyCached(entry, options) {
         entry.rider.get($item `Buddy Bjorn`)) {
         bjornifyFamiliar(entry.rider.get($item `Buddy Bjorn`) || $familiar.none);
     }
-    applyModes(entry.modes);
+    applyModes({ ...entry.modes, ...options.modes });
 }
 const slotStructure = [
     $slots `hat`,
@@ -335,7 +337,7 @@ function saveCached(cacheKey, options) {
             rider.delete($item `Crown of Thrones`);
         }
     }
-    const entry = new CacheEntry(equipment, rider, myFamiliar(), canEquipItemCount(), getCurrentModes());
+    const entry = new CacheEntry(equipment, rider, myFamiliar(), canEquipItemCount(), { ...getCurrentModes(), ...options.modes });
     cachedObjectives[cacheKey] = entry;
     if (options.useOutfitCaching) {
         const outfitName = outfitCache.insert(entry);

package/dist/resources/2017/AsdonMartin.js

@@ -1,7 +1,6 @@
 import "core-js/modules/es.object.values";
-import { autosellPrice, canInteract, cliExecute, getFuel, getWorkshed, haveEffect, historicalAge, historicalPrice, isNpcItem, Item, itemAmount, mallPrice, mallPrices, retrieveItem, toInt, visitUrl, } from "kolmafia";
+import { autosellPrice, buy, canInteract, cliExecute, getFuel, getWorkshed, haveEffect, historicalAge, historicalPrice, isNpcItem, Item, itemAmount, mallPrice, mallPrices, toInt, visitUrl, } from "kolmafia";
 import { getAverageAdventures, have as haveItem } from "../../lib";
-import { PropertiesManager } from "../../property";
 import { $effect, $item, $items } from "../../template-string";
 import { clamp } from "../../utils";
 var PriceAge;
@@ -119,7 +118,6 @@ export function insertFuel(it, quantity = 1) {
 export function fillTo(targetUnits) {
     if (!installed())
         return false;
-    const manager = new PropertiesManager();
     while (getFuel() < targetUnits) {
         const remaining = targetUnits - getFuel();
         // if in Hardcore/ronin, skip the price calculation and just use soda bread
@@ -127,18 +125,16 @@ export function fillTo(targetUnits) {
             ? getBestFuels(remaining)
             : [$item `loaf of soda bread`, undefined];
         const count = Math.ceil(targetUnits / getAverageAdventures(bestFuel));
+        let ceiling = undefined;
         if (secondBest) {
             const efficiencyOfSecondBest = mallPrice(secondBest) / getAverageAdventures(secondBest);
-            const ceiling = Math.ceil(efficiencyOfSecondBest * getAverageAdventures(bestFuel));
-            manager.setMaximumValue("autoBuyPriceLimit", ceiling);
+            ceiling = Math.ceil(efficiencyOfSecondBest * getAverageAdventures(bestFuel));
         }
-        retrieveItem(count, bestFuel);
+        ceiling ? buy(count, bestFuel, ceiling) : buy(count, bestFuel);
         if (!insertFuel(bestFuel, Math.min(itemAmount(bestFuel), count))) {
-            manager.resetAll();
             throw new Error("Failed to fuel Asdon Martin.");
         }
     }
-    manager.resetAll();
     return getFuel() >= targetUnits;
 }
 function fillWithBestInventoryItem(targetUnits) {

package/dist/resources/2022/AutumnAton.js

@@ -47,7 +47,7 @@ export function sendTo(target, upgrade = true) {
         return null;
     runChoice(2, `heythereprogrammer=${location.id}`);
     if (handlingChoice())
-        runChoice(3);
+        visitUrl("main.php");
     return location;
 }
 /**
@@ -59,7 +59,7 @@ export function upgrade() {
     const canUpgrade = availableChoiceOptions()[1] !== undefined;
     if (canUpgrade)
         runChoice(1);
-    runChoice(3);
+    visitUrl("main.php");
     return canUpgrade;
 }
 /**
@@ -69,7 +69,7 @@ export function availableLocations() {
     if (!available())
         return [];
     const pageHtml = use();
-    runChoice(3);
+    visitUrl("main.php");
     return checkLocations(pageHtml);
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "libram",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "description": "JavaScript helper library for KoLmafia",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",