Apply changes from PathOfBuildingCommunity/PathOfBuilding-PoE2#1679

Author: Wires77

src/Modules/CalcSetup.lua.rej

@@ -0,0 +1,26 @@
+diff a/src/Modules/CalcSetup.lua b/src/Modules/CalcSetup.lua	(rejected hunks)
+@@ -844,7 +844,12 @@ function calcs.initEnv(build, mode, override, specEnv)
+ 						item.jewelData.limitDisabled = nil
+ 					end
+ 					if item and item.type == "Jewel" and item.name:match("The Adorned, Diamond") then
+-						env.modDB.multipliers["CorruptedMagicJewelEffect"] = item.jewelData.corruptedMagicJewelIncEffect / 100
++						if item.jewelData.corruptedMagicJewelIncEffect then
++							env.modDB.multipliers["CorruptedMagicJewelEffect"] = item.jewelData.corruptedMagicJewelIncEffect / 100
++						end
++						if item.jewelData.corruptedRareJewelIncEffect then
++							env.modDB.multipliers["CorruptedRareJewelEffect"] = item.jewelData.corruptedRareJewelIncEffect / 100
++						end
+ 					end
+ 					if item.limit and not env.configInput.ignoreJewelLimits then
+ 						local limitKey = item.base.subType == "Timeless" and "Historic" or item.title
+@@ -1216,8 +1221,8 @@ function calcs.initEnv(build, mode, override, specEnv)
+ 							env.itemModDB:ScaleAddMod(mod, scale)
+ 						end
+ 					end
+-				elseif env.modDB.multipliers["CorruptedMagicJewelEffect"] and item.type == "Jewel" and item.rarity == "MAGIC" and item.corrupted and slot.nodeId and item.base.subType ~= "Charm" and not env.spec.nodes[slot.nodeId].containJewelSocket then
+-					scale = scale + env.modDB.multipliers["CorruptedMagicJewelEffect"]
++				elseif env.modDB.multipliers["Corrupted" .. item.rarity:gsub("(%a)(%u*)", function(a, b) return a..string.lower(b) end) .. "JewelEffect"] and item.type == "Jewel" and item.corrupted and slot.nodeId and item.base.subType ~= "Charm" and not env.spec.nodes[slot.nodeId].containJewelSocket then
++					scale = scale + env.modDB.multipliers["Corrupted" .. item.rarity:gsub("(%a)(%u*)", function(a, b) return a..string.lower(b) end) .. "JewelEffect"]
+ 					local combinedList = new("ModList")
+ 					for _, mod in ipairs(srcList) do
+ 						combinedList:MergeMod(mod)

src/Modules/ModParser.lua.rej

@@ -0,0 +1,12 @@
+diff a/src/Modules/ModParser.lua b/src/Modules/ModParser.lua	(rejected hunks)
+@@ -5357,8 +5357,8 @@ local specialModList = {
+ 	["added small passive skills grant nothing"] = { mod("JewelData", "LIST", { key = "clusterJewelSmallsAreNothingness", value = true }) },
+ 	["added small passive skills have (%d+)%% increased effect"] = function(num) return { mod("JewelData", "LIST", { key = "clusterJewelIncEffect", value = num }) } end,
+ 	["this jewel's socket has (%d+)%% increased effect per allocated passive skill between it and your class' starting location"] = function(num) return { mod("JewelData", "LIST", { key = "jewelIncEffectFromClassStart", value = num }) } end,
+-	["(%d+)%% increased effect of jewel socket passive skills containing corrupted magic jewels, if not from cluster jewels"] = function(num) return { mod("JewelData", "LIST", { key = "corruptedMagicJewelIncEffect", value = num }) } end,
+-	["(%d+)%% increased effect of jewel socket passive skills containing corrupted magic jewels"] = function(num) return { mod("JewelData", "LIST", { key = "corruptedMagicJewelIncEffect", value = num }) } end,
++	["(%d+)%% increased effect of jewel socket passive skills containing corrupted (m?r?ag?r?i?e?c?) jewels, if not from cluster jewels"] = function(num, _, rarity) return { mod("JewelData", "LIST", { key = "corrupted" .. firstToUpper(rarity) .. "JewelIncEffect", value = num }) } end,
++	["(%d+)%% increased effect of jewel socket passive skills containing corrupted (m?r?ag?r?i?e?c?) jewels"] = function(num, _, rarity) return { mod("JewelData", "LIST", { key = "corrupted" .. firstToUpper(rarity) .. "JewelIncEffect", value = num }) } end,
+ 	-- Misc
+ 	["fully broken armour effects also apply to fire damage taken from hits"] = { flag("ArmourBreakFireDamageTaken"), },
+ 	["can't use chest armour"] = { mod("CanNotUseBody", "Flag", 1, { type = "DisablesItem", slotName = "Body Armour" }) },