@@ -171,23 +171,6 @@ function calcs.buildModListForNode(env, node, incSmallPassiveSkill)
171171 modList :AddList (node .modList )
172172 end
173173
174- if node .allocMode and node .allocMode ~= 0 then
175- for i , mod in ipairs (modList ) do
176- local added = false
177- for j , extra in ipairs (mod ) do
178- -- if type conditional and start with WeaponSet then update the var to the current weapon set
179- if extra .type == " Condition" and extra .var and extra .var :match (" ^WeaponSet" ) then
180- mod [j ].var = " WeaponSet" .. node .allocMode
181- added = true
182- break
183- end
184- end
185- if not added then
186- table.insert (mod , { type = " Condition" , var = " WeaponSet" .. node .allocMode })
187- end
188- end
189- end
190-
191174 -- Run first pass radius jewels
192175 for _ , rad in pairs (env .radiusJewelList ) do
193176 if rad .type == " Other" and rad .nodes [node .id ] and rad .nodes [node .id ].type ~= " Mastery" then
@@ -247,6 +230,23 @@ function calcs.buildModListForNode(env, node, incSmallPassiveSkill)
247230 t_insert (env .explodeSources , node )
248231 end
249232
233+ if node .allocMode and node .allocMode ~= 0 then
234+ for i , mod in ipairs (modList ) do
235+ local added = false
236+ for j , extra in ipairs (mod ) do
237+ -- if type conditional and start with WeaponSet then update the var to the current weapon set
238+ if extra .type == " Condition" and extra .var and extra .var :match (" ^WeaponSet" ) then
239+ mod [j ].var = " WeaponSet" .. node .allocMode
240+ added = true
241+ break
242+ end
243+ end
244+ if not added then
245+ table.insert (mod , { type = " Condition" , var = " WeaponSet" .. node .allocMode })
246+ end
247+ end
248+ end
249+
250250 -- Apply Inc Node scaling from Hulking Form
251251 if incSmallPassiveSkill > 0 and node .type == " Normal" and not node .isAttribute and not node .ascendancyName then
252252 local scale = 1 + incSmallPassiveSkill / 100
0 commit comments