Change some variable names

Anonomit · Feb 8, 2024 · 4012bb0 · 4012bb0
1 parent 20872c0
commit 4012bb0
Show file tree

Hide file tree

Showing 16 changed files with 134 additions and 147 deletions.
diff --git a/Config/OptionsTables.lua b/Config/OptionsTables.lua
@@ -329,7 +329,7 @@ local function CreateStatOption(opts, i, stat)
   local self = Addon
   local GUI  = self.GUI
 
-  local percent = Addon.isClassic and percentStats[stat] and "%" or ""
+  local percent = Addon.isEra and percentStats[stat] and "%" or ""
 
   local defaultText = GetDefaultStatText(sampleNumber .. percent, stat)
   local formattedText = GetFormattedStatText(sampleNumber .. percent, stat)

diff --git a/Config/Settings.lua b/Config/Settings.lua
@@ -25,9 +25,9 @@ function Addon:MakeDefaultOptions()
         },
 
         order = {
-          [self.expansions.wrath]   = tblConcat(self.statList[self.expansions.wrath]  , ","),
-          [self.expansions.tbc]     = tblConcat(self.statList[self.expansions.tbc]    , ","),
-          [self.expansions.classic] = tblConcat(self.statList[self.expansions.classic], ","),
+          [self.expansions.wrath] = tblConcat(self.statList[self.expansions.wrath]  , ","),
+          [self.expansions.tbc]   = tblConcat(self.statList[self.expansions.tbc]    , ","),
+          [self.expansions.era]   = tblConcat(self.statList[self.expansions.era], ","),
         },
         hide = {
           ["*"]               = false,

diff --git a/Init/Init.lua b/Init/Init.lua
@@ -239,38 +239,25 @@ end
 
 do
   Addon.expansions = {
-    retail    = 10,
-    cataclysm = 4,
-    cata      = 4,
-    wrath     = 3,
-    wotlk     = 3,
-    tbc       = 2,
-    bcc       = 2,
-    classic   = 1,
-    era       = 1,
+    retail = 10,
+    cata   = 4,
+    wrath  = 3,
+    tbc    = 2,
+    era    = 1,
   }
 
-  Addon.season = ((C_Seasons or {}).GetActiveSeason or nop)() or 0
   Addon.expansionLevel = tonumber(GetBuildInfo():match"^(%d+)%.")
-  if Addon.expansionLevel >= Addon.expansions.retail then
-    Addon.expansionName = "retail"
-  elseif Addon.expansionLevel >= Addon.expansions.wrath then
-    Addon.expansionName = "wrath"
-  elseif Addon.expansionLevel == Addon.expansions.tbc then
-    Addon.expansionName = "tbc"
-  elseif Addon.expansionLevel == Addon.expansions.classic then
-    Addon.expansionName = "classic"
-  end
-  Addon.isRetail  = Addon.expansionName == "retail"
-  Addon.isWrath   = Addon.expansionName == "wrath"
-  Addon.isTBC     = Addon.expansionName == "tbc"
-  Addon.isClassic = Addon.expansionName == "classic"
-
-  Addon.isSeasonOfMastery   = Addon.season == Enum.SeasonID.SeasonOfMastery
-  Addon.isSeasonOfDiscovery = Addon.season == (Enum.SeasonID.SeasonOfDiscovery or Enum.SeasonID.Placeholder)
-
-  Addon.isSoM = Addon.isSeasonOfMastery
-  Addon.isSoD = Addon.isSeasonOfDiscovery
+
+  Addon.isRetail  = Addon.expansionLevel >= Addon.expansions.retail
+  Addon.isClassic = not Addon.isRetail
+  Addon.isCata    = Addon.expansionLevel == Addon.expansions.cata
+  Addon.isWrath   = Addon.expansionLevel == Addon.expansions.wrath
+  Addon.isTBC     = Addon.expansionLevel == Addon.expansions.tbc
+  Addon.isEra     = Addon.expansionLevel == Addon.expansions.era
+
+  local season = ((C_Seasons or {}).GetActiveSeason or nop)() or 0
+  Addon.isSoM = season == Enum.SeasonID.SeasonOfMastery
+  Addon.isSoD = season == (Enum.SeasonID.SeasonOfDiscovery or Enum.SeasonID.Placeholder)
 end
 
 

diff --git a/Init/InitAddon.lua b/Init/InitAddon.lua
@@ -247,9 +247,9 @@ do
 
 
   Addon.statList = {
-    [Addon.expansions.classic] = {},
-    [Addon.expansions.tbc]     = {},
-    [Addon.expansions.wrath]   = {},
+    [Addon.expansions.era]   = {},
+    [Addon.expansions.tbc]   = {},
+    [Addon.expansions.wrath] = {},
   }
   Addon.statsInfo        = setmetatable({}, {__index = function() return {} end})
   Addon.statOrder        = {}
@@ -348,9 +348,9 @@ do
 
   -- Races: Human, Orc, Dwarf, Night Elf, Undead, Tauren, Gnome, Troll, Blood Elf, Draenei
   local raceIDs = {}
-  raceIDs[Addon.expansions.classic] = {1, 2, 3, 4, 5, 6, 7, 8}
-  raceIDs[Addon.expansions.tbc]     = {1, 2, 3, 4, 5, 6, 7, 8, 10, 11}
-  raceIDs[Addon.expansions.wrath]   = raceIDs[Addon.expansions.tbc]
+  raceIDs[Addon.expansions.era]   = {1, 2, 3, 4, 5, 6, 7, 8}
+  raceIDs[Addon.expansions.tbc]   = {1, 2, 3, 4, 5, 6, 7, 8, 10, 11}
+  raceIDs[Addon.expansions.wrath] = raceIDs[Addon.expansions.tbc]
 
   Addon.raceNames = {}
 
@@ -1164,7 +1164,7 @@ do
         33633,
       },
     } or nil,
