libram 0.8.14 → 0.8.15

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/resources/2016/GingerBread.d.ts

@@ -0,0 +1,32 @@
+import { Location } from "kolmafia";
+/**
+ * @returns Whether or not you can currently access Gingerbread City
+ */
+export declare function available(): boolean;
+/**
+ * @returns The number of Gingerbread encounters until it's Midnight in the city; this may be negative if the time has passed
+ */
+export declare function minutesToMidnight(): number;
+/**
+ * @returns The number of Gingerbread encounters until it's Noon in the city; this may be negative if the time has passed
+ */
+export declare function minutesToNoon(): number;
+export declare const LOCATIONS: readonly Location[];
+/**
+ * @returns A list of all Gingerbread locations at which you can currently adventure
+ */
+export declare function availableLocations(): Location[];
+/**
+ * @param location The location in question
+ * @returns The id of the Noon choice adventure at that location; 0 if inapplicable
+ */
+export declare function getNoonChoiceId(location: Location): number;
+/**
+ * @param location The location in question
+ * @returns The id of the Midnight choice adventure at that location; 0 if inapplicable
+ */
+export declare function getMidnightChoiceId(location: Location): number;
+/**
+ * @returns Whether or not it is possible for you to fight Judge Fudge today
+ */
+export declare function canJudgeFudge(): boolean;

package/dist/resources/2016/GingerBread.js

@@ -0,0 +1,73 @@
+import { canAdventure } from "kolmafia";
+import { get } from "../../property";
+import { $location, $locations } from "../../template-string";
+/**
+ * @returns Whether or not you can currently access Gingerbread City
+ */
+export function available() {
+    return ((get("gingerbreadCityAvailable") || get("_gingerbreadCityToday")) &&
+        turns() < availableTurns());
+}
+function turns() {
+    return (get("_gingerbreadCityTurns") + (get("_gingerbreadClockAdvanced") ? 5 : 0));
+}
+function availableTurns() {
+    return 20 + (get("gingerExtraAdventures") ? 10 : 0);
+}
+/**
+ * @returns The number of Gingerbread encounters until it's Midnight in the city; this may be negative if the time has passed
+ */
+export function minutesToMidnight() {
+    return 19 - turns();
+}
+/**
+ * @returns The number of Gingerbread encounters until it's Noon in the city; this may be negative if the time has passed
+ */
+export function minutesToNoon() {
+    return 9 - turns();
+}
+export const LOCATIONS = Object.freeze($locations `Gingerbread Civic Center, Gingerbread Train Station, Gingerbread Industrial Zone, Gingerbread Upscale Retail District, Gingerbread Sewers`);
+/**
+ * @returns A list of all Gingerbread locations at which you can currently adventure
+ */
+export function availableLocations() {
+    return LOCATIONS.filter((l) => canAdventure(l));
+}
+const NOONS = new Map([
+    [$location `Gingerbread Train Station`, 1204],
+    [$location `Gingerbread Civic Center`, 1202],
+    [$location `Gingerbread Industrial Zone`, 1206],
+    [$location `Gingerbread Upscale Retail District`, 1208],
+]);
+const MIDNIGHTS = new Map([
+    [$location `Gingerbread Train Station`, 1205],
+    [$location `Gingerbread Civic Center`, 1203],
+    [$location `Gingerbread Industrial Zone`, 1207],
+    [$location `Gingerbread Upscale Retail District`, 1209],
+]);
+/**
+ * @param location The location in question
+ * @returns The id of the Noon choice adventure at that location; 0 if inapplicable
+ */
+export function getNoonChoiceId(location) {
+    return NOONS.get(location) ?? 0;
+}
+/**
+ * @param location The location in question
+ * @returns The id of the Midnight choice adventure at that location; 0 if inapplicable
+ */
+export function getMidnightChoiceId(location) {
+    return MIDNIGHTS.get(location) ?? 0;
+}
+/**
+ * @returns Whether or not it is possible for you to fight Judge Fudge today
+ */
+export function canJudgeFudge() {
+    if (minutesToNoon() >= 0) {
+        return true;
+    }
+    if (minutesToMidnight() >= 0 && get("_gingerbreadColumnDestroyed")) {
+        return true;
+    }
+    return false;
+}

