Merge branch 'BreakBB:master' into draenei

Alessandro-Barbieri · web-flow · commit 26fa53eb8a86 · 2026-01-23T17:01:34.000+01:00
diff --git a/ExtendedCharacterStats-BCC.toc b/ExtendedCharacterStats-BCC.toc
@@ -11,6 +11,17 @@
 ## OptionalDeps: Ace3, CallbackHandler-1.0, LibStub
 ## SavedVariablesPerCharacter: ExtendedCharacterStats
 ## DefaultState: enabled
+## Category: User Interface
+## Category-deDE: Benutzerinterface
+## Category-esES: Interfaz de usuario
+## Category-esMX: Interfaz de usuario
+## Category-frFR: Interface utilisateur
+## Category-itIT: Interfaccia utente
+## Category-koKR: 사용자 인터페이스
+## Category-ptBR: Interface do usuário
+## Category-ruRU: Интерфейс пользователя
+## Category-zhCN: 用户界面
+## Category-zhTW: 使用者介面
 ## X-Curse-Project-ID: 334877
 ## X-Wago-ID: e56nwDK9
 
diff --git a/ExtendedCharacterStats-Classic.toc b/ExtendedCharacterStats-Classic.toc
@@ -11,6 +11,17 @@
 ## OptionalDeps: Ace3, CallbackHandler-1.0, LibStub
 ## SavedVariablesPerCharacter: ExtendedCharacterStats
 ## DefaultState: enabled
+## Category: User Interface
+## Category-deDE: Benutzerinterface
+## Category-esES: Interfaz de usuario
+## Category-esMX: Interfaz de usuario
+## Category-frFR: Interface utilisateur
+## Category-itIT: Interfaccia utente
+## Category-koKR: 사용자 인터페이스
+## Category-ptBR: Interface do usuário
+## Category-ruRU: Интерфейс пользователя
+## Category-zhCN: 用户界面
+## Category-zhTW: 使用者介面
 ## X-Curse-Project-ID: 334877
 ## X-Wago-ID: e56nwDK9
 
diff --git a/ExtendedCharacterStats-WOTLKC.toc b/ExtendedCharacterStats-WOTLKC.toc
@@ -11,6 +11,17 @@
 ## OptionalDeps: Ace3, CallbackHandler-1.0, LibStub
 ## SavedVariablesPerCharacter: ExtendedCharacterStats
 ## DefaultState: enabled
+## Category: User Interface
+## Category-deDE: Benutzerinterface
+## Category-esES: Interfaz de usuario
+## Category-esMX: Interfaz de usuario
+## Category-frFR: Interface utilisateur
+## Category-itIT: Interfaccia utente
+## Category-koKR: 사용자 인터페이스
+## Category-ptBR: Interface do usuário
+## Category-ruRU: Интерфейс пользователя
+## Category-zhCN: 用户界面
+## Category-zhTW: 使用者介面
 ## X-Curse-Project-ID: 334877
 ## X-Wago-ID: e56nwDK9
 
diff --git a/Modules/Config/DefenseSection.lua b/Modules/Config/DefenseSection.lua
@@ -1,4 +1,4 @@
----@type Config
+---@class Config
 local Config = ECSLoader:ImportModule("Config")
 local _Config = Config.private
 
diff --git a/Modules/Config/GeneralSection.lua b/Modules/Config/GeneralSection.lua
@@ -1,4 +1,4 @@
----@type Config
+---@class Config
 local Config = ECSLoader:ImportModule("Config")
 local _Config = Config.private
 
diff --git a/Modules/Config/ManaSection.lua b/Modules/Config/ManaSection.lua
@@ -1,4 +1,4 @@
----@type Config
+---@class Config
 local Config = ECSLoader:ImportModule("Config")
 local _Config = Config.private
 
diff --git a/Modules/Config/MeleeSection.lua b/Modules/Config/MeleeSection.lua
@@ -1,4 +1,4 @@
----@type Config
+---@class Config
 local Config = ECSLoader:ImportModule("Config")
 local _Config = Config.private
 
