libram 0.6.10 → 0.6.11

package/dist/ascend.d.ts

@@ -7,6 +7,10 @@ export declare enum Lifestyle {
     normal = 2,
     hardcore = 3
 }
+export declare class AscendError extends Error {
+    cause?: Skill | Item | Class | Path;
+    constructor(cause?: Skill | Item | Class | Path);
+}
 declare type MoonSign = number | "mongoose" | "wallaby" | "vole" | "platypus" | "opossum" | "marmot" | "wombat" | "blender" | "packrat" | "degrassi" | "degrassi knoll" | "friendly degrassi knoll" | "knoll" | "canada" | "canadia" | "little canadia" | "gnomads" | "gnomish" | "gnomish gnomads camp";
 /**
  * Hops the gash, perming no skills

package/dist/ascend.js

@@ -1,4 +1,4 @@
-import { containsText, eudoraItem, getCampground, getWorkshed, Item, toInt, use, visitUrl, xpath, haveSkill, } from "kolmafia";
+import { Skill, Class, containsText, eudoraItem, getCampground, getWorkshed, Item, toInt, use, visitUrl, xpath, haveSkill, } from "kolmafia";
 import { ChateauMantegna } from "./resources";
 import { $item, $items, $stat } from "./template-string";
 export var Lifestyle;
@@ -8,6 +8,32 @@ export var Lifestyle;
     Lifestyle[Lifestyle["normal"] = 2] = "normal";
     Lifestyle[Lifestyle["hardcore"] = 3] = "hardcore";
 })(Lifestyle || (Lifestyle = {}));
+export class AscendError extends Error {
+    cause;
+    constructor(cause) {
+        if (!cause) {
+            super("Failed to ascend--do you have a pending trade offer?");
+        }
+        else if (cause instanceof Skill) {
+            const reason = cause.permable
+                ? haveSkill(cause)
+                    ? "invalid for mysterious reasons"
+                    : "not a skill you currently know"
+                : "unpermable";
+            super(`Skill ${cause} is ${reason}!`);
+        }
+        else if (cause instanceof Item) {
+            super(`Invalid astral item: ${cause}!`);
+        }
+        else if (cause instanceof Class) {
+            super(`Invalid class ${cause} for this path!`);
+        }
+        else {
+            super(`Invalid path ${cause}!`);
+        }
+        this.cause = cause;
+    }
+}
 function toMoonId(moon, playerClass) {
     if (typeof moon === "number")
         return moon;
@@ -70,32 +96,32 @@ function toMoonId(moon, playerClass) {
  */
 export function ascend(path, playerClass, lifestyle, moon, consumable = $item `astral six-pack`, pet = undefined, permSkills = undefined) {
     if (!path.classes.includes(playerClass)) {
-        throw new Error(`Invalid class ${playerClass} for this path`);
+        throw new AscendError(playerClass);
     }
     if (path.id < 0)
-        throw new Error(`Invalid path ID ${path.id}`);
+        throw new AscendError(path);
     const moonId = toMoonId(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)) {
-        throw new Error(`Invalid consumable ${consumable}!`);
+        throw new AscendError(consumable);
     }
     if (pet &&
         !$items `astral bludgeon, astral shield, astral chapeau, astral bracer, astral longbow, astral shorts, astral mace, astral ring, astral statuette, astral pistol, astral mask, astral pet sweater, astral shirt, astral belt`.includes(pet)) {
-        throw new Error(`Invalid astral item ${pet}!`);
+        throw new AscendError(pet);
     }
     const illegalSkill = permSkills
         ? Array.from(permSkills.keys()).find((skill) => !skill.permable || !haveSkill(skill))
         : undefined;
     if (illegalSkill) {
-        throw new Error(`Invalid skill ${illegalSkill}!`);
+        throw new AscendError(illegalSkill);
     }
     if (!containsText(visitUrl("charpane.php"), "Astral Spirit")) {
         visitUrl("ascend.php?action=ascend&confirm=on&confirm2=on");
     }
     if (!containsText(visitUrl("charpane.php"), "Astral Spirit")) {
-        throw new Error("Failed to ascend.");
+        throw new AscendError();
     }
     visitUrl("afterlife.php?action=pearlygates");
     if (consumable) {

package/dist/challengePaths/2015/CommunityService.js

@@ -223,7 +223,8 @@ export default class CommunityService {
     }, new Requirement(["Spell Damage", "Spell Damage Percent"], {}));
     static Noncombat = new CommunityService(8, "Non-Combat", "Be a Living Statue", () => {
         const noncombatRate = -1 * getModifier("Combat Rate");
-        return 60 - 3 * Math.floor(noncombatRate / 5);
+        const unsoftcappedRate = noncombatRate > 25 ? 25 + (noncombatRate - 25) * 5 : noncombatRate;
+        return 60 - 3 * Math.floor(unsoftcappedRate / 5);
     }, new Requirement(["-combat"], {}));
     static BoozeDrop = new CommunityService(9, "Item Drop", "Make Margaritas", () => {
         const mummingCostume = MummingTrunk.currentCostumes().get(myFamiliar());

package/dist/resources/2013/Florist.d.ts

@@ -9,8 +9,8 @@ declare class Flower {
     modifier: Modifiers | SpecialFlowerAbility;
     territorial: boolean;
     constructor(name: string, id: number, environment: EnvironmentType, modifier: Modifiers | SpecialFlowerAbility, territorial?: boolean);
-    static plantNamesInZone(location?: Location): string[] | null;
-    static plantsInZone(location?: Location): Flower[] | null;
+    static plantNamesInZone(location?: Location): string[];
+    static plantsInZone(location?: Location): Flower[];
     static modifiersInZone(location?: Location): Modifiers;
     isPlantedHere(location?: Location): boolean;
     available(location?: Location): boolean;

package/dist/resources/2013/Florist.js

@@ -15,12 +15,12 @@ class Flower {
         this.territorial = territorial;
     }
     static plantNamesInZone(location = myLocation()) {
-        return getFloristPlants()[location.toString()] ?? null;
+        return getFloristPlants()[location.toString()] ?? [];
     }
     static plantsInZone(location = myLocation()) {
-        return (this.plantNamesInZone(location)
-            ?.map((flowerName) => toFlower(flowerName))
-            .filter((flower) => flower !== undefined) ?? null);
+        return this.plantNamesInZone(location)
+            .map((flowerName) => toFlower(flowerName))
+            .filter((flower) => flower !== undefined);
     }
     static modifiersInZone(location = myLocation()) {
         const plants = this.plantsInZone(location);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "libram",
-  "version": "0.6.10",
+  "version": "0.6.11",
   "description": "JavaScript helper library for KoLmafia",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",