libram 0.8.26 → 0.8.27

package/dist/resources/2024/AprilingBandHelmet.d.ts

@@ -48,3 +48,10 @@ export declare function conduct(result: Item | Instrument | Effect | MarchingSon
  * @returns Whether we successfully played our instrument
  */
 export declare function play(instrument: Instrument | Item, acquire?: boolean): boolean;
+/**
+ * Determine whether you can play an instrument
+ * @param instrument The instrument you want to play
+ * @param acquire Whether you're willing to obtain an instrument you don't already have
+ * @returns Whether you can play that instrument
+ */
+export declare function canPlay(instrument: Instrument | Item, acquire?: boolean): boolean;

package/dist/resources/2024/AprilingBandHelmet.js

@@ -35,9 +35,9 @@ function makeConductFunction(mafiaClass, canDo, set, offset) {
     return (input) => {
         if (!canDo())
             return false;
-        const [name, instance] = typeof input === "object"
-            ? [input.toString(), input]
-            : [input, mafiaClass.get(input)];
+        const [name, instance] = typeof input === "string"
+            ? [input, mafiaClass.get(input)]
+            : [input.name, input];
         if (have_(instance))
             return true;
         const key = set.indexOf(name);
@@ -78,8 +78,7 @@ export const changeSong = makeConductFunction(Effect, canChangeSong, MARCHING_SO
  * @returns Whether we successfully completed the task
  */
 export function conduct(result) {
-    if ((typeof result === "object" && result instanceof Item) ||
-        arrayContains(result, INSTRUMENTS)) {
+    if (result instanceof Item || arrayContains(result, INSTRUMENTS)) {
         return joinSection(result);
     }
     return changeSong(result);
@@ -92,12 +91,28 @@ export function conduct(result) {
  * @returns Whether we successfully played our instrument
  */
 export function play(instrument, acquire = false) {
-    const item = typeof instrument === "object" ? instrument : Item.get(instrument);
-    if (!(acquire ? joinSection : have_)(item))
+    const item = instrument instanceof Item ? instrument : Item.get(instrument);
+    if (!canPlay(instrument, acquire))
         return false;
+    if (acquire && !have_(item))
+        joinSection(item);
     const currentUsesRemaining = item.dailyusesleft;
-    if (currentUsesRemaining <= 0)
-        return false;
     visitUrl(`inventory.php?pwd=${myHash()}&iid=${item.id}&action=aprilplay`, false);
     return item.dailyusesleft !== currentUsesRemaining;
 }
+/**
+ * Determine whether you can play an instrument
+ * @param instrument The instrument you want to play
+ * @param acquire Whether you're willing to obtain an instrument you don't already have
+ * @returns Whether you can play that instrument
+ */
+export function canPlay(instrument, acquire = false) {
+    if (!have())
+        return false;
+    const item = instrument instanceof Item ? instrument : Item.get(instrument);
+    if (!have_(item) && (!acquire || !canJoinSection()))
+        return false;
+    if (item.dailyusesleft <= 0)
+        return false;
+    return true;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "libram",
-  "version": "0.8.26",
+  "version": "0.8.27",
   "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.27668.0",
+    "kolmafia": "^5.27901.0",
     "lint-staged": ">=10",
     "node-fetch": "^2.6.1",
     "prettier": "^2.1.2",