libram 0.8.13 → 0.8.15

package/dist/ascend.d.ts

@@ -6,6 +6,10 @@ export declare enum Lifestyle {
     normal = 2,
     hardcore = 3
 }
+export declare enum KolGender {
+    male = 1,
+    female = 2
+}
 /**
  * Get a mapping of permed skills to the extent to which they're permed.
  *
@@ -40,21 +44,32 @@ export declare function signNameToId(moon: MoonSign): number;
  */
 export declare function signIdToName(id: number): MoonSign | "None";
 /**
- * Hops the gash, perming no skills
+ * Hops the gash, perming no skills by default
  *
- * @param path path of choice, as a Path object--these exist as properties of Paths
- * @param playerClass Your class of choice for this ascension
- * @param lifestyle 1 for casual, 2 for softcore, 3 for hardcore. Alternately, use the Lifestyle enum
- * @param moon Your moon sign as a string, or the zone you're looking for as a string
- * @param consumable From the astral deli. Pick the container item, not the product.
- * @param pet From the astral pet store.
- * @param permOptions Options for perming during a player's stay in Valhalla
- * @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
+ * @param options Configuration for the ascension
+ * @param options.path path of choice, as a Path object--these exist as properties of Paths
+ * @param options.playerClass Your class of choice for this ascension
+ * @param options.lifestyle 1 for casual, 2 for softcore, 3 for hardcore. Alternately, use the Lifestyle enum
+ * @param options.kolGender An entry from the KolGender enum: 1 for male, 2 for female (sorry that it's limited to those). Defaults to 2 or the corresponding value for defaultGenderOverride pref (which should be 'male' or 'female')
+ * @param options.moon Your moon sign as a string, or the zone you're looking for as a string
+ * @param options.consumable From the astral deli. Pick the container item, not the product. Defaults to astral six-pack, provide $item`none` for nothing.
+ * @param options.pet From the astral pet store.
+ * @param options.permOptions Options for perming during a player's stay in Valhalla
+ * @param options.permOptions.permSkills A Map<Skill, Lifestyle> of skills you'd like to perm, ordered by priority.
+ * @param options.permOptions.neverAbort Whether the ascension should abort on failure
  */
-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;
+export declare function ascend(options: {
+    path: Path;
+    playerClass: Class;
+    lifestyle: Lifestyle;
+    kolGender?: KolGender;
+    moon: InputMoonSign;
+    consumable?: Item;
+    pet?: Item;
+    permOptions?: {
+        permSkills: Map<Skill, Lifestyle>;
+        neverAbort: boolean;
+    };
 }): void;
 /**
  * Sets up various iotms you may want to use in the coming ascension

package/dist/ascend.js

@@ -10,6 +10,11 @@ export var Lifestyle;
     Lifestyle[Lifestyle["normal"] = 2] = "normal";
     Lifestyle[Lifestyle["hardcore"] = 3] = "hardcore";
 })(Lifestyle || (Lifestyle = {}));
+export var KolGender;
+(function (KolGender) {
+    KolGender[KolGender["male"] = 1] = "male";
+    KolGender[KolGender["female"] = 2] = "female";
+})(KolGender || (KolGender = {}));
 /**
  * Get a mapping of permed skills to the extent to which they're permed.
  *
@@ -179,19 +184,29 @@ function isInValhalla() {
     return matches !== null;
 }
 /**
- * Hops the gash, perming no skills
+ * Hops the gash, perming no skills by default
  *
- * @param path path of choice, as a Path object--these exist as properties of Paths
- * @param playerClass Your class of choice for this ascension
- * @param lifestyle 1 for casual, 2 for softcore, 3 for hardcore. Alternately, use the Lifestyle enum
- * @param moon Your moon sign as a string, or the zone you're looking for as a string
- * @param consumable From the astral deli. Pick the container item, not the product.
- * @param pet From the astral pet store.
- * @param permOptions Options for perming during a player's stay in Valhalla
- * @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
+ * @param options Configuration for the ascension
+ * @param options.path path of choice, as a Path object--these exist as properties of Paths
+ * @param options.playerClass Your class of choice for this ascension
+ * @param options.lifestyle 1 for casual, 2 for softcore, 3 for hardcore. Alternately, use the Lifestyle enum
+ * @param options.kolGender An entry from the KolGender enum: 1 for male, 2 for female (sorry that it's limited to those). Defaults to 2 or the corresponding value for defaultGenderOverride pref (which should be 'male' or 'female')
+ * @param options.moon Your moon sign as a string, or the zone you're looking for as a string
+ * @param options.consumable From the astral deli. Pick the container item, not the product. Defaults to astral six-pack, provide $item`none` for nothing.
+ * @param options.pet From the astral pet store.
+ * @param options.permOptions Options for perming during a player's stay in Valhalla
+ * @param options.permOptions.permSkills A Map<Skill, Lifestyle> of skills you'd like to perm, ordered by priority.
+ * @param options.permOptions.neverAbort Whether the ascension should abort on failure
  */
