Skip to content

Commit e547b6e

Browse files
author
justjuangui
committed
Grant Skill from Passive tree now can have support gems
1 parent 2098b45 commit e547b6e

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
@@ -821,6 +821,9 @@ function SkillsTabClass:CreateGemSlot(index)
821821
self.build.buildFlag = true
822822
end)
823823
slot.count.shown = function()
824+
if index == 1 and self.displayGroup and (self.displayGroup.sourceItem or self.displayGroup.sourceNode) then
825+
return false
826+
end
824827
local gemInstance = self.displayGroup and self.displayGroup.gemList[index]
825828
if gemInstance then
826829
local grantedEffectList = gemInstance.gemData and gemInstance.gemData.grantedEffectList or { gemInstance.grantedEffect }
@@ -1062,8 +1065,9 @@ function SkillsTabClass:SetDisplayGroup(socketGroup)
10621065
self.controls.groupEnabled.state = socketGroup.enabled
10631066
self.controls.includeInFullDPS.state = socketGroup.includeInFullDPS and socketGroup.enabled
10641067
if socketGroup.sourceItem then
1065-
socketGroup.set1 = true
1066-
socketGroup.set2 = false
1068+
local swap = not not socketGroup.slot:find("Swap")
1069+
socketGroup.set1 = not swap
1070+
socketGroup.set2 = swap
10671071
elseif socketGroup.sourceNode then
10681072
socketGroup.set1 = true
10691073
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
@@ -2973,8 +2973,8 @@ local specialModList = {
29732973
mod("ScoldsBridleSelfDamage", "LIST", {dmgMult = dmgMult, damageType = dmgType})
29742974
}end,
29752975
-- Extra skill/support
2976-
["grants skill: (%D+)"] = function(_, skill) return grantedExtraSkill(skill, 1) end,
2977-
["grants skill: level (%d+) (.+)"] = function(num, _, skill) return grantedExtraSkill(skill, num) end,
2976+
["grants skill: (%D+)"] = function(_, skill) return grantedExtraSkill(skill, 1, false) end,
2977+
["grants skill: level (%d+) (.+)"] = function(num, _, skill) return grantedExtraSkill(skill, num, false) end,
29782978
["[ct][ar][si][tg]g?e?r?s? level (%d+) (.+) when equipped"] = function(num, _, skill) return triggerExtraSkill(skill, num) end,
29792979
["[ct][ar][si][tg]g?e?r?s? level (%d+) (.+) on %a+"] = function(num, _, skill) return triggerExtraSkill(skill, num) end,
29802980
["use level (%d+) (.+) on %a+"] = function(num, _, skill) return triggerExtraSkill(skill, num) end,

0 commit comments

Comments
 (0)