@@ -322,7 +322,7 @@ function _Config:LoadMeleeSection()
                         end,
                         get = function () return ExtendedCharacterStats.profile.melee.glance.damageBossLevel.display; end,
                         set = function (_, value)
-                            ExtendedCharacterStats.profile.melee.glance.damageSameLevel.display = value
+                            ExtendedCharacterStats.profile.melee.glance.damageBossLevel.display = value
                             Stats.RebuildStatInfos()
                         end,
                     },
diff --git a/Modules/Config/RangeSection.lua b/Modules/Config/RangeSection.lua
@@ -1,4 +1,4 @@
----@type Config
+---@class Config
 local Config = ECSLoader:ImportModule("Config")
 local _Config = Config.private
 
diff --git a/Modules/Config/SpellSchoolsSection.lua b/Modules/Config/SpellSchoolsSection.lua
@@ -1,4 +1,4 @@
----@type Config
+---@class Config
 local Config = ECSLoader:ImportModule("Config")
 local _Config = Config.private
 
diff --git a/Modules/Config/SpellSection.lua b/Modules/Config/SpellSection.lua
@@ -1,4 +1,4 @@
----@type Config
+---@class Config
 local Config = ECSLoader:ImportModule("Config")
 local _Config = Config.private
 
diff --git a/Modules/Data/Constants.lua b/Modules/Data/Constants.lua
@@ -1,4 +1,4 @@
----@type Data
+---@class Data
 local Data = ECSLoader:ImportModule("Data")
 
 Data.PHYSICAL_SCHOOL = 1
