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

add altPickupHistory, fix WasPillUsed in co-op

Browse Source
This commit is contained in:
Buurazu authored and GitHub committed 2022-09-05 04:37:22 -04:00
1 parent fe4d31eecc
commit b290b28437
1 file changed
+11 -5
Download Patch File Download Diff File Expand all files Collapse all files
eid_api.lua
+11 -5
View File
@@ -1654,7 +1654,7 @@ function EID:evaluateQueuedItems()
--initialize the interactions table for all players if it isn't already --initialize the interactions table for all players if it isn't already
for i = 0, game:GetNumPlayers() - 1 do for i = 0, game:GetNumPlayers() - 1 do
if not EID.PlayerItemInteractions[i] then if not EID.PlayerItemInteractions[i] then
EID.PlayerItemInteractions[i] = {LastTouch = 0, actives = {}, pills = {}, altActives = {}, altPills = {}, pickupHistory = {}} EID.PlayerItemInteractions[i] = {LastTouch = 0, actives = {}, pills = {}, altActives = {}, altPills = {}, pickupHistory = {}, altPickupHistory = {}}
end end
EID.RecentlyTouchedItems[i] = EID.RecentlyTouchedItems[i] or {} EID.RecentlyTouchedItems[i] = EID.RecentlyTouchedItems[i] or {}
end end
@@ -1749,8 +1749,13 @@ function EID:AddPickupToHistory(pickupType, effectID, player, useFlags)
local playerID = EID:getPlayerID(player) local playerID = EID:getPlayerID(player)
if not EID.PlayerItemInteractions[playerID].pickupHistory then if not EID.PlayerItemInteractions[playerID].pickupHistory then
EID.PlayerItemInteractions[playerID].pickupHistory = {} EID.PlayerItemInteractions[playerID].pickupHistory = {}
EID.PlayerItemInteractions[playerID].altPickupHistory = {}
end end
local historyTable = EID.PlayerItemInteractions[playerID].pickupHistory local historyTable = EID.PlayerItemInteractions[playerID].pickupHistory
-- Dead Tainted Lazarus exception
if player:GetPlayerType() == 38 then
historyTable = EID.PlayerItemInteractions[playerID].altPickupHistory or historyTable
end
-- pickupType = ["pill","card"], playerTypeID, effectID, hadEchoChamberWhenUsed -- pickupType = ["pill","card"], playerTypeID, effectID, hadEchoChamberWhenUsed
table.insert(historyTable, 1, {pickupType, player:GetPlayerType(), effectID, REPENTANCE and player:HasCollectible(700)}) table.insert(historyTable, 1, {pickupType, player:GetPlayerType(), effectID, REPENTANCE and player:HasCollectible(700)})
@@ -1782,11 +1787,12 @@ function EID:IsGridEntity(entity)
end end
-- returns true if the given pilleffect id was used at least once by the current player -- returns true if the given pilleffect id was used at least once by the current player
function EID:WasPillUsed(pillEffectID) function EID:WasPillUsed(pillEffectID, player)
local playerID = EID:getPlayerID(EID.player) local playerID = EID:getPlayerID(player)
local pillsTable = EID.PlayerItemInteractions[playerID].pills local pillsTable = EID.PlayerItemInteractions[playerID].pills
if EID.player:GetPlayerType() == 38 then -- Dead Tainted Lazarus exception
if player:GetPlayerType() == 38 then
pillsTable = EID.PlayerItemInteractions[playerID].altPills or pillsTable pillsTable = EID.PlayerItemInteractions[playerID].altPills or pillsTable
end end
return pillsTable[tostring(pillEffectID)] ~= nil return pillsTable[tostring(pillEffectID)] ~= nil
end end