lzrdblzzrd/External-Item-Descriptions
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed modded card/pill icons in Item Reminder

Browse Source 
closes #795
This commit is contained in:
Wofsauge committed 2025-01-24 23:31:21 +01:00
1 parent 97cbaecc42
commit fc7c9d5605
1 file changed
+14 -21
Download Patch File Download Diff File Expand all files Collapse all files
features/eid_api.lua
+14 -21
View File
@@ -1117,11 +1117,8 @@ function EID:createItemIconObject(str)
local Type, Var, Sub = EID:SplitTVS(itemID) local Type, Var, Sub = EID:SplitTVS(itemID)
if Type == 1 then return EID:getIcon("Player" .. Sub) if Type == 1 then return EID:getIcon("Player" .. Sub)
elseif Type == 5 then elseif Type == 5 then
if Var == 100 then return EID:createItemIconObject("Collectible" .. Sub) local iconName = EID:GetIconNameByVariant(Var)
elseif Var == 350 then return EID:createItemIconObject("Trinket" .. Sub) return EID:createItemIconObject(iconName .. Sub)
elseif Var == 300 then return EID:createItemIconObject("Card" .. Sub)
elseif Var == 70 then return EID:createItemIconObject("Pill" .. Sub)
end
end end
end end
@@ -2559,18 +2556,8 @@ function EID:getObjectIcon(descObj)
end end
if descObj.ObjType == 5 then if descObj.ObjType == 5 then
if descObj.ObjVariant == 100 then local iconName = EID:GetIconNameByVariant(descObj.ObjVariant)
return EID:createItemIconObject("Collectible" .. descObj.ObjSubType) return EID:createItemIconObject(iconName .. descObj.ObjSubType)
elseif descObj.ObjVariant == 350 then
return EID:createItemIconObject("Trinket" .. descObj.ObjSubType)
elseif descObj.ObjVariant == 300 then
return EID:createItemIconObject("Card" .. descObj.ObjSubType)
elseif descObj.ObjVariant == 70 then
if descObj.ObjSubType >= 2049 then
return EID:createItemIconObject("Pill" .. (descObj.ObjSubType - 2048))
end
return EID:createItemIconObject("Pill" .. descObj.ObjSubType)
end
-- Handle Dice Room Floor -- Handle Dice Room Floor
elseif descObj.ObjType == 1000 and descObj.ObjVariant == 76 then elseif descObj.ObjType == 1000 and descObj.ObjVariant == 76 then
---@diagnostic disable-next-line: return-type-mismatch ---@diagnostic disable-next-line: return-type-mismatch
@@ -2742,12 +2729,18 @@ end
---@return string ---@return string
function EID:GetIconStringByDescriptionObject(descObj) function EID:GetIconStringByDescriptionObject(descObj)
if descObj and descObj.Icon then if descObj and descObj.Icon then
-- icon object assigned to Icon attribute
if type(descObj.Icon) == "table" then if type(descObj.Icon) == "table" then
local iconName = EID:GetIconNameByVariant(descObj.ObjVariant) local subType = descObj.ObjSubType
if iconName == "Card" or iconName == "Pill" then if descObj.ObjType == 1 then
return "{{" .. iconName .. (descObj.Icon[2] + 1) .. "}}" return "{{Player" .. (subType or "") .. "}}"
elseif descObj.ObjType == 5 then
local iconName = EID:GetIconNameByVariant(descObj.ObjVariant)
return "{{" .. iconName .. subType .. "}}"
elseif descObj.ObjType == 1000 and descObj.ObjVariant == 76 then
return "{{DiceFace" .. subType .. "}}"
end end
return "{{" .. iconName .. descObj.Icon[2] .. "}}" -- String assigned to Icon attribute
elseif type(descObj.Icon) == "string" then elseif type(descObj.Icon) == "string" then
---@diagnostic disable-next-line: return-type-mismatch ---@diagnostic disable-next-line: return-type-mismatch
return descObj.Icon return descObj.Icon