libram 0.6.11 → 0.6.14

package/dist/actions/ActionSource.d.ts

@@ -58,6 +58,7 @@ export declare type ActionConstraints = {
  * A combat-based action resource in the game (e.g. a free run or free kill).
  */
 export declare class ActionSource {
+    static defaultPriceFunction: (item: Item) => number;
     source: Item | Skill | Familiar | Array<Item | Skill | Familiar>;
     potential: () => number;
     macro: Macro;

package/dist/actions/ActionSource.js

@@ -1,4 +1,4 @@
-import { useFamiliar } from "kolmafia";
+import { mallPrice, useFamiliar } from "kolmafia";
 import { Macro } from "../combat";
 import { Requirement } from "../maximize";
 import { sum } from "../utils";
@@ -30,6 +30,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;
     source;
     potential; // Infinity: unlimited
     macro;
@@ -140,10 +141,10 @@ function filterAction(action, constraints) {
  * @returns Available action source satisfying constraints, or null.
  */
 export function findActionSource(actions, constraints = {}) {
-    return (actions
-        .filter((actions) => filterAction(actions, constraints))
-        .sort((a, b) => a.cost() - b.cost())
-        .find((action) => action) ?? null);
+    const validActions = actions.filter((actions) => filterAction(actions, constraints));
+    return validActions.length
+        ? validActions.reduce((a, b) => (a.cost() > b.cost() ? a : b))
+        : null;
 }
 /**
  * Count available action sources subject to constraints. Note that, if

package/dist/actions/FreeKill.js

@@ -1,4 +1,4 @@
-import { mallPrice, myLightning, restoreMp, retrieveItem, use } from "kolmafia";
+import { myLightning, restoreMp, retrieveItem, use } from "kolmafia";
 import { Macro } from "../combat";
 import { have } from "../lib";
 import { Requirement } from "../maximize";
@@ -37,17 +37,17 @@ const freeKillSources = [
     // Expensive limited sources
     new ActionSource($item `powdered madness`, () => 5 - get("_powderedMadnessUses"), Macro.item($item `powdered madness`), {
         preparation: () => retrieveItem($item `powdered madness`),
-        cost: () => mallPrice($item `powdered madness`),
+        cost: () => ActionSource.defaultPriceFunction($item `powdered madness`),
     }),
     new ActionSource($familiar `Puck Man`, () => (have($familiar `Puck Man`) ? 20 - get("_powerPillUses") : 0), Macro.item($item `power pill`), {
         familiar: () => $familiar `Puck Man`,
         preparation: () => retrieveItem($item `power pill`),
-        cost: () => mallPrice($item `power pill`),
+        cost: () => ActionSource.defaultPriceFunction($item `power pill`),
     }),
     new ActionSource($familiar `Ms. Puck Man`, () => (have($familiar `Ms. Puck Man`) ? 20 - get("_powerPillUses") : 0), Macro.item($item `power pill`), {
         familiar: () => $familiar `Ms. Puck Man`,
         preparation: () => retrieveItem($item `power pill`),
-        cost: () => mallPrice($item `power pill`),
+        cost: () => ActionSource.defaultPriceFunction($item `power pill`),
     }),
     // Expensive unlimited sources
     new ActionSource($skill `Shocking Lick`, () => Infinity, Macro.skill($skill `Shocking Lick`), {
@@ -58,11 +58,11 @@ const freeKillSources = [
             }
             return get("shockingLickCharges") > 0;
         },
-        cost: () => mallPrice($item `battery (AAA)`) * 4,
+        cost: () => ActionSource.defaultPriceFunction($item `battery (AAA)`) * 4,
     }),
     ...$items `Daily Affirmation: Think Win-Lose, superduperheated metal`.map((item) => new ActionSource(item, () => Infinity, Macro.item(item), {
         preparation: () => retrieveItem(item),
-        cost: () => mallPrice(item),
+        cost: () => ActionSource.defaultPriceFunction(item),
     })),
 ];
 /**

package/dist/actions/FreeRun.js

@@ -1,4 +1,4 @@
-import { cliExecute, mallPrice, myTurncount, restoreMp, retrieveItem, visitUrl, } from "kolmafia";
+import { cliExecute, myTurncount, restoreMp, retrieveItem, visitUrl, } from "kolmafia";
 import { Macro } from "../combat";
 import { ensureEffect, getFoldGroup, getSongCount, getSongLimit, have, } from "../lib";
 import { Requirement } from "../maximize";
@@ -108,16 +108,16 @@ 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(mallPrice($item `peppermint sprout`) * 5, mallPrice($item `peppermint parasol`)) / 10, // Breaks after 10 successful runaways.
+        cost: () => Math.min(ActionSource.defaultPriceFunction($item `peppermint sprout`) * 5, ActionSource.defaultPriceFunction($item `peppermint parasol`)) / 10, // Breaks after 10 successful runaways.
     }),
     new ActionSource($item `human musk`, () => Math.max(0, 3 - get("_humanMuskUses")), Macro.item($item `human musk`), {
         preparation: () => retrieveItem($item `human musk`),
-        cost: () => mallPrice($item `human musk`),
+        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), {
         preparation: () => retrieveItem(item),
-        cost: () => mallPrice(item),
+        cost: () => ActionSource.defaultPriceFunction(item),
     })),
 ];
 /**

package/dist/challengePaths/2015/CommunityService.js

@@ -14,7 +14,9 @@ const statCommunityServicePredictor = (stat) => {
     return () => 60 -
         Math.floor((1 / 30) *
             (myBuffedstat(stat) -
-                myBasestat(thralls.get(stat) === myThrall() ? $stat `mysticality` : stat)));
+                myBasestat(thralls.get(stat) === myThrall() && !have($effect `Expert Oiliness`)
+                    ? $stat `mysticality`
+                    : stat)));
 };
 const visitCouncil = () => visitUrl("council.php");
 export default class CommunityService {

package/dist/lib.d.ts

@@ -1,7 +1,7 @@
 /** @module GeneralLibrary */
 import "core-js/modules/es.object.entries";
 import "core-js/features/array/flat";
-import { Effect, Familiar, Item, Location, Monster, Servant, Skill, Thrall } from "kolmafia";
+import { Effect, Element, Familiar, Item, Location, Monster, Servant, Skill, Thrall } from "kolmafia";
 /**
  * Returns the current maximum Accordion Thief songs the player can have in their head
  *
@@ -269,3 +269,14 @@ export declare function findLeprechaunMultiplier(familiar: Familiar): number;
 export declare function findFairyMultiplier(familiar: Familiar): number;
 export declare const holidayWanderers: Map<string, Monster[]>;
 export declare function getTodaysHolidayWanderers(): Monster[];
+/**
+ * Determines & returns whether or not we can safely call visitUrl(), based on whether we're in a fight, multi-fight, choice, etc
+ */
+export declare function canVisitUrl(): boolean;
+/**
+ * Calculate damage taken from a specific element after factoring in resistance
+ * @param baseDamage
+ * @param element
+ * @returns damage after factoring in resistances
+ */
+export declare function damageTakenByElement(baseDamage: number, element: Element): number;

package/dist/lib.js

@@ -1,7 +1,7 @@
 /** @module GeneralLibrary */
 import "core-js/modules/es.object.entries";
 import "core-js/features/array/flat";
-import { appearanceRates, autosellPrice, availableAmount, booleanModifier, cliExecute, Effect, Familiar, fullnessLimit, getCampground, getCounters, getPlayerId, getPlayerName, getRelated, haveEffect, haveFamiliar, haveServant, haveSkill, holiday, inebrietyLimit, Item, Location, mallPrice, Monster, myEffects, myFamiliar, myFullness, myInebriety, myPath, mySpleenUse, myThrall, myTurncount, numericModifier, Servant, Skill, spleenLimit, Thrall, toItem, toSkill, totalTurnsPlayed, } from "kolmafia";
+import { appearanceRates, autosellPrice, availableAmount, booleanModifier, choiceFollowsFight, cliExecute, currentRound, Effect, elementalResistance, Familiar, fullnessLimit, getCampground, getCounters, getPlayerId, getPlayerName, getRelated, handlingChoice, haveEffect, haveFamiliar, haveServant, haveSkill, holiday, inebrietyLimit, inMultiFight, Item, Location, mallPrice, Monster, myEffects, myFamiliar, myFullness, myInebriety, myPath, mySpleenUse, myThrall, myTurncount, numericModifier, Servant, Skill, spleenLimit, Thrall, toItem, toSkill, totalTurnsPlayed, } from "kolmafia";
 import { get } from "./property";
 import { $class, $familiar, $item, $items, $monsters, $skill, } from "./template-string";
 import { chunk } from "./utils";
@@ -548,3 +548,24 @@ export function getTodaysHolidayWanderers() {
         .map((holiday) => holidayWanderers.get(holiday) ?? [])
         .flat();
 }
+/**
+ * Determines & returns whether or not we can safely call visitUrl(), based on whether we're in a fight, multi-fight, choice, etc
+ */
+export function canVisitUrl() {
+    return !(currentRound() ||
+        inMultiFight() ||
+        choiceFollowsFight() ||
+        handlingChoice());
+}
+/**
+ * Calculate damage taken from a specific element after factoring in resistance
+ * @param baseDamage
+ * @param element
+ * @returns damage after factoring in resistances
+ */
+export function damageTakenByElement(baseDamage, element) {
+    if (baseDamage < 0)
+        return 1;
+    const res = elementalResistance(element);
+    return Math.max(1, Math.ceil(baseDamage - (baseDamage * res) / 100));
+}

package/dist/mood.d.ts

@@ -1,7 +1,7 @@
 import "core-js/modules/es.object.values";
 import { Effect, Item, Skill } from "kolmafia";
 export declare abstract class MpSource {
-    usesRemaining(): number | null;
+    usesRemaining(): number;
     abstract availableMpMin(): number;
     availableMpMax(): number;
     abstract execute(): void;
@@ -9,13 +9,14 @@ export declare abstract class MpSource {
 export declare class OscusSoda extends MpSource {
     static instance: OscusSoda;
     available(): boolean;
-    usesRemaining(): number | null;
+    usesRemaining(): number;
     availableMpMin(): number;
     availableMpMax(): number;
     execute(): void;
 }
 export declare class MagicalSausages extends MpSource {
     static instance: MagicalSausages;
+    available(): boolean;
     usesRemaining(): number;
     availableMpMin(): number;
     execute(): void;

package/dist/mood.js

@@ -1,5 +1,5 @@
 import "core-js/modules/es.object.values";
-import { availableAmount, buy, cliExecute, eat, effectModifier, haveEffect, haveSkill, hpCost, itemAmount, mallPrice, mpCost, myHp, myMaxmp, myMp, numericModifier, retrieveItem, toEffect, toSkill, turnsPerCast, use, useSkill, } from "kolmafia";
+import { availableAmount, buy, cliExecute, eat, effectModifier, haveEffect, haveSkill, hpCost, mallPrice, mpCost, myHp, myMaxmp, myMp, numericModifier, retrieveItem, toEffect, toSkill, turnsPerCast, use, useSkill, } from "kolmafia";
 import { getActiveSongs, have, isSong } from "./lib";
 import { get } from "./property";
 import { AsdonMartin } from "./resources";
@@ -7,7 +7,7 @@ import { $item, $skill } from "./template-string";
 import { clamp, sum } from "./utils";
 export class MpSource {
     usesRemaining() {
-        return null;
+        return 0;
     }
     availableMpMax() {
         return this.availableMpMin();
@@ -22,10 +22,10 @@ export class OscusSoda extends MpSource {
         return get("oscusSodaUsed") ? 0 : 1;
     }
     availableMpMin() {
-        return this.available() ? 200 : 0;
+        return this.available() && this.usesRemaining() > 0 ? 200 : 0;
     }
     availableMpMax() {
-        return this.available() ? 300 : 0;
+        return this.available() && this.usesRemaining() > 0 ? 300 : 0;
     }
     execute() {
         use($item `Oscus's neverending soda`);
@@ -33,22 +33,26 @@ export class OscusSoda extends MpSource {
 }
 export class MagicalSausages extends MpSource {
     static instance = new MagicalSausages();
+    available() {
+        return have($item `Kramco Sausage-o-Matic™`);
+    }
     usesRemaining() {
-        return have($item `Kramco Sausage-o-Matic™`)
-            ? 23 - get("_sausagesEaten")
+        const maxSausages = availableAmount($item `magical sausage`) +
+            availableAmount($item `magical sausage casing`);
+        return this.available()
+            ? clamp(23 - get("_sausagesEaten"), 0, maxSausages)
             : 0;
     }
     availableMpMin() {
-        const maxSausages = Math.min(this.usesRemaining(), itemAmount($item `magical sausage`) +
-            itemAmount($item `magical sausage casing`));
-        return Math.min(myMaxmp(), 999) * maxSausages;
+        return this.available()
+            ? Math.min(myMaxmp(), 999) * this.usesRemaining()
+            : 0;
     }
     execute() {
         const mpSpaceAvailable = myMaxmp() - myMp();
         if (mpSpaceAvailable < 700)
             return;
-        const maxSausages = Math.min(this.usesRemaining(), itemAmount($item `magical sausage`) +
-            itemAmount($item `magical sausage casing`), Math.floor((myMaxmp() - myMp()) / Math.min(myMaxmp() - myMp(), 999)));
+        const maxSausages = Math.min(this.usesRemaining(), Math.floor((myMaxmp() - myMp()) / Math.min(myMaxmp() - myMp(), 999)));
         retrieveItem(maxSausages, $item `magical sausage`);
         eat(maxSausages, $item `magical sausage`);
     }
@@ -102,10 +106,10 @@ class SkillMoodElement extends MoodElement {
             }
             else {
                 const cost = mpCost(this.skill);
-                maxCasts = Math.floor(myMp() / cost);
+                maxCasts = Math.floor(Math.min(mood.availableMp(), myMp()) / cost);
                 if (maxCasts === 0) {
                     mood.moreMp(cost);
-                    maxCasts = Math.floor(myMp() / cost);
+                    maxCasts = Math.floor(Math.min(mood.availableMp(), myMp()) / cost);
                 }
             }
             const casts = clamp(remainingCasts, 0, Math.min(100, maxCasts));
@@ -236,9 +240,10 @@ export class Mood {
         return (sum(this.options.mpSources, (mpSource) => mpSource.availableMpMin()) + Math.max(myMp() - this.options.reserveMp, 0));
     }
     moreMp(minimumTarget) {
+        if (myMp() >= minimumTarget)
+            return;
         for (const mpSource of this.options.mpSources) {
-            const usesRemaining = mpSource.usesRemaining();
-            if (usesRemaining !== null && usesRemaining > 0) {
+            if (mpSource.usesRemaining() > 0) {
                 mpSource.execute();
                 if (myMp() >= minimumTarget)
                     break;
@@ -315,6 +320,7 @@ export class Mood {
             }
             completeSuccess = element.execute(this, elementTurns) && completeSuccess;
         }
+        this.moreMp(this.options.reserveMp);
         return completeSuccess;
     }
 }

package/dist/property.d.ts

@@ -93,6 +93,12 @@ export declare class PropertiesManager {
     setChoices(choicesToSet: {
         [choice: number]: number | string;
     }): void;
+    /**
+     * Sets a single choice adventure property to the given value, storing the old value.
+     * @param choiceToSet The number of the choice adventure to set the property for.
+     * @param value The value to assign to that choice adventure.
+     */
+    setChoice(choiceToSet: number, value: number | string): void;
     /**
      * Resets the given properties to their original stored value. Does not delete entries from the manager.
      * @param properties Collection of properties to reset.
@@ -125,5 +131,36 @@ export declare class PropertiesManager {
      * @returns Whether we needed to change the property.
      */
     setMaximumValue(property: NumericProperty, value: number): boolean;
+    /**
+     * Creates a new PropertiesManager with identical stored values to this one.
+     * @returns A new PropertiesManager, with identical stored values to this one.
+     */
+    clone(): PropertiesManager;
+    /**
+     * Clamps a numeric property, modulating it up or down to fit within a specified range
+     * @param property The numeric property to clamp
+     * @param min The lower bound for what we want the property to be allowed to be.
+     * @param max The upper bound for what we want the property to be allowed to be.
+     * @returns Whether we ended up changing the property or not.
+     */
+    clamp(property: NumericProperty, min: number, max: number): boolean;
+    /**
+     * Determines whether this PropertiesManager has identical stored values to another.
+     * @param other The PropertiesManager to compare to this one.
+     * @returns Whether their StoredValues are identical.
+     */
+    equals(other: PropertiesManager): boolean;
+    /**
+     * Merges a PropertiesManager onto this one, letting the input win in the event that both PropertiesManagers have a value stored.
+     * @param other The PropertiesManager to be merged onto this one.
+     * @returns A new PropertiesManager with stored values from both its parents.
+     */
+    merge(other: PropertiesManager): PropertiesManager;
+    /**
+     * Merges an arbitrary collection of PropertiesManagers, letting the rightmost PropertiesManager win in the event of verlap.
+     * @param mergees The PropertiesManagers to merge together.
+     * @returns A PropertiesManager that is just an amalgam of all the constituents.
+     */
+    static merge(...mergees: PropertiesManager[]): PropertiesManager;
 }
 export {};

package/dist/property.js

@@ -153,6 +153,14 @@ export class PropertiesManager {
             choiceValue,
         ])));
     }
+    /**
+     * Sets a single choice adventure property to the given value, storing the old value.
+     * @param choiceToSet The number of the choice adventure to set the property for.
+     * @param value The value to assign to that choice adventure.
+     */
+    setChoice(choiceToSet, value) {
+        this.setChoices({ [choiceToSet]: value });
+    }
     /**
      * Resets the given properties to their original stored value. Does not delete entries from the manager.
      * @param properties Collection of properties to reset.
@@ -214,4 +222,64 @@ export class PropertiesManager {
         }
         return false;
     }
+    /**
+     * Creates a new PropertiesManager with identical stored values to this one.
+     * @returns A new PropertiesManager, with identical stored values to this one.
+     */
+    clone() {
+        const newGuy = new PropertiesManager();
+        newGuy.properties = this.storedValues;
+        return newGuy;
+    }
+    /**
+     * Clamps a numeric property, modulating it up or down to fit within a specified range
+     * @param property The numeric property to clamp
+     * @param min The lower bound for what we want the property to be allowed to be.
+     * @param max The upper bound for what we want the property to be allowed to be.
+     * @returns Whether we ended up changing the property or not.
+     */
+    clamp(property, min, max) {
+        if (max < min)
+            return false;
+        const start = get(property);
+        this.setMinimumValue(property, min);
+        this.setMaximumValue(property, max);
+        return start !== get(property);
+    }
+    /**
+     * Determines whether this PropertiesManager has identical stored values to another.
+     * @param other The PropertiesManager to compare to this one.
+     * @returns Whether their StoredValues are identical.
+     */
+    equals(other) {
+        const thisProps = Object.entries(this.storedValues);
+        const otherProps = new Map(Object.entries(other.storedValues));
+        if (thisProps.length !== otherProps.size)
+            return false;
+        for (const [propertyName, propertyValue] of thisProps) {
+            if (otherProps.get(propertyName) === propertyValue)
+                return false;
+        }
+        return true;
+    }
+    /**
+     * Merges a PropertiesManager onto this one, letting the input win in the event that both PropertiesManagers have a value stored.
+     * @param other The PropertiesManager to be merged onto this one.
+     * @returns A new PropertiesManager with stored values from both its parents.
+     */
+    merge(other) {
+        const newGuy = new PropertiesManager();
+        newGuy.properties = { ...this.properties, ...other.properties };
+        return newGuy;
+    }
+    /**
+     * Merges an arbitrary collection of PropertiesManagers, letting the rightmost PropertiesManager win in the event of verlap.
+     * @param mergees The PropertiesManagers to merge together.
+     * @returns A PropertiesManager that is just an amalgam of all the constituents.
+     */
+    static merge(...mergees) {
+        if (mergees.length === 0)
+            return new PropertiesManager();
+        return mergees.reduce((a, b) => a.merge(b));
+    }
 }