Use PlayersHaveCollectible

This commit is contained in:
Buurazu authored and GitHub committed 2022-01-10 03:01:38 -05:00
1 parent 91f690e9ba
commit 706ca5589a
1 file changed
+10 -40
+10 -40
View File
@@ -32,12 +32,9 @@ local game = Game()
if descObj.ObjType ~= 5 or descObj.ObjVariant ~= PickupVariant.PICKUP_COLLECTIBLE then if descObj.ObjType ~= 5 or descObj.ObjVariant ~= PickupVariant.PICKUP_COLLECTIBLE then
return false return false
end end
for i = 0,game:GetNumPlayers() - 1 do if EID:PlayersHaveCollectible(CollectibleType.COLLECTIBLE_BINGE_EATER) then
local player = Isaac.GetPlayer(i)
if player:HasCollectible(CollectibleType.COLLECTIBLE_BINGE_EATER) then
return true return true
end end
end
return false return false
end end
@@ -86,12 +83,9 @@ local game = Game()
if descObj.ObjType ~= 5 or descObj.ObjVariant ~= PickupVariant.PICKUP_COLLECTIBLE then if descObj.ObjType ~= 5 or descObj.ObjVariant ~= PickupVariant.PICKUP_COLLECTIBLE then
return false return false
end end
for i = 0,game:GetNumPlayers() - 1 do if EID:PlayersHaveCollectible(CollectibleType.COLLECTIBLE_BOOK_OF_VIRTUES) then
local player = Isaac.GetPlayer(i)
if player:HasCollectible(CollectibleType.COLLECTIBLE_BOOK_OF_VIRTUES) then
return true return true
end end
end
return false return false
end end
@@ -112,12 +106,9 @@ local game = Game()
if descObj.ObjType ~= 5 or descObj.ObjVariant ~= PickupVariant.PICKUP_COLLECTIBLE then if descObj.ObjType ~= 5 or descObj.ObjVariant ~= PickupVariant.PICKUP_COLLECTIBLE then
return false return false
end end
for i = 0,game:GetNumPlayers() - 1 do if EID:PlayersHaveCollectible(CollectibleType.COLLECTIBLE_SPINDOWN_DICE) then
local player = Isaac.GetPlayer(i)
if player:HasCollectible(CollectibleType.COLLECTIBLE_SPINDOWN_DICE) then
return true return true
end end
end
return false return false
end end
@@ -158,12 +149,9 @@ local game = Game()
if descObj.ObjType ~= 5 or descObj.ObjVariant ~= PickupVariant.PICKUP_TAROTCARD then if descObj.ObjType ~= 5 or descObj.ObjVariant ~= PickupVariant.PICKUP_TAROTCARD then
return false return false
end end
for i = 0,game:GetNumPlayers() - 1 do if EID:PlayersHaveCollectible(CollectibleType.COLLECTIBLE_TAROT_CLOTH) then
local player = Isaac.GetPlayer(i)
if player:HasCollectible(CollectibleType.COLLECTIBLE_TAROT_CLOTH) then
return true return true
end end
end
return false return false
end end
@@ -192,12 +180,9 @@ local game = Game()
if descObj.ObjSubType > TrinketType.TRINKET_GOLDEN_FLAG then if descObj.ObjSubType > TrinketType.TRINKET_GOLDEN_FLAG then
isGolden = true isGolden = true
end end
for i = 0,game:GetNumPlayers() - 1 do if EID:PlayersHaveCollectible(CollectibleType.COLLECTIBLE_MOMS_BOX) then
local player = Isaac.GetPlayer(i)
if player:HasCollectible(CollectibleType.COLLECTIBLE_MOMS_BOX) then
hasBox = true hasBox = true
end end
end
return isGolden or hasBox return isGolden or hasBox
end end
@@ -297,12 +282,9 @@ 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 if not REPENTANCE or descObj.ObjType ~= 5 or descObj.ObjVariant ~= PickupVariant.PICKUP_TAROTCARD or blankCardHidden[descObj.ObjSubType] or descObj.ObjSubType > 80 then
return false return false
end end
for i = 0, game:GetNumPlayers() - 1 do if EID:PlayersHaveCollectible(CollectibleType.COLLECTIBLE_BLANK_CARD) then
local player = Isaac.GetPlayer(i)
if player:HasCollectible(CollectibleType.COLLECTIBLE_BLANK_CARD) then
return true return true
end end
end
return false return false
end end
@@ -330,12 +312,9 @@ local game = Game()
if not REPENTANCE or descObj.ObjType ~= 5 or descObj.ObjVariant ~= PickupVariant.PICKUP_TAROTCARD or not runeIDs[descObj.ObjSubType] then if not REPENTANCE or descObj.ObjType ~= 5 or descObj.ObjVariant ~= PickupVariant.PICKUP_TAROTCARD or not runeIDs[descObj.ObjSubType] then
return false return false
end end
for i = 0, game:GetNumPlayers() - 1 do if EID:PlayersHaveCollectible(CollectibleType.COLLECTIBLE_CLEAR_RUNE) then
local player = Isaac.GetPlayer(i)
if player:HasCollectible(CollectibleType.COLLECTIBLE_CLEAR_RUNE) then
return true return true
end end
end
return false return false
end end
@@ -357,12 +336,9 @@ local game = Game()
if not REPENTANCE or descObj.ObjType ~= 5 or descObj.ObjVariant ~= PickupVariant.PICKUP_PILL then if not REPENTANCE or descObj.ObjType ~= 5 or descObj.ObjVariant ~= PickupVariant.PICKUP_PILL then
return false return false
end end
for i = 0, game:GetNumPlayers() - 1 do if EID:PlayersHaveCollectible(CollectibleType.COLLECTIBLE_PLACEBO) then
local player = Isaac.GetPlayer(i)
if player:HasCollectible(CollectibleType.COLLECTIBLE_PLACEBO) then
return true return true
end end
end
return false return false
end end
@@ -383,12 +359,9 @@ local game = Game()
if not REPENTANCE or descObj.ObjType ~= 5 or descObj.ObjVariant ~= PickupVariant.PICKUP_PILL then if not REPENTANCE or descObj.ObjType ~= 5 or descObj.ObjVariant ~= PickupVariant.PICKUP_PILL then
return false return false
end end
for i = 0, game:GetNumPlayers() - 1 do if EID:PlayersHaveCollectible(CollectibleType.COLLECTIBLE_FALSE_PHD) then
local player = Isaac.GetPlayer(i)
if player:HasCollectible(CollectibleType.COLLECTIBLE_FALSE_PHD) then
return true return true
end end
end
return false return false
end end
@@ -419,12 +392,9 @@ local game = Game()
if not REPENTANCE or descObj.ObjType ~= 5 or descObj.ObjVariant ~= PickupVariant.PICKUP_COLLECTIBLE then if not REPENTANCE or descObj.ObjType ~= 5 or descObj.ObjVariant ~= PickupVariant.PICKUP_COLLECTIBLE then
return false return false
end end
for i = 0, game:GetNumPlayers() - 1 do if EID:PlayersHaveCollectible(CollectibleType.COLLECTIBLE_ABYSS) then
local player = Isaac.GetPlayer(i)
if player:HasCollectible(CollectibleType.COLLECTIBLE_ABYSS) then
return true return true
end end
end
return false return false
end end