libram 0.8.25 → 0.8.27

package/dist/lib.d.ts

@@ -488,4 +488,10 @@ export declare function withCombatFlags<T>(action: () => T, ...flags: {
     flag: AccountCombatFlag;
     value: boolean;
 }[]): T;
+/**
+ * Determines whether you currently have an effect intrinsically
+ * @param effect The effect in question
+ * @returns Whether you have that effect as an intrinsic. Alternately you could just have over 2147483647 turns of that effect, but that seems unlikely.
+ */
+export declare function haveIntrinsic(effect: Effect): boolean;
 export {};

package/dist/lib.js

@@ -948,3 +948,11 @@ export function withCombatFlags(action, ...flags) {
         setCombatFlags(...initialValues);
     }
 }
+/**
+ * Determines whether you currently have an effect intrinsically
+ * @param effect The effect in question
+ * @returns Whether you have that effect as an intrinsic. Alternately you could just have over 2147483647 turns of that effect, but that seems unlikely.
+ */
+export function haveIntrinsic(effect) {
+    return haveEffect(effect) >= 2147483647;
+}

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

@@ -3,7 +3,7 @@ import { Effect, Item } from "kolmafia";
  * @returns whether you `have` the Apriling band helmet
  */
 export declare function have(): boolean;
-export declare const MARCHING_SONGS: readonly ["Patrol Beat", "Battle Cadence", "Celebration Bop"];
+export declare const MARCHING_SONGS: readonly ["Apriling Band Patrol Beat", "Apriling Band Battle Cadence", "Apriling Band Celebration Bop"];
 export declare type MarchingSong = typeof MARCHING_SONGS[number];
 export declare const MARCHING_SONG_EFFECTS: readonly Effect[];
 export declare const INSTRUMENTS: readonly ["Apriling band saxophone", "Apriling band quad tom", "Apriling band tuba", "Apriling band staff", "Apriling band piccolo"];
@@ -32,7 +32,7 @@ export declare function canChangeSong(): boolean;
  *
  * @returns Whether we have the effect, at the end of all things
  */
-export declare const changeSong: (input: Effect | "Patrol Beat" | "Battle Cadence" | "Celebration Bop") => boolean;
+export declare const changeSong: (input: Effect | "Apriling Band Patrol Beat" | "Apriling Band Battle Cadence" | "Apriling Band Celebration Bop") => boolean;
 /**
  * Conduct your Apriling band helmet
  *
@@ -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

@@ -1,4 +1,4 @@
-import { Effect, Item, MafiaClass, myHash, runChoice, toEffect, toItem, totalTurnsPlayed, visitUrl, } from "kolmafia";
+import { Effect, Item, myHash, runChoice, toEffect, toItem, totalTurnsPlayed, visitUrl, } from "kolmafia";
 import { have as have_ } from "../../lib";
 import { get } from "../../property";
 import { $item } from "../../template-string";
@@ -11,9 +11,9 @@ export function have() {
     return have_(helmet);
 }
 export const MARCHING_SONGS = Object.freeze([
-    "Patrol Beat",
-    "Battle Cadence",
-    "Celebration Bop",
+    "Apriling Band Patrol Beat",
+    "Apriling Band Battle Cadence",
+    "Apriling Band Celebration Bop",
 ]);
 export const MARCHING_SONG_EFFECTS = Object.freeze(MARCHING_SONGS.map((song) => toEffect(song)));
 export const INSTRUMENTS = Object.freeze([
@@ -35,9 +35,9 @@ function makeConductFunction(mafiaClass, canDo, set, offset) {
     return (input) => {
         if (!canDo())
             return false;
-        const [name, instance] = input instanceof MafiaClass
-            ? [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);
@@ -56,7 +56,7 @@ function makeConductFunction(mafiaClass, canDo, set, offset) {
  *
  * @returns Whether we have the item, at the end of all things
  */
-export const joinSection = makeConductFunction(Item, canJoinSection, INSTRUMENTS, 1);
+export const joinSection = makeConductFunction(Item, canJoinSection, INSTRUMENTS, 4);
 /**
  * @returns Whether we can currently change the marching song of our Apriling Band
  */
@@ -70,7 +70,7 @@ export function canChangeSong() {
  *
  * @returns Whether we have the effect, at the end of all things
  */
-export const changeSong = makeConductFunction(Effect, canChangeSong, MARCHING_SONGS, 4);
+export const changeSong = makeConductFunction(Effect, canChangeSong, MARCHING_SONGS, 1);
 /**
  * Conduct your Apriling band helmet
  *
@@ -92,11 +92,27 @@ export function conduct(result) {
  */
 export function play(instrument, acquire = false) {
     const item = instrument instanceof Item ? instrument : Item.get(instrument);
-    if (!(acquire ? joinSection : have_)(item))
+    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.25",
+  "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",