isaacscript-common 29.5.1 → 29.5.2

package/dist/index.rollup.d.ts

@@ -3875,7 +3875,7 @@ declare class EsauJrDetection extends Feature {
     private postFirstEsauJr;
     constructor(postEsauJr: PostEsauJr, postFirstEsauJr: PostFirstEsauJr);
     private postUpdate;
-    private useItemEsauJr;
+    private postUseItemEsauJr;
 }
 
 /**
@@ -4110,7 +4110,7 @@ declare class FlipDetection extends Feature {
     private postFlip;
     private postFirstFlip;
     constructor(postFlip: PostFlip, postFirstFlip: PostFirstFlip);
-    private useItemFlip;
+    private postUseItemFlip;
 }
 
 declare class FlyingDetection extends Feature {
@@ -4204,7 +4204,7 @@ declare class GameReorderedCallbacks extends Feature {
     private postNewLevelReordered;
     private postNewRoomReordered;
     private postGameStartedReorderedLast;
-    private useItemGlowingHourGlass;
+    private postUseItemGlowingHourGlass;
     private postGameStarted;
     private postNewLevel;
     private postNewRoom;
@@ -13177,7 +13177,7 @@ declare class PlayerCollectibleDetection extends Feature {
      *                               rerolled.
      */
     private updateCollectibleMapAndFire;
-    private useItemD4;
+    private postUseItemD4;
     /** We need to handle the case of Tainted Eden taking damage. */
     private entityTakeDmgPlayer;
     /**
@@ -13533,11 +13533,13 @@ declare class PreventChildEntities extends Feature {
 
 declare class PreventCollectibleRotation extends Feature {
     private pickupIndexCreation;
+    private preUseItem;
     /**
      * 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.
      */
-    private useCardSoulOfIsaac;
+    private postUseCardSoulOfIsaac;
+    private postDiceRoomActivated;
     private postPickupChanged;
     /**
      * Helper function to prevent a collectible from being affected by Tainted Isaac's rotation
@@ -16354,6 +16356,8 @@ export declare const TIME_GAME_OPENED: number;
  * useful as a means to prevent unused variables.)
  *
  * This function does not actually do anything. (It is an "empty" function.)
+ *
+ * @allowEmptyVariadic
  */
 export declare function todo(...args: unknown[]): void;
 

package/dist/isaacscript-common.lua

