Fix Runegraft of the Bound scaling Facebreaker's incorrectly (#8820)

* Fix Runegraft of the Bound scaling Facebreaker's incorrectly

The mod was scaling the more multiplier on the gloves incorrectly by adding another More multiplier mod instead of modifying the existing mod
This change also made me realise that we sometime incorrectly handle mods when the are 2 instances of them on an item
e.g. T1 Life + crafted hybrid life shows up as 2 mods on the item so we process them in 2 loops which results in the rounding being incorrect
Would have to somehow merge all similar mods on an item first then loop though them to fix it I think

* Fix split mod rounding issues and move logic with other scaling logic

* Hack fix for getting mod data from the tree

* Remove old block

---------

Co-authored-by: LocalIdentity <[email protected]>
Co-authored-by: Wires77 <[email protected]>

Author: 3 people

src/Classes/ModDB.lua

@@ -45,8 +45,9 @@ function ModDBClass:ReplaceModInternal(mod)
 	local modIndex = -1
 	for i = 1, #modList do
 		local curMod = modList[i]
-		if mod.name == curMod.name and mod.type == curMod.type and mod.flags == curMod.flags and mod.keywordFlags == curMod.keywordFlags and mod.source == curMod.source then
+		if mod.name == curMod.name and mod.type == curMod.type and mod.flags == curMod.flags and mod.keywordFlags == curMod.keywordFlags and mod.source == curMod.source and not curMod.replaced then
 			modIndex = i
+			mod.replaced = true
 			break;
 		end
 	end

src/Classes/ModStore.lua

@@ -34,7 +34,7 @@ local ModStoreClass = newClass("ModStore", function(self, parent)
 	self.conditions = { }
 end)
 
-function ModStoreClass:ScaleAddMod(mod, scale)
+function ModStoreClass:ScaleAddMod(mod, scale, replace)
 	local unscalable = false
 	for _, effects in ipairs(mod) do
 		if effects.unscalable then
@@ -63,7 +63,11 @@ function ModStoreClass:ScaleAddMod(mod, scale)
 				subMod.value = m_modf(round(subMod.value * scale, 2))
 			end
 		end
-		self:AddMod(scaledMod)
+		if replace then
+			self:ReplaceModInternal(scaledMod)
+		else
+			self:AddMod(scaledMod)
+		end
 	end
 end
 
@@ -73,12 +77,12 @@ function ModStoreClass:CopyList(modList)
 	end
 end
 
-function ModStoreClass:ScaleAddList(modList, scale)
+function ModStoreClass:ScaleAddList(modList, scale, replace)
 	if scale == 1 then
 		self:AddList(modList)
 	else
 		for i = 1, #modList do
-			self:ScaleAddMod(modList[i], scale)
+			self:ScaleAddMod(modList[i], scale, replace)
 		end
 	end
 end

src/Modules/CalcSetup.lua

@@ -638,6 +638,7 @@ function calcs.initEnv(build, mode, override, specEnv)
 			nodes = copyTable(env.spec.allocNodes, true)
 		end
 		env.allocNodes = nodes
+		env.initialNodeModDB = calcs.buildModListForNodeList(env, env.allocNodes, true)
 	end
 
 	if allocatedNotableCount and allocatedNotableCount > 0 then
@@ -1051,6 +1052,20 @@ function calcs.initEnv(build, mode, override, specEnv)
 						combinedList:MergeMod(mod)
 					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")
+					local combinedList = new("ModList")
+					for _, mod in ipairs(srcList) do
+						combinedList:MergeMod(mod)
+					end
+					env.itemModDB:ScaleAddList(combinedList, scale)
+				elseif item.type == "Boots" and calcLib.mod(env.initialNodeModDB, nil, "EffectOfBonusesFromBoots") ~= 1 then
+					scale = calcLib.mod(env.initialNodeModDB, nil, "EffectOfBonusesFromBoots")
+					local combinedList = new("ModList")
+					for _, mod in ipairs(srcList) do
+						combinedList:MergeMod(mod)
+					end
+					env.itemModDB:ScaleAddList(combinedList, scale)
 				else
 					env.itemModDB:ScaleAddList(srcList, scale)
 				end
@@ -1188,33 +1203,6 @@ function calcs.initEnv(build, mode, override, specEnv)
 			return calcs.initEnv(build, mode, override, specEnv)
 		end
 	end
-	
-	if env.player.itemList["Gloves"] then
-		local gloveEffectMod = env.modDB:Sum("INC", nil, "EffectOfBonusesFromGloves") / 100
-		if gloveEffectMod ~= 0 then
-			local modList = env.player.itemList["Gloves"].modList
-			for _, mod in ipairs(modList) do
-				if not (mod.name == "ExtraSupport" or mod.name == "ExtraSkill" or mod.name == "ExtraSupport" or mod.name == "ExtraSkillMod" or (mod[1] and mod[1].type == "SocketedIn")) then
-					local modCopy = copyTable(mod)
-					modCopy.source = tostring(gloveEffectMod * 100) .. "% Gloves Bonus Effect"
-					modDB:ScaleAddMod(modCopy, gloveEffectMod)
-				end
-			end
-		end
-	end
-	if env.player.itemList["Boots"] then
-		local bootEffectMod = env.modDB:Sum("INC", nil, "EffectOfBonusesFromBoots") / 100
-		if bootEffectMod ~= 0 then
-			local modList = env.player.itemList["Boots"].modList
-			for _, mod in ipairs(modList) do
-				if not (mod.name == "ExtraSupport" or mod.name == "ExtraSkill" or mod.name == "ExtraSupport" or mod.name == "ExtraSkillMod" or (mod[1] and mod[1].type == "SocketedIn")) then
-					local modCopy = copyTable(mod)
-					modCopy.source = tostring(bootEffectMod * 100) .. "% Boots Bonus Effect"
-					modDB:ScaleAddMod(modCopy, bootEffectMod)
-				end
-			end
-		end
-	end
 
 	-- Find skills granted by tree nodes
 	if not accelerate.nodeAlloc then