From d94587b73009e0427e1595bc8a54eec7742e5ef1 Mon Sep 17 00:00:00 2001 From: Wires77 Date: Sat, 10 Jan 2026 22:09:02 +0000 Subject: [PATCH 1/2] Apply changes from https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/1679 --- src/Modules/CalcSetup.lua.rej | 26 ++++++++++++++++++++++++++ src/Modules/ModParser.lua.rej | 12 ++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 src/Modules/CalcSetup.lua.rej create mode 100644 src/Modules/ModParser.lua.rej diff --git a/src/Modules/CalcSetup.lua.rej b/src/Modules/CalcSetup.lua.rej new file mode 100644 index 0000000000..032863fb59 --- /dev/null +++ b/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) diff --git a/src/Modules/ModParser.lua.rej b/src/Modules/ModParser.lua.rej new file mode 100644 index 0000000000..6d7045c9d0 --- /dev/null +++ b/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" }) }, From 3e196d426558b0a0e1b6eda00360fe4e408880d3 Mon Sep 17 00:00:00 2001 From: LocalIdentity Date: Thu, 12 Feb 2026 16:51:03 +1100 Subject: [PATCH 2/2] Fix merge issues --- src/Modules/CalcSetup.lua | 11 ++++++++--- src/Modules/CalcSetup.lua.rej | 26 -------------------------- src/Modules/ModParser.lua | 4 ++-- src/Modules/ModParser.lua.rej | 12 ------------ 4 files changed, 10 insertions(+), 43 deletions(-) delete mode 100644 src/Modules/CalcSetup.lua.rej delete mode 100644 src/Modules/ModParser.lua.rej diff --git a/src/Modules/CalcSetup.lua b/src/Modules/CalcSetup.lua index dd8603c851..e33109c645 100644 --- a/src/Modules/CalcSetup.lua +++ b/src/Modules/CalcSetup.lua @@ -712,7 +712,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, Crimson Jewel") 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 @@ -1061,8 +1066,8 @@ function calcs.initEnv(build, mode, override, specEnv) combinedList:MergeMod(mod) end env.itemModDB:ScaleAddList(combinedList, scale) - elseif env.modDB.multipliers["CorruptedMagicJewelEffect"] and item.type == "Jewel" and item.rarity == "MAGIC" and item.corrupted and slot.nodeId and item.base.subType ~= "Charm" 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) diff --git a/src/Modules/CalcSetup.lua.rej b/src/Modules/CalcSetup.lua.rej deleted file mode 100644 index 032863fb59..0000000000 --- a/src/Modules/CalcSetup.lua.rej +++ /dev/null @@ -1,26 +0,0 @@ -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) diff --git a/src/Modules/ModParser.lua b/src/Modules/ModParser.lua index c884ca3eaf..dc77b15b83 100644 --- a/src/Modules/ModParser.lua +++ b/src/Modules/ModParser.lua @@ -4914,8 +4914,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 ["can't use chest armour"] = { mod("CanNotUseItem", "Flag", 1, { type = "DisablesItem", slotName = "Body Armour" }) }, ["can't use helmets?"] = { mod("CanNotUseItem", "Flag", 1, { type = "DisablesItem", slotName = "Helmet" }) }, diff --git a/src/Modules/ModParser.lua.rej b/src/Modules/ModParser.lua.rej deleted file mode 100644 index 6d7045c9d0..0000000000 --- a/src/Modules/ModParser.lua.rej +++ /dev/null @@ -1,12 +0,0 @@ -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" }) },