Skip to content

Fix Corrupted Gems import and update gem tooltip #1743

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Blitz54 wants to merge 10 commits into
base: dev
Choose a base branch
from
Open

Fix Corrupted Gems import and update gem tooltip #1743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7a7fdc2
Show where levels came from
Blitz54 Jan 19, 2026
1942ebe
Add corruption dropdown to skills tab, import corrupted, and fix Sacr…
Blitz54 Jan 20, 2026
757016b
Fix import missing corruptLevel
Blitz54 Jan 20, 2026
140ffb0
Some cleanup and tooltip fixes
Blitz54 Jan 20, 2026
aa0539a
Fix corrupted check
Blitz54 Jan 20, 2026
b0c73e6
Fix pasting corrupted socket group
Blitz54 Jan 22, 2026
e425327
Fix paste for companion and spectre
Blitz54 Jan 22, 2026
657586d
Set corruption dropdown with default gem level dropdown
Blitz54 Feb 2, 2026
97af70b
Support gem sorting
Blitz54 Feb 3, 2026
fcb9e72
Fix Oisins Oath letter
Blitz54 Feb 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 37 additions & 10 deletions src/Classes/GemSelectControl.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,9 @@ function GemSelectClass:CalcOutputWithThisGem(calcFunc, gemData, useFullDPS)
enableGlobal2 = true,
gemId = gemData.id,
nameSpec = gemData.name,
skillId = gemData.grantedEffectId
skillId = gemData.grantedEffectId,
corrupted = self.skillsTab.defaultCorruptionState,
corruptLevel = self.skillsTab.defaultCorruptionLevel,
}
end

Expand Down Expand Up @@ -90,7 +92,7 @@ end
function GemSelectClass:PopulateGemList()
wipeTable(self.gems)
local showAll = self.skillsTab.showSupportGemTypes == "ALL"
local showAwakened = self.skillsTab.showSupportGemTypes == "AWAKENED"
local showLineage = self.skillsTab.showSupportGemTypes == "LINEAGE"
local showNormal = self.skillsTab.showSupportGemTypes == "NORMAL"
local matchLevel = self.skillsTab.defaultGemLevel == "characterLevel"
local characterLevel = self.skillsTab.build and self.skillsTab.build.characterLevel or 1
Expand All @@ -113,8 +115,8 @@ function GemSelectClass:FilterSupport(gemId, gemData)
local showSupportTypes = self.skillsTab.showSupportGemTypes
return (not gemData.grantedEffect.support
or showSupportTypes == "ALL"
or (showSupportTypes == "NORMAL" and not gemData.grantedEffect.plusVersionOf)
or (showSupportTypes == "AWAKENED" and gemData.grantedEffect.plusVersionOf))
or (showSupportTypes == "NORMAL" and not gemData.grantedEffect.isLineage)
or (showSupportTypes == "LINEAGE" and gemData.grantedEffect.isLineage))
end

