libram 0.6.21 → 0.6.24

package/dist/Path.d.ts

@@ -3,6 +3,7 @@ export declare class Path {
     name: string;
     id: number;
     hasAllPerms: boolean;
+    canUseSkillbooks: boolean;
     hasCampground: boolean;
     hasTerrarium: boolean;
     stomachSize: number;
@@ -14,6 +15,7 @@ export declare class Path {
      * @param name Name of path
      * @param id Path ID
      * @param hasAllPerms Does the player have immediate access to all permed skills>
+     * @param canUseSkillbooks Does the player have ability to learn skills from skillbooks>
      * @param hasCampground Does the player have access to the campground?
      * @param hasTerrarium Does the player have access to terrarium.php
      * @param stomachSize Maximum fullness achievable at turn 0
@@ -21,7 +23,7 @@ export declare class Path {
      * @param spleenSize Maximum spleen achievable at turn 0
      * @param classes Classes available in this path
      */
-    constructor(name: string, id: number, hasAllPerms?: boolean, hasCampground?: boolean, hasTerrarium?: boolean, stomachSize?: number, liverSize?: number, spleenSize?: number, classes?: Class[]);
+    constructor(name: string, id: number, hasAllPerms?: boolean, canUseSkillbooks?: boolean, hasCampground?: boolean, hasTerrarium?: boolean, stomachSize?: number, liverSize?: number, spleenSize?: number, classes?: Class[]);
 }
 export declare const Paths: {
     readonly Unrestricted: Path;
@@ -66,4 +68,5 @@ export declare const Paths: {
     readonly QuantumTerrarium: Path;
     readonly Wildfire: Path;
     readonly GreyYou: Path;
+    readonly Journeyman: Path;
 };

package/dist/Path.js

@@ -3,6 +3,7 @@ export class Path {
     name;
     id;
     hasAllPerms; //here, we define avatar-ness around being its own class
+    canUseSkillbooks;
     hasCampground;
     hasTerrarium;
     stomachSize;
@@ -14,6 +15,7 @@ export class Path {
      * @param name Name of path
      * @param id Path ID
      * @param hasAllPerms Does the player have immediate access to all permed skills>
+     * @param canUseSkillbooks Does the player have ability to learn skills from skillbooks>
      * @param hasCampground Does the player have access to the campground?
      * @param hasTerrarium Does the player have access to terrarium.php
      * @param stomachSize Maximum fullness achievable at turn 0
@@ -21,10 +23,11 @@ export class Path {
      * @param spleenSize Maximum spleen achievable at turn 0
      * @param classes Classes available in this path
      */
-    constructor(name, id, hasAllPerms = true, hasCampground = true, hasTerrarium = true, stomachSize = 15, liverSize = 15, spleenSize = 15, classes = $classes `Seal Clubber, Turtle Tamer, Sauceror, Pastamancer, Disco Bandit, Accordion Thief`) {
+    constructor(name, id, hasAllPerms = true, canUseSkillbooks = true, hasCampground = true, hasTerrarium = true, stomachSize = 15, liverSize = 15, spleenSize = 15, classes = $classes `Seal Clubber, Turtle Tamer, Sauceror, Pastamancer, Disco Bandit, Accordion Thief`) {
         this.name = name;
         this.id = id;
         this.hasAllPerms = hasAllPerms;
+        this.canUseSkillbooks = canUseSkillbooks;
         this.hasCampground = hasCampground;
         this.hasTerrarium = hasTerrarium;
         this.stomachSize = stomachSize;
@@ -35,46 +38,47 @@ export class Path {
 }
 export const Paths = {
     Unrestricted: new Path("Unrestricted", 0),
-    Boozetafarian: new Path("Boozetafarian", 1, false, true, true, 0),
-    Teetotaler: new Path("Teetotaler", 2, false, true, true, 15, 0),
-    Oxygenarian: new Path("Oxygenarian", 3, false, true, true, 0, 0),
+    Boozetafarian: new Path("Boozetafarian", 1, true, true, true, true, 0),
+    Teetotaler: new Path("Teetotaler", 2, true, true, true, true, 15, 0),
+    Oxygenarian: new Path("Oxygenarian", 3, true, true, true, true, 0, 0),
     BeesHateYou: new Path("Bees Hate You", 4),
     WayOfTheSurprisingFist: new Path("Way of the Surprising Fist", 6),
-    Trendy: new Path("Trendy", 6),
-    AvatarOfBoris: new Path("Avatar of Boris", 8, false, true, false, 20, 5, 15, $classes `Avatar of Boris`),
+    Trendy: new Path("Trendy", 7),
+    AvatarOfBoris: new Path("Avatar of Boris", 8, false, false, true, false, 20, 5, 15, $classes `Avatar of Boris`),
     BugbearInvasion: new Path("Bugbear Invasion", 9),
-    ZombieSlayer: new Path("Zombie Slayer", 10, false, true, true, 15, 5, 15, $classes `Zombie Master`),
-    ClassAct: new Path("Class Act", 11, false),
-    AvatarofJarlsberg: new Path("Avatar of Jarlsberg", 12, false, true, false, 10, 10, 15, $classes `Avatar of Jarlsberg`),
+    ZombieSlayer: new Path("Zombie Slayer", 10, false, false, true, true, 15, 5, 15, $classes `Zombie Master`),
+    ClassAct: new Path("Class Act", 11, false, false),
+    AvatarofJarlsberg: new Path("Avatar of Jarlsberg", 12, false, false, true, false, 10, 10, 15, $classes `Avatar of Jarlsberg`),
     Big: new Path("BIG!", 14),
     KolHs: new Path("KOLHS", 15),
     ClassAct2: new Path("Class Act II: A Class For Pigs", 16, false),
-    AvatarofSneakyPete: new Path("Avatar of Sneaky Pete", 17, false, true, false, 5, 20, 15, $classes `Avatar of Sneaky Pete`),
+    AvatarofSneakyPete: new Path("Avatar of Sneaky Pete", 17, false, false, true, false, 5, 20, 15, $classes `Avatar of Sneaky Pete`),
     SlowAndSteady: new Path("Slow and Steady", 18),
     HeavyRains: new Path("Heavy Rains", 19),
-    Picky: new Path("Picky", 21, false),
+    Picky: new Path("Picky", 21, false, false),
     Standard: new Path("Standard", 22),
-    ActuallyEdTheUndying: new Path("Actually Ed the Undying", 23, false, false, false, 0, 0, 5, $classes `Ed`),
+    ActuallyEdTheUndying: new Path("Actually Ed the Undying", 23, false, false, false, false, 0, 0, 5, $classes `Ed`),
     OneCrazyRandomSummer: new Path("One Crazy Random Summer", 24),
     CommunityService: new Path("Community Service", 25),
-    AvatarOfWestOfLoathing: new Path("Avatar of West of Loathing", 26, false, true, true, 10, 10, 10, $classes `Cow Puncher, Snake Oiler, Beanslinger`),
+    AvatarOfWestOfLoathing: new Path("Avatar of West of Loathing", 26, false, false, true, true, 10, 10, 10, $classes `Cow Puncher, Snake Oiler, Beanslinger`),
     TheSource: new Path("The Source", 27),
-    NuclearAutumn: new Path("Nuclear Autumn", 28, false, false, true, 3, 3, 3),
-    GelatinousNoob: new Path("Gelatinous Noob", 29, false, true, true, 0, 0, 0, $classes `Gelatinous Noob`),
-    LicenseToAdventure: new Path("License to Adventure", 30, true, true, false, 0, 2, 15),
+    NuclearAutumn: new Path("Nuclear Autumn", 28, false, false, false, true, 3, 3, 3),
+    GelatinousNoob: new Path("Gelatinous Noob", 29, false, false, true, true, 0, 0, 0, $classes `Gelatinous Noob`),
+    LicenseToAdventure: new Path("License to Adventure", 30, true, true, true, false, 0, 2, 15),
     LiveAscendRepeat: new Path("Live. Ascend. Repeat.", 31),
-    PocketFamiliars: new Path("Pocket Familiars", 32, false, true, false),
+    PocketFamiliars: new Path("Pocket Familiars", 32, false, false, true, false),
     GLover: new Path("G-Lover", 33),
     DisguisesDelimit: new Path("Disguises Delimit", 34),
-    DarkGyffte: new Path("Dark Gyffte", 35, false, true, false, 5, 5, 15, $classes `Vampyre`),
+    DarkGyffte: new Path("Dark Gyffte", 35, false, false, true, false, 5, 5, 15, $classes `Vampyre`),
     TwoCrazyRandomSummer: new Path("Two Crazy Random Summer", 36),
     KingdomOfExploathing: new Path("Kingdom of Exploathing", 37),
-    PathOfThePlumber: new Path("Path of the Plumber", 38, false, true, true, 20, 0, 5, $classes `Plumber`),
-    LowKeySummer: new Path("Low Key Summer", 40),
+    PathOfThePlumber: new Path("Path of the Plumber", 38, false, false, true, true, 20, 0, 5, $classes `Plumber`),
+    LowKeySummer: new Path("Low Key Summer", 39),
     GreyGoo: new Path("Grey Goo", 40),
-    YouRobot: new Path("You, Robot", 41, false, false, true, 0, 0, 0),
-    QuantumTerrarium: new Path("Quantum Terrarium", 42, true, true, false),
+    YouRobot: new Path("You, Robot", 41, false, false, false, true, 0, 0, 0),
+    QuantumTerrarium: new Path("Quantum Terrarium", 42, true, 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
+    GreyYou: new Path("Grey You", 44, false, false, true, true, 0, 0, 0, // eslint-disable-next-line libram/verify-constants
     $classes `Grey Goo`),
+    Journeyman: new Path("Journeyman", 45, false, false),
 };

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

@@ -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 {
@@ -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 {
@@ -369,11 +380,11 @@ export class Requirement {
             forceEquip: [
                 ...(optionsA.forceEquip ?? []),
                 ...(other.maximizeOptions.forceEquip ?? []),
-            ],
+            ].filter((x) => !other.maximizeOptions.preventEquip?.includes(x)),
             preventEquip: [
                 ...(optionsA.preventEquip ?? []),
                 ...(other.maximizeOptions.preventEquip ?? []),
-            ],
+            ].filter((x) => !other.maximizeOptions.forceEquip?.includes(x)),
             bonusEquip: new Map([
                 ...(optionsA.bonusEquip?.entries() ?? []),
                 ...(optionsB.bonusEquip?.entries() ?? []),

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(/, ?/));