Skip to content

Fix misc calculations based on spell suppression when evasion mastery is active #9405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
danielztolnai wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Fix misc calculations based on spell suppression when evasion mastery is active #9405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e18aaf3
Move armour defence type calculation for conditionals before misc cal…
danielztolnai Dec 18, 2025
6ea31d8
Fix typo
danielztolnai Dec 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions src/Modules/CalcDefence.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,18 +471,11 @@ local function incomingDamageBreakdown(breakdownTable, poolsRemaining, output)
return breakdownTable
end

-- Performs all ingame and related defensive calculations
function calcs.defence(env, actor)
-- Performs defensive calculations used by conditionals
function calcs.defenceForConditionals(env, actor)
local modDB = actor.modDB
local enemyDB = actor.enemy.modDB
local output = actor.output
local breakdown = actor.breakdown

local condList = modDB.conditions

-- Action Speed
output.ActionSpeedMod = calcs.actionSpeedMod(actor)

-- Armour defence types for conditionals
for _, slot in pairs({"Helmet","Gloves","Boots","Body Armour","Weapon 2","Weapon 3"}) do
local armourData = actor.itemList[slot] and actor.itemList[slot].armourData
Expand All @@ -505,6 +498,19 @@ function calcs.defence(env, actor)
end
end
end
end

-- Performs all ingame and related defensive calculations
function calcs.defence(env, actor)
local modDB = actor.modDB
local enemyDB = actor.enemy.modDB
local output = actor.output
local breakdown = actor.breakdown

local condList = modDB.conditions

-- Action Speed
output.ActionSpeedMod = calcs.actionSpeedMod(actor)

-- Resistances
output["PhysicalResist"] = 0
Expand Down
6 changes: 6 additions & 0 deletions src/Modules/CalcPerform.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3216,6 +3216,12 @@ function calcs.perform(env, skipEHP)
modDB:AddList(env.weaponModList1)
end

-- Process prerequisites for conditionals
calcs.defenceForConditionals(env, env.player)
if env.minion then
calcs.defenceForConditionals(env, env.minion)
end

-- Process misc buffs/modifiers
doActorCharges(env, env.player)
doActorMisc(env, env.player)
Expand Down