libram 0.6.22 → 0.7.0

package/dist/ascend.d.ts

@@ -1,5 +1,4 @@
-import { Skill, Class, Item, MafiaClass } from "kolmafia";
-import { Path } from "./Path";
+import { Skill, Class, Item, Path, MafiaClass } from "kolmafia";
 import { ChateauMantegna } from "./resources";
 export declare enum Lifestyle {
     casual = 1,

package/dist/ascend.js

@@ -1,5 +1,4 @@
-import { Skill, Class, containsText, eudoraItem, getCampground, getWorkshed, Item, toInt, use, visitUrl, xpath, haveSkill, } from "kolmafia";
-import { Path } from "./Path";
+import { Skill, Class, containsText, eudoraItem, getCampground, getWorkshed, Item, Path, toInt, use, visitUrl, xpath, haveSkill, } from "kolmafia";
 import { ChateauMantegna } from "./resources";
 import { $item, $items, $stat } from "./template-string";
 import { createStringUnionTypeGuardFunction } from "./utils";
@@ -163,7 +162,8 @@ function toMoonId(moon, playerClass) {
  * @param pet From the astral pet store.
  */
 export function ascend(path, playerClass, lifestyle, moon, consumable = $item `astral six-pack`, pet = undefined, permSkills = undefined) {
-    if (!path.classes.includes(playerClass)) {
+    if (path === Path.none ||
+        playerClass.path !== (path.avatar ? path : Path.none)) {
         throw new AscendError(playerClass);
     }
     if (path.id < 0)

package/dist/challengePaths/2015/CommunityService.js

@@ -216,7 +216,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", familiarWeight($familiar `Magic Dragonfish`) + weightAdjustment(), $item.none)
             : 0;
         // We add 0.001 because the floor function sometimes introduces weird rounding errors
         return (60 -

package/dist/combat.js

@@ -78,7 +78,7 @@ export class Macro {
      * Convert macro to string.
      */
     toString() {
-        return this.components.join(";");
+        return (this.components.join(";") + ";").replace(/;;+/g, ";");
     }
     /**
      * Gives your macro a new name to be used when saving an autoattack.
@@ -115,10 +115,7 @@ export class Macro {
      */
     step(...nextSteps) {
         const nextStepsStrings = [].concat(...nextSteps.map((x) => (x instanceof Macro ? x.components : [x])));
-        this.components = [
-            ...this.components,
-            ...nextStepsStrings.filter((s) => s.length > 0),
-        ];
+        this.components.push(...nextStepsStrings.filter((s) => s.length > 0));
         return this;
     }
     /**

package/dist/diet/index.js

@@ -225,7 +225,7 @@ class DietPlanner {
         const helpers = [];
         if (this.seasoning &&
             itemType(menuItem.item) === "food" &&
-            this.mpa > mallPrice($item `Special Seasoning`)) {
+            this.mpa * 0.5 > mallPrice($item `Special Seasoning`)) {
             helpers.push(this.seasoning);
         }
         if (itemType(menuItem.item) === "food" && this.mayoLookup.size) {

package/dist/lib.js

@@ -1,7 +1,7 @@
 /** @module GeneralLibrary */
 import "core-js/modules/es.object.entries";
 import "core-js/features/array/flat";
-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 { 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, Path, Servant, Skill, spleenLimit, Thrall, toItem, toSkill, totalTurnsPlayed, } from "kolmafia";
 import { get } from "./property";
 import { $class, $element, $familiar, $item, $items, $monsters, $skill, $stat, } from "./template-string";
 import { chunk } from "./utils";
@@ -178,7 +178,8 @@ export function haveWandererCounter(wanderer) {
  * @category Wanderers
  */
 export function isVoteWandererNow() {
-    return totalTurnsPlayed() % 11 == 1;
+    return (totalTurnsPlayed() % 11 === 1 &&
+        get("lastVoteMonsterTurn") < totalTurnsPlayed());
 }
 /**
  * Tells us whether we can expect a given wanderer now. Behaves differently
@@ -200,7 +201,7 @@ export function isWandererNow(wanderer) {
     if (deterministicWanderers.includes(wanderer)) {
         return haveCounter(wanderer, 0, 0);
     }
-    if (wanderer == Wanderer.Kramco) {
+    if (wanderer === Wanderer.Kramco) {
         return true;
     }
     if (wanderer === Wanderer.Vote) {
@@ -327,12 +328,12 @@ export function getBanishedMonsters() {
             result.set($skill `Use the Force`, Monster.get(foe));
         }
         else if ([
-            Item.get("none"),
+            Item.none,
             Item.get(`training scroll:  Snokebomb`),
             Item.get(`tomayohawk-style reflex hammer`),
             null,
         ].includes(banisherItem)) {
-            if (Skill.get(banisher) === $skill `none`) {
+            if (Skill.get(banisher) === $skill.none) {
                 break;
             }
             else {
@@ -354,16 +355,16 @@ export function getBanishedMonsters() {
  */
 export function canUse(item) {
     const path = myPath();
-    if (path !== "Nuclear Autumn") {
+    if (path !== Path.get("Nuclear Autumn")) {
         if ($items `Shrieking Weasel holo-record, Power-Guy 2000 holo-record, Lucky Strikes holo-record, EMD holo-record, Superdrifter holo-record, The Pigs holo-record, Drunk Uncles holo-record`.includes(item)) {
             return false;
         }
     }
-    if (path === "G-Lover") {
+    if (path === Path.get("G-Lover")) {
         if (!item.name.toLowerCase().includes("g"))
             return false;
     }
-    if (path === "Bees Hate You") {
+    if (path === Path.get("Bees Hate You")) {
         if (item.name.toLowerCase().includes("b"))
             return false;
     }
@@ -376,13 +377,13 @@ export function canUse(item) {
  */
 export function noneToNull(thing) {
     if (thing instanceof Effect) {
-        return thing === Effect.get("none") ? null : thing;
+        return thing === Effect.none ? null : thing;
     }
     if (thing instanceof Familiar) {
-        return thing === Familiar.get("none") ? null : thing;
+        return thing === Familiar.none ? null : thing;
     }
     if (thing instanceof Item) {
-        return thing === Item.get("none") ? null : thing;
+        return thing === Item.none ? null : thing;
     }
     return thing;
 }
@@ -513,11 +514,11 @@ export const Environment = {
  */
 export function findLeprechaunMultiplier(familiar) {
     if (familiar === $familiar `Mutant Cactus Bud`) {
-        return numericModifier(familiar, "Leprechaun Effectiveness", 1, $item `none`);
+        return numericModifier(familiar, "Leprechaun Effectiveness", 1, $item.none);
     }
     if (familiar === $familiar `Reanimated Reanimator`)
         return 0;
-    const meatBonus = numericModifier(familiar, "Meat Drop", 1, $item `none`);
+    const meatBonus = numericModifier(familiar, "Meat Drop", 1, $item.none);
     if (meatBonus === 0)
         return 0;
     return Math.pow(Math.sqrt(meatBonus / 2 + 55 / 4 + 3) - Math.sqrt(55) / 2, 2);
@@ -530,11 +531,11 @@ export function findLeprechaunMultiplier(familiar) {
  */
 export function findFairyMultiplier(familiar) {
     if (familiar === $familiar `Mutant Fire Ant`) {
-        return numericModifier(familiar, "Fairy Effectiveness", 1, $item `none`);
+        return numericModifier(familiar, "Fairy Effectiveness", 1, $item.none);
     }
     if (familiar === $familiar `Reanimated Reanimator`)
         return 0;
-    const itemBonus = numericModifier(familiar, "Item Drop", 1, $item `none`);
+    const itemBonus = numericModifier(familiar, "Item Drop", 1, $item.none);
     if (itemBonus === 0)
         return 0;
     return Math.pow(Math.sqrt(itemBonus + 55 / 4 + 3) - Math.sqrt(55) / 2, 2);

package/dist/maximize.js

@@ -195,11 +195,11 @@ function applyCached(entry, options) {
     }
     if (equippedAmount($item `Crown of Thrones`) > 0 &&
         entry.rider.get($item `Crown of Thrones`)) {
-        enthroneFamiliar(entry.rider.get($item `Crown of Thrones`) || $familiar `none`);
+        enthroneFamiliar(entry.rider.get($item `Crown of Thrones`) || $familiar.none);
     }
     if (equippedAmount($item `Buddy Bjorn`) > 0 &&
         entry.rider.get($item `Buddy Bjorn`)) {
-        bjornifyFamiliar(entry.rider.get($item `Buddy Bjorn`) || $familiar `none`);
+        bjornifyFamiliar(entry.rider.get($item `Buddy Bjorn`) || $familiar.none);
     }
 }
 const slotStructure = [
@@ -312,28 +312,39 @@ export function maximizeCached(objectives, options = {}) {
     const { forceEquip, preventEquip, bonusEquip, onlySlot, preventSlot, forceUpdate, } = fullOptions;
     // Sort each group in objective to ensure consistent ordering in string
     const objective = [
-        ...objectives.sort(),
-        ...forceEquip.map((item) => `equip ${item}`).sort(),
-        ...preventEquip.map((item) => `-equip ${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}`)
-            .sort(),
+        ...new Set([
+            ...objectives.sort(),
+            ...forceEquip.map((item) => `equip ${item}`).sort(),
+            ...preventEquip.map((item) => `-equip ${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}`)
+                .sort(),
+        ]),
     ].join(", ");
-    const cacheEntry = checkCache(objective, fullOptions);
+    // Items equipped in slots not touched by the maximizer must be in the cache key
+    const untouchedSlots = cachedSlots.filter((slot) => preventSlot.includes(slot) ||
+        (onlySlot.length > 0 && !onlySlot.includes(slot)));
+    const cacheKey = [
+        objective,
+        ...untouchedSlots
+            .map((slot) => `${slot}:${equippedItem(slot)}`)
+            .sort(),
+    ].join("; ");
+    const cacheEntry = checkCache(cacheKey, fullOptions);
     if (cacheEntry && !forceUpdate) {
         logger.info("Equipment found in maximize cache, equipping...");
         applyCached(cacheEntry, fullOptions);
         if (verifyCached(cacheEntry)) {
-            logger.info(`Equipped cached ${objective}`);
+            logger.info(`Equipped cached ${cacheKey}`);
             return true;
         }
         logger.warning("Maximize cache application failed, maximizing...");
     }
     const result = maximize(objective, false);
-    saveCached(objective, fullOptions);
+    saveCached(cacheKey, fullOptions);
     return result;
 }
 export class Requirement {

package/dist/mood.js

@@ -104,7 +104,7 @@ class SkillMoodElement extends MoodElement {
             let maxCasts;
             if (hpCost(this.skill) > 0) {
                 // FIXME: restore HP
-                maxCasts = Math.floor(myHp() / hpCost(this.skill));
+                maxCasts = Math.max(0, Math.floor((myHp() - 1) / hpCost(this.skill))); // Do not allow ourselves to hit 0 hp
             }
             else {
                 const cost = mpCost(this.skill);
@@ -274,7 +274,7 @@ export class Mood {
      */
     effect(effect, gainEffect) {
         const skill = toSkill(effect);
-        if (!gainEffect && skill !== $skill `none`) {
+        if (!gainEffect && skill !== $skill.none) {
             this.skill(skill);
         }
         else {

package/dist/property.js

@@ -13,7 +13,7 @@ const createMafiaClassPropertyGetter = (Type, toType) => createPropertyGetter((v
     if (value === "")
         return null;
     const v = toType(value);
-    return v === Type.get("none") ? null : v;
+    return v === Type.none ? null : v;
 });
 export const getString = createPropertyGetter((value) => value);
 export const getCommaSeparated = createPropertyGetter((value) => value.split(/, ?/));