libram 0.8.0 → 0.8.2

package/dist/Kmail.js

@@ -1,4 +1,4 @@
-import { extractItems, extractMeat, isGiftable, Item, toInt, visitUrl, } from "kolmafia";
+import { extractItems, extractMeat, isGiftable, Item, visitUrl, } from "kolmafia";
 import { arrayToCountedMap, chunk } from "./utils";
 export default class Kmail {
     id;
@@ -46,7 +46,7 @@ export default class Kmail {
         for (const c of chunks.length > 0 ? chunks : [null]) {
             const itemsQuery = c === null
                 ? []
-                : c.map(([item, quantity], index) => `whichitem${index + 1}=${toInt(item)}&howmany${index + 1}=${quantity}`);
+                : c.map(([item, quantity], index) => `whichitem${index + 1}=${item.id}&howmany${index + 1}=${quantity}`);
             const r = visitUrl(constructUrl(m, itemsQuery.join("&"), itemsQuery.length));
             if (r.includes("That player cannot receive Meat or items")) {
                 return Kmail.gift(to, message, items, meat);

package/dist/ascend.d.ts

@@ -26,7 +26,19 @@ export declare class AscensionPrepError extends Error {
     cause: string;
     constructor(cause: string, original?: MafiaClass | string);
 }
-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";
+declare const MoonSigns: readonly ["Mongoose", "Wallaby", "Vole", "Platypus", "Opossum", "Marmot", "Wombat", "Blender", "Packrat"];
+declare type MoonSign = typeof MoonSigns[number];
+declare type InputMoonSign = number | Lowercase<MoonSign> | "degrassi" | "degrassi knoll" | "friendly degrassi knoll" | "knoll" | "canada" | "canadia" | "little canadia" | "gnomads" | "gnomish" | "gnomish gnomads camp";
+/**
+ * @param moon Moon sign name
+ * @returns Moon sign id else 0
+ */
+export declare function signNameToId(moon: MoonSign): number;
+/**
+ * @param id Moon sign id
+ * @returns Name of moon sign else "None"
+ */
+export declare function signIdToName(id: number): MoonSign | "None";
 /**
  * Hops the gash, perming no skills
  *
@@ -40,7 +52,7 @@ declare type MoonSign = number | "mongoose" | "wallaby" | "vole" | "platypus" |
  * @param permOptions.permSkills A Map<Skill, Lifestyle> of skills you'd like to perm, ordered by priority.
  * @param permOptions.neverAbort Whether the ascension shouold abort on failure
  */
-export declare function ascend(path: Path, playerClass: Class, lifestyle: Lifestyle, moon: MoonSign, consumable?: Item | undefined, pet?: Item | undefined, permOptions?: {
+export declare function ascend(path: Path, playerClass: Class, lifestyle: Lifestyle, moon: InputMoonSign, consumable?: Item | undefined, pet?: Item | undefined, permOptions?: {
     permSkills: Map<Skill, Lifestyle>;
     neverAbort: boolean;
 }): void;

package/dist/ascend.js

@@ -1,8 +1,8 @@
-import { Skill, Class, eudoraItem, getCampground, Item, Path, toInt, use, visitUrl, xpath, haveSkill, getPermedSkills, toSkill, } from "kolmafia";
+import { Skill, Class, eudoraItem, getCampground, Item, Path, use, visitUrl, xpath, haveSkill, getPermedSkills, toSkill, } from "kolmafia";
 import { get } from "./property";
 import { ChateauMantegna } from "./resources";
 import { $item, $items, $stat } from "./template-string";
-import { arrayContains } from "./utils";
+import { arrayContains, tc } from "./utils";
 export var Lifestyle;
 (function (Lifestyle) {
     Lifestyle[Lifestyle["casual"] = 1] = "casual";
@@ -97,6 +97,31 @@ export class AscensionPrepError extends Error {
         this.cause = cause;
     }
 }
+const MoonSigns = [
+    "Mongoose",
+    "Wallaby",
+    "Vole",
+    "Platypus",
+    "Opossum",
+    "Marmot",
+    "Wombat",
+    "Blender",
+    "Packrat",
+];
+/**
+ * @param moon Moon sign name
+ * @returns Moon sign id else 0
+ */
+export function signNameToId(moon) {
+    return MoonSigns.indexOf(moon) + 1;
+}
+/**
+ * @param id Moon sign id
+ * @returns Name of moon sign else "None"
+ */
+export function signIdToName(id) {
+    return MoonSigns[id - 1] || "None";
+}
 /**
  * Determine the id of the appropriate moon sign.
  *
@@ -104,7 +129,7 @@ export class AscensionPrepError extends Error {
  * @param playerClass Class, required for working out a moon sign based on the desired zone
  * @returns Moon sign id
  */
-function toMoonId(moon, playerClass) {
+function inputToMoonId(moon, playerClass) {
     if (typeof moon === "number")
         return moon;
     const offset = () => {
@@ -119,25 +144,10 @@ function toMoonId(moon, playerClass) {
                 throw new AscendError(`unknown prime stat for ${playerClass}`);
         }
     };
+    const fromNormalInput = signNameToId(tc(moon));
+    if (fromNormalInput >= 0)
+        return fromNormalInput;
     switch (moon.toLowerCase()) {
-        case "mongoose":
-            return 1;
-        case "wallaby":
-            return 2;
-        case "vole":
-            return 3;
-        case "platypus":
-            return 4;
-        case "opossum":
-            return 5;
-        case "marmot":
-            return 6;
-        case "wombat":
-            return 7;
-        case "blender":
-            return 8;
-        case "packrat":
-            return 9;
         case "degrassi":
         case "degrassi knoll":
         case "friendly degrassi knoll":
@@ -187,7 +197,7 @@ export function ascend(path, playerClass, lifestyle, moon, consumable = $item `a
     }
     if (path.id < 0)
         throw new AscendError(path);
-    const moonId = toMoonId(moon, playerClass);
+    const moonId = inputToMoonId(moon, playerClass);
     if (moonId < 1 || moonId > 9)
         throw new Error(`Invalid moon ${moon}`);
     if (consumable &&
@@ -212,10 +222,10 @@ export function ascend(path, playerClass, lifestyle, moon, consumable = $item `a
     }
     visitUrl("afterlife.php?action=pearlygates");
     if (consumable) {
-        visitUrl(`afterlife.php?action=buydeli&whichitem=${toInt(consumable)}`);
+        visitUrl(`afterlife.php?action=buydeli&whichitem=${consumable.id}`);
     }
     if (pet)
-        visitUrl(`afterlife.php?action=buyarmory&whichitem=${toInt(pet)}`);
+        visitUrl(`afterlife.php?action=buyarmory&whichitem=${pet.id}`);
     if (permOptions) {
         const currentPerms = permedSkills();
         let karma = get("bankedKarma");
@@ -230,11 +240,11 @@ export function ascend(path, playerClass, lifestyle, moon, consumable = $item `a
                 }
                 karma -= expectedKarma;
                 const permText = prospectivePermLevel === Lifestyle.hardcore ? "hcperm" : "scperm";
-                visitUrl(`afterlife.php?action=${permText}&whichskill=${toInt(skill)}`);
+                visitUrl(`afterlife.php?action=${permText}&whichskill=${skill.id}`);
             }
         }
     }
-    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);
+    visitUrl(`afterlife.php?action=ascend&confirmascend=1&whichsign=${moonId}&gender=2&whichclass=${playerClass.id}&whichpath=${path.id}&asctype=${lifestyle}&nopetok=1&noskillsok=1&lamepathok=1&lamesignok=1&pwd`, true);
 }
 /**
  * Sets up various iotms you may want to use in the coming ascension

package/dist/combat.js

@@ -1,4 +1,4 @@
-import { adv1, choiceFollowsFight, Class, Effect, getAutoAttack, inMultiFight, Item, Location, Monster, removeProperty, runCombat, setAutoAttack, Skill, Stat, toInt, urlEncode, visitUrl, xpath, } from "kolmafia";
+import { adv1, choiceFollowsFight, Class, Effect, getAutoAttack, inMultiFight, Item, Location, Monster, removeProperty, runCombat, setAutoAttack, Skill, Stat, urlEncode, visitUrl, xpath, } from "kolmafia";
 import { getTodaysHolidayWanderers } from "./lib";
 import { overlappingItemNames, overlappingSkillNames, } from "./overlappingNames";
 import { get, set } from "./property";
@@ -44,7 +44,7 @@ function itemOrItemsBallsMacroName(itemOrItems) {
         const item = itemOrNameToItem(itemOrItems);
         return !overlappingItemNames.includes(item.name)
             ? item.name
-            : toInt(item).toString();
+            : item.id.toFixed(0);
     }
 }
 /**
@@ -86,7 +86,7 @@ function skillBallsMacroName(skillOrName) {
     return skill.name.match(/^[A-Za-z ]+$/) &&
         !overlappingSkillNames.includes(skill.name)
         ? skill.name
-        : toInt(skill);
+        : skill.id;
 }
 export class InvalidMacroError extends Error {
 }
@@ -279,7 +279,7 @@ export class Macro {
             ballsCondition = `(${ballsCondition})`;
         }
         else if (condition instanceof Effect) {
-            ballsCondition = `haseffect ${toInt(condition)}`;
+            ballsCondition = `haseffect ${condition.id}`;
         }
         else if (condition instanceof Skill) {
             ballsCondition = `hasskill ${skillBallsMacroName(condition)}`;
@@ -298,7 +298,7 @@ export class Macro {
             ballsCondition = `snarfblat ${snarfblat}`;
         }
         else if (condition instanceof Class) {
-            if (toInt(condition) > 6) {
+            if (condition.id > 6) {
                 throw new InvalidMacroError(`Class ${condition} cannot be made a valid BALLS predicate (it is not a standard class)`);
             }
             ballsCondition = condition.toString().replaceAll(" ", "").toLowerCase();

package/dist/index.d.ts

@@ -8,6 +8,7 @@ export * from "./diet";
 export * from "./Dungeon";
 export * from "./lib";
 export * from "./maximize";
+export { numericModifiers, statModifiers, booleanModifiers, classModifiers, monsterModifiers, effectModifiers, skillModifiers, } from "./modifierTypes";
 export * from "./mood";
 export * from "./propertyTyping";
 export * from "./resources";
@@ -25,3 +26,4 @@ export { get as getModifier, getTotalModifier } from "./modifier";
 export { Session } from "./session";
 export type { LogLevels } from "./logger";
 export type { Modifiers } from "./modifier";
+export type { NumericModifier, StringModifier, ClassModifier, StatModifier, BooleanModifier, EffectModifier, SkillModifier, } from "./modifierTypes";

package/dist/index.js

@@ -8,6 +8,7 @@ export * from "./diet";
 export * from "./Dungeon";
 export * from "./lib";
 export * from "./maximize";
+export { numericModifiers, statModifiers, booleanModifiers, classModifiers, monsterModifiers, effectModifiers, skillModifiers, } from "./modifierTypes";
 export * from "./mood";
 export * from "./propertyTyping";
 export * from "./resources";

package/dist/lib.js

@@ -1,5 +1,5 @@
 /** @module GeneralLibrary */
-import { appearanceRates, autosellPrice, availableAmount, booleanModifier, choiceFollowsFight, cliExecute, currentRound, Effect, elementalResistance, equip, equippedItem, Familiar, fullnessLimit, getCampground, getCounters, getPlayerId, getPlayerName, getRelated, handlingChoice, haveEffect, haveFamiliar, haveServant, haveSkill, holiday, inebrietyLimit, inMultiFight, Item, Location, mallPrice, Monster, myClass, myEffects, myFamiliar, myFullness, myInebriety, myPath, myPrimestat, mySpleenUse, myThrall, myTurncount, numericModifier, Path, Servant, Skill, Slot, spleenLimit, Thrall, toInt, toItem, toSkill, totalTurnsPlayed, visitUrl, } from "kolmafia";
+import { appearanceRates, autosellPrice, availableAmount, booleanModifier, choiceFollowsFight, cliExecute, currentRound, Effect, elementalResistance, equip, equippedItem, Familiar, fullnessLimit, getCampground, getCounters, getPlayerId, getPlayerName, getRelated, handlingChoice, haveEffect, haveFamiliar, haveServant, haveSkill, holiday, inebrietyLimit, inMultiFight, Item, Location, mallPrice, Monster, myClass, myEffects, myFamiliar, myFullness, myInebriety, myPath, myPrimestat, mySpleenUse, myThrall, myTurncount, numericModifier, Path, Servant, Skill, Slot, spleenLimit, Thrall, toItem, toSkill, totalTurnsPlayed, visitUrl, } from "kolmafia";
 import logger from "./logger";
 import { get } from "./property";
 import { $class, $element, $familiar, $item, $items, $monsters, $skill, $stat, } from "./template-string";
@@ -717,10 +717,10 @@ export function examine(thing) {
     const url = thing instanceof Item
         ? `desc_item.php?whichitem=${thing.descid}`
         : thing instanceof Familiar
-            ? `desc_familiar.php?which=${toInt(thing)}`
+            ? `desc_familiar.php?which=${thing.id}`
             : thing instanceof Effect
                 ? `desc_effect.php?whicheffect=${thing.descid}`
-                : `desc_skill.php?whichskill=${toInt(thing)}`;
+                : `desc_skill.php?whichskill=${thing.id}`;
     return visitUrl(url);
 }
 /**
@@ -744,7 +744,7 @@ export const byClass = makeByXFunction(() => myClass().toString());
  * @returns The html of the resulting page
  */
 export function directlyUse(item) {
-    return visitUrl(`inv_use.php?which=3&whichitem=${toInt(item)}&pwd`);
+    return visitUrl(`inv_use.php?which=3&whichitem=${item.id}&pwd`);
 }
 /**
  * Empty a slot, or unequip all instances of a given equipped item

package/dist/maximize.js

@@ -2,6 +2,9 @@ import { availableAmount, bjornifyFamiliar, canEquip, cliExecute, enthroneFamili
 import logger from "./logger";
 import { $familiar, $item, $slot, $slots, $stats } from "./template-string";
 import { setEqual } from "./utils";
+function toMaximizerName({ name, id }) {
+    return name.includes(";") ? `¶${id}` : name;
+}
 /**
  * Merges a partial set of maximizer options onto a full set maximizer options. We merge via overriding for all boolean properties and for onlySlot, and concat all other array properties.
  *
@@ -394,13 +397,13 @@ export function maximizeCached(objectives, options = {}) {
     const objective = [
         ...new Set([
             ...objectives.sort(),
-            ...forceEquip.map((item) => `equip ${item}`).sort(),
-            ...preventEquip.map((item) => `-equip ${item}`).sort(),
+            ...forceEquip.map((item) => `"equip ${toMaximizerName(item)}"`).sort(),
+            ...preventEquip.map((item) => `-"equip ${toMaximizerName(item)}"`).sort(),
             ...onlySlot.map((slot) => `${slot}`).sort(),
             ...preventSlot.map((slot) => `-${slot}`).sort(),
             ...Array.from(bonusEquip.entries())
                 .filter(([, bonus]) => bonus !== 0)
-                .map(([item, bonus]) => `${Math.round(bonus * 100) / 100} bonus ${item}`)
+                .map(([item, bonus]) => `${Math.round(bonus * 100) / 100} "bonus ${toMaximizerName(item)}"`)
                 .sort(),
         ]),
     ].join(", ");