libram 0.6.2 → 0.6.6

package/dist/Clan.d.ts

@@ -1,3 +1,4 @@
+import { Item, Monster } from "kolmafia";
 export interface Rank {
     name: string;
     degree: number;

package/dist/Clan.js

@@ -4,7 +4,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { availableAmount, cliExecute, getClanId, getClanName, getPlayerId, putStash, refreshStash, retrieveItem, stashAmount, takeStash, visitUrl, xpath, } from "kolmafia";
+import { availableAmount, cliExecute, getClanId, getClanName, getPlayerId, Monster, putStash, refreshStash, retrieveItem, stashAmount, takeStash, visitUrl, xpath, } from "kolmafia";
 import { getFoldGroup } from "./lib";
 import logger from "./logger";
 import { arrayToCountedMap, countedMapToArray, countedMapToString, notNull, parseNumber, } from "./utils";

package/dist/Copier.d.ts

@@ -1,3 +1,4 @@
+import { Monster } from "kolmafia";
 export declare class Copier {
     private couldCopy;
     private prepare;

package/dist/Kmail.d.ts

@@ -1,4 +1,5 @@
 import "core-js/modules/es.object.entries";
+import { Item } from "kolmafia";
 declare type RawKmail = {
     id: string;
     type: string;

package/dist/Kmail.js

@@ -1,5 +1,5 @@
 import "core-js/modules/es.object.entries";
-import { extractItems, extractMeat, isGiftable, toInt, visitUrl, } from "kolmafia";
+import { extractItems, extractMeat, isGiftable, Item, toInt, visitUrl, } from "kolmafia";
 import { arrayToCountedMap, chunk } from "./utils";
 export default class Kmail {
     id;

package/dist/Path.d.ts

@@ -1,3 +1,4 @@
+import { Class } from "kolmafia";
 export declare class Path {
     name: string;
     id: number;

package/dist/actions/ActionSource.d.ts

@@ -1,3 +1,4 @@
+import { Familiar, Item, Skill } from "kolmafia";
 import { Macro } from "../combat";
 import { Requirement } from "../maximize";
 export declare type FindActionSourceConstraints = {
@@ -57,17 +58,17 @@ export declare type ActionConstraints = {
  * A combat-based action resource in the game (e.g. a free run or free kill).
  */
 export declare class ActionSource {
-    source: Item | Skill | Familiar;
+    source: Item | Skill | Familiar | Array<Item | Skill | Familiar>;
     potential: () => number;
     macro: Macro;
     constraints: ActionConstraints;
     /**
-     * @param source Source of the action (e.g. item or skill needed).
+     * @param source Source(s) of the action (e.g. item, skill, or familiar needed).
      * @param potential Function returning how many times this action can be used.
      * @param macro Macro to execute this action in combat.
      * @param constraints Constraints required for this action to be available.
      */
-    constructor(source: Item | Skill | Familiar, potential: () => number, macro: Macro, constraints?: ActionConstraints);
+    constructor(source: Item | Skill | Familiar | Array<Item | Skill | Familiar>, potential: () => number, macro: Macro, constraints?: ActionConstraints);
     /**
      * @returns Name of the action source.
      */

package/dist/actions/ActionSource.js

@@ -35,7 +35,7 @@ export class ActionSource {
     macro;
     constraints;
     /**
-     * @param source Source of the action (e.g. item or skill needed).
+     * @param source Source(s) of the action (e.g. item, skill, or familiar needed).
      * @param potential Function returning how many times this action can be used.
      * @param macro Macro to execute this action in combat.
      * @param constraints Constraints required for this action to be available.
@@ -88,7 +88,7 @@ export class ActionSource {
             // Inconsistent constraints - no path forward here.
             return null;
         }
-        return new ActionSource(this.source, () => sum(actions, (action) => action.potential()), Macro.step(...actions.map((action) => action.macro)), constraints);
+        return new ActionSource([...actions.map((action) => action.source).flat()], () => sum(actions, (action) => action.potential()), Macro.step(...actions.map((action) => action.macro)), constraints);
     }
     /**
      * Perform all preparation necessary to make this action available.

package/dist/actions/FreeKill.js

@@ -3,9 +3,9 @@ import { Macro } from "../combat";
 import { have } from "../lib";
 import { Requirement } from "../maximize";
 import { get } from "../property";
+import * as AsdonMartin from "../resources/2017/AsdonMartin";
 import { $familiar, $item, $items, $skill } from "../template-string";
 import { ActionSource, findActionSource, } from "./ActionSource";
-import * as AsdonMartin from "../resources/2017/AsdonMartin";
 const freeKillSources = [
     // Free limited sources
     new ActionSource($skill `Gingerbread Mob Hit`, () => !get("_gingerbreadMobHitUsed") && have($skill `Gingerbread Mob Hit`)

package/dist/actions/FreeRun.js

@@ -3,11 +3,11 @@ import { Macro } from "../combat";
 import { ensureEffect, getFoldGroup, getSongCount, getSongLimit, have, } from "../lib";
 import { Requirement } from "../maximize";
 import { get } from "../property";
-import { $effect, $item, $items, $skill } from "../template-string";
-import { ActionSource, findActionSource, } from "./ActionSource";
 import * as Bandersnatch from "../resources/2009/Bandersnatch";
 import * as StompingBoots from "../resources/2011/StompingBoots";
 import * as AsdonMartin from "../resources/2017/AsdonMartin";
+import { $effect, $item, $items, $skill } from "../template-string";
+import { ActionSource, findActionSource, } from "./ActionSource";
 // Value of _lastCombatStarted the last time we updated scrapbook charges.
 let scrapbookChargesLastUpdated = get("_lastCombatStarted");
 // Free unlimited source every 30 turns.

package/dist/ascend.d.ts

@@ -1,3 +1,4 @@
+import { Class, Item } from "kolmafia";
 import { Path } from "./Path";
 import { Ceiling, Desk, Nightstand } from "./resources/2015/ChateauMantegna";
 export declare enum Lifestyle {

package/dist/ascend.js

@@ -1,6 +1,6 @@
-import { containsText, eudoraItem, getCampground, getWorkshed, toInt, toItem, use, visitUrl, xpath, } from "kolmafia";
-import { $item, $items, $stat } from "./template-string";
+import { containsText, eudoraItem, getCampground, getWorkshed, Item, toInt, toItem, use, visitUrl, xpath, } from "kolmafia";
 import { ChateauMantegna } from "./resources";
+import { $item, $items, $stat } from "./template-string";
 export var Lifestyle;
 (function (Lifestyle) {
     Lifestyle[Lifestyle["casual"] = 1] = "casual";

package/dist/challengePaths/2015/CommunityService.d.ts

@@ -56,9 +56,10 @@ declare class Test {
      * Wrapper function that prepares for a test and then completes it, adding time and turn details to the log.
      * @param prepare A function that does all necessary preparations for this CS test, including choosing your outfit.
      * @param beCertain Whether we should check council.php instead of mafia to determine whether the test is complete.
+     * @param maxTurns We will run the test iff the predicted turns is less than or equal to this parameter.
      * @returns The output of the prepare function given, or null if the test is already complete.
      */
-    run<T>(prepare: () => T, beCertain?: boolean): T | null;
+    run(prepare: () => void, beCertain?: boolean, maxTurns?: number): boolean;
     /**
      * Checks council.php to verify that a test is complete; more reliable than isDone, but requires an additional pagehit.
      * @returns Whether council.php suggests that the test is complete.
@@ -81,4 +82,5 @@ export declare const CoilWire: Test;
  * @param colour The colour (or color) you'd like the log to be printed in.
  */
 export declare function printLog(colour?: string): void;
+export declare const donate: () => void;
 export {};

package/dist/challengePaths/2015/CommunityService.js

@@ -1,10 +1,10 @@
-import { equippedItem, familiarWeight, getPower, haveEquipped, myBasestat, myBuffedstat, myClass, myFamiliar, myLevel, myMaxhp, myThrall, myTurncount, numericModifier, print, runChoice, toSlot, visitUrl, weightAdjustment, } from "kolmafia";
-import { get } from "../../property";
+import { equippedItem, familiarWeight, getPower, haveEquipped, myBasestat, myBuffedstat, myFamiliar, myLevel, myMaxhp, myThrall, myTurncount, numericModifier, print, runChoice, toSlot, visitUrl, weightAdjustment, } from "kolmafia";
+import { have } from "../../lib";
 import { Requirement } from "../../maximize";
-import { $class, $effect, $familiar, $item, $items, $slot, $stat, $thrall, } from "../../template-string";
 import { get as getModifier } from "../../modifier";
-import { have } from "../../lib";
-import { SongBoom } from "../../resources";
+import { get } from "../../property";
+import { MummingTrunk, SongBoom } from "../../resources";
+import { $effect, $familiar, $item, $items, $slot, $stat, $thrall, } from "../../template-string";
 import { sum } from "../../utils";
 /**
  * A log of the predicted turns, actual turns, and duration of each CS test performed.
@@ -79,29 +79,34 @@ class Test {
      * Wrapper function that prepares for a test and then completes it, adding time and turn details to the log.
      * @param prepare A function that does all necessary preparations for this CS test, including choosing your outfit.
      * @param beCertain Whether we should check council.php instead of mafia to determine whether the test is complete.
+     * @param maxTurns We will run the test iff the predicted turns is less than or equal to this parameter.
      * @returns The output of the prepare function given, or null if the test is already complete.
      */
-    run(prepare, beCertain = false) {
-        const finishedFunction = beCertain ? this.verifyIsDone : this.isDone;
+    run(prepare, beCertain = false, maxTurns = Infinity) {
+        const finishedFunction = () => beCertain ? this.verifyIsDone() : this.isDone();
         if (finishedFunction())
-            return null;
+            return false;
         const startTime = Date.now();
         const startTurns = myTurncount();
         try {
-            return prepare();
+            prepare();
+        }
+        catch {
+            return false;
         }
-        finally {
-            const prediction = this.predictor();
+        const prediction = this.predictor();
+        if (prediction <= maxTurns) {
             this.do();
-            const loggedTest = {
+        }
+        if (finishedFunction()) {
+            log[this.property] = {
                 predictedTurns: prediction,
                 turnCost: myTurncount() - startTurns,
                 seconds: (Date.now() - startTime) / 1000,
             };
-            if (finishedFunction()) {
-                log[this.property] = loggedTest;
-            }
+            return true;
         }
+        return false;
     }
     /**
      * Checks council.php to verify that a test is complete; more reliable than isDone, but requires an additional pagehit.
@@ -116,13 +121,10 @@ const thralls = new Map([
     [$stat `moxie`, $thrall `Penne Dreadful`],
 ]);
 const statTestPredictor = (stat) => {
-    let baseStat = stat;
-    if (myClass() === $class `Pastamancer`) {
-        const thrall = thralls.get(stat);
-        if (thrall && myThrall() === thrall)
-            baseStat = $stat `mysticality`;
-    }
-    return () => 60 - Math.floor((1 / 30) * (myBuffedstat(stat) - myBasestat(baseStat)));
+    return () => 60 -
+        Math.floor((1 / 30) *
+            (myBuffedstat(stat) -
+                myBasestat(thralls.get(myThrall()) === stat ? $stat `mysticality` : stat)));
 };
 export const HP = new Test(1, "Donate Blood", () => 60 - Math.floor((myMaxhp() - myBuffedstat($stat `muscle`) - 3) / 30), new Requirement(["HP"], {}));
 export const Muscle = new Test(2, "Feed The Children", statTestPredictor($stat `Muscle`), new Requirement(["Muscle"], {}));
@@ -140,6 +142,7 @@ export const WeaponDamage = new Test(6, "Reduce Gazelle Population", () => {
     const songDamage = SongBoom.song() === "These Fists Were Made for Punchin'" ? myLevel() : 0;
     // mafia does not currently count swagger
     const multiplier = have($effect `Bow-Legged Swagger`) ? 2 : 1;
+    // We add 0.001 because the floor function sometimes introduces weird rounding errors
     return (60 -
         Math.floor((multiplier *
             (getModifier("Weapon Damage") -
@@ -153,6 +156,7 @@ export const SpellDamage = new Test(7, "Make Sausage", () => {
     const dragonfishDamage = myFamiliar() === $familiar `Magic Dragonfish`
         ? numericModifier($familiar `Magic Dragonfish`, "Spell Damage Percent", familiarWeight($familiar `Magic Dragonfish`) + weightAdjustment(), $item `none`)
         : 0;
+    // We add 0.001 because the floor function sometimes introduces weird rounding errors
     return (60 -
         Math.floor(getModifier("Spell Damage") / 50 + 0.001) -
         Math.floor((getModifier("Spell Damage Percent") - dragonfishDamage) / 50 + 0.001));
@@ -163,16 +167,24 @@ export const Noncombat = new Test(8, "Be a Living Statue", () => {
     return 60 - 3 * Math.floor(unsoftcappedRate / 5);
 }, new Requirement(["-combat"], {}));
 export const BoozeDrop = new Test(9, "Make Margaritas", () => {
-    const familiarItemDrop = numericModifier(myFamiliar(), "Item Drop", familiarWeight(myFamiliar()) + weightAdjustment(), equippedItem($slot `familiar`));
+    const mummingCostume = MummingTrunk.currentCostumes().get(myFamiliar());
+    const mummingBuff = mummingCostume && mummingCostume[0] === "Item Drop"
+        ? mummingCostume[1]
+        : 0;
+    const familiarItemDrop = numericModifier(myFamiliar(), "Item Drop", familiarWeight(myFamiliar()) + weightAdjustment(), equippedItem($slot `familiar`)) +
+        mummingBuff -
+        numericModifier(equippedItem($slot `familiar`), "Item Drop");
+    const familiarBoozeDrop = numericModifier(myFamiliar(), "Booze Drop", familiarWeight(myFamiliar()) + weightAdjustment(), equippedItem($slot `familiar`)) - numericModifier(equippedItem($slot `familiar`), "Booze Drop");
     //Champagne doubling does NOT count for CS, so we undouble
     const multiplier = haveEquipped($item `broken champagne bottle`) &&
         get("garbageChampagneCharge") > 0
         ? 0.5
         : 1;
+    // We add 0.001 because the floor function sometimes introduces weird rounding errors
     return (60 -
         multiplier *
             Math.floor((getModifier("Item Drop") - familiarItemDrop) / 30 + 0.001) -
-        Math.floor(getModifier("Booze Drop") / 15 + 0.001));
+        Math.floor((getModifier("Booze Drop") - familiarBoozeDrop) / 15 + 0.001));
 }, new Requirement(["Item Drop", "2 Booze Drop"], {
     preventEquip: $items `broken champagne bottle`,
 }));
@@ -191,3 +203,7 @@ export function printLog(colour = "blue") {
     }
     print(`All together, you have spent ${sum(logEntries, ([, testEntry]) => testEntry.seconds)} seconds during this Community Service run`, colour);
 }
+export const donate = () => {
+    visitUrl("council.php");
+    runChoice(30);
+};

package/dist/combat.d.ts

@@ -1,5 +1,6 @@
+import { Class, Effect, Item, Location, Monster, Skill, Stat } from "kolmafia";
 /**
- * Get the KoL native ID of the macro with name Script Autoattack Macro.
+ * Get the KoL native ID of the macro with name name.
  *
  * @category Combat
  * @returns {number} The macro ID.

package/dist/combat.js

@@ -1,10 +1,10 @@
-import { adv1, choiceFollowsFight, getAutoAttack, inMultiFight, removeProperty, runCombat, setAutoAttack, toInt, urlEncode, visitUrl, xpath, } from "kolmafia";
-import { $items, $skills } from "./template-string";
-import { get, set } from "./property";
+import { adv1, choiceFollowsFight, Class, Effect, getAutoAttack, inMultiFight, Item, Location, Monster, removeProperty, runCombat, setAutoAttack, Skill, Stat, toInt, urlEncode, visitUrl, xpath, } from "kolmafia";
 import { getTodaysHolidayWanderers } from "./lib";
+import { get, set } from "./property";
+import { $items, $skills } from "./template-string";
 const MACRO_NAME = "Script Autoattack Macro";
 /**
- * Get the KoL native ID of the macro with name Script Autoattack Macro.
+ * Get the KoL native ID of the macro with name name.
  *
  * @category Combat
  * @returns {number} The macro ID.
@@ -141,9 +141,10 @@ export class Macro {
      */
     setAutoAttack() {
         let id = Macro.cachedMacroIds.get(this.name);
-        if (id === undefined)
-            Macro.cachedMacroIds.set(this.name, getMacroId(this.name));
-        id = getMacroId(this.name);
+        if (id === undefined) {
+            id = getMacroId(this.name);
+            Macro.cachedMacroIds.set(this.name, id);
+        }
         if (getAutoAttack() === 99000000 + id &&
             this.toString() === Macro.cachedAutoAttacks.get(this.name)) {
             // This macro is already set. Don"t make the server request.

package/dist/diet/index.d.ts

@@ -1,3 +1,4 @@
+import { Effect, Item } from "kolmafia";
 declare type RawDietEntry<T> = [MenuItem<T>[], number];
 declare type RawDiet<T> = RawDietEntry<T>[];
 declare type MenuItemOptions<T> = {

package/dist/diet/index.js

@@ -1,11 +1,11 @@
 import { canEquip, fullnessLimit, historicalAge, historicalPrice, inebrietyLimit, itemType, mallPrice, mallPrices, myFullness, myInebriety, myLevel, myPrimestat, mySpleenUse, npcPrice, spleenLimit, } from "kolmafia";
-import { knapsack } from "./knapsack";
 import { have } from "../lib";
 import { get as getModifier } from "../modifier";
 import { get } from "../property";
+import { Mayo, installed as mayoInstalled } from "../resources/2015/MayoClinic";
 import { $effect, $item, $items, $skill, $stat } from "../template-string";
 import { sum, sumNumbers } from "../utils";
-import { Mayo, installed as mayoInstalled } from "../resources/2015/MayoClinic";
+import { knapsack } from "./knapsack";
 function isMonday() {
     // Checking Tuesday's ruby is a hack to see if it's Monday in Arizona.
     return getModifier("Muscle Percent", $item `Tuesday's ruby`) > 0;

package/dist/dungeons/Dreadsylvania.d.ts

@@ -1,3 +1,4 @@
+import { Item } from "kolmafia";
 export declare function close(): boolean;
 export declare function open(paymentPolicy?: "None" | "All" | "Difference"): boolean;
 export declare function distribute(idOrName?: number | string, loot?: Item | Item[] | Map<Item, number>, distributeAllOfAGivenItem?: boolean): void;

package/dist/dungeons/Dungeon.d.ts

@@ -1,3 +1,4 @@
+import { Item } from "kolmafia";
 export declare type Dungeon = {
     name: string;
     loot: Item[];

package/dist/dungeons/Dungeon.js

@@ -1,7 +1,7 @@
 import { getClanName, myId, toItem, visitUrl, xpath } from "kolmafia";
-import { $items } from "../template-string";
 import { Clan } from "../Clan";
 import { getPlayerFromIdOrName } from "../lib";
+import { $items } from "../template-string";
 import { countedMapToArray } from "../utils";
 /**
  * Distributes loot from given dungeon

package/dist/dungeons/Hobopolis.d.ts

@@ -1,3 +1,4 @@
+import { Item } from "kolmafia";
 export declare function close(): boolean;
 export declare function open(paymentPolicy?: "None" | "All" | "Difference"): boolean;
 export declare function distribute(idOrName?: number | string, loot?: Item | Item[] | Map<Item, number>, distributeAllOfAGivenItem?: boolean): void;

package/dist/dungeons/SlimeTube.d.ts

@@ -1,3 +1,4 @@
+import { Item } from "kolmafia";
 export declare function close(): boolean;
 export declare function open(paymentPolicy?: "None" | "All" | "Difference"): boolean;
 export declare function distribute(idOrName?: number | string, loot?: Item | Item[] | Map<Item, number>, distributeAllOfAGivenItem?: boolean): void;

package/dist/index.d.ts

@@ -8,6 +8,7 @@ export * from "./diet";
 export * from "./lib";
 export * from "./maximize";
 export * from "./mood";
+export * from "./propertyTyping";
 export * from "./resources";
 export * from "./since";
 export * from "./template-string";
@@ -16,6 +17,7 @@ export * from "./Path";
 export { default as logger, LogLevel } from "./logger";
 export * as console from "./console";
 export * as property from "./property";
+export * as propertyTypes from "./propertyTypes";
 export * from "./utils";
 export { get, PropertiesManager, set, setProperties, withProperties, withProperty, withChoices, withChoice, } from "./property";
 export { get as getModifier } from "./modifier";

package/dist/index.js

@@ -8,6 +8,7 @@ export * from "./diet";
 export * from "./lib";
 export * from "./maximize";
 export * from "./mood";
+export * from "./propertyTyping";
 export * from "./resources";
 export * from "./since";
 export * from "./template-string";
@@ -16,6 +17,7 @@ export * from "./Path";
 export { default as logger } from "./logger";
 export * as console from "./console";
 export * as property from "./property";
+export * as propertyTypes from "./propertyTypes";
 export * from "./utils";
 export { get, PropertiesManager, set, setProperties, withProperties, withProperty, withChoices, withChoice, } from "./property";
 export { get as getModifier } from "./modifier";

package/dist/lib.d.ts

@@ -1,6 +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";
 /**
  * Returns the current maximum Accordion Thief songs the player can have in their head
  *

package/dist/lib.js

@@ -1,9 +1,9 @@
 /** @module GeneralLibrary */
 import "core-js/modules/es.object.entries";
 import "core-js/features/array/flat";
-import { appearanceRates, autosellPrice, availableAmount, booleanModifier, cliExecute, fullnessLimit, getCampground, getCounters, getPlayerId, getPlayerName, getRelated, haveEffect, haveFamiliar, haveServant, haveSkill, holiday, inebrietyLimit, mallPrice, myEffects, myFamiliar, myFullness, myInebriety, myPath, mySpleenUse, myThrall, myTurncount, numericModifier, spleenLimit, toItem, toSkill, totalTurnsPlayed, } from "kolmafia";
-import { $class, $familiar, $item, $items, $monsters } from "./template-string";
+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 { get } from "./property";
+import { $class, $familiar, $item, $items, $monsters } from "./template-string";
 import { chunk } from "./utils";
 /**
  * Returns the current maximum Accordion Thief songs the player can have in their head

package/dist/maximize.d.ts

@@ -1,3 +1,4 @@
+import { Item, Slot } from "kolmafia";
 export declare type MaximizeOptions = {
     updateOnFamiliarChange: boolean;
     updateOnCanEquipChanged: boolean;

package/dist/maximize.js

@@ -1,6 +1,6 @@
-import { availableAmount, bjornifyFamiliar, canEquip, cliExecute, enthroneFamiliar, equip, equippedAmount, equippedItem, isWearingOutfit, maximize, myBasestat, myBjornedFamiliar, myEnthronedFamiliar, myFamiliar, outfit, } from "kolmafia";
-import { $familiar, $item, $slot, $slots, $stats } from "./template-string";
+import { availableAmount, bjornifyFamiliar, canEquip, cliExecute, enthroneFamiliar, equip, equippedAmount, equippedItem, 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";
 /**
  * Merges a Partial<MaximizeOptions> onto a MaximizeOptions. We merge via overriding for all boolean properties and for onlySlot, and concat all other array properties.

package/dist/modifier.d.ts

@@ -1,4 +1,5 @@
 import "core-js/modules/es.object.values";
+import { Class, Effect, Familiar, Item, Monster, Skill, Stat } from "kolmafia";
 import { BooleanModifier, ClassModifier, EffectModifier, MonsterModifier, NumericModifier, SkillModifier, StatModifier, StringModifier } from "./modifierTypes";
 export declare function get(name: BooleanModifier, subject?: string | Item | Effect): boolean;
 export declare function get(name: ClassModifier, subject: string | Item): Class;

package/dist/modifier.js

@@ -1,7 +1,7 @@
 import "core-js/modules/es.object.values";
 import { booleanModifier, classModifier, effectModifier, monsterModifier, numericModifier, skillModifier, statModifier, stringModifier, } from "kolmafia";
-import { arrayContains } from "./utils";
 import { booleanModifiers, classModifiers, effectModifiers, monsterModifiers, numericModifiers, skillModifiers, statModifiers, stringModifiers, } from "./modifierTypes";
+import { arrayContains } from "./utils";
 export function get(name, subject) {
     if (arrayContains(name, booleanModifiers)) {
         return subject === undefined

package/dist/mood.d.ts

@@ -1,4 +1,5 @@
 import "core-js/modules/es.object.values";
+import { Effect, Item, Skill } from "kolmafia";
 export declare abstract class MpSource {
     usesRemaining(): number | null;
     abstract availableMpMin(): number;

package/dist/mood.js

@@ -131,7 +131,7 @@ class PotionMoodElement extends MoodElement {
         if (mallPrice(this.potion) > this.maxPricePerTurn * turnsPerUse) {
             return false;
         }
-        //integer part
+        // integer part
         if (effectTurns < ensureTurns) {
             const uses = Math.floor((ensureTurns - effectTurns) / turnsPerUse);
             const quantityToBuy = clamp(uses - availableAmount(this.potion), 0, 100);
@@ -139,13 +139,12 @@ class PotionMoodElement extends MoodElement {
             const quantityToUse = clamp(uses, 0, availableAmount(this.potion));
             use(quantityToUse, this.potion);
         }
-        //fractional part
+        // fractional part
         const remainingDifference = ensureTurns - haveEffect(effect);
         if (remainingDifference > 0) {
-            const price = this.maxPricePerTurn * remainingDifference;
-            if (price <= mallPrice(this.potion)) {
-                if (availableAmount(this.potion) ||
-                    buy(1, this.potion, Math.floor(price))) {
+            const price = Math.floor(this.maxPricePerTurn * remainingDifference);
+            if (price >= mallPrice(this.potion)) {
+                if (availableAmount(this.potion) || buy(1, this.potion, price)) {
                     use(1, this.potion);
                 }
             }
@@ -193,12 +192,14 @@ class CustomMoodElement extends MoodElement {
 }
 class AsdonMoodElement extends MoodElement {
     effect;
-    constructor(effect) {
+    preferInventory;
+    constructor(effect, preferInventory = false) {
         super();
         this.effect = effect;
+        this.preferInventory = preferInventory;
     }
     execute(mood, ensureTurns) {
-        return AsdonMartin.drive(this.effect, ensureTurns);
+        return AsdonMartin.drive(this.effect, ensureTurns, this.preferInventory);
     }
 }
 /**

package/dist/property.d.ts

@@ -1,46 +1,79 @@
 import "core-js/modules/es.object.entries";
 import "core-js/modules/es.object.from-entries";
-import { KnownProperty, PropertyValue } from "./propertyTyping";
-import { NumericProperty } from "./propertyTypes";
+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";
+import { KnownProperty } from "./propertyTyping";
 export declare const getString: (property: string, default_?: string | undefined) => string;
 export declare const getCommaSeparated: (property: string, default_?: string[] | undefined) => string[];
 export declare const getBoolean: (property: string, default_?: boolean | undefined) => boolean;
 export declare const getNumber: (property: string, default_?: number | undefined) => number;
-export declare const getBounty: (property: string, default_?: Bounty | null | undefined) => Bounty | null;
-export declare const getClass: (property: string, default_?: Class | null | undefined) => Class | null;
-export declare const getCoinmaster: (property: string, default_?: Coinmaster | null | undefined) => Coinmaster | null;
-export declare const getEffect: (property: string, default_?: Effect | null | undefined) => Effect | null;
-export declare const getElement: (property: string, default_?: Element | null | undefined) => Element | null;
-export declare const getFamiliar: (property: string, default_?: Familiar | null | undefined) => Familiar | null;
-export declare const getItem: (property: string, default_?: Item | null | undefined) => Item | null;
-export declare const getLocation: (property: string, default_?: Location | null | undefined) => Location | null;
-export declare const getMonster: (property: string, default_?: Monster | null | undefined) => Monster | null;
-export declare const getPhylum: (property: string, default_?: Phylum | null | undefined) => Phylum | null;
-export declare const getServant: (property: string, default_?: Servant | null | undefined) => Servant | null;
-export declare const getSkill: (property: string, default_?: Skill | null | undefined) => Skill | null;
-export declare const getSlot: (property: string, default_?: Slot | null | undefined) => Slot | null;
-export declare const getStat: (property: string, default_?: Stat | null | undefined) => Stat | null;
-export declare const getThrall: (property: string, default_?: Thrall | null | undefined) => Thrall | null;
+export declare const getBounty: (property: string, default_?: Bounty | undefined) => Bounty | null;
+export declare const getClass: (property: string, default_?: Class | undefined) => Class | null;
+export declare const getCoinmaster: (property: string, default_?: Coinmaster | undefined) => Coinmaster | null;
+export declare const getEffect: (property: string, default_?: Effect | undefined) => Effect | null;
+export declare const getElement: (property: string, default_?: Element | undefined) => Element | null;
+export declare const getFamiliar: (property: string, default_?: Familiar | undefined) => Familiar | null;
+export declare const getItem: (property: string, default_?: Item | undefined) => Item | null;
+export declare const getLocation: (property: string, default_?: Location | undefined) => Location | null;
+export declare const getMonster: (property: string, default_?: Monster | undefined) => Monster | null;
+export declare const getPhylum: (property: string, default_?: Phylum | undefined) => Phylum | null;
+export declare const getServant: (property: string, default_?: Servant | undefined) => Servant | null;
+export declare const getSkill: (property: string, default_?: Skill | undefined) => Skill | null;
+export declare const getSlot: (property: string, default_?: Slot | undefined) => Slot | null;
+export declare const getStat: (property: string, default_?: Stat | undefined) => Stat | null;
+export declare const getThrall: (property: string, default_?: Thrall | undefined) => Thrall | null;
 /**
  * Returns the value of a mafia property, either built in or custom
  * @param property Name of the property
  * @param _default Default value for the property to take if not set
  */
-export declare function get<_D, P extends KnownProperty>(property: P, _default?: PropertyValue<P>): PropertyValue<P>;
-export declare function get<D = string | boolean | number, P extends string = string>(property: P, _default?: D): PropertyValue<P, D>;
+export declare function get(property: BooleanProperty): boolean;
+export declare function get(property: BooleanProperty, _default: boolean): boolean;
+export declare function get(property: NumericProperty): number;
+export declare function get(property: NumericProperty, _default: number): number;
+export declare function get(property: NumericOrStringProperty): number | string;
+export declare function get(property: NumericOrStringProperty, _default: number | string): number | string;
+export declare function get(property: StringProperty): string;
+export declare function get(property: StringProperty, _default: string): string;
+export declare function get(property: LocationProperty): Location | null;
+export declare function get(property: LocationProperty, _default: Location): Location;
+export declare function get(property: MonsterProperty): Monster | null;
+export declare function get(property: MonsterProperty, _default: Monster): Monster;
+export declare function get(property: FamiliarProperty): Familiar | null;
+export declare function get(property: FamiliarProperty, _default: Familiar): Familiar;
+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: string, _default: boolean): boolean;
+export declare function get(property: string, _default: number): number;
+export declare function get(property: string, _default?: string): string;
 /**
  * Sets the value of a mafia property, either built in or custom
  * @param property Name of the property
  * @param value Value to give the property
  */
-export declare function set<P extends KnownProperty>(property: P, value: PropertyValue<P>): void;
-export declare function set<P extends string>(property: P, value: PropertyValue<P>): void;
+export declare function set(property: BooleanProperty, value: boolean): void;
+export declare function set(property: NumericProperty, value: number): void;
+export declare function set(property: NumericOrStringProperty, value: number | string): void;
+export declare function set(property: StringProperty, value: string): void;
+export declare function set(property: LocationProperty, value: Location): void;
+export declare function set(property: MonsterProperty, value: Monster): void;
+export declare function set(property: FamiliarProperty, value: Familiar): void;
+export declare function set(property: StatProperty, value: Stat): void;
+export declare function set(property: PhylumProperty, value: Phylum): void;
+export declare function set<D extends {
+    toString(): string;
+}>(property: string, value: D): void;
 declare type Properties = Partial<{
-    [P in KnownProperty]: PropertyValue<P>;
+    [P in KnownProperty]: unknown;
 }>;
 export declare function setProperties(properties: Properties): void;
 export declare function withProperties(properties: Properties, callback: () => void): void;
-export declare function withProperty<P extends KnownProperty>(property: P, value: PropertyValue<P>, callback: () => void): void;
+export declare function withProperty<P extends KnownProperty>(property: P, value: unknown, callback: () => void): void;
 export declare function withChoices(choices: {
     [choice: number]: number | string;
 }, callback: () => void): void;