From e0e29fa241756f45b0f0db3320206be896e7febe Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Sun, 14 Dec 2025 05:03:43 +0100 Subject: [PATCH 1/5] Remove Arcane Power talent from spell damage calculation --- Modules/Data/SpellDamage.lua | 21 +------------------ .../SpellConfigTranslations.lua | 14 ++++++------- 2 files changed, 8 insertions(+), 27 deletions(-) diff --git a/Modules/Data/SpellDamage.lua b/Modules/Data/SpellDamage.lua index 4801b5e9..3f290e9c 100755 --- a/Modules/Data/SpellDamage.lua +++ b/Modules/Data/SpellDamage.lua @@ -3,32 +3,13 @@ local Data = ECSLoader:ImportModule("Data") ---@type DataUtils local DataUtils = ECSLoader:ImportModule("DataUtils") -local _SpellDamage = {} - -local _, _, classId = UnitClass("player") - ---@param school number ---@return number function Data:GetSpellDamage(school) local spellDmg = GetSpellBonusDamage(school) - local modifier = _SpellDamage:GetGeneralTalentModifier() - spellDmg = spellDmg * (1 + (modifier / 100)) return DataUtils:Round(spellDmg, 0) end ----@return number -function _SpellDamage:GetGeneralTalentModifier() - local mod = 0 - - if classId == Data.MAGE then - local talentSlot = ECS.IsWotlk and 17 or 14 - local _, _, _, _, points, _, _, _ = GetTalentInfo(1, talentSlot) - mod = points * 1 -- 0-3% Arcane Instability - end - - return mod -end - ---@return number function Data:SpellPenetration() return DataUtils:Round(GetSpellPenetration(), 2) .. "%" @@ -49,4 +30,4 @@ end function Data:GetSpellHasteBonus() local hasteBonus = GetCombatRatingBonus(CR_HASTE_SPELL) return DataUtils:Round(hasteBonus, 2) .. "%" -end \ No newline at end of file +end diff --git a/Modules/i18n/translations/ConfigTranslations/SpellConfigTranslations.lua b/Modules/i18n/translations/ConfigTranslations/SpellConfigTranslations.lua index 9fd59d06..b21203ff 100644 --- a/Modules/i18n/translations/ConfigTranslations/SpellConfigTranslations.lua +++ b/Modules/i18n/translations/ConfigTranslations/SpellConfigTranslations.lua @@ -142,7 +142,7 @@ local spellConfigTranslations = { ["esMX"] = "Poder con hechizos", ["ptBR"] = "Poder mágico" }, - ["Shows/Hides the physical damage value."] = { + ["Shows/Hides the physical spell damage value."] = { ["enUS"] = true, ["deDE"] = "Zeigt/Versteckt den physischen Schadenswert.", ["frFR"] = "Affiche/cache les dégats physiques.", @@ -152,7 +152,7 @@ local spellConfigTranslations = { ["esMX"] = "Muestra/oculta el valor de daño físico", ["ptBR"] = "Mostra/oculta o valor do dano físico" }, - ["Shows/Hides the holy damage value."] = { + ["Shows/Hides the holy spell damage value."] = { ["enUS"] = true, ["deDE"] = "Zeigt/Versteckt den Heiligschadenswert.", ["frFR"] = "Affiche/cache les dégats du sacré.", @@ -162,7 +162,7 @@ local spellConfigTranslations = { ["esMX"] = "Muestra/oculta el valor de daño sagrado", ["ptBR"] = "Mostra/oculta o valor de dano sagrado" }, - ["Shows/Hides the arcane damage value."] = { + ["Shows/Hides the arcane spell damage value."] = { ["enUS"] = true, ["deDE"] = "Zeigt/Versteckt den Arkanschadenswert.", ["frFR"] = "Affiche/cache les dégats des arcanes.", @@ -172,7 +172,7 @@ local spellConfigTranslations = { ["esMX"] = "Muestra/oculta el valor de daño arcano", ["ptBR"] = "Mostra/oculta o valor de dano arcano" }, - ["Shows/Hides the nature damage value."] = { + ["Shows/Hides the nature spell damage value."] = { ["enUS"] = true, ["deDE"] = "Zeigt/Versteckt den Naturschadenswert.", ["frFR"] = "Affiche/cache les dégats de la nature.", @@ -182,7 +182,7 @@ local spellConfigTranslations = { ["esMX"] = "Muestra/oculta el valor de daño de la naturaleza", ["ptBR"] = "Mostra/oculta o valor de dano de natureza" }, - ["Shows/Hides the frost damage value."] = { + ["Shows/Hides the frost spell damage value."] = { ["enUS"] = true, ["deDE"] = "Zeigt/Versteckt den Frostschadenswert.", ["frFR"] = "Affiche/cache les dégats du givre.", @@ -192,7 +192,7 @@ local spellConfigTranslations = { ["esMX"] = "Muestra/oculta el valor de daño de escarcha", ["ptBR"] = "Mostra/oculta o valor de dano de gelo" }, - ["Shows/Hides the fire damage value."] = { + ["Shows/Hides the fire spell damage value."] = { ["enUS"] = true, ["deDE"] = "Zeigt/Versteckt den Feuerschadenswert.", ["frFR"] = "Affiche/cache les dégats du feu.", @@ -202,7 +202,7 @@ local spellConfigTranslations = { ["esMX"] = "Muestra/oculta el valor de daño de fuego", ["ptBR"] = "Mostra/oculta o valor de dano de fogo" }, - ["Shows/Hides the shadow damage value."] = { + ["Shows/Hides the shadow spell damage value."] = { ["enUS"] = true, ["deDE"] = "Zeigt/Versteckt den Schattenschadenswert.", ["frFR"] = "Affiche/cache les dégats des ombres.", From 9fca92b0112d2cfc8ea5ac0410a3e68f0e24f0b3 Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Mon, 22 Dec 2025 16:26:55 +0100 Subject: [PATCH 2/5] more changes --- Modules/Config/SpellSection.lua | 28 +++++++++---------- .../i18n/translations/StatTranslations.lua | 14 +++++----- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Modules/Config/SpellSection.lua b/Modules/Config/SpellSection.lua index 5f7e84e5..0f60d226 100755 --- a/Modules/Config/SpellSection.lua +++ b/Modules/Config/SpellSection.lua @@ -182,8 +182,8 @@ function _Config:LoadSpellSection() arcaneDmg = { type = "toggle", order = 2, - name = function() return i18n("Arcane Damage") end, - desc = function() return i18n("Shows/Hides the arcane damage value.") end, + name = function() return i18n("Arcane Spell Damage") end, + desc = function() return i18n("Shows/Hides the arcane spell damage value.") end, width = 1.5, disabled = function() return (not ExtendedCharacterStats.profile.spell.display); end, get = function () return ExtendedCharacterStats.profile.spellBonus.arcaneDmg.display; end, @@ -195,8 +195,8 @@ function _Config:LoadSpellSection() fireDmg = { type = "toggle", order = 3, - name = function() return i18n("Fire Damage") end, - desc = function() return i18n("Shows/Hides the fire damage value.") end, + name = function() return i18n("Fire Spell Damage") end, + desc = function() return i18n("Shows/Hides the fire spell damage value.") end, width = 1.5, disabled = function() return (not ExtendedCharacterStats.profile.spell.display); end, get = function () return ExtendedCharacterStats.profile.spellBonus.fireDmg.display; end, @@ -208,8 +208,8 @@ function _Config:LoadSpellSection() frostDmg = { type = "toggle", order = 4, - name = function() return i18n("Frost Damage") end, - desc = function() return i18n("Shows/Hides the frost damage value.") end, + name = function() return i18n("Frost Spell Damage") end, + desc = function() return i18n("Shows/Hides the frost spell damage value.") end, width = 1.5, disabled = function() return (not ExtendedCharacterStats.profile.spell.display); end, get = function () return ExtendedCharacterStats.profile.spellBonus.frostDmg.display; end, @@ -221,8 +221,8 @@ function _Config:LoadSpellSection() holyDmg = { type = "toggle", order = 5, - name = function() return i18n("Holy Damage") end, - desc = function() return i18n("Shows/Hides the holy damage value.") end, + name = function() return i18n("Holy Spell Damage") end, + desc = function() return i18n("Shows/Hides the holy spell damage value.") end, width = 1.5, disabled = function() return (not ExtendedCharacterStats.profile.spell.display); end, get = function () return ExtendedCharacterStats.profile.spellBonus.holyDmg.display; end, @@ -234,8 +234,8 @@ function _Config:LoadSpellSection() natureDmg = { type = "toggle", order = 6, - name = function() return i18n("Nature Damage") end, - desc = function() return i18n("Shows/Hides the nature damage value.") end, + name = function() return i18n("Nature Spell Damage") end, + desc = function() return i18n("Shows/Hides the nature spell damage value.") end, width = 1.5, disabled = function() return (not ExtendedCharacterStats.profile.spell.display); end, get = function () return ExtendedCharacterStats.profile.spellBonus.natureDmg.display; end, @@ -247,8 +247,8 @@ function _Config:LoadSpellSection() physicalDmg = { type = "toggle", order = 7, - name = function() return i18n("Physical Damage") end, - desc = function() return i18n("Shows/Hides the physical damage value.") end, + name = function() return i18n("Physical Spell Damage") end, + desc = function() return i18n("Shows/Hides the physical spell damage value.") end, width = 1.5, disabled = function() return (not ExtendedCharacterStats.profile.spell.display); end, get = function () return ExtendedCharacterStats.profile.spellBonus.physicalDmg.display; end, @@ -260,8 +260,8 @@ function _Config:LoadSpellSection() shadowDmg = { type = "toggle", order = 8, - name = function() return i18n("Shadow Damage") end, - desc = function() return i18n("Shows/Hides the shadow damage value.") end, + name = function() return i18n("Shadow Spell Damage") end, + desc = function() return i18n("Shows/Hides the shadow spell spell damage value.") end, width = 1.5, disabled = function() return (not ExtendedCharacterStats.profile.spell.display); end, get = function () return ExtendedCharacterStats.profile.spellBonus.shadowDmg.display; end, diff --git a/Modules/i18n/translations/StatTranslations.lua b/Modules/i18n/translations/StatTranslations.lua index 6bf9140e..47294576 100644 --- a/Modules/i18n/translations/StatTranslations.lua +++ b/Modules/i18n/translations/StatTranslations.lua @@ -462,7 +462,7 @@ local statTranslations = { ["esMX"] = "Sanación", ["ptBR"] = "Poder de cura" }, - ["Arcane Damage"] = { + ["Arcane Spell Damage"] = { ["enUS"] = true, ["deDE"] = "Arkanschaden", ["frFR"] = "Dégats des arcanes", @@ -512,7 +512,7 @@ local statTranslations = { ["esMX"] = "Fallo arcano (Niv. + 3)", ["ptBR"] = "Erro arcano (Nív. + 3)" }, - ["Fire Damage"] = { + ["Fire Spell Damage"] = { ["enUS"] = true, ["deDE"] = "Feuerschaden", ["frFR"] = "Dégats du feu", @@ -562,7 +562,7 @@ local statTranslations = { ["esMX"] = "Fallo de fuego (Niv. + 3)", ["ptBR"] = "Erro de fogo (Nív. + 3)" }, - ["Frost Damage"] = { + ["Frost Spell Damage"] = { ["enUS"] = true, ["deDE"] = "Frostschaden", ["frFR"] = "Dégats du givre", @@ -612,7 +612,7 @@ local statTranslations = { ["esMX"] = "Fallo de escarcha (Niv. + 3)", ["ptBR"] = "Erro de gelo (Nív. + 3)" }, - ["Holy Damage"] = { + ["Holy Spell Damage"] = { ["enUS"] = true, ["deDE"] = "Heiligschaden", ["frFR"] = "Dégats du sacré", @@ -662,7 +662,7 @@ local statTranslations = { ["esMX"] = "Fallo sagrado (Niv. + 3)", ["ptBR"] = "Erro sagrado (Nív. + 3)" }, - ["Nature Damage"] = { + ["Nature Spell Damage"] = { ["enUS"] = true, ["deDE"] = "Naturschaden", ["frFR"] = "Dégats de la nature", @@ -712,7 +712,7 @@ local statTranslations = { ["esMX"] = "Fallo de la naturaleza (Niv. + 3)", ["ptBR"] = "Erro de natureza (Nív. + 3)" }, - ["Physical Damage"] = { + ["Physical Spell Damage"] = { ["enUS"] = true, ["deDE"] = "Physischer Schaden", ["frFR"] = "Dégats physiques", @@ -762,7 +762,7 @@ local statTranslations = { ["esMX"] = "Fallo físico (Niv. + 3)", ["ptBR"] = "Erro físico (Nív. + 3)" }, - ["Shadow Damage"] = { + ["Shadow Spell Damage"] = { ["enUS"] = true, ["deDE"] = "Schattenschaden", ["frFR"] = "Dégats des ombres", From e61752949af064d5b357b8a5089cddb4213b609a Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Tue, 23 Dec 2025 17:53:45 +0100 Subject: [PATCH 3/5] revert --- Modules/Config/SpellSection.lua | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Modules/Config/SpellSection.lua b/Modules/Config/SpellSection.lua index 0f60d226..5f7e84e5 100755 --- a/Modules/Config/SpellSection.lua +++ b/Modules/Config/SpellSection.lua @@ -182,8 +182,8 @@ function _Config:LoadSpellSection() arcaneDmg = { type = "toggle", order = 2, - name = function() return i18n("Arcane Spell Damage") end, - desc = function() return i18n("Shows/Hides the arcane spell damage value.") end, + name = function() return i18n("Arcane Damage") end, + desc = function() return i18n("Shows/Hides the arcane damage value.") end, width = 1.5, disabled = function() return (not ExtendedCharacterStats.profile.spell.display); end, get = function () return ExtendedCharacterStats.profile.spellBonus.arcaneDmg.display; end, @@ -195,8 +195,8 @@ function _Config:LoadSpellSection() fireDmg = { type = "toggle", order = 3, - name = function() return i18n("Fire Spell Damage") end, - desc = function() return i18n("Shows/Hides the fire spell damage value.") end, + name = function() return i18n("Fire Damage") end, + desc = function() return i18n("Shows/Hides the fire damage value.") end, width = 1.5, disabled = function() return (not ExtendedCharacterStats.profile.spell.display); end, get = function () return ExtendedCharacterStats.profile.spellBonus.fireDmg.display; end, @@ -208,8 +208,8 @@ function _Config:LoadSpellSection() frostDmg = { type = "toggle", order = 4, - name = function() return i18n("Frost Spell Damage") end, - desc = function() return i18n("Shows/Hides the frost spell damage value.") end, + name = function() return i18n("Frost Damage") end, + desc = function() return i18n("Shows/Hides the frost damage value.") end, width = 1.5, disabled = function() return (not ExtendedCharacterStats.profile.spell.display); end, get = function () return ExtendedCharacterStats.profile.spellBonus.frostDmg.display; end, @@ -221,8 +221,8 @@ function _Config:LoadSpellSection() holyDmg = { type = "toggle", order = 5, - name = function() return i18n("Holy Spell Damage") end, - desc = function() return i18n("Shows/Hides the holy spell damage value.") end, + name = function() return i18n("Holy Damage") end, + desc = function() return i18n("Shows/Hides the holy damage value.") end, width = 1.5, disabled = function() return (not ExtendedCharacterStats.profile.spell.display); end, get = function () return ExtendedCharacterStats.profile.spellBonus.holyDmg.display; end, @@ -234,8 +234,8 @@ function _Config:LoadSpellSection() natureDmg = { type = "toggle", order = 6, - name = function() return i18n("Nature Spell Damage") end, - desc = function() return i18n("Shows/Hides the nature spell damage value.") end, + name = function() return i18n("Nature Damage") end, + desc = function() return i18n("Shows/Hides the nature damage value.") end, width = 1.5, disabled = function() return (not ExtendedCharacterStats.profile.spell.display); end, get = function () return ExtendedCharacterStats.profile.spellBonus.natureDmg.display; end, @@ -247,8 +247,8 @@ function _Config:LoadSpellSection() physicalDmg = { type = "toggle", order = 7, - name = function() return i18n("Physical Spell Damage") end, - desc = function() return i18n("Shows/Hides the physical spell damage value.") end, + name = function() return i18n("Physical Damage") end, + desc = function() return i18n("Shows/Hides the physical damage value.") end, width = 1.5, disabled = function() return (not ExtendedCharacterStats.profile.spell.display); end, get = function () return ExtendedCharacterStats.profile.spellBonus.physicalDmg.display; end, @@ -260,8 +260,8 @@ function _Config:LoadSpellSection() shadowDmg = { type = "toggle", order = 8, - name = function() return i18n("Shadow Spell Damage") end, - desc = function() return i18n("Shows/Hides the shadow spell spell damage value.") end, + name = function() return i18n("Shadow Damage") end, + desc = function() return i18n("Shows/Hides the shadow damage value.") end, width = 1.5, disabled = function() return (not ExtendedCharacterStats.profile.spell.display); end, get = function () return ExtendedCharacterStats.profile.spellBonus.shadowDmg.display; end, From 6266dd92f9d7d6a54766eb4d2b6c31b0456a70bd Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Tue, 23 Dec 2025 17:54:39 +0100 Subject: [PATCH 4/5] revert --- .../ConfigTranslations/SpellConfigTranslations.lua | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Modules/i18n/translations/ConfigTranslations/SpellConfigTranslations.lua b/Modules/i18n/translations/ConfigTranslations/SpellConfigTranslations.lua index b21203ff..9fd59d06 100644 --- a/Modules/i18n/translations/ConfigTranslations/SpellConfigTranslations.lua +++ b/Modules/i18n/translations/ConfigTranslations/SpellConfigTranslations.lua @@ -142,7 +142,7 @@ local spellConfigTranslations = { ["esMX"] = "Poder con hechizos", ["ptBR"] = "Poder mágico" }, - ["Shows/Hides the physical spell damage value."] = { + ["Shows/Hides the physical damage value."] = { ["enUS"] = true, ["deDE"] = "Zeigt/Versteckt den physischen Schadenswert.", ["frFR"] = "Affiche/cache les dégats physiques.", @@ -152,7 +152,7 @@ local spellConfigTranslations = { ["esMX"] = "Muestra/oculta el valor de daño físico", ["ptBR"] = "Mostra/oculta o valor do dano físico" }, - ["Shows/Hides the holy spell damage value."] = { + ["Shows/Hides the holy damage value."] = { ["enUS"] = true, ["deDE"] = "Zeigt/Versteckt den Heiligschadenswert.", ["frFR"] = "Affiche/cache les dégats du sacré.", @@ -162,7 +162,7 @@ local spellConfigTranslations = { ["esMX"] = "Muestra/oculta el valor de daño sagrado", ["ptBR"] = "Mostra/oculta o valor de dano sagrado" }, - ["Shows/Hides the arcane spell damage value."] = { + ["Shows/Hides the arcane damage value."] = { ["enUS"] = true, ["deDE"] = "Zeigt/Versteckt den Arkanschadenswert.", ["frFR"] = "Affiche/cache les dégats des arcanes.", @@ -172,7 +172,7 @@ local spellConfigTranslations = { ["esMX"] = "Muestra/oculta el valor de daño arcano", ["ptBR"] = "Mostra/oculta o valor de dano arcano" }, - ["Shows/Hides the nature spell damage value."] = { + ["Shows/Hides the nature damage value."] = { ["enUS"] = true, ["deDE"] = "Zeigt/Versteckt den Naturschadenswert.", ["frFR"] = "Affiche/cache les dégats de la nature.", @@ -182,7 +182,7 @@ local spellConfigTranslations = { ["esMX"] = "Muestra/oculta el valor de daño de la naturaleza", ["ptBR"] = "Mostra/oculta o valor de dano de natureza" }, - ["Shows/Hides the frost spell damage value."] = { + ["Shows/Hides the frost damage value."] = { ["enUS"] = true, ["deDE"] = "Zeigt/Versteckt den Frostschadenswert.", ["frFR"] = "Affiche/cache les dégats du givre.", @@ -192,7 +192,7 @@ local spellConfigTranslations = { ["esMX"] = "Muestra/oculta el valor de daño de escarcha", ["ptBR"] = "Mostra/oculta o valor de dano de gelo" }, - ["Shows/Hides the fire spell damage value."] = { + ["Shows/Hides the fire damage value."] = { ["enUS"] = true, ["deDE"] = "Zeigt/Versteckt den Feuerschadenswert.", ["frFR"] = "Affiche/cache les dégats du feu.", @@ -202,7 +202,7 @@ local spellConfigTranslations = { ["esMX"] = "Muestra/oculta el valor de daño de fuego", ["ptBR"] = "Mostra/oculta o valor de dano de fogo" }, - ["Shows/Hides the shadow spell damage value."] = { + ["Shows/Hides the shadow damage value."] = { ["enUS"] = true, ["deDE"] = "Zeigt/Versteckt den Schattenschadenswert.", ["frFR"] = "Affiche/cache les dégats des ombres.", From 242edf65bea831086cf8ec5c89215129d6beb3a6 Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Tue, 23 Dec 2025 17:55:12 +0100 Subject: [PATCH 5/5] revert --- Modules/i18n/translations/StatTranslations.lua | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Modules/i18n/translations/StatTranslations.lua b/Modules/i18n/translations/StatTranslations.lua index 47294576..6bf9140e 100644 --- a/Modules/i18n/translations/StatTranslations.lua +++ b/Modules/i18n/translations/StatTranslations.lua @@ -462,7 +462,7 @@ local statTranslations = { ["esMX"] = "Sanación", ["ptBR"] = "Poder de cura" }, - ["Arcane Spell Damage"] = { + ["Arcane Damage"] = { ["enUS"] = true, ["deDE"] = "Arkanschaden", ["frFR"] = "Dégats des arcanes", @@ -512,7 +512,7 @@ local statTranslations = { ["esMX"] = "Fallo arcano (Niv. + 3)", ["ptBR"] = "Erro arcano (Nív. + 3)" }, - ["Fire Spell Damage"] = { + ["Fire Damage"] = { ["enUS"] = true, ["deDE"] = "Feuerschaden", ["frFR"] = "Dégats du feu", @@ -562,7 +562,7 @@ local statTranslations = { ["esMX"] = "Fallo de fuego (Niv. + 3)", ["ptBR"] = "Erro de fogo (Nív. + 3)" }, - ["Frost Spell Damage"] = { + ["Frost Damage"] = { ["enUS"] = true, ["deDE"] = "Frostschaden", ["frFR"] = "Dégats du givre", @@ -612,7 +612,7 @@ local statTranslations = { ["esMX"] = "Fallo de escarcha (Niv. + 3)", ["ptBR"] = "Erro de gelo (Nív. + 3)" }, - ["Holy Spell Damage"] = { + ["Holy Damage"] = { ["enUS"] = true, ["deDE"] = "Heiligschaden", ["frFR"] = "Dégats du sacré", @@ -662,7 +662,7 @@ local statTranslations = { ["esMX"] = "Fallo sagrado (Niv. + 3)", ["ptBR"] = "Erro sagrado (Nív. + 3)" }, - ["Nature Spell Damage"] = { + ["Nature Damage"] = { ["enUS"] = true, ["deDE"] = "Naturschaden", ["frFR"] = "Dégats de la nature", @@ -712,7 +712,7 @@ local statTranslations = { ["esMX"] = "Fallo de la naturaleza (Niv. + 3)", ["ptBR"] = "Erro de natureza (Nív. + 3)" }, - ["Physical Spell Damage"] = { + ["Physical Damage"] = { ["enUS"] = true, ["deDE"] = "Physischer Schaden", ["frFR"] = "Dégats physiques", @@ -762,7 +762,7 @@ local statTranslations = { ["esMX"] = "Fallo físico (Niv. + 3)", ["ptBR"] = "Erro físico (Nív. + 3)" }, - ["Shadow Spell Damage"] = { + ["Shadow Damage"] = { ["enUS"] = true, ["deDE"] = "Schattenschaden", ["frFR"] = "Dégats des ombres",