@@ -222,15 +222,15 @@ Data.Aura = {
         [10491] = (ECS.IsWotlk and 5/2 or nil), -- Mana Spring rank 2
         [10493] = (ECS.IsWotlk and 5/2 or nil), -- Mana Spring rank 3
         [10494] = (ECS.IsWotlk and 5/2 or nil), -- Mana Spring rank 4
-        [19742] = ((ECS.IsTbc or ECS.IsWotlk) and 1 or nil), -- Blessing of Wisdom rank 1
-        [19850] = ((ECS.IsTbc or ECS.IsWotlk) and 1 or nil), -- Blessing of Wisdom rank 2
-        [19852] = ((ECS.IsTbc or ECS.IsWotlk) and 1 or nil), -- Blessing of Wisdom rank 3
-        [19853] = ((ECS.IsTbc or ECS.IsWotlk) and 1 or nil), -- Blessing of Wisdom rank 4
-        [19854] = ((ECS.IsTbc or ECS.IsWotlk) and 1 or nil), -- Blessing of Wisdom rank 5
-        [25290] = ((ECS.IsTbc or ECS.IsWotlk) and 1 or nil), -- Blessing of Wisdom rank 6
+        [19742] = ((ECS.IsTBC or ECS.IsWotlk) and 1 or nil), -- Blessing of Wisdom rank 1
+        [19850] = ((ECS.IsTBC or ECS.IsWotlk) and 1 or nil), -- Blessing of Wisdom rank 2
+        [19852] = ((ECS.IsTBC or ECS.IsWotlk) and 1 or nil), -- Blessing of Wisdom rank 3
+        [19853] = ((ECS.IsTBC or ECS.IsWotlk) and 1 or nil), -- Blessing of Wisdom rank 4
+        [19854] = ((ECS.IsTBC or ECS.IsWotlk) and 1 or nil), -- Blessing of Wisdom rank 5
+        [25290] = ((ECS.IsTBC or ECS.IsWotlk) and 1 or nil), -- Blessing of Wisdom rank 6
         [25569] = (ECS.IsWotlk and 5/2 or nil), -- Mana Spring rank 5
-        [25894] = ((ECS.IsTbc or ECS.IsWotlk) and 1 or nil), -- Greater Blessing of Wisdom rank 1
-        [25918] = ((ECS.IsTbc or ECS.IsWotlk) and 1 or nil), -- Greater Blessing of Wisdom rank 2
+        [25894] = ((ECS.IsTBC or ECS.IsWotlk) and 1 or nil), -- Greater Blessing of Wisdom rank 1
+        [25918] = ((ECS.IsTBC or ECS.IsWotlk) and 1 or nil), -- Greater Blessing of Wisdom rank 2
         [27142] = 1, -- Blessing of Wisdom rank 7
         [27143] = 1, -- Greater Blessing of Wisdom rank 3
         [48935] = 1, -- Blessing of Wisdom rank 8
@@ -243,12 +243,12 @@ Data.Aura = {
         [58777] = 5/2, -- Mana Spring rank 8
     },
     PercentageMp5 = {
-        [12051] = ((ECS.IsTbc or ECS.IsWotlk) and 0.15/2*5 or nil), -- Evocation
-        [18792] = ((ECS.IsTbc or ECS.IsWotlk) and 0.03/4 or 0.02/4)*5, -- Fel Energy
+        [12051] = ((ECS.IsTBC or ECS.IsWotlk) and 0.15/2*5 or nil), -- Evocation
+        [18792] = ((ECS.IsTBC or ECS.IsWotlk) and 0.03/4 or 0.02/4)*5, -- Fel Energy
         [24355] = 0.02*5, -- Drink
         [24707] = 0.03*5, -- Food
         [25990] = 0.05*5, -- Graccu's Mince Meat Fruitcake
-        [26263] = ((ECS.IsTbc or ECS.IsWotlk) and 0.03 or 0.04)*5, -- Dim Sum
+        [26263] = ((ECS.IsTBC or ECS.IsWotlk) and 0.03 or 0.04)*5, -- Dim Sum
         [29055] = 0.04*5, -- Refreshing Red Apple
         [30024] = 0.2*5, -- Drink
         [30254] = 0.05*5, -- Evocation
@@ -325,16 +325,16 @@ Data.Aura = {
         [10491] = (ECS.IsWotlk and nil or 5/2), -- Mana Spring rank 2
         [10493] = (ECS.IsWotlk and nil or 5/2), -- Mana Spring rank 3
         [10494] = (ECS.IsWotlk and nil or 5/2), -- Mana Spring rank 4
-        [19742] = ((ECS.IsTbc or ECS.IsWotlk) and nil or 1), -- Blessing of Wisdom rank 1
-        [19850] = ((ECS.IsTbc or ECS.IsWotlk) and nil or 1), -- Blessing of Wisdom rank 2
-        [19852] = ((ECS.IsTbc or ECS.IsWotlk) and nil or 1), -- Blessing of Wisdom rank 3
-        [19853] = ((ECS.IsTbc or ECS.IsWotlk) and nil or 1), -- Blessing of Wisdom rank 4
-        [19854] = ((ECS.IsTbc or ECS.IsWotlk) and nil or 1), -- Blessing of Wisdom rank 5
+        [19742] = ((ECS.IsTBC or ECS.IsWotlk) and nil or 1), -- Blessing of Wisdom rank 1
+        [19850] = ((ECS.IsTBC or ECS.IsWotlk) and nil or 1), -- Blessing of Wisdom rank 2
+        [19852] = ((ECS.IsTBC or ECS.IsWotlk) and nil or 1), -- Blessing of Wisdom rank 3
+        [19853] = ((ECS.IsTBC or ECS.IsWotlk) and nil or 1), -- Blessing of Wisdom rank 4
+        [19854] = ((ECS.IsTBC or ECS.IsWotlk) and nil or 1), -- Blessing of Wisdom rank 5
         [24853] = 5/2, -- Mana Spring
-        [25290] = ((ECS.IsTbc or ECS.IsWotlk) and nil or 1), -- Blessing of Wisdom rank 6
+        [25290] = ((ECS.IsTBC or ECS.IsWotlk) and nil or 1), -- Blessing of Wisdom rank 6
         [25569] = (ECS.IsWotlk and nil or 5/2), -- Mana Spring rank 5
-        [25894] = ((ECS.IsTbc or ECS.IsWotlk) and nil or 1), -- Greater Blessing of Wisdom rank 1
-        [25918] = ((ECS.IsTbc or ECS.IsWotlk) and nil or 1), -- Greater Blessing of Wisdom rank 2
+        [25894] = ((ECS.IsTBC or ECS.IsWotlk) and nil or 1), -- Greater Blessing of Wisdom rank 1
+        [25918] = ((ECS.IsTBC or ECS.IsWotlk) and nil or 1), -- Greater Blessing of Wisdom rank 2
     },
     SpellCrit = {
         [24907] = ((ECS.IsTBC or ECS.IsWotlk) and 5 or nil), -- Moonkin Aura
diff --git a/Modules/Data/Data.lua b/Modules/Data/Data.lua
@@ -13,6 +13,7 @@ function Data.GetStatInfo(refName)
         return dataFunction()
     else
         ECS:Print("Invalid data refName: " .. refName)
+        return ""
     end
 end
 
diff --git a/Modules/Data/DataUtils.lua b/Modules/Data/DataUtils.lua
@@ -129,7 +129,7 @@ function DataUtils.GetRuneForEquipSlot(equipSlot)
 end
 
 ---@param itemLink ItemLink
----@return (number, number, number) | nil
+---@return number | nil, number | nil, number | nil
 function DataUtils:GetSocketedGemsFromItemLink(itemLink)
     if itemLink then
         local _, itemStringLink = GetItemInfo(itemLink)
diff --git a/Modules/Data/Defense.lua b/Modules/Data/Defense.lua
@@ -1,4 +1,4 @@
----@type Data
+---@class Data
 local Data = ECSLoader:ImportModule("Data")
 ---@type DataUtils
 local DataUtils = ECSLoader:ImportModule("DataUtils")
@@ -20,7 +20,7 @@ function Data:GetArmorValue()
     return DataUtils:Round(effectiveArmor, 2)
 end
 
----@return (number, number, number)
+---@return number, number, number
 function _Defense:GetCritReduction()
     local defBonus = Data:GetDefenseValue()
 
diff --git a/Modules/Data/General.lua b/Modules/Data/General.lua
@@ -1,4 +1,4 @@
----@type Data
+---@class Data
 local Data = ECSLoader:ImportModule("Data")
 ---@type DataUtils
 local DataUtils = ECSLoader:ImportModule("DataUtils")
diff --git a/Modules/Data/ItemSets.lua b/Modules/Data/ItemSets.lua
@@ -1,4 +1,4 @@
----@type Data
+---@class Data
 local Data = ECSLoader:ImportModule("Data")
 
 local _, _, classId = UnitClass("player")
@@ -132,10 +132,10 @@ function Data:GetSetBonusModifierMP5()
     )) then
         mod = mod + 0.15
     end
-    if (ECS.IsSod and Data:IsSetBonusActive(setNames.LIVING_GREEN_DRAGON_MAIL, 3)) then
+    if (ECS.IsSoD and Data:IsSetBonusActive(setNames.LIVING_GREEN_DRAGON_MAIL, 3)) then
         mod = mod + 0.15
     end
-    if (ECS.IsSod and Data:IsSetBonusActive(setNames.DAWN_OF_TRANSCENDENCE, 2)) then
+    if (ECS.IsSoD and Data:IsSetBonusActive(setNames.DAWN_OF_TRANSCENDENCE, 2)) then
         mod = mod + 0.15
     end
     if Data:IsSetBonusActive(setNames.PRIMAL_MOONCLOTH, 3) then
@@ -153,7 +153,7 @@ function Data:GetSetBonusValueMP5()
     ) then
         bonus = bonus + (ECS.IsWotlk and 5 or 4)
     end
