From 76ac9373ecfe26bc0c00275e286806a20fa95ad8 Mon Sep 17 00:00:00 2001 From: avtobus32 Date: Sun, 24 May 2026 13:01:21 +0000 Subject: [PATCH 1/2] Apply changes from https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/1949 --- src/Classes/ModStore.lua.rej | 10 ++++++++++ src/Data/ModCache.lua.rej | 9 +++++++++ src/Modules/ModParser.lua.rej | 11 +++++++++++ 3 files changed, 30 insertions(+) create mode 100644 src/Classes/ModStore.lua.rej create mode 100644 src/Data/ModCache.lua.rej create mode 100644 src/Modules/ModParser.lua.rej diff --git a/src/Classes/ModStore.lua.rej b/src/Classes/ModStore.lua.rej new file mode 100644 index 00000000000..504100cae18 --- /dev/null +++ b/src/Classes/ModStore.lua.rej @@ -0,0 +1,10 @@ +diff a/src/Classes/ModStore.lua b/src/Classes/ModStore.lua (rejected hunks) +@@ -441,7 +441,7 @@ function ModStoreClass:EvalMod(mod, cfg, globalLimits) + mult = GetMultiplier(target, tag.var, cfg) + end + local threshold = tag.threshold or GetMultiplier(tag.thresholdActor and thresholdTarget or target, tag.thresholdVar, cfg) +- if (tag.upper and mult > threshold) or (tag.equals and mult ~= threshold) or (not (tag.upper and tag.exact) and mult < threshold) then ++ if (tag.upper and mult > threshold) or (tag.equals and mult ~= threshold) or (not tag.upper and mult < threshold) then + return + end + -- scale effects of Multiplier mod diff --git a/src/Data/ModCache.lua.rej b/src/Data/ModCache.lua.rej new file mode 100644 index 00000000000..fdeaf764f4b --- /dev/null +++ b/src/Data/ModCache.lua.rej @@ -0,0 +1,9 @@ +diff a/src/Data/ModCache.lua b/src/Data/ModCache.lua (rejected hunks) +@@ -2314,7 +2314,6 @@ c["30% chance to Impale on Spell Hit"]={{[1]={flags=2,keywordFlags=0,name="Impal + c["30% chance to Pierce an Enemy"]={{[1]={flags=0,keywordFlags=0,name="PierceChance",type="BASE",value=30}},nil} + c["30% chance to Poison on Hit"]={{[1]={flags=0,keywordFlags=0,name="PoisonChance",type="BASE",value=30}},nil} + c["30% chance to Poison on Hit against Enemies that are not Poisoned"]={{[1]={[1]={actor="enemy",threshold=1,type="MultiplierThreshold",upper=true,var="PoisonStacks"},flags=0,keywordFlags=0,name="PoisonChance",type="BASE",value=30}},nil} +-c["30% chance to Poison on Hit against Enemies that are not Poisoned 80% increased Effect of Poison you inflict on targets that are not Poisoned"]={{[1]={[1]={actor="enemy",threshold=1,type="MultiplierThreshold",upper=true,var="PoisonStacks"},flags=0,keywordFlags=0,name="PoisonChance",type="BASE",value=30}}," 80% increased Effect of Poison you inflict on targets that are not Poisoned"} + c["30% chance to Poison on Hit with Attacks"]={{[1]={flags=0,keywordFlags=65536,name="PoisonChance",type="BASE",value=30}},nil} + c["30% chance to inflict Bleeding on Hit"]={{[1]={flags=0,keywordFlags=0,name="BleedChance",type="BASE",value=30}},nil} + c["30% chance when you Reload a Crossbow to be immediate"]={{[1]={flags=0,keywordFlags=0,name="InstantReloadChance",type="BASE",value=30}},nil} diff --git a/src/Modules/ModParser.lua.rej b/src/Modules/ModParser.lua.rej new file mode 100644 index 00000000000..8b7bda5304a --- /dev/null +++ b/src/Modules/ModParser.lua.rej @@ -0,0 +1,11 @@ +diff a/src/Modules/ModParser.lua b/src/Modules/ModParser.lua (rejected hunks) +@@ -2104,7 +2104,8 @@ local modTagList = { + ["against enemies that are affected by elemental ailments"] = { tag = { type = "ActorCondition", actor = "enemy", varList = { "Frozen","Chilled","Shocked","Ignited","Scorched","Brittle","Sapped" } } }, + ["against enemies that are affected by no elemental ailments"] = { tagList = { { type = "ActorCondition", actor = "enemy", varList = { "Frozen","Chilled","Shocked","Ignited","Scorched","Brittle","Sapped" }, neg = true }, { type = "Condition", var = "Effective" } } }, + ["against enemies affected by (%d+) spider's webs"] = function(num) return { tag = { type = "MultiplierThreshold", actor = "enemy", var = "Spider's WebStack", threshold = num } } end, +- ["on targets that are not poisoned"] = { tag = { type = "MultiplierThreshold", var = "PoisonStacks", threshold = 1, upper = true } }, ++ ["against enemies that are not poisoned"] = { tag = { type = "MultiplierThreshold", actor = "enemy", var = "PoisonStacks", threshold = 1, upper = true } }, ++ ["on targets that are not poisoned"] = { tag = { type = "MultiplierThreshold", actor = "enemy", var = "PoisonStacks", threshold = 1, upper = true } }, + ["against enemies on consecrated ground"] = { tag = { type = "ActorCondition", actor = "enemy", var = "OnConsecratedGround" } }, + ["if (%d+)%% of curse duration expired"] = function(num) return { tag = { type = "MultiplierThreshold", actor = "enemy", var = "CurseExpired", threshold = num } } end, + ["against enemies with (%w+) exposure"] = function(element) return { tag = { type = "ActorCondition", actor = "enemy", var = "Has"..(firstToUpper(element).."Exposure") } } end, From accbee73960015af7907c4941965bb1ca12953b8 Mon Sep 17 00:00:00 2001 From: LocalIdentity Date: Thu, 23 Jul 2026 08:45:13 +1000 Subject: [PATCH 2/2] Fix merge --- src/Classes/ModStore.lua | 2 +- src/Classes/ModStore.lua.rej | 10 ---------- src/Data/ModCache.lua.rej | 9 --------- src/Modules/ModParser.lua.rej | 11 ----------- 4 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 src/Classes/ModStore.lua.rej delete mode 100644 src/Data/ModCache.lua.rej delete mode 100644 src/Modules/ModParser.lua.rej diff --git a/src/Classes/ModStore.lua b/src/Classes/ModStore.lua index 92603eb3235..e7fa805a615 100644 --- a/src/Classes/ModStore.lua +++ b/src/Classes/ModStore.lua @@ -420,7 +420,7 @@ function ModStoreClass:EvalMod(mod, cfg, globalLimits) mult = GetMultiplier(target, tag.var, cfg) end local threshold = tag.threshold or GetMultiplier(tag.thresholdActor and thresholdTarget or target, tag.thresholdVar, cfg) - if (tag.upper and mult > threshold) or (tag.equals and mult ~= threshold) or (not (tag.upper and tag.exact) and mult < threshold) then + if (tag.upper and mult > threshold) or (tag.equals and mult ~= threshold) or (not tag.upper and mult < threshold) then return end elseif tag.type == "PerStat" then diff --git a/src/Classes/ModStore.lua.rej b/src/Classes/ModStore.lua.rej deleted file mode 100644 index 504100cae18..00000000000 --- a/src/Classes/ModStore.lua.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/src/Classes/ModStore.lua b/src/Classes/ModStore.lua (rejected hunks) -@@ -441,7 +441,7 @@ function ModStoreClass:EvalMod(mod, cfg, globalLimits) - mult = GetMultiplier(target, tag.var, cfg) - end - local threshold = tag.threshold or GetMultiplier(tag.thresholdActor and thresholdTarget or target, tag.thresholdVar, cfg) -- if (tag.upper and mult > threshold) or (tag.equals and mult ~= threshold) or (not (tag.upper and tag.exact) and mult < threshold) then -+ if (tag.upper and mult > threshold) or (tag.equals and mult ~= threshold) or (not tag.upper and mult < threshold) then - return - end - -- scale effects of Multiplier mod diff --git a/src/Data/ModCache.lua.rej b/src/Data/ModCache.lua.rej deleted file mode 100644 index fdeaf764f4b..00000000000 --- a/src/Data/ModCache.lua.rej +++ /dev/null @@ -1,9 +0,0 @@ -diff a/src/Data/ModCache.lua b/src/Data/ModCache.lua (rejected hunks) -@@ -2314,7 +2314,6 @@ c["30% chance to Impale on Spell Hit"]={{[1]={flags=2,keywordFlags=0,name="Impal - c["30% chance to Pierce an Enemy"]={{[1]={flags=0,keywordFlags=0,name="PierceChance",type="BASE",value=30}},nil} - c["30% chance to Poison on Hit"]={{[1]={flags=0,keywordFlags=0,name="PoisonChance",type="BASE",value=30}},nil} - c["30% chance to Poison on Hit against Enemies that are not Poisoned"]={{[1]={[1]={actor="enemy",threshold=1,type="MultiplierThreshold",upper=true,var="PoisonStacks"},flags=0,keywordFlags=0,name="PoisonChance",type="BASE",value=30}},nil} --c["30% chance to Poison on Hit against Enemies that are not Poisoned 80% increased Effect of Poison you inflict on targets that are not Poisoned"]={{[1]={[1]={actor="enemy",threshold=1,type="MultiplierThreshold",upper=true,var="PoisonStacks"},flags=0,keywordFlags=0,name="PoisonChance",type="BASE",value=30}}," 80% increased Effect of Poison you inflict on targets that are not Poisoned"} - c["30% chance to Poison on Hit with Attacks"]={{[1]={flags=0,keywordFlags=65536,name="PoisonChance",type="BASE",value=30}},nil} - c["30% chance to inflict Bleeding on Hit"]={{[1]={flags=0,keywordFlags=0,name="BleedChance",type="BASE",value=30}},nil} - c["30% chance when you Reload a Crossbow to be immediate"]={{[1]={flags=0,keywordFlags=0,name="InstantReloadChance",type="BASE",value=30}},nil} diff --git a/src/Modules/ModParser.lua.rej b/src/Modules/ModParser.lua.rej deleted file mode 100644 index 8b7bda5304a..00000000000 --- a/src/Modules/ModParser.lua.rej +++ /dev/null @@ -1,11 +0,0 @@ -diff a/src/Modules/ModParser.lua b/src/Modules/ModParser.lua (rejected hunks) -@@ -2104,7 +2104,8 @@ local modTagList = { - ["against enemies that are affected by elemental ailments"] = { tag = { type = "ActorCondition", actor = "enemy", varList = { "Frozen","Chilled","Shocked","Ignited","Scorched","Brittle","Sapped" } } }, - ["against enemies that are affected by no elemental ailments"] = { tagList = { { type = "ActorCondition", actor = "enemy", varList = { "Frozen","Chilled","Shocked","Ignited","Scorched","Brittle","Sapped" }, neg = true }, { type = "Condition", var = "Effective" } } }, - ["against enemies affected by (%d+) spider's webs"] = function(num) return { tag = { type = "MultiplierThreshold", actor = "enemy", var = "Spider's WebStack", threshold = num } } end, -- ["on targets that are not poisoned"] = { tag = { type = "MultiplierThreshold", var = "PoisonStacks", threshold = 1, upper = true } }, -+ ["against enemies that are not poisoned"] = { tag = { type = "MultiplierThreshold", actor = "enemy", var = "PoisonStacks", threshold = 1, upper = true } }, -+ ["on targets that are not poisoned"] = { tag = { type = "MultiplierThreshold", actor = "enemy", var = "PoisonStacks", threshold = 1, upper = true } }, - ["against enemies on consecrated ground"] = { tag = { type = "ActorCondition", actor = "enemy", var = "OnConsecratedGround" } }, - ["if (%d+)%% of curse duration expired"] = function(num) return { tag = { type = "MultiplierThreshold", actor = "enemy", var = "CurseExpired", threshold = num } } end, - ["against enemies with (%w+) exposure"] = function(element) return { tag = { type = "ActorCondition", actor = "enemy", var = "Has"..(firstToUpper(element).."Exposure") } } end,