From 9780f9b401f32172d6382d91111b230a00fd7908 Mon Sep 17 00:00:00 2001 From: Blitz54 Date: Sun, 26 Jan 2025 23:07:37 -0600 Subject: [PATCH 1/2] Parse Glancing Blows Keystone and Stand Ground node --- src/Data/ModCache.lua | 6 ++---- src/Modules/ModParser.lua | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Data/ModCache.lua b/src/Data/ModCache.lua index f2058bc6f..d447aefc2 100755 --- a/src/Data/ModCache.lua +++ b/src/Data/ModCache.lua @@ -2201,8 +2201,7 @@ c["Bleeding you inflict deals Damage 10% faster"]={{[1]={flags=0,keywordFlags=0, c["Bleeding you inflict is Aggravated"]={nil,"Bleeding you inflict is Aggravated "} c["Blind Chilled enemies on Hit"]={nil,"Blind Chilled enemies on Hit "} c["Blind Enemies when they Stun you"]={nil,"Blind Enemies when they Stun you "} -c["Block Chance is doubled"]={nil,"Block Chance is doubled "} -c["Block Chance is doubled You take 50% of Damage from Blocked Hits"]={nil,"Block Chance is doubled You take 50% of Damage from Blocked Hits "} +c["Block Chance is doubled"]={{[1]={flags=0,keywordFlags=0,name="BlockChance",type="MORE",value=100}},nil} c["Block chance is Lucky"]={nil,"Block chance is Lucky "} c["Blocking Damage Poisons the Enemy as though dealing 100 Base Chaos Damage"]={nil,"Blocking Damage Poisons the Enemy as though dealing 100 Base Chaos Damage "} c["Blocking Damage Poisons the Enemy as though dealing 100 Base Chaos Damage Blocking Damage Poisons the Enemy as though dealing 200 Base Chaos Damage"]={nil,"Blocking Damage Poisons the Enemy as though dealing 100 Base Chaos Damage Blocking Damage Poisons the Enemy as though dealing 200 Base Chaos Damage "} @@ -2888,8 +2887,7 @@ c["Regenerate 0.4% of Life per second if you have been Hit Recently"]={{[1]={[1] c["Regenerate 0.5% of Life per second"]={{[1]={flags=0,keywordFlags=0,name="LifeRegenPercent",type="BASE",value=0.5}},nil} c["Regenerate 0.75% of Life per second"]={{[1]={flags=0,keywordFlags=0,name="LifeRegenPercent",type="BASE",value=0.75}},nil} c["Regenerate 1% of Life per Second if you've used a Life Flask in the past 10 seconds"]={{[1]={[1]={type="Condition",var="UsingLifeFlask"},flags=0,keywordFlags=0,name="LifeRegenPercent",type="BASE",value=1}},nil} -c["Regenerate 1% of Life per second while affected by any Damaging Ailment"]={{[1]={flags=0,keywordFlags=0,name="LifeRegenPercent",type="BASE",value=1}}," while affected by any Damaging Ailment "} -c["Regenerate 1% of Life per second while affected by any Damaging Ailment Regenerate 1% of Life per second while stationary"]={{[1]={[1]={type="Condition",var="Stationary"},flags=0,keywordFlags=0,name="LifeRegenPercent",type="BASE",value=1}}," while affected by any Damaging Ailment Regenerate 1% of per second "} +c["Regenerate 1% of Life per second while affected by any Damaging Ailment"]={{[1]={[1]={type="Condition",varList={[1]="Poisoned",[2]="Ignited",[3]="Bleeding"}},flags=0,keywordFlags=0,name="LifeRegenPercent",type="BASE",value=1}},nil} c["Regenerate 1% of Life per second while stationary"]={{[1]={[1]={type="Condition",var="Stationary"},flags=0,keywordFlags=0,name="LifeRegenPercent",type="BASE",value=1}},nil} c["Regenerate 1% of Life per second while you have a Totem"]={{[1]={[1]={type="Condition",var="HaveTotem"},flags=0,keywordFlags=0,name="LifeRegenPercent",type="BASE",value=1}},nil} c["Regenerate 1.5% of Life per second while on Low Life"]={{[1]={[1]={type="Condition",var="LowLife"},flags=0,keywordFlags=0,name="LifeRegenPercent",type="BASE",value=1.5}},nil} diff --git a/src/Modules/ModParser.lua b/src/Modules/ModParser.lua index d5161337c..f70cc2e26 100644 --- a/src/Modules/ModParser.lua +++ b/src/Modules/ModParser.lua @@ -1652,6 +1652,7 @@ local modTagList = { ["while you are poisoned"] = { tag = { type = "Condition", var = "Poisoned" } }, ["while cursed"] = { tag = { type = "Condition", var = "Cursed" } }, ["while not cursed"] = { tag = { type = "Condition", var = "Cursed", neg = true } }, + ["while affected by any damaging ailment"] = { tag = { type = "Condition", varList = { "Poisoned", "Ignited", "Bleeding" } } }, ["while there is only one nearby enemy"] = { tagList = { { type = "Multiplier", var = "NearbyEnemies", limit = 1 }, { type = "Condition", var = "OnlyOneNearbyEnemy" } } }, ["while t?h?e?r?e? ?i?s? ?a rare or unique enemy i?s? ?nearby"] = { tag = { type = "ActorCondition", actor = "enemy", varList = { "NearbyRareOrUniqueEnemy", "RareOrUnique" } } }, ["while a rare or unique enemy is in your presence"] = { tag = { type = "ActorCondition", actor = "enemy", varList = { "NearbyRareOrUniqueEnemy", "RareOrUnique" } } }, @@ -2184,8 +2185,7 @@ local specialModList = { flag("CannotFork", nil, ModFlag.Projectile), }, ["critical hits inflict scorch, brittle and sapped"] = { flag("CritAlwaysAltAilments") }, - ["chance to block attack damage is doubled"] = { mod("BlockChance", "MORE", 100) }, - ["chance to block spell damage is doubled"] = { mod("SpellBlockChance", "MORE", 100) }, + ["block chance is doubled"] = { mod("BlockChance", "MORE", 100) }, ["you take (%d+)%% of damage from blocked hits"] = function(num) return { mod("BlockEffect", "BASE", num) } end, ["ignore attribute requirements"] = { flag("IgnoreAttributeRequirements") }, ["gain no inherent bonuses from attributes"] = { flag("NoAttributeBonuses") }, From 8bdcf536c81f52b3f726efbe2f8fb395e5110ec7 Mon Sep 17 00:00:00 2001 From: Blitz54 Date: Sun, 26 Jan 2025 23:25:31 -0600 Subject: [PATCH 2/2] removed spell block chance from calc page --- src/Modules/CalcSections.lua | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/CalcSections.lua b/src/Modules/CalcSections.lua index dbaa9731a..82ed8e053 100644 --- a/src/Modules/CalcSections.lua +++ b/src/Modules/CalcSections.lua @@ -1628,10 +1628,6 @@ return { { breakdown = "BlockChance" }, { modName = { "BlockChance", "ReplaceShieldBlock" } }, }, }, - { label = "Spell Block Chance", { format = "{0:output:SpellBlockChance}% (+{0:output:SpellBlockChanceOverCap}%)", - { breakdown = "SpellBlockChance" }, - { modName = { "SpellBlockChance", "SpellBlockChanceIsBlockChance", "SpellBlockChanceMaxIsBlockChanceMax" }, }, - }, }, { label = "Taken From Block", haveOutput = "ShowBlockEffect", { format = "{0:output:DamageTakenOnBlock}%", { breakdown = "BlockEffect" }, { modName = { "BlockEffect" }, },