libram 0.9.32 → 0.9.34

package/dist/actions/ActionSource.js

@@ -1,7 +1,8 @@
-import { retrievePrice, useFamiliar } from "kolmafia";
+import { useFamiliar } from "kolmafia";
 import { Macro } from "../combat.js";
 import { Requirement } from "../maximize.js";
 import { sum } from "../utils.js";
+import { getAcquirePrice } from "../lib.js";
 /**
  * Merge a set of constraints into one
  *
@@ -37,7 +38,7 @@ function mergeConstraints(...allConstraints) {
  * A combat-based action resource in the game (e.g. a free run or free kill).
  */
 export class ActionSource {
-    static defaultPriceFunction = (item) => retrievePrice(item) > 0 ? retrievePrice(item) : Infinity;
+    static defaultPriceFunction = (item) => getAcquirePrice(item) > 0 ? getAcquirePrice(item) : Infinity;
     source;
     potential; // Infinity: unlimited
     macro;

package/dist/lib.d.ts

@@ -580,4 +580,12 @@ export type FamiliarTag = (typeof familiarTags)[number];
  * @returns An array of the familiar's tags
  */
 export declare function getFamiliarTags(familiar: Familiar): FamiliarTag[];
+/**
+ * Determines the cost of acquiring an item taking into account your valueOfInventory preference
+ *
+ * @param item The item to check the price of
+ * @param quantity the number of items to acquire
+ * @returns The total value of the items
+ */
+export declare function getAcquirePrice(item: Item, quantity?: number): number;
 export {};

package/dist/lib.js

@@ -1,5 +1,5 @@
 /** @module GeneralLibrary */
-import { appearanceRates, autosellPrice, availableAmount, booleanModifier, choiceFollowsFight, cliExecute, currentRound, Effect, elementalResistance, equip, equippedItem, extractItems as kolmafiaExtractItems, Familiar, fullnessLimit, getCampground, getCounters, getPlayerId, getPlayerName, getRelated, handlingChoice, haveEffect, haveFamiliar, haveServant, haveSkill, holiday, inebrietyLimit, inMultiFight, Item, Location, mallPrice, myClass, myEffects, myFamiliar, myFullness, myInebriety, myPath, myPrimestat, mySpleenUse, myThrall, myTurncount, numericModifier, Path, Servant, Skill, Slot, spleenLimit, Thrall, todayToString, toItem, toSkill, totalTurnsPlayed, visitUrl, xpath, monsterEval, batchOpen, batchClose, autosell, putCloset, putDisplay, putShop, putStash, sell, takeCloset, takeDisplay, takeShop, takeStash, takeStorage, repriceShop, familiarWeight, weightAdjustment, MafiaClasses, toMonster, } from "kolmafia";
+import { appearanceRates, autosellPrice, availableAmount, booleanModifier, choiceFollowsFight, cliExecute, currentRound, Effect, elementalResistance, equip, equippedItem, extractItems as kolmafiaExtractItems, Familiar, fullnessLimit, getCampground, getCounters, getPlayerId, getPlayerName, getRelated, handlingChoice, haveEffect, haveFamiliar, haveServant, haveSkill, holiday, inebrietyLimit, inMultiFight, Item, Location, mallPrice, myClass, myEffects, myFamiliar, myFullness, myInebriety, myPath, myPrimestat, mySpleenUse, myThrall, myTurncount, numericModifier, Path, Servant, Skill, Slot, spleenLimit, Thrall, todayToString, toItem, toSkill, totalTurnsPlayed, visitUrl, xpath, monsterEval, batchOpen, batchClose, autosell, putCloset, putDisplay, putShop, putStash, sell, takeCloset, takeDisplay, takeShop, takeStash, takeStorage, repriceShop, familiarWeight, weightAdjustment, MafiaClasses, toMonster, retrievePrice, craftType, isNpcItem, npcPrice, } from "kolmafia";
 import logger from "./logger.js";
 import { get } from "./property.js";
 import { $class, $effect, $element, $familiar, $item, $items, $monsters, $skill, $stat, } from "./template-string.js";
@@ -820,7 +820,7 @@ export function unequip(thing) {
         if (equippedItem(s) !== thing)
             return false;
         // Filter the slot out if we succeed at unequipping it
-        return !unequip(thing);
+        return !unequip(s);
         // This leaves only slots that do contain the item but that we failed to unequip
     });
     if (failedSlots.length)
