Use PlayersHaveCollectible
This commit is contained in:
1 parent
91f690e9ba
commit
706ca5589a
1 file changed
+20
-50
+20
-50
@@ -32,11 +32,8 @@ 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)
|
return true
|
||||||
if player:HasCollectible(CollectibleType.COLLECTIBLE_BINGE_EATER) then
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
@@ -86,11 +83,8 @@ 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)
|
return true
|
||||||
if player:HasCollectible(CollectibleType.COLLECTIBLE_BOOK_OF_VIRTUES) then
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
@@ -112,11 +106,8 @@ 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)
|
return true
|
||||||
if player:HasCollectible(CollectibleType.COLLECTIBLE_SPINDOWN_DICE) then
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
@@ -158,11 +149,8 @@ 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)
|
return true
|
||||||
if player:HasCollectible(CollectibleType.COLLECTIBLE_TAROT_CLOTH) then
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
@@ -192,11 +180,8 @@ 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)
|
hasBox = true
|
||||||
if player:HasCollectible(CollectibleType.COLLECTIBLE_MOMS_BOX) then
|
|
||||||
hasBox = true
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
return isGolden or hasBox
|
return isGolden or hasBox
|
||||||
end
|
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
|
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)
|
return true
|
||||||
if player:HasCollectible(CollectibleType.COLLECTIBLE_BLANK_CARD) then
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
return false
|
return false
|
||||||
end
|
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
|
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)
|
return true
|
||||||
if player:HasCollectible(CollectibleType.COLLECTIBLE_CLEAR_RUNE) then
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
@@ -357,11 +336,8 @@ 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)
|
return true
|
||||||
if player:HasCollectible(CollectibleType.COLLECTIBLE_PLACEBO) then
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
@@ -383,11 +359,8 @@ 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)
|
return true
|
||||||
if player:HasCollectible(CollectibleType.COLLECTIBLE_FALSE_PHD) then
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
@@ -419,11 +392,8 @@ 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)
|
return true
|
||||||
if player:HasCollectible(CollectibleType.COLLECTIBLE_ABYSS) then
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in new issue
Block a user