libram 0.8.3 → 0.8.5

package/dist/Clan.js

@@ -1,3 +1,4 @@
+import { decode as decodeEntities } from "html-entities";
 import { availableAmount, cliExecute, getClanId, getClanName, getPlayerId, Monster, putStash, refreshStash, retrieveItem, stashAmount, takeStash, visitUrl, xpath, } from "kolmafia";
 import { getFoldGroup } from "./lib";
 import logger from "./logger";
@@ -114,7 +115,7 @@ export class Clan {
         return xpath(page, '//select[@name="whichclan"]//option').map((option) => {
             const validHtml = `<select>${option}</select>`;
             const id = Number.parseInt(xpath(validHtml, "//@value")[0]);
-            const name = xpath(validHtml, "//text()")[0];
+            const name = decodeEntities(xpath(validHtml, "//text()")[0]);
             return new Clan(id, name);
         });
     }
@@ -174,9 +175,9 @@ export class Clan {
             const id = xpath(validHtml, "//@value")[0];
             if (!match || !id)
                 return null;
-            const [, name, degree] = match;
+            const [, encodedName, degree] = match;
             return {
-                name,
+                name: decodeEntities(encodedName),
                 degree: Number.parseInt(degree),
                 id: Number.parseInt(id),
             };

package/dist/Kmail.d.ts

@@ -11,7 +11,7 @@ declare type RawKmail = {
 export default class Kmail {
     readonly id: number;
     readonly date: Date;
-    readonly type: "normal";
+    readonly type: "normal" | "giftshop";
     readonly senderId: number;
     readonly senderName: string;
     readonly rawMessage: string;

package/dist/challengePaths/2015/CommunityService.js

@@ -91,11 +91,11 @@ export default class CommunityService {
         }
     }
     static logTask(name, action) {
-        const estimatedTurns = action() ?? 0;
         const { time, turns } = this.taskTimers.get(name) ?? {
             time: Date.now(),
             turns: myTurncount(),
         };
+        const estimatedTurns = action() ?? 0;
         CommunityService.log[name] = {
             type: "task",
             turnCost: myTurncount() - turns,

package/dist/property.d.ts

@@ -44,18 +44,36 @@ export declare function get(property: string, _default: Familiar): Familiar | nu
 export declare function get(property: string, _default: boolean): boolean;
 export declare function get(property: string, _default: number): number;
 export declare function get(property: string, _default?: string): string;
-export declare function set(property: BooleanProperty, value: boolean): void;
-export declare function set(property: NumericProperty, value: number): void;
-export declare function set(property: NumericOrStringProperty, value: number | string): void;
-export declare function set(property: StringProperty, value: string): void;
-export declare function set(property: LocationProperty, value: Location): void;
-export declare function set(property: MonsterProperty, value: Monster): void;
-export declare function set(property: FamiliarProperty, value: Familiar): void;
-export declare function set(property: StatProperty, value: Stat): void;
-export declare function set(property: PhylumProperty, value: Phylum): void;
+export declare function set(property: BooleanProperty, value: boolean): boolean;
+export declare function set(property: NumericProperty, value: number): number;
+export declare function set<T extends number | string>(property: NumericOrStringProperty, value: T): T;
+export declare function set(property: StringProperty, value: string): string;
+export declare function set(property: LocationProperty, value: Location): Location;
+export declare function set(property: MonsterProperty, value: Monster): Monster;
+export declare function set(property: FamiliarProperty, value: Familiar): Familiar;
+export declare function set(property: StatProperty, value: Stat): Stat;
+export declare function set(property: PhylumProperty, value: Phylum): Phylum;
 export declare function set<D extends {
     toString(): string;
-}>(property: string, value: D): void;
+}>(property: string, value: D): D;
+/**
+ * Increment a property
+ *
+ * @param property Numeric property to increment
+ * @param delta Number by which to increment
+ * @param max Maximum value to set
+ * @returns New value
+ */
+export declare function increment(property: NumericProperty, delta?: number, max?: number): number;
+/**
+ * Decrement a property
+ *
+ * @param property Numeric property to decrement
+ * @param delta Number by which to decrement
+ * @param min Maximum value to set
+ * @returns New value
+ */
+export declare function decrement(property: NumericProperty, delta?: number, min?: number): number;
 declare type Properties = Partial<{
     [P in KnownProperty]: unknown;
 }>;

package/dist/property.js

@@ -103,10 +103,42 @@ export function get(property, _default) {
  *
  * @param property Name of the property
  * @param value Value to give the property
+ * @returns Value that was set
  */
 export function set(property, value) {
     const stringValue = value === null ? "" : value.toString();
     setProperty(property, stringValue);
+    return value;
+}
+/**
+ * Increment a property
+ *
+ * @param property Numeric property to increment
+ * @param delta Number by which to increment
+ * @param max Maximum value to set
+ * @returns New value
+ */
+export function increment(property, delta = 1, max = Infinity) {
+    const value = get(property);
+    if (!isNumericProperty(property))
+        return value;
+    const nextValue = Math.min(max, value + delta);
+    return set(property, nextValue);
+}
+/**
+ * Decrement a property
+ *
+ * @param property Numeric property to decrement
+ * @param delta Number by which to decrement
+ * @param min Maximum value to set
+ * @returns New value
+ */
+export function decrement(property, delta = 1, min = Infinity) {
+    const value = get(property);
+    if (!isNumericProperty(property))
+        return value;
+    const nextValue = Math.max(min, value - delta);
+    return set(property, nextValue);
 }
 /**
  * Sets the value of a set of mafia properties