Skip to content

Commit 1f653bf

Browse files
authored
Parse Glancing Blows and Stand Ground (#631)
* Parse Glancing Blows Keystone and Stand Ground node * removed spell block chance from calc page
1 parent 7cfb8bd commit 1f653bf

File tree

3 files changed

+4
-10
lines changed

3 files changed

+4
-10
lines changed

src/Data/ModCache.lua

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2201,8 +2201,7 @@ c["Bleeding you inflict deals Damage 10% faster"]={{[1]={flags=0,keywordFlags=0,
22012201
c["Bleeding you inflict is Aggravated"]={nil,"Bleeding you inflict is Aggravated "}
22022202
c["Blind Chilled enemies on Hit"]={nil,"Blind Chilled enemies on Hit "}
22032203
c["Blind Enemies when they Stun you"]={nil,"Blind Enemies when they Stun you "}
2204-
c["Block Chance is doubled"]={nil,"Block Chance is doubled "}
2205-
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 "}
2204+
c["Block Chance is doubled"]={{[1]={flags=0,keywordFlags=0,name="BlockChance",type="MORE",value=100}},nil}
22062205
c["Block chance is Lucky"]={nil,"Block chance is Lucky "}
22072206
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 "}
22082207
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]
28882887
c["Regenerate 0.5% of Life per second"]={{[1]={flags=0,keywordFlags=0,name="LifeRegenPercent",type="BASE",value=0.5}},nil}
28892888
c["Regenerate 0.75% of Life per second"]={{[1]={flags=0,keywordFlags=0,name="LifeRegenPercent",type="BASE",value=0.75}},nil}
28902889
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}
2891-
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 "}
2892-
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 "}
2890+
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}
28932891
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}
28942892
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}
28952893
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}

src/Modules/CalcSections.lua

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1628,10 +1628,6 @@ return {
16281628
{ breakdown = "BlockChance" },
16291629
{ modName = { "BlockChance", "ReplaceShieldBlock" } },
16301630
}, },
1631-
{ label = "Spell Block Chance", { format = "{0:output:SpellBlockChance}% (+{0:output:SpellBlockChanceOverCap}%)",
1632-
{ breakdown = "SpellBlockChance" },
1633-
{ modName = { "SpellBlockChance", "SpellBlockChanceIsBlockChance", "SpellBlockChanceMaxIsBlockChanceMax" }, },
1634-
}, },
16351631
{ label = "Taken From Block", haveOutput = "ShowBlockEffect", { format = "{0:output:DamageTakenOnBlock}%",
16361632
{ breakdown = "BlockEffect" },
16371633
{ modName = { "BlockEffect" }, },

src/Modules/ModParser.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1652,6 +1652,7 @@ local modTagList = {
16521652
["while you are poisoned"] = { tag = { type = "Condition", var = "Poisoned" } },
16531653
["while cursed"] = { tag = { type = "Condition", var = "Cursed" } },
16541654
["while not cursed"] = { tag = { type = "Condition", var = "Cursed", neg = true } },
1655+
["while affected by any damaging ailment"] = { tag = { type = "Condition", varList = { "Poisoned", "Ignited", "Bleeding" } } },
16551656
["while there is only one nearby enemy"] = { tagList = { { type = "Multiplier", var = "NearbyEnemies", limit = 1 }, { type = "Condition", var = "OnlyOneNearbyEnemy" } } },
16561657
["while t?h?e?r?e? ?i?s? ?a rare or unique enemy i?s? ?nearby"] = { tag = { type = "ActorCondition", actor = "enemy", varList = { "NearbyRareOrUniqueEnemy", "RareOrUnique" } } },
16571658
["while a rare or unique enemy is in your presence"] = { tag = { type = "ActorCondition", actor = "enemy", varList = { "NearbyRareOrUniqueEnemy", "RareOrUnique" } } },
@@ -2184,8 +2185,7 @@ local specialModList = {
21842185
flag("CannotFork", nil, ModFlag.Projectile),
21852186
},
21862187
["critical hits inflict scorch, brittle and sapped"] = { flag("CritAlwaysAltAilments") },
2187-
["chance to block attack damage is doubled"] = { mod("BlockChance", "MORE", 100) },
2188-
["chance to block spell damage is doubled"] = { mod("SpellBlockChance", "MORE", 100) },
2188+
["block chance is doubled"] = { mod("BlockChance", "MORE", 100) },
21892189
["you take (%d+)%% of damage from blocked hits"] = function(num) return { mod("BlockEffect", "BASE", num) } end,
21902190
["ignore attribute requirements"] = { flag("IgnoreAttributeRequirements") },
21912191
["gain no inherent bonuses from attributes"] = { flag("NoAttributeBonuses") },

0 commit comments

Comments
 (0)