@@ -1179,3 +1179,39 @@ export const familiarTags = Object.freeze([
 export function getFamiliarTags(familiar) {
     return familiar.attributes.split("; ").filter(Boolean);
 }
+/**
+ * Determines the cost of acquiring an item taking into account your valueOfInventory preference
+ *
+ * @param item The item to check the price of
+ * @param quantity the number of items to acquire
+ * @returns The total value of the items
+ */
+export function getAcquirePrice(item, quantity = 1) {
+    if (quantity <= 0)
+        return 0;
+    const currentAmount = availableAmount(item);
+    const amountNeeded = Math.max(0, quantity - currentAmount);
+    const retrieveCost = retrievePrice(item, currentAmount + quantity) -
+        retrievePrice(item, currentAmount);
+    const mallMinPrice = Math.max(100, 2 * autosellPrice(item));
+    if (craftType(item) === "Meatpasting" && retrieveCost > 0) {
+        return retrieveCost;
+    }
+    if (isNpcItem(item) &&
+        npcPrice(item) > 0 &&
+        npcPrice(item) < mallPrice(item)) {
+        return quantity * npcPrice(item);
+    }
+    if (item.tradeable && mallPrice(item) === mallMinPrice) {
+        return currentAmount * autosellPrice(item) + amountNeeded * mallPrice(item);
+    }
+    if (item.tradeable && mallPrice(item) > mallMinPrice) {
+        return quantity * mallPrice(item);
+    }
+    if (item.tradeable)
+        return quantity * autosellPrice(item);
+    if (item.discardable) {
+        return have(item, quantity) ? quantity * autosellPrice(item) : Infinity;
+    }
+    return 0;
+}

package/dist/property.d.ts

@@ -1,5 +1,5 @@
 import { Bounty, Class, Coinmaster, Effect, Element, Familiar, Item, Location, Monster, Phylum, Servant, Skill, Slot, Stat, Thrall } from "kolmafia";
-import { BooleanProperty, FamiliarProperty, LocationProperty, MonsterProperty, NumericOrStringProperty, NumericProperty, PhylumProperty, StatProperty, StringProperty } from "./propertyTypes.js";
+import { BooleanProperty, FamiliarProperty, ItemProperty, LocationProperty, MonsterProperty, NumericOrStringProperty, NumericProperty, PhylumProperty, StatProperty, StringProperty } from "./propertyTypes.js";
 import { KnownProperty } from "./propertyTyping.js";
 export declare const getString: (property: string, default_?: string | undefined) => string;
 export declare const getCommaSeparated: (property: string, default_?: string[] | undefined) => string[];
@@ -38,9 +38,13 @@ export declare function get(property: StatProperty): Stat | null;
 export declare function get(property: StatProperty, _default: Stat): Stat;
 export declare function get(property: PhylumProperty): Phylum | null;
 export declare function get(property: PhylumProperty, _default: Phylum): Phylum;
-export declare function get(property: string, _default: Location): Location | null;
-export declare function get(property: string, _default: Monster): Monster | null;
-export declare function get(property: string, _default: Familiar): Familiar | null;
+export declare function get(property: ItemProperty): Item | null;
+export declare function get(property: ItemProperty, _default: Item): Item;
+export declare function get(property: string, _default: Location): Location;
+export declare function get(property: string, _default: Monster): Monster;
+export declare function get(property: string, _default: Familiar): Familiar;
+export declare function get(property: string, _default: Phylum): Phylum;
+export declare function get(property: string, _default: Item): Item;
 export declare function get(property: string, _default: boolean): boolean;
 export declare function get(property: string, _default: number): number;
 export declare function get(property: string, _default?: string): string;

package/dist/property.js

@@ -1,5 +1,5 @@
 import { Bounty, Class, Coinmaster, Effect, Element, Familiar, getProperty, Item, Location, Monster, Phylum, propertyExists, removeProperty, Servant, setProperty, Skill, Slot, Stat, Thrall, toBounty, toClass, toCoinmaster, toEffect, toElement, toFamiliar, toItem, toLocation, toMonster, toPhylum, toServant, toSkill, toSlot, toStat, toThrall, } from "kolmafia";
-import { isBooleanProperty, isFamiliarProperty, isLocationProperty, isMonsterProperty, isNumericOrStringProperty, isNumericProperty, isPhylumProperty, isStatProperty, isStringProperty, } from "./propertyTyping.js";
+import { isBooleanProperty, isFamiliarProperty, isItemProperty, isLocationProperty, isMonsterProperty, isNumericOrStringProperty, isNumericProperty, isPhylumProperty, isStatProperty, isStringProperty, } from "./propertyTyping.js";
 const createPropertyGetter = (transform) => (property, default_) => {
     const value = getProperty(property);
     if (default_ !== undefined && value === "") {
@@ -66,6 +66,9 @@ export function get(property, _default) {
     else if (isPhylumProperty(property)) {
         return getPhylum(property, _default);
     }
+    else if (isItemProperty(property)) {
+        return getItem(property, _default);
+    }
     else if (isStringProperty(property)) {
         return value === "" && _default !== undefined ? _default : value;
     }
@@ -85,6 +88,9 @@ export function get(property, _default) {
     else if (_default instanceof Phylum) {
         return getPhylum(property, _default);
     }
+    else if (_default instanceof Item) {
+        return getItem(property, _default);
+    }
     else if (typeof _default === "boolean") {
         return value === "true" ? true : value === "false" ? false : _default;
     }