Revert "Quick fix for Crane Game + Glowing Hour Glass"
This reverts commit acda876e9c.
This commit is contained in:
1 parent
64623ce5c1
commit
6917ccda2b
1 file changed
-26
@@ -33,7 +33,6 @@ EID.sacrificeCounter = {}
|
|||||||
EID.itemConfig = Isaac.GetItemConfig()
|
EID.itemConfig = Isaac.GetItemConfig()
|
||||||
EID.itemUnlockStates = {}
|
EID.itemUnlockStates = {}
|
||||||
EID.CraneItemType = {}
|
EID.CraneItemType = {}
|
||||||
EID.LastCraneType = {}
|
|
||||||
EID.absorbedItems = {}
|
EID.absorbedItems = {}
|
||||||
EID.CollectedItems = {}
|
EID.CollectedItems = {}
|
||||||
EID.IgnoredEntities = {}
|
EID.IgnoredEntities = {}
|
||||||
@@ -256,19 +255,6 @@ if REPENTANCE then
|
|||||||
local lastGetItemResult = {nil, nil, nil, nil} -- itemID, Frame, gridIndex, InitSeed
|
local lastGetItemResult = {nil, nil, nil, nil} -- itemID, Frame, gridIndex, InitSeed
|
||||||
local lastFrameGridChecked = 0
|
local lastFrameGridChecked = 0
|
||||||
|
|
||||||
local function RevertCraneGameItems()
|
|
||||||
for seed, collectibleType in pairs(EID.LastCraneType) do
|
|
||||||
if EID.CraneItemType[seed] then
|
|
||||||
EID.CraneItemType[seed] = EID.LastCraneType[seed]
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
local function OnUseGlowingHourGlass(_, _, _, player)
|
|
||||||
RevertCraneGameItems()
|
|
||||||
end
|
|
||||||
EID:AddCallback(ModCallbacks.MC_USE_ITEM, OnUseGlowingHourGlass, CollectibleType.COLLECTIBLE_GLOWING_HOUR_GLASS)
|
|
||||||
|
|
||||||
function EID:postGetCollectible(selectedCollectible, itemPoolType, decrease, seed)
|
function EID:postGetCollectible(selectedCollectible, itemPoolType, decrease, seed)
|
||||||
-- Handle Crane Game
|
-- Handle Crane Game
|
||||||
if itemPoolType == ItemPoolType.POOL_CRANE_GAME then
|
if itemPoolType == ItemPoolType.POOL_CRANE_GAME then
|
||||||
@@ -754,17 +740,6 @@ if REPENTANCE then
|
|||||||
initialItemNext = false
|
initialItemNext = false
|
||||||
flipItemNext = false
|
flipItemNext = false
|
||||||
EID:AssignFlipItems()
|
EID:AssignFlipItems()
|
||||||
|
|
||||||
-- Handle Crane Game
|
|
||||||
if REPENTANCE then
|
|
||||||
EID.LastCraneType = {}
|
|
||||||
for _, crane in ipairs(Isaac.FindByType(6, 16, -1, true, false)) do
|
|
||||||
if EID.CraneItemType[tostring(crane.InitSeed)] then
|
|
||||||
EID.LastCraneType[tostring(crane.InitSeed)] = EID.CraneItemType[tostring(crane.InitSeed)]
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
end
|
end
|
||||||
EID:AddCallback(ModCallbacks.MC_POST_NEW_ROOM, EID.onNewRoom)
|
EID:AddCallback(ModCallbacks.MC_POST_NEW_ROOM, EID.onNewRoom)
|
||||||
end
|
end
|
||||||
@@ -1591,7 +1566,6 @@ if EID.MCMLoaded or REPENTANCE then
|
|||||||
if REPENTANCE then
|
if REPENTANCE then
|
||||||
EID.BagItems = {}
|
EID.BagItems = {}
|
||||||
EID.CraneItemType = {}
|
EID.CraneItemType = {}
|
||||||
EID.LastCraneType = {}
|
|
||||||
EID.flipItemPositions = {}
|
EID.flipItemPositions = {}
|
||||||
EID.absorbedItems = {}
|
EID.absorbedItems = {}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user