Skip to content

Commit 01aa3d1

Browse files
ImmotephSimonLocalIdentity
andauthored
Add breakdown for Daze Chance on Calcs tab (#1339)
* Add parsing/implementation for daze * Add parsing for Headshot node * Support Nazir's Judgement --------- Co-authored-by: LocalIdentity <[email protected]>
1 parent af70cec commit 01aa3d1

File tree

4 files changed

+15
-19
lines changed

4 files changed

+15
-19
lines changed

src/Data/ModCache.lua

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -957,13 +957,7 @@ c["10% chance for Mace Strike Skills you use yourself to cause Aftershocks, deal
957957
c["10% chance to Aggravate Bleeding on targets you Hit with Attacks"]={{}," to Aggravate Bleeding on targets you Hit "}
958958
c["10% chance to Aggravate Bleeding on targets you Hit with Attacks 8% increased Attack Speed while a Rare or Unique Enemy is in your Presence"]={{[1]={[1]={actor="enemy",type="ActorCondition",varList={[1]="NearbyRareOrUniqueEnemy",[2]="RareOrUnique"}},flags=1,keywordFlags=65536,name="Speed",type="BASE",value=10}}," to Aggravate Bleeding on targets you Hit 8% increased "}
959959
c["10% chance to Blind Enemies on Hit with Attacks"]={{[1]={flags=0,keywordFlags=65536,name="BlindChance",type="BASE",value=10}},nil}
960-
c["10% chance to Daze on Hit"]={{}," to Daze "}
961-
c["10% chance to Daze on Hit 25% increased Daze Duration"]={{[1]={flags=4,keywordFlags=0,name="Duration",type="BASE",value=10}}," to Daze 25% increased Daze "}
962-
c["10% chance to Daze on Hit 30% increased Defences while wielding a Quarterstaff"]={{[1]={[1]={type="Condition",var="UsingStaff"},flags=4,keywordFlags=0,name="Defences",type="BASE",value=10}}," to Daze 30% increased "}
963-
c["10% chance to Daze on Hit 30% increased Defences while wielding a Quarterstaff 30% increased Freeze Buildup with Quarterstaves"]={{[1]={[1]={type="Condition",var="UsingStaff"},flags=4,keywordFlags=0,name="Defences",type="BASE",value=10}}," to Daze 30% increased 30% increased Freeze Buildup with Quarterstaves "}
964-
c["10% chance to Daze on Hit 30% increased Defences while wielding a Quarterstaff 30% increased Freeze Buildup with Quarterstaves 30% increased Stun Buildup with Quarterstaves"]={{[1]={[1]={type="Condition",var="UsingStaff"},flags=4,keywordFlags=0,name="Defences",type="BASE",value=10}}," to Daze 30% increased 30% increased Freeze Buildup with Quarterstaves 30% increased Stun Buildup with Quarterstaves "}
965-
c["10% chance to Daze on Hit 40% increased Critical Hit Chance against Dazed Enemies"]={{[1]={[1]={actor="enemy",type="ActorCondition",var="Dazed"},flags=4,keywordFlags=0,name="CritChance",type="BASE",value=10}}," to Daze 40% increased "}
966-
c["10% chance to Daze on Hit 40% increased Damage against Dazed Enemies"]={{[1]={[1]={actor="enemy",type="ActorCondition",var="Dazed"},flags=4,keywordFlags=0,name="Damage",type="BASE",value=10}}," to Daze 40% increased "}
960+
c["10% chance to Daze on Hit"]={{[1]={flags=4,keywordFlags=0,name="DazeChance",type="BASE",value=10}},nil}
967961
c["10% chance to Defend with 200% of Armour"]={{[1]={[1]={type="Condition",var="ArmourMax"},flags=0,keywordFlags=0,name="ArmourDefense",source="Armour Mastery: Max Calc",type="MAX",value=100},[2]={[1]={type="Condition",var="ArmourAvg"},flags=0,keywordFlags=0,name="ArmourDefense",source="Armour Mastery: Average Calc",type="MAX",value=10},[3]={[1]={neg=true,type="Condition",var="ArmourMax"},[2]={neg=true,type="Condition",var="ArmourAvg"},flags=0,keywordFlags=0,name="ArmourDefense",source="Armour Mastery: Min Calc",type="MAX",value=0}},nil}
968962
c["10% chance to Gain Arcane Surge when you deal a Critical Hit"]={{[1]={[1]={type="Condition",var="CritRecently"},flags=0,keywordFlags=0,name="Condition:ArcaneSurge",type="FLAG",value=true}},nil}
969963
c["10% chance to Pierce an Enemy"]={{}," to Pierce an Enemy "}
@@ -1187,7 +1181,7 @@ c["10% reduced effect of Curses on you"]={{[1]={flags=0,keywordFlags=0,name="Cur
11871181
c["10% reduced effect of Shock on you"]={{[1]={flags=0,keywordFlags=0,name="SelfShockEffect",type="INC",value=-10}},nil}
11881182
c["10% reduced maximum Mana"]={{[1]={flags=0,keywordFlags=0,name="Mana",type="INC",value=-10}},nil}
11891183
c["100 Passive Skill Points become Weapon Set Skill Points"]={{[1]={flags=0,keywordFlags=0,name="PassivePointsToWeaponSetPoints",type="BASE",value=100}},nil}
1190-
c["100% chance to Daze Enemies whose Hits you Block while Actively Blocking"]={{}," to Daze Enemies whose Hits you Block ly Blocking "}
1184+
c["100% chance to Daze Enemies whose Hits you Block while Actively Blocking"]={{[1]={flags=0,keywordFlags=0,name="DazeChance",type="BASE",value=100}}," Enemies whose Hits you Block ly Blocking "}
11911185
c["100% chance to not consume a bolt if you've Reloaded Recently"]={{}," to not consume a bolt if you've Reloaded Recently "}
11921186
c["100% faster start of Energy Shield Recharge"]={{[1]={flags=0,keywordFlags=0,name="EnergyShieldRechargeFaster",type="INC",value=100}},nil}
11931187
c["100% increased Armour"]={{[1]={flags=0,keywordFlags=0,name="Armour",type="INC",value=100}},nil}
@@ -1957,7 +1951,7 @@ c["25% chance to be inflicted with Bleeding when Hit"]={{}," to be inflicted wh
19571951
c["25% chance to cause Bleeding on Hit"]={{[1]={flags=0,keywordFlags=0,name="BleedChance",type="BASE",value=25}},nil}
19581952
c["25% chance to gain a Power Charge on Critical Hit"]={nil,"a Power Charge "}
19591953
c["25% chance to inflict Bleeding on Hit"]={{[1]={flags=0,keywordFlags=0,name="BleedChance",type="BASE",value=25}},nil}
1960-
c["25% chance to inflict Daze with Hits against Enemies further than 6m"]={{}," to inflict Daze "}
1954+
c["25% chance to inflict Daze with Hits against Enemies further than 6m"]={{[1]={[1]={threshold=60,type="MultiplierThreshold",var="enemyDistance"},flags=0,keywordFlags=262144,name="DazeChance",type="BASE",value=25}},nil}
19611955
c["25% chance to inflict Withered for 2 seconds on Hit"]={{[1]={flags=0,keywordFlags=0,name="Condition:CanWither",type="FLAG",value=true}},nil}
19621956
c["25% chance to not destroy Corpses when Consuming Corpses"]={{}," to not destroy Corpses when Consuming Corpses "}
19631957
c["25% faster start of Energy Shield Recharge"]={{[1]={flags=0,keywordFlags=0,name="EnergyShieldRechargeFaster",type="INC",value=25}},nil}
@@ -2316,7 +2310,7 @@ c["30% increased Spell Damage if you have consumed an Elemental Infusion Recentl
23162310
c["30% increased Strength"]={{[1]={flags=0,keywordFlags=0,name="Str",type="INC",value=30}},nil}
23172311
c["30% increased Stun Buildup"]={{}," Stun Buildup "}
23182312
c["30% increased Stun Buildup +15 to Strength"]={{[1]={flags=0,keywordFlags=0,name="Str",type="INC",value=30}}," Stun Buildup +15 to "}
2319-
c["30% increased Stun Buildup 10% chance to Daze on Hit"]={{}," Stun Buildup 10% chance to Daze "}
2313+
c["30% increased Stun Buildup 10% chance to Daze on Hit"]={{[1]={flags=4,keywordFlags=0,name="DazeChance",type="INC",value=30}}," Stun Buildup 10% chance "}
23202314
c["30% increased Stun Buildup 12% increased Area of Effect if you have Stunned an Enemy Recently"]={{[1]={[1]={type="Condition",var="StunnedEnemyRecently"},flags=0,keywordFlags=0,name="AreaOfEffect",type="INC",value=30}}," Stun Buildup 12% increased "}
23212315
c["30% increased Stun Buildup 30% increased Stun Threshold"]={{[1]={flags=0,keywordFlags=0,name="StunThreshold",type="INC",value=30}}," Stun Buildup 30% increased "}
23222316
c["30% increased Stun Buildup 30% increased Stun Threshold 5% increased Strength"]={{[1]={flags=0,keywordFlags=0,name="StunThreshold",type="INC",value=30}}," Stun Buildup 30% increased 5% increased Strength "}
@@ -2472,9 +2466,7 @@ c["4.6 Life Regeneration per second"]={{[1]={flags=0,keywordFlags=0,name="LifeRe
24722466
c["40% chance to Aggravate Bleeding on Hit"]={{}," to Aggravate Bleeding "}
24732467
c["40% chance to Avoid Chaos Damage from Hits"]={{[1]={flags=0,keywordFlags=0,name="AvoidChaosDamageChance",type="BASE",value=40}},nil}
24742468
c["40% chance to Avoid Physical Damage from Hits"]={{[1]={flags=0,keywordFlags=0,name="AvoidPhysicalDamageChance",type="BASE",value=40}},nil}
2475-
c["40% chance to Daze on Hit"]={{}," to Daze "}
2476-
c["40% chance to Daze on Hit 172% increased Physical Damage"]={{[1]={flags=4,keywordFlags=0,name="PhysicalDamage",type="BASE",value=40}}," to Daze 172% increased "}
2477-
c["40% chance to Daze on Hit Adds 53 to 86 Fire Damage"]={{[1]={flags=4,keywordFlags=0,name="FireDamage",type="BASE",value=40}}," to Daze Adds 53 to 86 "}
2469+
c["40% chance to Daze on Hit"]={{[1]={flags=4,keywordFlags=0,name="DazeChance",type="BASE",value=40}},nil}
24782470
c["40% faster Curse Activation"]={{[1]={flags=0,keywordFlags=0,name="CurseActivation",type="INC",value=40}},nil}
24792471
c["40% faster start of Energy Shield Recharge"]={{[1]={flags=0,keywordFlags=0,name="EnergyShieldRechargeFaster",type="INC",value=40}},nil}
24802472
c["40% increased Ailment and Stun Threshold while Surrounded"]={{[1]={[1]={type="Condition",var="Surrounded"},flags=0,keywordFlags=0,name="StunThreshold",type="INC",value=40}}," Ailment and "}
@@ -2633,10 +2625,7 @@ c["5% additional Physical Damage Reduction while you have at least 150 Devotion"
26332625
c["5% chance for Slam Skills you use yourself to cause Aftershocks"]={{}," for Slam Skills you use yourself to cause Aftershocks "}
26342626
c["5% chance to Blind Enemies on Hit"]={{[1]={flags=0,keywordFlags=0,name="BlindChance",type="BASE",value=5}},nil}
26352627
c["5% chance to Blind Enemies on Hit with Attacks"]={{[1]={flags=0,keywordFlags=65536,name="BlindChance",type="BASE",value=5}},nil}
2636-
c["5% chance to Daze on Hit"]={{}," to Daze "}
2637-
c["5% chance to Daze on Hit 20% increased Freeze Buildup with Quarterstaves"]={{}," to Daze 20% increased Freeze Buildup with Quarterstaves "}
2638-
c["5% chance to Daze on Hit Gain 12% of Physical Damage as Extra Cold Damage against Dazed Enemies"]={{[1]={[1]={actor="enemy",type="ActorCondition",var="Dazed"},flags=4,keywordFlags=0,name="PhysicalDamage",type="BASE",value=5}}," to Daze Gain 12% of as Extra Cold Damage "}
2639-
c["5% chance to Daze on Hit Gain 12% of Physical Damage as Extra Lightning Damage against Dazed Enemies"]={{[1]={[1]={actor="enemy",type="ActorCondition",var="Dazed"},flags=4,keywordFlags=0,name="PhysicalDamage",type="BASE",value=5}}," to Daze Gain 12% of as Extra Lightning Damage "}
2628+
c["5% chance to Daze on Hit"]={{[1]={flags=4,keywordFlags=0,name="DazeChance",type="BASE",value=5}},nil}
26402629
c["5% chance to Gain Arcane Surge when you deal a Critical Hit"]={{[1]={[1]={type="Condition",var="CritRecently"},flags=0,keywordFlags=0,name="Condition:ArcaneSurge",type="FLAG",value=true}},nil}
26412630
c["5% chance to gain Volatility on Kill"]={nil,"Volatility "}
26422631
c["5% chance to inflict Bleeding on Hit"]={{[1]={flags=0,keywordFlags=0,name="BleedChance",type="BASE",value=5}},nil}
@@ -4387,8 +4376,7 @@ c["Damaging Ailments deal damage 5% faster"]={{[1]={flags=0,keywordFlags=0,name=
43874376
c["Damaging Spells consume a Power Charge if able to trigger Abyssal Apparition"]={nil,"Damaging Spells consume a Power Charge if able to trigger Abyssal Apparition "}
43884377
c["Darkness Reservation lasts for 5 seconds"]={nil,"Darkness Reservation lasts for 5 seconds "}
43894378
c["Darkness Reservation lasts for 5 seconds +8 to Maximum Darkness per Level"]={nil,"Darkness Reservation lasts for 5 seconds +8 to Maximum Darkness per Level "}
4390-
c["Dazes on Hit"]={nil,"Dazes on Hit "}
4391-
c["Dazes on Hit 50% increased Melee Damage against Heavy Stunned enemies"]={nil,"Dazes on Hit 50% increased Melee Damage against Heavy Stunned enemies "}
4379+
c["Dazes on Hit"]={{[1]={[1]={type="Condition",var="{Hand}Attack"},flags=0,keywordFlags=0,name="DazeChance",type="BASE",value=100}},nil}
43924380
c["Deal 30% of Overkill damage to enemies within 2 metres of the enemy killed"]={{[1]={flags=0,keywordFlags=0,name="Damage",type="BASE",value=30}}," Overkill to enemies within 2 metres of the enemy killed "}
43934381
c["Deal 4% increased Damage with Hits to Rare or Unique Enemies for each second they've ever been in your Presence, up to a maximum of 200%"]={{[1]={[1]={actor="enemy",limit=200,limitTotal=true,type="Multiplier",var="EnemyPresenceSeconds"},[2]={actor="enemy",type="ActorCondition",var="RareOrUnique"},flags=0,keywordFlags=262144,name="Damage",type="INC",value=4}},nil}
43944382
c["Deal no Non-Fire Damage"]={{[1]={flags=0,keywordFlags=0,name="DealNoPhysical",type="FLAG",value=true},[2]={flags=0,keywordFlags=0,name="DealNoLightning",type="FLAG",value=true},[3]={flags=0,keywordFlags=0,name="DealNoCold",type="FLAG",value=true},[4]={flags=0,keywordFlags=0,name="DealNoChaos",type="FLAG",value=true}},nil}

src/Data/SkillStatMap.lua

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -488,6 +488,9 @@ return {
488488
["global_chance_to_blind_on_hit_%"] = {
489489
mod("BlindChance", "BASE", nil),
490490
},
491+
["global_chance_to_daze_on_hit_%"] = {
492+
mod("DazeChance", "BASE", nil),
493+
},
491494
["cannot_be_stunned_while_leeching"] = {
492495
mod("AvoidStun", "BASE", 100, { type = "Condition", var = "Leeching"}),
493496
},

src/Modules/CalcSections.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1406,6 +1406,7 @@ return {
14061406
{ label = "Presence Mod", haveOutput = "PresenceMod", { format = "{2:output:PresenceMod}", { breakdown = "PresenceMod" }, { modName = "PresenceRadius", cfg = "skill" }} , },
14071407
{ label = "Presence Radius", haveOutput = "PresenceRadius", { format = "{1:output:PresenceRadiusMetres}m", { breakdown = "PresenceRadius" }, { modName = "PresenceArea", cfg = "skill"} }, },
14081408
{ label = "Chance to Blind", { format = "{0:mod:1}%", { modName = "BlindChance", modType = "BASE", cfg = "skill" }, }, },
1409+
{ label = "Chance to Daze", { format = "{0:mod:1}%", { modName = "DazeChance", modType = "BASE", cfg = "skill" }, }, },
14091410
{ label = "Chance to Rearm", haveOutput = "HazardRearmChance", { format = "{2:mod:1}%", { modName = "HazardRearmChance", modType = "BASE", cfg = "skill"}, }, },
14101411
{ label = "Inc. Quiver Effect", { format = "{0:mod:1}%", { modName="EffectOfBonusesFromQuiver", modType= "INC", cfg = "skill" }, }, },
14111412
{ label = "Inc. Item Quantity", { format = "{0:mod:1}%", { modName = "LootQuantity", modType = "INC", cfg = "skill" }, }, },

src/Modules/ModParser.lua

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -809,6 +809,9 @@ local modNameList = {
809809
["to blind enemies on hit"] = { "BlindChance" },
810810
["curse magnitudes"] = { "CurseEffect" },
811811
["aura magnitudes"] = { "AuraEffect" },
812+
-- Other negative effects
813+
["to daze"] = "DazeChance",
814+
["to inflict daze"] = "DazeChance",
812815
-- Misc modifiers
813816
["movement speed"] = "MovementSpeed",
814817
["attack, cast and movement speed"] = { "Speed", "MovementSpeed" },
@@ -3122,6 +3125,7 @@ local specialModList = {
31223125
["hits can't be evaded"] = { flag("CannotBeEvaded", { type = "Condition", var = "{Hand}Attack" }) },
31233126
["always hits"] = { flag("CannotBeEvaded", { type = "Condition", var = "{Hand}Attack" }) },
31243127
["causes bleeding on hit"] = { mod("BleedChance", "BASE", 100, { type = "Condition", var = "{Hand}Attack" }) },
3128+
["dazes on hit"] = { mod("DazeChance", "BASE", 100, { type = "Condition", var = "{Hand}Attack" }) },
31253129
["poisonous hit"] = { mod("PoisonChance", "BASE", 100, { type = "Condition", var = "{Hand}Attack" }) },
31263130
["attacks with this weapon deal double damage"] = { mod("DoubleDamageChance", "BASE", 100, nil, ModFlag.Hit, { type = "Condition", var = "{Hand}Attack" }, { type = "SkillType", skillType = SkillType.Attack }) },
31273131
["hits with this weapon gain (%d+)%% of physical damage as extra cold or lightning damage"] = function(num) return {

0 commit comments

Comments
 (0)