libram 0.6.4 → 0.6.5

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.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 { 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 { get } from "../../property";
 import { SongBoom } from "../../resources";
+import { $class, $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.
@@ -82,7 +82,7 @@ class Test {
      * @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;
+        const finishedFunction = () => beCertain ? this.verifyIsDone() : this.isDone();
         if (finishedFunction())
             return null;
         const startTime = Date.now();

package/dist/combat.d.ts

@@ -1,3 +1,4 @@
+import { Class, Effect, Item, Location, Monster, Skill, Stat } from "kolmafia";
 /**
  * Get the KoL native ID of the macro with name name.
  *

package/dist/combat.js

@@ -1,7 +1,7 @@
-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 name.

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);
                 }
             }

package/dist/property.d.ts

@@ -1,7 +1,8 @@
 import "core-js/modules/es.object.entries";
 import "core-js/modules/es.object.from-entries";
-import { KnownProperty } from "./propertyTyping";
+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;
@@ -44,8 +45,12 @@ 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<D extends string | number | boolean>(property: string, _default: D): D;
-export declare function get(property: string): string;
+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

package/dist/property.js

@@ -1,6 +1,6 @@
 import "core-js/modules/es.object.entries";
 import "core-js/modules/es.object.from-entries";
-import { getProperty, setProperty, toBounty, toClass, toCoinmaster, toEffect, toElement, toFamiliar, toItem, toLocation, toMonster, toPhylum, toServant, toSkill, toSlot, toStat, toThrall, } from "kolmafia";
+import { Bounty, Class, Coinmaster, Effect, Element, Familiar, getProperty, Item, Location, Monster, Phylum, 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";
 const createPropertyGetter = (transform) => (property, default_) => {
     const value = getProperty(property);
@@ -80,6 +80,12 @@ export function get(property, _default) {
     else if (_default instanceof Phylum) {
         return getPhylum(property, _default);
     }
+    else if (typeof _default === "boolean") {
+        return value === "true" ? true : value === "false" ? false : _default;
+    }
+    else if (typeof _default === "number") {
+        return value === "" ? _default : parseInt(value);
+    }
     else if (value === "") {
         return _default === undefined ? "" : _default;
     }