@@ -1,6 +1,6 @@
 --[[
 
-isaacscript-common 29.5.1
+isaacscript-common 29.5.2
 
 This is the "isaacscript-common" library, which was created with the IsaacScript tool.
 
@@ -34244,13 +34244,13 @@ function EsauJrDetection.prototype.____constructor(self, postEsauJr, postFirstEs
         end
         self.postEsauJr:fire(player)
     end
-    self.useItemEsauJr = function(____, _collectibleType, _rng, player, _useFlags, _activeSlot, _customVarData)
+    self.postUseItemEsauJr = function(____, _collectibleType, _rng, player, _useFlags, _activeSlot, _customVarData)
         local gameFrameCount = game:GetFrameCount()
         v.run.usedEsauJrFrame = gameFrameCount + 1
         v.run.usedEsauJrControllerIndex = player.ControllerIndex
         return nil
     end
-    self.callbacksUsed = {{ModCallback.POST_UPDATE, self.postUpdate}, {ModCallback.POST_USE_ITEM, self.useItemEsauJr, {CollectibleType.ESAU_JR}}}
+    self.callbacksUsed = {{ModCallback.POST_UPDATE, self.postUpdate}, {ModCallback.POST_USE_ITEM, self.postUseItemEsauJr, {CollectibleType.ESAU_JR}}}
     self.postEsauJr = postEsauJr
     self.postFirstEsauJr = postFirstEsauJr
 end
@@ -34296,7 +34296,7 @@ __TS__ClassExtends(FlipDetection, Feature)
 function FlipDetection.prototype.____constructor(self, postFlip, postFirstFlip)
     Feature.prototype.____constructor(self)
     self.v = v
-    self.useItemFlip = function(____, _collectibleType, _rng, player, _useFlags, _activeSlot, _customVarData)
+    self.postUseItemFlip = function(____, _collectibleType, _rng, player, _useFlags, _activeSlot, _customVarData)
         if not isTaintedLazarus(nil, player) then
             return nil
         end
@@ -34311,7 +34311,7 @@ function FlipDetection.prototype.____constructor(self, postFlip, postFirstFlip)
         self.postFlip:fire(newLazarus, player)
         return nil
     end
-    self.callbacksUsed = {{ModCallback.POST_USE_ITEM, self.useItemFlip, {CollectibleType.FLIP}}}
+    self.callbacksUsed = {{ModCallback.POST_USE_ITEM, self.postUseItemFlip, {CollectibleType.FLIP}}}
     self.postFlip = postFlip
     self.postFirstFlip = postFirstFlip
 end
@@ -34343,7 +34343,7 @@ function GameReorderedCallbacks.prototype.____constructor(self, postGameStartedR
     self.usedGlowingHourGlass = false
     self.forceNewLevel = false
     self.forceNewRoom = false
-    self.useItemGlowingHourGlass = function()
+    self.postUseItemGlowingHourGlass = function()
         self.usedGlowingHourGlass = true
         return nil
     end
@@ -34396,7 +34396,7 @@ function GameReorderedCallbacks.prototype.____constructor(self, postGameStartedR
         self.forceNewRoom = false
         self.postNewRoomReordered:fire(roomType)
     end
-    self.callbacksUsed = {{ModCallback.POST_USE_ITEM, self.useItemGlowingHourGlass, {CollectibleType.GLOWING_HOUR_GLASS}}, {ModCallback.POST_GAME_STARTED, self.postGameStarted}, {ModCallback.POST_NEW_LEVEL, self.postNewLevel}, {ModCallback.POST_NEW_ROOM, self.postNewRoom}}
+    self.callbacksUsed = {{ModCallback.POST_USE_ITEM, self.postUseItemGlowingHourGlass, {CollectibleType.GLOWING_HOUR_GLASS}}, {ModCallback.POST_GAME_STARTED, self.postGameStarted}, {ModCallback.POST_NEW_LEVEL, self.postNewLevel}, {ModCallback.POST_NEW_ROOM, self.postNewRoom}}
     self.postGameStartedReordered = postGameStartedReordered
     self.postNewLevelReordered = postNewLevelReordered
     self.postNewRoomReordered = postNewRoomReordered
@@ -38120,7 +38120,7 @@ __TS__ClassExtends(PlayerCollectibleDetection, Feature)
 function PlayerCollectibleDetection.prototype.____constructor(self, postPlayerCollectibleAdded, postPlayerCollectibleRemoved, moddedElementSets, runInNFrames)
     Feature.prototype.____constructor(self)
     self.v = v
-    self.useItemD4 = function(____, _collectibleType, _rng, player)
+    self.postUseItemD4 = function(____, _collectibleType, _rng, player)
         self:updateCollectibleMapAndFire(player, nil)
         return nil
     end
@@ -38163,7 +38163,7 @@ function PlayerCollectibleDetection.prototype.____constructor(self, postPlayerCo
         end
     end
     self.featuresUsed = {ISCFeature.MODDED_ELEMENT_SETS, ISCFeature.RUN_IN_N_FRAMES}
-    self.callbacksUsed = {{ModCallback.POST_USE_ITEM, self.useItemD4, {CollectibleType.D4}}}
+    self.callbacksUsed = {{ModCallback.POST_USE_ITEM, self.postUseItemD4, {CollectibleType.D4}}}
     self.customCallbacksUsed = {{ModCallbackCustom.ENTITY_TAKE_DMG_PLAYER, self.entityTakeDmgPlayer}, {ModCallbackCustom.POST_ITEM_PICKUP, self.postItemPickup}, {ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED, self.postPEffectUpdateReordered}}
     self.postPlayerCollectibleAdded = postPlayerCollectibleAdded
     self.postPlayerCollectibleRemoved = postPlayerCollectibleRemoved
@@ -46107,17 +46107,21 @@ return ____exports
  end,
 ["src.classes.features.other.PreventCollectibleRotation"] = function(...) 
 local ____lualib = require("lualib_bundle")
-local Map = ____lualib.Map
 local __TS__New = ____lualib.__TS__New
+local Map = ____lualib.Map
 local __TS__Class = ____lualib.__TS__Class
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
 local __TS__Decorate = ____lualib.__TS__Decorate
 local ____exports = {}
+local markRollFrame, v
 local ____isaac_2Dtypescript_2Ddefinitions = require("lua_modules.isaac-typescript-definitions.dist.src.index")
 local CardType = ____isaac_2Dtypescript_2Ddefinitions.CardType
 local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
+local DiceFloorSubType = ____isaac_2Dtypescript_2Ddefinitions.DiceFloorSubType
 local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
 local PickupVariant = ____isaac_2Dtypescript_2Ddefinitions.PickupVariant
+local ____cachedClasses = require("src.core.cachedClasses")
+local game = ____cachedClasses.game
 local ____decorators = require("src.decorators")
 local Exported = ____decorators.Exported
 local ____ISCFeature = require("src.enums.ISCFeature")
@@ -46134,9 +46138,19 @@ local ____pickupVariants = require("src.functions.pickupVariants")
 local isCollectible = ____pickupVariants.isCollectible
 local ____types = require("src.functions.types")
 local asCollectibleType = ____types.asCollectibleType
+local ____ReadonlySet = require("src.types.ReadonlySet")
+local ReadonlySet = ____ReadonlySet.ReadonlySet
 local ____Feature = require("src.classes.private.Feature")
 local Feature = ____Feature.Feature
-local v = {run = {trackedCollectibles = __TS__New(Map)}}
+function markRollFrame(self)
+    v.run.rollGameFrame = game:GetFrameCount()
+end
+local ROLL_COLLECTIBLE_TYPES = __TS__New(ReadonlySet, {CollectibleType.D6, CollectibleType.ETERNAL_D6, CollectibleType.SPINDOWN_DICE})
+local ROLL_FLOOR_DICE_FLOOR_SUB_TYPES = __TS__New(ReadonlySet, {DiceFloorSubType.FOUR_PIP, DiceFloorSubType.SIX_PIP})
+v = {run = {
+    trackedCollectibles = __TS__New(Map),
+    rollGameFrame = nil
+}}
 ____exports.PreventCollectibleRotation = __TS__Class()
 local PreventCollectibleRotation = ____exports.PreventCollectibleRotation
 PreventCollectibleRotation.name = "PreventCollectibleRotation"
@@ -46144,13 +46158,24 @@ __TS__ClassExtends(PreventCollectibleRotation, Feature)
 function PreventCollectibleRotation.prototype.____constructor(self, pickupIndexCreation)
     Feature.prototype.____constructor(self)
     self.v = v
-    self.useCardSoulOfIsaac = function()
+    self.preUseItem = function(____, collectibleType)
+        if ROLL_COLLECTIBLE_TYPES:has(collectibleType) then
+            markRollFrame(nil)
+        end
+        return nil
+    end
+    self.postUseCardSoulOfIsaac = function()
         local collectibles = getCollectibles(nil)
         for ____, collectible in ipairs(collectibles) do
             local pickupIndex = self.pickupIndexCreation:getPickupIndex(collectible)
             v.run.trackedCollectibles:delete(pickupIndex)
         end
     end
+    self.postDiceRoomActivated = function(____, _player, diceFloorSubType)
+        if ROLL_FLOOR_DICE_FLOOR_SUB_TYPES:has(diceFloorSubType) then
+            v.run.trackedCollectibles:clear()
+        end
+    end
     self.postPickupChanged = function(____, pickup, oldVariant, _oldSubType, newVariant, newSubType)
         if oldVariant ~= PickupVariant.COLLECTIBLE or newVariant ~= PickupVariant.COLLECTIBLE then
             return
@@ -46163,13 +46188,18 @@ function PreventCollectibleRotation.prototype.____constructor(self, pickupIndexC
         if trackedCollectibleType == nil then
             return
         end
+        local gameFrameCount = game:GetFrameCount()
+        if gameFrameCount == v.run.rollGameFrame then
+            v.run.trackedCollectibles:delete(pickupIndex)
+            return
+        end
         if trackedCollectibleType ~= asCollectibleType(nil, newSubType) then
             setCollectibleSubType(nil, pickup, trackedCollectibleType)
         end
     end
     self.featuresUsed = {ISCFeature.PICKUP_INDEX_CREATION}
-    self.callbacksUsed = {{ModCallback.POST_USE_CARD, self.useCardSoulOfIsaac, {CardType.SOUL_ISAAC}}}
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_PICKUP_CHANGED, self.postPickupChanged}}
+    self.callbacksUsed = {{ModCallback.POST_USE_CARD, self.postUseCardSoulOfIsaac, {CardType.SOUL_ISAAC}}, {ModCallback.PRE_USE_ITEM, self.preUseItem}}
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_DICE_ROOM_ACTIVATED, self.postDiceRoomActivated}, {ModCallbackCustom.POST_PICKUP_CHANGED, self.postPickupChanged}}
     self.pickupIndexCreation = pickupIndexCreation
 end
 function PreventCollectibleRotation.prototype.preventCollectibleRotation(self, collectible, collectibleType)

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

@@ -14,6 +14,6 @@ export declare class EsauJrDetection extends Feature {
     private postFirstEsauJr;
     constructor(postEsauJr: PostEsauJr, postFirstEsauJr: PostFirstEsauJr);
     private postUpdate;
-    private useItemEsauJr;
+    private postUseItemEsauJr;
 }
 //# sourceMappingURL=EsauJrDetection.d.ts.map

package/dist/src/classes/features/callbackLogic/EsauJrDetection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EsauJrDetection.d.ts","sourceRoot":"","sources":["../../../../../src/classes/features/callbackLogic/EsauJrDetection.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,eAAe,EAGhB,MAAM,8BAA8B,CAAC;AAGtC,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAUhD,qBAAa,eAAgB,SAAQ,OAAO;IAC1B,CAAC;;;;;;MAAK;IAEtB,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,eAAe,CAAkB;gBAE7B,UAAU,EAAE,UAAU,EAAE,eAAe,EAAE,eAAe;IAoBpE,OAAO,CAAC,UAAU,CAiChB;IAIF,OAAO,CAAC,aAAa,CAenB;CACH"}
+{"version":3,"file":"EsauJrDetection.d.ts","sourceRoot":"","sources":["../../../../../src/classes/features/callbackLogic/EsauJrDetection.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,eAAe,EAGhB,MAAM,8BAA8B,CAAC;AAGtC,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAUhD,qBAAa,eAAgB,SAAQ,OAAO;IAC1B,CAAC;;;;;;MAAK;IAEtB,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,eAAe,CAAkB;gBAE7B,UAAU,EAAE,UAAU,EAAE,eAAe,EAAE,eAAe;IAoBpE,OAAO,CAAC,UAAU,CAiChB;IAIF,OAAO,CAAC,iBAAiB,CAevB;CACH"}

package/dist/src/classes/features/callbackLogic/EsauJrDetection.lua

@@ -40,13 +40,13 @@ function EsauJrDetection.prototype.____constructor(self, postEsauJr, postFirstEs
         end
         self.postEsauJr:fire(player)
     end
-    self.useItemEsauJr = function(____, _collectibleType, _rng, player, _useFlags, _activeSlot, _customVarData)
+    self.postUseItemEsauJr = function(____, _collectibleType, _rng, player, _useFlags, _activeSlot, _customVarData)
         local gameFrameCount = game:GetFrameCount()
         v.run.usedEsauJrFrame = gameFrameCount + 1
         v.run.usedEsauJrControllerIndex = player.ControllerIndex
         return nil
     end
-    self.callbacksUsed = {{ModCallback.POST_UPDATE, self.postUpdate}, {ModCallback.POST_USE_ITEM, self.useItemEsauJr, {CollectibleType.ESAU_JR}}}
+    self.callbacksUsed = {{ModCallback.POST_UPDATE, self.postUpdate}, {ModCallback.POST_USE_ITEM, self.postUseItemEsauJr, {CollectibleType.ESAU_JR}}}
     self.postEsauJr = postEsauJr
     self.postFirstEsauJr = postFirstEsauJr
 end

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

@@ -11,6 +11,6 @@ export declare class FlipDetection extends Feature {
     private postFlip;
     private postFirstFlip;
     constructor(postFlip: PostFlip, postFirstFlip: PostFirstFlip);
-    private useItemFlip;
+    private postUseItemFlip;
 }
 //# sourceMappingURL=FlipDetection.d.ts.map

package/dist/src/classes/features/callbackLogic/FlipDetection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FlipDetection.d.ts","sourceRoot":"","sources":["../../../../../src/classes/features/callbackLogic/FlipDetection.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAShD,qBAAa,aAAc,SAAQ,OAAO;IACxB,CAAC;;YANf,2FAA2F;;;MAMvE;IAEtB,OAAO,CAAC,QAAQ,CAAW;IAC3B,OAAO,CAAC,aAAa,CAAgB;gBAEzB,QAAQ,EAAE,QAAQ,EAAE,aAAa,EAAE,aAAa;IAc5D,OAAO,CAAC,WAAW,CA2BjB;CACH"}
+{"version":3,"file":"FlipDetection.d.ts","sourceRoot":"","sources":["../../../../../src/classes/features/callbackLogic/FlipDetection.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAShD,qBAAa,aAAc,SAAQ,OAAO;IACxB,CAAC;;YANf,2FAA2F;;;MAMvE;IAEtB,OAAO,CAAC,QAAQ,CAAW;IAC3B,OAAO,CAAC,aAAa,CAAgB;gBAEzB,QAAQ,EAAE,QAAQ,EAAE,aAAa,EAAE,aAAa;IAc5D,OAAO,CAAC,eAAe,CA2BrB;CACH"}

package/dist/src/classes/features/callbackLogic/FlipDetection.lua

@@ -37,7 +37,7 @@ __TS__ClassExtends(FlipDetection, Feature)
 function FlipDetection.prototype.____constructor(self, postFlip, postFirstFlip)
     Feature.prototype.____constructor(self)
     self.v = v
-    self.useItemFlip = function(____, _collectibleType, _rng, player, _useFlags, _activeSlot, _customVarData)
+    self.postUseItemFlip = function(____, _collectibleType, _rng, player, _useFlags, _activeSlot, _customVarData)
         if not isTaintedLazarus(nil, player) then
             return nil
         end
@@ -52,7 +52,7 @@ function FlipDetection.prototype.____constructor(self, postFlip, postFirstFlip)
         self.postFlip:fire(newLazarus, player)
         return nil
     end
-    self.callbacksUsed = {{ModCallback.POST_USE_ITEM, self.useItemFlip, {CollectibleType.FLIP}}}
+    self.callbacksUsed = {{ModCallback.POST_USE_ITEM, self.postUseItemFlip, {CollectibleType.FLIP}}}
     self.postFlip = postFlip
     self.postFirstFlip = postFirstFlip
 end

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

@@ -25,7 +25,7 @@ export declare class GameReorderedCallbacks extends Feature {
     private postNewLevelReordered;
     private postNewRoomReordered;
     private postGameStartedReorderedLast;
-    private useItemGlowingHourGlass;
+    private postUseItemGlowingHourGlass;
     private postGameStarted;
     private postNewLevel;
     private postNewRoom;

package/dist/src/classes/features/callbackLogic/GameReorderedCallbacks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GameReorderedCallbacks.d.ts","sourceRoot":"","sources":["../../../../../src/classes/features/callbackLogic/GameReorderedCallbacks.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,UAAU,EAEV,SAAS,EACV,MAAM,8BAA8B,CAAC;AAOtC,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAEhD;;;;;;;;;;;;;;GAcG;AACH,qBAAa,sBAAuB,SAAQ,OAAO;IACjD,OAAO,CAAC,YAAY,CAAoB;IACxC,OAAO,CAAC,gBAAgB,CAAoB;IAC5C,OAAO,CAAC,oBAAoB,CAAS;IACrC,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,YAAY,CAAS;IAE7B,OAAO,CAAC,wBAAwB,CAA2B;IAC3D,OAAO,CAAC,qBAAqB,CAAwB;IACrD,OAAO,CAAC,oBAAoB,CAAuB;IACnD,OAAO,CAAC,4BAA4B,CAA+B;IAwCnE,OAAO,CAAC,uBAAuB,CAM7B;IAGF,OAAO,CAAC,eAAe,CAYrB;IAGF,OAAO,CAAC,YAAY,CAiBlB;IAGF,OAAO,CAAC,WAAW,CAiCjB;IAEF,OAAO,CAAC,kBAAkB;IAS1B;;;;;;;;;;;;OAYG;IAEI,qBAAqB,IAAI,IAAI;IAIpC;;;;;;;;;;;;OAYG;IAEI,oBAAoB,IAAI,IAAI;IAInC;;;;;;;;;OASG;IAEI,0BAA0B,CAC/B,KAAK,EAAE,UAAU,EACjB,SAAS,EAAE,SAAS,GACnB,IAAI;CAIR"}
+{"version":3,"file":"GameReorderedCallbacks.d.ts","sourceRoot":"","sources":["../../../../../src/classes/features/callbackLogic/GameReorderedCallbacks.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,UAAU,EAEV,SAAS,EACV,MAAM,8BAA8B,CAAC;AAOtC,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAEhD;;;;;;;;;;;;;;GAcG;AACH,qBAAa,sBAAuB,SAAQ,OAAO;IACjD,OAAO,CAAC,YAAY,CAAoB;IACxC,OAAO,CAAC,gBAAgB,CAAoB;IAC5C,OAAO,CAAC,oBAAoB,CAAS;IACrC,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,YAAY,CAAS;IAE7B,OAAO,CAAC,wBAAwB,CAA2B;IAC3D,OAAO,CAAC,qBAAqB,CAAwB;IACrD,OAAO,CAAC,oBAAoB,CAAuB;IACnD,OAAO,CAAC,4BAA4B,CAA+B;IAwCnE,OAAO,CAAC,2BAA2B,CAMjC;IAGF,OAAO,CAAC,eAAe,CAYrB;IAGF,OAAO,CAAC,YAAY,CAiBlB;IAGF,OAAO,CAAC,WAAW,CAiCjB;IAEF,OAAO,CAAC,kBAAkB;IAS1B;;;;;;;;;;;;OAYG;IAEI,qBAAqB,IAAI,IAAI;IAIpC;;;;;;;;;;;;OAYG;IAEI,oBAAoB,IAAI,IAAI;IAInC;;;;;;;;;OASG;IAEI,0BAA0B,CAC/B,KAAK,EAAE,UAAU,EACjB,SAAS,EAAE,SAAS,GACnB,IAAI;CAIR"}

package/dist/src/classes/features/callbackLogic/GameReorderedCallbacks.lua

@@ -36,7 +36,7 @@ function GameReorderedCallbacks.prototype.____constructor(self, postGameStartedR
     self.usedGlowingHourGlass = false
     self.forceNewLevel = false
     self.forceNewRoom = false
-    self.useItemGlowingHourGlass = function()
+    self.postUseItemGlowingHourGlass = function()
         self.usedGlowingHourGlass = true
         return nil
     end
@@ -89,7 +89,7 @@ function GameReorderedCallbacks.prototype.____constructor(self, postGameStartedR
         self.forceNewRoom = false
         self.postNewRoomReordered:fire(roomType)
     end
-    self.callbacksUsed = {{ModCallback.POST_USE_ITEM, self.useItemGlowingHourGlass, {CollectibleType.GLOWING_HOUR_GLASS}}, {ModCallback.POST_GAME_STARTED, self.postGameStarted}, {ModCallback.POST_NEW_LEVEL, self.postNewLevel}, {ModCallback.POST_NEW_ROOM, self.postNewRoom}}
+    self.callbacksUsed = {{ModCallback.POST_USE_ITEM, self.postUseItemGlowingHourGlass, {CollectibleType.GLOWING_HOUR_GLASS}}, {ModCallback.POST_GAME_STARTED, self.postGameStarted}, {ModCallback.POST_NEW_LEVEL, self.postNewLevel}, {ModCallback.POST_NEW_ROOM, self.postNewRoom}}
     self.postGameStartedReordered = postGameStartedReordered
     self.postNewLevelReordered = postNewLevelReordered
     self.postNewRoomReordered = postNewRoomReordered

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

@@ -32,7 +32,7 @@ export declare class PlayerCollectibleDetection extends Feature {
      *                               rerolled.
      */
     private updateCollectibleMapAndFire;
-    private useItemD4;
+    private postUseItemD4;
     /** We need to handle the case of Tainted Eden taking damage. */
     private entityTakeDmgPlayer;
     /**

package/dist/src/classes/features/callbackLogic/PlayerCollectibleDetection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PlayerCollectibleDetection.d.ts","sourceRoot":"","sources":["../../../../../src/classes/features/callbackLogic/PlayerCollectibleDetection.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,eAAe,EAKhB,MAAM,8BAA8B,CAAC;AAatC,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,0BAA0B,EAAE,MAAM,4CAA4C,CAAC;AACxF,OAAO,EAAE,4BAA4B,EAAE,MAAM,8CAA8C,CAAC;AAC5F,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAgBrD,qBAAa,0BAA2B,SAAQ,OAAO;IACrC,CAAC;;;;;;MAAK;IAEtB,OAAO,CAAC,0BAA0B,CAA6B;IAC/D,OAAO,CAAC,4BAA4B,CAA+B;IACnE,OAAO,CAAC,iBAAiB,CAAoB;IAC7C,OAAO,CAAC,YAAY,CAAe;gBAGjC,0BAA0B,EAAE,0BAA0B,EACtD,4BAA4B,EAAE,4BAA4B,EAC1D,iBAAiB,EAAE,iBAAiB,EACpC,YAAY,EAAE,YAAY;IA6B5B;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,2BAA2B;IA0CnC,OAAO,CAAC,SAAS,CAqBf;IAEF,gEAAgE;IAEhE,OAAO,CAAC,mBAAmB,CA2BzB;IAEF;;;OAGG;IAEH,OAAO,CAAC,cAAc,CAepB;IAGF,OAAO,CAAC,0BAA0B,CAiBhC;IAEF;;;;;;;;OAQG;IACH,OAAO,CAAC,uBAAuB;CA+BhC"}
+{"version":3,"file":"PlayerCollectibleDetection.d.ts","sourceRoot":"","sources":["../../../../../src/classes/features/callbackLogic/PlayerCollectibleDetection.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,eAAe,EAKhB,MAAM,8BAA8B,CAAC;AAatC,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,0BAA0B,EAAE,MAAM,4CAA4C,CAAC;AACxF,OAAO,EAAE,4BAA4B,EAAE,MAAM,8CAA8C,CAAC;AAC5F,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAgBrD,qBAAa,0BAA2B,SAAQ,OAAO;IACrC,CAAC;;;;;;MAAK;IAEtB,OAAO,CAAC,0BAA0B,CAA6B;IAC/D,OAAO,CAAC,4BAA4B,CAA+B;IACnE,OAAO,CAAC,iBAAiB,CAAoB;IAC7C,OAAO,CAAC,YAAY,CAAe;gBAGjC,0BAA0B,EAAE,0BAA0B,EACtD,4BAA4B,EAAE,4BAA4B,EAC1D,iBAAiB,EAAE,iBAAiB,EACpC,YAAY,EAAE,YAAY;IA6B5B;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,2BAA2B;IA0CnC,OAAO,CAAC,aAAa,CAqBnB;IAEF,gEAAgE;IAEhE,OAAO,CAAC,mBAAmB,CA2BzB;IAEF;;;OAGG;IAEH,OAAO,CAAC,cAAc,CAepB;IAGF,OAAO,CAAC,0BAA0B,CAiBhC;IAEF;;;;;;;;OAQG;IACH,OAAO,CAAC,uBAAuB;CA+BhC"}

package/dist/src/classes/features/callbackLogic/PlayerCollectibleDetection.lua

@@ -56,7 +56,7 @@ __TS__ClassExtends(PlayerCollectibleDetection, Feature)
 function PlayerCollectibleDetection.prototype.____constructor(self, postPlayerCollectibleAdded, postPlayerCollectibleRemoved, moddedElementSets, runInNFrames)
     Feature.prototype.____constructor(self)
     self.v = v
-    self.useItemD4 = function(____, _collectibleType, _rng, player)
+    self.postUseItemD4 = function(____, _collectibleType, _rng, player)
         self:updateCollectibleMapAndFire(player, nil)
         return nil
     end
@@ -99,7 +99,7 @@ function PlayerCollectibleDetection.prototype.____constructor(self, postPlayerCo
         end
     end
     self.featuresUsed = {ISCFeature.MODDED_ELEMENT_SETS, ISCFeature.RUN_IN_N_FRAMES}
-    self.callbacksUsed = {{ModCallback.POST_USE_ITEM, self.useItemD4, {CollectibleType.D4}}}
+    self.callbacksUsed = {{ModCallback.POST_USE_ITEM, self.postUseItemD4, {CollectibleType.D4}}}
     self.customCallbacksUsed = {{ModCallbackCustom.ENTITY_TAKE_DMG_PLAYER, self.entityTakeDmgPlayer}, {ModCallbackCustom.POST_ITEM_PICKUP, self.postItemPickup}, {ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED, self.postPEffectUpdateReordered}}
     self.postPlayerCollectibleAdded = postPlayerCollectibleAdded
     self.postPlayerCollectibleRemoved = postPlayerCollectibleRemoved

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

@@ -2,11 +2,13 @@ import { CollectibleType } from "isaac-typescript-definitions";
 import { Feature } from "../../private/Feature";
 export declare class PreventCollectibleRotation extends Feature {
     private pickupIndexCreation;
+    private preUseItem;
     /**
      * 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.
      */
-    private useCardSoulOfIsaac;
+    private postUseCardSoulOfIsaac;
+    private postDiceRoomActivated;
     private postPickupChanged;
     /**
      * Helper function to prevent a collectible from being affected by Tainted Isaac's rotation

package/dist/src/classes/features/other/PreventCollectibleRotation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PreventCollectibleRotation.d.ts","sourceRoot":"","sources":["../../../../../src/classes/features/other/PreventCollectibleRotation.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,eAAe,EAGhB,MAAM,8BAA8B,CAAC;AAUtC,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAShD,qBAAa,0BAA2B,SAAQ,OAAO;IAIrD,OAAO,CAAC,mBAAmB,CAAsB;IAwBjD;;;OAGG;IAGH,OAAO,CAAC,kBAAkB,CAMxB;IAGF,OAAO,CAAC,iBAAiB,CA8BvB;IAEF;;;;;;;;;;;OAWG;IAEI,0BAA0B,CAC/B,WAAW,EAAE,YAAY,EACzB,eAAe,EAAE,eAAe,GAC/B,IAAI;CAiBR"}
+{"version":3,"file":"PreventCollectibleRotation.d.ts","sourceRoot":"","sources":["../../../../../src/classes/features/other/PreventCollectibleRotation.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,eAAe,EAIhB,MAAM,8BAA8B,CAAC;AAYtC,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAuBhD,qBAAa,0BAA2B,SAAQ,OAAO;IAIrD,OAAO,CAAC,mBAAmB,CAAsB;IA4BjD,OAAO,CAAC,UAAU,CAQhB;IAEF;;;OAGG;IAGH,OAAO,CAAC,sBAAsB,CAM5B;IAGF,OAAO,CAAC,qBAAqB,CAO3B;IAGF,OAAO,CAAC,iBAAiB,CAoCvB;IAEF;;;;;;;;;;;OAWG;IAEI,0BAA0B,CAC/B,WAAW,EAAE,YAAY,EACzB,eAAe,EAAE,eAAe,GAC/B,IAAI;CAiBR"}

package/dist/src/classes/features/other/PreventCollectibleRotation.lua

@@ -1,15 +1,19 @@
 local ____lualib = require("lualib_bundle")
-local Map = ____lualib.Map
 local __TS__New = ____lualib.__TS__New
+local Map = ____lualib.Map
 local __TS__Class = ____lualib.__TS__Class
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
 local __TS__Decorate = ____lualib.__TS__Decorate
 local ____exports = {}
+local markRollFrame, v
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local CardType = ____isaac_2Dtypescript_2Ddefinitions.CardType
 local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
+local DiceFloorSubType = ____isaac_2Dtypescript_2Ddefinitions.DiceFloorSubType
 local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
 local PickupVariant = ____isaac_2Dtypescript_2Ddefinitions.PickupVariant
+local ____cachedClasses = require("src.core.cachedClasses")
+local game = ____cachedClasses.game
 local ____decorators = require("src.decorators")
 local Exported = ____decorators.Exported
 local ____ISCFeature = require("src.enums.ISCFeature")
@@ -26,9 +30,19 @@ local ____pickupVariants = require("src.functions.pickupVariants")
 local isCollectible = ____pickupVariants.isCollectible
 local ____types = require("src.functions.types")
 local asCollectibleType = ____types.asCollectibleType
+local ____ReadonlySet = require("src.types.ReadonlySet")
+local ReadonlySet = ____ReadonlySet.ReadonlySet
 local ____Feature = require("src.classes.private.Feature")
 local Feature = ____Feature.Feature
-local v = {run = {trackedCollectibles = __TS__New(Map)}}
+function markRollFrame(self)
+    v.run.rollGameFrame = game:GetFrameCount()
+end
+local ROLL_COLLECTIBLE_TYPES = __TS__New(ReadonlySet, {CollectibleType.D6, CollectibleType.ETERNAL_D6, CollectibleType.SPINDOWN_DICE})
+local ROLL_FLOOR_DICE_FLOOR_SUB_TYPES = __TS__New(ReadonlySet, {DiceFloorSubType.FOUR_PIP, DiceFloorSubType.SIX_PIP})
+v = {run = {
+    trackedCollectibles = __TS__New(Map),
+    rollGameFrame = nil
+}}
 ____exports.PreventCollectibleRotation = __TS__Class()
 local PreventCollectibleRotation = ____exports.PreventCollectibleRotation
 PreventCollectibleRotation.name = "PreventCollectibleRotation"
@@ -36,13 +50,24 @@ __TS__ClassExtends(PreventCollectibleRotation, Feature)
 function PreventCollectibleRotation.prototype.____constructor(self, pickupIndexCreation)
     Feature.prototype.____constructor(self)
     self.v = v
-    self.useCardSoulOfIsaac = function()
+    self.preUseItem = function(____, collectibleType)
+        if ROLL_COLLECTIBLE_TYPES:has(collectibleType) then
+            markRollFrame(nil)
+        end
+        return nil
+    end
+    self.postUseCardSoulOfIsaac = function()
         local collectibles = getCollectibles(nil)
         for ____, collectible in ipairs(collectibles) do
             local pickupIndex = self.pickupIndexCreation:getPickupIndex(collectible)
             v.run.trackedCollectibles:delete(pickupIndex)
         end
     end
+    self.postDiceRoomActivated = function(____, _player, diceFloorSubType)
+        if ROLL_FLOOR_DICE_FLOOR_SUB_TYPES:has(diceFloorSubType) then
+            v.run.trackedCollectibles:clear()
+        end
+    end
     self.postPickupChanged = function(____, pickup, oldVariant, _oldSubType, newVariant, newSubType)
         if oldVariant ~= PickupVariant.COLLECTIBLE or newVariant ~= PickupVariant.COLLECTIBLE then
             return
@@ -55,13 +80,18 @@ function PreventCollectibleRotation.prototype.____constructor(self, pickupIndexC
         if trackedCollectibleType == nil then
             return
         end
+        local gameFrameCount = game:GetFrameCount()
+        if gameFrameCount == v.run.rollGameFrame then
+            v.run.trackedCollectibles:delete(pickupIndex)
+            return
+        end
         if trackedCollectibleType ~= asCollectibleType(nil, newSubType) then
             setCollectibleSubType(nil, pickup, trackedCollectibleType)
         end
     end
     self.featuresUsed = {ISCFeature.PICKUP_INDEX_CREATION}
-    self.callbacksUsed = {{ModCallback.POST_USE_CARD, self.useCardSoulOfIsaac, {CardType.SOUL_ISAAC}}}
-    self.customCallbacksUsed = {{ModCallbackCustom.POST_PICKUP_CHANGED, self.postPickupChanged}}
+    self.callbacksUsed = {{ModCallback.POST_USE_CARD, self.postUseCardSoulOfIsaac, {CardType.SOUL_ISAAC}}, {ModCallback.PRE_USE_ITEM, self.preUseItem}}
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_DICE_ROOM_ACTIVATED, self.postDiceRoomActivated}, {ModCallbackCustom.POST_PICKUP_CHANGED, self.postPickupChanged}}
     self.pickupIndexCreation = pickupIndexCreation
 end
 function PreventCollectibleRotation.prototype.preventCollectibleRotation(self, collectible, collectibleType)

package/dist/src/functions/utils.d.ts

@@ -103,6 +103,8 @@ export declare 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
  */
 export declare function todo(...args: unknown[]): void;
 //# sourceMappingURL=utils.d.ts.map

package/dist/src/functions/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/functions/utils.ts"],"names":[],"mappings":";AAMA;;;;;;;;;;;GAWG;AACH,wBAAgB,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,SAAS,SAAI,GAAG,GAAG,EAAE,CAWlE;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,OAAO,EACZ,oBAAoB,EAAE,MAAM,GAC3B,MAAM,CAQR;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,SAAS,SAAI,GAAG,GAAG,EAAE,CAOlE;AAED;;;;;;;;;GASG;AACH,wBAAgB,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAE/D;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,IAAI,OAAO,CAMvC;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,IAAI,OAAO,CAI5C;AAED;;;;;;;GAOG;AACH,wBAAgB,YAAY,IAAI,OAAO,CAetC;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI,CAI3D;AAED;;;;;;;;;;;;GAYG;AAEH,wBAAgB,IAAI,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAG"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/functions/utils.ts"],"names":[],"mappings":";AAMA;;;;;;;;;;;GAWG;AACH,wBAAgB,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,SAAS,SAAI,GAAG,GAAG,EAAE,CAWlE;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,OAAO,EACZ,oBAAoB,EAAE,MAAM,GAC3B,MAAM,CAQR;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,SAAS,SAAI,GAAG,GAAG,EAAE,CAOlE;AAED;;;;;;;;;GASG;AACH,wBAAgB,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAE/D;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,IAAI,OAAO,CAMvC;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,IAAI,OAAO,CAI5C;AAED;;;;;;;GAOG;AACH,wBAAgB,YAAY,IAAI,OAAO,CAetC;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI,CAI3D;AAED;;;;;;;;;;;;;;GAcG;AAEH,wBAAgB,IAAI,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAG"}

package/dist/src/functions/utils.lua

@@ -163,6 +163,8 @@ end
 -- useful as a means to prevent unused variables.)
 -- 
 -- This function does not actually do anything. (It is an "empty" function.)
+-- 
+-- @allowEmptyVariadic
 function ____exports.todo(self, ...)
 end
 return ____exports

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "29.5.1",
+  "version": "29.5.2",
   "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)) {
+      markRollFrame();
+    }
+
+    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,12 @@ export class PreventCollectibleRotation extends Feature {
       return;
     }
 
+    const gameFrameCount = game.GetFrameCount();
+    if (gameFrameCount === v.run.rollGameFrame) {
+      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);
@@ -131,3 +178,7 @@ export class PreventCollectibleRotation extends Feature {
     }
   }
 }
+
+function markRollFrame() {
+  v.run.rollGameFrame = game.GetFrameCount();
+}

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 {}