-export function ascend(path, playerClass, lifestyle, moon, consumable = $item `astral six-pack`, pet = undefined, permOptions) {
+export function ascend(options) {
+    const DEFAULT_OPTIONS = {
+        kolGender: get("defaultGenderOverride", "female") === "male"
+            ? KolGender.male
+            : KolGender.female,
+        consumable: $item `astral six-pack`,
+        pet: $item `none`,
+    };
+    const { path, playerClass, lifestyle, kolGender, moon, consumable, pet, permOptions, } = { ...DEFAULT_OPTIONS, ...options };
     if (playerClass.path !== (path.avatar ? path : Path.none)) {
         throw new AscendError(playerClass);
     }
@@ -200,12 +215,10 @@ export function ascend(path, playerClass, lifestyle, moon, consumable = $item `a
     const moonId = inputToMoonId(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)) {
+    if (!$items `none, astral six-pack, astral hot dog dinner, [10882]carton of astral energy drinks`.includes(consumable)) {
         throw new AscendError(consumable);
     }
-    if (pet &&
-        !$items `astral bludgeon, astral shield, astral chapeau, astral bracer, astral longbow, astral shorts, astral mace, astral trousers, astral ring, astral statuette, astral pistol, astral mask, astral pet sweater, astral shirt, astral belt`.includes(pet)) {
+    if (!$items `none, astral bludgeon, astral shield, astral chapeau, astral bracer, astral longbow, astral shorts, astral mace, astral trousers, astral ring, astral statuette, astral pistol, astral mask, astral pet sweater, astral shirt, astral belt`.includes(pet)) {
         throw new AscendError(pet);
     }
     const illegalSkill = permOptions
@@ -221,11 +234,12 @@ export function ascend(path, playerClass, lifestyle, moon, consumable = $item `a
         throw new AscendError();
     }
     visitUrl("afterlife.php?action=pearlygates");
-    if (consumable) {
+    if (consumable !== $item `none`) {
         visitUrl(`afterlife.php?action=buydeli&whichitem=${consumable.id}`);
     }
-    if (pet)
+    if (pet !== $item `none`) {
         visitUrl(`afterlife.php?action=buyarmory&whichitem=${pet.id}`);
+    }
     if (permOptions) {
         const currentPerms = permedSkills();
         let karma = get("bankedKarma");
@@ -244,7 +258,7 @@ export function ascend(path, playerClass, lifestyle, moon, consumable = $item `a
             }
         }
     }
-    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);
+    visitUrl(`afterlife.php?action=ascend&confirmascend=1&whichsign=${moonId}&gender=${kolGender}&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/challengePaths/2015/CommunityService.d.ts

@@ -1,3 +1,4 @@
+import { Effect } from "kolmafia";
 import { Requirement } from "../../maximize";
 export default class CommunityService {
     private choice;
@@ -86,6 +87,11 @@ export default class CommunityService {
      * @returns The number of turns to complete this test according to council.php.
      */
     actualCost(): number;
+    /**
+     * @param effects A spread array of Effects to consider
+     * @returns The number of turns we expect to save if we start using those effects
+     */
+    turnsSavedBy(...effects: Effect[]): number;
     /**
      * A log of the predicted turns, actual turns, and duration of each CS test performed.
      */

package/dist/challengePaths/2015/CommunityService.js

@@ -1,11 +1,10 @@
 import { equippedItem, familiarWeight, getPower, haveEquipped, myAdventures, myBasestat, myBuffedstat, myFamiliar, myMaxhp, myThrall, myTurncount, numericModifier, print, runChoice, toSlot, visitUrl, weightAdjustment, } from "kolmafia";
 import { have } from "../../lib";
 import { Requirement } from "../../maximize";
-import { get as getModifier } from "../../modifier";
 import { get } from "../../property";
 import { MummingTrunk } from "../../resources";
 import { $effect, $familiar, $item, $items, $path, $slot, $stat, $thrall, } from "../../template-string";
-import { sum } from "../../utils";
+import { clamp, sum } from "../../utils";
 const thralls = new Map([
     [$stat `muscle`, $thrall `Elbow Macaroni`],
     [$stat `moxie`, $thrall `Penne Dreadful`],
@@ -20,6 +19,11 @@ const statCommunityServicePredictor = (stat) => {
 };
 const visitCouncil = () => visitUrl("council.php");
 const baseWeight = () => have($effect `Fidoxene`) ? 20 : familiarWeight(myFamiliar());
+function hypotheticalModifier(modifier, ...effects) {
+    const newEffects = effects.filter((e) => !have(e));
+    return (numericModifier(modifier) +
+        sum(newEffects, (effect) => numericModifier(effect, modifier)));
+}
 export default class CommunityService {
     choice;
     stat;
@@ -194,6 +198,15 @@ export default class CommunityService {
     actualCost() {
         return this._actualCost(visitCouncil());
     }
+    /**
+     * @param effects A spread array of Effects to consider
+     * @returns The number of turns we expect to save if we start using those effects
+     */
+    turnsSavedBy(...effects) {
+        const currentTurns = clamp(this.prediction, 1, 60);
+        const newTurns = clamp(this.predictor(...effects), 1, 60);
+        return currentTurns - newTurns;
+    }
     /**
      * A log of the predicted turns, actual turns, and duration of each CS test performed.
      */
@@ -226,8 +239,9 @@ 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((baseWeight() + weightAdjustment()) / 5), new Requirement(["Familiar Weight"], {}));
-    static WeaponDamage = new CommunityService(6, "Weapon Damage", "Reduce Gazelle Population", () => {
+    static FamiliarWeight = new CommunityService(5, "Familiar Weight", "Breed More Collies", (...effects) => 60 -
+        Math.floor((baseWeight() + hypotheticalModifier("Familiar Weight", ...effects)) / 5), new Requirement(["Familiar Weight"], {}));
+    static WeaponDamage = new CommunityService(6, "Weapon Damage", "Reduce Gazelle Population", (...effects) => {
         const weaponPower = getPower(equippedItem($slot `weapon`));
         const offhandPower = toSlot(equippedItem($slot `off-hand`)) === $slot `weapon`
             ? getPower(equippedItem($slot `off-hand`))
@@ -240,27 +254,39 @@ export default class CommunityService {
         // We add 0.001 because the floor function sometimes introduces weird rounding errors
         return (60 -
             Math.floor((multiplier *
-                (getModifier("Weapon Damage") -
+                (hypotheticalModifier("Weapon Damage", ...effects) -
                     0.15 * (weaponPower + offhandPower + familiarPower))) /
                 50 +
                 0.001) -
-            Math.floor((multiplier * getModifier("Weapon Damage Percent")) / 50 + 0.001));
+            Math.floor((multiplier *
+                hypotheticalModifier("Weapon Damage Percent", ...effects)) /
+                50 +
+                0.001));
     }, new Requirement(["Weapon Damage", "Weapon Damage Percent"], {}));
-    static SpellDamage = new CommunityService(7, "Spell Damage", "Make Sausage", () => {
+    static SpellDamage = new CommunityService(7, "Spell Damage", "Make Sausage", (...effects) => {
         const dragonfishDamage = myFamiliar() === $familiar `Magic Dragonfish`
             ? 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 -
-            Math.floor(getModifier("Spell Damage") / 50 + 0.001) -
-            Math.floor((getModifier("Spell Damage Percent") - dragonfishDamage) / 50 + 0.001));
+            Math.floor(hypotheticalModifier("Spell Damage", ...effects) / 50 + 0.001) -
+            Math.floor((hypotheticalModifier("Spell Damage Percent", ...effects) -
+                dragonfishDamage) /
+                50 +
+                0.001));
     }, new Requirement(["Spell Damage", "Spell Damage Percent"], {}));
-    static Noncombat = new CommunityService(8, "Non-Combat", "Be a Living Statue", () => {
-        const noncombatRate = -1 * getModifier("Combat Rate");
+    static Noncombat = new CommunityService(8, "Non-Combat", "Be a Living Statue", (...effects) => {
+        const noncombatRate = -1 * hypotheticalModifier("Combat Rate", ...effects);
         const unsoftcappedRate = noncombatRate > 25 ? 25 + (noncombatRate - 25) * 5 : noncombatRate;
-        return 60 - 3 * Math.floor(unsoftcappedRate / 5);
+        const currentFamiliarModifier = -1 *
+            numericModifier(myFamiliar(), "Combat Rate", familiarWeight(myFamiliar()) + numericModifier("Familiar Weight"), equippedItem($slot `familiar`));
+        const newFamiliarModifier = -1 *
+            numericModifier(myFamiliar(), "Combat Rate", familiarWeight(myFamiliar()) +
+                hypotheticalModifier("Combat Rate", ...effects), equippedItem($slot `familiar`));
+        const adjustedRate = unsoftcappedRate - currentFamiliarModifier + newFamiliarModifier;
+        return 60 - 3 * Math.floor(adjustedRate / 5);
     }, new Requirement(["-combat"], {}));
-    static BoozeDrop = new CommunityService(9, "Item Drop", "Make Margaritas", () => {
+    static BoozeDrop = new CommunityService(9, "Item Drop", "Make Margaritas", (...effects) => {
         const mummingCostume = MummingTrunk.currentCostumes().get(myFamiliar());
         const mummingBuff = mummingCostume && mummingCostume[0] === "Item Drop"
             ? mummingCostume[1]
@@ -277,16 +303,26 @@ export default class CommunityService {
         // We add 0.001 because the floor function sometimes introduces weird rounding errors
         return (60 -
             Math.floor((multiplier *
-                (getModifier("Item Drop") -
+                (hypotheticalModifier("Item Drop", ...effects) -
                     familiarItemDrop -
                     numericModifier(myThrall(), "Item Drop"))) /
                 30 +
                 0.001) -
-            Math.floor((getModifier("Booze Drop") - familiarBoozeDrop) / 15 + 0.001));
+            Math.floor((hypotheticalModifier("Booze Drop", ...effects) - familiarBoozeDrop) /
+                15 +
+                0.001));
     }, new Requirement(["Item Drop", "2 Booze Drop"], {
         preventEquip: $items `broken champagne bottle`,
     }));
-    static HotRes = new CommunityService(10, "Hot Resistance", "Clean Steam Tunnels", () => 60 - getModifier("Hot Resistance"), new Requirement(["Hot Resistance"], {}));
+    static HotRes = new CommunityService(10, "Hot Resistance", "Clean Steam Tunnels", (...effects) => {
+        const currentFamiliarModifier = numericModifier(myFamiliar(), "Hot Resistance", familiarWeight(myFamiliar()) + numericModifier("Familiar Weight"), equippedItem($slot `familiar`));
+        const newFamiliarModifier = numericModifier(myFamiliar(), "Hot Resistance", familiarWeight(myFamiliar()) +
+            hypotheticalModifier("Familiar Weight", ...effects), equippedItem($slot `familiar`));
+        return (60 -
+            (hypotheticalModifier("Hot Resistance", ...effects) -
+                currentFamiliarModifier +
+                newFamiliarModifier));
+    }, new Requirement(["Hot Resistance"], {}));
     static CoilWire = new CommunityService(11, "Coil Wire", "Coil Wire", () => 60, new Requirement([], {}));
     static donate = () => {
         visitCouncil();

package/dist/mood.js

@@ -150,9 +150,9 @@ class PotionMoodElement extends MoodElement {
         // fractional part
         const remainingDifference = ensureTurns - haveEffect(effect);
         if (remainingDifference > 0) {
-            const price = Math.floor(this.maxPricePerTurn * remainingDifference);
-            if (price <= mallPrice(this.potion)) {
-                if (availableAmount(this.potion) || buy(1, this.potion, price)) {
+            const maxPrice = Math.floor(this.maxPricePerTurn * remainingDifference);
+            if (mallPrice(this.potion) <= maxPrice) {
+                if (availableAmount(this.potion) || buy(1, this.potion, maxPrice)) {
                     use(1, this.potion);
                 }
             }