isaacscript-common 29.5.0 → 29.5.2

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

@@ -1,68 +1,109 @@
 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 getMapIndex
+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")
+local ISCFeature = ____ISCFeature.ISCFeature
+local ____ModCallbackCustom = require("src.enums.ModCallbackCustom")
+local ModCallbackCustom = ____ModCallbackCustom.ModCallbackCustom
 local ____collectibles = require("src.functions.collectibles")
 local setCollectibleSubType = ____collectibles.setCollectibleSubType
 local ____entities = require("src.functions.entities")
 local getEntityID = ____entities.getEntityID
+local ____pickupsSpecific = require("src.functions.pickupsSpecific")
+local getCollectibles = ____pickupsSpecific.getCollectibles
 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
-function getMapIndex(self, collectible)
-    local room = game:GetRoom()
-    local gridIndex = room:GetGridIndex(collectible.Position)
-    return (tostring(gridIndex) .. ",") .. tostring(collectible.InitSeed)
+function markRollFrame(self)
+    v.run.rollGameFrame = game:GetFrameCount()
 end
-local v = {room = {trackedCollectibles = __TS__New(Map)}}
+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"
 __TS__ClassExtends(PreventCollectibleRotation, Feature)
-function PreventCollectibleRotation.prototype.____constructor(self)
+function PreventCollectibleRotation.prototype.____constructor(self, pickupIndexCreation)
     Feature.prototype.____constructor(self)
     self.v = v
-    self.useCardSoulOfIsaac = function()
-        v.room.trackedCollectibles:clear()
+    self.preUseItem = function(____, collectibleType)
+        if ROLL_COLLECTIBLE_TYPES:has(collectibleType) then
+            markRollFrame(nil)
+        end
+        return nil
     end
-    self.postPickupUpdateCollectible = function(____, pickup)
-        local collectible = pickup
-        self:checkCollectibleRotated(collectible)
+    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.callbacksUsed = {{ModCallback.POST_USE_CARD, self.useCardSoulOfIsaac, {CardType.SOUL_ISAAC}}, {ModCallback.POST_PICKUP_UPDATE, self.postPickupUpdateCollectible, {PickupVariant.COLLECTIBLE}}}
-end
-function PreventCollectibleRotation.prototype.checkCollectibleRotated(self, collectible)
-    if collectible.SubType == CollectibleType.NULL then
-        return
+    self.postDiceRoomActivated = function(____, _player, diceFloorSubType)
+        if ROLL_FLOOR_DICE_FLOOR_SUB_TYPES:has(diceFloorSubType) then
+            v.run.trackedCollectibles:clear()
+        end
     end
-    local index = getMapIndex(nil, collectible)
-    local trackedCollectibleType = v.room.trackedCollectibles:get(index)
-    if trackedCollectibleType ~= nil and collectible.SubType ~= trackedCollectibleType then
-        setCollectibleSubType(nil, collectible, trackedCollectibleType)
+    self.postPickupChanged = function(____, pickup, oldVariant, _oldSubType, newVariant, newSubType)
+        if oldVariant ~= PickupVariant.COLLECTIBLE or newVariant ~= PickupVariant.COLLECTIBLE then
+            return
+        end
+        if asCollectibleType(nil, newSubType) == CollectibleType.NULL then
+            return
+        end
+        local pickupIndex = self.pickupIndexCreation:getPickupIndex(pickup)
+        local trackedCollectibleType = v.run.trackedCollectibles:get(pickupIndex)
+        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.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)
     if not isCollectible(nil, collectible) then
         local entityID = getEntityID(nil, collectible)
         error("The \"preventCollectibleRotate\" function was given a non-collectible: " .. entityID)
     end
-    local index = getMapIndex(nil, collectible)
-    v.room.trackedCollectibles:set(index, collectibleType)
-    self:checkCollectibleRotated(collectible)
+    local pickupIndex = self.pickupIndexCreation:getPickupIndex(collectible)
+    v.run.trackedCollectibles:set(pickupIndex, collectibleType)
+    if collectible.SubType ~= collectibleType then
+        setCollectibleSubType(nil, collectible, collectibleType)
+    end
 end
 __TS__Decorate({Exported}, PreventCollectibleRotation.prototype, "preventCollectibleRotation", true)
 return ____exports