diff --git a/RatingBuster.lua b/RatingBuster.lua
index 2458ceb..dc4f3d5 100644
--- a/RatingBuster.lua
+++ b/RatingBuster.lua
@@ -2721,6 +2721,11 @@ do
 				local effect = value * statModContext("ADD_AP_MOD_ARMOR") * statModContext("MOD_AP")
 				infoTable[StatLogic.Stats.AttackPower] = infoTable[StatLogic.Stats.AttackPower] + effect
 			end
+		elseif statID == StatLogic.Stats.GenericAttackPower then
+			local attackPower = value * statModContext("ADD_AP_MOD_GENERIC_ATTACK_POWER")
+			self:ProcessStat(StatLogic.Stats.AttackPower, attackPower, infoTable, link, color, statModContext, true)
+			local rangedAttackPower = value * statModContext("ADD_RANGED_AP_MOD_GENERIC_ATTACK_POWER")
+			self:ProcessStat(StatLogic.Stats.RangedAttackPower, rangedAttackPower, infoTable, link, color, statModContext, true)
 		elseif statID == StatLogic.Stats.AttackPower then
 			local mod = statModContext("MOD_AP")
 			value = value * mod
@@ -3109,6 +3114,7 @@ local summaryCalcData = {
 		func = function(sum, statModContext)
 			return statModContext("MOD_RANGED_AP") * (
 				sum[StatLogic.Stats.RangedAttackPower]
+				+ sum[StatLogic.Stats.GenericAttackPower] * statModContext("ADD_RANGED_AP_MOD_GENERIC_ATTACK_POWER")
 				+ sum[StatLogic.Stats.Agility] * statModContext("ADD_RANGED_AP_MOD_AGI")
 				+ sum[StatLogic.Stats.Intellect] * statModContext("ADD_RANGED_AP_MOD_INT")
 				+ sum[StatLogic.Stats.Stamina] * statModContext("ADD_AP_MOD_STA")
diff --git a/libs/StatLogic/locales/deDE.lua b/libs/StatLogic/locales/deDE.lua
index ce390e6..379a109 100644
--- a/libs/StatLogic/locales/deDE.lua
+++ b/libs/StatLogic/locales/deDE.lua
@@ -104,7 +104,7 @@ L["%s zaubermacht und %s ausdauer"] = {{StatLogic.Stats.SpellDamage, StatLogic.S
 L["%s zaubermacht und alle %s sek. %s mana"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, StatLogic.Stats.ManaRegen, }
 L["%s beweglichkeit und %s ausdauer"] = {StatLogic.Stats.Agility, StatLogic.Stats.Stamina, }
 L["%s stärke und %s ausdauer"] = {StatLogic.Stats.Strength, StatLogic.Stats.Stamina, }
-L["%s angriffskraft"] = {StatLogic.Stats.AttackPower, }
+L["%s angriffskraft"] = {StatLogic.Stats.GenericAttackPower, }
 L["%s ausweichwertung"] = {StatLogic.Stats.DodgeRating, }
 L["%s kritische trefferwertung und %s stärke"] = {StatLogic.Stats.Strength, StatLogic.Stats.CritRating, }
 L["%s parierwertung"] = {StatLogic.Stats.ParryRating, }
@@ -114,7 +114,7 @@ L["%s abhärtungswertung"] = {StatLogic.Stats.ResilienceRating, }
 L["%s kritische trefferwertung und %s zaubermacht"] = {StatLogic.Stats.CritRating, {StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, }
 L["%s kritische trefferwertung und %s zauberdurchschlagskraft"] = {StatLogic.Stats.CritRating, false, }
 L["%s kritische trefferwertung und %s% zauberreflexion"] = {StatLogic.Stats.CritRating, false, }
-L["%s angriffskraft und geringe bewegungstempoerhöhung"] = {StatLogic.Stats.AttackPower, }
+L["%s angriffskraft und geringe bewegungstempoerhöhung"] = {StatLogic.Stats.GenericAttackPower, }
 L["%s kritische trefferwertung und um %s% verringerte dauer von bewegungseinschränkung"] = {StatLogic.Stats.CritRating, false, }
 L["%s ausdauer und betäubungsdauer um %s% verringert"] = {StatLogic.Stats.Stamina, false, }
 L["%s zaubermacht und um %s% verringerte bedrohung"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
@@ -124,10 +124,10 @@ L["%s ausdauer, %s kritische trefferwertung"] = {StatLogic.Stats.Stamina, StatLo
 L["%s stärke, %s kritische trefferwertung"] = {StatLogic.Stats.Strength, StatLogic.Stats.CritRating, }
 L["%s zaubermacht und %s kritische trefferwertung"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, StatLogic.Stats.CritRating, }
 L["%s ausdauer und %s kritische trefferwertung"] = {StatLogic.Stats.CritRating, StatLogic.Stats.Stamina, }
-L["%s angriffskraft, %s kritische trefferwertung"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.CritRating, }
+L["%s angriffskraft, %s kritische trefferwertung"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.CritRating, }
 L["%s zaubermacht und geringe bewegungstempoerhöhung"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, }
 L["%s kritische trefferwertung und alle %s sek. %s mana"] = {StatLogic.Stats.CritRating, false, StatLogic.Stats.ManaRegen, }
-L["%s angriffskraft und %s trefferwertung"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.HitRating, }
+L["%s angriffskraft und %s trefferwertung"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.HitRating, }
 L["%s verteidigungswertung und %s ausweichwertung"] = {StatLogic.Stats.DefenseRating, StatLogic.Stats.DodgeRating, }
 L["%s beweglichkeit und %s trefferwertung"] = {StatLogic.Stats.Agility, StatLogic.Stats.HitRating, }
 L["%s parierwertung und %s verteidigungswertung"] = {StatLogic.Stats.ParryRating, StatLogic.Stats.DefenseRating, }
@@ -137,17 +137,17 @@ L["%s kritische trefferwertung und %s ausweichwertung"] = {StatLogic.Stats.CritR
 L["%s parierwertung und %s ausdauer"] = {StatLogic.Stats.ParryRating, StatLogic.Stats.Stamina, }
 L["%s willenskraft und %s zaubermacht"] = {StatLogic.Stats.Spirit, {StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, }
 L["%s zaubermacht und %s zauberdurchschlagskraft"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
-L["%s angriffskraft und %s ausdauer"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.Stamina, }
+L["%s angriffskraft und %s ausdauer"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.Stamina, }
 L["%s ausweichwertung und %s trefferwertung"] = {StatLogic.Stats.DodgeRating, StatLogic.Stats.HitRating, }
 L["%s zaubermacht und %s abhärtungswertung"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, StatLogic.Stats.ResilienceRating, }
-L["%s angriffskraft und %s kritische trefferwertung"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.CritRating, }
+L["%s angriffskraft und %s kritische trefferwertung"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.CritRating, }
 L["%s intelligenz und %s ausdauer"] = {StatLogic.Stats.Intellect, StatLogic.Stats.Stamina, }
 L["%s stärke und %s kritische trefferwertung"] = {StatLogic.Stats.Strength, StatLogic.Stats.CritRating, }
 L["%s beweglichkeit und %s verteidigungswertung"] = {StatLogic.Stats.Agility, StatLogic.Stats.DefenseRating, }
 L["%s intelligenz und %s willenskraft"] = {StatLogic.Stats.Intellect, StatLogic.Stats.Spirit, }
 L["%s stärke und %s verteidigungswertung"] = {StatLogic.Stats.Strength, StatLogic.Stats.DefenseRating, }
 L["%s ausdauer und %s verteidigungswertung"] = {StatLogic.Stats.Stamina, StatLogic.Stats.DefenseRating, }
-L["%s angriffskraft und %s abhärtungswertung"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.ResilienceRating, }
+L["%s angriffskraft und %s abhärtungswertung"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.ResilienceRating, }
 L["%s ausdauer und %s abhärtungswertung"] = {StatLogic.Stats.Stamina, StatLogic.Stats.ResilienceRating, }
 L["%s verteidigungswertung und alle %s sek. %s mana"] = {StatLogic.Stats.DefenseRating, false, StatLogic.Stats.ManaRegen, }
 L["%s zaubermacht und %s willenskraft"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, StatLogic.Stats.Spirit, }
@@ -156,11 +156,11 @@ L["%s stärke und %s abhärtungswertung"] = {StatLogic.Stats.Strength, StatLogic
 L["%s trefferwertung und %s ausdauer"] = {StatLogic.Stats.HitRating, StatLogic.Stats.Stamina, }
 L["%s trefferwertung und alle %s sek. %s mana"] = {StatLogic.Stats.HitRating, false, StatLogic.Stats.ManaRegen, }
 L["%s parierwertung und %s abhärtungswertung"] = {StatLogic.Stats.ParryRating, StatLogic.Stats.ResilienceRating, }
-L["%s angriffskraft und alle %s sek. %s mana"] = {StatLogic.Stats.AttackPower, false, StatLogic.Stats.ManaRegen, }
+L["%s angriffskraft und alle %s sek. %s mana"] = {StatLogic.Stats.GenericAttackPower, false, StatLogic.Stats.ManaRegen, }
 L["%s trefferwertung und %s zaubermacht"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, StatLogic.Stats.HitRating, }
-L["%s kritische trefferwertung und %s angriffskraft"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.CritRating, }
+L["%s kritische trefferwertung und %s angriffskraft"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.CritRating, }
 L["%s beweglichkeit und um %s% erhöhter kritischer schaden"] = {StatLogic.Stats.Agility, false, }
-L["%s angriffskraft und %s% betäubungswiderstand"] = {StatLogic.Stats.AttackPower, false, }
+L["%s angriffskraft und %s% betäubungswiderstand"] = {StatLogic.Stats.GenericAttackPower, false, }
 L["%s zaubermacht und %s% betäubungswiderstand"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
 L["%s abhärtungswertung und %s ausdauer"] = {StatLogic.Stats.ResilienceRating, StatLogic.Stats.Stamina, }
 L["%s ausdauer und schwache temposteigerung"] = {StatLogic.Stats.Stamina, }
@@ -185,7 +185,7 @@ L["%s zaubermacht und %s tempowertung"] = {{StatLogic.Stats.SpellDamage, StatLog
 L["%s ausweichwertung und %s verteidigungswertung"] = {StatLogic.Stats.DodgeRating, StatLogic.Stats.DefenseRating, }
 L["%s waffenkundewertung und %s trefferwertung"] = {StatLogic.Stats.ExpertiseRating, StatLogic.Stats.HitRating, }
 L["%s waffenkundewertung und %s verteidigungswertung"] = {StatLogic.Stats.ExpertiseRating, StatLogic.Stats.DefenseRating, }
-L["%s angriffskraft und %s tempowertung"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.HasteRating, }
+L["%s angriffskraft und %s tempowertung"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.HasteRating, }
 L["%s kritische trefferwertung und %s willenskraft"] = {StatLogic.Stats.CritRating, StatLogic.Stats.Spirit, }
 L["%s trefferwertung und %s willenskraft"] = {StatLogic.Stats.HitRating, StatLogic.Stats.Spirit, }
 L["%s abhärtungswertung und %s willenskraft"] = {StatLogic.Stats.ResilienceRating, StatLogic.Stats.Spirit, }
@@ -204,12 +204,12 @@ L["%s ausdauer und erlittener zauberschaden um %s% verringert"] = {StatLogic.Sta
 L["%s zaubermacht und um %s% verkürzte dauer von stilleeffekten"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
 L["%s kritische trefferwertung und um %s% verkürzte dauer von furchteffekten"] = {StatLogic.Stats.CritRating, false, }
 L["%s ausdauer und durch gegenstände erzielte rüstung um %s% erhöht"] = {StatLogic.Stats.Stamina, false, }
-L["%s angriffskraft und %s% verkürzte dauer von betäubungseffekten"] = {StatLogic.Stats.AttackPower, false, }
+L["%s angriffskraft und %s% verkürzte dauer von betäubungseffekten"] = {StatLogic.Stats.GenericAttackPower, false, }
 L["%s zaubermacht und um %s% verkürzte dauer von betäubungseffekten"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
-L["%s angriffskraft und heilt manchmal bei erzielten kritischen treffern"] = {StatLogic.Stats.AttackPower, }
+L["%s angriffskraft und heilt manchmal bei erzielten kritischen treffern"] = {StatLogic.Stats.GenericAttackPower, }
 L["%s kritische trefferwertung und %s% mana"] = {StatLogic.Stats.CritRating, false, }
 L["%s ausdauer und um %s% verkürzte dauer von betäubungseffekten"] = {StatLogic.Stats.Stamina, false, }
-L["%s angriffskraft und um %s% verkürzte dauer von betäubungseffekten"] = {StatLogic.Stats.AttackPower, false, }
+L["%s angriffskraft und um %s% verkürzte dauer von betäubungseffekten"] = {StatLogic.Stats.GenericAttackPower, false, }
 L["%s zauberdurchschlag"] = {StatLogic.Stats.SpellPenetration, }
 L["%s tempowertung und %s intelligenz"] = {StatLogic.Stats.Intellect, StatLogic.Stats.HasteRating, }
 L["%s intelligenz und %s tempowertung"] = {StatLogic.Stats.Intellect, StatLogic.Stats.HasteRating, }
diff --git a/libs/StatLogic/locales/enUS.lua b/libs/StatLogic/locales/enUS.lua
index 8e35da3..7f8a5c6 100644
--- a/libs/StatLogic/locales/enUS.lua
+++ b/libs/StatLogic/locales/enUS.lua
@@ -108,7 +108,7 @@ L["%s spell power and %s stamina"] = {{StatLogic.Stats.SpellDamage, StatLogic.St
 L["%s spell power and %s mana every %s seconds"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, StatLogic.Stats.ManaRegen, false, }
 L["%s agility and %s stamina"] = {StatLogic.Stats.Agility, StatLogic.Stats.Stamina, }
 L["%s strength and %s stamina"] = {StatLogic.Stats.Strength, StatLogic.Stats.Stamina, }
-L["%s attack power"] = {StatLogic.Stats.AttackPower, }
+L["%s attack power"] = {StatLogic.Stats.GenericAttackPower, }
 L["%s dodge rating"] = {StatLogic.Stats.DodgeRating, }
 L["%s intellect and %s mana every %s seconds"] = {StatLogic.Stats.Intellect, StatLogic.Stats.ManaRegen, false, }
 L["%s critical strike rating and %s strength"] = {StatLogic.Stats.Strength, StatLogic.Stats.CritRating, }
@@ -119,7 +119,7 @@ L["%s resilience rating"] = {StatLogic.Stats.ResilienceRating, }
 L["%s critical strike rating and %s spell power"] = {StatLogic.Stats.CritRating, {StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, }
 L["%s critical strike rating and %s spell penetration"] = {StatLogic.Stats.CritRating, StatLogic.Stats.SpellPenetration, }
 L["%s critical strike rating and %s% spell reflect"] = {StatLogic.Stats.CritRating, false, }
-L["%s attack power and minor run speed increase"] = {StatLogic.Stats.AttackPower, }
+L["%s attack power and minor run speed increase"] = {StatLogic.Stats.GenericAttackPower, }
 L["%s critical strike rating and reduces snare/root duration by %s%"] = {StatLogic.Stats.CritRating, false, }
 L["%s stamina and stun duration reduced by %s%"] = {StatLogic.Stats.Stamina, false, }
 L["%s spell power and %s% reduced threat"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
@@ -128,10 +128,10 @@ L["%s intellect and chance to restore mana on spellcast"] = {StatLogic.Stats.Int
 L["%s stamina, %s crit rating"] = {StatLogic.Stats.Stamina, StatLogic.Stats.CritRating, }
 L["%s stamina and %s critical strike rating"] = {StatLogic.Stats.CritRating, StatLogic.Stats.Stamina, }
 L["%s strength, %s crit rating"] = {StatLogic.Stats.Strength, StatLogic.Stats.CritRating, }
-L["%s attack power, %s critical strike rating"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.CritRating, }
+L["%s attack power, %s critical strike rating"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.CritRating, }
 L["%s spell power and minor run speed increase"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, }
 L["%s critical strike rating and %s mana per %s sec"] = {StatLogic.Stats.CritRating, StatLogic.Stats.ManaRegen, false, }
-L["%s attack power and %s hit rating"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.HitRating, }
+L["%s attack power and %s hit rating"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.HitRating, }
 L["%s defense rating and %s dodge rating"] = {StatLogic.Stats.DefenseRating, StatLogic.Stats.DodgeRating, }
 L["%s agility and %s hit rating"] = {StatLogic.Stats.Agility, StatLogic.Stats.HitRating, }
 L["%s parry rating and %s defense rating"] = {StatLogic.Stats.ParryRating, StatLogic.Stats.DefenseRating, }
@@ -142,10 +142,10 @@ L["%s critical strike rating and %s dodge rating"] = {StatLogic.Stats.CritRating
 L["%s parry rating and %s stamina"] = {StatLogic.Stats.ParryRating, StatLogic.Stats.Stamina, }
 L["%s spirit and %s spell power"] = {StatLogic.Stats.Spirit, {StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, }
 L["%s spell power and %s spell penetration"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
-L["%s attack power and %s stamina"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.Stamina, }
+L["%s attack power and %s stamina"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.Stamina, }
 L["%s dodge rating and %s hit rating"] = {StatLogic.Stats.DodgeRating, StatLogic.Stats.HitRating, }
 L["%s spell power and %s resilience rating"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, StatLogic.Stats.ResilienceRating, }
-L["%s attack power and %s critical strike rating"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.CritRating, }
+L["%s attack power and %s critical strike rating"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.CritRating, }
 L["%s intellect and %s stamina"] = {StatLogic.Stats.Intellect, StatLogic.Stats.Stamina, }
 L["%s strength and %s critical strike rating"] = {StatLogic.Stats.Strength, StatLogic.Stats.CritRating, }
 L["%s agility and %s defense rating"] = {StatLogic.Stats.Agility, StatLogic.Stats.DefenseRating, }
@@ -153,7 +153,7 @@ L["%s intellect and %s spirit"] = {StatLogic.Stats.Intellect, StatLogic.Stats.Sp
 L["%s strength and %s defense rating"] = {StatLogic.Stats.Strength, StatLogic.Stats.DefenseRating, }
 L["%s intellect and %s mana per %s sec"] = {StatLogic.Stats.Intellect, StatLogic.Stats.ManaRegen, false, }
 L["%s stamina and %s defense rating"] = {StatLogic.Stats.Stamina, StatLogic.Stats.DefenseRating, }
-L["%s attack power and %s resilience rating"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.ResilienceRating, }
+L["%s attack power and %s resilience rating"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.ResilienceRating, }
 L["%s stamina and %s resilience rating"] = {StatLogic.Stats.Stamina, StatLogic.Stats.ResilienceRating, }
 L["%s spell power and %s critical strike rating"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, StatLogic.Stats.CritRating, }
 L["%s defense rating and %s mana per %s sec"] = {StatLogic.Stats.DefenseRating, StatLogic.Stats.ManaRegen, false, }
@@ -164,11 +164,11 @@ L["%s strength and %s resilience rating"] = {StatLogic.Stats.Strength, StatLogic
 L["%s hit rating and %s stamina"] = {StatLogic.Stats.HitRating, StatLogic.Stats.Stamina, }
 L["%s hit rating and %s mana per %s sec"] = {StatLogic.Stats.HitRating, StatLogic.Stats.ManaRegen, false, }
 L["%s parry rating and %s resilience rating"] = {StatLogic.Stats.ParryRating, StatLogic.Stats.ResilienceRating, }
-L["%s attack power & %s mana per %s seconds"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.ManaRegen, false, }
-L["%s attack power and %s mana every %s seconds"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.ManaRegen, false, }
-L["%s critical strike rating and %s attack power"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.CritRating, }
+L["%s attack power & %s mana per %s seconds"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.ManaRegen, false, }
+L["%s attack power and %s mana every %s seconds"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.ManaRegen, false, }
+L["%s critical strike rating and %s attack power"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.CritRating, }
 L["%s agility and %s% increased critical damage"] = {StatLogic.Stats.Agility, false, }
-L["%s attack power and %s% stun resistance"] = {StatLogic.Stats.AttackPower, false, }
+L["%s attack power and %s% stun resistance"] = {StatLogic.Stats.GenericAttackPower, false, }
 L["%s spell power and %s% stun resistance"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
 L["%s resilience rating and %s stamina"] = {StatLogic.Stats.ResilienceRating, StatLogic.Stats.Stamina, }
 L["%s stamina and minor speed increase"] = {StatLogic.Stats.Stamina, }
@@ -192,7 +192,7 @@ L["%s spell power and %s haste rating"] = {{StatLogic.Stats.SpellDamage, StatLog
 L["%s dodge rating and %s defense rating"] = {StatLogic.Stats.DodgeRating, StatLogic.Stats.DefenseRating, }
 L["%s expertise rating and %s hit rating"] = {StatLogic.Stats.ExpertiseRating, StatLogic.Stats.HitRating, }
 L["%s expertise rating and %s defense rating"] = {StatLogic.Stats.ExpertiseRating, StatLogic.Stats.DefenseRating, }
-L["%s attack power and %s haste rating"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.HasteRating, }
+L["%s attack power and %s haste rating"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.HasteRating, }
 L["%s critical strike rating and %s spirit"] = {StatLogic.Stats.CritRating, StatLogic.Stats.Spirit, }
 L["%s hit rating and %s spirit"] = {StatLogic.Stats.HitRating, StatLogic.Stats.Spirit, }
 L["%s resilience rating and %s spirit"] = {StatLogic.Stats.ResilienceRating, StatLogic.Stats.Spirit, }
@@ -211,9 +211,9 @@ L["%s stamina and reduce spell damage taken by %s%"] = {StatLogic.Stats.Stamina,
 L["%s spell power and silence duration reduced by %s%"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
 L["%s critical strike rating and fear duration reduced by %s%"] = {StatLogic.Stats.CritRating, false, }
 L["%s stamina and %s% increased armor value from items"] = {StatLogic.Stats.Stamina, false, }
-L["%s attack power and stun duration reduced by %s%"] = {StatLogic.Stats.AttackPower, false, }
+L["%s attack power and stun duration reduced by %s%"] = {StatLogic.Stats.GenericAttackPower, false, }
 L["%s spell power and stun duration reduced by %s%"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
-L["%s attack power and sometimes heal on your crits"] = {StatLogic.Stats.AttackPower, }
+L["%s attack power and sometimes heal on your crits"] = {StatLogic.Stats.GenericAttackPower, }
 L["%s critical strike rating and %s% mana"] = {StatLogic.Stats.CritRating, false, }
 L["%s spell penetration"] = {StatLogic.Stats.SpellPenetration, }
 L["%s haste rating and %s intellect"] = {StatLogic.Stats.Intellect, StatLogic.Stats.HasteRating, }
diff --git a/libs/StatLogic/locales/esES.lua b/libs/StatLogic/locales/esES.lua
index 5c0f388..d92e02b 100644
--- a/libs/StatLogic/locales/esES.lua
+++ b/libs/StatLogic/locales/esES.lua
@@ -105,7 +105,7 @@ L["%s poder con hechizos y %s aguante"] = {{StatLogic.Stats.SpellDamage, StatLog
 L["%s poder con hechizos y %s maná cada %s s"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, StatLogic.Stats.ManaRegen, false, }
 L["%s agilidad y %s aguante"] = {StatLogic.Stats.Agility, StatLogic.Stats.Stamina, }
 L["%s fuerza y %s aguante"] = {StatLogic.Stats.Strength, StatLogic.Stats.Stamina, }
-L["%s poder de ataque"] = {StatLogic.Stats.AttackPower, }
+L["%s poder de ataque"] = {StatLogic.Stats.GenericAttackPower, }
 L["%s índice de esquivar"] = {StatLogic.Stats.DodgeRating, }
 L["%s índice de golpe crítico y %s fuerza"] = {StatLogic.Stats.Strength, StatLogic.Stats.CritRating, }
 L["%s índice de parada"] = {StatLogic.Stats.ParryRating, }
@@ -115,7 +115,7 @@ L["%s índice de temple"] = {StatLogic.Stats.ResilienceRating, }
 L["%s índice de golpe crítico y %s poder con hechizos"] = {StatLogic.Stats.CritRating, {StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, }
 L["%s índice de golpe crítico y %s penetración del hechizo"] = {StatLogic.Stats.CritRating, false, }
 L["%s índice de golpe crítico y %s% refracción de hechizos"] = {StatLogic.Stats.CritRating, false, }
-L["%s poder de ataque y aumento mín. de velocidad de carrera"] = {StatLogic.Stats.AttackPower, }
+L["%s poder de ataque y aumento mín. de velocidad de carrera"] = {StatLogic.Stats.GenericAttackPower, }
 L["%s índice de golpe crítico y reduce la duración de efectos de frenado y raíces en un %s%"] = {StatLogic.Stats.CritRating, false, }
 L["%s aguante y reducción de duración de aturdir un %s%"] = {StatLogic.Stats.Stamina, false, }
 L["%s poder con hechizos y %s% amenaza reducida"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
@@ -124,10 +124,10 @@ L["%s intelecto y prob. de restaurar maná al lanzar hechizo"] = {StatLogic.Stat
 L["%s aguante, %s índice de golpe crítico"] = {StatLogic.Stats.Stamina, StatLogic.Stats.CritRating, }
 L["%s aguante y %s índice de golpe crítico"] = {StatLogic.Stats.CritRating, StatLogic.Stats.Stamina, }
 L["%s fuerza y %s índice de golpe crítico"] = {StatLogic.Stats.Strength, StatLogic.Stats.CritRating, }
-L["%s poder de ataque, %s índice de golpe crítico"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.CritRating, }
+L["%s poder de ataque, %s índice de golpe crítico"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.CritRating, }
 L["%s poder con hechizos y aumento mín. de velocidad de carrera"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, }
 L["%s índice de golpe crítico y %s maná cada %s s"] = {StatLogic.Stats.CritRating, StatLogic.Stats.ManaRegen, false, }
-L["%s poder de ataque %s índice de golpe"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.HitRating, }
+L["%s poder de ataque %s índice de golpe"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.HitRating, }
 L["%s índice de defensa y %s índice de esquivar"] = {StatLogic.Stats.DefenseRating, StatLogic.Stats.DodgeRating, }
 L["%s agilidad y %s índice de golpe"] = {StatLogic.Stats.Agility, StatLogic.Stats.HitRating, }
 L["%s índice de parada y %s índice de defensa"] = {StatLogic.Stats.ParryRating, StatLogic.Stats.DefenseRating, }
@@ -138,16 +138,16 @@ L["%s índice de golpe crítico y %s índice de esquivar"] = {StatLogic.Stats.Cr
 L["%s índice de parada y %s aguante"] = {StatLogic.Stats.ParryRating, StatLogic.Stats.Stamina, }
 L["%s espíritu y %s poder con hechizos"] = {StatLogic.Stats.Spirit, {StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, }
 L["%s poder con hechizos y %s penetración del hechizo"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
-L["%s poder de ataque %s aguante"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.Stamina, }
+L["%s poder de ataque %s aguante"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.Stamina, }
 L["%s índice de esquivar y %s índice de golpe"] = {StatLogic.Stats.DodgeRating, StatLogic.Stats.HitRating, }
 L["%s poder con hechizos y %s índice de temple"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, StatLogic.Stats.ResilienceRating, }
-L["%s poder de ataque y %s índice de golpe crítico"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.CritRating, }
+L["%s poder de ataque y %s índice de golpe crítico"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.CritRating, }
 L["%s intelecto y %s aguante"] = {StatLogic.Stats.Intellect, StatLogic.Stats.Stamina, }
 L["%s agilidad y %s índice de defensa"] = {StatLogic.Stats.Agility, StatLogic.Stats.DefenseRating, }
 L["%s intelecto y %s espíritu"] = {StatLogic.Stats.Intellect, StatLogic.Stats.Spirit, }
 L["%s fuerza y %s índice de defensa"] = {StatLogic.Stats.Strength, StatLogic.Stats.DefenseRating, }
 L["%s aguante y %s índice de defensa"] = {StatLogic.Stats.Stamina, StatLogic.Stats.DefenseRating, }
-L["%s poder de ataque y %s índice de temple"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.ResilienceRating, }
+L["%s poder de ataque y %s índice de temple"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.ResilienceRating, }
 L["%s aguante y %s índice de temple"] = {StatLogic.Stats.Stamina, StatLogic.Stats.ResilienceRating, }
 L["%s poder con hechizos y %s índice de golpe crítico"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, StatLogic.Stats.CritRating, }
 L["%s índice de defensa y %s maná cada %s s"] = {StatLogic.Stats.DefenseRating, StatLogic.Stats.ManaRegen, false, }
@@ -158,13 +158,13 @@ L["%s fuerza y %s índice de temple"] = {StatLogic.Stats.Strength, StatLogic.Sta
 L["%s índice de golpe y %s aguante"] = {StatLogic.Stats.HitRating, StatLogic.Stats.Stamina, }
 L["%s índice de golpe y %s maná cada %s s"] = {StatLogic.Stats.HitRating, StatLogic.Stats.ManaRegen, false, }
 L["%s índice de parada y %s índice de temple"] = {StatLogic.Stats.ParryRating, StatLogic.Stats.ResilienceRating, }
-L["%s poder de ataque y %s aguante"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.Stamina, }
-L["%s poder de ataque y %s maná cada %s s"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.ManaRegen, false, }
-L["%s índice de golpe crítico y %s poder de ataque"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.CritRating, }
+L["%s poder de ataque y %s aguante"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.Stamina, }
+L["%s poder de ataque y %s maná cada %s s"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.ManaRegen, false, }
+L["%s índice de golpe crítico y %s poder de ataque"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.CritRating, }
 L["%s índice esquivar"] = {StatLogic.Stats.DodgeRating, }
-L["%s poder de ataque y %s maná cada %s segundos"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.ManaRegen, false, }
+L["%s poder de ataque y %s maná cada %s segundos"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.ManaRegen, false, }
 L["%s agilidad y %s% de daño crítico aumentado"] = {StatLogic.Stats.Agility, false, }
-L["%s poder de ataque y %s% resistencia al aturdimiento"] = {StatLogic.Stats.AttackPower, false, }
+L["%s poder de ataque y %s% resistencia al aturdimiento"] = {StatLogic.Stats.GenericAttackPower, false, }
 L["%s poder con hechizos y %s% resistencia al aturdimiento"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
 L["%s índice de temple y %s aguante"] = {StatLogic.Stats.ResilienceRating, StatLogic.Stats.Stamina, }
 L["%s aguante y aumento mínimo de velocidad"] = {StatLogic.Stats.Stamina, }
@@ -189,8 +189,8 @@ L["%s poder con hechizos y %s índice de celeridad"] = {{StatLogic.Stats.SpellDa
 L["%s índice de esquivar y %s índice de defensa"] = {StatLogic.Stats.DodgeRating, StatLogic.Stats.DefenseRating, }
 L["%s índice de pericia y %s índice de golpe"] = {StatLogic.Stats.ExpertiseRating, StatLogic.Stats.HitRating, }
 L["%s índice de pericia y %s índice de defensa"] = {StatLogic.Stats.ExpertiseRating, StatLogic.Stats.DefenseRating, }
-L["%s poder de ataque y %s índice de golpe"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.HitRating, }
-L["%s poder de ataque y %s índice de celeridad"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.HasteRating, }
+L["%s poder de ataque y %s índice de golpe"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.HitRating, }
+L["%s poder de ataque y %s índice de celeridad"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.HasteRating, }
 L["%s índice de golpe crítico y %s espíritu"] = {StatLogic.Stats.CritRating, StatLogic.Stats.Spirit, }
 L["%s índice de golpe y %s espíritu"] = {StatLogic.Stats.HitRating, StatLogic.Stats.Spirit, }
 L["%s índice de temple y %s espíritu"] = {StatLogic.Stats.ResilienceRating, StatLogic.Stats.Spirit, }
@@ -217,9 +217,9 @@ L["%s aguante y daño con hechizos recibido reducido un %s%"] = {StatLogic.Stats
 L["%s poder con hechizos y reducción de duración de silencio un %s%"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
 L["%s índice de golpe crítico y reducción de duración de miedo un %s%"] = {StatLogic.Stats.CritRating, false, }
 L["%s aguante y aumenta %s% de valor de armadura de objetos"] = {StatLogic.Stats.Stamina, false, }
-L["%s poder de ataque y reducción de duración de aturdir un %s%"] = {StatLogic.Stats.AttackPower, false, }
+L["%s poder de ataque y reducción de duración de aturdir un %s%"] = {StatLogic.Stats.GenericAttackPower, false, }
 L["%s poder con hechizos y reducción de duración de aturdir un %s%"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
-L["%s poder de ataque y a veces sana con tus golpes críticos"] = {StatLogic.Stats.AttackPower, }
+L["%s poder de ataque y a veces sana con tus golpes críticos"] = {StatLogic.Stats.GenericAttackPower, }
 L["%s índice de golpe crítico y %s% maná"] = {StatLogic.Stats.CritRating, false, }
 L["%s índice de golpe crítico y reducción de duración de efectos de frenado y raíces un %s%"] = {StatLogic.Stats.CritRating, false, }
 L["%s penetración de hechizos"] = {StatLogic.Stats.SpellPenetration, }
diff --git a/libs/StatLogic/locales/esMX.lua b/libs/StatLogic/locales/esMX.lua
index f78b596..7e13ddc 100644
--- a/libs/StatLogic/locales/esMX.lua
+++ b/libs/StatLogic/locales/esMX.lua
@@ -102,7 +102,7 @@ L["%s poder con hechizos y %s aguante"] = {{StatLogic.Stats.SpellDamage, StatLog
 L["%s poder con hechizos y %s maná cada %s s"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, StatLogic.Stats.ManaRegen, false, }
 L["%s agilidad y %s aguante"] = {StatLogic.Stats.Agility, StatLogic.Stats.Stamina, }
 L["%s fuerza y %s aguante"] = {StatLogic.Stats.Strength, StatLogic.Stats.Stamina, }
-L["%s poder de ataque"] = {StatLogic.Stats.AttackPower, }
+L["%s poder de ataque"] = {StatLogic.Stats.GenericAttackPower, }
 L["%s índice de esquivar"] = {StatLogic.Stats.DodgeRating, }
 L["%s índice de golpe crítico y %s fuerza"] = {StatLogic.Stats.Strength, StatLogic.Stats.CritRating, }
 L["%s índice de parada"] = {StatLogic.Stats.ParryRating, }
@@ -113,7 +113,7 @@ L["%s índice de temple"] = {StatLogic.Stats.ResilienceRating, }
 L["%s índice de golpe crítico y %s poder con hechizos"] = {StatLogic.Stats.CritRating, {StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, }
 L["%s índice de golpe crítico y %s penetración de hechizos"] = {StatLogic.Stats.CritRating, StatLogic.Stats.SpellPenetration, }
 L["%s índice de golpe crítico y %s% refracción de hechizos"] = {StatLogic.Stats.CritRating, false, }
-L["%s poder de ataque y aumento mín. de velocidad de carrera"] = {StatLogic.Stats.AttackPower, }
+L["%s poder de ataque y aumento mín. de velocidad de carrera"] = {StatLogic.Stats.GenericAttackPower, }
 L["%s índice de golpe crítico y reduce la duración de efectos de frenado y raíces en un %s%"] = {StatLogic.Stats.CritRating, false, }
 L["%s aguante y reducción de duración de aturdir un %s%"] = {StatLogic.Stats.Stamina, false, }
 L["%s poder con hechizos y %s% amenaza reducida"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
@@ -122,10 +122,10 @@ L["%s intelecto y prob. de restaurar maná al lanzar hechizo"] = {StatLogic.Stat
 L["%s aguante, %s índice de golpe crítico"] = {StatLogic.Stats.Stamina, StatLogic.Stats.CritRating, }
 L["%s aguante y %s índice de golpe crítico"] = {StatLogic.Stats.CritRating, StatLogic.Stats.Stamina, }
 L["%s fuerza y %s índice de golpe crítico"] = {StatLogic.Stats.Strength, StatLogic.Stats.CritRating, }
-L["%s poder de ataque, %s índice de golpe crítico"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.CritRating, }
+L["%s poder de ataque, %s índice de golpe crítico"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.CritRating, }
 L["%s poder con hechizos y aumento mín. de velocidad de carrera"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, }
 L["%s índice de golpe crítico y %s maná cada %s s"] = {StatLogic.Stats.CritRating, StatLogic.Stats.ManaRegen, false, }
-L["%s poder de ataque %s índice de golpes"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.HitRating, }
+L["%s poder de ataque %s índice de golpes"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.HitRating, }
 L["%s índice de defensa y %s índice de esquivar"] = {StatLogic.Stats.DefenseRating, StatLogic.Stats.DodgeRating, }
 L["%s agilidad y %s índice de golpe"] = {StatLogic.Stats.Agility, StatLogic.Stats.HitRating, }
 L["%s índice de parar y %s índice de defensa"] = {StatLogic.Stats.DefenseRating, StatLogic.Stats.ParryRating, }
@@ -136,16 +136,16 @@ L["%s índice de golpe crítico y %s índice de esquivar"] = {StatLogic.Stats.Cr
 L["%s índice de parada y %s aguante"] = {StatLogic.Stats.ParryRating, StatLogic.Stats.Stamina, }
 L["%s espíritu y %s poder con hechizos"] = {StatLogic.Stats.Spirit, {StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, }
 L["%s poder con hechizos y %s penetración del hechizo"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
-L["%s poder de ataque %s aguante"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.Stamina, }
+L["%s poder de ataque %s aguante"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.Stamina, }
 L["%s índice de esquivar y %s índice de golpe"] = {StatLogic.Stats.DodgeRating, StatLogic.Stats.HitRating, }
 L["%s poder con hechizos y %s índice de temple"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, StatLogic.Stats.ResilienceRating, }
-L["%s poder de ataque y %s índice de golpe crítico"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.CritRating, }
+L["%s poder de ataque y %s índice de golpe crítico"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.CritRating, }
 L["%s intelecto y %s aguante"] = {StatLogic.Stats.Intellect, StatLogic.Stats.Stamina, }
 L["%s agilidad y %s índice de defensa"] = {StatLogic.Stats.Agility, StatLogic.Stats.DefenseRating, }
 L["%s intelecto y %s espíritu"] = {StatLogic.Stats.Intellect, StatLogic.Stats.Spirit, }
 L["%s fuerza y %s índice de defensa"] = {StatLogic.Stats.Strength, StatLogic.Stats.DefenseRating, }
 L["%s aguante y %s índice de defensa"] = {StatLogic.Stats.Stamina, StatLogic.Stats.DefenseRating, }
-L["%s poder de ataque y %s índice de temple"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.ResilienceRating, }
+L["%s poder de ataque y %s índice de temple"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.ResilienceRating, }
 L["%s aguante y %s índice de temple"] = {StatLogic.Stats.Stamina, StatLogic.Stats.ResilienceRating, }
 L["%s poder con hechizos y %s índice de golpe crítico"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, StatLogic.Stats.CritRating, }
 L["%s índice de defensa y %s maná cada %s s"] = {StatLogic.Stats.DefenseRating, StatLogic.Stats.ManaRegen, false, }
@@ -156,13 +156,13 @@ L["%s fuerza y %s índice de temple"] = {StatLogic.Stats.Strength, StatLogic.Sta
 L["%s índice de golpe y %s aguante"] = {StatLogic.Stats.HitRating, StatLogic.Stats.Stamina, }
 L["%s índice de golpe y %s maná cada %s s"] = {StatLogic.Stats.HitRating, StatLogic.Stats.ManaRegen, false, }
 L["%s índice de parada y %s índice de temple"] = {StatLogic.Stats.ParryRating, StatLogic.Stats.ResilienceRating, }
-L["%s poder de ataque y %s aguante"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.Stamina, }
-L["%s poder de ataque y %s maná cada %s s"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.ManaRegen, false, }
-L["%s índice de golpe crítico y %s poder de ataque"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.CritRating, }
+L["%s poder de ataque y %s aguante"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.Stamina, }
+L["%s poder de ataque y %s maná cada %s s"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.ManaRegen, false, }
+L["%s índice de golpe crítico y %s poder de ataque"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.CritRating, }
 L["%s índice esquivar"] = {StatLogic.Stats.DodgeRating, }
-L["%s poder de ataque y %s maná cada %s segundos"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.ManaRegen, false, }
+L["%s poder de ataque y %s maná cada %s segundos"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.ManaRegen, false, }
 L["%s agilidad y %s% de daño crítico aumentado"] = {StatLogic.Stats.Agility, false, }
-L["%s poder de ataque y %s% resistencia al aturdimiento"] = {StatLogic.Stats.AttackPower, false, }
+L["%s poder de ataque y %s% resistencia al aturdimiento"] = {StatLogic.Stats.GenericAttackPower, false, }
 L["%s poder con hechizos y %s% resistencia al aturdimiento"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
 L["%s índice de temple y %s aguante"] = {StatLogic.Stats.ResilienceRating, StatLogic.Stats.Stamina, }
 L["%s aguante y aumento mínimo de velocidad"] = {StatLogic.Stats.Stamina, }
@@ -188,8 +188,8 @@ L["%s índice de esquivar y %s índice de defensa"] = {StatLogic.Stats.DodgeRati
 L["%s índice de parada y %s índice de defensa"] = {StatLogic.Stats.ParryRating, StatLogic.Stats.DefenseRating, }
 L["%s índice de pericia y %s índice de golpe"] = {StatLogic.Stats.ExpertiseRating, StatLogic.Stats.HitRating, }
 L["%s índice de pericia y %s índice de defensa"] = {StatLogic.Stats.ExpertiseRating, StatLogic.Stats.DefenseRating, }
-L["%s poder de ataque y %s índice de golpe"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.HitRating, }
-L["%s poder de ataque y %s índice de celeridad"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.HasteRating, }
+L["%s poder de ataque y %s índice de golpe"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.HitRating, }
+L["%s poder de ataque y %s índice de celeridad"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.HasteRating, }
 L["%s índice de golpe crítico y %s espíritu"] = {StatLogic.Stats.CritRating, StatLogic.Stats.Spirit, }
 L["%s índice de golpe y %s espíritu"] = {StatLogic.Stats.HitRating, StatLogic.Stats.Spirit, }
 L["%s índice de temple y %s espíritu"] = {StatLogic.Stats.ResilienceRating, StatLogic.Stats.Spirit, }
@@ -216,9 +216,9 @@ L["%s aguante y daño con hechizos recibido reducido un %s%"] = {StatLogic.Stats
 L["%s poder con hechizos y reducción de duración de silencio un %s%"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
 L["%s índice de golpe crítico y reducción de duración de miedo un %s%"] = {StatLogic.Stats.CritRating, false, }
 L["%s aguante y aumenta %s% de valor de armadura de objetos"] = {StatLogic.Stats.Stamina, false, }
-L["%s poder de ataque y reducción de duración de aturdir un %s%"] = {StatLogic.Stats.AttackPower, false, }
+L["%s poder de ataque y reducción de duración de aturdir un %s%"] = {StatLogic.Stats.GenericAttackPower, false, }
 L["%s poder con hechizos y reducción de duración de aturdir un %s%"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
-L["%s poder de ataque y a veces sana con tus golpes críticos"] = {StatLogic.Stats.AttackPower, }
+L["%s poder de ataque y a veces sana con tus golpes críticos"] = {StatLogic.Stats.GenericAttackPower, }
 L["%s índice de golpe crítico y %s% maná"] = {StatLogic.Stats.CritRating, false, }
 L["%s índice de golpe crítico y reducción de duración de efectos de frenado y raíces un %s%"] = {StatLogic.Stats.CritRating, false, }
 L["%s penetración de hechizos"] = {StatLogic.Stats.SpellPenetration, }
diff --git a/libs/StatLogic/locales/frFR.lua b/libs/StatLogic/locales/frFR.lua
index 7a478c5..de2422b 100644
--- a/libs/StatLogic/locales/frFR.lua
+++ b/libs/StatLogic/locales/frFR.lua
@@ -106,7 +106,7 @@ L["%s à la puissance des sorts et %s endurance"] = {{StatLogic.Stats.SpellDamag
 L["%s à la puissance des sorts et %s point de mana toutes les %s secondes"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, StatLogic.Stats.ManaRegen, false, }
 L["%s agilité et %s endurance"] = {StatLogic.Stats.Agility, StatLogic.Stats.Stamina, }
 L["%s force et %s endurance"] = {StatLogic.Stats.Strength, StatLogic.Stats.Stamina, }
-L["%s à la puissance d'attaque"] = {StatLogic.Stats.AttackPower, }
+L["%s à la puissance d'attaque"] = {StatLogic.Stats.GenericAttackPower, }
 L["%s au score d'esquive"] = {StatLogic.Stats.DodgeRating, }
 L["%s à la puissance des sorts et %s points de mana toutes les %s secondes"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, StatLogic.Stats.ManaRegen, false, }
 L["%s intelligence et %s points de mana toutes les %s secondes"] = {StatLogic.Stats.Intellect, StatLogic.Stats.ManaRegen, false, }
@@ -118,7 +118,7 @@ L["%s au score de résilience"] = {StatLogic.Stats.ResilienceRating, }
 L["%s au score de coup critique et %s à la puissance des sorts"] = {StatLogic.Stats.CritRating, {StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, }
 L["%s au score de coup critique et %s à la pénétration des sorts"] = {StatLogic.Stats.CritRating, StatLogic.Stats.SpellPenetration, }
 L["%s au score de critique et %s% de renvoi de sort"] = {StatLogic.Stats.CritRating, false, }
-L["%s à la puissance d'attaque et légère augmentation de la vitesse de course"] = {StatLogic.Stats.AttackPower, }
+L["%s à la puissance d'attaque et légère augmentation de la vitesse de course"] = {StatLogic.Stats.GenericAttackPower, }
 L["%s au score de coup critique et durées des ralentissements/immobilisations réduites de %s%"] = {StatLogic.Stats.CritRating, false, }
 L["%s à l'endurance et durée d'étourdissement réduite de %s%"] = {StatLogic.Stats.Stamina, false, }
 L["%s à la puissance des sorts et %s% de réduction de la menace"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
@@ -127,12 +127,12 @@ L["%s intelligence et une chance de restaurer des points de mana au lancement d'
 L["%s endurance, %s au score de critique"] = {StatLogic.Stats.Stamina, StatLogic.Stats.CritRating, }
 L["%s endurance, %s au score de coup critique"] = {StatLogic.Stats.Stamina, StatLogic.Stats.CritRating, }
 L["%s force, %s au score de critique"] = {StatLogic.Stats.Strength, StatLogic.Stats.CritRating, }
-L["%s à la puissance d'attaque, %s au score de critique"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.CritRating, }
+L["%s à la puissance d'attaque, %s au score de critique"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.CritRating, }
 L["%s point de mana toutes les %s secondes"] = {StatLogic.Stats.ManaRegen, false, }
 L["%s à la puissance des sorts et légère augmentation de la vitesse de course"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, }
 L["%s endurance et %s au score de coup critique"] = {StatLogic.Stats.CritRating, StatLogic.Stats.Stamina, }
 L["%s au score de coup critique et %s points de mana toutes les %s sec"] = {StatLogic.Stats.CritRating, StatLogic.Stats.ManaRegen, false, }
-L["%s à la puissance d'attaque et %s au score de toucher"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.HitRating, }
+L["%s à la puissance d'attaque et %s au score de toucher"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.HitRating, }
 L["%s au score de défense et %s au score d'esquive"] = {StatLogic.Stats.DefenseRating, StatLogic.Stats.DodgeRating, }
 L["%s agilité et %s au score de toucher"] = {StatLogic.Stats.Agility, StatLogic.Stats.HitRating, }
 L["%s au score de parade et %s au score de défense"] = {StatLogic.Stats.ParryRating, StatLogic.Stats.DefenseRating, }
@@ -143,10 +143,10 @@ L["%s au score de coup critique et %s au score d'esquive"] = {StatLogic.Stats.Cr
 L["%s au score de parade et %s endurance"] = {StatLogic.Stats.ParryRating, StatLogic.Stats.Stamina, }
 L["%s esprit et %s à la puissance des sorts"] = {StatLogic.Stats.Spirit, {StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, }
 L["%s à la puissance des sorts et %s à la pénétration des sorts"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
-L["%s à la puissance d'attaque et %s endurance"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.Stamina, }
+L["%s à la puissance d'attaque et %s endurance"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.Stamina, }
 L["%s au score d'esquive et %s au score de toucher"] = {StatLogic.Stats.DodgeRating, StatLogic.Stats.HitRating, }
 L["%s à la puissance des sorts et %s au score de résilience"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, StatLogic.Stats.ResilienceRating, }
-L["%s à la puissance d'attaque et %s au score de coup critique"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.CritRating, }
+L["%s à la puissance d'attaque et %s au score de coup critique"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.CritRating, }
 L["%s intelligence et %s endurance"] = {StatLogic.Stats.Intellect, StatLogic.Stats.Stamina, }
 L["%s force et %s score de coup critique"] = {StatLogic.Stats.Strength, StatLogic.Stats.CritRating, }
 L["%s agilité et %s au score de défense"] = {StatLogic.Stats.Agility, StatLogic.Stats.DefenseRating, }
@@ -154,7 +154,7 @@ L["%s intelligence et %s esprit"] = {StatLogic.Stats.Intellect, StatLogic.Stats.
 L["%s à la force et %s au score de défense"] = {StatLogic.Stats.Strength, StatLogic.Stats.DefenseRating, }
 L["%s intelligence et %s points de mana toutes les %s sec"] = {StatLogic.Stats.Intellect, StatLogic.Stats.ManaRegen, false, }
 L["%s endurance et %s au score de défense"] = {StatLogic.Stats.Stamina, StatLogic.Stats.DefenseRating, }
-L["%s à la puissance d'attaque et %s au score de résilience"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.ResilienceRating, }
+L["%s à la puissance d'attaque et %s au score de résilience"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.ResilienceRating, }
 L["%s endurance et %s score de résilience"] = {StatLogic.Stats.Stamina, StatLogic.Stats.ResilienceRating, }
 L["%s à la puissance des sorts et %s au score de coup critique"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, StatLogic.Stats.CritRating, }
 L["%s au score de défense et %s points de mana toutes les %s sec"] = {StatLogic.Stats.DefenseRating, StatLogic.Stats.ManaRegen, false, }
@@ -166,12 +166,12 @@ L["%s force et %s au score de résilience"] = {StatLogic.Stats.Strength, StatLog
 L["%s au score de toucher et %s endurance"] = {StatLogic.Stats.HitRating, StatLogic.Stats.Stamina, }
 L["%s au score de toucher et %s points de mana toutes les %s sec"] = {StatLogic.Stats.HitRating, StatLogic.Stats.ManaRegen, false, }
 L["%s au score de parade et %s au score de résilience"] = {StatLogic.Stats.ParryRating, StatLogic.Stats.ResilienceRating, }
-L["%s à la puissance d'attaque & %s point de mana toutes les %s secondes"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.ManaRegen, false, }
-L["%s à la puissance d'attaque et %s points de mana toutes les %s secondes"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.ManaRegen, false, }
-L["%s au score de coup critique et %s à la puissance d'attaque"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.CritRating, }
+L["%s à la puissance d'attaque & %s point de mana toutes les %s secondes"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.ManaRegen, false, }
+L["%s à la puissance d'attaque et %s points de mana toutes les %s secondes"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.ManaRegen, false, }
+L["%s au score de coup critique et %s à la puissance d'attaque"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.CritRating, }
 L["%s points de mana toutes les %s secondes"] = {StatLogic.Stats.ManaRegen, false, }
 L["%s à l'agilité et dégâts critiques augmentés de %s%"] = {StatLogic.Stats.Agility, false, }
-L["%s à la puissance d'attaque et %s% à la résistance aux étourdissements"] = {StatLogic.Stats.AttackPower, false, }
+L["%s à la puissance d'attaque et %s% à la résistance aux étourdissements"] = {StatLogic.Stats.GenericAttackPower, false, }
 L["%s à la puissance des sorts et %s% à la résistance aux étourdissements"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
 L["%s au score de résilience et %s endurance"] = {StatLogic.Stats.ResilienceRating, StatLogic.Stats.Stamina, }
 L["%s endurance et augmentation mineure de la vitesse"] = {StatLogic.Stats.Stamina, }
@@ -184,7 +184,7 @@ L["%s au score de défense et %s% à la valeur de blocage du bouclier"] = {StatL
 L["%s à la puissance des sorts & %s% à l'intelligence"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
 L["%s au score de hâte et %s endurance"] = {StatLogic.Stats.HasteRating, StatLogic.Stats.Stamina, }
 L["%s à la puissance des sorts et %s à l'esprit"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, StatLogic.Stats.Spirit, }
-L["%s à la puissance d'attaque, %s au score de coup critique"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.CritRating, }
+L["%s à la puissance d'attaque, %s au score de coup critique"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.CritRating, }
 L["%s à la puissance des sorts et %s au score de critique"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, StatLogic.Stats.CritRating, }
 L["%s au score de pénétration d'armure"] = {StatLogic.Stats.ArmorPenetrationRating, }
 L["%s au score d'expertise"] = {StatLogic.Stats.ExpertiseRating, }
@@ -192,7 +192,7 @@ L["%s au score de pénétration d'armure et %s à l'endurance"] = {StatLogic.Sta
 L["%s à la force et %s à l'endurance"] = {StatLogic.Stats.Strength, StatLogic.Stats.Stamina, }
 L["%s à l'agilité et %s à l'endurance"] = {StatLogic.Stats.Agility, StatLogic.Stats.Stamina, }
 L["%s à la puissance des sorts et %s à l'endurance"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, StatLogic.Stats.Stamina, }
-L["%s à la puissance d'attaque et %s à l'endurance"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.Stamina, }
+L["%s à la puissance d'attaque et %s à l'endurance"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.Stamina, }
 L["%s au score d'esquive et %s à l'endurance"] = {StatLogic.Stats.DodgeRating, StatLogic.Stats.Stamina, }
 L["%s au score d'expertise et %s à l'endurance"] = {StatLogic.Stats.ExpertiseRating, StatLogic.Stats.Stamina, }
 L["%s à l'agilité et %s points de mana toutes les %s secondes"] = {StatLogic.Stats.Agility, StatLogic.Stats.ManaRegen, false, }
@@ -209,7 +209,7 @@ L["%s à la puissance des sorts et %s au score de hâte"] = {{StatLogic.Stats.Sp
 L["%s au score d'esquive et %s au score de défense"] = {StatLogic.Stats.DodgeRating, StatLogic.Stats.DefenseRating, }
 L["%s au score d'expertise et %s au score de toucher"] = {StatLogic.Stats.ExpertiseRating, StatLogic.Stats.HitRating, }
 L["%s au score d'expertise et %s au score de défense"] = {StatLogic.Stats.ExpertiseRating, StatLogic.Stats.DefenseRating, }
-L["%s à la puissance d'attaque et %s au score de hâte"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.HasteRating, }
+L["%s à la puissance d'attaque et %s au score de hâte"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.HasteRating, }
 L["%s à l'intelligence et %s à l'endurance"] = {StatLogic.Stats.Intellect, StatLogic.Stats.Stamina, }
 L["%s au score de coup critique et %s à l'endurance"] = {StatLogic.Stats.CritRating, StatLogic.Stats.Stamina, }
 L["%s au score de toucher et %s à l'endurance"] = {StatLogic.Stats.HitRating, StatLogic.Stats.Stamina, }
@@ -250,12 +250,12 @@ L["%s endurance et réduit les dégâts des sorts reçus de %s%"] = {StatLogic.S
 L["%s à la puissance des sorts et durée de silence réduite de %s%"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
 L["%s au score de coup critique et durée de peur réduite de %s%"] = {StatLogic.Stats.CritRating, false, }
 L["%s endurance et augmente de %s% la valeur d'armure des objets"] = {StatLogic.Stats.Stamina, false, }
-L["%s à la puissance d'attaque et durée de etourdir réduite de %s%"] = {StatLogic.Stats.AttackPower, false, }
+L["%s à la puissance d'attaque et durée de etourdir réduite de %s%"] = {StatLogic.Stats.GenericAttackPower, false, }
 L["%s à la puissance des sort et durée de etourdir réduite de %s%"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
-L["%s à la puissance d'attaque et régénère parfois vos points de vie quand critique"] = {StatLogic.Stats.AttackPower, }
+L["%s à la puissance d'attaque et régénère parfois vos points de vie quand critique"] = {StatLogic.Stats.GenericAttackPower, }
 L["%s au score de coup critique et %s% aux points de mana"] = {StatLogic.Stats.CritRating, false, }
 L["%s endurance et durée de etourdir réduite de %s%"] = {StatLogic.Stats.Stamina, false, }
-L["%s à la puissance d'attaque et %s points de mana toutes les %s sec"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.ManaRegen, false, }
+L["%s à la puissance d'attaque et %s points de mana toutes les %s sec"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.ManaRegen, false, }
 L["%s au score de pénétration d'armure et %s endurance"] = {false, StatLogic.Stats.Stamina, }
 L["%s agilité et %s points de mana toutes les %s secondes"] = {StatLogic.Stats.Agility, StatLogic.Stats.ManaRegen, false, }
 L["%s au score d'expertise et %s endurance"] = {StatLogic.Stats.ExpertiseRating, StatLogic.Stats.Stamina, }
@@ -266,7 +266,7 @@ L["%s au score de coup critique et %s esprit"] = {StatLogic.Stats.CritRating, St
 L["%s au score de hâte et %s esprit"] = {StatLogic.Stats.HasteRating, StatLogic.Stats.Spirit, }
 L["%s au score de toucher et %s esprit"] = {StatLogic.Stats.HitRating, StatLogic.Stats.Spirit, }
 L["%s au score de résilience et %s esprit"] = {StatLogic.Stats.ResilienceRating, StatLogic.Stats.Spirit, }
-L["%s à la puissance d'attaque et durée d'etourdissement réduite de %s%"] = {StatLogic.Stats.AttackPower, false, }
+L["%s à la puissance d'attaque et durée d'etourdissement réduite de %s%"] = {StatLogic.Stats.GenericAttackPower, false, }
 L["%s endurance et durée d'etourdissement réduite de %s%"] = {StatLogic.Stats.Stamina, false, }
 L["%s à la puissance des sorts et durée d'etourdissement réduite de %s%"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
 L["%s à la pénétration des sorts"] = {StatLogic.Stats.SpellPenetration, }
diff --git a/libs/StatLogic/locales/itIT.lua b/libs/StatLogic/locales/itIT.lua
index a5ad358..6ddd879 100644
--- a/libs/StatLogic/locales/itIT.lua
+++ b/libs/StatLogic/locales/itIT.lua
@@ -108,7 +108,7 @@ L["%s zaubermacht und %s ausdauer"] = {{StatLogic.Stats.SpellDamage, StatLogic.S
 L["%s zaubermacht und alle %s sek. %s mana"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, StatLogic.Stats.ManaRegen, }
 L["%s beweglichkeit und %s ausdauer"] = {StatLogic.Stats.Agility, StatLogic.Stats.Stamina, }
 L["%s stärke und %s ausdauer"] = {StatLogic.Stats.Strength, StatLogic.Stats.Stamina, }
-L["%s angriffskraft"] = {StatLogic.Stats.AttackPower, }
+L["%s angriffskraft"] = {StatLogic.Stats.GenericAttackPower, }
 L["%s ausweichwertung"] = {StatLogic.Stats.DodgeRating, }
 L["%s kritische trefferwertung und %s stärke"] = {StatLogic.Stats.Strength, StatLogic.Stats.CritRating, }
 L["%s parierwertung"] = {StatLogic.Stats.ParryRating, }
@@ -118,7 +118,7 @@ L["%s abhärtungswertung"] = {StatLogic.Stats.ResilienceRating, }
 L["%s kritische trefferwertung und %s zaubermacht"] = {StatLogic.Stats.CritRating, {StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, }
 L["%s kritische trefferwertung und %s zauberdurchschlagskraft"] = {StatLogic.Stats.CritRating, false, }
 L["%s kritische trefferwertung und %s% zauberreflexion"] = {StatLogic.Stats.CritRating, false, }
-L["%s angriffskraft und geringe bewegungstempoerhöhung"] = {StatLogic.Stats.AttackPower, }
+L["%s angriffskraft und geringe bewegungstempoerhöhung"] = {StatLogic.Stats.GenericAttackPower, }
 L["%s kritische trefferwertung und um %s% verringerte dauer von bewegungseinschränkung"] = {StatLogic.Stats.CritRating, false, }
 L["%s ausdauer und betäubungsdauer um %s% verringert"] = {StatLogic.Stats.Stamina, false, }
 L["%s zaubermacht und um %s% verringerte bedrohung"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
@@ -128,10 +128,10 @@ L["%s ausdauer, %s kritische trefferwertung"] = {StatLogic.Stats.Stamina, StatLo
 L["%s stärke, %s kritische trefferwertung"] = {StatLogic.Stats.Strength, StatLogic.Stats.CritRating, }
 L["%s zaubermacht und %s kritische trefferwertung"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, StatLogic.Stats.CritRating, }
 L["%s ausdauer und %s kritische trefferwertung"] = {StatLogic.Stats.CritRating, StatLogic.Stats.Stamina, }
-L["%s angriffskraft, %s kritische trefferwertung"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.CritRating, }
+L["%s angriffskraft, %s kritische trefferwertung"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.CritRating, }
 L["%s zaubermacht und geringe bewegungstempoerhöhung"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, }
 L["%s kritische trefferwertung und alle %s sek. %s mana"] = {StatLogic.Stats.CritRating, false, StatLogic.Stats.ManaRegen, }
-L["%s angriffskraft und %s trefferwertung"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.HitRating, }
+L["%s angriffskraft und %s trefferwertung"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.HitRating, }
 L["%s verteidigungswertung und %s ausweichwertung"] = {StatLogic.Stats.DefenseRating, StatLogic.Stats.DodgeRating, }
 L["%s beweglichkeit und %s trefferwertung"] = {StatLogic.Stats.Agility, StatLogic.Stats.HitRating, }
 L["%s parierwertung und %s verteidigungswertung"] = {StatLogic.Stats.ParryRating, StatLogic.Stats.DefenseRating, }
@@ -141,17 +141,17 @@ L["%s kritische trefferwertung und %s ausweichwertung"] = {StatLogic.Stats.CritR
 L["%s parierwertung und %s ausdauer"] = {StatLogic.Stats.ParryRating, StatLogic.Stats.Stamina, }
 L["%s willenskraft und %s zaubermacht"] = {StatLogic.Stats.Spirit, {StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, }
 L["%s zaubermacht und %s zauberdurchschlagskraft"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
-L["%s angriffskraft und %s ausdauer"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.Stamina, }
+L["%s angriffskraft und %s ausdauer"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.Stamina, }
 L["%s ausweichwertung und %s trefferwertung"] = {StatLogic.Stats.DodgeRating, StatLogic.Stats.HitRating, }
 L["%s zaubermacht und %s abhärtungswertung"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, StatLogic.Stats.ResilienceRating, }
-L["%s angriffskraft und %s kritische trefferwertung"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.CritRating, }
+L["%s angriffskraft und %s kritische trefferwertung"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.CritRating, }
 L["%s intelligenz und %s ausdauer"] = {StatLogic.Stats.Intellect, StatLogic.Stats.Stamina, }
 L["%s stärke und %s kritische trefferwertung"] = {StatLogic.Stats.Strength, StatLogic.Stats.CritRating, }
 L["%s beweglichkeit und %s verteidigungswertung"] = {StatLogic.Stats.Agility, StatLogic.Stats.DefenseRating, }
 L["%s intelligenz und %s willenskraft"] = {StatLogic.Stats.Intellect, StatLogic.Stats.Spirit, }
 L["%s stärke und %s verteidigungswertung"] = {StatLogic.Stats.Strength, StatLogic.Stats.DefenseRating, }
 L["%s ausdauer und %s verteidigungswertung"] = {StatLogic.Stats.Stamina, StatLogic.Stats.DefenseRating, }
-L["%s angriffskraft und %s abhärtungswertung"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.ResilienceRating, }
+L["%s angriffskraft und %s abhärtungswertung"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.ResilienceRating, }
 L["%s ausdauer und %s abhärtungswertung"] = {StatLogic.Stats.Stamina, StatLogic.Stats.ResilienceRating, }
 L["%s verteidigungswertung und alle %s sek. %s mana"] = {StatLogic.Stats.DefenseRating, false, StatLogic.Stats.ManaRegen, }
 L["%s zaubermacht und %s willenskraft"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, StatLogic.Stats.Spirit, }
@@ -160,11 +160,11 @@ L["%s stärke und %s abhärtungswertung"] = {StatLogic.Stats.Strength, StatLogic
 L["%s trefferwertung und %s ausdauer"] = {StatLogic.Stats.HitRating, StatLogic.Stats.Stamina, }
 L["%s trefferwertung und alle %s sek. %s mana"] = {StatLogic.Stats.HitRating, false, StatLogic.Stats.ManaRegen, }
 L["%s parierwertung und %s abhärtungswertung"] = {StatLogic.Stats.ParryRating, StatLogic.Stats.ResilienceRating, }
-L["%s angriffskraft und alle %s sek. %s mana"] = {StatLogic.Stats.AttackPower, false, StatLogic.Stats.ManaRegen, }
+L["%s angriffskraft und alle %s sek. %s mana"] = {StatLogic.Stats.GenericAttackPower, false, StatLogic.Stats.ManaRegen, }
 L["%s trefferwertung und %s zaubermacht"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, StatLogic.Stats.HitRating, }
-L["%s kritische trefferwertung und %s angriffskraft"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.CritRating, }
+L["%s kritische trefferwertung und %s angriffskraft"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.CritRating, }
 L["%s beweglichkeit und um %s% erhöhter kritischer schaden"] = {StatLogic.Stats.Agility, false, }
-L["%s angriffskraft und %s% betäubungswiderstand"] = {StatLogic.Stats.AttackPower, false, }
+L["%s angriffskraft und %s% betäubungswiderstand"] = {StatLogic.Stats.GenericAttackPower, false, }
 L["%s zaubermacht und %s% betäubungswiderstand"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
 L["%s abhärtungswertung und %s ausdauer"] = {StatLogic.Stats.ResilienceRating, StatLogic.Stats.Stamina, }
 L["%s ausdauer und schwache temposteigerung"] = {StatLogic.Stats.Stamina, }
@@ -189,7 +189,7 @@ L["%s zaubermacht und %s tempowertung"] = {{StatLogic.Stats.SpellDamage, StatLog
 L["%s ausweichwertung und %s verteidigungswertung"] = {StatLogic.Stats.DodgeRating, StatLogic.Stats.DefenseRating, }
 L["%s waffenkundewertung und %s trefferwertung"] = {StatLogic.Stats.ExpertiseRating, StatLogic.Stats.HitRating, }
 L["%s waffenkundewertung und %s verteidigungswertung"] = {StatLogic.Stats.ExpertiseRating, StatLogic.Stats.DefenseRating, }
-L["%s angriffskraft und %s tempowertung"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.HasteRating, }
+L["%s angriffskraft und %s tempowertung"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.HasteRating, }
 L["%s kritische trefferwertung und %s willenskraft"] = {StatLogic.Stats.CritRating, StatLogic.Stats.Spirit, }
 L["%s trefferwertung und %s willenskraft"] = {StatLogic.Stats.HitRating, StatLogic.Stats.Spirit, }
 L["%s abhärtungswertung und %s willenskraft"] = {StatLogic.Stats.ResilienceRating, StatLogic.Stats.Spirit, }
@@ -208,12 +208,12 @@ L["%s ausdauer und erlittener zauberschaden um %s% verringert"] = {StatLogic.Sta
 L["%s zaubermacht und um %s% verkürzte dauer von stilleeffekten"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
 L["%s kritische trefferwertung und um %s% verkürzte dauer von furchteffekten"] = {StatLogic.Stats.CritRating, false, }
 L["%s ausdauer und durch gegenstände erzielte rüstung um %s% erhöht"] = {StatLogic.Stats.Stamina, false, }
-L["%s angriffskraft und %s% verkürzte dauer von betäubungseffekten"] = {StatLogic.Stats.AttackPower, false, }
+L["%s angriffskraft und %s% verkürzte dauer von betäubungseffekten"] = {StatLogic.Stats.GenericAttackPower, false, }
 L["%s zaubermacht und um %s% verkürzte dauer von betäubungseffekten"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
-L["%s angriffskraft und heilt manchmal bei erzielten kritischen treffern"] = {StatLogic.Stats.AttackPower, }
+L["%s angriffskraft und heilt manchmal bei erzielten kritischen treffern"] = {StatLogic.Stats.GenericAttackPower, }
 L["%s kritische trefferwertung und %s% mana"] = {StatLogic.Stats.CritRating, false, }
 L["%s ausdauer und um %s% verkürzte dauer von betäubungseffekten"] = {StatLogic.Stats.Stamina, false, }
-L["%s angriffskraft und um %s% verkürzte dauer von betäubungseffekten"] = {StatLogic.Stats.AttackPower, false, }
+L["%s angriffskraft und um %s% verkürzte dauer von betäubungseffekten"] = {StatLogic.Stats.GenericAttackPower, false, }
 L["%s strength"] = {StatLogic.Stats.Strength, }
 L["%s agility"] = {StatLogic.Stats.Agility, }
 L["%s stamina"] = {StatLogic.Stats.Stamina, }
@@ -281,7 +281,7 @@ L["%s haste rating"] = {StatLogic.Stats.HasteRating, }
 L["%s haste rating and %s stamina"] = {StatLogic.Stats.HasteRating, StatLogic.Stats.Stamina, }
 L["%s dodge rating and %s% shield block value"] = {StatLogic.Stats.DodgeRating, false, }
 L["%s intellect and %s% maximum mana"] = {StatLogic.Stats.Intellect, false, }
-L["%s attack power"] = {StatLogic.Stats.AttackPower, }
+L["%s attack power"] = {StatLogic.Stats.GenericAttackPower, }
 L["%s spell power"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, }
 L["%s expertise rating"] = {StatLogic.Stats.ExpertiseRating, }
 L["%s expertise rating and %s stamina"] = {StatLogic.Stats.ExpertiseRating, StatLogic.Stats.Stamina, }
diff --git a/libs/StatLogic/locales/koKR.lua b/libs/StatLogic/locales/koKR.lua
index f554a61..71d35a3 100644
--- a/libs/StatLogic/locales/koKR.lua
+++ b/libs/StatLogic/locales/koKR.lua
@@ -96,7 +96,7 @@ L["주문력 %s / 체력 %s"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.H
 L["주문력 %s / %s초당 마나 회복량 %s"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, StatLogic.Stats.ManaRegen, }
 L["민첩성 %s / 체력 %s"] = {StatLogic.Stats.Agility, StatLogic.Stats.Stamina, }
 L["힘 %s / 체력 %s"] = {StatLogic.Stats.Strength, StatLogic.Stats.Stamina, }
-L["전투력 %s"] = {StatLogic.Stats.AttackPower, }
+L["전투력 %s"] = {StatLogic.Stats.GenericAttackPower, }
 L["회피 숙련도 %s"] = {StatLogic.Stats.DodgeRating, }
 L["치명타 및 주문 극대화 적중도 %s / 힘 %s"] = {StatLogic.Stats.Strength, StatLogic.Stats.CritRating, }
 L["무기 막기 숙련도 %s"] = {StatLogic.Stats.ParryRating, }
@@ -106,7 +106,7 @@ L["탄력도 %s"] = {StatLogic.Stats.ResilienceRating, }
 L["치명타 및 주문 극대화 적중도 %s / 주문력 %s"] = {StatLogic.Stats.CritRating, {StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, }
 L["치명타 및 주문 극대화 적중도 %s / 주문 관통력 %s"] = {StatLogic.Stats.CritRating, false, }
 L["치명타 및 주문 극대화 적중도 %s / %s% 확률로 주문 반사"] = {StatLogic.Stats.CritRating, false, }
-L["전투력 %s / 최하급 달리기 속도 증가"] = {StatLogic.Stats.AttackPower, }
+L["전투력 %s / 최하급 달리기 속도 증가"] = {StatLogic.Stats.GenericAttackPower, }
 L["치명타 및 주문 극대화 적중도 %s / 덫, 이동 불가에 대한 저항력 %s%"] = {StatLogic.Stats.CritRating, false, }
 L["체력 %s / 기절 지속시간 %s% 감소"] = {StatLogic.Stats.Stamina, false, }
 L["주문력 %s / 위협 수준 %s%만큼 감소"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
@@ -114,10 +114,10 @@ L["방어 숙련도 %s / 공격 받을 시 일정 확률로 생명력 회복"] =
 L["지능 %s / 주문 시전 시 일정 확률로 마나 회복"] = {StatLogic.Stats.Intellect, }
 L["체력 %s / 치명타 및 주문 극대화 적중도 %s"] = {StatLogic.Stats.Stamina, StatLogic.Stats.CritRating, }
 L["힘 %s / 치명타 및 주문 극대화 적중도 %s"] = {StatLogic.Stats.Strength, StatLogic.Stats.CritRating, }
-L["전투력 %s / 치명타 및 주문 극대화 적중도 %s"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.CritRating, }
+L["전투력 %s / 치명타 및 주문 극대화 적중도 %s"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.CritRating, }
 L["주문력 %s / 최하급 달리기 속도 증가"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, }
 L["치명타 및 주문 극대화 적중도 %s / %s초당 마나 회복량 %s"] = {StatLogic.Stats.CritRating, false, StatLogic.Stats.ManaRegen, }
-L["전투력 %s / 적중도 %s"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.HitRating, }
+L["전투력 %s / 적중도 %s"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.HitRating, }
 L["방어 숙련도 %s / 회피 숙련도 %s"] = {StatLogic.Stats.DefenseRating, StatLogic.Stats.DodgeRating, }
 L["무기 막기 숙련도 %s / 방어 숙련도 %s"] = {StatLogic.Stats.ParryRating, StatLogic.Stats.DefenseRating, }
 L["힘 %s / 적중도 %s"] = {StatLogic.Stats.Strength, StatLogic.Stats.HitRating, }
@@ -127,14 +127,14 @@ L["치명타 및 주문 극대화 적중도 %s / 회피 숙련도 %s"] = {StatLo
 L["무기 막기 숙련도 %s / 체력 %s"] = {StatLogic.Stats.ParryRating, StatLogic.Stats.Stamina, }
 L["정신력 %s / 주문력 %s"] = {StatLogic.Stats.Spirit, {StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, }
 L["주문력 %s / 주문 관통력 %s"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
-L["전투력 %s / 체력 %s"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.Stamina, }
+L["전투력 %s / 체력 %s"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.Stamina, }
 L["회피 숙련도 %s / 적중도 %s"] = {StatLogic.Stats.DodgeRating, StatLogic.Stats.HitRating, }
 L["주문력 %s / 탄력도 %s"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, StatLogic.Stats.ResilienceRating, }
 L["지능 %s / 체력 %s"] = {StatLogic.Stats.Intellect, StatLogic.Stats.Stamina, }
 L["민첩성 %s / 방어 숙련도 %s"] = {StatLogic.Stats.Agility, StatLogic.Stats.DefenseRating, }
 L["지능 %s / 정신력 %s"] = {StatLogic.Stats.Intellect, StatLogic.Stats.Spirit, }
 L["힘 %s / 방어 숙련도 %s"] = {StatLogic.Stats.Strength, StatLogic.Stats.DefenseRating, }
-L["전투력 %s / 탄력도 %s"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.ResilienceRating, }
+L["전투력 %s / 탄력도 %s"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.ResilienceRating, }
 L["체력 %s / 탄력도 %s"] = {StatLogic.Stats.Stamina, StatLogic.Stats.ResilienceRating, }
 L["주문력 %s / 치명타 및 주문 극대화 적중도 %s"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, StatLogic.Stats.CritRating, }
 L["방어 숙련도 %s / %s초당 마나 회복량 %s"] = {StatLogic.Stats.DefenseRating, false, StatLogic.Stats.ManaRegen, }
@@ -144,10 +144,10 @@ L["힘 %s / 탄력도 %s"] = {StatLogic.Stats.Strength, StatLogic.Stats.Resilien
 L["적중도 %s / 체력 %s"] = {StatLogic.Stats.HitRating, StatLogic.Stats.Stamina, }
 L["적중도 %s / %s초당 마나 회복량 %s"] = {StatLogic.Stats.HitRating, false, StatLogic.Stats.ManaRegen, }
 L["무기 막기 숙련도 %s / 탄력도 %s"] = {StatLogic.Stats.ParryRating, StatLogic.Stats.ResilienceRating, }
-L["전투력 %s / %s초당 마나 회복량 %s"] = {StatLogic.Stats.AttackPower, false, StatLogic.Stats.ManaRegen, }
-L["치명타 및 주문 극대화 적중도 %s / 전투력 %s"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.CritRating, }
+L["전투력 %s / %s초당 마나 회복량 %s"] = {StatLogic.Stats.GenericAttackPower, false, StatLogic.Stats.ManaRegen, }
+L["치명타 및 주문 극대화 적중도 %s / 전투력 %s"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.CritRating, }
 L["민첩성 %s / 치명타 피해 %s%만큼 증가"] = {StatLogic.Stats.Agility, false, }
-L["전투력 %s / 기절에 대한 저항력 %s%"] = {StatLogic.Stats.AttackPower, false, }
+L["전투력 %s / 기절에 대한 저항력 %s%"] = {StatLogic.Stats.GenericAttackPower, false, }
 L["주문력 %s / 기절에 대한 저항력 %s%"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
 L["탄력도 %s / 체력 %s"] = {StatLogic.Stats.ResilienceRating, StatLogic.Stats.Stamina, }
 L["체력 %s / 최하급 속도 증가"] = {StatLogic.Stats.Stamina, }
@@ -172,7 +172,7 @@ L["주문력 %s / 가속도 %s"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stat
 L["회피 숙련도 %s / 방어 숙련도 %s"] = {StatLogic.Stats.DodgeRating, StatLogic.Stats.DefenseRating, }
 L["숙련 %s / 적중도 %s"] = {StatLogic.Stats.ExpertiseRating, StatLogic.Stats.HitRating, }
 L["숙련 %s / 방어 숙련도 %s"] = {StatLogic.Stats.ExpertiseRating, StatLogic.Stats.DefenseRating, }
-L["전투력 %s / 가속도 %s"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.HasteRating, }
+L["전투력 %s / 가속도 %s"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.HasteRating, }
 L["치명타 및 주문 극대화 적중도 %s / 정신력 %s"] = {StatLogic.Stats.CritRating, StatLogic.Stats.Spirit, }
 L["적중도 %s / 정신력 %s"] = {StatLogic.Stats.HitRating, StatLogic.Stats.Spirit, }
 L["탄력도 %s / 정신력 %s"] = {StatLogic.Stats.ResilienceRating, StatLogic.Stats.Spirit, }
@@ -191,9 +191,9 @@ L["체력 %s / 받는 주문 피해 %s%만큼 감소"] = {StatLogic.Stats.Stamin
 L["주문력 %s / 침묵 지속시간 %s%만큼 감소"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
 L["치명타 및 주문 극대화 적중도 %s / 공포 지속시간 %s%만큼 감소"] = {StatLogic.Stats.CritRating, false, }
 L["체력 %s / 아이템에 의한 방어도 %s%만큼 증가"] = {StatLogic.Stats.Stamina, false, }
-L["전투력 %s / 기절 지속시간 %s%만큼 감소"] = {StatLogic.Stats.AttackPower, false, }
+L["전투력 %s / 기절 지속시간 %s%만큼 감소"] = {StatLogic.Stats.GenericAttackPower, false, }
 L["주문력 %s / 기절 지속시간 %s%만큼 감소"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
-L["전투력 %s / 치명타 적중 시 일정 확률로 생명력 회복"] = {StatLogic.Stats.AttackPower, }
+L["전투력 %s / 치명타 적중 시 일정 확률로 생명력 회복"] = {StatLogic.Stats.GenericAttackPower, }
 L["치명타 및 주문 극대화 적중도 %s / 마나 %s%"] = {StatLogic.Stats.CritRating, false, }
 L["체력 %s / 기절 지속시간 %s%만큼 감소"] = {StatLogic.Stats.Stamina, false, }
 L["주문력 + %s / 침묵 지속시간 %s%만큼 감소"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
diff --git a/libs/StatLogic/locales/ptBR.lua b/libs/StatLogic/locales/ptBR.lua
index b1318ad..74a247c 100644
--- a/libs/StatLogic/locales/ptBR.lua
+++ b/libs/StatLogic/locales/ptBR.lua
@@ -101,7 +101,7 @@ L["%s poder mágico e %s vigor"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stat
 L["%s poder mágico e %s mana a cada %s s"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, StatLogic.Stats.ManaRegen, false, }
 L["%s agilidade e %s vigor"] = {StatLogic.Stats.Agility, StatLogic.Stats.Stamina, }
 L["%s força e %s vigor"] = {StatLogic.Stats.Strength, StatLogic.Stats.Stamina, }
-L["%s poder de ataque"] = {StatLogic.Stats.AttackPower, }
+L["%s poder de ataque"] = {StatLogic.Stats.GenericAttackPower, }
 L["%s taxa de esquiva"] = {StatLogic.Stats.DodgeRating, }
 L["%s taxa de acerto crítico e %s força"] = {StatLogic.Stats.Strength, StatLogic.Stats.CritRating, }
 L["%s taxa de aparo"] = {StatLogic.Stats.ParryRating, }
@@ -111,7 +111,7 @@ L["%s taxa de resiliência"] = {StatLogic.Stats.ResilienceRating, }
 L["%s taxa de acerto crítico e %s poder mágico"] = {StatLogic.Stats.CritRating, {StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, }
 L["%s taxa de acerto crítico e %s penetração de feitiço"] = {StatLogic.Stats.CritRating, StatLogic.Stats.SpellPenetration, }
 L["%s taxa de acerto crítico e %s% reflexo mágico"] = {StatLogic.Stats.CritRating, false, }
-L["%s poder de ataque e pequeno aumento na velocidade de movimento"] = {StatLogic.Stats.AttackPower, }
+L["%s poder de ataque e pequeno aumento na velocidade de movimento"] = {StatLogic.Stats.GenericAttackPower, }
 L["%s taxa de acerto crítico e reduz em %s% a duração de lerdeza/enraizamento"] = {StatLogic.Stats.CritRating, false, }
 L["%s vigor e duração de atordoamento reduzida em %s%"] = {StatLogic.Stats.Stamina, false, }
 L["%s poder mágico e ameaça reduzida em %s%"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
@@ -119,10 +119,10 @@ L["%s vigor e %s taxa de acerto crítico"] = {StatLogic.Stats.Stamina, StatLogic
 L["%s taxa de defesa e chance de restaurar vida ao acertar"] = {StatLogic.Stats.DefenseRating, }
 L["%s intelecto e chance de restaurar mana ao lançar um feitiço"] = {StatLogic.Stats.Intellect, }
 L["%s força, %s taxa de acerto crítico"] = {StatLogic.Stats.Strength, StatLogic.Stats.CritRating, }
-L["%s poder de ataque e %s taxa de acerto crítico"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.CritRating, }
+L["%s poder de ataque e %s taxa de acerto crítico"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.CritRating, }
 L["%s poder mágico e pequeno aumento na velocidade de movimento"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, }
 L["%s taxa de acerto crítico e %s mana a cada %ss"] = {StatLogic.Stats.CritRating, StatLogic.Stats.ManaRegen, false, }
-L["%s poder de ataque e %s taxa de acerto"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.HitRating, }
+L["%s poder de ataque e %s taxa de acerto"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.HitRating, }
 L["%s taxa de defesa e %s taxa de esquiva"] = {StatLogic.Stats.DefenseRating, StatLogic.Stats.DodgeRating, }
 L["%s agilidade e %s taxa de acerto"] = {StatLogic.Stats.Agility, StatLogic.Stats.HitRating, }
 L["%s taxa de aparo e %s taxa de defesa"] = {StatLogic.Stats.ParryRating, StatLogic.Stats.DefenseRating, }
@@ -134,7 +134,7 @@ L["%s taxa de acerto crítico e %s taxa de esquiva"] = {StatLogic.Stats.CritRati
 L["%s taxa de aparo e %s vigor"] = {StatLogic.Stats.ParryRating, StatLogic.Stats.Stamina, }
 L["%s espírito e %s poder mágico"] = {StatLogic.Stats.Spirit, {StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, }
 L["%s poder mágico e %s penetração de feitiço"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
-L["%s poder de ataque e %s vigor"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.Stamina, }
+L["%s poder de ataque e %s vigor"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.Stamina, }
 L["%s taxa de esquiva e %s taxa de acerto"] = {StatLogic.Stats.DodgeRating, StatLogic.Stats.HitRating, }
 L["%s poder mágico e %s taxa de resiliência"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, StatLogic.Stats.ResilienceRating, }
 L["%s intelecto e %s vigor"] = {StatLogic.Stats.Intellect, StatLogic.Stats.Stamina, }
@@ -143,7 +143,7 @@ L["%s agilidade e %s taxa de defesa"] = {StatLogic.Stats.Agility, StatLogic.Stat
 L["%s intelecto e %s espírito"] = {StatLogic.Stats.Intellect, StatLogic.Stats.Spirit, }
 L["%s força e %s taxa de defesa"] = {StatLogic.Stats.Strength, StatLogic.Stats.DefenseRating, }
 L["%s vigor e %s taxa de defesa"] = {StatLogic.Stats.Stamina, StatLogic.Stats.DefenseRating, }
-L["%s poder de ataque e %s taxa de resiliência"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.ResilienceRating, }
+L["%s poder de ataque e %s taxa de resiliência"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.ResilienceRating, }
 L["%s vigor e %s taxa de resiliência"] = {StatLogic.Stats.Stamina, StatLogic.Stats.ResilienceRating, }
 L["%s poder mágico e %s taxa de acerto crítico"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, StatLogic.Stats.CritRating, }
 L["%s taxa de defesa e %s mana a cada %s s"] = {StatLogic.Stats.DefenseRating, StatLogic.Stats.ManaRegen, false, }
@@ -153,10 +153,10 @@ L["%s força e %s taxa de resiliência"] = {StatLogic.Stats.Strength, StatLogic.
 L["%s taxa de acerto e %s vigor"] = {StatLogic.Stats.HitRating, StatLogic.Stats.Stamina, }
 L["%s taxa de acerto e %s de mana a cada %s s"] = {StatLogic.Stats.HitRating, StatLogic.Stats.ManaRegen, false, }
 L["%s taxa de aparo e %s taxa de resiliência"] = {StatLogic.Stats.ParryRating, StatLogic.Stats.ResilienceRating, }
-L["%s poder de ataque e %s mana a cada %s s"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.ManaRegen, false, }
-L["%s taxa de acerto crítico e %s poder de ataque"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.CritRating, }
+L["%s poder de ataque e %s mana a cada %s s"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.ManaRegen, false, }
+L["%s taxa de acerto crítico e %s poder de ataque"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.CritRating, }
 L["%s agilidade e %s% aumento no dano crítico"] = {StatLogic.Stats.Agility, false, }
-L["%s poder de ataque e %s% resistência a atordoamento"] = {StatLogic.Stats.AttackPower, false, }
+L["%s poder de ataque e %s% resistência a atordoamento"] = {StatLogic.Stats.GenericAttackPower, false, }
 L["%s poder mágico e %s% resistência a atordoamento"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
 L["%s mana a cada %s segundos"] = {StatLogic.Stats.ManaRegen, false, }
 L["%s taxa de resiliência e %s vigor"] = {StatLogic.Stats.ResilienceRating, StatLogic.Stats.Stamina, }
@@ -183,7 +183,7 @@ L["%s poder mágico e %s taxa de aceleração"] = {{StatLogic.Stats.SpellDamage,
 L["%s taxa de esquiva e %s taxa de defesa"] = {StatLogic.Stats.DodgeRating, StatLogic.Stats.DefenseRating, }
 L["%s taxa de aptidão e %s taxa de acerto"] = {StatLogic.Stats.ExpertiseRating, StatLogic.Stats.HitRating, }
 L["%s taxa de aptidão e %s taxa de defesa"] = {StatLogic.Stats.ExpertiseRating, StatLogic.Stats.DefenseRating, }
-L["%s poder de ataque e %s taxa de aceleração"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.HasteRating, }
+L["%s poder de ataque e %s taxa de aceleração"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.HasteRating, }
 L["%s taxa de acerto crítico e %s espírito"] = {StatLogic.Stats.CritRating, StatLogic.Stats.Spirit, }
 L["%s taxa de acerto e %s espírito"] = {StatLogic.Stats.HitRating, StatLogic.Stats.Spirit, }
 L["%s taxa de resiliência e %s espírito"] = {StatLogic.Stats.ResilienceRating, StatLogic.Stats.Spirit, }
@@ -203,9 +203,9 @@ L["%s vigor e %s% redução do dano mágico recebido"] = {StatLogic.Stats.Stamin
 L["%s poder mágico e duração de silêncio reduzida em %s%"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
 L["%s taxa de acerto crítico e duração de medo reduzida em %s%"] = {StatLogic.Stats.CritRating, false, }
 L["%s vigor e aumento de %s% no valor de armadura proveniente dos itens"] = {StatLogic.Stats.Stamina, false, }
-L["%s poder de ataque e duração de atordoamento reduzida em %s%"] = {StatLogic.Stats.AttackPower, false, }
+L["%s poder de ataque e duração de atordoamento reduzida em %s%"] = {StatLogic.Stats.GenericAttackPower, false, }
 L["%s poder mágico e duração de atordoamento reduzida em %s%"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
-L["%s poder de ataque e críticos às vezes curam"] = {StatLogic.Stats.AttackPower, }
+L["%s poder de ataque e críticos às vezes curam"] = {StatLogic.Stats.GenericAttackPower, }
 L["%s taxa de acerto crítico e %s% mana"] = {StatLogic.Stats.CritRating, false, }
 L["%s penetração de feitiço"] = {StatLogic.Stats.SpellPenetration, }
 L["%s taxa de aceleração e %s intelecto"] = {StatLogic.Stats.Intellect, StatLogic.Stats.HasteRating, }
diff --git a/libs/StatLogic/locales/ruRU.lua b/libs/StatLogic/locales/ruRU.lua
index 2f83071..fc424bf 100644
--- a/libs/StatLogic/locales/ruRU.lua
+++ b/libs/StatLogic/locales/ruRU.lua
@@ -94,7 +94,7 @@ L["%s к силе заклинаний и %s к выносливости"] = {{S
 L["%s к силе заклинаний и %s ед. маны каждые %s секунд"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, StatLogic.Stats.ManaRegen, false, }
 L["%s к ловкости и %s к выносливости"] = {StatLogic.Stats.Agility, StatLogic.Stats.Stamina, }
 L["%s к силе и %s к выносливости"] = {StatLogic.Stats.Strength, StatLogic.Stats.Stamina, }
-L["%s к силе атаки"] = {StatLogic.Stats.AttackPower, }
+L["%s к силе атаки"] = {StatLogic.Stats.GenericAttackPower, }
 L["%s к рейтингу уклонения"] = {StatLogic.Stats.DodgeRating, }
 L["%s к интеллекту и %s ед. маны каждые %s секунд"] = {StatLogic.Stats.Intellect, StatLogic.Stats.ManaRegen, false, }
 L["%s к рейтингу критического удара и %s к силе"] = {StatLogic.Stats.Strength, StatLogic.Stats.CritRating, }
@@ -105,7 +105,7 @@ L["%s к рейтингу устойчивости"] = {StatLogic.Stats.Resilien
 L["%s к рейтингу критического удара и %s к силе заклинаний"] = {StatLogic.Stats.CritRating, {StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, }
 L["%s к рейтингу критического удара и %s к проникающей способности заклинаний"] = {StatLogic.Stats.CritRating, StatLogic.Stats.SpellPenetration, }
 L["%s к рейтингу критического удара и %s% вероятность отразить заклинание"] = {StatLogic.Stats.CritRating, false, }
-L["%s к силе атаки и небольшое увеличение скорости бега"] = {StatLogic.Stats.AttackPower, }
+L["%s к силе атаки и небольшое увеличение скорости бега"] = {StatLogic.Stats.GenericAttackPower, }
 L["%s к рейтингу критического удара и уменьшение длительности эффектов оплетения/сковывания на %s%"] = {StatLogic.Stats.CritRating, false, }
 L["%s к выносливости, время действия оглушения снижено на %s%"] = {StatLogic.Stats.Stamina, false, }
 L["%s к силе заклинаний и снижение угрозы на %s%"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
@@ -114,10 +114,10 @@ L["%s к интеллекту и вероятность восполнить м
 L["%s к выносливости, %s к рейтингу критического удара"] = {StatLogic.Stats.Stamina, StatLogic.Stats.CritRating, }
 L["%s к выносливости и %s к рейтингу критического удара"] = {StatLogic.Stats.CritRating, StatLogic.Stats.Stamina, }
 L["%s к силе, %s к рейтингу крит. удара"] = {StatLogic.Stats.Strength, StatLogic.Stats.CritRating, }
-L["%s к силе атаки, %s к рейтингу критического удара"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.CritRating, }
+L["%s к силе атаки, %s к рейтингу критического удара"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.CritRating, }
 L["%s к силе заклинаний и небольшое увеличение скорости бега"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, }
 L["%s к рейтингу критического удара и %s ед. маны каждые %s секунд"] = {StatLogic.Stats.CritRating, StatLogic.Stats.ManaRegen, false, }
-L["%s к силе атаки и %s к рейтингу меткости"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.HitRating, }
+L["%s к силе атаки и %s к рейтингу меткости"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.HitRating, }
 L["%s к рейтингу защиты и %s к рейтингу уклонения"] = {StatLogic.Stats.DefenseRating, StatLogic.Stats.DodgeRating, }
 L["%s к ловкости и %s к рейтингу меткости"] = {StatLogic.Stats.Agility, StatLogic.Stats.HitRating, }
 L["%s к рейтингу парирования и %s к рейтингу защиты"] = {StatLogic.Stats.ParryRating, StatLogic.Stats.DefenseRating, }
@@ -128,10 +128,10 @@ L["%s к рейтингу критического удара и %s к рейт
 L["%s к рейтингу парирования и %s к выносливости"] = {StatLogic.Stats.ParryRating, StatLogic.Stats.Stamina, }
 L["%s к духу и %s к силе заклинаний"] = {StatLogic.Stats.Spirit, {StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, }
 L["%s к силе заклинаний и %s к проникающей способности заклинаний"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
-L["%s к силе атаки и %s к выносливости"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.Stamina, }
+L["%s к силе атаки и %s к выносливости"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.Stamina, }
 L["%s к рейтингу уклонения и %s к рейтингу меткости"] = {StatLogic.Stats.DodgeRating, StatLogic.Stats.HitRating, }
 L["%s к силе заклинаний и %s к рейтингу устойчивости"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, StatLogic.Stats.ResilienceRating, }
-L["%s к силе атаки и %s к рейтингу критического удара"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.CritRating, }
+L["%s к силе атаки и %s к рейтингу критического удара"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.CritRating, }
 L["%s к интеллекту и %s к выносливости"] = {StatLogic.Stats.Intellect, StatLogic.Stats.Stamina, }
 L["%s к силе и %s к рейтингу критического удара"] = {StatLogic.Stats.Strength, StatLogic.Stats.CritRating, }
 L["%s к ловкости и %s к рейтингу защиты"] = {StatLogic.Stats.Agility, StatLogic.Stats.DefenseRating, }
@@ -139,7 +139,7 @@ L["%s к интеллекту и %s к духу"] = {StatLogic.Stats.Intellect,
 L["%s к силе и %s к рейтингу защиты"] = {StatLogic.Stats.Strength, StatLogic.Stats.DefenseRating, }
 L["%s к интеллекту и %s маны каждые %s секунд"] = {StatLogic.Stats.Intellect, StatLogic.Stats.ManaRegen, false, }
 L["%s к выносливости и %s к рейтингу защиты"] = {StatLogic.Stats.Stamina, StatLogic.Stats.DefenseRating, }
-L["%s к силе атаки и %s к рейтингу устойчивости"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.ResilienceRating, }
+L["%s к силе атаки и %s к рейтингу устойчивости"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.ResilienceRating, }
 L["%s к выносливости и %s к рейтингу устойчивости"] = {StatLogic.Stats.Stamina, StatLogic.Stats.ResilienceRating, }
 L["%s к силе заклинаний и %s к рейтингу критического удара"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, StatLogic.Stats.CritRating, }
 L["%s к рейтингу защиты и %s маны каждые %s сек"] = {StatLogic.Stats.DefenseRating, StatLogic.Stats.ManaRegen, false, }
@@ -149,11 +149,11 @@ L["%s к силе и %s к устойчивости"] = {StatLogic.Stats.Strengt
 L["%s к рейтингу меткости и %s к выносливости"] = {StatLogic.Stats.HitRating, StatLogic.Stats.Stamina, }
 L["%s к рейтингу меткости и %s ед. маны каждые %s секунд"] = {StatLogic.Stats.HitRating, StatLogic.Stats.ManaRegen, false, }
 L["%s к рейтингу парирования и %s к рейтингу устойчивости"] = {StatLogic.Stats.ParryRating, StatLogic.Stats.ResilienceRating, }
-L["%s к силе атаки и %s ед. маны каждые %s секунд"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.ManaRegen, false, }
-L["%s к рейтингу критического удара и %s к силе атаки"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.CritRating, }
+L["%s к силе атаки и %s ед. маны каждые %s секунд"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.ManaRegen, false, }
+L["%s к рейтингу критического удара и %s к силе атаки"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.CritRating, }
 L["%s ед. маны раз в %s сек"] = {StatLogic.Stats.ManaRegen, false, }
 L["%s к ловкости и на %s% увеличенный критический урон"] = {StatLogic.Stats.Agility, false, }
-L["%s к силе атаки и %s% к сопротивлению оглушению"] = {StatLogic.Stats.AttackPower, false, }
+L["%s к силе атаки и %s% к сопротивлению оглушению"] = {StatLogic.Stats.GenericAttackPower, false, }
 L["%s к силе заклинаний и %s% к сопротивлению оглушению"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
 L["%s к рейтингу устойчивости и %s к выносливости"] = {StatLogic.Stats.ResilienceRating, StatLogic.Stats.Stamina, }
 L["%s к выносливости и небольшое увеличение скорости"] = {StatLogic.Stats.Stamina, }
@@ -171,7 +171,7 @@ L["%s маны каждые %s секунд"] = {StatLogic.Stats.ManaRegen, fals
 L["%s к рейтингу пробивания брони и %s к выносливости"] = {false, StatLogic.Stats.Stamina, }
 L["%s к рейтингу мастерства и %s к выносливости"] = {StatLogic.Stats.ExpertiseRating, StatLogic.Stats.Stamina, }
 L["%s к ловкости и %s ед. маны каждые %s секунд"] = {StatLogic.Stats.Agility, StatLogic.Stats.ManaRegen, false, }
-L["%s к силе атаки и %s к мане каждые %s секунд"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.ManaRegen, false, }
+L["%s к силе атаки и %s к мане каждые %s секунд"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.ManaRegen, false, }
 L["%s к силе и %s к рейтингу устойчивости"] = {StatLogic.Stats.Strength, StatLogic.Stats.ResilienceRating, }
 L["%s к силе и %s к рейтингу скорости"] = {StatLogic.Stats.Strength, StatLogic.Stats.HasteRating, }
 L["%s к ловкости и %s к рейтингу критического удара"] = {StatLogic.Stats.Agility, StatLogic.Stats.CritRating, }
@@ -181,7 +181,7 @@ L["%s к силе заклинаний и %s к рейтингу скорост
 L["%s к рейтингу уклонения и %s к рейтингу защиты"] = {StatLogic.Stats.DodgeRating, StatLogic.Stats.DefenseRating, }
 L["%s к рейтингу мастерства и %s к рейтингу меткости"] = {StatLogic.Stats.ExpertiseRating, StatLogic.Stats.HitRating, }
 L["%s к рейтингу мастерства и %s к рейтингу защиты"] = {StatLogic.Stats.ExpertiseRating, StatLogic.Stats.DefenseRating, }
-L["%s к силе атаки и %s к рейтингу скорости"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.HasteRating, }
+L["%s к силе атаки и %s к рейтингу скорости"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.HasteRating, }
 L["%s к рейтингу критического удара и %s к духу"] = {StatLogic.Stats.CritRating, StatLogic.Stats.Spirit, }
 L["%s к рейтингу меткости и %s к духу"] = {StatLogic.Stats.HitRating, StatLogic.Stats.Spirit, }
 L["%s к рейтингу устойчивости и %s к духу"] = {StatLogic.Stats.ResilienceRating, StatLogic.Stats.Spirit, }
@@ -190,7 +190,7 @@ L["%s к рейтингу устойчивости и %s ед. маны кажд
 L["%s к рейтингу скорости и %s ед. маны каждые %s секунд"] = {StatLogic.Stats.HasteRating, StatLogic.Stats.ManaRegen, false, }
 L["%s к рейтингу меткости и %s к проникающей способности заклинаний"] = {StatLogic.Stats.HitRating, false, }
 L["%s к рейтингу скорости и %s к проникающей способности заклинаний"] = {StatLogic.Stats.HasteRating, StatLogic.Stats.SpellPenetration, }
-L["%s к силе атаки и %s маны каждые %s секунд"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.ManaRegen, false, }
+L["%s к силе атаки и %s маны каждые %s секунд"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.ManaRegen, false, }
 L["%s к интеллекту и %s к мане каждые %s секунд"] = {StatLogic.Stats.Intellect, StatLogic.Stats.ManaRegen, false, }
 L["%s к рейтингу критического удара и %s к мане каждые %s секунд"] = {StatLogic.Stats.CritRating, StatLogic.Stats.ManaRegen, false, }
 L["%s к рейтингу меткости и %s к мане каждые %s секунд"] = {StatLogic.Stats.HitRating, StatLogic.Stats.ManaRegen, false, }
@@ -210,11 +210,11 @@ L["%s к выносливости и уменьшение получаемого
 L["%s к силе заклинаний и уменьшение длительности эффекта немоты на %s%"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
 L["%s к рейтингу критического удара и уменьшение длительности эффекта страха на %s%"] = {StatLogic.Stats.CritRating, false, }
 L["%s к выносливости и увеличение показателя брони от носимой экипировки на %s%"] = {StatLogic.Stats.Stamina, false, }
-L["%s к силе атаки, время действия оглушения снижено на %s%"] = {StatLogic.Stats.AttackPower, false, }
+L["%s к силе атаки, время действия оглушения снижено на %s%"] = {StatLogic.Stats.GenericAttackPower, false, }
 L["%s к силе заклинаний, время действия оглушения снижено на %s%"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
-L["%s к силе атаки и периодическое восстановление здоровья при критических ударах"] = {StatLogic.Stats.AttackPower, }
+L["%s к силе атаки и периодическое восстановление здоровья при критических ударах"] = {StatLogic.Stats.GenericAttackPower, }
 L["%s к рейтингу критического удара и %s% к мане"] = {StatLogic.Stats.CritRating, false, }
-L["%s к силе атаки/%s к рейтингу критического удара"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.CritRating, }
+L["%s к силе атаки/%s к рейтингу критического удара"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.CritRating, }
 L["%s к проникающей способности заклинаний"] = {StatLogic.Stats.SpellPenetration, }
 L["%s к рейтингу скорости и %s к интеллекту"] = {StatLogic.Stats.Intellect, StatLogic.Stats.HasteRating, }
 L["%s к интеллекту и %s к рейтингу скорости"] = {StatLogic.Stats.Intellect, StatLogic.Stats.HasteRating, }
diff --git a/libs/StatLogic/locales/zhCN.lua b/libs/StatLogic/locales/zhCN.lua
index 80d938e..eb6acfc 100644
--- a/libs/StatLogic/locales/zhCN.lua
+++ b/libs/StatLogic/locales/zhCN.lua
@@ -104,7 +104,7 @@ L["%s 法术强度，%s 耐力"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stat
 L["%s 法术强度，每%s秒法力回复%s"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, StatLogic.Stats.ManaRegen, }
 L["%s 敏捷，%s 耐力"] = {StatLogic.Stats.Agility, StatLogic.Stats.Stamina, }
 L["%s 力量，%s 耐力"] = {StatLogic.Stats.Strength, StatLogic.Stats.Stamina, }
-L["%s 攻击强度"] = {StatLogic.Stats.AttackPower, }
+L["%s 攻击强度"] = {StatLogic.Stats.GenericAttackPower, }
 L["%s 躲闪等级"] = {StatLogic.Stats.DodgeRating, }
 L["%s 爆击等级，%s 力量"] = {StatLogic.Stats.Strength, StatLogic.Stats.CritRating, }
 L["%s 招架等级"] = {StatLogic.Stats.ParryRating, }
@@ -114,7 +114,7 @@ L["%s 韧性等级"] = {StatLogic.Stats.ResilienceRating, }
 L["%s 爆击等级，%s 法术强度"] = {StatLogic.Stats.CritRating, {StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, }
 L["%s 爆击等级，%s 法术穿透"] = {StatLogic.Stats.CritRating, StatLogic.Stats.SpellPenetration, }
 L["%s 爆击等级，%s%法术反射"] = {StatLogic.Stats.CritRating, false, }
-L["%s 攻击强度，奔跑速度略微提升"] = {StatLogic.Stats.AttackPower, }
+L["%s 攻击强度，奔跑速度略微提升"] = {StatLogic.Stats.GenericAttackPower, }
 L["%s 爆击等级，%s% 诱捕/缠绕时间"] = {StatLogic.Stats.CritRating, false, }
 L["%s 耐力，%s% 昏迷时间"] = {StatLogic.Stats.Stamina, false, }
 L["%s 法术强度，%s% 威胁"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
@@ -123,10 +123,10 @@ L["%s 智力，施法时有一定几率回复法力值"] = {StatLogic.Stats.Inte
 L["%s 耐力，%s 爆击等级"] = {StatLogic.Stats.Stamina, StatLogic.Stats.CritRating, }
 L["%s 力量，%s 爆击等级"] = {StatLogic.Stats.Strength, StatLogic.Stats.CritRating, }
 L["%s 法术强度，%s 爆击等级"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, StatLogic.Stats.CritRating, }
-L["%s 攻击强度，%s 爆击等级"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.CritRating, }
+L["%s 攻击强度，%s 爆击等级"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.CritRating, }
 L["%s 法术强度，奔跑速度略微提升"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, }
 L["%s 爆击等级，每%s秒法力回复%s"] = {StatLogic.Stats.CritRating, false, StatLogic.Stats.ManaRegen, }
-L["%s 攻击强度，%s 命中等级"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.HitRating, }
+L["%s 攻击强度，%s 命中等级"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.HitRating, }
 L["%s 防御等级，%s 躲闪等级"] = {StatLogic.Stats.DefenseRating, StatLogic.Stats.DodgeRating, }
 L["%s 敏捷，%s 命中等级"] = {StatLogic.Stats.Agility, StatLogic.Stats.HitRating, }
 L["%s 招架等级，%s 防御等级"] = {StatLogic.Stats.ParryRating, StatLogic.Stats.DefenseRating, }
@@ -136,7 +136,7 @@ L["%s 爆击等级，%s 躲闪等级"] = {StatLogic.Stats.CritRating, StatLogic.
 L["%s 招架等级，%s 耐力"] = {StatLogic.Stats.ParryRating, StatLogic.Stats.Stamina, }
 L["%s 精神，%s 法术强度"] = {StatLogic.Stats.Spirit, {StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, }
 L["%s 法术强度，%s 法术穿透"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
-L["%s 攻击强度，%s 耐力"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.Stamina, }
+L["%s 攻击强度，%s 耐力"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.Stamina, }
 L["%s 躲闪等级，%s 命中等级"] = {StatLogic.Stats.DodgeRating, StatLogic.Stats.HitRating, }
 L["%s 法术强度，%s 韧性等级"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, StatLogic.Stats.ResilienceRating, }
 L["%s 智力，%s 耐力"] = {StatLogic.Stats.Intellect, StatLogic.Stats.Stamina, }
@@ -144,7 +144,7 @@ L["%s 敏捷，%s 防御等级"] = {StatLogic.Stats.Agility, StatLogic.Stats.Def
 L["%s 智力，%s 精神"] = {StatLogic.Stats.Intellect, StatLogic.Stats.Spirit, }
 L["%s 力量，%s 防御等级"] = {StatLogic.Stats.Strength, StatLogic.Stats.DefenseRating, }
 L["%s 耐力，%s 防御等级"] = {StatLogic.Stats.Stamina, StatLogic.Stats.DefenseRating, }
-L["%s 攻击强度，%s 韧性等级"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.ResilienceRating, }
+L["%s 攻击强度，%s 韧性等级"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.ResilienceRating, }
 L["%s 耐力，%s 韧性等级"] = {StatLogic.Stats.Stamina, StatLogic.Stats.ResilienceRating, }
 L["%s 防御等级，每%s秒法力回复%s"] = {StatLogic.Stats.DefenseRating, false, StatLogic.Stats.ManaRegen, }
 L["%s 法术强度，%s 精神"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, StatLogic.Stats.Spirit, }
@@ -153,11 +153,11 @@ L["%s 力量，%s 韧性等级"] = {StatLogic.Stats.Strength, StatLogic.Stats.Re
 L["%s 命中等级，%s 耐力"] = {StatLogic.Stats.HitRating, StatLogic.Stats.Stamina, }
 L["%s 命中等级，每%s秒法力回复%s"] = {StatLogic.Stats.HitRating, false, StatLogic.Stats.ManaRegen, }
 L["%s 招架等级，%s 韧性等级"] = {StatLogic.Stats.ParryRating, StatLogic.Stats.ResilienceRating, }
-L["%s 攻击强度，每%s秒法力回复%s"] = {StatLogic.Stats.AttackPower, false, StatLogic.Stats.ManaRegen, }
+L["%s 攻击强度，每%s秒法力回复%s"] = {StatLogic.Stats.GenericAttackPower, false, StatLogic.Stats.ManaRegen, }
 L["%s 命中等级，%s 法术强度"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, StatLogic.Stats.HitRating, }
-L["%s 爆击等级，%s 攻击强度"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.CritRating, }
+L["%s 爆击等级，%s 攻击强度"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.CritRating, }
 L["%s 敏捷，%s% 爆击伤害"] = {StatLogic.Stats.Agility, false, }
-L["%s 攻击强度，%s%昏迷抵抗"] = {StatLogic.Stats.AttackPower, false, }
+L["%s 攻击强度，%s%昏迷抵抗"] = {StatLogic.Stats.GenericAttackPower, false, }
 L["%s 法术强度，%s%昏迷抵抗"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
 L["%s 韧性等级，%s 耐力"] = {StatLogic.Stats.ResilienceRating, StatLogic.Stats.Stamina, }
 L["%s生命值，每%s秒法力回复%s"] = {{StatLogic.Stats.HealthRegen, StatLogic.Stats.ManaRegen, }, false, false, }
@@ -167,14 +167,14 @@ L["%s 急速等级，%s 法术强度"] = {StatLogic.Stats.HasteRating, {StatLogi
 L["%s 急速等级，%s 耐力"] = {StatLogic.Stats.HasteRating, StatLogic.Stats.Stamina, }
 L["%s 防御等级，%s% 盾牌格挡值"] = {StatLogic.Stats.DefenseRating, false, }
 L["%s 法术强度，%s% 智力"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
-L["%s攻击强度"] = {StatLogic.Stats.AttackPower, }
+L["%s攻击强度"] = {StatLogic.Stats.GenericAttackPower, }
 L["%s 护甲穿透等级"] = {StatLogic.Stats.ArmorPenetrationRating, }
 L["%s 精准等级"] = {StatLogic.Stats.ExpertiseRating, }
 L["每%s秒回复法力%s"] = {false, StatLogic.Stats.ManaRegen, }
 L["%s 护甲穿透等级，%s 耐力"] = {false, StatLogic.Stats.Stamina, }
 L["%s 精准等级，%s 耐力"] = {StatLogic.Stats.ExpertiseRating, StatLogic.Stats.Stamina, }
 L["%s 敏捷，每%s秒法力回复%s"] = {StatLogic.Stats.Agility, false, StatLogic.Stats.ManaRegen, }
-L["%s 攻击强度，每%s秒回复法力%s"] = {StatLogic.Stats.AttackPower, false, StatLogic.Stats.ManaRegen, }
+L["%s 攻击强度，每%s秒回复法力%s"] = {StatLogic.Stats.GenericAttackPower, false, StatLogic.Stats.ManaRegen, }
 L["%s 力量，%s 急速等级"] = {StatLogic.Stats.Strength, StatLogic.Stats.HasteRating, }
 L["%s 敏捷，%s 爆击等级"] = {StatLogic.Stats.Agility, StatLogic.Stats.CritRating, }
 L["%s 敏捷，%s 韧性等级"] = {StatLogic.Stats.Agility, StatLogic.Stats.ResilienceRating, }
@@ -183,7 +183,7 @@ L["%s 法术强度，%s 急速等级"] = {{StatLogic.Stats.SpellDamage, StatLogi
 L["%s 躲闪等级，%s 防御等级"] = {StatLogic.Stats.DodgeRating, StatLogic.Stats.DefenseRating, }
 L["%s 精准等级，%s 命中等级"] = {StatLogic.Stats.ExpertiseRating, StatLogic.Stats.HitRating, }
 L["%s 精准等级，%s 防御等级"] = {StatLogic.Stats.ExpertiseRating, StatLogic.Stats.DefenseRating, }
-L["%s 攻击强度，%s 急速等级"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.HasteRating, }
+L["%s 攻击强度，%s 急速等级"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.HasteRating, }
 L["%s 爆击等级，%s 精神"] = {StatLogic.Stats.CritRating, StatLogic.Stats.Spirit, }
 L["%s 命中等级，%s 精神"] = {StatLogic.Stats.HitRating, StatLogic.Stats.Spirit, }
 L["%s 韧性等级，%s 精神"] = {StatLogic.Stats.ResilienceRating, StatLogic.Stats.Spirit, }
@@ -207,9 +207,9 @@ L["%s 耐力，受到的法术伤害降低%s%"] = {StatLogic.Stats.Stamina, fals
 L["%s 法术强度，%s% 沉默时间"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
 L["%s 爆击等级，%s% 恐惧时间"] = {StatLogic.Stats.CritRating, false, }
 L["%s 耐力，由物品获得的护甲值提高%s%"] = {StatLogic.Stats.Stamina, false, }
-L["%s 攻击强度，%s% 昏迷时间"] = {StatLogic.Stats.AttackPower, false, }
+L["%s 攻击强度，%s% 昏迷时间"] = {StatLogic.Stats.GenericAttackPower, false, }
 L["%s 法术强度，%s% 昏迷时间"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
-L["%s 攻击强度，爆击后可能恢复生命值"] = {StatLogic.Stats.AttackPower, }
+L["%s 攻击强度，爆击后可能恢复生命值"] = {StatLogic.Stats.GenericAttackPower, }
 L["%s 爆击等级，%s% 法力值"] = {StatLogic.Stats.CritRating, false, }
 L["%s 急速等级，每%s秒法力回复%s"] = {StatLogic.Stats.HasteRating, false, StatLogic.Stats.ManaRegen, }
 L["%s力量"] = {StatLogic.Stats.Strength, }
diff --git a/libs/StatLogic/locales/zhTW.lua b/libs/StatLogic/locales/zhTW.lua
index 1127a96..0ffec5c 100644
--- a/libs/StatLogic/locales/zhTW.lua
+++ b/libs/StatLogic/locales/zhTW.lua
@@ -104,7 +104,7 @@ L["%s法術能量和%s耐力"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.
 L["%s法術能量和每%s秒恢復%s法力"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, StatLogic.Stats.ManaRegen, }
 L["%s敏捷和%s耐力"] = {StatLogic.Stats.Agility, StatLogic.Stats.Stamina, }
 L["%s力量和%s耐力"] = {StatLogic.Stats.Strength, StatLogic.Stats.Stamina, }
-L["%s攻擊強度"] = {StatLogic.Stats.AttackPower, }
+L["%s攻擊強度"] = {StatLogic.Stats.GenericAttackPower, }
 L["%s閃躲等級"] = {StatLogic.Stats.DodgeRating, }
 L["%s致命一擊等級和%s力量"] = {StatLogic.Stats.Strength, StatLogic.Stats.CritRating, }
 L["%s招架等級"] = {StatLogic.Stats.ParryRating, }
@@ -114,7 +114,7 @@ L["%s韌性等級"] = {StatLogic.Stats.ResilienceRating, }
 L["%s致命一擊等級和%s法術能量"] = {StatLogic.Stats.CritRating, {StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, }
 L["%s致命一擊等級和%s法術穿透力"] = {StatLogic.Stats.CritRating, StatLogic.Stats.SpellPenetration, }
 L["%s致命一擊等級和%s%法術反射"] = {StatLogic.Stats.CritRating, false, }
-L["%s攻擊強度和略微提高奔跑速度"] = {StatLogic.Stats.AttackPower, }
+L["%s攻擊強度和略微提高奔跑速度"] = {StatLogic.Stats.GenericAttackPower, }
 L["%s致命一擊等級和縮短%s%緩速及定身持續時間"] = {StatLogic.Stats.CritRating, false, }
 L["%s耐力和縮短%s%昏迷持續時間"] = {StatLogic.Stats.Stamina, false, }
 L["%s法術能量和降低%s%威脅值"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
@@ -122,10 +122,10 @@ L["%s防禦等級和擊中時有機率恢愎生命力"] = {StatLogic.Stats.Defen
 L["%s智力和有機率在施放法術時恢愎法力"] = {StatLogic.Stats.Intellect, }
 L["%s耐力和%s致命一擊等級"] = {StatLogic.Stats.Stamina, StatLogic.Stats.CritRating, }
 L["%s力量和%s致命一擊等級"] = {StatLogic.Stats.Strength, StatLogic.Stats.CritRating, }
-L["%s攻擊強度和%s致命一擊等級"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.CritRating, }
+L["%s攻擊強度和%s致命一擊等級"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.CritRating, }
 L["%s法術能量和略微提高奔跑速度"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, }
 L["%s致命一擊等級和每%s秒恢復%s法力"] = {StatLogic.Stats.CritRating, false, StatLogic.Stats.ManaRegen, }
-L["%s攻擊強度和%s命中等級"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.HitRating, }
+L["%s攻擊強度和%s命中等級"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.HitRating, }
 L["%s防禦等級和%s閃躲等級"] = {StatLogic.Stats.DefenseRating, StatLogic.Stats.DodgeRating, }
 L["%s敏捷和%s命中等級"] = {StatLogic.Stats.Agility, StatLogic.Stats.HitRating, }
 L["%s招架等級和%s防禦等級"] = {StatLogic.Stats.ParryRating, StatLogic.Stats.DefenseRating, }
@@ -136,7 +136,7 @@ L["%s致命一擊等級和%s閃躲等級"] = {StatLogic.Stats.CritRating, StatLo
 L["%s招架等級和%s耐力"] = {StatLogic.Stats.ParryRating, StatLogic.Stats.Stamina, }
 L["%s精神和%s法術能量"] = {StatLogic.Stats.Spirit, {StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, }
 L["%s法術能量和%s法術穿透力"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
-L["%s攻擊強度和%s耐力"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.Stamina, }
+L["%s攻擊強度和%s耐力"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.Stamina, }
 L["%s閃躲等級和%s命中等級"] = {StatLogic.Stats.DodgeRating, StatLogic.Stats.HitRating, }
 L["%s法術能量和%s韌性等級"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, StatLogic.Stats.ResilienceRating, }
 L["%s智力和%s耐力"] = {StatLogic.Stats.Intellect, StatLogic.Stats.Stamina, }
@@ -144,7 +144,7 @@ L["%s敏捷和%s防禦等級"] = {StatLogic.Stats.Agility, StatLogic.Stats.Defen
 L["%s智力和%s精神"] = {StatLogic.Stats.Intellect, StatLogic.Stats.Spirit, }
 L["%s力量和%s防禦等級"] = {StatLogic.Stats.Strength, StatLogic.Stats.DefenseRating, }
 L["%s耐力和%s防禦等級"] = {StatLogic.Stats.Stamina, StatLogic.Stats.DefenseRating, }
-L["%s攻擊強度和%s韌性等級"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.ResilienceRating, }
+L["%s攻擊強度和%s韌性等級"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.ResilienceRating, }
 L["%s耐力和%s韌性等級"] = {StatLogic.Stats.Stamina, StatLogic.Stats.ResilienceRating, }
 L["%s法術能量和%s致命一擊等級"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, StatLogic.Stats.CritRating, }
 L["%s防禦等級和每%s秒恢復%s法力"] = {StatLogic.Stats.DefenseRating, false, StatLogic.Stats.ManaRegen, }
@@ -154,10 +154,10 @@ L["%s力量和%s韌性等級"] = {StatLogic.Stats.Strength, StatLogic.Stats.Resi
 L["%s命中等級和%s耐力"] = {StatLogic.Stats.HitRating, StatLogic.Stats.Stamina, }
 L["%s命中等級和每%s秒恢復%s法力"] = {StatLogic.Stats.HitRating, false, StatLogic.Stats.ManaRegen, }
 L["%s招架等級和%s韌性等級"] = {StatLogic.Stats.ParryRating, StatLogic.Stats.ResilienceRating, }
-L["%s攻擊強度和每%s秒恢復%s法力"] = {StatLogic.Stats.AttackPower, false, StatLogic.Stats.ManaRegen, }
-L["%s致命一擊等級和%s攻擊強度"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.CritRating, }
+L["%s攻擊強度和每%s秒恢復%s法力"] = {StatLogic.Stats.GenericAttackPower, false, StatLogic.Stats.ManaRegen, }
+L["%s致命一擊等級和%s攻擊強度"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.CritRating, }
 L["%s敏捷和%s%致命一擊傷害"] = {StatLogic.Stats.Agility, false, }
-L["%s攻擊強度和%s%昏迷抗性"] = {StatLogic.Stats.AttackPower, false, }
+L["%s攻擊強度和%s%昏迷抗性"] = {StatLogic.Stats.GenericAttackPower, false, }
 L["%s法術能量和%s%昏迷抗性"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
 L["%s韌性等級和%s耐力"] = {StatLogic.Stats.ResilienceRating, StatLogic.Stats.Stamina, }
 L["%s耐力和移動速度略微提升"] = {StatLogic.Stats.Stamina, }
@@ -181,7 +181,7 @@ L["%s法術能量和%s加速等級"] = {{StatLogic.Stats.SpellDamage, StatLogic.
 L["%s閃躲等級和%s防禦等級"] = {StatLogic.Stats.DodgeRating, StatLogic.Stats.DefenseRating, }
 L["%s熟練等級和%s命中等級"] = {StatLogic.Stats.ExpertiseRating, StatLogic.Stats.HitRating, }
 L["%s熟練等級和%s防禦等級"] = {StatLogic.Stats.ExpertiseRating, StatLogic.Stats.DefenseRating, }
-L["%s攻擊強度和%s加速等級"] = {StatLogic.Stats.AttackPower, StatLogic.Stats.HasteRating, }
+L["%s攻擊強度和%s加速等級"] = {StatLogic.Stats.GenericAttackPower, StatLogic.Stats.HasteRating, }
 L["%s致命一擊等級和%s精神"] = {StatLogic.Stats.CritRating, StatLogic.Stats.Spirit, }
 L["%s命中等級和%s精神"] = {StatLogic.Stats.HitRating, StatLogic.Stats.Spirit, }
 L["%s韌性等級和%s精神"] = {StatLogic.Stats.ResilienceRating, StatLogic.Stats.Spirit, }
@@ -198,9 +198,9 @@ L["%s耐力和減少%s%法術傷害"] = {StatLogic.Stats.Stamina, false, }
 L["%s法術能量和縮短%s%沉默持續時間"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
 L["%s致命一擊等級和縮短%s%恐懼持續時間"] = {StatLogic.Stats.CritRating, false, }
 L["%s耐力和提高%s%裝備提供的護甲值"] = {StatLogic.Stats.Stamina, false, }
-L["%s攻擊強度和縮短%s%昏迷持續時間"] = {StatLogic.Stats.AttackPower, false, }
+L["%s攻擊強度和縮短%s%昏迷持續時間"] = {StatLogic.Stats.GenericAttackPower, false, }
 L["%s法術能量和縮短%s%昏迷持續時間"] = {{StatLogic.Stats.SpellDamage, StatLogic.Stats.HealingPower, }, false, }
-L["%s攻擊強度和致命一擊時偶爾恢復生命力"] = {StatLogic.Stats.AttackPower, }
+L["%s攻擊強度和致命一擊時偶爾恢復生命力"] = {StatLogic.Stats.GenericAttackPower, }
 L["%s致命一擊等級和%s%法力"] = {StatLogic.Stats.CritRating, false, }
 L["%s法術穿透力"] = {StatLogic.Stats.SpellPenetration, }
 L["%s加速等級和%s智力"] = {StatLogic.Stats.Intellect, StatLogic.Stats.HasteRating, }
diff --git a/locales/deDE.lua b/locales/deDE.lua
index 1a046f3..9d514cf 100644
--- a/locales/deDE.lua
+++ b/locales/deDE.lua
@@ -370,7 +370,7 @@ L["statList"] = {
 	{"rüstungsdurchschlag", StatLogic.Stats.ArmorPenetrationRating},
 	{"meisterschaft", StatLogic.Stats.MasteryRating},
 	{ARMOR:lower(), StatLogic.Stats.Armor},
-	{"angriffskraft", StatLogic.Stats.AttackPower},
+	{"angriffskraft", StatLogic.Stats.GenericAttackPower},
 }
 -------------------------
 -- Added info patterns --
diff --git a/locales/esES.lua b/locales/esES.lua
index b049d4e..eb45233 100644
--- a/locales/esES.lua
+++ b/locales/esES.lua
@@ -371,7 +371,7 @@ L["statList"] = {
 	{"índice de penetración de armadura", StatLogic.Stats.ArmorPenetrationRating},
 	{"maestría", StatLogic.Stats.MasteryRating},
 	{ARMOR:lower(), StatLogic.Stats.Armor},
-	{"poder de ataque", StatLogic.Stats.AttackPower},
+	{"poder de ataque", StatLogic.Stats.GenericAttackPower},
 }
 -------------------------
 -- Added info patterns --
diff --git a/locales/esMX.lua b/locales/esMX.lua
index 4465065..05a1197 100644
--- a/locales/esMX.lua
+++ b/locales/esMX.lua
@@ -373,7 +373,7 @@ L["statList"] = {
 	{"penetración de armadura", StatLogic.Stats.ArmorPenetrationRating},
 	{"maestría", StatLogic.Stats.MasteryRating},
 	{ARMOR:lower(), StatLogic.Stats.Armor},
-	{"poder de ataque", StatLogic.Stats.AttackPower},
+	{"poder de ataque", StatLogic.Stats.GenericAttackPower},
 }
 -------------------------
 -- Added info patterns --
diff --git a/locales/frFR.lua b/locales/frFR.lua
index 39cf932..69de27f 100644
--- a/locales/frFR.lua
+++ b/locales/frFR.lua
@@ -391,7 +391,7 @@ L["statList"] = {
 	{"pénétration d'armure", StatLogic.Stats.ArmorPenetrationRating},
 	{"maîtrise", StatLogic.Stats.MasteryRating},
 	{ARMOR:lower(), StatLogic.Stats.Armor},
-	{"puissance d'attaque", StatLogic.Stats.AttackPower},
+	{"puissance d'attaque", StatLogic.Stats.GenericAttackPower},
 }
 -------------------------
 -- Added info patterns --
diff --git a/locales/itIT.lua b/locales/itIT.lua
index 5135a91..2de9728 100644
--- a/locales/itIT.lua
+++ b/locales/itIT.lua
@@ -349,7 +349,7 @@ L["statList"] = {
 	{"spell critical rating", StatLogic.Stats.SpellCritRating},
 	{"spell crit rating", StatLogic.Stats.SpellCritRating},
 	{"spell critical", StatLogic.Stats.SpellCritRating},
-	{"attack power", StatLogic.Stats.AttackPower},
+	{"attack power", StatLogic.Stats.GenericAttackPower},
 	{"ranged critical strike", StatLogic.Stats.RangedCritRating},
 	{"ranged critical hit rating", StatLogic.Stats.RangedCritRating},
 	{"ranged critical rating", StatLogic.Stats.RangedCritRating},
diff --git a/locales/koKR.lua b/locales/koKR.lua
index 83836d4..d617249 100644
--- a/locales/koKR.lua
+++ b/locales/koKR.lua
@@ -370,7 +370,7 @@ L["statList"] = {
 	{"방어구 관통력", StatLogic.Stats.ArmorPenetrationRating},	--armor penetration rating
 	{"특화", StatLogic.Stats.MasteryRating},
 	{ARMOR:lower(), StatLogic.Stats.Armor},
-	{"전투력이", StatLogic.Stats.AttackPower},
+	{"전투력이", StatLogic.Stats.GenericAttackPower},
 }
 -------------------------
 -- Added info patterns --
diff --git a/locales/ptBR.lua b/locales/ptBR.lua
index 060c612..aac0ddd 100644
--- a/locales/ptBR.lua
+++ b/locales/ptBR.lua
@@ -347,7 +347,7 @@ L["statList"] = {
 	{"spell critical rating", StatLogic.Stats.SpellCritRating},
 	{"spell crit rating", StatLogic.Stats.SpellCritRating},
 	{"spell critical", StatLogic.Stats.SpellCritRating},
-	{"attack power", StatLogic.Stats.AttackPower},
+	{"attack power", StatLogic.Stats.GenericAttackPower},
 	{"ranged critical strike", StatLogic.Stats.RangedCritRating},
 	{"ranged critical hit rating", StatLogic.Stats.RangedCritRating},
 	{"ranged critical rating", StatLogic.Stats.RangedCritRating},
diff --git a/locales/ruRU.lua b/locales/ruRU.lua
index 438af46..9513bc3 100644
--- a/locales/ruRU.lua
+++ b/locales/ruRU.lua
@@ -364,11 +364,11 @@ SPELL_STAT5_NAME = "Spirit"
 L["statList"] = {
 	{"ослабление брони противника", false}, -- Annihilator
 
-	{"сила атаки", StatLogic.Stats.AttackPower},
-	{"силу атаки", StatLogic.Stats.AttackPower},
-	{"силы атаки", StatLogic.Stats.AttackPower},
-	{"силы вашей атаки", StatLogic.Stats.AttackPower},
-	{"к силе атаки", StatLogic.Stats.AttackPower},
+	{"сила атаки", StatLogic.Stats.GenericAttackPower},
+	{"силу атаки", StatLogic.Stats.GenericAttackPower},
+	{"силы атаки", StatLogic.Stats.GenericAttackPower},
+	{"силы вашей атаки", StatLogic.Stats.GenericAttackPower},
+	{"к силе атаки", StatLogic.Stats.GenericAttackPower},
 
 	-- Resistance and Spell Damage aren't used for breakdowns,
 	-- but are needed to prevent false matches of other stats
diff --git a/scripts/GenerateStatLocales/GenerateStatLocales.mjs b/scripts/GenerateStatLocales/GenerateStatLocales.mjs
index 43a7165..2846d45 100755
--- a/scripts/GenerateStatLocales/GenerateStatLocales.mjs
+++ b/scripts/GenerateStatLocales/GenerateStatLocales.mjs
@@ -135,7 +135,7 @@ const itemStatType = {
     35: 'ResilienceRating',
     36: 'HasteRating',
     37: 'ExpertiseRating',
-    38: 'AttackPower',
+    38: 'GenericAttackPower',
     39: 'RangedAttackPower',
     40: 'Versatility',
     41: 'HealingPower',