libram 0.6.9 → 0.6.12

package/dist/ascend.d.ts

@@ -1,4 +1,4 @@
-import { Class, Item } from "kolmafia";
+import { Skill, Class, Item } from "kolmafia";
 import { Path } from "./Path";
 import { Ceiling, Desk, Nightstand } from "./resources/2015/ChateauMantegna";
 export declare enum Lifestyle {
@@ -7,6 +7,10 @@ export declare enum Lifestyle {
     normal = 2,
     hardcore = 3
 }
+export declare class AscendError extends Error {
+    cause?: Skill | Item | Class | Path;
+    constructor(cause?: Skill | Item | Class | Path);
+}
 declare type MoonSign = number | "mongoose" | "wallaby" | "vole" | "platypus" | "opossum" | "marmot" | "wombat" | "blender" | "packrat" | "degrassi" | "degrassi knoll" | "friendly degrassi knoll" | "knoll" | "canada" | "canadia" | "little canadia" | "gnomads" | "gnomish" | "gnomish gnomads camp";
 /**
  * Hops the gash, perming no skills
@@ -17,7 +21,7 @@ declare type MoonSign = number | "mongoose" | "wallaby" | "vole" | "platypus" |
  * @param consumable From the astral deli. Pick the container item, not the product.
  * @param pet From the astral pet store.
  */
-export declare function ascend(path: Path, playerClass: Class, lifestyle: Lifestyle, moon: MoonSign, consumable?: Item | undefined, pet?: Item | undefined): void;
+export declare function ascend(path: Path, playerClass: Class, lifestyle: Lifestyle, moon: MoonSign, consumable?: Item | undefined, pet?: Item | undefined, permSkills?: Map<Skill, Lifestyle> | undefined): void;
 declare const worksheds: readonly ["warbear LP-ROM burner", "warbear jackhammer drill press", "warbear induction oven", "warbear high-efficiency still", "warbear chemistry lab", "warbear auto-anvil", "spinning wheel", "snow machine", "Little Geneticist DNA-Splicing Lab", "portable Mayo Clinic", "Asdon Martin keyfob", "diabolic pizza cube", "cold medicine cabinet"];
 declare type Workshed = typeof worksheds[number];
 declare const gardens: readonly ["packet of pumpkin seeds", "Peppermint Pip Packet", "packet of dragon's teeth", "packet of beer seeds", "packet of winter seeds", "packet of thanksgarden seeds", "packet of tall grass seeds", "packet of mushroom spores"];

package/dist/ascend.js

@@ -1,4 +1,4 @@
-import { containsText, eudoraItem, getCampground, getWorkshed, Item, toInt, use, visitUrl, xpath, } from "kolmafia";
+import { Skill, Class, containsText, eudoraItem, getCampground, getWorkshed, Item, toInt, use, visitUrl, xpath, haveSkill, } from "kolmafia";
 import { ChateauMantegna } from "./resources";
 import { $item, $items, $stat } from "./template-string";
 export var Lifestyle;
@@ -8,6 +8,32 @@ export var Lifestyle;
     Lifestyle[Lifestyle["normal"] = 2] = "normal";
     Lifestyle[Lifestyle["hardcore"] = 3] = "hardcore";
 })(Lifestyle || (Lifestyle = {}));
