Skip to content

fix double counting of spell crit talents #442

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

Draft
Alessandro-Barbieri wants to merge 4 commits into
base: master
Choose a base branch
from
+13 −19
Draft

fix double counting of spell crit talents #442

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
df3dfc3
fix double counting of spell crit talents
Alessandro-Barbieri Apr 20, 2026
923a208
fix arcane instability
Alessandro-Barbieri Apr 21, 2026
887e3ed
Remove 'Devastation' talent from SpellCrit calculation
Alessandro-Barbieri Apr 21, 2026
d3c3138
Merge branch 'BreakBB:master' into spellcrit
Alessandro-Barbieri Apr 24, 2026
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
32 changes: 13 additions & 19 deletions Modules/Data/SpellCrit.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ function _SpellCrit:GetGeneralTalentModifier()
local mod = 0

if classId == Data.MAGE then
if not ECS.IsClassic then
if ECS.IsClassic then
mod = mod + 1 * DataUtils:GetActiveTalentSpell({15058,15059,15060}) -- Arcane Instability
end
elseif classId == Data.DRUID then
Expand All @@ -66,8 +66,6 @@ function _SpellCrit:GetGeneralTalentModifier()
mod = mod + 2 * DataUtils:GetActiveTalentSpell({30242,30245,30246,30247,30248}) -- Demonic Tactics
mod = mod + 1 * DataUtils:GetActiveTalentSpell({34935,34938,34939}) -- Backlash
end

mod = mod + 1 * DataUtils:GetActiveTalentSpell({18130,18131,18132,18133,18134}) -- Devastation
elseif classId == Data.SHAMAN then
if ECS.IsWotlk then
mod = mod + 1 * DataUtils:GetActiveTalentSpell({16255,16302,16303,16304,16305}) -- Thundering Strikes
Expand Down Expand Up @@ -97,29 +95,25 @@ end
---@return number
function _SpellCrit:GetTalentModifierHolyCrit()
local mod = 0

if classId == Data.PRIEST then
-- Holy Specialization
mod = 1 * DataUtils:GetActiveTalentSpell({14889,15008,15009,15010,15011})
elseif classId == Data.PALADIN then
-- Holy Power
mod = 1 * DataUtils:GetActiveTalentSpell({5923,5924,5925,5926,25829})
if ECS.IsClassic then
if classId == Data.PRIEST then
-- Holy Specialization
mod = 1 * DataUtils:GetActiveTalentSpell({14889,15008,15009,15010,15011})
elseif classId == Data.PALADIN then
-- Holy Power
mod = 1 * DataUtils:GetActiveTalentSpell({5923,5924,5925,5926,25829})
end
end
return mod
end

---@return number
function _SpellCrit:GetTalentModifierFireCrit()
local mod = 0

if classId == Data.MAGE then
mod = mod + 2 * DataUtils:GetActiveTalentSpell({11115,11367,11368}) -- Critical Mass

if ECS.IsWotlk then
mod = mod + 1 * DataUtils:GetActiveTalentSpell({34293,34295,34296}) -- Pyromaniac
end
elseif classId == Data.WARLOCK then
if ECS.IsClassic then
if ECS.IsClassic then
if classId == Data.MAGE then
mod = mod + 2 * DataUtils:GetActiveTalentSpell({11115,11367,11368}) -- Critical Mass
elseif classId == Data.WARLOCK then
-- Devastation (while this increases the crit chance of "Destruction spells" there are no fire spells, which are not destruction spells)
mod = mod + 1 * DataUtils:GetActiveTalentSpell({18130,18131,18132,18133,18134})
end
Expand Down
Loading