revert

main.lua

@@ -37,7 +37,6 @@ EID.CollectedItems = {}
 EID.IgnoredEntities = {}
 EID.CurrentRoomGridEntities = {}
 EID.UnidentifyablePillEffects = {} -- List of pilleffects that are always unidentifyable
-EID.UsedPillColors = {} -- Colors of pills that have been eaten during this game
 local pathsChecked = {}
 local altPathItemChecked = {}
 local alwaysUseLocalMode = false -- set to true after drawing a non-local mode description this frame
@@ -1475,7 +1474,7 @@ local function onRender(t)
 						local identified = pool:IsPillIdentified(pillColor) and not EID.Config["OnlyShowPillWhenUsedAtLeastOnce"]
 						if REPENTANCE and pillColor % PillColor.PILL_GIANT_FLAG == PillColor.PILL_GOLD then identified = true end
 						local pillEffectID = EID:getAdjustedSubtype(closest.Type, closest.Variant, pillColor)
-						local wasUsed = EID:WasPillUsed(pillColor)
+						local wasUsed = EID:WasPillUsed(pillEffectID, player)
 
 						if (identified or wasUsed or EID.Config["ShowUnidentifiedPillDescriptions"]) and not EID.UnidentifyablePillEffects[pillEffectID] then
 							local descEntry = EID:getDescriptionObj(closest.Type, closest.Variant, pillColor, closest)
@@ -1582,17 +1581,22 @@ if REPENTANCE then
 end
 
 function EID:OnUsePill(pillEffectID, player, useFlags)
+	if (REPENTANCE and player:GetPill(0) % PillColor.PILL_GIANT_FLAG == PillColor.PILL_GOLD) then return end
 	player = player or EID.player --AB+ doesn't receive player in callback arguments!
-	-- get the pill color by checking the player's pocket (not accurate for Temperance? and such, but useFlags will help us ignore those)
+	local playerID = EID:getPlayerID(player)
-	local pillColor = player:GetPill(0)
+	-- Dead Tainted Lazarus exceptions
-	if pillColor == 0 then return end -- ignore if no pill found in pocket
+	local pillsTable = EID.PlayerItemInteractions[playerID].pills
-	EID:AddPickupToHistory("pill", pillEffectID+1, player, useFlags, pillColor) -- Echo Chamber tracking
 
-	-- for tracking used pills, ignore gold pills and noannouncer flag pills 
+	if player:GetPlayerType() == 38 then
-	-- (not using a bitmask, because Placebo is mimic+noannouncer, and we want to count those)
+		pillsTable = EID.PlayerItemInteractions[playerID].altPills or pillsTable
-	if REPENTANCE and (pillColor % PillColor.PILL_GIANT_FLAG == PillColor.PILL_GOLD or useFlags == UseFlag.USE_NOANNOUNCER) then return end
+	end
-	EID.UsedPillColors[tostring(pillColor)] = true
+	local effectID = tostring(pillEffectID+1)
+	if not pillsTable[effectID] then
+		pillsTable[effectID] = 0
+	end
+	pillsTable[effectID] = pillsTable[effectID] + 1
 	
+	EID:AddPickupToHistory("pill", pillEffectID+1, player, useFlags)
 end
 EID:AddCallback(ModCallbacks.MC_USE_PILL, EID.OnUsePill)
 
@@ -1613,7 +1617,6 @@ if EID.MCMLoaded or REPENTANCE then
 		["AbsorbedItems"] = true,
 		["CollectedItems"] = true,
 		["PlayerItemInteractions"] = true,
-		["UsedPillColors"] = true,
 	}
 	--------------------------------
 	--------Handle Savadata---------
@@ -1645,10 +1648,6 @@ if EID.MCMLoaded or REPENTANCE then
 				-- check for the players' starting active items
 				CheckAllActiveItemProgress()
 			end
-			EID.UsedPillColors = {}
-			if isSave then
-				EID.UsedPillColors = savedEIDConfig["UsedPillColors"] or {}
-			end
 
 			if REPENTANCE then
 				EID.BoC.BagItems = {}
@@ -1736,7 +1735,6 @@ if EID.MCMLoaded or REPENTANCE then
 		end
 		EID.Config["CollectedItems"] = EID.CollectedItems
 		EID.Config["PlayerItemInteractions"] = EID.PlayerItemInteractions or {}
-		EID.Config["UsedPillColors"] = EID.UsedPillColors
 
 		EID.SaveData(EID, json.encode(EID.Config))
 		EID:hidePermanentText()