Skip to content

simplify Is* checks #404

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
Alessandro-Barbieri wants to merge 10 commits into
base: master
Choose a base branch
from
Open

simplify Is* checks #404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1b384c5
simplify Is* checks
Alessandro-Barbieri Jan 23, 2026
d758410
more changes
Alessandro-Barbieri Jan 24, 2026
aea329d
simplify more things
Alessandro-Barbieri Jan 24, 2026
5e7c1a8
Merge branch 'master' into checks
Alessandro-Barbieri Jan 25, 2026
4169c7c
Merge branch 'master' into checks
Alessandro-Barbieri Jan 26, 2026
0d1d4ea
fix
Alessandro-Barbieri Jan 26, 2026
533cee4
fixes for tbc
Alessandro-Barbieri Jan 26, 2026
3af1fab
reorder
Alessandro-Barbieri Jan 26, 2026
91211e6
restore deleted part
Alessandro-Barbieri Jan 28, 2026
885c41b
Merge branch 'BreakBB:master' into checks
Alessandro-Barbieri Jan 29, 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
8 changes: 2 additions & 6 deletions Modules/Config/DefenseSection.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,7 @@ function _Config:LoadDefenseSection()
name = function() return i18n("Defense Rating") end,
desc = function() return i18n("Shows/Hides the defense rating.") end,
width = 1.5,
hidden = function()
return (not ECS.IsWotlk)
end,
hidden = function() return ECS.IsClassic end,
disabled = function() return (not ExtendedCharacterStats.profile.defense.display); end,
get = function () return ExtendedCharacterStats.profile.defense.defenseRating.display; end,
set = function (_, value)
Expand Down Expand Up @@ -192,9 +190,7 @@ function _Config:LoadDefenseSection()
name = function() return i18n("Resilience") end,
desc = function() return i18n("Shows/Hides the resilience value.") end,
width = 1.5,
hidden = function()
return (not ECS.IsWotlk)
end,
hidden = function() return ECS.IsClassic end,
disabled = function() return (not ExtendedCharacterStats.profile.defense.display); end,
get = function () return ExtendedCharacterStats.profile.defense.resilience.display; end,
set = function (_, value)
Expand Down
36 changes: 9 additions & 27 deletions Modules/Config/MeleeSection.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,7 @@ function _Config:LoadMeleeSection()
name = function() return i18n("Armor Pen.") end,
desc = function() return i18n("Shows/Hides the armor penetration value.") end,
width = 1.5,
hidden = function()
return (not ECS.IsWotlk)
end,
hidden = function() return ECS.IsClassic end,
Copy link
Owner

@BreakBB BreakBB Jan 29, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think all of these ECS.IsClassic checks should now be ECS.IsEra because we want to see them in SoD.

Copy link
Contributor Author

@Alessandro-Barbieri Alessandro-Barbieri Jan 29, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll do that in a different pr

Copy link
Contributor Author

@Alessandro-Barbieri Alessandro-Barbieri Feb 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Armor penetration is on hold until I get some actual item with arpen to test with

