moved display last pool func to fix potential issues (#570)

This commit is contained in:
wakaba (aka. 미카) authored and GitHub committed 2023-06-23 16:14:02 +02:00
1 parent fde251ef77
commit b8e114b1fa
3 files changed
+18 -16

No files matched your search

-14
View File
@@ -229,19 +229,6 @@ end
if EID.isRepentance then
-- Handle Last Pool
local function LastPoolCallback(descObj)
local itemConfig = EID.itemConfig:GetCollectible(descObj.ObjSubType)
if itemConfig:IsCollectible() and not itemConfig:HasTags(ItemConfig.TAG_QUEST) then
local lastPool = game:GetItemPool():GetLastPool()
local poolName = ""
local poolDescPrepend = EID:getDescriptionEntry("itemPoolFor")
local poolDescTable = EID:getDescriptionEntry("itemPoolNames")
poolName = "{{"..EID.Config["ItemPoolTextColor"].."}}"..poolDescPrepend..""..(EID.ItemPoolTypeToMarkup[lastPool] or "{{ItemPoolTreasure}}")..poolDescTable[lastPool] .. "{{CR}}#"
descObj.Description = poolName .. descObj.Description
end
return descObj
end
-- Handle Birthright
local function BirthrightCallback(descObj)
descObj.Description = ""
@@ -689,7 +676,6 @@ if EID.isRepentance then
-- Using magic numbers here in case it's slightly faster, and because the callback names give context
-- Check Birthright first because it overwrites the description instead of appending to it
if descObj.ObjSubType == 619 then table.insert(callbacks, BirthrightCallback) end
if not EID.InsideItemReminder and EID.Config["ShowItemPoolText"] then table.insert(callbacks, LastPoolCallback) end
if descObj.ObjSubType == 644 then table.insert(callbacks, ConsolationPrizeCallback) end
if EID.collectiblesOwned[664] then table.insert(callbacks, BingeEaterCallback) end