Apply changes from PathOfBuildingCommunity/PathOfBuilding#8862

Author: Wires77

src/Classes/ModList.lua.rej

@@ -0,0 +1,20 @@
+diff a/src/Classes/ModList.lua b/src/Classes/ModList.lua	(rejected hunks)
+@@ -46,11 +46,13 @@ function ModListClass:ReplaceModInternal(mod)
+ end
+ 
+ function ModListClass:MergeMod(mod)
+-	for i = 1, #self do
+-		if modLib.compareModParams(self[i], mod) then
+-			self[i] = copyTable(self[i], true)
+-			self[i].value = self[i].value + mod.value
+-			return
++	if mod.type == "BASE" or mod.type == "INC" or mod.type == "MORE" then
++		for i = 1, #self do
++			if modLib.compareModParams(self[i], mod) then
++				self[i] = copyTable(self[i], true)
++				self[i].value = self[i].value + mod.value
++				return
++			end
+ 		end
+ 	end
+ 	self:AddMod(mod)

src/Modules/CalcSetup.lua.rej

@@ -0,0 +1,35 @@
+diff a/src/Modules/CalcSetup.lua b/src/Modules/CalcSetup.lua	(rejected hunks)
+@@ -1051,19 +1051,29 @@ function calcs.initEnv(build, mode, override, specEnv)
+ 					end	
+ 					env.itemModDB:ScaleAddList(combinedList, scale)
+ 				elseif item.type == "Gloves" and calcLib.mod(env.initialNodeModDB, nil, "EffectOfBonusesFromGloves") ~=1 then
+-					scale = calcLib.mod(env.initialNodeModDB, nil, "EffectOfBonusesFromGloves")
++					scale = calcLib.mod(env.initialNodeModDB, nil, "EffectOfBonusesFromGloves") - 1
+ 					local combinedList = new("ModList")
+ 					for _, mod in ipairs(srcList) do
+ 						combinedList:MergeMod(mod)
+ 					end
+-					env.itemModDB:ScaleAddList(combinedList, scale)
++					local scaledList = new("ModList")
++					scaledList:ScaleAddList(combinedList, scale)
++					for _, mod in ipairs(scaledList) do
++						combinedList:MergeMod(mod)
++					end
++					env.itemModDB:AddList(combinedList)
+ 				elseif item.type == "Boots" and calcLib.mod(env.initialNodeModDB, nil, "EffectOfBonusesFromBoots") ~= 1 then
+-					scale = calcLib.mod(env.initialNodeModDB, nil, "EffectOfBonusesFromBoots")
++					scale = calcLib.mod(env.initialNodeModDB, nil, "EffectOfBonusesFromBoots") - 1
+ 					local combinedList = new("ModList")
+ 					for _, mod in ipairs(srcList) do
+ 						combinedList:MergeMod(mod)
+ 					end
+-					env.itemModDB:ScaleAddList(combinedList, scale)
++					local scaledList = new("ModList")
++					scaledList:ScaleAddList(combinedList, scale)
++					for _, mod in ipairs(scaledList) do
++						combinedList:MergeMod(mod)
++					end
++					env.itemModDB:AddList(combinedList)
+ 				else
+ 					env.itemModDB:ScaleAddList(srcList, scale)
+ 				end