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

Update main.lua

Browse Source
This commit is contained in:
kochetov2000 authored and GitHub committed 2021-12-04 16:20:18 +03:00
1 parent a909826fd3
commit c5585d5caa
1 file changed
+66 -46
Download Patch File Download Diff File Expand all files Collapse all files
main.lua
+66 -46
View File
@@ -18,6 +18,7 @@ EID.player = nil
EID.PositionModifiers = {} EID.PositionModifiers = {}
EID.DescModifiers = {} EID.DescModifiers = {}
EID.UsedPosition = Vector(EID.Config["XPosition"], EID.Config["YPosition"]) EID.UsedPosition = Vector(EID.Config["XPosition"], EID.Config["YPosition"])
EID.Scale = EID.Config["Scale"]
EID.isDisplaying = false EID.isDisplaying = false
EID.isDisplayingPermanent = false EID.isDisplayingPermanent = false
EID.permanentDisplayTextObj = nil EID.permanentDisplayTextObj = nil
@@ -216,7 +217,7 @@ end
---------------------------Printing Functions------------------------------ ---------------------------Printing Functions------------------------------
function EID:printDescription(desc) function EID:printDescription(desc)
local textScale = Vector(EID.Config["Scale"], EID.Config["Scale"]) local textScale = Vector(EID.Scale, EID.Scale)
local renderPos = EID:getTextPosition() local renderPos = EID:getTextPosition()
local offsetX = 0 local offsetX = 0
if EID.Config["ShowItemIcon"] then if EID.Config["ShowItemIcon"] then
@@ -240,7 +241,7 @@ function EID:printDescription(desc)
offsetX = offsetX + 14 offsetX = offsetX + 14
EID:renderString( EID:renderString(
"{{" .. iconType .. subType .. "}}", "{{" .. iconType .. subType .. "}}",
renderPos + (Vector(-3, -4) * EID.Config["Scale"]), renderPos + (Vector(-3, -4) * EID.Scale),
textScale, textScale,
EID:getNameColor() EID:getNameColor()
) )
@@ -253,11 +254,11 @@ function EID:printDescription(desc)
end end
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
if EID.Config["Scale"] < 1 then if EID.Scale < 1 then
offsetY = -1 offsetY = -1
end end
EID.IconSprite:Play(EID.ItemTypeAnm2Names[itemType]) EID.IconSprite:Play(EID.ItemTypeAnm2Names[itemType])
EID:renderIcon(EID.IconSprite, renderPos.X + offsetX * EID.Config["Scale"], renderPos.Y + offsetY * EID.Config["Scale"]) EID:renderIcon(EID.IconSprite, renderPos.X + offsetX * EID.Scale, renderPos.Y + offsetY * EID.Scale)
if itemType == 3 then if itemType == 3 then
-- Display Charge -- Display Charge
offsetX = offsetX + 1 offsetX = offsetX + 1
@@ -270,14 +271,14 @@ function EID:printDescription(desc)
else else
EID.InlineIconSprite2:SetFrame("numbers", curItemConfig.MaxCharges) EID.InlineIconSprite2:SetFrame("numbers", curItemConfig.MaxCharges)
end end
EID:renderIcon(EID.InlineIconSprite2, renderPos.X + offsetX * EID.Config["Scale"], renderPos.Y + offsetY * EID.Config["Scale"]) EID:renderIcon(EID.InlineIconSprite2, renderPos.X + offsetX * EID.Scale, renderPos.Y + offsetY * EID.Scale)
offsetX = offsetX + 8 offsetX = offsetX + 8
elseif itemType == 4 then elseif itemType == 4 then
-- familiar -- familiar
offsetX = offsetX + 8 offsetX = offsetX + 8
end end
if not EID.Config["ShowItemName"] then if not EID.Config["ShowItemName"] then
renderPos.Y = renderPos.Y + EID.lineHeight * EID.Config["Scale"] renderPos.Y = renderPos.Y + EID.lineHeight * EID.Scale
end end
end end
--Display Itemname --Display Itemname
@@ -300,12 +301,12 @@ function EID:printDescription(desc)
end end
EID:renderString( EID:renderString(
curName, curName,
renderPos + (Vector(offsetX, -3) * EID.Config["Scale"]), renderPos + (Vector(offsetX, -3) * EID.Scale),
textScale, textScale,
EID:getNameColor() EID:getNameColor()
) )
renderPos.Y = renderPos.Y + EID.lineHeight * EID.Config["Scale"] renderPos.Y = renderPos.Y + EID.lineHeight * EID.Scale
end end
--Display Transformation --Display Transformation
@@ -324,13 +325,13 @@ function EID:printDescription(desc)
local textOffsetY = math.min(0, (iconHeight - 9)) / 4 local textOffsetY = math.min(0, (iconHeight - 9)) / 4
EID:renderString( EID:renderString(
transformationName, transformationName,
renderPos + (Vector(iconWidth + 4, textOffsetY)* EID.Config["Scale"]), renderPos + (Vector(iconWidth + 4, textOffsetY)* EID.Scale),
textScale, textScale,
EID:getTransformationColor() EID:getTransformationColor()
) )
end end
if (EID.Config["TransformationIcons"] or EID.Config["TransformationText"]) then if (EID.Config["TransformationIcons"] or EID.Config["TransformationText"]) then
renderPos.Y = renderPos.Y + transformLineHeight * EID.Config["Scale"] renderPos.Y = renderPos.Y + transformLineHeight * EID.Scale
end end
end end
end end
@@ -339,7 +340,7 @@ end
function EID:printBulletPoints(description, renderPos) function EID:printBulletPoints(description, renderPos)
local textboxWidth = tonumber(EID.Config["TextboxWidth"]) local textboxWidth = tonumber(EID.Config["TextboxWidth"])
local textScale = Vector(EID.Config["Scale"], EID.Config["Scale"]) local textScale = Vector(EID.Scale, EID.Scale)
description = EID:replaceShortMarkupStrings(description) description = EID:replaceShortMarkupStrings(description)
for line in string.gmatch(description, "([^#]+)") do for line in string.gmatch(description, "([^#]+)") do
@@ -351,13 +352,13 @@ function EID:printBulletPoints(description, renderPos)
local bpIcon = EID:handleBulletpointIcon(lineToPrint) local bpIcon = EID:handleBulletpointIcon(lineToPrint)
if EID:getIcon(bpIcon) ~= EID.InlineIcons["ERROR"] then if EID:getIcon(bpIcon) ~= EID.InlineIcons["ERROR"] then
lineToPrint = string.gsub(lineToPrint, bpIcon .. " ", "", 1) lineToPrint = string.gsub(lineToPrint, bpIcon .. " ", "", 1)
textColor = EID:renderString(bpIcon, renderPos + Vector(-3 * EID.Config["Scale"], 0), textScale , textColor) textColor = EID:renderString(bpIcon, renderPos + Vector(-3 * EID.Scale, 0), textScale , textColor)
else else
textColor = EID:renderString(bpIcon, renderPos, textScale , textColor) textColor = EID:renderString(bpIcon, renderPos, textScale , textColor)
end end
end end
textColor = EID:renderString(lineToPrint, renderPos + Vector(12 * EID.Config["Scale"], 0), textScale, textColor) textColor = EID:renderString(lineToPrint, renderPos + Vector(12 * EID.Scale, 0), textScale, textColor)
renderPos.Y = renderPos.Y + EID.lineHeight * EID.Config["Scale"] renderPos.Y = renderPos.Y + EID.lineHeight * EID.Scale
end end
end end
end end
@@ -376,7 +377,7 @@ EID:AddCallback(ModCallbacks.MC_POST_NEW_ROOM, EID.onNewRoom)
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.Config["Scale"], pos.Y + 5 * EID.Config["Scale"]) EID:renderIcon(EID.IconSprite, pos.X + 5 * EID.Scale, pos.Y + 5 * EID.Scale)
end end
function EID:renderIndicator(entity) function EID:renderIndicator(entity)
@@ -436,6 +437,34 @@ function EID:renderIndicator(entity)
end end
end end
function EID:ScaleValue(entity)
if entity.Variant == EffectVariant.DICE_FLOOR then
EID.Scale = EID.Config["Scale"]
EID.UsedPosition = Vector(EID.Config["XPosition"], EID.Config["YPosition"])
elseif EID.Config["LocalMode"] then
EID.Scale = EID.Config["LocalScale"]
end
end
function EID:PositionLocalMode(entity)
if EID.Config["LocalMode"] then
EID:alterTextPos(Isaac.WorldToScreen(entity.Position - Vector(35,-20)))
if REPENTANCE then
if isMirrorRoom then
EID:alterTextPos(Isaac.WorldToScreen(entity.Position - Vector(-35,-20)))
local screenCenter = EID:getScreenSize()/2
EID.UsedPosition.X = EID.UsedPosition.X - (EID.UsedPosition-screenCenter).X * 2
end
end
if entity:ToPickup() and entity:ToPickup():IsShopItem() then
EID:alterTextPos(Isaac.WorldToScreen(entity.Position - Vector(35,-40)))
end
else
EID.UsedPosition = Vector(EID.Config["XPosition"], EID.Config["YPosition"])
EID.Scale = EID.Config["Scale"]
end
end
function EID:renderEntity(entity, sprite, position) function EID:renderEntity(entity, sprite, position)
if entity.Type == 5 and entity.Variant == 100 then if entity.Type == 5 and entity.Variant == 100 then
sprite:RenderLayer(1, position, nullVector, nullVector) sprite:RenderLayer(1, position, nullVector, nullVector)
@@ -555,36 +584,19 @@ EID:AddCallback(ModCallbacks.MC_POST_UPDATE, EID.onGameUpdate)
local hasShownAchievementWarning = false local hasShownAchievementWarning = false
local function renderAchievementInfo() local function renderAchievementInfo()
if REPENTANCE and not EID.Config.DisableAchievementCheck and game:GetFrameCount() < 10*30 then if REPENTANCE and not EID.Config.DisableAchievementCheck and game:GetFrameCount() < 10*30 and game.Challenge == 0 then
-- Old Repentance version check; update this to check for the existence of the newest mod API function EID uses local characterID = Game():GetPlayer(0):GetPlayerType()
-- 1.7.6 (Nov. 16, 2021): The Options object (to read the game's options like HUD Offset) --ID 21 = Tainted Isaac. Tainted characters have definitely beaten Mom! (Fixes Tainted Lost's item pools ruining this check)
if Options == nil then if characterID < 21 then
local demoDescObj = EID:getDescriptionObj(-999, -1, 1) local hasBookOfRevelationsUnlocked = EID:isCollectibleUnlockedAnyPool(CollectibleType.COLLECTIBLE_BOOK_OF_REVELATIONS or CollectibleType.COLLECTIBLE_BOOK_REVELATIONS)
demoDescObj.Name = EID:getDescriptionEntry("AchievementWarningTitle") or "" if not hasBookOfRevelationsUnlocked then
demoDescObj.Description = EID:getDescriptionEntry("OldGameVersionWarningText") or "" local hasCubeOfMeatUnlocked = EID:isCollectibleUnlockedAnyPool(CollectibleType.COLLECTIBLE_CUBE_OF_MEAT)
EID:displayPermanentText(demoDescObj) if not hasCubeOfMeatUnlocked then
hasShownAchievementWarning = true local demoDescObj = EID:getDescriptionObj(-999, -1, 1)
elseif EID.player:HasCollectible(710) and EID:DetectModdedItems() and EID.Config.DisplayBagOfCrafting ~= "never" and not EID.Config.BagOfCraftingSimplifiedMode then demoDescObj.Name = EID:getDescriptionEntry("AchievementWarningTitle") or ""
local demoDescObj = EID:getDescriptionObj(-999, -1, 1) demoDescObj.Description = EID:getDescriptionEntry("AchievementWarningText") or ""
demoDescObj.Name = EID:getDescriptionEntry("AchievementWarningTitle") or "" EID:displayPermanentText(demoDescObj)
demoDescObj.Description = EID:getDescriptionEntry("ModdedRecipesWarningText") or "" hasShownAchievementWarning = true
EID:displayPermanentText(demoDescObj)
hasShownAchievementWarning = true
else
-- Achievements Locked Check (do we have Cube of Meat or Book of Revelations unlocked?)
local characterID = Game():GetPlayer(0):GetPlayerType()
--ID 21 = Tainted Isaac. Tainted characters have definitely beaten Mom! (Fixes Tainted Lost's item pools ruining this check)
if characterID < 21 and game.Challenge == 0 then
local hasBookOfRevelationsUnlocked = EID:isCollectibleUnlockedAnyPool(CollectibleType.COLLECTIBLE_BOOK_OF_REVELATIONS or CollectibleType.COLLECTIBLE_BOOK_REVELATIONS)
if not hasBookOfRevelationsUnlocked then
local hasCubeOfMeatUnlocked = EID:isCollectibleUnlockedAnyPool(CollectibleType.COLLECTIBLE_CUBE_OF_MEAT)
if not hasCubeOfMeatUnlocked then
local demoDescObj = EID:getDescriptionObj(-999, -1, 1)
demoDescObj.Name = EID:getDescriptionEntry("AchievementWarningTitle") or ""
demoDescObj.Description = EID:getDescriptionEntry("AchievementWarningText") or ""
EID:displayPermanentText(demoDescObj)
hasShownAchievementWarning = true
end
end end
end end
end end
@@ -689,6 +701,8 @@ local function onRender(t)
local curCounter = EID.sacrificeCounter[curRoomIndex] or 1 local curCounter = EID.sacrificeCounter[curRoomIndex] or 1
local sacrificeDesc = EID:getDescriptionObj(-999, -1, curCounter) local sacrificeDesc = EID:getDescriptionObj(-999, -1, curCounter)
sacrificeDesc.Name = sacrificeDesc.Name.." ("..curCounter.."/12)" sacrificeDesc.Name = sacrificeDesc.Name.." ("..curCounter.."/12)"
EID:alterTextPos(Vector(EID.Config["XPosition"], EID.Config["YPosition"]))
EID.Scale = EID.Config["Scale"]
EID:printDescription(sacrificeDesc) EID:printDescription(sacrificeDesc)
end end
return return
@@ -703,6 +717,11 @@ local function onRender(t)
--Handle Indicators --Handle Indicators
EID:renderIndicator(closest) EID:renderIndicator(closest)
--Local Mode
EID:PositionLocalMode(closest)
--Scale Value
EID:ScaleValue(closest)
--Handle GetData Entities (specific) --Handle GetData Entities (specific)
if EID.Config["EnableEntityDescriptions"] and EID:getEntityData(closest, "EID_Description") then if EID.Config["EnableEntityDescriptions"] and EID:getEntityData(closest, "EID_Description") then
local desc = EID:getEntityData(closest, "EID_Description") local desc = EID:getEntityData(closest, "EID_Description")
@@ -784,7 +803,7 @@ local function onRender(t)
EID:renderString( EID:renderString(
"{{Pill"..pillColor.."}} "..EID:getDescriptionEntry("unidentifiedPill"), "{{Pill"..pillColor.."}} "..EID:getDescriptionEntry("unidentifiedPill"),
EID:getTextPosition(), EID:getTextPosition(),
Vector(EID.Config["Scale"], EID.Config["Scale"]), Vector(EID.Scale, EID.Scale),
EID:getErrorColor() EID:getErrorColor()
) )
end end
@@ -840,6 +859,7 @@ if EID.MCMLoaded or REPENTANCE then
end end
EID.isHidden = EID.Config["InitiallyHidden"] EID.isHidden = EID.Config["InitiallyHidden"]
EID.UsedPosition = Vector(EID.Config["XPosition"], EID.Config["YPosition"]) EID.UsedPosition = Vector(EID.Config["XPosition"], EID.Config["YPosition"])
EID.Scale = EID.Config["Scale"]
EID:loadFont(EID.modPath .. "resources/font/eid_"..EID.Config["FontType"]..".fnt") EID:loadFont(EID.modPath .. "resources/font/eid_"..EID.Config["FontType"]..".fnt")
if REPENTANCE then if REPENTANCE then
EID:addTextPosModifier("HudOffset", Vector(((Options.HUDOffset * 10) * 2) - 20, (Options.HUDOffset * 10) - 10)) EID:addTextPosModifier("HudOffset", Vector(((Options.HUDOffset * 10) * 2) - 20, (Options.HUDOffset * 10) - 10))