Skip to content

Commit d49a439

Browse files
committed
Fix stages in comparison tab
1 parent fcd4836 commit d49a439

2 files changed

Lines changed: 5 additions & 6 deletions

File tree

src/Classes/CompareEntry.lua

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -341,10 +341,9 @@ function CompareEntryClass:RefreshSkillSelectControls(controls, mainGroup, suffi
341341
t_insert(controls.mainSkillPart.list, { val = i, label = part.name })
342342
end
343343
controls.mainSkillPart.selIndex = activeEffect.srcInstance["skillPart"..suffix] or 1
344-
local selectedPart = activeEffect.grantedEffect.parts[controls.mainSkillPart.selIndex]
345-
if selectedPart and selectedPart.stages then
344+
if activeEffect.grantedEffect.parts[controls.mainSkillPart.selIndex].stages then
346345
controls.mainSkillStageCount.shown = true
347-
controls.mainSkillStageCount.buf = tostring(activeEffect.srcInstance["skillStageCount"..suffix] or selectedPart.stagesMin or 1)
346+
controls.mainSkillStageCount.buf = tostring(activeEffect.srcInstance["skillStageCount"..suffix] or activeEffect.grantedEffect.parts[controls.mainSkillPart.selIndex].stagesMin or 1)
348347
end
349348
end
350349

@@ -367,7 +366,7 @@ function CompareEntryClass:RefreshSkillSelectControls(controls, mainGroup, suffi
367366
controls.statSet.shown = true
368367
end
369368
-- Stage count (for multi-stage skills without parts)
370-
if activeSkill.activeEffect.srcInstance.statSet.skillFlags and activeSkill.activeEffect.statSet.skillFlags.multiStage and not (activeEffect.grantedEffect.parts and #activeEffect.grantedEffect.parts > 1) then
369+
if activeSkill.activeEffect["statSet"..suffix].skillFlags.multiStage and not (activeEffect.grantedEffect.parts and #activeEffect.grantedEffect.parts > 1) then
371370
controls.mainSkillStageCount.shown = true
372371
controls.mainSkillStageCount.buf = tostring(activeEffect.srcInstance["skillStageCount"..suffix] or activeSkill.skillData.stagesMin or 1)
373372
end

src/Classes/CompareTab.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ function CompareTabClass:InitControls()
336336
entry.buildFlag = true
337337
end
338338
end)
339-
self.controls.cmpStatSet.shown = true
339+
self.controls.cmpStatSet.shown = false
340340

341341
-- Skill part (multi-part skills)
342342
self.controls.cmpSkillPart = new("DropDownControl", {"LEFT", self.controls.cmpStatSet, "RIGHT"}, {2, 0, 100, 20}, {}, function(index, value)
@@ -356,7 +356,7 @@ function CompareTabClass:InitControls()
356356
self.controls.cmpSkillPart.shown = false
357357

358358
-- Stage count
359-
self.controls.cmpStageCountLabel = new("LabelControl", {"LEFT", self.controls.cmpSkillPart, "RIGHT"}, {4, 0, 0, 16}, "^7Stages:")
359+
self.controls.cmpStageCountLabel = new("LabelControl", {"LEFT", self.controls.cmpStatSet, "RIGHT"}, {4, 0, 0, 16}, "^7Stages:")
360360
self.controls.cmpStageCountLabel.shown = function() return self.controls.cmpStageCount.shown end
361361
self.controls.cmpStageCount = new("EditControl", {"LEFT", self.controls.cmpStageCountLabel, "RIGHT"}, {2, 0, 52, 20}, "", nil, "%D", 5, function(buf)
362362
local entry = self:GetActiveCompare()

0 commit comments

Comments
 (0)