From 706ca5589afb882e5da031ebe4a5aaddf40a9b0c Mon Sep 17 00:00:00 2001
From: Buurazu <excel_saga_rules@hotmail.com>
Date: Mon, 10 Jan 2022 03:01:38 -0500
Subject: [PATCH] Use PlayersHaveCollectible

---
 eid_modifiers.lua | 70 ++++++++++++++---------------------------------
 1 file changed, 20 insertions(+), 50 deletions(-)

diff --git a/eid_modifiers.lua b/eid_modifiers.lua
index 89e72e3d..8ac027b3 100644
--- a/eid_modifiers.lua
+++ b/eid_modifiers.lua
@@ -32,11 +32,8 @@ local game = Game()
 		if descObj.ObjType ~= 5 or descObj.ObjVariant ~= PickupVariant.PICKUP_COLLECTIBLE then
 			return false
 		end
-		for i = 0,game:GetNumPlayers() - 1 do
-			local player = Isaac.GetPlayer(i)
-			if player:HasCollectible(CollectibleType.COLLECTIBLE_BINGE_EATER) then
-				return true
-			end
+		if EID:PlayersHaveCollectible(CollectibleType.COLLECTIBLE_BINGE_EATER) then
+			return true
 		end
 		return false
 	end
@@ -86,11 +83,8 @@ local game = Game()
 		if descObj.ObjType ~= 5 or descObj.ObjVariant ~= PickupVariant.PICKUP_COLLECTIBLE then
 			return false
 		end
-		for i = 0,game:GetNumPlayers() - 1 do
-			local player = Isaac.GetPlayer(i)
-			if player:HasCollectible(CollectibleType.COLLECTIBLE_BOOK_OF_VIRTUES) then
-				return true
-			end
+		if EID:PlayersHaveCollectible(CollectibleType.COLLECTIBLE_BOOK_OF_VIRTUES) then
+			return true
 		end
 		return false
 	end
@@ -112,11 +106,8 @@ local game = Game()
 		if descObj.ObjType ~= 5 or descObj.ObjVariant ~= PickupVariant.PICKUP_COLLECTIBLE then
 			return false
 		end
-		for i = 0,game:GetNumPlayers() - 1 do
-			local player = Isaac.GetPlayer(i)
-			if player:HasCollectible(CollectibleType.COLLECTIBLE_SPINDOWN_DICE) then
-				return true
-			end
+		if EID:PlayersHaveCollectible(CollectibleType.COLLECTIBLE_SPINDOWN_DICE) then
+			return true
 		end
 		return false
 	end
@@ -158,11 +149,8 @@ local game = Game()
 		if descObj.ObjType ~= 5 or descObj.ObjVariant ~= PickupVariant.PICKUP_TAROTCARD then
 			return false
 		end
-		for i = 0,game:GetNumPlayers() - 1 do
-			local player = Isaac.GetPlayer(i)
-			if player:HasCollectible(CollectibleType.COLLECTIBLE_TAROT_CLOTH) then
-				return true
-			end
+		if EID:PlayersHaveCollectible(CollectibleType.COLLECTIBLE_TAROT_CLOTH) then
+			return true
 		end
 		return false
 	end
@@ -192,11 +180,8 @@ local game = Game()
 		if descObj.ObjSubType > TrinketType.TRINKET_GOLDEN_FLAG then
 			isGolden = true
 		end
-		for i = 0,game:GetNumPlayers() - 1 do
-			local player = Isaac.GetPlayer(i)
-			if player:HasCollectible(CollectibleType.COLLECTIBLE_MOMS_BOX) then
-				hasBox = true
-			end
+		if EID:PlayersHaveCollectible(CollectibleType.COLLECTIBLE_MOMS_BOX) then
+			hasBox = true
 		end
 		return isGolden or hasBox
 	end
@@ -297,11 +282,8 @@ local game = Game()
 		if not REPENTANCE or descObj.ObjType ~= 5 or descObj.ObjVariant ~= PickupVariant.PICKUP_TAROTCARD or blankCardHidden[descObj.ObjSubType] or descObj.ObjSubType > 80 then
 			return false
 		end
-		for i = 0, game:GetNumPlayers() - 1 do
-			local player = Isaac.GetPlayer(i)
-			if player:HasCollectible(CollectibleType.COLLECTIBLE_BLANK_CARD) then
-				return true
-			end
+		if EID:PlayersHaveCollectible(CollectibleType.COLLECTIBLE_BLANK_CARD) then
+			return true
 		end
 		return false
 	end
@@ -330,11 +312,8 @@ local game = Game()
 		if not REPENTANCE or descObj.ObjType ~= 5 or descObj.ObjVariant ~= PickupVariant.PICKUP_TAROTCARD or not runeIDs[descObj.ObjSubType] then
 			return false
 		end
-		for i = 0, game:GetNumPlayers() - 1 do
-			local player = Isaac.GetPlayer(i)
-			if player:HasCollectible(CollectibleType.COLLECTIBLE_CLEAR_RUNE) then
-				return true
-			end
+		if EID:PlayersHaveCollectible(CollectibleType.COLLECTIBLE_CLEAR_RUNE) then
+			return true
 		end
 		return false
 	end
@@ -357,11 +336,8 @@ local game = Game()
 		if not REPENTANCE or descObj.ObjType ~= 5 or descObj.ObjVariant ~= PickupVariant.PICKUP_PILL then
 			return false
 		end
-		for i = 0, game:GetNumPlayers() - 1 do
-			local player = Isaac.GetPlayer(i)
-			if player:HasCollectible(CollectibleType.COLLECTIBLE_PLACEBO) then
-				return true
-			end
+		if EID:PlayersHaveCollectible(CollectibleType.COLLECTIBLE_PLACEBO) then
+			return true
 		end
 		return false
 	end
@@ -383,11 +359,8 @@ local game = Game()
 		if not REPENTANCE or descObj.ObjType ~= 5 or descObj.ObjVariant ~= PickupVariant.PICKUP_PILL then
 			return false
 		end
-		for i = 0, game:GetNumPlayers() - 1 do
-			local player = Isaac.GetPlayer(i)
-			if player:HasCollectible(CollectibleType.COLLECTIBLE_FALSE_PHD) then
-				return true
-			end
+		if EID:PlayersHaveCollectible(CollectibleType.COLLECTIBLE_FALSE_PHD) then
+			return true
 		end
 		return false
 	end
@@ -419,11 +392,8 @@ local game = Game()
 		if not REPENTANCE or descObj.ObjType ~= 5 or descObj.ObjVariant ~= PickupVariant.PICKUP_COLLECTIBLE then
 			return false
 		end
-		for i = 0, game:GetNumPlayers() - 1 do
-			local player = Isaac.GetPlayer(i)
-			if player:HasCollectible(CollectibleType.COLLECTIBLE_ABYSS) then
-				return true
-			end
+		if EID:PlayersHaveCollectible(CollectibleType.COLLECTIBLE_ABYSS) then
+			return true
 		end
 		return false
 	end