libram 0.6.4 → 0.6.7

package/dist/Clan.d.ts

@@ -1,12 +1,9 @@
+import { Item, Monster } from "kolmafia";
 export interface Rank {
     name: string;
     degree: number;
     id: number;
 }
-export declare class ClanError extends Error {
-    reason?: Error;
-    constructor(message: string, reason?: Error);
-}
 export declare class Clan {
     readonly id: number;
     readonly name: string;
@@ -42,6 +39,7 @@ export declare class Clan {
      */
     static getWhitelisted(): Clan[];
     private constructor();
+    private _check;
     /**
      * Join clan
      */

package/dist/Clan.js

@@ -1,39 +1,7 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    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";
-export class ClanError extends Error {
-    reason;
-    constructor(message, reason) {
-        super(message);
-        this.reason = reason;
-        Object.setPrototypeOf(this, ClanError.prototype);
-    }
-}
-// It would be fantastic to have this function properly typed
-// But until someone can work out how to do it, it gets the
-// comment blocks of shame
-/* eslint-disable */
-function validate(target, propertyName, descriptor) {
-    if (!descriptor?.value)
-        return;
-    const method = descriptor.value;
-    // @ts-ignore
-    descriptor.value = function (...args) {
-        // @ts-ignore
-        if (this.id !== getClanId()) {
-            throw new Error("You are no longer a member of this clan");
-        }
-        return method.apply(this, args);
-    };
-}
-/* eslint-enable */
 const clanIdCache = {};
 const toPlayerId = (player) => typeof player === "string" ? getPlayerId(player) : player;
 const LOG_FAX_PATTERN = /(\d{2}\/\d{2}\/\d{2}, \d{2}:\d{2}(?:AM|PM): )<a [^>]+>([^<]+)<\/a>(?: faxed in a (?<monster>.*?))<br>/;
@@ -146,6 +114,11 @@ export class Clan {
         this.id = id;
         this.name = name;
     }
+    _check() {
+        if (this.id !== getClanId()) {
+            throw new Error("You are no longer a member of this clan");
+        }
+    }
     /**
      * Join clan
      */
@@ -159,6 +132,7 @@ export class Clan {
      * Return the monster that is currently in the current clan's fax machine if any
      */
     getCurrentFax() {
+        this._check();
         const logs = visitUrl("clan_log.php");
         const lastFax = logs.match(LOG_FAX_PATTERN);
         if (!lastFax)
@@ -172,6 +146,7 @@ export class Clan {
      * List available ranks (name, degree and id) from the current clan
      */
     getRanks() {
+        this._check();
         const page = visitUrl("clan_whitelist.php");
         return xpath(page, '//select[@name="level"]//option')
             .map((option) => {
@@ -197,6 +172,7 @@ export class Clan {
      * @param title Title to give the player. If not provided, will be blank
      */
     addPlayerToWhitelist(player, rankName, title = "") {
+        this._check();
         const playerId = toPlayerId(player);
         const ranks = this.getRanks();
         const rank = rankName
@@ -213,6 +189,7 @@ export class Clan {
      * @param player Player id or name
      */
     removePlayerFromWhitelist(player) {
+        this._check();
         const playerId = toPlayerId(player);
         const result = visitUrl(`clan_whitelist.php?action=updatewl&pwd&who=${playerId}&remove=Remove`);
         return result.includes("Whitelist updated.");
@@ -221,6 +198,7 @@ export class Clan {
      * Return the amount of meat in the current clan's coffer.
      */
     getMeatInCoffer() {
+        this._check();
         const page = visitUrl("clan_stash.php");
         const [, meat] = page.match(/Your <b>Clan Coffer<\/b> contains ([\d,]+) Meat./) || ["0", "0"];
         return parseNumber(meat);
@@ -230,10 +208,12 @@ export class Clan {
      * @param amount Amount of meat to put in coffer
      */
     putMeatInCoffer(amount) {
+        this._check();
         const result = visitUrl(`clan_stash.php?pwd&action=contribute&howmuch=${amount}`);
         return result.includes("You contributed");
     }
     take(items) {
+        this._check();
         const map = arrayToCountedMap(items);
         map.forEach((quantity, item) => {
             let needed = Math.max(0, quantity - availableAmount(item));
@@ -271,6 +251,7 @@ export class Clan {
         return Array.isArray(items) ? countedMapToArray(map) : map;
     }
     put(items) {
+        this._check();
         const map = arrayToCountedMap(items);
         if (!this.check())
             throw new Error(`Wanted to return ${countedMapToString(map)} to ${this.name} but KoLmafia's clan data is out of sync`);
@@ -284,34 +265,8 @@ export class Clan {
     }
     withStash(items, callback // eslint-disable-line @typescript-eslint/no-explicit-any
     ) {
+        this._check();
         const map = arrayToCountedMap(items);
         return Clan._withStash(() => this.take(map), (borrowed) => this.put(borrowed), callback);
     }
 }
-__decorate([
-    validate
-], Clan.prototype, "getCurrentFax", null);
-__decorate([
-    validate
-], Clan.prototype, "getRanks", null);
-__decorate([
-    validate
-], Clan.prototype, "addPlayerToWhitelist", null);
-__decorate([
-    validate
-], Clan.prototype, "removePlayerFromWhitelist", null);
-__decorate([
-    validate
-], Clan.prototype, "getMeatInCoffer", null);
-__decorate([
-    validate
-], Clan.prototype, "putMeatInCoffer", null);
-__decorate([
-    validate
-], Clan.prototype, "take", null);
-__decorate([
-    validate
-], Clan.prototype, "put", null);
-__decorate([
-    validate
-], Clan.prototype, "withStash", null);

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;
@@ -40,9 +40,7 @@ export default class Kmail {
     }
     static _genericSend(to, message, items, meat, chunkSize, constructUrl, successString) {
         let m = meat;
-        const sendableItems = [
-            ...arrayToCountedMap(items).entries(),
-        ].filter(([item]) => isGiftable(item));
+        const sendableItems = [...arrayToCountedMap(items).entries()].filter(([item]) => isGiftable(item));
         let result = true;
         const chunks = chunk(sendableItems, chunkSize);
         // Split the items to be sent into chunks of max 11 item types

package/dist/Path.d.ts

@@ -1,3 +1,4 @@
+import { Class } from "kolmafia";
 export declare class Path {
     name: string;
     id: number;
@@ -64,4 +65,5 @@ export declare const Paths: {
     readonly YouRobot: Path;
     readonly QuantumTerrarium: Path;
     readonly Wildfire: Path;
+    readonly GreyYou: Path;
 };

package/dist/Path.js

@@ -75,4 +75,6 @@ export const Paths = {
     YouRobot: new Path("You, Robot", 41, false, false, true, 0, 0, 0),
     QuantumTerrarium: new Path("Quantum Terrarium", 42, true, true, false),
     Wildfire: new Path("Wildfire", 43),
+    GreyYou: new Path("Grey You", 44, false, true, true, 0, 0, 0, // eslint-disable-next-line libram/verify-constants
+    $classes `Grey Goo`),
 };

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 {
@@ -27,10 +28,10 @@ declare type Eudora = typeof eudorae[number];
  * Sets up various iotms you may want to use in the coming ascension
  * @param ascensionItems.workshed Workshed to switch to.
  * @param ascensionItems.garden Garden to switch to.
- * @param ascensionItems An object potentially containing your workshed, garden, and eudora, all as items
+ * @param ascensionItems An object potentially containing your workshed, garden, chateau, and eudora, all as strings
  * @param throwOnFail If true, this will throw an error when it fails to switch something
  */
-export declare function prepareAscension({ workshed, garden, eudora, chateau, }?: {
+export declare function prepareAscension({ workshed, garden, eudora, chateau, throwOnFail, }?: {
     workshed?: Workshed;
     garden?: Garden;
     eudora?: Eudora;
@@ -39,5 +40,6 @@ export declare function prepareAscension({ workshed, garden, eudora, chateau, }?
         ceiling?: Ceiling;
         nightstand?: Nightstand;
     };
+    throwOnFail?: boolean;
 }): void;
 export {};

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, 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";
@@ -135,45 +135,51 @@ const eudorae = [
  * Sets up various iotms you may want to use in the coming ascension
  * @param ascensionItems.workshed Workshed to switch to.
  * @param ascensionItems.garden Garden to switch to.
- * @param ascensionItems An object potentially containing your workshed, garden, and eudora, all as items
+ * @param ascensionItems An object potentially containing your workshed, garden, chateau, and eudora, all as strings
  * @param throwOnFail If true, this will throw an error when it fails to switch something
  */
-export function prepareAscension({ workshed, garden, eudora, chateau, } = {}) {
-    if (workshed && getWorkshed() !== toItem(workshed)) {
+export function prepareAscension({ workshed, garden, eudora, chateau, throwOnFail, } = {}) {
+    throwOnFail = throwOnFail ?? true;
+    if (workshed && getWorkshed() !== Item.get(workshed)) {
         use(Item.get(workshed));
+        if (getWorkshed().name !== workshed && throwOnFail) {
+            throw new Error(`Failed to switch workshed to ${workshed}; it is currently still ${getWorkshed()}.`);
+        }
     }
     if (garden && !Object.getOwnPropertyNames(getCampground()).includes(garden)) {
         use(Item.get(garden));
-        if (!Object.getOwnPropertyNames(getCampground()).includes(garden)) {
+        if (!Object.getOwnPropertyNames(getCampground()).includes(garden) &&
+            throwOnFail) {
             throw new Error(`We really thought we changed your garden to a ${garden}, but Mafia is saying otherwise.`);
         }
     }
     if (eudora && eudoraItem().name !== eudora) {
         const eudoraNumber = 1 + eudorae.indexOf(eudora);
-        if (!xpath(visitUrl("account.php?tab=correspondence"), `//select[@name="whichpenpal"]/option/@value`).includes(eudoraNumber.toString())) {
+        if (!xpath(visitUrl("account.php?tab=correspondence"), `//select[@name="whichpenpal"]/option/@value`).includes(eudoraNumber.toString()) &&
+            throwOnFail) {
             throw new Error(`I'm sorry buddy, but you don't seem to be subscribed to ${eudora}. Which makes it REALLY hard to correspond with them.`);
         }
         else {
             visitUrl(`account.php?actions[]=whichpenpal&whichpenpal=${eudoraNumber}&action=Update`, true);
         }
-        if (eudoraItem() !== toItem(eudora)) {
+        if (eudoraItem() !== Item.get(eudora) && throwOnFail) {
             throw new Error(`We really thought we changed your eudora to a ${eudora}, but Mafia is saying otherwise.`);
         }
     }
     if (chateau && ChateauMantegna.have()) {
         const { desk, ceiling, nightstand } = chateau;
         if (ceiling && ChateauMantegna.getCeiling() !== ceiling) {
-            if (!ChateauMantegna.changeCeiling(ceiling)) {
+            if (!ChateauMantegna.changeCeiling(ceiling) && throwOnFail) {
                 throw new Error(`We tried, but were unable to change your chateau ceiling to ${ceiling}. Probably.`);
             }
         }
         if (desk && ChateauMantegna.getDesk() !== desk) {
-            if (!ChateauMantegna.changeDesk(desk)) {
+            if (!ChateauMantegna.changeDesk(desk) && throwOnFail) {
                 throw new Error(`We tried, but were unable to change your chateau desk to ${desk}. Probably.`);
             }
         }
         if (nightstand && ChateauMantegna.getNightstand() !== nightstand) {
-            if (!ChateauMantegna.changeNightstand(nightstand)) {
+            if (!ChateauMantegna.changeNightstand(nightstand) && throwOnFail) {
                 throw new Error(`We tried, but were unable to change your chateau nightstand to ${nightstand}. Probably.`);
             }
         }

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.

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();
         }
-        finally {
-            const prediction = this.predictor();
+        catch {
+            return false;
+        }
+        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(stat) === myThrall() ? $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`,
 }));
@@ -193,5 +205,5 @@ export function printLog(colour = "blue") {
 }
 export const donate = () => {
     visitUrl("council.php");
-    runChoice(30);
+    visitUrl("choice.php?whichchoice=1089&option=30");
 };

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.
@@ -561,9 +561,7 @@ export class StrictMacro extends Macro {
      * @returns {StrictMacro} This object itself.
      */
     trySkillRepeat(...skills) {
-        return this.step(...skills.map((skill) => {
-            return StrictMacro.if_(`hasskill ${skillBallsMacroName(skill)}`, StrictMacro.skill(skill).repeat());
-        }));
+        return super.trySkillRepeat(...skills);
     }
     /**
      * Create a new macro with one or more skill-cast-and-repeat steps, where each step checks if you have the skill first.

package/dist/console.d.ts

@@ -1,4 +1,12 @@
-export declare const log: (...args: any[]) => void;
-export declare const info: (...args: any[]) => void;
-export declare const warn: (...args: any[]) => void;
-export declare const error: (...args: any[]) => void;
+export declare const log: (...args: {
+    toString(): string;
+}[]) => void;
+export declare const info: (...args: {
+    toString(): string;
+}[]) => void;
+export declare const warn: (...args: {
+    toString(): string;
+}[]) => void;
+export declare const error: (...args: {
+    toString(): string;
+}[]) => void;

package/dist/console.js

@@ -1,5 +1,4 @@
 import { print } from "kolmafia";
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 const logColor = (color) => (...args) => {
     const output = args.map((x) => x.toString()).join(" ");
     if (color) {

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;