Skip to content
Merged
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\nSplinter 1/0 1\nConduction 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 1/0 1")
runCallback("OnFrame")
build.skillsTab:PasteSocketGroup("Falling Thunder 1/0 1\nIgnition 1/0 1\nDiscombobulate 1/0 1\nCoursing Current 1/0 1")
build.skillsTab:PasteSocketGroup("Falling Thunder 1/0 1\nIgnite I 1/0 1\nDaze 1/0 1\nShock Conduction 1/0 1")
runCallback("OnFrame")

build.configTab:BuildModList()
Expand Down
5 changes: 4 additions & 1 deletion src/Classes/GemSelectControl.lua
Original file line number Diff line number Diff line change
Expand Up @@ -542,6 +542,9 @@ function GemSelectClass:AddGemTooltip(gemInstance)
if gemInstance.gemData.tagString ~= "" then
self.tooltip:AddLine(16, "^x7F7F7F" .. gemInstance.gemData.tagString)
end
if gemInstance.gemData.gemFamily then
self.tooltip:AddLine(16, "^x7F7F7FCategory: ^7" .. gemInstance.gemData.gemFamily)
end
-- Will need rework if a gem can have 2+ additional supports
self:AddGrantedEffectInfo(gemInstance, grantedEffect, true)
for _, statSet in ipairs(grantedEffect.statSets) do
Expand All @@ -566,7 +569,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 then
if gemInstance.gemData.Tier and not grantedEffect.isLineage then
self.tooltip:AddLine(16, string.format("^x7F7F7FTier: ^7%d", gemInstance.gemData.Tier))
end
if addReq and not grantedEffect.support then
Expand Down
3 changes: 3 additions & 0 deletions src/Classes/ModStore.lua
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,9 @@ function ModStoreClass:EvalMod(mod, cfg, globalLimits)
else
base = target:GetStat(tag.stat, cfg)
end
if tag.divVar then
tag.div = self:GetMultiplier(tag.divVar, cfg)
end
local mult = m_floor(base / (tag.div or 1) + 0.0001)
local limitTotal
if tag.limit or tag.limitVar then
Expand Down
13 changes: 6 additions & 7 deletions src/Classes/SkillsTab.lua
Original file line number Diff line number Diff line change
Expand Up @@ -287,16 +287,14 @@ function SkillsTabClass:LoadSkill(node, skillSetId)
local possibleVariants = self.build.data.gemsByGameId[child.attrib.gemId]
if possibleVariants then
-- If it is a known gem, try to determine which variant is used
if child.attrib.variantId then
if child.attrib.variantId and possibleVariants[child.attrib.variantId] then
-- New save format from 3.23 that stores the specific variation (transfiguration)
gemData = possibleVariants[child.attrib.variantId]
elseif child.attrib.skillId then
-- Old format relying on the uniqueness of the granted effects id
else
-- If a gem has changed names between updates, assumed it's the first gem in the list
for _, variant in pairs(possibleVariants) do
if variant.grantedEffectId == child.attrib.skillId then
gemData = variant
break
end
gemData = variant
break
end
end
end
Expand Down Expand Up @@ -1324,6 +1322,7 @@ function SkillsTabClass:UpdateGlobalGemCountAssignments()
GlobalGemAssignments[gemInstance.gemData.name] = {
count = 1,
support = gemInstance.gemData.grantedEffect and gemInstance.gemData.grantedEffect.support or false,
lineage = gemInstance.gemData.grantedEffect and gemInstance.gemData.grantedEffect.isLineage or false,
groups = { }
}
if socketGroup.displayLabel then
Expand Down
Loading