Skip to content

Commit ba4f153

Browse files
author
justjuangui
committed
Grant Skill from Passive tree now can have support gems
1 parent b728315 commit ba4f153

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

src/Classes/SkillsTab.lua

+6-2
Original file line numberDiff line numberDiff line change
@@ -838,6 +838,9 @@ function SkillsTabClass:CreateGemSlot(index)
838838
self.build.buildFlag = true
839839
end)
840840
slot.count.shown = function()
841+
if index == 1 and self.displayGroup and (self.displayGroup.sourceItem or self.displayGroup.sourceNode) then
842+
return false
843+
end
841844
local gemInstance = self.displayGroup and self.displayGroup.gemList[index]
842845
if gemInstance then
843846
local grantedEffectList = gemInstance.gemData and gemInstance.gemData.grantedEffectList or { gemInstance.grantedEffect }
@@ -1079,8 +1082,9 @@ function SkillsTabClass:SetDisplayGroup(socketGroup)
10791082
self.controls.groupEnabled.state = socketGroup.enabled
10801083
self.controls.includeInFullDPS.state = socketGroup.includeInFullDPS and socketGroup.enabled
10811084
if socketGroup.sourceItem then
1082-
socketGroup.set1 = true
1083-
socketGroup.set2 = false
1085+
local swap = not not socketGroup.slot:find("Swap")
1086+
socketGroup.set1 = not swap
1087+
socketGroup.set2 = swap
10841088
elseif socketGroup.sourceNode then
10851089
socketGroup.set1 = true
10861090
socketGroup.set2 = true

src/Modules/CalcSetup.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ function calcs.buildModListForNode(env, node, incSmallPassiveSkill)
175175
t_insert(node.grantedSkills, {
176176
skillId = skill.skillId,
177177
level = skill.level,
178-
noSupports = true,
178+
noSupports = skill.noSupports ~= nil and skill.noSupports,
179179
source = "Tree:"..node.id
180180
})
181181
end

src/Modules/ModParser.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -3108,8 +3108,8 @@ local specialModList = {
31083108
mod("ScoldsBridleSelfDamage", "LIST", {dmgMult = dmgMult, damageType = dmgType})
31093109
}end,
31103110
-- Extra skill/support
3111-
["grants skill: (%D+)"] = function(_, skill) return grantedExtraSkill(skill, 1) end,
3112-
["grants skill: level (%d+) (.+)"] = function(num, _, skill) return grantedExtraSkill(skill, num) end,
3111+
["grants skill: (%D+)"] = function(_, skill) return grantedExtraSkill(skill, 1, false) end,
3112+
["grants skill: level (%d+) (.+)"] = function(num, _, skill) return grantedExtraSkill(skill, num, false) end,
31133113
["[ct][ar][si][tg]g?e?r?s? level (%d+) (.+) when equipped"] = function(num, _, skill) return triggerExtraSkill(skill, num) end,
31143114
["[ct][ar][si][tg]g?e?r?s? level (%d+) (.+) on %a+"] = function(num, _, skill) return triggerExtraSkill(skill, num) end,
31153115
["use level (%d+) (.+) on %a+"] = function(num, _, skill) return triggerExtraSkill(skill, num) end,

0 commit comments

Comments
 (0)