From 3bcefefafc6fc08ab4da33c44a86942e76e2a20d Mon Sep 17 00:00:00 2001 From: LocalIdentity Date: Sun, 30 Aug 2026 11:02:45 +0000 Subject: [PATCH 1/2] Apply changes from https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/10046 --- src/Data/ModCache.lua.rej | 16 ++++++++++++++++ src/Modules/ModParser.lua.rej | 10 ++++++++++ 2 files changed, 26 insertions(+) create mode 100644 src/Data/ModCache.lua.rej create mode 100644 src/Modules/ModParser.lua.rej diff --git a/src/Data/ModCache.lua.rej b/src/Data/ModCache.lua.rej new file mode 100644 index 0000000000..7f79b5a425 --- /dev/null +++ b/src/Data/ModCache.lua.rej @@ -0,0 +1,16 @@ +diff a/src/Data/ModCache.lua b/src/Data/ModCache.lua (rejected hunks) +@@ -12122,10 +12122,10 @@ c["Spell Critical Strike Chance Bifurcates"]={{[1]={flags=2,keywordFlags=0,name= + c["Spell Skills always deal Critical Strikes on final Repeat"]={{[1]={flags=2,keywordFlags=0,name="SpellSkillsAlwaysDealCriticalStrikesOnFinalRepeat",type="FLAG",value=true}},nil} + c["Spell Skills cannot deal Critical Strikes except on final Repeat"]={{[1]={flags=2,keywordFlags=0,name="SpellSkillsCannotDealCriticalStrikesExceptOnFinalRepeat",type="FLAG",value=true},[2]={[1]={type="Condition",var="alwaysFinalRepeat"},flags=0,keywordFlags=0,name="",type="FLAG",value=true}},nil} + c["Spell Skills deal no Damage"]={{[1]={[1]={skillType=2,type="SkillType"},flags=0,keywordFlags=0,name="DealNoDamage",type="FLAG",value=true}},nil} +-c["Spell Skills have +12% to Damage over Time Multiplier for Poison"]={{[1]={flags=0,keywordFlags=1075970048,name="DotMultiplier",type="BASE",value=12}},nil} +-c["Spell Skills have +5% to Damage over Time Multiplier for Poison"]={{[1]={flags=0,keywordFlags=1075970048,name="DotMultiplier",type="BASE",value=5}},nil} +-c["Spell Skills have 10% increased Area of Effect"]={{[1]={flags=0,keywordFlags=131072,name="AreaOfEffect",type="INC",value=10}},nil} +-c["Spell Skills have 20% increased Area of Effect"]={{[1]={flags=0,keywordFlags=131072,name="AreaOfEffect",type="INC",value=20}},nil} ++c["Spell Skills have +12% to Damage over Time Multiplier for Poison"]={{[1]={[1]={skillType=2,type="SkillType"},flags=0,keywordFlags=1075838976,name="DotMultiplier",type="BASE",value=12}},nil} ++c["Spell Skills have +5% to Damage over Time Multiplier for Poison"]={{[1]={[1]={skillType=2,type="SkillType"},flags=0,keywordFlags=1075838976,name="DotMultiplier",type="BASE",value=5}},nil} ++c["Spell Skills have 10% increased Area of Effect"]={{[1]={[1]={skillType=2,type="SkillType"},flags=0,keywordFlags=0,name="AreaOfEffect",type="INC",value=10}},nil} ++c["Spell Skills have 20% increased Area of Effect"]={{[1]={[1]={skillType=2,type="SkillType"},flags=0,keywordFlags=0,name="AreaOfEffect",type="INC",value=20}},nil} + c["Spells Cast by Totems have 4% increased Cast Speed"]={{[1]={flags=18,keywordFlags=16384,name="Speed",type="INC",value=4}},nil} + c["Spells Cast by Totems have 5% increased Cast Speed"]={{[1]={flags=18,keywordFlags=16384,name="Speed",type="INC",value=5}},nil} + c["Spells Cast by Totems have 8% increased Cast Speed"]={{[1]={flags=18,keywordFlags=16384,name="Speed",type="INC",value=8}},nil} diff --git a/src/Modules/ModParser.lua.rej b/src/Modules/ModParser.lua.rej new file mode 100644 index 0000000000..6d35df6cbf --- /dev/null +++ b/src/Modules/ModParser.lua.rej @@ -0,0 +1,10 @@ +diff a/src/Modules/ModParser.lua b/src/Modules/ModParser.lua (rejected hunks) +@@ -1182,7 +1182,7 @@ local preFlagList = { + ["^attacks [hd][ae][va][el] "] = { flags = ModFlag.Attack }, + ["^attack skills [hd][ae][va][el] "] = { keywordFlags = KeywordFlag.Attack }, + ["^spells [hd][ae][va][el] a? ?"] = { flags = ModFlag.Spell }, +- ["^spell skills [hd][ae][va][el] "] = { keywordFlags = KeywordFlag.Spell }, ++ ["^spell skills [hd][ae][va][el] "] = { tag = { type = "SkillType", skillType = SkillType.Spell } }, + ["^projectile attack skills [hd][ae][va][el] "] = { tag = { type = "SkillType", skillType = SkillType.RangedAttack } }, + ["^projectiles from attacks [hd][ae][va][el] "] = { tag = { type = "SkillType", skillType = SkillType.RangedAttack } }, + ["^arrows [hd][ae][va][el] "] = { keywordFlags = KeywordFlag.Arrow }, From 9e1d9cb3a730a7aab500241e56cede5085f49936 Mon Sep 17 00:00:00 2001 From: LocalIdentity Date: Mon, 31 Aug 2026 00:40:10 +1000 Subject: [PATCH 2/2] Fix port --- src/Data/ModCache.lua | 14 +++++++------- src/Data/ModCache.lua.rej | 16 ---------------- src/Modules/ModParser.lua | 2 +- src/Modules/ModParser.lua.rej | 10 ---------- 4 files changed, 8 insertions(+), 34 deletions(-) delete mode 100644 src/Data/ModCache.lua.rej delete mode 100644 src/Modules/ModParser.lua.rej diff --git a/src/Data/ModCache.lua b/src/Data/ModCache.lua index 1db80b017e..b217653a88 100644 --- a/src/Data/ModCache.lua +++ b/src/Data/ModCache.lua @@ -9513,13 +9513,13 @@ c["Spell Hits Gain 27% of Damage as Extra Physical Damage per Curse on target"]= c["Spell Hits Gain 31% of Damage as Extra Chaos Damage per Curse on target"]={{[1]={[1]={type="Multiplier",var="CurseOnEnemy"},flags=4,keywordFlags=131072,name="DamageGainAsChaos",type="BASE",value=31}},nil} c["Spell Hits Gain 31% of Damage as Extra Physical Damage per Curse on target"]={{[1]={[1]={type="Multiplier",var="CurseOnEnemy"},flags=4,keywordFlags=131072,name="DamageGainAsPhysical",type="BASE",value=31}},nil} c["Spell Skills deal no Damage"]={nil,"no Damage "} -c["Spell Skills have +1 to maximum number of Summoned Totems"]={{[1]={flags=0,keywordFlags=131072,name="ActiveTotemLimit",type="BASE",value=1}},nil} -c["Spell Skills have 10% reduced Area of Effect"]={{[1]={flags=0,keywordFlags=131072,name="AreaOfEffect",type="INC",value=-10}},nil} -c["Spell Skills have 12% increased Area of Effect"]={{[1]={flags=0,keywordFlags=131072,name="AreaOfEffect",type="INC",value=12}},nil} -c["Spell Skills have 15% increased Area of Effect"]={{[1]={flags=0,keywordFlags=131072,name="AreaOfEffect",type="INC",value=15}},nil} -c["Spell Skills have 18% increased Area of Effect"]={{[1]={flags=0,keywordFlags=131072,name="AreaOfEffect",type="INC",value=18}},nil} -c["Spell Skills have 25% increased Area of Effect"]={{[1]={flags=0,keywordFlags=131072,name="AreaOfEffect",type="INC",value=25}},nil} -c["Spell Skills have 6% increased Area of Effect"]={{[1]={flags=0,keywordFlags=131072,name="AreaOfEffect",type="INC",value=6}},nil} +c["Spell Skills have +1 to maximum number of Summoned Totems"]={{[1]={[1]={skillType=2,type="SkillType"},flags=0,keywordFlags=0,name="ActiveTotemLimit",type="BASE",value=1}},nil} +c["Spell Skills have 10% reduced Area of Effect"]={{[1]={[1]={skillType=2,type="SkillType"},flags=0,keywordFlags=0,name="AreaOfEffect",type="INC",value=-10}},nil} +c["Spell Skills have 12% increased Area of Effect"]={{[1]={[1]={skillType=2,type="SkillType"},flags=0,keywordFlags=0,name="AreaOfEffect",type="INC",value=12}},nil} +c["Spell Skills have 15% increased Area of Effect"]={{[1]={[1]={skillType=2,type="SkillType"},flags=0,keywordFlags=0,name="AreaOfEffect",type="INC",value=15}},nil} +c["Spell Skills have 18% increased Area of Effect"]={{[1]={[1]={skillType=2,type="SkillType"},flags=0,keywordFlags=0,name="AreaOfEffect",type="INC",value=18}},nil} +c["Spell Skills have 25% increased Area of Effect"]={{[1]={[1]={skillType=2,type="SkillType"},flags=0,keywordFlags=0,name="AreaOfEffect",type="INC",value=25}},nil} +c["Spell Skills have 6% increased Area of Effect"]={{[1]={[1]={skillType=2,type="SkillType"},flags=0,keywordFlags=0,name="AreaOfEffect",type="INC",value=6}},nil} c["Spells Cast by Totems have 2% increased Cast Speed"]={{[1]={flags=18,keywordFlags=16384,name="Speed",type="INC",value=2}},nil} c["Spells Cast by Totems have 3% increased Cast Speed per Summoned Totem"]={{[1]={[1]={stat="TotemsSummoned",type="PerStat"},flags=18,keywordFlags=16384,name="Speed",type="INC",value=3}},nil} c["Spells Cast by Totems have 4% increased Cast Speed"]={{[1]={flags=18,keywordFlags=16384,name="Speed",type="INC",value=4}},nil} diff --git a/src/Data/ModCache.lua.rej b/src/Data/ModCache.lua.rej deleted file mode 100644 index 7f79b5a425..0000000000 --- a/src/Data/ModCache.lua.rej +++ /dev/null @@ -1,16 +0,0 @@ -diff a/src/Data/ModCache.lua b/src/Data/ModCache.lua (rejected hunks) -@@ -12122,10 +12122,10 @@ c["Spell Critical Strike Chance Bifurcates"]={{[1]={flags=2,keywordFlags=0,name= - c["Spell Skills always deal Critical Strikes on final Repeat"]={{[1]={flags=2,keywordFlags=0,name="SpellSkillsAlwaysDealCriticalStrikesOnFinalRepeat",type="FLAG",value=true}},nil} - c["Spell Skills cannot deal Critical Strikes except on final Repeat"]={{[1]={flags=2,keywordFlags=0,name="SpellSkillsCannotDealCriticalStrikesExceptOnFinalRepeat",type="FLAG",value=true},[2]={[1]={type="Condition",var="alwaysFinalRepeat"},flags=0,keywordFlags=0,name="",type="FLAG",value=true}},nil} - c["Spell Skills deal no Damage"]={{[1]={[1]={skillType=2,type="SkillType"},flags=0,keywordFlags=0,name="DealNoDamage",type="FLAG",value=true}},nil} --c["Spell Skills have +12% to Damage over Time Multiplier for Poison"]={{[1]={flags=0,keywordFlags=1075970048,name="DotMultiplier",type="BASE",value=12}},nil} --c["Spell Skills have +5% to Damage over Time Multiplier for Poison"]={{[1]={flags=0,keywordFlags=1075970048,name="DotMultiplier",type="BASE",value=5}},nil} --c["Spell Skills have 10% increased Area of Effect"]={{[1]={flags=0,keywordFlags=131072,name="AreaOfEffect",type="INC",value=10}},nil} --c["Spell Skills have 20% increased Area of Effect"]={{[1]={flags=0,keywordFlags=131072,name="AreaOfEffect",type="INC",value=20}},nil} -+c["Spell Skills have +12% to Damage over Time Multiplier for Poison"]={{[1]={[1]={skillType=2,type="SkillType"},flags=0,keywordFlags=1075838976,name="DotMultiplier",type="BASE",value=12}},nil} -+c["Spell Skills have +5% to Damage over Time Multiplier for Poison"]={{[1]={[1]={skillType=2,type="SkillType"},flags=0,keywordFlags=1075838976,name="DotMultiplier",type="BASE",value=5}},nil} -+c["Spell Skills have 10% increased Area of Effect"]={{[1]={[1]={skillType=2,type="SkillType"},flags=0,keywordFlags=0,name="AreaOfEffect",type="INC",value=10}},nil} -+c["Spell Skills have 20% increased Area of Effect"]={{[1]={[1]={skillType=2,type="SkillType"},flags=0,keywordFlags=0,name="AreaOfEffect",type="INC",value=20}},nil} - c["Spells Cast by Totems have 4% increased Cast Speed"]={{[1]={flags=18,keywordFlags=16384,name="Speed",type="INC",value=4}},nil} - c["Spells Cast by Totems have 5% increased Cast Speed"]={{[1]={flags=18,keywordFlags=16384,name="Speed",type="INC",value=5}},nil} - c["Spells Cast by Totems have 8% increased Cast Speed"]={{[1]={flags=18,keywordFlags=16384,name="Speed",type="INC",value=8}},nil} diff --git a/src/Modules/ModParser.lua b/src/Modules/ModParser.lua index 375df22f3f..14d368501d 100644 --- a/src/Modules/ModParser.lua +++ b/src/Modules/ModParser.lua @@ -1291,7 +1291,7 @@ local preFlagList = { ["^attack skills [hd][ae][va][el] "] = { keywordFlags = KeywordFlag.Attack }, ["^spells [hgdf][aei][ivar][nel] a? ?"] = { flags = ModFlag.Spell }, ["^spells which cost life gain "] = { keywordFlags = KeywordFlag.Spell, tag = { type = "StatThreshold", statList = { "LifeCost", "LifePerSecondCost" }, threshold = 1 } }, - ["^spell skills [hd][ae][va][el] "] = { keywordFlags = KeywordFlag.Spell }, + ["^spell skills [hd][ae][va][el] "] = { tag = { type = "SkillType", skillType = SkillType.Spell } }, ["^spell hits [ghd][ae][iva][eln] "] = { flags = ModFlag.Hit, keywordFlags = KeywordFlag.Spell }, ["^offering skills [hd][ae][va][el] "] = { tag = { type = "SkillType", skillType = SkillType.Offering } }, ["^projectile attack skills [hd][ae][va][el] "] = { tag = { type = "SkillType", skillType = SkillType.RangedAttack } }, diff --git a/src/Modules/ModParser.lua.rej b/src/Modules/ModParser.lua.rej deleted file mode 100644 index 6d35df6cbf..0000000000 --- a/src/Modules/ModParser.lua.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/src/Modules/ModParser.lua b/src/Modules/ModParser.lua (rejected hunks) -@@ -1182,7 +1182,7 @@ local preFlagList = { - ["^attacks [hd][ae][va][el] "] = { flags = ModFlag.Attack }, - ["^attack skills [hd][ae][va][el] "] = { keywordFlags = KeywordFlag.Attack }, - ["^spells [hd][ae][va][el] a? ?"] = { flags = ModFlag.Spell }, -- ["^spell skills [hd][ae][va][el] "] = { keywordFlags = KeywordFlag.Spell }, -+ ["^spell skills [hd][ae][va][el] "] = { tag = { type = "SkillType", skillType = SkillType.Spell } }, - ["^projectile attack skills [hd][ae][va][el] "] = { tag = { type = "SkillType", skillType = SkillType.RangedAttack } }, - ["^projectiles from attacks [hd][ae][va][el] "] = { tag = { type = "SkillType", skillType = SkillType.RangedAttack } }, - ["^arrows [hd][ae][va][el] "] = { keywordFlags = KeywordFlag.Arrow },