isaacscript-common 29.5.1 → 29.5.3

package/package.json

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

package/src/classes/features/callbackLogic/EsauJrDetection.ts

@@ -34,7 +34,7 @@ export class EsauJrDetection extends Feature {
       // 3
       [
         ModCallback.POST_USE_ITEM,
-        this.useItemEsauJr,
+        this.postUseItemEsauJr,
         [CollectibleType.ESAU_JR],
       ],
     ];
@@ -81,7 +81,7 @@ export class EsauJrDetection extends Feature {
 
   // ModCallback.POST_USE_ITEM (3)
   // CollectibleType.ESAU_JR (703)
-  private useItemEsauJr = (
+  private postUseItemEsauJr = (
     _collectibleType: CollectibleType,
     _rng: RNG,
     player: EntityPlayer,

package/src/classes/features/callbackLogic/FlipDetection.ts

@@ -27,7 +27,7 @@ export class FlipDetection extends Feature {
 
     this.callbacksUsed = [
       // 3
-      [ModCallback.POST_USE_ITEM, this.useItemFlip, [CollectibleType.FLIP]],
+      [ModCallback.POST_USE_ITEM, this.postUseItemFlip, [CollectibleType.FLIP]],
     ];
 
     this.postFlip = postFlip;
@@ -36,7 +36,7 @@ export class FlipDetection extends Feature {
 
   // ModCallback.POST_USE_ITEM (3)
   // CollectibleType.FLIP (711)
-  private useItemFlip = (
+  private postUseItemFlip = (
     _collectibleType: CollectibleType,
     _rng: RNG,
     player: EntityPlayer,

package/src/classes/features/callbackLogic/GameReorderedCallbacks.ts

@@ -52,7 +52,7 @@ export class GameReorderedCallbacks extends Feature {
       // 3
       [
         ModCallback.POST_USE_ITEM,
-        this.useItemGlowingHourGlass,
+        this.postUseItemGlowingHourGlass,
         [CollectibleType.GLOWING_HOUR_GLASS],
       ],
 
@@ -77,7 +77,7 @@ export class GameReorderedCallbacks extends Feature {
 
   // ModCallback.POST_USE_ITEM (3)
   // CollectibleType.GLOWING_HOUR_GLASS (422)
-  private useItemGlowingHourGlass = (): boolean | undefined => {
+  private postUseItemGlowingHourGlass = (): boolean | undefined => {
     // If Glowing Hourglass is used on the first room of a floor, it will send the player to the
     // previous floor without triggering the `POST_NEW_LEVEL` callback. Manually check for this.
     this.usedGlowingHourGlass = true;

package/src/classes/features/callbackLogic/PlayerCollectibleDetection.ts

@@ -63,7 +63,7 @@ export class PlayerCollectibleDetection extends Feature {
 
     this.callbacksUsed = [
       // 3
-      [ModCallback.POST_USE_ITEM, this.useItemD4, [CollectibleType.D4]],
+      [ModCallback.POST_USE_ITEM, this.postUseItemD4, [CollectibleType.D4]],
     ];
 
     this.customCallbacksUsed = [
@@ -135,7 +135,7 @@ export class PlayerCollectibleDetection extends Feature {
 
   // ModCallback.POST_USE_ITEM (3)
   // CollectibleType.D4 (284)
-  private useItemD4 = (
+  private postUseItemD4 = (
     _collectibleType: CollectibleType,
     _rng: RNG,
     player: EntityPlayer,

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

@@ -1,9 +1,11 @@
 import {
   CardType,
   CollectibleType,
+  DiceFloorSubType,
   ModCallback,
   PickupVariant,
 } from "isaac-typescript-definitions";
+import { game } from "../../../core/cachedClasses";
 import { Exported } from "../../../decorators";
 import { ISCFeature } from "../../../enums/ISCFeature";
 import { ModCallbackCustom } from "../../../enums/ModCallbackCustom";
@@ -13,12 +15,27 @@ import { getCollectibles } from "../../../functions/pickupsSpecific";
 import { isCollectible } from "../../../functions/pickupVariants";
 import { asCollectibleType } from "../../../functions/types";
 import { PickupIndex } from "../../../types/PickupIndex";
+import { ReadonlySet } from "../../../types/ReadonlySet";
 import { Feature } from "../../private/Feature";
 import { PickupIndexCreation } from "./PickupIndexCreation";
 
+const ROLL_COLLECTIBLE_TYPES = new ReadonlySet([
+  // The `PRE_USE_ITEM` D6 callback is fired for D6, D100, Dice Shard, 4-pip Dice Room, and 6-pip
+  // Dice Room.
+  CollectibleType.D6, // 105
+  CollectibleType.ETERNAL_D6, // 609
+  CollectibleType.SPINDOWN_DICE, // 723
+]);
+
+const ROLL_FLOOR_DICE_FLOOR_SUB_TYPES = new ReadonlySet([
+  DiceFloorSubType.FOUR_PIP,
+  DiceFloorSubType.SIX_PIP,
+]);
+
 const v = {
   run: {
     trackedCollectibles: new Map<PickupIndex, CollectibleType>(),
+    rollGameFrame: null as int | null,
   },
 };
 
@@ -38,25 +55,39 @@ export class PreventCollectibleRotation extends Feature {
       // 5
       [
         ModCallback.POST_USE_CARD,
-        this.useCardSoulOfIsaac,
+        this.postUseCardSoulOfIsaac,
         [CardType.SOUL_ISAAC],
       ],
+
+      // 23, 105
+      [ModCallback.PRE_USE_ITEM, this.preUseItem],
     ];
 
     this.customCallbacksUsed = [
+      [ModCallbackCustom.POST_DICE_ROOM_ACTIVATED, this.postDiceRoomActivated],
       [ModCallbackCustom.POST_PICKUP_CHANGED, this.postPickupChanged],
     ];
 
     this.pickupIndexCreation = pickupIndexCreation;
   }
 
+  private preUseItem = (
+    collectibleType: CollectibleType,
+  ): boolean | undefined => {
+    if (ROLL_COLLECTIBLE_TYPES.has(collectibleType)) {
+      v.run.rollGameFrame = game.GetFrameCount();
+    }
+
+    return undefined;
+  };
+
   /**
    * Soul of Isaac causes items to flip. We assume that the player deliberately wants to roll a
    * quest item, so we delete all tracked items in the current room.
    */
   // ModCallback.POST_USE_CARD (5)
   // Card.SOUL_ISAAC (81)
-  private useCardSoulOfIsaac = () => {
+  private postUseCardSoulOfIsaac = () => {
     const collectibles = getCollectibles();
     for (const collectible of collectibles) {
       const pickupIndex = this.pickupIndexCreation.getPickupIndex(collectible);
@@ -64,6 +95,16 @@ export class PreventCollectibleRotation extends Feature {
     }
   };
 
+  // ModCallbackCustom.POST_DICE_ROOM_ACTIVATED
+  private postDiceRoomActivated = (
+    _player: EntityPlayer,
+    diceFloorSubType: DiceFloorSubType,
+  ) => {
+    if (ROLL_FLOOR_DICE_FLOOR_SUB_TYPES.has(diceFloorSubType)) {
+      v.run.trackedCollectibles.clear();
+    }
+  };
+
   // ModCallbackCustom.POST_PICKUP_CHANGED
   private postPickupChanged = (
     pickup: EntityPickup,
@@ -91,6 +132,17 @@ export class PreventCollectibleRotation extends Feature {
       return;
     }
 
+    // It can take a frame after the activation of the D6 for the sub-type to change.
+    const gameFrameCount = game.GetFrameCount();
+    if (
+      v.run.rollGameFrame !== null &&
+      (gameFrameCount === v.run.rollGameFrame ||
+        gameFrameCount === v.run.rollGameFrame + 1)
+    ) {
+      v.run.trackedCollectibles.delete(pickupIndex);
+      return;
+    }
+
     if (trackedCollectibleType !== asCollectibleType(newSubType)) {
       // This collectible has rotated, so restore it back to the way it was.
       setCollectibleSubType(pickup, trackedCollectibleType);

package/src/functions/utils.ts

@@ -176,6 +176,8 @@ export function repeat(n: int, func: (i: int) => void): void {
  * useful as a means to prevent unused variables.)
  *
  * This function does not actually do anything. (It is an "empty" function.)
+ *
+ * @allowEmptyVariadic
  */
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 export function todo(...args: unknown[]): void {}