-    if (ECS.IsSod and Data:IsSetBonusActive(setNames.LIVING_GREEN_DRAGON_MAIL, 2)) then
+    if (ECS.IsSoD and Data:IsSetBonusActive(setNames.LIVING_GREEN_DRAGON_MAIL, 2)) then
         bonus = bonus + 3
     end
     if Data:IsSetBonusActive(setNames.GREEN_DRAGON_MAIL, 2) then
@@ -181,13 +181,17 @@ function Data:GetSetBonusValueMP5()
     return bonus
 end
 
+---@return boolean
 function Data:HasNatureCritBonusModifier()
     if classId == Data.SHAMAN then
         return Data:IsSetBonusActive(setNames.TEN_STORMS, 5)
     end
     return false
 end
 
+---@param setName string
+---@param bonusLevel number
+---@return boolean
 function Data:IsSetBonusActive(setName, bonusLevel)
     local setItems = itemSets[setName]
     if (not setItems) then
diff --git a/Modules/Data/MP5.lua b/Modules/Data/MP5.lua
@@ -1,4 +1,4 @@
----@type Data
+---@class Data
 local Data = ECSLoader:ImportModule("Data")
 ---@type DataUtils
 local DataUtils = ECSLoader:ImportModule("DataUtils")
@@ -180,34 +180,34 @@ function _MP5:GetTalentModifier()
 
     if classId == Data.PRIEST then
         if C_SpellBook.IsSpellKnown(14777) then