-    [Addon.expansions.wotlk] = Addon.expansionLevel >= Addon.expansions.wotlk and {
+    [Addon.expansions.wrath] = Addon.expansionLevel >= Addon.expansions.wrath and {
       Socket_red = {
         39998,
         39996,

diff --git a/LocaleExtra/deDE.lua b/LocaleExtra/deDE.lua
@@ -37,7 +37,7 @@ Addon:AddExtraStatCapture("Holy Damage",
   {INPUT = "^%+(%d+) Heiligzauberschaden$"})
 
 
-if Addon.isClassic then
+if Addon.isEra then
   Addon:AddExtraStatCapture("Defense Rating",
     {INPUT = "^Verteidigung %+(%d+)%.$"})
 

diff --git a/LocaleExtra/enUS.lua b/LocaleExtra/enUS.lua
@@ -99,7 +99,7 @@ Addon:AddExtraStatCapture("Health Regeneration",
 
 
 
-if Addon.isClassic then
+if Addon.isEra then
   Addon:AddExtraStatCapture("Defense Rating",
     {INPUT = "^Increased Defense %+(%d+)%.$"})
 
@@ -249,7 +249,7 @@ if Addon.isTBC then
     }
   )
 end
-if Addon.isClassic then
+if Addon.isEra then
   Addon:AddExtraReplacement("Mount Speed",
     {
       INPUT  = "^Mithril Spurs", -- Mithril Spurs Enchantment (Mithril Spurs (464))

diff --git a/LocaleExtra/esES.lua b/LocaleExtra/esES.lua
@@ -18,7 +18,7 @@ end
 
 
 
-if Addon.isClassic then
+if Addon.isEra then
   Addon:AddExtraStatCapture("Stamina",
     {INPUT = "^(%+)(%d+) de aguante$"})
 

diff --git a/LocaleExtra/esMX.lua b/LocaleExtra/esMX.lua
@@ -43,7 +43,7 @@ Addon:AddExtraStatCapture("Health Regeneration",
   {INPUT = "^%+(%d+) salud cada 5 s$"})
 
 
-if Addon.isClassic then
+if Addon.isEra then
   Addon:AddExtraStatCapture("Defense Rating",
     {INPUT = "^Aumenta (%d+) p%. el índice de defensa%.$"})
 

diff --git a/LocaleExtra/frFR.lua b/LocaleExtra/frFR.lua
@@ -61,7 +61,7 @@ Addon:AddExtraStatCapture("Health Regeneration",
     {INPUT = "^%+(%d+) points? de vie toutes les 5 sec%.$"})
 
 
-if Addon.isClassic then
+if Addon.isEra then
     Addon:AddExtraStatCapture("Defense Rating",
     {INPUT = "^Défense augmentée de (%d+)%.$"})
 

diff --git a/LocaleExtra/koKR.lua b/LocaleExtra/koKR.lua
@@ -41,7 +41,7 @@ Addon:AddExtraStatCapture("Health Regeneration",
   {INPUT = "^5초당 생명력 회복 %+(%d+)$"})
 
 
-if Addon.isClassic then
+if Addon.isEra then
   Addon:AddExtraStatCapture("Defense Rating",
     {INPUT = "^방어 숙련도 %+(%d+)%.?$"})
 

diff --git a/LocaleExtra/ptBR.lua b/LocaleExtra/ptBR.lua
@@ -42,7 +42,7 @@ Addon:AddExtraStatCapture("Health Regeneration",
 Addon:AddExtraStatCapture("Mana Regeneration",
   {INPUT = "^Restaura (%d+) de mana a cada 5 s%.$"})
 
-if Addon.isClassic then
+if Addon.isEra then
   Addon:AddExtraStatCapture("Defense Rating",
     {INPUT = "^Defesa aumentada em (%d+)%.$"})
 

diff --git a/LocaleExtra/ruRU.lua b/LocaleExtra/ruRU.lua
@@ -95,7 +95,7 @@ Addon:AddExtraStatCapture("Health Regeneration",
   {INPUT = "^%+(%d+) ед%. здоровья каждые 5 секунд$"})
 
 
-if Addon.isClassic then
+if Addon.isEra then
   Addon:AddExtraStatCapture("Defense Rating",
     {INPUT = "^Увеличение рейтинга защиты на (%d+) ед%.$"})
 

diff --git a/LocaleExtra/zhCN.lua b/LocaleExtra/zhCN.lua
@@ -37,7 +37,7 @@ Addon:AddExtraStatCapture("Holy Damage",
   {INPUT = "^%+(%d+) 神圣法术伤害$"})
 
 
-if Addon.isClassic then
+if Addon.isEra then
   Addon:AddExtraStatCapture("Defense Rating",
     {INPUT = "^防御技能提高(%d+)点。$"})
 

diff --git a/LocaleExtra/zhTW.lua b/LocaleExtra/zhTW.lua
@@ -38,7 +38,7 @@ Addon:AddExtraStatCapture("Holy Damage",
   {INPUT = "^%+(%d+)神聖法術傷害$"},
   {INPUT = "^%+(%d+) 神聖法術傷害$"})
 
-if Addon.isClassic then
+if Addon.isEra then
   Addon:AddExtraStatCapture("Defense Rating",
     {INPUT = "^防禦技能提高(%d+)點。$"})