+export class AscendError extends Error {
+    cause;
+    constructor(cause) {
+        if (!cause) {
+            super("Failed to ascend--do you have a pending trade offer?");
+        }
+        else if (cause instanceof Skill) {
+            const reason = cause.permable
+                ? haveSkill(cause)
+                    ? "invalid for mysterious reasons"
+                    : "not a skill you currently know"
+                : "unpermable";
+            super(`Skill ${cause} is ${reason}!`);
+        }
+        else if (cause instanceof Item) {
+            super(`Invalid astral item: ${cause}!`);
+        }
+        else if (cause instanceof Class) {
+            super(`Invalid class ${cause} for this path!`);
+        }
+        else {
+            super(`Invalid path ${cause}!`);
+        }
+        this.cause = cause;
+    }
+}
 function toMoonId(moon, playerClass) {
     if (typeof moon === "number")
         return moon;
@@ -68,28 +94,34 @@ function toMoonId(moon, playerClass) {
  * @param consumable From the astral deli. Pick the container item, not the product.
  * @param pet From the astral pet store.
  */
-export function ascend(path, playerClass, lifestyle, moon, consumable = $item `astral six-pack`, pet = undefined) {
-    if (!containsText(visitUrl("charpane.php"), "Astral Spirit")) {
-        visitUrl("ascend.php?action=ascend&confirm=on&confirm2=on");
-    }
-    if (!containsText(visitUrl("charpane.php"), "Astral Spirit")) {
-        throw new Error("Failed to ascend.");
-    }
+export function ascend(path, playerClass, lifestyle, moon, consumable = $item `astral six-pack`, pet = undefined, permSkills = undefined) {
     if (!path.classes.includes(playerClass)) {
-        throw new Error(`Invalid class ${playerClass} for this path`);
+        throw new AscendError(playerClass);
     }
     if (path.id < 0)
-        throw new Error(`Invalid path ID ${path.id}`);
+        throw new AscendError(path);
     const moonId = toMoonId(moon, playerClass);
     if (moonId < 1 || moonId > 9)
         throw new Error(`Invalid moon ${moon}`);
     if (consumable &&
         !$items `astral six-pack, astral hot dog dinner, [10882]carton of astral energy drinks`.includes(consumable)) {
-        throw new Error(`Invalid consumable ${consumable}`);
+        throw new AscendError(consumable);
     }
     if (pet &&
         !$items `astral bludgeon, astral shield, astral chapeau, astral bracer, astral longbow, astral shorts, astral mace, astral ring, astral statuette, astral pistol, astral mask, astral pet sweater, astral shirt, astral belt`.includes(pet)) {
-        throw new Error(`Invalid astral item ${pet}`);
+        throw new AscendError(pet);
+    }
+    const illegalSkill = permSkills
+        ? Array.from(permSkills.keys()).find((skill) => !skill.permable || !haveSkill(skill))
+        : undefined;
+    if (illegalSkill) {
+        throw new AscendError(illegalSkill);
+    }
+    if (!containsText(visitUrl("charpane.php"), "Astral Spirit")) {
+        visitUrl("ascend.php?action=ascend&confirm=on&confirm2=on");
+    }
+    if (!containsText(visitUrl("charpane.php"), "Astral Spirit")) {
+        throw new AscendError();
     }
     visitUrl("afterlife.php?action=pearlygates");
     if (consumable) {
@@ -97,6 +129,14 @@ export function ascend(path, playerClass, lifestyle, moon, consumable = $item `a
     }
     if (pet)
         visitUrl(`afterlife.php?action=buyarmory&whichitem=${toInt(pet)}`);
+    if (permSkills) {
+        for (const [skill, permLevel] of permSkills.entries()) {
+            if (permLevel !== Lifestyle.casual) {
+                const permText = permLevel === Lifestyle.hardcore ? "hcperm" : "scperm";
+                visitUrl(`afterlife.php?action=${permText}&whichskill=${toInt(skill)}`);
+            }
+        }
+    }
     visitUrl(`afterlife.php?action=ascend&confirmascend=1&whichsign=${moonId}&gender=2&whichclass=${toInt(playerClass)}&whichpath=${path.id}&asctype=${lifestyle}&nopetok=1&noskillsok=1&lamepathok=1&lamesignok=1&pwd`, true);
 }
 const worksheds = [

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

@@ -52,7 +52,6 @@ export default class CommunityService {
     /**
      * 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. Optionally returns the number of turns you expect to spend preparing for the test.
-     * @param beCertain Whether we should check council.php instead of mafia to determine the test cost and whether the test is complete.
      * @param maxTurns We will run the test iff the predicted/actual turns is less than or equal to this parameter.
      * @returns "completed", "failed", or "already completed".
      */

package/dist/challengePaths/2015/CommunityService.js

@@ -107,7 +107,6 @@ export default class CommunityService {
     /**
      * 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. Optionally returns the number of turns you expect to spend preparing for the test.
-     * @param beCertain Whether we should check council.php instead of mafia to determine the test cost and whether the test is complete.
      * @param maxTurns We will run the test iff the predicted/actual turns is less than or equal to this parameter.
      * @returns "completed", "failed", or "already completed".
      */
@@ -128,7 +127,7 @@ export default class CommunityService {
         const turns = this._actualCost(council);
         if (!turns)
             return "already completed";
-        if (turns > Math.max(maxTurns, myAdventures())) {
+        if (turns > Math.min(maxTurns, myAdventures())) {
             return "failed";
         }
         if (!this.do())
@@ -176,16 +175,17 @@ export default class CommunityService {
             const { type, predictedTurns, turnCost, seconds } = testEntry;
             if (type === "test") {
                 print(`We predicted the ${testName} test would take ${predictedTurns} turns, ${predictedTurns === turnCost ? "and" : "but"} it took ${turnCost} turns.`, colour);
-                print(`${testName} took ${seconds} seconds.`, colour);
+                print(`${testName} took ${seconds.toFixed(1)} seconds.`, colour);
             }
             else {
                 if (!(predictedTurns === 0 && turnCost === 0)) {
                     print(`We predicted the task ${testName} would take ${predictedTurns} turns, ${predictedTurns === turnCost ? "and" : "but"} it took ${turnCost} turns.`, colour);
-                    print(`The task ${testName} took ${seconds} seconds.`, colour);
                 }
+                print(`The task ${testName} took ${seconds.toFixed(1)} seconds.`, colour);
             }
         }
-        print(`All together, you have spent ${sum(logEntries, ([, testEntry]) => testEntry.seconds)} seconds during this Community Service run`, colour);
+        const totalTime = sum(logEntries, ([, testEntry]) => testEntry.seconds);
+        print(`All together, you have spent ${totalTime.toFixed(1)} seconds during this Community Service run`, colour);
     }
     // Below, we have the tests themselves.
     static HP = new CommunityService(1, "HP", "Donate Blood", () => 60 - Math.floor((myMaxhp() - myBuffedstat($stat `muscle`) - 3) / 30), new Requirement(["HP"], {}));
@@ -251,7 +251,7 @@ export default class CommunityService {
     static HotRes = new CommunityService(10, "Hot Resistance", "Clean Steam Tunnels", () => 60 - getModifier("Hot Resistance"), new Requirement(["Hot Resistance"], {}));
     static CoilWire = new CommunityService(11, "Coil Wire", "Coil Wire", () => 60, new Requirement([], {}));
     static donate = () => {
-        visitUrl("council.php");
+        visitCouncil();
         visitUrl("choice.php?whichchoice=1089&option=30");
     };
 }

package/dist/combat.d.ts

@@ -103,7 +103,7 @@ export declare class Macro {
      * @param ifTrue Continuation if the condition is true.
      * @returns {Macro} This object itself.
      */
-    if_(condition: string | Monster | Effect | Skill | Item | Location | Class | Stat, ifTrue: string | Macro): this;
+    if_(condition: string | Monster | Monster[] | Effect | Skill | Item | Location | Class | Stat, ifTrue: string | Macro): this;
     /**
      * Create a new macro with an "if" statement.
      * @param condition The BALLS condition for the if statement.

package/dist/combat.js

@@ -211,6 +211,12 @@ export class Macro {
         if (condition instanceof Monster) {
             ballsCondition = `monsterid ${condition.id}`;
         }
+        else if (condition instanceof Array) {
+            ballsCondition = condition
+                .map((mon) => `monsterid ${mon.id}`)
+                .join(" || ");
+            ballsCondition = `(${ballsCondition})`;
+        }
         else if (condition instanceof Effect) {
             ballsCondition = `haseffect ${toInt(condition)}`;
         }

package/dist/counter.d.ts

@@ -1,9 +1,15 @@
 /**
- * Returns null for counters that do not exist, and otherwise returns the duration of the counter
+ * Returns Infinity for counters that do not exist, and otherwise returns the duration of the counter
  * @param counter The name of the counter in question
- * @returns null if the counter does not exist; otherwise returns the duration of the counter
+ * @returns Infinity if the counter does not exist; otherwise returns the duration of the counter
  */
-export declare function get(counter: string): number | null;
+export declare function get(counter: string): number;
+/**
+ * The world is everything that is the case. This determines which counters are the case.
+ * @param counter The name of the counter in question
+ * @returns True for counters which currently exist; false for those which do not
+ */
+export declare function exists(counter: string): boolean;
 /**
  * Creates a manual counter with specified name and duration
  * @param counter Name of the counter to manually create

package/dist/counter.js

@@ -1,19 +1,27 @@
 import { cliExecute, getCounter, getCounters } from "kolmafia";
 /**
- * Returns null for counters that do not exist, and otherwise returns the duration of the counter
+ * Returns Infinity for counters that do not exist, and otherwise returns the duration of the counter
  * @param counter The name of the counter in question
- * @returns null if the counter does not exist; otherwise returns the duration of the counter
+ * @returns Infinity if the counter does not exist; otherwise returns the duration of the counter
  */
 export function get(counter) {
     const value = getCounter(counter);
-    //getCounter returns -1 for counters that don't exist, but it also returns -1 for counters whose value is -1
+    // getCounter returns -1 for counters that don't exist, but it also returns -1 for counters whose value is -1
     if (value === -1) {
-        //if we have a counter with value -1, we check to see if that counter exists via getCounters()
-        //We return null if it doesn't exist
-        return getCounters(counter, -1, -1).trim() === "" ? null : -1;
+        // if we have a counter with value -1, we check to see if that counter exists via getCounters()
+        // We return null if it doesn't exist
+        return getCounters(counter, -1, -1).trim() === "" ? Infinity : -1;
     }
     return value;
 }
+/**
+ * The world is everything that is the case. This determines which counters are the case.
+ * @param counter The name of the counter in question
+ * @returns True for counters which currently exist; false for those which do not
+ */
+export function exists(counter) {
+    return (getCounter(counter) !== -1 || getCounters(counter, -1, -1).trim() !== "");
+}
 /**
  * Creates a manual counter with specified name and duration
  * @param counter Name of the counter to manually create

package/dist/diet/index.d.ts

@@ -10,6 +10,7 @@ declare type MenuItemOptions<T> = {
     priceOverride?: number;
     mayo?: Item;
     data?: T;
+    useRetrievePrice?: boolean;
 };
 export declare class MenuItem<T> {
     item: Item;
@@ -21,6 +22,7 @@ export declare class MenuItem<T> {
     priceOverride?: number;
     mayo?: Item;
     data?: T;
+    static defaultPriceFunction: (item: Item) => number;
     static defaultOptions<T>(): Map<Item, MenuItemOptions<T>>;
     /**
      * Construct a new menu item, possibly with extra properties. Items in MenuItem.defaultOptions have intelligent defaults.

package/dist/diet/index.js

@@ -60,6 +60,7 @@ export class MenuItem {
     priceOverride;
     mayo;
     data;
+    static defaultPriceFunction = (item) => npcPrice(item) > 0 ? npcPrice(item) : mallPrice(item);
     static defaultOptions() {
         return new Map([
             [
@@ -159,8 +160,7 @@ export class MenuItem {
         return this.item.toString();
     }
     price() {
-        return (this.priceOverride ??
-            (npcPrice(this.item) > 0 ? npcPrice(this.item) : mallPrice(this.item)));
+        return this.priceOverride ?? MenuItem.defaultPriceFunction?.(this.item);
     }
 }
 const organs = ["food", "booze", "spleen item"];

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,9 +1,9 @@
 /** @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 } from "./template-string";
+import { $class, $familiar, $item, $items, $monsters, $skill, } from "./template-string";
 import { chunk } from "./utils";
 /**
  * Returns the current maximum Accordion Thief songs the player can have in their head
@@ -323,10 +323,25 @@ export function getBanishedMonsters() {
             break;
         // toItem doesn"t error if the item doesn"t exist, so we have to use that.
         const banisherItem = toItem(banisher);
-        const banisherObject = [Item.get("none"), null].includes(banisherItem)
-            ? Skill.get(banisher)
-            : banisherItem;
-        result.set(banisherObject, Monster.get(foe));
+        if (banisher.toLowerCase() === "saber force") {
+            result.set($skill `Use the Force`, Monster.get(foe));
+        }
+        else if ([
+            Item.get("none"),
+            Item.get(`training scroll:  Snokebomb`),
+            Item.get(`tomayohawk-style reflex hammer`),
+            null,
+        ].includes(banisherItem)) {
+            if (Skill.get(banisher) === $skill `none`) {
+                break;
+            }
+            else {
+                result.set(Skill.get(banisher), Monster.get(foe));
+            }
+        }
+        else {
+            result.set(banisherItem, Monster.get(foe));
+        }
     }
     return result;
 }
@@ -533,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;
     }
 }