-            mod = (ECS.IsTbc and 0.3 or (ECS.IsWotlk and 0.5 or 0.15))
+            mod = (ECS.IsTBC and 0.3 or (ECS.IsWotlk and 0.5 or 0.15))
         elseif C_SpellBook.IsSpellKnown(14776) then
-            mod = (ECS.IsTbc and 0.2 or (ECS.IsWotlk and 0.33 or 0.1))
+            mod = (ECS.IsTBC and 0.2 or (ECS.IsWotlk and 0.33 or 0.1))
         elseif C_SpellBook.IsSpellKnown(14521) then
-            mod = (ECS.IsTbc and 0.1 or (ECS.IsWotlk and 0.17 or 0.05))
+            mod = (ECS.IsTBC and 0.1 or (ECS.IsWotlk and 0.17 or 0.05))
         end
     elseif classId == Data.MAGE then
         if C_SpellBook.IsSpellKnown(18464) then
-            mod = (ECS.IsTbc and 0.3 or (ECS.IsWotlk and 0.5 or 0.15))
+            mod = (ECS.IsTBC and 0.3 or (ECS.IsWotlk and 0.5 or 0.15))
         elseif C_SpellBook.IsSpellKnown(18463) then
-            mod = (ECS.IsTbc and 0.2 or (ECS.IsWotlk and 0.33 or 0.1))
+            mod = (ECS.IsTBC and 0.2 or (ECS.IsWotlk and 0.33 or 0.1))
         elseif C_SpellBook.IsSpellKnown(18462) then
-            mod = (ECS.IsTbc and 0.1 or (ECS.IsWotlk and 0.17 or 0.05))
+            mod = (ECS.IsTBC and 0.1 or (ECS.IsWotlk and 0.17 or 0.05))
         end
         if C_SpellBook.IsSpellKnown(34296) then
-            mod = mod + (ECS.IsTbc and 0.3 or (ECS.IsWotlk and 0.5 or 0.15))
+            mod = mod + (ECS.IsTBC and 0.3 or (ECS.IsWotlk and 0.5 or 0.15))
         elseif C_SpellBook.IsSpellKnown(34295) then
-            mod = mod + (ECS.IsTbc and 0.2 or (ECS.IsWotlk and 0.33 or 0.1))
+            mod = mod + (ECS.IsTBC and 0.2 or (ECS.IsWotlk and 0.33 or 0.1))
         elseif C_SpellBook.IsSpellKnown(34293) then
-            mod = mod + (ECS.IsTbc and 0.1 or (ECS.IsWotlk and 0.17 or 0.05))
+            mod = mod + (ECS.IsTBC and 0.1 or (ECS.IsWotlk and 0.17 or 0.05))
         end
     elseif classId == Data.DRUID then
         if C_SpellBook.IsSpellKnown(17108) then
