diff --git a/src/Data/ModCache.lua b/src/Data/ModCache.lua index ff1fe14290..cadc3a83c7 100755 --- a/src/Data/ModCache.lua +++ b/src/Data/ModCache.lua @@ -2383,7 +2383,7 @@ c["Blind Enemies when they Stun you"]={nil,"Blind Enemies when they Stun you "} c["Blind does not affect your Light Radius"]={nil,"Blind does not affect your Light Radius "} c["Blind does not affect your Light Radius 25% more Melee Critical Hit Chance while Blinded"]={nil,"Blind does not affect your Light Radius 25% more Melee Critical Hit Chance while Blinded "} 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["Block chance is Lucky"]={{[1]={flags=0,keywordFlags=0,name="BlockChanceIsLucky",type="FLAG",value=true}},nil} 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 "} c["Blocking Damage Poisons the Enemy as though dealing 200 Base Chaos Damage"]={nil,"Blocking Damage Poisons the Enemy as though dealing 200 Base Chaos Damage "} diff --git a/src/Modules/CalcSections.lua b/src/Modules/CalcSections.lua index 82ed8e053b..a958ba20a8 100644 --- a/src/Modules/CalcSections.lua +++ b/src/Modules/CalcSections.lua @@ -1623,7 +1623,7 @@ return { { label = "Avoid Chaos Chance", haveOutput = "AvoidChaosDamageChance", { format = "{0:output:AvoidChaosDamageChance}%", { modName = "AvoidChaosDamageChance" }, }, }, { label = "Avoid Proj Ch.", haveOutput = "AvoidProjectilesChance", { format = "{0:output:AvoidProjectilesChance}%", { modName = "AvoidProjectilesChance" }, }, }, } }, { defaultCollapsed = false, label = "Block", data = { - extra = "{0:output:EffectiveBlockChance}%/{0:output:EffectiveSpellBlockChance}%", + extra = "{0:output:EffectiveBlockChance}%", { label = "Block Chance", { format = "{0:output:BlockChance}% (+{0:output:BlockChanceOverCap}%)", { breakdown = "BlockChance" }, { modName = { "BlockChance", "ReplaceShieldBlock" } }, diff --git a/src/Modules/ModParser.lua b/src/Modules/ModParser.lua index df9b2a3980..0dde7c6cb3 100644 --- a/src/Modules/ModParser.lua +++ b/src/Modules/ModParser.lua @@ -3654,11 +3654,9 @@ local specialModList = { ["you are at maximum chance to block attack damage if you have not blocked recently"] = { flag("MaxBlockIfNotBlockedRecently", { type = "Condition", var = "BlockedRecently", neg = true }) }, ["you are at maximum chance to block spell damage if you have not blocked recently"] = { flag("MaxSpellBlockIfNotBlockedRecently", { type = "Condition", var = "BlockedRecently", neg = true }) }, ["%+(%d+)%% chance to block attack damage if you have not blocked recently"] = function(num) return { mod("BlockChance", "BASE", num, { type = "Condition", var = "BlockedRecently", neg = true }) } end, - ["%+(%d+)%% chance to block spell damage if you have not blocked recently"] = function(num) return { mod("SpellBlockChance", "BASE", num, { type = "Condition", var = "BlockedRecently", neg = true }) } end, + ["block chance is lucky"] = { flag("BlockChanceIsLucky") }, ["y?o?u?r? ?chance to block is lucky"] = { flag("BlockChanceIsLucky"), flag("ProjectileBlockChanceIsLucky"),flag("SpellBlockChanceIsLucky"), flag("SpellProjectileBlockChanceIsLucky") }, ["y?o?u?r? ?chance to block is unlucky"] = { flag("BlockChanceIsUnlucky"), flag("ProjectileBlockChanceIsUnlucky"), flag("SpellBlockChanceIsUnlucky"), flag("SpellProjectileBlockChanceIsUnlucky") }, - ["y?o?u?r? ?chance to block spell damage is lucky"] = { flag("SpellBlockChanceIsLucky"), flag("SpellProjectileBlockChanceIsLucky") }, - ["y?o?u?r? ?chance to block spell damage is unlucky"] = { flag("SpellBlockChanceIsUnlucky"), flag("SpellProjectileBlockChanceIsUnlucky") }, ["chance to block attack or spell damage is lucky if you've blocked recently"] = { flag("BlockChanceIsLucky", { type = "Condition", var = "BlockedRecently" }), flag("ProjectileBlockChanceIsLucky", { type = "Condition", var = "BlockedRecently" }),