libram 0.7.9 → 0.7.11

package/dist/ascend.js

@@ -2,7 +2,7 @@ import { Skill, Class, eudoraItem, getCampground, Item, Path, toInt, use, visitU
 import { get } from "./property";
 import { ChateauMantegna } from "./resources";
 import { $item, $items, $stat } from "./template-string";
-import { createStringUnionTypeGuardFunction } from "./utils";
+import { arrayContains } from "./utils";
 export var Lifestyle;
 (function (Lifestyle) {
     Lifestyle[Lifestyle["casual"] = 1] = "casual";
@@ -61,11 +61,11 @@ const eudorae = [
     "New-You Club Membership Form",
     "Our Daily Candles™ order form",
 ];
-const isGarden = createStringUnionTypeGuardFunction(gardens);
-const isEudora = createStringUnionTypeGuardFunction(eudorae);
-const isDesk = createStringUnionTypeGuardFunction(ChateauMantegna.desks);
-const isNightstand = createStringUnionTypeGuardFunction(ChateauMantegna.nightstands);
-const isCeiling = createStringUnionTypeGuardFunction(ChateauMantegna.ceilings);
+const isGarden = (x) => arrayContains(x, gardens);
+const isEudora = (x) => arrayContains(x, eudorae);
+const isDesk = (x) => arrayContains(x, ChateauMantegna.desks);
+const isNightstand = (x) => arrayContains(x, ChateauMantegna.nightstands);
+const isCeiling = (x) => arrayContains(x, ChateauMantegna.ceilings);
 export class AscensionPrepError extends Error {
     cause;
     constructor(cause, original) {

package/dist/challengePaths/2015/CommunityService.js

@@ -19,6 +19,7 @@ const statCommunityServicePredictor = (stat) => {
                     : stat)));
 };
 const visitCouncil = () => visitUrl("council.php");
+const baseWeight = () => have($effect `Fidoxene`) ? 20 : familiarWeight(myFamiliar());
 export default class CommunityService {
     choice;
     stat;
@@ -121,7 +122,8 @@ export default class CommunityService {
         try {
             additionalTurns = prepare() ?? 0;
         }
-        catch {
+        catch (e) {
+            print(`${e}`, "red");
             return "failed";
         }
         const prediction = this.predictor();
@@ -194,7 +196,7 @@ export default class CommunityService {
     static Muscle = new CommunityService(2, "Muscle", "Feed The Children", statCommunityServicePredictor($stat `Muscle`), new Requirement(["Muscle"], {}));
     static Mysticality = new CommunityService(3, "Mysticality", "Build Playground Mazes", statCommunityServicePredictor($stat `Mysticality`), new Requirement(["Mysticality"], {}));
     static Moxie = new CommunityService(4, "Moxie", "Feed Conspirators", statCommunityServicePredictor($stat `Moxie`), new Requirement(["Moxie"], {}));
-    static FamiliarWeight = new CommunityService(5, "Familiar Weight", "Breed More Collies", () => 60 - Math.floor((familiarWeight(myFamiliar()) + weightAdjustment()) / 5), new Requirement(["Familiar Weight"], {}));
+    static FamiliarWeight = new CommunityService(5, "Familiar Weight", "Breed More Collies", () => 60 - Math.floor((baseWeight() + weightAdjustment()) / 5), new Requirement(["Familiar Weight"], {}));
     static WeaponDamage = new CommunityService(6, "Weapon Damage", "Reduce Gazelle Population", () => {
         const weaponPower = getPower(equippedItem($slot `weapon`));
         const offhandPower = toSlot(equippedItem($slot `off-hand`)) === $slot `weapon`
@@ -216,7 +218,7 @@ export default class CommunityService {
     }, new Requirement(["Weapon Damage", "Weapon Damage Percent"], {}));
     static SpellDamage = new CommunityService(7, "Spell Damage", "Make Sausage", () => {
         const dragonfishDamage = myFamiliar() === $familiar `Magic Dragonfish`
-            ? numericModifier($familiar `Magic Dragonfish`, "Spell Damage Percent", familiarWeight($familiar `Magic Dragonfish`) + weightAdjustment(), $item.none)
+            ? numericModifier($familiar `Magic Dragonfish`, "Spell Damage Percent", baseWeight() + weightAdjustment(), $item.none)
             : 0;
         // We add 0.001 because the floor function sometimes introduces weird rounding errors
         return (60 -
@@ -233,10 +235,10 @@ export default class CommunityService {
         const mummingBuff = mummingCostume && mummingCostume[0] === "Item Drop"
             ? mummingCostume[1]
             : 0;
-        const familiarItemDrop = numericModifier(myFamiliar(), "Item Drop", familiarWeight(myFamiliar()) + weightAdjustment(), equippedItem($slot `familiar`)) +
+        const familiarItemDrop = numericModifier(myFamiliar(), "Item Drop", baseWeight() + 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");
+        const familiarBoozeDrop = numericModifier(myFamiliar(), "Booze Drop", baseWeight() + 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

package/dist/combat.d.ts

@@ -34,9 +34,15 @@ export declare class Macro {
     /**
      * Gives your macro a new name to be used when saving an autoattack.
      * @param name The name to be used when saving as an autoattack.
-     * @returns The previous name assigned to this macro.
+     * @returns The macro in question
      */
-    rename(name: string): string;
+    rename(name: string): this;
+    /**
+     * Creates a new Macro with a name other than the default name.
+     * @param name The name to assign this macro.
+     * @returns A new Macro with the assigned name.
+     */
+    static rename<T extends Macro>(this: Constructor<T>, name: string): T;
     /**
      * Save a macro to a Mafia property for use in a consult script.
      */

package/dist/combat.js

@@ -23,8 +23,10 @@ export function getMacroId(name = MACRO_NAME) {
 function itemOrNameToItem(itemOrName) {
     return typeof itemOrName === "string" ? Item.get(itemOrName) : itemOrName;
 }
-const substringCombatItems = $items `spider web, really sticky spider web, dictionary, NG, Cloaca-Cola, yo-yo, top, ball, kite, yo, red potion, blue potion, adder, red button, pile of sand, mushroom, deluxe mushroom`;
-const substringCombatSkills = $skills `Shoot, Thrust-Smack, Headbutt, Toss, Sing, Disarm, LIGHT, BURN, Extract, Meteor Shower, Cleave, Boil, Slice, Rainbow`;
+// The list of all combat items whose name is a strict substring of another combat item
+const substringCombatItems = $items `spider web, really sticky spider web, dictionary, NG, Cloaca-Cola, yo-yo, top, ball, kite, yo, red potion, blue potion, bowling ball, adder, red button, pile of sand, mushroom, deluxe mushroom`;
+// The list of all combat skills whose name is a strict substring of another combat skill
+const substringCombatSkills = $skills `Shoot, Thrust-Smack, Headbutt, Toss, Sing, Disarm, LIGHT, BURN, Extract, Meteor Shower, Snipe, Cleave, Boil, Slice, Rainbow`;
 function itemOrItemsBallsMacroName(itemOrItems) {
     if (Array.isArray(itemOrItems)) {
         return itemOrItems.map(itemOrItemsBallsMacroName).join(", ");
@@ -83,12 +85,19 @@ export class Macro {
     /**
      * Gives your macro a new name to be used when saving an autoattack.
      * @param name The name to be used when saving as an autoattack.
-     * @returns The previous name assigned to this macro.
+     * @returns The macro in question
      */
     rename(name) {
-        const returnValue = this.name;
         this.name = name;
-        return returnValue;
+        return this;
+    }
+    /**
+     * Creates a new Macro with a name other than the default name.
+     * @param name The name to assign this macro.
+     * @returns A new Macro with the assigned name.
+     */
+    static rename(name) {
+        return new this().rename(name);
     }
     /**
      * Save a macro to a Mafia property for use in a consult script.

package/dist/logger.js

@@ -1,8 +1,17 @@
-import { printHtml } from "kolmafia";
+import { logprint, printHtml } from "kolmafia";
 const defaultHandlers = {
-    info: (message) => printHtml(`<b>[Libram]</b> ${message}`),
-    warning: (message) => printHtml(`<span style="background: orange; color: white;"><b>[Libram]</b> ${message}</span>`),
-    error: (error) => printHtml(`<span style="background: red; color: white;"><b>[Libram]</b> ${error.toString()}</span>`),
+    info: (message) => {
+        printHtml(`<b>[Libram]</b> ${message}`);
+        logprint(`[Libram] ${message}`);
+    },
+    warning: (message) => {
+        printHtml(`<span style="background: orange; color: white;"><b>[Libram]</b> ${message}</span>`);
+        logprint(`[Libram] ${message}`);
+    },
+    error: (error) => {
+        printHtml(`<span style="background: red; color: white;"><b>[Libram]</b> ${error.toString()}</span>`);
+        logprint(`[Libram] ${error.toString()}`);
+    },
 };
 class Logger {
     handlers = defaultHandlers;

package/dist/maximize.d.ts

@@ -11,6 +11,12 @@ export declare type MaximizeOptions = {
     forceUpdate: boolean;
     modes: Modes;
 };
+/**
+ * Merges a Partial<MaximizeOptions> onto a MaximizeOptions. We merge via overriding for all boolean properties and for onlySlot, and concat all other array properties.
+ * @param defaultOptions MaximizeOptions to use as a "base."
+ * @param addendums Options to attempt to merge onto defaultOptions.
+ */
+export declare function mergeMaximizeOptions(defaultOptions: MaximizeOptions, addendums: Partial<MaximizeOptions>): MaximizeOptions;
 /**
  *
  * @param options Default options for each maximizer run.

package/dist/maximize.js

@@ -7,7 +7,7 @@ import { setEqual } from "./utils";
  * @param defaultOptions MaximizeOptions to use as a "base."
  * @param addendums Options to attempt to merge onto defaultOptions.
  */
-function mergeMaximizeOptions(defaultOptions, addendums) {
+export function mergeMaximizeOptions(defaultOptions, addendums) {
     return {
         updateOnFamiliarChange: addendums.updateOnFamiliarChange ?? defaultOptions.updateOnFamiliarChange,
         updateOnCanEquipChanged: addendums.updateOnCanEquipChanged ??
@@ -269,7 +269,7 @@ const slotStructure = [
  * @param entry The CacheEntry to verify
  * @returns If all desired equipment was appliedn in the correct slots.
  */
-function verifyCached(entry) {
+function verifyCached(entry, warn = true) {
     let success = true;
     for (const slotGroup of slotStructure) {
         const desiredSlots = slotGroup
@@ -278,21 +278,27 @@ function verifyCached(entry) {
         const desiredSet = desiredSlots.map(([, item]) => item);
         const equippedSet = desiredSlots.map(([slot]) => equippedItem(slot));
         if (!setEqual(desiredSet, equippedSet)) {
-            logger.warning(`Failed to apply cached ${desiredSet.join(", ")} in ${slotGroup.join(", ")}.`);
+            if (warn) {
+                logger.warning(`Failed to apply cached ${desiredSet.join(", ")} in ${slotGroup.join(", ")}.`);
+            }
             success = false;
         }
     }
     if (equippedAmount($item `Crown of Thrones`) > 0 &&
         entry.rider.get($item `Crown of Thrones`)) {
         if (entry.rider.get($item `Crown of Thrones`) !== myEnthronedFamiliar()) {
-            logger.warning(`Failed to apply ${entry.rider.get($item `Crown of Thrones`)} in ${$item `Crown of Thrones`}.`);
+            if (warn) {
+                logger.warning(`Failed to apply ${entry.rider.get($item `Crown of Thrones`)} in ${$item `Crown of Thrones`}.`);
+            }
             success = false;
         }
     }
     if (equippedAmount($item `Buddy Bjorn`) > 0 &&
         entry.rider.get($item `Buddy Bjorn`)) {
         if (entry.rider.get($item `Buddy Bjorn`) !== myBjornedFamiliar()) {
-            logger.warning(`Failed to apply${entry.rider.get($item `Buddy Bjorn`)} in ${$item `Buddy Bjorn`}.`);
+            if (warn) {
+                logger.warning(`Failed to apply${entry.rider.get($item `Buddy Bjorn`)} in ${$item `Buddy Bjorn`}.`);
+            }
             success = false;
         }
     }
@@ -388,7 +394,7 @@ export function maximizeCached(objectives, options = {}) {
     ].join("; ");
     const cacheEntry = checkCache(cacheKey, fullOptions);
     if (cacheEntry && !forceUpdate) {
-        if (verifyCached(cacheEntry))
+        if (verifyCached(cacheEntry, false))
             return true;
         logger.info("Equipment found in maximize cache, equipping...");
         applyCached(cacheEntry, fullOptions);