Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions spec/System/TestAttacks_spec.lua
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ describe("TestAttacks", function()
runCallback("OnFrame")
-- Add 2 skills with 1 red, 1 blue, 1 green support each
-- Test against Quarterstaff Strike (skill slot 1)
build.skillsTab:PasteSocketGroup("Quarterstaff Strike 1/0 1\nArmour Break I 1/0 1\nShock 1/0 1\nBiting Frost 1/0 1")
build.skillsTab:PasteSocketGroup("Quarterstaff Strike 1/0 1\nArmour Break I 1/0 1\nShock 1/0 1\nBiting Frost I 1/0 1")
runCallback("OnFrame")
build.skillsTab:PasteSocketGroup("Falling Thunder 1/0 1\nIgnite I 1/0 1\nDaze 1/0 1\nShock Conduction 1/0 1")
build.skillsTab:PasteSocketGroup("Falling Thunder 1/0 1\nIgnite I 1/0 1\nDaze 1/0 1\nShock Conduction I 1/0 1")
runCallback("OnFrame")

build.configTab:BuildModList()
Expand Down
4 changes: 2 additions & 2 deletions src/Classes/GemSelectControl.lua
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,7 @@ end
function GemSelectClass:AddGrantedEffectInfo(gemInstance, grantedEffect, addReq)
local displayInstance = gemInstance.displayEffect or gemInstance
local grantedEffectLevel = grantedEffect.levels[displayInstance.level] or { }
if gemInstance.gemData.Tier and not grantedEffect.isLineage and not grantedEffect.hidden then
if gemInstance.gemData.Tier and gemInstance.gemData.Tier > 0 and not grantedEffect.isLineage and not grantedEffect.hidden then
self.tooltip:AddLine(16, string.format("^x7F7F7FTier: ^7%d", gemInstance.gemData.Tier))
end
if addReq and not grantedEffect.support then
Expand Down Expand Up @@ -709,7 +709,7 @@ function GemSelectClass:AddGrantedEffectInfo(gemInstance, grantedEffect, addReq)
end
function GemSelectClass:AddStatSetInfo(gemInstance, grantedEffect, statSet, noLabel, index)
local displayInstance = gemInstance.displayEffect or gemInstance
local statSetLevel = statSet.levels[displayInstance.level] or { }
local statSetLevel = statSet.levels[displayInstance.level] or statSet.levels[1] or { }
if not (index == 1 and statSet.label == grantedEffect.name) and statSet.label ~= "" and not noLabel then
self.tooltip:AddSeparator(10)
self.tooltip:AddLine(20, colorCodes.GEM .. statSet.label)
Expand Down
Loading
Loading