libram 0.9.31 → 0.9.33

package/dist/actions/ActionSource.js

@@ -1,7 +1,8 @@
-import { mallPrice, 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) => mallPrice(item) > 0 ? mallPrice(item) : Infinity;
+    static defaultPriceFunction = (item) => getAcquirePrice(item) > 0 ? getAcquirePrice(item) : Infinity;
     source;
     potential; // Infinity: unlimited
     macro;

package/dist/actions/Banish.js

@@ -85,7 +85,7 @@ const banishSources = [
         cost: () => ActionSource.defaultPriceFunction($item `human musk`),
     }),
     // Expensive unlimited sources
-    ...$items `Louder Than Bomb, divine champagne popper, tennis ball`.map((item) => new ActionSource(item, () => Infinity, Macro.item(item), {
+    ...$items `Louder Than Bomb, divine champagne popper, tennis ball, stuffed yam stinkbomb, anchor bomb, handful of split pea soup`.map((item) => new ActionSource(item, () => Infinity, Macro.item(item), {
         preparation: () => retrieveItem(item),
         cost: () => ActionSource.defaultPriceFunction(item),
     })),

package/dist/actions/FreeKill.js

@@ -62,7 +62,7 @@ const freeKillSources = [
             }
             return get("shockingLickCharges") > 0;
         },
-        cost: () => ActionSource.defaultPriceFunction($item `battery (AAA)`) * 4,
+        cost: () => ActionSource.defaultPriceFunction($item `battery (9-Volt)`),
     }),
     ...$items `Daily Affirmation: Think Win-Lose, superduperheated metal`.map((item) => new ActionSource(item, () => Infinity, Macro.item(item), {
         preparation: () => retrieveItem(item),

package/dist/actions/FreeRun.js

@@ -41,7 +41,7 @@ const freeRunSources = [
     }),
     new ActionSource($item `peppermint parasol`, () => Math.max(0, 3 - get("_navelRunaways")), Macro.item($item `peppermint parasol`), {
         preparation: () => retrieveItem($item `peppermint parasol`),
-        cost: () => Math.min(ActionSource.defaultPriceFunction($item `peppermint sprout`) * 5, ActionSource.defaultPriceFunction($item `peppermint parasol`)) / 10, // Breaks after 10 successful runaways.
+        cost: () => ActionSource.defaultPriceFunction($item `peppermint parasol`) / 10, // Breaks after 10 successful runaways.
     }),
     // unlimited items that trigger everything looks green
     ...$items `green smoke bomb, tattered scrap of paper, GOTO, T.U.R.D.S. Key`.map((item) => new ActionSource(item, everythingLooksGreen(), Macro.item(item), {

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, } 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";
@@ -1179,3 +1179,34 @@ 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 (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;
     }