disabled = function() return (not ExtendedCharacterStats.profile.melee.display); end,
get = function () return ExtendedCharacterStats.profile.melee.penetration.display; end,
set = function (_, value)
Expand All @@ -75,9 +73,7 @@ function _Config:LoadMeleeSection()
name = function() return i18n("Armor Pen. Rating") end,
desc = function() return i18n("Shows/Hides the armor penetration rating value.") end,
width = 1.5,
hidden = function()
return (not ECS.IsWotlk)
end,
hidden = function() return not ECS.IsWotlk end,
disabled = function() return (not ExtendedCharacterStats.profile.melee.display); end,
get = function () return ExtendedCharacterStats.profile.melee.penetrationRating.display; end,
set = function (_, value)
Expand All @@ -91,9 +87,7 @@ function _Config:LoadMeleeSection()
name = function() return i18n("Expertise") end,
desc = function() return i18n("Shows/Hides the expertise value.") end,
width = 1.5,
hidden = function()
return (not ECS.IsWotlk)
end,
hidden = function() return ECS.IsClassic end,
disabled = function() return (not ExtendedCharacterStats.profile.melee.display); end,
get = function () return ExtendedCharacterStats.profile.melee.expertise.display; end,
set = function (_, value)
Expand All @@ -107,9 +101,7 @@ function _Config:LoadMeleeSection()
name = function() return i18n("Expertise Rating") end,
desc = function() return i18n("Shows/Hides the expertise rating.") end,
width = 1.5,
hidden = function()
return (not ECS.IsWotlk)
end,
hidden = function() return ECS.IsClassic end,
disabled = function() return (not ExtendedCharacterStats.profile.melee.display); end,
get = function () return ExtendedCharacterStats.profile.melee.expertiseRating.display; end,
set = function (_, value)
Expand All @@ -123,9 +115,7 @@ function _Config:LoadMeleeSection()
name = function() return i18n("Haste Rating") end,
desc = function() return i18n("Shows/Hides the melee haste rating.") end,
width = 1.5,
hidden = function()
return (not ECS.IsWotlk)
end,
hidden = function() return ECS.IsClassic end,
disabled = function() return (not ExtendedCharacterStats.profile.melee.display); end,
get = function () return ExtendedCharacterStats.profile.melee.hasteRating.display; end,
set = function (_, value)
Expand All @@ -139,9 +129,7 @@ function _Config:LoadMeleeSection()
name = function() return i18n("Haste Bonus") end,
desc = function() return i18n("Shows/Hides the melee haste bonus value.") end,
width = 1.5,
hidden = function()
return (not ECS.IsWotlk)
end,
hidden = function() return ECS.IsClassic end,
disabled = function() return (not ExtendedCharacterStats.profile.melee.display); end,
get = function () return ExtendedCharacterStats.profile.melee.hasteBonus.display; end,
set = function (_, value)
Expand Down Expand Up @@ -174,9 +162,7 @@ function _Config:LoadMeleeSection()
name = function() return i18n("Hit Rating") end,
desc = function() return i18n("Shows/Hides the melee hit rating.") end,
width = 1.5,
hidden = function()
return (not ECS.IsWotlk)
end,
hidden = function() return ECS.IsClassic end,
disabled = function()
return ((not ExtendedCharacterStats.profile.melee.display) or
(not ExtendedCharacterStats.profile.melee.hit.display))
Expand Down Expand Up @@ -243,9 +229,7 @@ function _Config:LoadMeleeSection()
name = function() return i18n("Glancing Blow") end,
desc = function() return i18n("Shows/Hides all glancing blow stats") end,
width = 1.5,
hidden = function()
return (not ECS.IsClassic)
end,
hidden = function() return ECS.IsWotlk end,
disabled = function() return (not ExtendedCharacterStats.profile.melee.display); end,
get = function () return ExtendedCharacterStats.profile.melee.glance.display; end,
set = function (_, value)
Expand All @@ -258,9 +242,7 @@ function _Config:LoadMeleeSection()
order = 6,
inline = true,
name = function() return i18n("Melee Glance Values") end,
hidden = function()
return (not ECS.IsClassic)
end,
hidden = function() return ECS.IsWotlk end,
args = {
meleeGlance = {
type = "toggle",
Expand Down
16 changes: 4 additions & 12 deletions Modules/Config/RangeSection.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,7 @@ function _Config:LoadRangeSection()
name = function() return i18n("Armor Pen. Rating") end,
desc = function() return i18n("Shows/Hides the armor penetration rating value.") end,
width = 1.5,
hidden = function()
return (not ECS.IsWotlk)
end,
hidden = function() return not ECS.IsWotlk end,
disabled = function() return (not ExtendedCharacterStats.profile.ranged.display); end,
get = function () return ExtendedCharacterStats.profile.ranged.penetrationRating.display; end,
set = function (_, value)
Expand All @@ -91,9 +89,7 @@ function _Config:LoadRangeSection()
name = function() return i18n("Haste Rating") end,
desc = function() return i18n("Shows/Hides the ranged haste rating.") end,
width = 1.5,
hidden = function()
return (not ECS.IsWotlk)
end,
hidden = function() return ECS.IsClassic end,
disabled = function() return (not ExtendedCharacterStats.profile.ranged.display); end,
get = function () return ExtendedCharacterStats.profile.ranged.hasteRating.display; end,
set = function (_, value)
Expand All @@ -107,9 +103,7 @@ function _Config:LoadRangeSection()
name = function() return i18n("Haste Bonus") end,
desc = function() return i18n("Shows/Hides the ranged haste bonus value.") end,
width = 1.5,
hidden = function()
return (not ECS.IsWotlk)
end,
hidden = function() return ECS.IsClassic end,
disabled = function() return (not ExtendedCharacterStats.profile.ranged.display); end,
get = function () return ExtendedCharacterStats.profile.ranged.hasteBonus.display; end,
set = function (_, value)
Expand Down Expand Up @@ -155,9 +149,7 @@ function _Config:LoadRangeSection()
name = function() return i18n("Hit Rating") end,
desc = function() return i18n("Shows/Hides the ranged hit rating.") end,
width = 1.5,
hidden = function()
return (not ECS.IsWotlk)
end,
hidden = function() return ECS.IsClassic end,
disabled = function()
return ((not ExtendedCharacterStats.profile.ranged.display) or
(not ExtendedCharacterStats.profile.ranged.hit.display))
Expand Down
12 changes: 3 additions & 9 deletions Modules/Config/SpellSection.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,7 @@ function _Config:LoadSpellSection()
name = function() return i18n("Haste Rating") end,
desc = function() return i18n("Shows/Hides the spell haste rating value.") end,
width = 1.5,
hidden = function()
return (not ECS.IsWotlk)
end,
hidden = function() return ECS.IsClassic end,
disabled = function() return (not ExtendedCharacterStats.profile.spell.display); end,
get = function () return ExtendedCharacterStats.profile.spell.hasteRating.display; end,
set = function (_, value)
Expand All @@ -62,9 +60,7 @@ function _Config:LoadSpellSection()
name = function() return i18n("Haste Bonus") end,
desc = function() return i18n("Shows/Hides the spell haste bonus value.") end,
width = 1.5,
hidden = function()
return (not ECS.IsWotlk)
end,
hidden = function() return ECS.IsClassic end,
disabled = function() return (not ExtendedCharacterStats.profile.spell.display); end,
get = function () return ExtendedCharacterStats.profile.spell.hasteBonus.display; end,
set = function (_, value)
Expand Down Expand Up @@ -97,9 +93,7 @@ function _Config:LoadSpellSection()
name = function() return i18n("Hit Rating") end,
desc = function() return i18n("Shows/Hides the spell hit rating.") end,
width = 1.5,
hidden = function()
return (not ECS.IsWotlk)
end,
hidden = function() return ECS.IsClassic end,
disabled = function()
return ((not ExtendedCharacterStats.profile.spell.display) or
(not ExtendedCharacterStats.profile.spell.hit.display))
Expand Down
40 changes: 20 additions & 20 deletions Modules/Data/Constants.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,15 +222,15 @@ Data.Aura = {
[10491] = (ECS.IsWotlk and 5/2 or nil), -- Mana Spring rank 2
[10493] = (ECS.IsWotlk and 5/2 or nil), -- Mana Spring rank 3
[10494] = (ECS.IsWotlk and 5/2 or nil), -- Mana Spring rank 4
[19742] = ((ECS.IsTBC or ECS.IsWotlk) and 1 or nil), -- Blessing of Wisdom rank 1
[19850] = ((ECS.IsTBC or ECS.IsWotlk) and 1 or nil), -- Blessing of Wisdom rank 2
[19852] = ((ECS.IsTBC or ECS.IsWotlk) and 1 or nil), -- Blessing of Wisdom rank 3
[19853] = ((ECS.IsTBC or ECS.IsWotlk) and 1 or nil), -- Blessing of Wisdom rank 4
[19854] = ((ECS.IsTBC or ECS.IsWotlk) and 1 or nil), -- Blessing of Wisdom rank 5
[25290] = ((ECS.IsTBC or ECS.IsWotlk) and 1 or nil), -- Blessing of Wisdom rank 6
[19742] = (ECS.IsClassic and nil or 1), -- Blessing of Wisdom rank 1
[19850] = (ECS.IsClassic and nil or 1), -- Blessing of Wisdom rank 2
[19852] = (ECS.IsClassic and nil or 1), -- Blessing of Wisdom rank 3
[19853] = (ECS.IsClassic and nil or 1), -- Blessing of Wisdom rank 4
[19854] = (ECS.IsClassic and nil or 1), -- Blessing of Wisdom rank 5
[25290] = (ECS.IsClassic and nil or 1), -- Blessing of Wisdom rank 6
[25569] = (ECS.IsWotlk and 5/2 or nil), -- Mana Spring rank 5
[25894] = ((ECS.IsTBC or ECS.IsWotlk) and 1 or nil), -- Greater Blessing of Wisdom rank 1
[25918] = ((ECS.IsTBC or ECS.IsWotlk) and 1 or nil), -- Greater Blessing of Wisdom rank 2
[25894] = (ECS.IsClassic and nil or 1), -- Greater Blessing of Wisdom rank 1
[25918] = (ECS.IsClassic and nil or 1), -- Greater Blessing of Wisdom rank 2
[27142] = 1, -- Blessing of Wisdom rank 7
[27143] = 1, -- Greater Blessing of Wisdom rank 3
[48935] = 1, -- Blessing of Wisdom rank 8
Expand All @@ -243,12 +243,12 @@ Data.Aura = {
[58777] = 5/2, -- Mana Spring rank 8
},
PercentageMp5 = {
[12051] = ((ECS.IsTBC or ECS.IsWotlk) and 0.15/2*5 or nil), -- Evocation
[18792] = ((ECS.IsTBC or ECS.IsWotlk) and 0.03/4 or 0.02/4)*5, -- Fel Energy
[12051] = (ECS.IsClassic and nil or 0.15/2*5), -- Evocation
[18792] = (ECS.IsClassic and 0.02/4 or 0.03/4)*5, -- Fel Energy
[24355] = 0.02*5, -- Drink
[24707] = 0.03*5, -- Food
[25990] = 0.05*5, -- Graccu's Mince Meat Fruitcake
[26263] = ((ECS.IsTBC or ECS.IsWotlk) and 0.03 or 0.04)*5, -- Dim Sum
[26263] = (ECS.IsClassic and 0.04 or 0.03)*5, -- Dim Sum
[29055] = 0.04*5, -- Refreshing Red Apple
[30024] = 0.2*5, -- Drink
[30254] = 0.05*5, -- Evocation
Expand Down Expand Up @@ -325,19 +325,19 @@ Data.Aura = {
[10491] = (ECS.IsWotlk and nil or 5/2), -- Mana Spring rank 2
[10493] = (ECS.IsWotlk and nil or 5/2), -- Mana Spring rank 3
[10494] = (ECS.IsWotlk and nil or 5/2), -- Mana Spring rank 4
[19742] = ((ECS.IsTBC or ECS.IsWotlk) and nil or 1), -- Blessing of Wisdom rank 1
[19850] = ((ECS.IsTBC or ECS.IsWotlk) and nil or 1), -- Blessing of Wisdom rank 2
[19852] = ((ECS.IsTBC or ECS.IsWotlk) and nil or 1), -- Blessing of Wisdom rank 3
[19853] = ((ECS.IsTBC or ECS.IsWotlk) and nil or 1), -- Blessing of Wisdom rank 4
[19854] = ((ECS.IsTBC or ECS.IsWotlk) and nil or 1), -- Blessing of Wisdom rank 5
[19742] = (ECS.IsClassic and 1 or nil), -- Blessing of Wisdom rank 1
[19850] = (ECS.IsClassic and 1 or nil), -- Blessing of Wisdom rank 2
[19852] = (ECS.IsClassic and 1 or nil), -- Blessing of Wisdom rank 3
[19853] = (ECS.IsClassic and 1 or nil), -- Blessing of Wisdom rank 4
[19854] = (ECS.IsClassic and 1 or nil), -- Blessing of Wisdom rank 5
[24853] = 5/2, -- Mana Spring
[25290] = ((ECS.IsTBC or ECS.IsWotlk) and nil or 1), -- Blessing of Wisdom rank 6
[25290] = (ECS.IsClassic and 1 or nil), -- Blessing of Wisdom rank 6
[25569] = (ECS.IsWotlk and nil or 5/2), -- Mana Spring rank 5
[25894] = ((ECS.IsTBC or ECS.IsWotlk) and nil or 1), -- Greater Blessing of Wisdom rank 1
[25918] = ((ECS.IsTBC or ECS.IsWotlk) and nil or 1), -- Greater Blessing of Wisdom rank 2
[25894] = (ECS.IsClassic and 1 or nil), -- Greater Blessing of Wisdom rank 1
[25918] = (ECS.IsClassic and 1 or nil), -- Greater Blessing of Wisdom rank 2
},
SpellCrit = {
[24907] = ((ECS.IsTBC or ECS.IsWotlk) and 5 or nil), -- Moonkin Aura
[24907] = (ECS.IsClassic and nil or 5), -- Moonkin Aura
[29177] = 6, -- Elemental Devastation Rank 2
[29178] = 9, -- Elemental Devastation Rank 3
[30165] = 3, -- Elemental Devastation Rank 1
Expand Down
Loading
Loading