Compare commits

...
4 Commits
Author SHA1 Message Date
Wofsauge b99888aef8 Update Workshop mod 2022-02-02 13:06:24 +01:00
wofsauge 1f430375ed Merge pull request #368 from Buurazu/master
Fix description caching failing on AB+
2022-02-02 10:06:05 +01:00
Buurazu 0bbebab615 Fix AB+ desc caching 2022-02-01 23:22:01 -05:00
Buurazu 01c8005401 Fix description caching on AB+ 2022-02-01 23:17:24 -05:00
3 changed files with 11 additions and 10 deletions

No files matched your search

+1 -1
View File
@@ -666,7 +666,7 @@ function EID:renderIcon(spriteObj, posX, posY, callback, animName, animFrame)
end end
if EID.CachingDescription then if EID.CachingDescription then
table.insert(EID.CachedIcons, {spriteObj, posX, posY, callback, animName or spriteObj:GetAnimation(), animFrame or spriteObj:GetFrame()}) table.insert(EID.CachedIcons, {spriteObj, posX, posY, callback, animName, animFrame})
end end
spriteObj:Render(Vector(posX, posY), nullVector, nullVector) spriteObj:Render(Vector(posX, posY), nullVector, nullVector)
+9 -8
View File
@@ -9,7 +9,7 @@ local game = Game()
require("eid_config") require("eid_config")
EID.Config = EID.UserConfig EID.Config = EID.UserConfig
EID.Config.Version = "3.2" -- note: changing this will reset everyone's settings to default! EID.Config.Version = "3.2" -- note: changing this will reset everyone's settings to default!
EID.ModVersion = "4.17" EID.ModVersion = "4.18"
EID.DefaultConfig.Version = EID.Config.Version EID.DefaultConfig.Version = EID.Config.Version
EID.isHidden = false EID.isHidden = false
EID.player = nil EID.player = nil
@@ -527,20 +527,21 @@ function EID:printDescription(desc)
if EID.Config["ShowItemType"] and (itemType == 3 or itemType == 4) then if EID.Config["ShowItemType"] and (itemType == 3 or itemType == 4) then
local offsetY = 2 local offsetY = 2
EID.IconSprite:Play(EID.ItemTypeAnm2Names[itemType]) EID.IconSprite:Play(EID.ItemTypeAnm2Names[itemType])
EID:renderIcon(EID.IconSprite, renderPos.X + offsetX * EID.Scale, renderPos.Y + offsetY * EID.Scale) EID:renderIcon(EID.IconSprite, renderPos.X + offsetX * EID.Scale, renderPos.Y + offsetY * EID.Scale, nil, EID.ItemTypeAnm2Names[itemType], 0)
if itemType == 3 then if itemType == 3 then
-- Display Charge -- Display Charge
offsetX = offsetX + 1 offsetX = offsetX + 1
local curItemConfig = EID.itemConfig:GetCollectible(desc.ObjSubType) local curItemConfig = EID.itemConfig:GetCollectible(desc.ObjSubType)
local anim2 = "numbers"
local frame2 = curItemConfig.MaxCharges
if REPENTANCE and curItemConfig.ChargeType == ItemConfig.CHARGE_TIMED then if REPENTANCE and curItemConfig.ChargeType == ItemConfig.CHARGE_TIMED then
EID.InlineIconSprite2:SetFrame("pickups", 10) -- Timer Icon anim2 = "pickups"; frame2 = 10 -- Timer Icon
elseif REPENTANCE and (curItemConfig.ChargeType == ItemConfig.CHARGE_SPECIAL or desc.ObjSubType == CollectibleType.COLLECTIBLE_BLANK_CARD or desc.ObjSubType == CollectibleType.COLLECTIBLE_PLACEBO or elseif REPENTANCE and (curItemConfig.ChargeType == ItemConfig.CHARGE_SPECIAL or desc.ObjSubType == CollectibleType.COLLECTIBLE_BLANK_CARD or desc.ObjSubType == CollectibleType.COLLECTIBLE_PLACEBO or
desc.ObjSubType == CollectibleType.COLLECTIBLE_CLEAR_RUNE or desc.ObjSubType == CollectibleType.COLLECTIBLE_D_INFINITY) then desc.ObjSubType == CollectibleType.COLLECTIBLE_CLEAR_RUNE or desc.ObjSubType == CollectibleType.COLLECTIBLE_D_INFINITY) then
EID.InlineIconSprite2:SetFrame("numbers", 13) frame2 = 13 -- Question Mark Icon
else
EID.InlineIconSprite2:SetFrame("numbers", curItemConfig.MaxCharges)
end end
EID:renderIcon(EID.InlineIconSprite2, renderPos.X + offsetX * EID.Scale, renderPos.Y + offsetY * EID.Scale) EID.InlineIconSprite2:SetFrame(anim2, frame2)
EID:renderIcon(EID.InlineIconSprite2, renderPos.X + offsetX * EID.Scale, renderPos.Y + offsetY * EID.Scale, nil, anim2, frame2)
end end
offsetX = offsetX + 8 offsetX = offsetX + 8
end end
@@ -681,7 +682,7 @@ end
function EID:renderQuestionMark() function EID:renderQuestionMark()
EID.IconSprite:Play("CurseOfBlind") EID.IconSprite:Play("CurseOfBlind")
local pos = EID:getTextPosition() local pos = EID:getTextPosition()
EID:renderIcon(EID.IconSprite, pos.X + 5 * EID.Scale, pos.Y + 5 * EID.Scale) EID:renderIcon(EID.IconSprite, pos.X + 5 * EID.Scale, pos.Y + 5 * EID.Scale, nil, "CurseOfBlind", 0)
end end
function EID:renderIndicator(entity) function EID:renderIndicator(entity)
+1 -1
View File
@@ -103,7 +103,7 @@ https://moddingofisaac.com/mod/1079/external-item-descriptions
- Jake for the sweet [b]German[/b] language pack - Jake for the sweet [b]German[/b] language pack
- Blackcreamtea and 미카 for the awesome [b]Korean[/b] language pack - Blackcreamtea and 미카 for the awesome [b]Korean[/b] language pack
- [url=https://steamcommunity.com/id/whytefang/]adc[/url] for creating an awesome new Languagepack and providing ideas for new functionalities</description> - [url=https://steamcommunity.com/id/whytefang/]adc[/url] for creating an awesome new Languagepack and providing ideas for new functionalities</description>
<version>4.17</version> <version>4.18</version>
<visibility>Public</visibility> <visibility>Public</visibility>
<tag id="Lua"/> <tag id="Lua"/>
<tag id="Items"/> <tag id="Items"/>