diff --git a/descriptions/ab+/en_us.lua b/descriptions/ab+/en_us.lua index 8e7c1d3b..d627ff8e 100644 --- a/descriptions/ab+/en_us.lua +++ b/descriptions/ab+/en_us.lua @@ -319,7 +319,7 @@ EID.descriptions[languageCode].collectibles={ {"296", "Converter", "{{Heart}} Converts 2 Soul/Black Hearts into 1 heart container"}, -- Converter -- NOTE FOR LOCALIZERS: There is code to highlight the text of your current floor -- For it to work, only use line breaks or semicolons to separate floor details, and use the same order as English - {"297", "Pandora's Box", "Spawns rewards based on floor:#B1: 2{{SoulHeart}}; B2: 2{{Bomb}} + 2{{Key}}#{{NoLB}}C1: Boss item; C2: C1 + 2{{SoulHeart}}#D1: 4{{SoulHeart}}; D2: 20{{Coin}}#W1: 2 Boss items#W2: {{Collectible33}} The Bible#???/Void: Nothing#Sheol: Devil item + 1{{BlackHeart}}#Cathe: Angel item + 1{{EternalHeart}}#{{NoLB}}Dark Room: Unlocks {{Collectible523}} Moving Box#Chest: 1{{Coin}}"}, -- Pandora's Box + {"297", "Pandora's Box", "{{NoLB}}Spawns rewards based on floor:#B1: 2{{SoulHeart}}; B2: 2{{Bomb}} + 2{{Key}}#{{NoLB}}C1: Boss item; C2: C1 + 2{{SoulHeart}}#D1: 4{{SoulHeart}}; D2: 20{{Coin}}#W1: 2 Boss items#W2: {{Collectible33}} The Bible#???/Void: Nothing#Sheol: Devil item + 1{{BlackHeart}}#Cathe: Angel item + 1{{EternalHeart}}#{{NoLB}}Dark Room: Unlocks {{Collectible523}} Moving Box#Chest: 1{{Coin}}"}, -- Pandora's Box {"298", "Unicorn Stump", "{{Timer}} Receive for 6 seconds:#↑ {{Speed}} +0.28 Speed#Invincibility#Isaac can't shoot (No contact damage)"}, -- Unicorn Stump {"299", "Taurus", "↓ {{Speed}} -0.3 Speed#↑ {{Speed}} Slowly gain speed while in hostile rooms#At 2 speed, Isaac becomes invincible and deals contact damage#Afterwards, lose the Taurus speed boost for the room"}, -- Taurus {"300", "Aries", "↑ {{Speed}} +0.25 Speed#Touching enemies deals contact damage"}, -- Aries diff --git a/descriptions/rep/en_us.lua b/descriptions/rep/en_us.lua index 841ce966..2712b667 100644 --- a/descriptions/rep/en_us.lua +++ b/descriptions/rep/en_us.lua @@ -136,7 +136,7 @@ local repCollectibles={ [296] = {"296", "Converter", "{{Heart}} Converts 1 Soul or Black Heart into 1 heart container"}, -- Converter -- NOTE FOR LOCALIZERS: There is code to highlight the text of your current floor -- For it to work, only use line breaks or semicolons to separate floor details, and use the same order as English - [297] = {"297", "Pandora's Box", "Spawns rewards based on floor:#B1: 2{{SoulHeart}}; B2: 2{{Bomb}} + 2{{Key}}#{{NoLB}}C1: Boss item; C2: C1 + 2{{SoulHeart}}#D1: 4{{SoulHeart}}; D2: 20{{Coin}}#W1: 2 Boss items#W2: {{Collectible33}} The Bible#???/Void: Nothing#Sheol: Devil item + 1{{BlackHeart}}#Cathe: Angel item + 1{{EternalHeart}}#{{NoLB}}Dark Room: Unlocks {{Collectible523}} Moving Box#Chest: 1{{Coin}}#Home: {{Collectible580}} Red Key"}, -- Pandora's Box + [297] = {"297", "Pandora's Box", "{{NoLB}}Spawns rewards based on floor:#B1: 2{{SoulHeart}}; B2: 2{{Bomb}} + 2{{Key}}#{{NoLB}}C1: Boss item; C2: C1 + 2{{SoulHeart}}#D1: 4{{SoulHeart}}; D2: 20{{Coin}}#W1: 2 Boss items#W2: {{Collectible33}} The Bible#???/Void: Nothing#Sheol: Devil item + 1{{BlackHeart}}#Cathe: Angel item + 1{{EternalHeart}}#{{NoLB}}Dark Room: Unlocks {{Collectible523}} Moving Box#Chest: 1{{Coin}}#Home: {{Collectible580}} Red Key"}, -- Pandora's Box [300] = {"300", "Aries", "↑ {{Speed}} +0.25 Speed#Moving above 0.85 Speed makes Isaac immune to contact damage and deals 25 damage to enemies"}, -- Aries [307] = {"307", "Capricorn", "↑ {{Heart}} +1 Health#↑ {{Speed}} +0.1 Speed#↑ {{Tears}} +0.5 Fire rate#↑ {{Damage}} +0.5 Damage#↑ {{Range}} +0.75 Range#+1 {{Coin}} coin, {{Bomb}} bomb and {{Key}} key#{{HealingRed}} Heals 1 heart"}, -- Capricorn [308] = {"308", "Aquarius", "Isaac leaves a trail of creep#{{Damage}} The creep deals 66% of Isaac's damage per second and inherits his tear effects"}, -- Aquarius diff --git a/features/eid_api.lua b/features/eid_api.lua index 4a4981b2..1b268c9f 100644 --- a/features/eid_api.lua +++ b/features/eid_api.lua @@ -1321,7 +1321,7 @@ end function EID:PlayerVoidedCollectible(player, collectibleID) local playerNum = EID:getPlayerID(player, true) local isCollectibleAbsorbed = EID.absorbedItems[tostring(playerNum)] and EID.absorbedItems[tostring(playerNum)][tostring(collectibleID)] - if player:HasCollectible(477) and isCollectibleAbsorbed and not EID.SingleUseCollectibles[collectibleID] then + if player:HasCollectible(477) and isCollectibleAbsorbed then return true, player, i end end diff --git a/features/eid_conditionals.lua b/features/eid_conditionals.lua index 84e9f5eb..6d8f9b17 100644 --- a/features/eid_conditionals.lua +++ b/features/eid_conditionals.lua @@ -327,10 +327,10 @@ EID:AddItemConditional("5.300.48", 286, nil, { lineColor = "ColorSilver" }) EID:AddItemConditional(286, "5.300.48", "? + Blank Pedestal") -- ? Card + Blank Card EID:AddSynergyConditional(368, {69, 118, 316, 229, 395, 114, 329}, "Almost No Effect") -- Epiphora + Charge Shots / Ludovico -EID:AddSynergyConditional({127, 297, 347, 490, 483, 515, 475}, 477, "Void Single Use") -- Void + Single Use Actives -if EID.isRepentance then EID:AddSynergyConditional({536, 585, 577, 628, 636}, 477, "Void Single Use") end -- Void + Single Use Actives -EID:AddSynergyConditional({127, 297, 347, 490, 483, 515, 475, 536}, "5.300.48", "? Card Single Use") -- ? Card + Single Use Actives -if EID.isRepentance then EID:AddSynergyConditional({585, 577, 628, 636}, "5.300.48", "? Card Single Use") end -- ? Card + Single Use Actives +EID:AddSynergyConditional({127, 297, 347, 475, 483, 490, 515}, 477, "Void Single Use") -- Void + Single Use Actives +if EID.isRepentance then EID:AddSynergyConditional({536, 577, 585, 628, 636}, 477, "Void Single Use") end -- Void + Single Use Actives +EID:AddSynergyConditional({127, 297, 347, 475, 483, 490, 515, 536}, "5.300.48", "? Card Single Use") -- ? Card + Single Use Actives +if EID.isRepentance then EID:AddSynergyConditional({577, 585, 628, 636}, "5.300.48", "? Card Single Use") end -- ? Card + Single Use Actives EID:AddConditional(521, EID.PlayersHaveRestock) -- Coupon + Restock/Greed for k,_ in pairs(EID.blackFeatherItems) do EID:AddItemConditional(k, "5.350.80", "Black Feather", {lineColor="BlinkGray"}) end -- Black Feather diff --git a/features/eid_data.lua b/features/eid_data.lua index 4e7d1310..b82d39d5 100644 --- a/features/eid_data.lua +++ b/features/eid_data.lua @@ -1122,6 +1122,7 @@ EID.SingleUseCollectibles = { } if EID.isRepentance then EID.SingleUseCollectibles[577] = true -- Damocles + EID.SingleUseCollectibles[585] = true -- Alabaster Box EID.SingleUseCollectibles[622] = true -- Genesis EID.SingleUseCollectibles[628] = true -- Death Certificate EID.SingleUseCollectibles[636] = true -- R Key diff --git a/main.lua b/main.lua index b86eb9dc..3ed05b3a 100644 --- a/main.lua +++ b/main.lua @@ -377,8 +377,17 @@ function EID:CheckVoidAbsorbs(_, _, player) player = player or EID.player local playerID = EID:getPlayerID(player, true) EID.absorbedItems[tostring(playerID)] = EID.absorbedItems[tostring(playerID)] or {} + -- Remove single use items from Void on use in Repentance + if EID.isRepentance then + for k,_ in pairs(EID.SingleUseCollectibles) do + EID.absorbedItems[tostring(playerID)][tostring(k)] = nil + end + end for _,v in ipairs(EID:VoidRoomCheck()) do - EID.absorbedItems[tostring(playerID)][tostring(v)] = true + -- Don't include single use items in AB+ (they're immediately used and gone) + if EID.isRepentance or not EID.SingleUseCollectibles[v] then + EID.absorbedItems[tostring(playerID)][tostring(v)] = true + end end EID.RecheckVoid = true end