libram 0.8.16 → 0.8.18

package/dist/Kmail.js

@@ -1,4 +1,5 @@
 import { extractItems, extractMeat, isGiftable, Item, visitUrl, } from "kolmafia";
+import { combineQuery, EMPTY_VALUE, fetchUrl } from "./url";
 import { arrayToCountedMap, chunk } from "./utils";
 export default class Kmail {
     id;
@@ -32,9 +33,12 @@ export default class Kmail {
      * @returns Number of kmails deleted
      */
     static delete(kmails) {
-        const results = visitUrl(`messages.php?the_action=delete&box=Inbox&pwd&${kmails
-            .map((k) => `sel${k.id}=on`)
-            .join("&")}`);
+        const results = fetchUrl("messages.php", [
+            ["the_action", "delete"],
+            ["box", "Inbox"],
+            ["pwd", EMPTY_VALUE],
+            ...kmails.map((k) => [`sel${k.id}`, "on"]),
+        ]);
         return Number(results.match(/<td>(\d) messages? deleted.<\/td>/)?.[1] ?? 0);
     }
     static _genericSend(to, message, items, meat, chunkSize, constructUrl, successString) {
@@ -44,10 +48,18 @@ export default class Kmail {
         const chunks = chunk(sendableItems, chunkSize);
         // Split the items to be sent into chunks of max 11 item types
         for (const c of chunks.length > 0 ? chunks : [null]) {
-            const itemsQuery = c === null
-                ? []
-                : c.map(([item, quantity], index) => `whichitem${index + 1}=${item.id}&howmany${index + 1}=${quantity}`);
-            const r = visitUrl(constructUrl(m, itemsQuery.join("&"), itemsQuery.length));
+            const itemsQuery = {};
+            if (c !== null) {
+                c.forEach(([item, quantity], i) => {
+                    itemsQuery[`whichitem${i + 1}`] = item.id;
+                    itemsQuery[`howmany${i + 1}`] = quantity;
+                });
+            }
+            const { path, query } = constructUrl({
+                meat: m,
+                chunkSize: c?.length ?? 0,
+            });
+            const r = fetchUrl(path, combineQuery(query, itemsQuery));
             if (r.includes("That player cannot receive Meat or items")) {
                 return Kmail.gift(to, message, items, meat);
             }
@@ -71,7 +83,16 @@ export default class Kmail {
      * @returns True if the kmail was successfully sent
      */
     static send(to, message = "", items = [], meat = 0) {
-        return Kmail._genericSend(to, message, items, meat, 11, (meat, itemsQuery) => `sendmessage.php?action=send&pwd&towho=${to}&message=${message}${itemsQuery ? `&${itemsQuery}` : ""}&sendmeat=${meat}`, ">Message sent.</");
+        return Kmail._genericSend(to, message, items, meat, 11, ({ meat }) => ({
+            path: "sendmessage.php",
+            query: {
+                action: "send",
+                pwd: EMPTY_VALUE,
+                towho: to,
+                message,
+                sendmeat: meat,
+            },
+        }), ">Message sent.</");
     }
     /**
      * Sends a gift to a player
@@ -87,8 +108,19 @@ export default class Kmail {
      * @returns True if the gift was successfully sent
      */
     static gift(to, message = "", items = [], meat = 0, insideNote = "") {
-        const baseUrl = `town_sendgift.php?action=Yep.&pwd&fromwhere=0&note=${message}&insidenote=${insideNote}&towho=${to}`;
-        return Kmail._genericSend(to, message, items, meat, 3, (m, itemsQuery, chunkSize) => `${baseUrl}&whichpackage=${chunkSize}${itemsQuery ? `&${itemsQuery}` : ""}&sendmeat=${m}`, ">Package sent.</");
+        return Kmail._genericSend(to, message, items, meat, 3, ({ meat, chunkSize }) => ({
+            path: `town_sendgift.php`,
+            query: {
+                action: "Yep.",
+                pwd: EMPTY_VALUE,
+                fromwhere: 0,
+                note: message,
+                insidenote: insideNote,
+                towho: to,
+                whichpackage: chunkSize,
+                sendmeat: meat,
+            },
+        }), ">Package sent.</");
     }
     constructor(rawKmail) {
         const date = new Date(rawKmail.localtime);

package/dist/ascend.d.ts

@@ -1,4 +1,5 @@
 import { Skill, Class, Item, Path, MafiaClass } from "kolmafia";
+import { MoonSign } from "./moonSign";
 import { ChateauMantegna } from "./resources";
 export declare enum Lifestyle {
     casual = 1,
@@ -30,19 +31,7 @@ export declare class AscensionPrepError extends Error {
     cause: string;
     constructor(cause: string, original?: MafiaClass | string);
 }
-declare const MoonSigns: readonly ["Mongoose", "Wallaby", "Vole", "Platypus", "Opossum", "Marmot", "Wombat", "Blender", "Packrat"];
-declare type MoonSign = typeof MoonSigns[number];
 declare type InputMoonSign = number | Lowercase<MoonSign> | "degrassi" | "degrassi knoll" | "friendly degrassi knoll" | "knoll" | "canada" | "canadia" | "little canadia" | "gnomads" | "gnomish" | "gnomish gnomads camp";
-/**
- * @param moon Moon sign name
- * @returns Moon sign id else 0
- */
-export declare function signNameToId(moon: MoonSign): number;
-/**
- * @param id Moon sign id
- * @returns Name of moon sign else "None"
- */
-export declare function signIdToName(id: number): MoonSign | "None";
 /**
  * Hops the gash, perming no skills by default
  *

package/dist/ascend.js

@@ -1,4 +1,5 @@
 import { Skill, Class, eudoraItem, getCampground, Item, Path, use, visitUrl, xpath, haveSkill, getPermedSkills, toSkill, } from "kolmafia";
+import { signNameToId } from "./moonSign";
 import { get } from "./property";
 import { ChateauMantegna } from "./resources";
 import { $item, $items, $stat } from "./template-string";
@@ -102,31 +103,6 @@ export class AscensionPrepError extends Error {
         this.cause = cause;
     }
 }
-const MoonSigns = [
-    "Mongoose",
-    "Wallaby",
-    "Vole",
-    "Platypus",
-    "Opossum",
-    "Marmot",
-    "Wombat",
-    "Blender",
-    "Packrat",
-];
-/**
- * @param moon Moon sign name
- * @returns Moon sign id else 0
- */
-export function signNameToId(moon) {
-    return MoonSigns.indexOf(moon) + 1;
-}
-/**
- * @param id Moon sign id
- * @returns Name of moon sign else "None"
- */
-export function signIdToName(id) {
-    return MoonSigns[id - 1] || "None";
-}
 /**
  * Determine the id of the appropriate moon sign.
  *

package/dist/challengePaths/2015/CommunityService.js

@@ -277,13 +277,15 @@ export default class CommunityService {
     }, new Requirement(["Spell Damage", "Spell Damage Percent"], {}));
     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;
+        const unsoftcappedRate = (rate) => rate > 25 ? 25 + (rate - 25) * 5 : rate;
         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;
+                hypotheticalModifier("Familiar Weight", ...effects), equippedItem($slot `familiar`));
+        const adjustedRate = unsoftcappedRate(noncombatRate) -
+            unsoftcappedRate(currentFamiliarModifier) +
+            unsoftcappedRate(newFamiliarModifier);
         return 60 - 3 * Math.floor(adjustedRate / 5);
     }, new Requirement(["-combat"], {}));
     static BoozeDrop = new CommunityService(9, "Item Drop", "Make Margaritas", (...effects) => {

package/dist/index.d.ts

@@ -10,12 +10,12 @@ export * from "./lib";
 export * from "./maximize";
 export { numericModifiers, statModifiers, booleanModifiers, classModifiers, monsterModifiers, effectModifiers, skillModifiers, } from "./modifierTypes";
 export * from "./mood";
+export * from "./moonSign";
 export * from "./propertyTyping";
 export * from "./resources";
 export * from "./since";
 export * from "./template-string";
 export { default as Kmail } from "./Kmail";
-export * from "./Path";
 export { default as logger } from "./logger";
 export * as console from "./console";
 export * as property from "./property";

package/dist/index.js

@@ -10,12 +10,12 @@ export * from "./lib";
 export * from "./maximize";
 export { numericModifiers, statModifiers, booleanModifiers, classModifiers, monsterModifiers, effectModifiers, skillModifiers, } from "./modifierTypes";
 export * from "./mood";
+export * from "./moonSign";
 export * from "./propertyTyping";
 export * from "./resources";
 export * from "./since";
 export * from "./template-string";
 export { default as Kmail } from "./Kmail";
-export * from "./Path";
 export { default as logger } from "./logger";
 export * as console from "./console";
 export * as property from "./property";

package/dist/maximize.d.ts

@@ -29,7 +29,7 @@ export declare function mergeMaximizeOptions(defaultOptions: MaximizeOptions, ad
  * @param options.bonusEquip Equipment to apply a bonus to ("200 bonus X").
  */
 export declare function setDefaultMaximizeOptions(options: Partial<MaximizeOptions>): void;
-declare const modeableCommands: readonly ["backupcamera", "umbrella", "snowsuit", "edpiece", "retrocape", "parka"];
+declare const modeableCommands: readonly ["backupcamera", "umbrella", "snowsuit", "edpiece", "retrocape", "parka", "jillcandle"];
 export declare type Mode = typeof modeableCommands[number];
 export declare type Modes = Partial<{
     [x in Mode]: string;
@@ -41,6 +41,7 @@ export declare const modeableItems: {
     readonly edpiece: Item;
     readonly retrocape: Item;
     readonly parka: Item;
+    readonly jillcandle: Item;
 };
 export declare const modeableState: {
     readonly backupcamera: () => string;
@@ -49,6 +50,7 @@ export declare const modeableState: {
     readonly edpiece: () => string;
     readonly retrocape: () => string;
     readonly parka: () => string;
+    readonly jillcandle: () => string;
 };
 /**
  * Get set of current modes for modeables

package/dist/maximize.js

@@ -69,6 +69,7 @@ const modeableCommands = [
     "edpiece",
     "retrocape",
     "parka",
+    "jillcandle",
 ];
 export const modeableItems = {
     backupcamera: $item `backup camera`,
@@ -77,6 +78,7 @@ export const modeableItems = {
     edpiece: $item `The Crown of Ed the Undying`,
     retrocape: $item `unwrapped knock-off retro superhero cape`,
     parka: $item `Jurassic Parka`,
+    jillcandle: $item `LED candle`,
 };
 export const modeableState = {
     backupcamera: () => getProperty("backupCameraMode"),
@@ -87,6 +89,7 @@ export const modeableState = {
         " " +
         getProperty("retroCapeWashingInstructions"),
     parka: () => getProperty("parkaMode"),
+    jillcandle: () => getProperty("ledCandleMode"),
 };
 /**
  * Get set of current modes for modeables

package/dist/moonSign.d.ts

@@ -0,0 +1,13 @@
+declare const MoonSigns: readonly ["Mongoose", "Wallaby", "Vole", "Platypus", "Opossum", "Marmot", "Wombat", "Blender", "Packrat"];
+export declare type MoonSign = typeof MoonSigns[number];
+/**
+ * @param moon Moon sign name
+ * @returns Moon sign id else 0
+ */
+export declare function signNameToId(moon: MoonSign): number;
+/**
+ * @param id Moon sign id
+ * @returns Name of moon sign else "None"
+ */
+export declare function signIdToName(id: number): MoonSign | "None";
+export {};

package/dist/moonSign.js

@@ -0,0 +1,25 @@
+const MoonSigns = [
+    "Mongoose",
+    "Wallaby",
+    "Vole",
+    "Platypus",
+    "Opossum",
+    "Marmot",
+    "Wombat",
+    "Blender",
+    "Packrat",
+];
+/**
+ * @param moon Moon sign name
+ * @returns Moon sign id else 0
+ */
+export function signNameToId(moon) {
+    return MoonSigns.indexOf(moon) + 1;
+}
+/**
+ * @param id Moon sign id
+ * @returns Name of moon sign else "None"
+ */
+export function signIdToName(id) {
+    return MoonSigns[id - 1] || "None";
+}

package/dist/property.d.ts

@@ -76,7 +76,9 @@ export declare function increment(property: NumericProperty, delta?: number, max
 export declare function decrement(property: NumericProperty, delta?: number, min?: number): number;
 declare type Properties = Partial<{
     [P in KnownProperty]: unknown;
-}>;
+}> & {
+    [x in string]: unknown;
+};
 /**
  * Sets the value of a set of mafia properties
  *
@@ -120,6 +122,7 @@ export declare function withChoices<T>(choices: {
  */
 export declare function withChoice<T>(choice: number, value: number | string, callback: () => T): T;
 export declare class PropertiesManager {
+    private static EMPTY_PREFERENCE;
     private properties;
     get storedValues(): Properties;
     /**
@@ -158,7 +161,7 @@ export declare class PropertiesManager {
      *
      * @param properties Properties for the manager to forget.
      */
-    clear(...properties: KnownProperty[]): void;
+    clear(...properties: (KnownProperty | string)[]): void;
     /**
      * Clears all properties.
      */

package/dist/property.js

@@ -1,4 +1,4 @@
-import { Bounty, Class, Coinmaster, Effect, Element, Familiar, getProperty, Item, Location, Monster, Phylum, Servant, setProperty, Skill, Slot, Stat, Thrall, toBounty, toClass, toCoinmaster, toEffect, toElement, toFamiliar, toItem, toLocation, toMonster, toPhylum, toServant, toSkill, toSlot, toStat, toThrall, } from "kolmafia";
+import { Bounty, Class, Coinmaster, Effect, Element, Familiar, getProperty, Item, Location, Monster, Phylum, propertyExists, removeProperty, Servant, setProperty, Skill, Slot, Stat, Thrall, toBounty, toClass, toCoinmaster, toEffect, toElement, toFamiliar, toItem, toLocation, toMonster, toPhylum, toServant, toSkill, toSlot, toStat, toThrall, } from "kolmafia";
 import { isBooleanProperty, isFamiliarProperty, isLocationProperty, isMonsterProperty, isNumericOrStringProperty, isNumericProperty, isPhylumProperty, isStatProperty, isStringProperty, } from "./propertyTyping";
 const createPropertyGetter = (transform) => (property, default_) => {
     const value = getProperty(property);
@@ -204,6 +204,7 @@ export function withChoice(choice, value, callback) {
     return withChoices({ [choice]: value }, callback);
 }
 export class PropertiesManager {
+    static EMPTY_PREFERENCE = Symbol("empty preference");
     properties = {};
     get storedValues() {
         return this.properties;
@@ -215,8 +216,10 @@ export class PropertiesManager {
      */
     set(propertiesToSet) {
         for (const [propertyName, propertyValue] of Object.entries(propertiesToSet)) {
-            if (this.properties[propertyName] === undefined) {
-                this.properties[propertyName] = get(propertyName);
+            if (!(propertyName in this.properties)) {
+                this.properties[propertyName] = propertyExists(propertyName)
+                    ? get(propertyName)
+                    : PropertiesManager.EMPTY_PREFERENCE;
             }
             set(propertyName, propertyValue);
         }
@@ -248,10 +251,18 @@ export class PropertiesManager {
      */
     reset(...properties) {
         for (const property of properties) {
+            if (!(property in this.properties))
+                continue;
             const value = this.properties[property];
-            if (value) {
+            if (value === PropertiesManager.EMPTY_PREFERENCE) {
+                removeProperty(property);
+            }
+            else if (value) {
                 set(property, value);
             }
+            else {
+                set(property, "");
+            }
         }
     }
     /**