Merge branch 'master' of https://github.com/kohashiwakaba/External-Item-Descriptions
This commit is contained in:
commit
c8f0998ed8
1 file changed
+15
-7
@@ -1463,6 +1463,13 @@ end
|
|||||||
|
|
||||||
EID:AddCallback(ModCallbacks.MC_POST_RENDER, onRender)
|
EID:AddCallback(ModCallbacks.MC_POST_RENDER, onRender)
|
||||||
|
|
||||||
|
-- Check the active items of every player for transformation progress (used at game start and after Genesis)
|
||||||
|
local function CheckAllActiveItemProgress()
|
||||||
|
for i = 0, game:GetNumPlayers() - 1 do
|
||||||
|
AddActiveItemProgress(Isaac.GetPlayer(i))
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
local function AddActiveItemProgress(player, isD4)
|
local function AddActiveItemProgress(player, isD4)
|
||||||
EID.ForceRefreshCache = true
|
EID.ForceRefreshCache = true
|
||||||
local playerID = EID:getPlayerID(player)
|
local playerID = EID:getPlayerID(player)
|
||||||
@@ -1503,10 +1510,13 @@ end
|
|||||||
EID:AddCallback(ModCallbacks.MC_USE_ITEM, OnUseD4, CollectibleType.COLLECTIBLE_D4)
|
EID:AddCallback(ModCallbacks.MC_USE_ITEM, OnUseD4, CollectibleType.COLLECTIBLE_D4)
|
||||||
|
|
||||||
-- Re-init transformation progress and item interactions after using Genesis
|
-- Re-init transformation progress and item interactions after using Genesis
|
||||||
local function OnUseGenesis(_, _, _, player)
|
if REPENTANCE then
|
||||||
OnGameStartGeneral()
|
local function OnUseGenesis(_, _, _, player)
|
||||||
|
OnGameStartGeneral()
|
||||||
|
CheckAllActiveItemProgress()
|
||||||
|
end
|
||||||
|
EID:AddCallback(ModCallbacks.MC_USE_ITEM, OnUseGenesis, CollectibleType.COLLECTIBLE_GENESIS)
|
||||||
end
|
end
|
||||||
EID:AddCallback(ModCallbacks.MC_USE_ITEM, OnUseGenesis, CollectibleType.COLLECTIBLE_GENESIS)
|
|
||||||
|
|
||||||
function EID:OnUsePill(pillEffectID, player)
|
function EID:OnUsePill(pillEffectID, player)
|
||||||
local playerID = EID:getPlayerID(player)
|
local playerID = EID:getPlayerID(player)
|
||||||
@@ -1563,10 +1573,8 @@ if EID.MCMLoaded or REPENTANCE then
|
|||||||
EID.PlayerItemInteractions[tonumber(playerID)] = convertedData
|
EID.PlayerItemInteractions[tonumber(playerID)] = convertedData
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
-- check for the players' starting active items (thorough, for Eden and modded J&E chars' sake)
|
-- check for the players' starting active items
|
||||||
for i = 0, game:GetNumPlayers() - 1 do
|
CheckAllActiveItemProgress()
|
||||||
AddActiveItemProgress(Isaac.GetPlayer(i))
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
if REPENTANCE then
|
if REPENTANCE then
|
||||||
|
|||||||
Reference in new issue
Block a user