isaacscript-common 30.4.4 → 30.4.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "30.4.4",
+  "version": "30.4.6",
   "description": "Helper functions and features for IsaacScript mods.",
   "keywords": [
     "isaac",

package/src/classes/callbacks/PostPurchase.ts

@@ -1,3 +1,10 @@
+import {
+  CardType,
+  CollectibleType,
+  ModCallback,
+  PillEffect,
+} from "isaac-typescript-definitions";
+import { game } from "../../core/cachedClasses";
 import { ModCallbackCustom } from "../../enums/ModCallbackCustom";
 import { getPickups } from "../../functions/entitiesSpecific";
 import {
@@ -19,6 +26,7 @@ const v = {
     playersHoldingItemOnLastFrameMap: new DefaultMap<PlayerIndex, boolean>(
       false,
     ),
+    playersUsedItemOnFrame: new DefaultMap<PlayerIndex, int>(0),
   },
 };
 
@@ -28,6 +36,17 @@ export class PostPurchase extends CustomCallback<T> {
   constructor() {
     super();
 
+    this.callbacksUsed = [
+      // 3
+      [ModCallback.POST_USE_ITEM, this.postUseItem],
+
+      // 5
+      [ModCallback.POST_USE_CARD, this.postUseCard],
+
+      // 10
+      [ModCallback.POST_USE_PILL, this.postUsePill],
+    ];
+
     this.customCallbacksUsed = [
       [
         ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED,
@@ -51,6 +70,28 @@ export class PostPurchase extends CustomCallback<T> {
     );
   };
 
+  // ModCallback.POST_USE_ITEM (3)
+  private postUseItem = (
+    _collectibleType: CollectibleType,
+    _rng: RNG,
+    player: EntityPlayer,
+  ): boolean | undefined => {
+    markUsedItemOnThisFrame(player);
+    return undefined;
+  };
+
+  // ModCallback.POST_USE_CARD (5)
+  private postUseCard = (_cardType: CardType, player: EntityPlayer) => {
+    markUsedItemOnThisFrame(player);
+    return undefined;
+  };
+
+  // ModCallback.POST_USE_PILL (10)
+  private postUsePill = (_pillEffect: PillEffect, player: EntityPlayer) => {
+    markUsedItemOnThisFrame(player);
+    return undefined;
+  };
+
   // ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED
   private postPEffectUpdateReordered = (player: EntityPlayer) => {
     const isHoldingItem = player.IsHoldingItem();
@@ -64,11 +105,29 @@ export class PostPurchase extends CustomCallback<T> {
       isHoldingItem,
     );
 
-    if (!wasHoldingItemOnLastFrame && isHoldingItem) {
+    // Assume that if the player did not use an active item, card, or pill recently, then they
+    // purchased an item.
+    if (
+      !wasHoldingItemOnLastFrame &&
+      isHoldingItem &&
+      !this.playerUsedItemRecently(player)
+    ) {
       this.playerPickedUpNewItem(player);
     }
   };
 
+  private playerUsedItemRecently(player: EntityPlayer): boolean {
+    const gameFrameCount = game.GetFrameCount();
+    const usedCollectibleOnFrame = defaultMapGetPlayer(
+      v.room.playersUsedItemOnFrame,
+      player,
+    );
+    return (
+      gameFrameCount === usedCollectibleOnFrame ||
+      gameFrameCount === usedCollectibleOnFrame + 1
+    );
+  }
+
   private playerPickedUpNewItem(player: EntityPlayer) {
     const pickups = getPickups();
     const disappearingPickup = pickups.find(
@@ -79,3 +138,8 @@ export class PostPurchase extends CustomCallback<T> {
     }
   }
 }
+
+function markUsedItemOnThisFrame(player: EntityPlayer) {
+  const gameFrameCount = game.GetFrameCount();
+  mapSetPlayer(v.room.playersUsedItemOnFrame, player, gameFrameCount);
+}

package/src/classes/features/other/CustomStages.ts

@@ -26,6 +26,7 @@ import { removeUrnRewards } from "../../../functions/rockAlt";
 import {
   getRoomDataForTypeVariant,
   getRoomsInsideGrid,
+  inRoomType,
 } from "../../../functions/rooms";
 import { getMusicForStage } from "../../../functions/sound";
 import { setStage } from "../../../functions/stage";
@@ -203,6 +204,17 @@ export class CustomStages extends Feature {
 
     streakTextPostRender();
     versusScreenPostRender(this.pause, this.disableAllSound);
+
+    // Fix the bug where the music will stop after loading a new room. (This does not work if placed
+    // in the `POST_NEW_ROOM_REORDERED` callback or the `POST_UPDATE` callback.)
+    if (customStage.music !== undefined) {
+      const currentMusic = musicManager.GetCurrentMusicID();
+      const music = Isaac.GetMusicIdByName(customStage.music);
+      if (currentMusic === music) {
+        musicManager.Resume();
+        musicManager.UpdateVolume();
+      }
+    }
   };
 
   // ModCallback.POST_CURSE_EVAL (12)
@@ -293,6 +305,16 @@ export class CustomStages extends Feature {
       this.pause,
       this.runInNFrames,
     );
+
+    // Fix the bug where music from special rooms (like the "Boss Over" music) will persist for the
+    // rest of the floor.
+    if (customStage.music !== undefined && inRoomType(RoomType.DEFAULT)) {
+      const music = Isaac.GetMusicIdByName(customStage.music);
+      const currentMusic = musicManager.GetCurrentMusicID();
+      if (currentMusic !== music) {
+        musicManager.Fadein(music);
+      }
+    }
   };
 
   /** Pick a custom room for each vanilla room. */
@@ -501,10 +523,9 @@ export class CustomStages extends Feature {
         : customStageMusic;
 
     this.runInNFrames.runInNRenderFrames(() => {
-      // By default, the `MusicManager.Play` method will play the music at max volume (1.0), which
-      // is around twice as loud as the vanilla music plays.
       musicManager.Enable();
-      musicManager.Crossfade(music);
+      musicManager.Play(music);
+      musicManager.UpdateVolume();
     }, MUSIC_DELAY_RENDER_FRAMES);
 
     // We must reload the current room in order for the `Level.SetStage` method to take effect.