function GemSelectClass:BuildList(buf)
Expand Down Expand Up @@ -462,7 +464,9 @@ function GemSelectClass:Draw(viewPort, noTooltip)
nameSpec = gemData.name,
skillId = gemData.grantedEffectId,
displayEffect = nil,
gemData = gemData
gemData = gemData,
corruptLevel = self.skillsTab.defaultCorruptionLevel,
corrupted = self.skillsTab.defaultCorruptionState == true,
}
self:AddGemTooltip(gemInstance)
self.tooltip:AddSeparator(10)
Expand Down Expand Up @@ -600,11 +604,30 @@ function GemSelectClass:AddGrantedEffectInfo(gemInstance, grantedEffect, addReq)
self.tooltip:AddLine(fontSizeBig, string.format("^x7F7F7FTier: ^7%d", gemInstance.gemData.Tier), "FONTIN SC")
end
if addReq and not grantedEffect.support then
self.tooltip:AddLine(fontSizeBig, string.format("^x7F7F7FLevel: ^7%d%s%s",
gemInstance.level,
((displayInstance.level > gemInstance.level) and " (" .. colorCodes.MAGIC .. "+" .. (displayInstance.level - gemInstance.level) .. "^7)") or ((displayInstance.level < gemInstance.level) and " (" .. colorCodes.WARNING .. "-" .. (gemInstance.level - displayInstance.level) .. "^7)") or "",
(gemInstance.level >= gemInstance.gemData.naturalMaxLevel) and " (Max)" or ""
),"FONTIN SC")
local totalLevel
totalLevel = m_max(displayInstance.level, (gemInstance.level + gemInstance.corruptLevel)) -- Needed for tooltip comparison for dropdown gems. Otherwise they only show level 20 when corrupted.
if displayInstance.corruptLevel ~= 0 or
(displayInstance.gemPropertyInfo and displayInstance.gemPropertyInfo[1].value.value > 0 ) or
(displayInstance.level - gemInstance.level - displayInstance.corruptLevel > 0)
then
self.tooltip:AddLine(fontSizeBig, string.format("^x7F7F7FLevel: ^7" .. colorCodes.MAGIC .. totalLevel), "FONTIN SC")
self.tooltip:AddLine(fontSizeBig, "^7" .. gemInstance.level .. " Levels from Gem" .. ((gemInstance.level >= gemInstance.gemData.naturalMaxLevel) and " (Max)" or ""), "FONTIN SC")
else
self.tooltip:AddLine(fontSizeBig, string.format("^x7F7F7FLevel: ^7" .. totalLevel .. ((gemInstance.level >= gemInstance.gemData.naturalMaxLevel) and " (Max)" or "")), "FONTIN SC")
end
if displayInstance.corruptLevel > 0 then
self.tooltip:AddLine(fontSizeBig, colorCodes.MAGIC .. "+" .. displayInstance.corruptLevel .. " Level from Corruption", "FONTIN SC")
elseif displayInstance.corruptLevel < 0 then
self.tooltip:AddLine(fontSizeBig, colorCodes.MAGIC .. displayInstance.corruptLevel .. " Level from Corruption", "FONTIN SC")
end
if displayInstance.gemPropertyInfo and displayInstance.gemPropertyInfo[1].value.value > 0 then
self.tooltip:AddLine(fontSizeBig, colorCodes.MAGIC .. "+" .. displayInstance.gemPropertyInfo[1].value.value .. " Levels from Global Modifiers", "FONTIN SC")
if totalLevel - gemInstance.level - displayInstance.corruptLevel*2 - displayInstance.gemPropertyInfo[1].value.value > 0 then
self.tooltip:AddLine(fontSizeBig, colorCodes.MAGIC .. "+" .. totalLevel - gemInstance.level - displayInstance.corruptLevel - displayInstance.gemPropertyInfo[1].value.value .. " Levels from Supports", "FONTIN SC")
end
elseif totalLevel - gemInstance.level - displayInstance.corruptLevel > 0 then
self.tooltip:AddLine(fontSizeBig, colorCodes.MAGIC .. "+" .. totalLevel - gemInstance.level - displayInstance.corruptLevel .. " Levels from Supports", "FONTIN SC")
end
end
if grantedEffect.support then
if grantedEffectLevel.manaMultiplier and grantedEffectLevel.reservationMultiplier and grantedEffectLevel.manaMultiplier == grantedEffectLevel.reservationMultiplier then
Expand Down Expand Up @@ -707,6 +730,10 @@ function GemSelectClass:AddGrantedEffectInfo(gemInstance, grantedEffect, addReq)
for _, line in ipairs(wrap) do
self.tooltip:AddLine(fontSizeBig, colorCodes.GEMDESCRIPTION..line, "FONTIN ITALIC")
end
if displayInstance.corrupted == true then
self.tooltip:AddSeparator(10)
self.tooltip:AddLine(fontSizeBig, colorCodes.NEGATIVE .. "Corrupted", "FONTIN SC")
end
end
end
function GemSelectClass:AddStatSetInfo(gemInstance, grantedEffect, statSet, noLabel, index)
Expand Down
7 changes: 5 additions & 2 deletions src/Classes/ImportTab.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -775,6 +775,7 @@ function ImportTabClass:ImportItemsAndSkills(charData)
if gemId then
local gemInstance = { level = 20, quality = 0, enabled = true, enableGlobal1 = true, enableGlobal2 = true, count = 1, gemId = gemId }
gemInstance.support = skillData.support
gemInstance.corrupted = skillData.corrupted

local spectreList = data.spectres
if typeLine:sub(1, 8) == "Spectre:" then
Expand Down Expand Up @@ -830,8 +831,10 @@ function ImportTabClass:ImportItemsAndSkills(charData)
else
gemInstance.level = tonumber(property.values[1][1]:match("%d+"))
end
if skillData.properties[_ + 2] and skillData.properties[_ + 2].values[1][1]:match("(%d+) Level[s]? from Corruption") then
gemInstance.level = gemInstance.level + tonumber(skillData.properties[_ + 2].values[1][1]:match("(%d+) Level[s]? from Corruption"))
if skillData.properties[_ + 2] and skillData.properties[_ + 2].values[1][1]:match("(-?%d+) Level[s]? from Corruption") then
gemInstance.corruptLevel = tonumber(skillData.properties[_ + 2].values[1][1]:match("(-?%d+) Level[s]? from Corruption"))
else
gemInstance.corruptLevel = 0
end
elseif escapeGGGString(property.name) == "Quality" then
gemInstance.quality = tonumber(property.values[1][1]:match("%d+"))
Expand Down
Loading