package/dist/resources/2021/CrystalBall.js

@@ -1,4 +1,4 @@
-import { toLocation, toMonster, availableAmount, Item, visitUrl, } from "kolmafia";
+import { toLocation, toMonster, availableAmount, Item, visitUrl, myTotalTurnsSpent, totalTurnsPlayed, } from "kolmafia";
 import { logger } from "../..";
 import { canVisitUrl } from "../../lib";
 import { get } from "../../property";
@@ -15,6 +15,8 @@ const parsedProp = () => get("crystalBallPredictions")
     .split("|")
     .map((element) => element.split(":"))
     .map(([, location, monster]) => [toLocation(location), toMonster(monster)]);
+const getLastPondered = () => `${myTotalTurnsSpent()};${totalTurnsPlayed()};${get("lastAdventure")}`;
+let lastPondered = "";
 /**
  * Ponders your orb (if it is able to do so safely) and then returns a Map keyed by location consisting of extant predictions
  *
@@ -23,12 +25,15 @@ const parsedProp = () => get("crystalBallPredictions")
 export function ponder() {
     if (!have())
         return new Map();
-    if (canVisitUrl()) {
-        logger.debug("Now pondering Crystal Ball.");
-        visitUrl("inventory.php?ponder=1", false);
-    }
-    else {
-        logger.debug("Failed to ponder Crystall Ball.");
+    if (lastPondered !== getLastPondered()) {
+        if (canVisitUrl()) {
+            logger.debug("Now pondering Crystal Ball.");
+            visitUrl("inventory.php?ponder=1", false);
+            lastPondered = getLastPondered();
+        }
+        else {
+            logger.debug("Failed to ponder Crystall Ball.");
+        }
     }
     return new Map(parsedProp());
 }

package/dist/resources/index.d.ts

@@ -17,6 +17,7 @@ import * as ChateauMantegna from "./2015/ChateauMantegna";
 import * as DeckOfEveryCard from "./2015/DeckOfEveryCard";
 import * as Dinseylandfill from "./2015/Dinseylandfill";
 import * as MayoClinic from "./2015/MayoClinic";
+import * as GingerBread from "./2016/GingerBread";
 import * as SourceTerminal from "./2016/SourceTerminal";
 import * as Witchess from "./2016/Witchess";
 import * as AsdonMartin from "./2017/AsdonMartin";
@@ -45,6 +46,6 @@ import * as AugustScepter from "./2023/AugustScepter";
 import * as CinchoDeMayo from "./2023/CinchoDeMayo";
 import * as ClosedCircuitPayphone from "./2023/ClosedCircuitPayphone";
 import * as CursedMonkeyPaw from "./2023/CursedMonkeyPaw";
-export { AugustScepter, AutumnAton, AsdonMartin, Bandersnatch, BarrelShrine, BeachComb, CampAway, Cartography, ChateauMantegna, CinchoDeMayo, ClosedCircuitPayphone, CombatLoversLocket, CrimboShrub, CrownOfThrones, CrystalBall, CursedMonkeyPaw, DaylightShavings, DeckOfEveryCard, Dinseylandfill, DNALab, FloristFriar, GreyGoose, Guzzlr, Horsery, JuneCleaver, JungMan, Latte, LookingGlass, MayoClinic, MummingTrunk, ObtuseAngel, Pantogram, RainDoh, ReagnimatedGnome, RetroCape, Robortender, Snapper, SongBoom, SourceTerminal, Spacegate, SpookyPutty, Stickers, StompingBoots, TrainSet, TunnelOfLove, WinterGarden, Witchess, };
+export { AugustScepter, AutumnAton, AsdonMartin, Bandersnatch, BarrelShrine, BeachComb, CampAway, Cartography, ChateauMantegna, CinchoDeMayo, ClosedCircuitPayphone, CombatLoversLocket, CrimboShrub, CrownOfThrones, CrystalBall, CursedMonkeyPaw, DaylightShavings, DeckOfEveryCard, Dinseylandfill, DNALab, FloristFriar, GingerBread, GreyGoose, Guzzlr, Horsery, JuneCleaver, JungMan, Latte, LookingGlass, MayoClinic, MummingTrunk, ObtuseAngel, Pantogram, RainDoh, ReagnimatedGnome, RetroCape, Robortender, Snapper, SongBoom, SourceTerminal, Spacegate, SpookyPutty, Stickers, StompingBoots, TrainSet, TunnelOfLove, WinterGarden, Witchess, };
 export * from "./putty-likes";
 export * from "./LibramSummon";

package/dist/resources/index.js

@@ -17,6 +17,7 @@ import * as ChateauMantegna from "./2015/ChateauMantegna";
 import * as DeckOfEveryCard from "./2015/DeckOfEveryCard";
 import * as Dinseylandfill from "./2015/Dinseylandfill";
 import * as MayoClinic from "./2015/MayoClinic";
+import * as GingerBread from "./2016/GingerBread";
 import * as SourceTerminal from "./2016/SourceTerminal";
 import * as Witchess from "./2016/Witchess";
 import * as AsdonMartin from "./2017/AsdonMartin";
@@ -45,6 +46,6 @@ import * as AugustScepter from "./2023/AugustScepter";
 import * as CinchoDeMayo from "./2023/CinchoDeMayo";
 import * as ClosedCircuitPayphone from "./2023/ClosedCircuitPayphone";
 import * as CursedMonkeyPaw from "./2023/CursedMonkeyPaw";
-export { AugustScepter, AutumnAton, AsdonMartin, Bandersnatch, BarrelShrine, BeachComb, CampAway, Cartography, ChateauMantegna, CinchoDeMayo, ClosedCircuitPayphone, CombatLoversLocket, CrimboShrub, CrownOfThrones, CrystalBall, CursedMonkeyPaw, DaylightShavings, DeckOfEveryCard, Dinseylandfill, DNALab, FloristFriar, GreyGoose, Guzzlr, Horsery, JuneCleaver, JungMan, Latte, LookingGlass, MayoClinic, MummingTrunk, ObtuseAngel, Pantogram, RainDoh, ReagnimatedGnome, RetroCape, Robortender, Snapper, SongBoom, SourceTerminal, Spacegate, SpookyPutty, Stickers, StompingBoots, TrainSet, TunnelOfLove, WinterGarden, Witchess, };
+export { AugustScepter, AutumnAton, AsdonMartin, Bandersnatch, BarrelShrine, BeachComb, CampAway, Cartography, ChateauMantegna, CinchoDeMayo, ClosedCircuitPayphone, CombatLoversLocket, CrimboShrub, CrownOfThrones, CrystalBall, CursedMonkeyPaw, DaylightShavings, DeckOfEveryCard, Dinseylandfill, DNALab, FloristFriar, GingerBread, GreyGoose, Guzzlr, Horsery, JuneCleaver, JungMan, Latte, LookingGlass, MayoClinic, MummingTrunk, ObtuseAngel, Pantogram, RainDoh, ReagnimatedGnome, RetroCape, Robortender, Snapper, SongBoom, SourceTerminal, Spacegate, SpookyPutty, Stickers, StompingBoots, TrainSet, TunnelOfLove, WinterGarden, Witchess, };
 export * from "./putty-likes";
 export * from "./LibramSummon";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "libram",
-  "version": "0.8.14",
+  "version": "0.8.15",
   "description": "JavaScript helper library for KoLmafia",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -53,7 +53,7 @@
     "husky": "^4.3.6",
     "java-parser": "^1.4.0",
     "jest": "^27.1.0",
-    "kolmafia": "^5.27457.0",
+    "kolmafia": "^5.27647.0",
     "lint-staged": ">=10",
     "node-fetch": "^2.6.1",
     "prettier": "^2.1.2",