lzrdblzzrd/External-Item-Descriptions
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dead Tainted Lazarus + co-op fix

Browse Source
This commit is contained in:
Buurazu authored and GitHub committed 2022-04-13 02:39:54 -04:00
1 parent 98a7a0b8f0
commit 10fd31a923
1 file changed
+21 -11
Download Patch File Download Diff File Expand all files Collapse all files
main.lua
+21 -11
View File
@@ -652,13 +652,13 @@ function EID:printDescription(desc, cachedID)
if EID.Config["TransformationProgress"] then if EID.Config["TransformationProgress"] then
EID:evaluateTransformationProgress(transform) EID:evaluateTransformationProgress(transform)
transformationName = transformationName .. " " transformationName = transformationName .. " "
for _, player in ipairs(EID.players) do for _, player in ipairs(EID.coopAllPlayers) do
if player:GetPlayerType() ~= PlayerType.PLAYER_THESOUL_B then if player:GetPlayerType() ~= PlayerType.PLAYER_THESOUL_B then
if #EID.players > 1 then if #EID.coopAllPlayers > 1 then
local playerIcon = EID:getIcon("Player"..player.SubType) ~= EID.InlineIcons["ERROR"] and "{{Player"..player.SubType.."}}" or "{{CustomTransformation}}" local playerIcon = EID:getIcon("Player"..player.SubType) ~= EID.InlineIcons["ERROR"] and "{{Player"..player.SubType.."}}" or "{{CustomTransformation}}"
transformationName = transformationName .. playerIcon transformationName = transformationName .. playerIcon
end end
local numCollected = EID.TransformationProgress[EID:getPlayerID(player)][transform] local numCollected = EID.TransformationProgress[EID:getPlayerID(player)][transform] or 0
local numMax = EID.TransformationData[transform] and EID.TransformationData[transform].NumNeeded or 3 local numMax = EID.TransformationData[transform] and EID.TransformationData[transform].NumNeeded or 3
transformationName = transformationName.."("..numCollected.."/"..numMax..") " transformationName = transformationName.."("..numCollected.."/"..numMax..") "
end end
@@ -1465,7 +1465,12 @@ local function AddActiveItemProgress(player, isD4)
EID.ForceRefreshCache = true EID.ForceRefreshCache = true
local playerID = EID:getPlayerID(player) local playerID = EID:getPlayerID(player)
if not EID.PlayerItemInteractions[playerID] then if not EID.PlayerItemInteractions[playerID] then
EID.PlayerItemInteractions[playerID] = {LastTouch = 0, actives = {}, pills = {}} EID.PlayerItemInteractions[playerID] = {LastTouch = 0, actives = {}, pills = {}, altActives = {}, altPills = {}}
end
-- Dead Tainted Lazarus exceptions
local activesTable = EID.PlayerItemInteractions[playerID].actives
if player:GetPlayerType() == 38 then
activesTable = EID.PlayerItemInteractions[playerID].altActives or activesTable
end end
-- don't check pocket items after D4, they don't reroll and would get counted twice -- don't check pocket items after D4, they don't reroll and would get counted twice
local maxSlot = 3 local maxSlot = 3
@@ -1473,10 +1478,10 @@ local function AddActiveItemProgress(player, isD4)
for i = 0, maxSlot do for i = 0, maxSlot do
local itemID = tostring(player:GetActiveItem(i)) local itemID = tostring(player:GetActiveItem(i))
if itemID ~= "0" then if itemID ~= "0" then
if not EID.PlayerItemInteractions[playerID].actives[itemID] then if not activesTable[itemID] then
EID.PlayerItemInteractions[playerID].actives[itemID] = 0 activesTable[itemID] = 0
end end
EID.PlayerItemInteractions[playerID].actives[itemID] = EID.PlayerItemInteractions[playerID].actives[itemID] + 1 activesTable[itemID] = activesTable[itemID] + 1
end end
end end
end end
@@ -1497,11 +1502,16 @@ EID:AddCallback(ModCallbacks.MC_USE_ITEM, OnUseD4, CollectibleType.COLLECTIBLE_D
function EID:OnUsePill(pillEffectID, player) function EID:OnUsePill(pillEffectID, player)
local playerID = EID:getPlayerID(player) local playerID = EID:getPlayerID(player)
local effectID = tostring(pillEffectID+1) -- Dead Tainted Lazarus exceptions
if not EID.PlayerItemInteractions[playerID].pills[effectID] then local pillsTable = EID.PlayerItemInteractions[playerID].pills
EID.PlayerItemInteractions[playerID].pills[effectID] = 0 if player:GetPlayerType() == 38 then
pillsTable = EID.PlayerItemInteractions[playerID].altPills or pillsTable
end end
EID.PlayerItemInteractions[playerID].pills[effectID] = EID.PlayerItemInteractions[playerID].pills[effectID] + 1 local effectID = tostring(pillEffectID+1)
if not pillsTable[effectID] then
pillsTable[effectID] = 0
end
pillsTable[effectID] = pillsTable[effectID] + 1
end end
EID:AddCallback(ModCallbacks.MC_USE_PILL, EID.OnUsePill) EID:AddCallback(ModCallbacks.MC_USE_PILL, EID.OnUsePill)