-            mod = (ECS.IsTbc and 0.3 or (ECS.IsWotlk and 0.5 or 0.15))
+            mod = (ECS.IsTBC and 0.3 or (ECS.IsWotlk and 0.5 or 0.15))
         elseif C_SpellBook.IsSpellKnown(17107) then
-            mod = (ECS.IsTbc and 0.2 or (ECS.IsWotlk and 0.33 or 0.1))
+            mod = (ECS.IsTBC and 0.2 or (ECS.IsWotlk and 0.33 or 0.1))
         elseif C_SpellBook.IsSpellKnown(17106) then
-            mod = (ECS.IsTbc and 0.1 or (ECS.IsWotlk and 0.17 or 0.05))
+            mod = (ECS.IsTBC and 0.1 or (ECS.IsWotlk and 0.17 or 0.05))
         end
     end
     return mod
diff --git a/Modules/Data/Melee.lua b/Modules/Data/Melee.lua
@@ -1,4 +1,4 @@
----@type Data
+---@class Data
 local Data = ECSLoader:ImportModule("Data")
 ---@type DataUtils
 local DataUtils = ECSLoader:ImportModule("DataUtils")
@@ -8,19 +8,19 @@ local Utils = ECSLoader:ImportModule("Utils")
 local _Melee = {}
 local _, _, classId = UnitClass("player")
 
----@return string
+---@return number
 function Data:GetMeleeAttackPower()
     local melee, posBuff, negBuff = UnitAttackPower("player")
     return melee + posBuff + negBuff
 end
 
----@return string
+---@return number
 function Data:GetMeleeAttackSpeedMainHand()
     local mainHand, _ = UnitAttackSpeed("player")
     return DataUtils:Round(mainHand, 2)
 end
 
----@return string
+---@return number
 function Data:GetMeleeAttackSpeedOffHand()
     local _, offHand = UnitAttackSpeed("player")
     return DataUtils:Round(offHand, 2)
@@ -50,6 +50,7 @@ function _Melee:GetHitRatingBonus()
     return (GetHitModifier() or 0) + _Melee.GetHitFromRunes()
 end
 
+---@return number
 function _Melee:GetHitTalentBonus()
     local mod = 0
 
@@ -94,6 +95,7 @@ function _Melee:GetHitTalentBonus()
     return mod
 end
 
+---@return number
 function _Melee:GetHitFromBuffs()
     local mod = 0
     local otherDraeneiInGroup = false
@@ -118,6 +120,7 @@ function _Melee:GetHitFromBuffs()
     return mod
 end
 
+---@return number
 function _Melee.GetHitFromRunes()
     local mod = 0
 
@@ -212,10 +215,12 @@ function Data:GlanceHitChanceByLevel(level)
     return DataUtils:Round(glancingChance*100, 2) .. "%"
 end
 
+---@return string
 function Data:GlanceDamageSameLevel()
     return Data:GlanceDamageByLevel(0)
 end
 
+---@return string
 function Data:GlanceDamageBossLevel()
     return Data:GlanceDamageByLevel(3)
 end
@@ -260,7 +265,7 @@ function Data:GetArmorPenetration()
     return DataUtils:Round(armorPenetration, 2) .. "%"
 end
 
----@return string
+---@return number
 function Data:GetArmorPenetrationRating()
     local armorPenetrationRating = GetCombatRating(CR_ARMOR_PENETRATION)
     return DataUtils:Round(armorPenetrationRating, 0)
diff --git a/Modules/Data/Ranged.lua b/Modules/Data/Ranged.lua
diff --git a/Modules/Data/SpellCrit.lua b/Modules/Data/SpellCrit.lua
diff --git a/Modules/Data/SpellDamage.lua b/Modules/Data/SpellDamage.lua
diff --git a/Modules/Data/SpellHit.lua b/Modules/Data/SpellHit.lua
diff --git a/Modules/Init.lua b/Modules/Init.lua
diff --git a/types/types.lua b/types/types.lua

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`----@type Config`
	`1`	`+---@class Config`
`2`	`2`	`local Config = ECSLoader:ImportModule("Config")`
`3`	`3`	`local _Config = Config.private`
`4`	`4`