diff --git a/Locales/enUS/classes-specs.lua b/Locales/enUS/classes-specs.lua index a6905d4..1ae3d5b 100644 --- a/Locales/enUS/classes-specs.lua +++ b/Locales/enUS/classes-specs.lua @@ -33,7 +33,9 @@ ww_specNames = { ["Feral Tank"] = "Feral Tank", ["Fire"] = "Fire", ["Frost"] = "Frost", + ["Frost DW"] = "Frost DW", ["Fury"] = "Fury", + ["Fury TG"] = "Fury TG", ["Holy"] = "Holy", ["Marksmanship"] = "Marksmanship", ["Protection"] = "Protection", @@ -43,4 +45,5 @@ ww_specNames = { ["Subtlety"] = "Subtlety", ["Survival"] = "Survival", ["Unholy"] = "Unholy", + ["Unholy DW"] = "Unholy DW", } diff --git a/defaults.lua b/defaults.lua index 92c0550..a46f6ca 100644 --- a/defaults.lua +++ b/defaults.lua @@ -253,52 +253,73 @@ ww_defaultVars = { ["DEATHKNIGHT"] = { ww_specNames["Blood"], ww_specNames["Frost"], + ww_specNames["Frost DW"], ww_specNames["Unholy"], + ww_specNames["Unholy DW"], [ww_specNames["Blood"]] = { - ["melee dps"] = 500, - ["stamina"] = 100, - ["mastery rating"] = 100, - ["agility"] = 69, - ["dodge rating"] = 50, - ["parry rating"] = 43, - ["expertise rating"] = 38, - ["strength"] = 31, - ["critical strike rating"] = 22, - ["melee critical strike rating"] = 22, - ["armor"] = 18, - ["haste rating"] = 16, - ["hit rating"] = 16, + ["mastery rating"] = 1.2, + ["dodge rating"] = 1, + ["parry rating"] = 1, + ["stamina"] = 0.65, + ["expertise rating"] = 0.4, + ["strength"] = 0.284, + ["hit rating"] = 0.2, + ["armor"] = 0.153, triggers = { meleeDamage = true, - } + }, }, [ww_specNames["Frost"]] = { - ["strength"] = 100, - ["melee dps"] = 100, - ["hit rating"] = 43, - ["expertise rating"] = 41, - ["haste rating"] = 37, - ["mastery rating"] = 35, - ["attack power"] = 32, - ["critical strike rating"] = 26, - ["melee critical strike rating"] = 26, + ["melee dps"] = 10.09, + ["strength"] = 2.83, + ["hit rating"] = 2.26, + ["expertise rating"] = 1.75, + ["haste rating"] = 1.4, + ["mastery rating"] = 1.37, + ["critical strike rating"] = 1.34, + ["attack power"] = 1, triggers = { meleeDamage = true, - } + }, + }, + [ww_specNames["Frost DW"]] = { + ["melee dps"] = (6.69 + 4.12) / 2, + ["strength"] = 3.08, + ["hit rating"] = 2.14, + ["haste rating"] = 1.58, + ["expertise rating"] = 1.51, + ["mastery rating"] = 1.33, + ["attack power"] = 1.12, + ["critical strike rating"] = 1.09, + triggers = { + meleeDamage = true, + }, }, [ww_specNames["Unholy"]] = { - ["strength"] = 100, - ["melee dps"] = 100, - ["hit rating"] = 25, - ["haste rating"] = 25, - ["attack power"] = 23, - ["expertise rating"] = 21, - ["critical strike rating"] = 20, - ["melee critical strike rating"] = 20, - ["mastery rating"] = 8, + ["melee dps"] = 5.91, + ["strength"] = 3.24, + ["hit rating"] = 2.67, + ["haste rating"] = 1.64, + ["mastery rating"] = 1.33, + ["critical strike rating"] = 1.26, + ["expertise rating"] = 0.98, + ["attack power"] = 0.82, + triggers = { + meleeDamage = true, + }, + }, + [ww_specNames["Unholy DW"]] = { + ["melee dps"] = (3.5 + 3.2) / 2, + ["strength"] = 3.1, + ["hit rating"] = 1.1, + ["haste rating"] = 1.01, + ["mastery rating"] = 0.9, + ["expertise rating"] = 0.82, + ["attack power"] = 0.79, + ["critical strike rating"] = 0.76, triggers = { meleeDamage = true, - } + }, }, }, ["DRUID"] = { @@ -307,63 +328,57 @@ ww_defaultVars = { ww_specNames["Feral Tank"], ww_specNames["Restoration"], [ww_specNames["Balance"]] = { - ["intellect"] = 100, - ["spell power"] = 100, - ["spirit"] = 90, - ["haste rating"] = 90, - ["hit rating"] = 90, - ["spell hit rating"] = 90, - ["mastery rating"] = 80, - ["critical strike rating"] = 70, - ["spell critical strike rating"] = 70, + ["intellect"] = 2.97, + ["hit rating"] = 2.4, + ["spirit"] = 2.4, + ["spell power"] = 2.3, + ["haste rating"] = 2.15, + ["mastery rating"] = 1.45, + ["critical strike rating"] = 0.87, triggers = { harmfulSpell = true, - } + }, }, [ww_specNames["Feral DPS"]] = { - ["melee dps"] = 151, - ["agility"] = 100, - ["strength"] = 78, - ["attack power"] = 37, - ["mastery rating"] = 35, - ["haste rating"] = 32, - ["expertise rating"] = 29, - ["hit rating"] = 28, - ["critical strike rating"] = 28, - ["melee critical strike rating"] = 28, + ["melee dps"] = 6.604, + ["agility"] = 3.775, + ["strength"] = 1.445, + ["attack power"] = 1.376, + ["critical strike rating"] = 1.291, + ["haste rating"] = 1.291, + ["mastery rating"] = 1.291, + ["expertise rating"] = 1.24, + ["hit rating"] = 1.24, triggers = { meleeDamage = true, - } + }, }, [ww_specNames["Feral Tank"]] = { - ["stamina"] = 100, - ["armor"] = 75, - ["agility"] = 48, - ["dodge rating"] = 41, - ["mastery rating"] = 16, - ["critical strike rating"] = 13, - ["melee critical strike rating"] = 13, - ["strength"] = 10, - ["expertise rating"] = 10, - ["health"] = 7, - ["attack power"] = 5, - ["hit rating"] = 5, - ["haste rating"] = 1, + ["agility"] = 1, + ["dodge rating"] = 0.88, + ["armor"] = 0.71, + ["mastery rating"] = 0.48, + ["stamina"] = 0.31, + ["expertise rating"] = 0.3, + ["critical strike rating"] = 0.28, + ["hit rating"] = 0.15, + ["strength"] = 0.126, + ["attack power"] = 0.12, + ["haste rating"] = 0.04, triggers = { meleeDamage = true, - } + }, }, [ww_specNames["Restoration"]] = { ["intellect"] = 100, - ["spell power"] = 95, - ["spirit"] = 90, - ["mastery rating"] = 80, - ["haste rating"] = 70, - ["critical strike rating"] = 60, - ["spell critical strike rating"] = 60, + ["spell power"] = 85, + ["spirit"] = 75, + ["haste rating"] = 65, + ["mastery rating"] = 60, + ["critical strike rating"] = 50, triggers = { helpfulSpell = true, - } + }, }, }, ["HUNTER"] = { @@ -371,46 +386,42 @@ ww_defaultVars = { ww_specNames["Marksmanship"], ww_specNames["Survival"], [ww_specNames["Beast Mastery"]] = { - ["agility"] = 100, - ["ranged dps"] = 100, - ["hit rating"] = 80, - ["ranged hit rating"] = 80, - ["critical strike rating"] = 60, - ["ranged critical strike rating"] = 60, - ["mastery rating"] = 40, - ["haste rating"] = 20, - ["ranged haste rating"] = 20, + ["ranged dps"] = 5.03, + ["agility"] = 3.17, + ["hit rating"] = 2.58, + ["critical strike rating"] = 2.31, + ["haste rating"] = 1.37, + ["attack power"] = 1.2, + ["mastery rating"] = 0.73, triggers = { rangedDamage = true, - } + }, }, [ww_specNames["Marksmanship"]] = { - ["agility"] = 100, - ["ranged dps"] = 100, - ["hit rating"] = 80, - ["ranged hit rating"] = 80, - ["critical strike rating"] = 60, - ["ranged critical strike rating"] = 60, - ["haste rating"] = 60, - ["ranged haste rating"] = 60, - ["mastery rating"] = 40, + ["ranged weapon speed"] = 11.78, + ["ranged dps"] = 7.68, + ["agility"] = 3.72, + ["hit rating"] = 3.49, + ["critical strike rating"] = 1.66, + ["haste rating"] = 1.61, + ["mastery rating"] = 1.38, + ["attack power"] = 1.19, triggers = { rangedDamage = true, - } + }, }, [ww_specNames["Survival"]] = { - ["agility"] = 100, - ["ranged dps"] = 100, - ["hit rating"] = 80, - ["ranged hit rating"] = 80, - ["critical strike rating"] = 60, - ["ranged critical strike rating"] = 60, - ["haste rating"] = 40, - ["ranged haste rating"] = 40, - ["mastery rating"] = 20, + ["ranged weapon speed"] = 7.63, + ["ranged dps"] = 5.33, + ["agility"] = 3.33, + ["hit rating"] = 2.66, + ["haste rating"] = 1.5, + ["attack power"] = 1.04, + ["critical strike rating"] = 1.02, + ["mastery rating"] = 0.95, triggers = { rangedDamage = true, - } + }, }, }, ["MAGE"] = { @@ -418,44 +429,37 @@ ww_defaultVars = { ww_specNames["Fire"], ww_specNames["Frost"], [ww_specNames["Arcane"]] = { - ["spell power"] = 100, - ["intellect"] = 100, - ["hit rating"] = 80, - ["spell hit rating"] = 80, - ["haste rating"] = 50, - ["critical strike rating"] = 45, - ["spell critical strike rating"] = 45, - ["mastery rating"] = 40, + ["intellect"] = 5.16, + ["hit rating"] = 3.21, + ["spell power"] = 2.8, + ["mastery rating"] = 1.4, + ["critical strike rating"] = 1.34, + ["haste rating"] = 1.28, triggers = { harmfulSpell = true, - } + }, }, [ww_specNames["Fire"]] = { - ["intellect"] = 100, - ["hit rating"] = 82, - ["spell hit rating"] = 82, - ["spell power"] = 68, - ["fire spell damage"] = 68, - ["critical strike rating"] = 52, - ["spell critical strike rating"] = 52, - ["mastery rating"] = 37, - ["haste rating"] = 35, + ["intellect"] = 3.43, + ["hit rating"] = 2.72, + ["spell power"] = 2.57, + ["haste rating"] = 1.59, + ["critical strike rating"] = 1.55, + ["mastery rating"] = 1.3, triggers = { harmfulSpell = true, - } + }, }, [ww_specNames["Frost"]] = { - ["intellect"] = 100, - ["spell power"] = 100, - ["hit rating"] = 80, - ["spell hit rating"] = 80, - ["mastery rating"] = 70, - ["haste rating"] = 50, - ["critical strike rating"] = 45, - ["spell critical strike rating"] = 45, + ["intellect"] = 3.68, + ["hit rating"] = 3.08, + ["spell power"] = 2.66, + ["critical strike rating"] = 1.97, + ["haste rating"] = 1.61, + ["mastery rating"] = 1.43, triggers = { harmfulSpell = true, - } + }, }, }, ["PALADIN"] = { @@ -464,42 +468,42 @@ ww_defaultVars = { ww_specNames["Retribution"], [ww_specNames["Holy"]] = { ["intellect"] = 100, - ["haste rating"] = 80, - ["spirit"] = 50, - ["mastery rating"] = 50, - ["spell power"] = 50, - ["critical strike rating"] = 25, - ["spell critical strike rating"] = 25, + ["spell power"] = 80, + ["spirit"] = 75, + ["haste rating"] = 40, + ["critical strike rating"] = 35, + ["mastery rating"] = 30, triggers = { helpfulSpell = true, - } + }, }, [ww_specNames["Protection"]] = { - ["stamina"] = 100, - ["mastery rating"] = 90, - ["dodge rating"] = 80, - ["parry rating"] = 80, - ["hit rating"] = 70, - ["expertise rating"] = 60, - ["strength"] = 50, + ["dodge rating"] = 1.23, + ["parry rating"] = 1.23, + ["mastery rating"] = 1, + ["stamina"] = 0.6, + ["strength"] = 0.349, + ["armor"] = 0.155, + ["expertise rating"] = 0.1, + ["hit rating"] = 0.05, triggers = { - harmfulSpell = true, meleeDamage = true, - } + }, }, [ww_specNames["Retribution"]] = { - ["strength"] = 100, - ["melee dps"] = 100, - ["attack power"] = 45, - ["hit rating"] = 35, - ["expertise rating"] = 22, - ["haste rating"] = 18, - ["critical strike rating"] = 16, - ["mastery rating"] = 9, + ["melee weapon speed"] = 18.848, + ["melee dps"] = 9, + ["strength"] = 2.33, + ["hit rating"] = 1.55 + 0.22, + ["expertise rating"] = 1.3, + ["mastery rating"] = 1.13, + ["attack power"] = 1, + ["critical strike rating"] = 0.98, + ["haste rating"] = 0.79, triggers = { harmfulSpell = true, meleeDamage = true, - } + }, }, }, ["PRIEST"] = { @@ -509,39 +513,36 @@ ww_defaultVars = { [ww_specNames["Discipline"]] = { ["intellect"] = 100, ["spirit"] = 80, - ["spell power"] = 19, - ["critical strike rating"] = 11, - ["spell critical strike rating"] = 11, - ["haste rating"] = 10, - ["mastery rating"] = 6, + ["spell power"] = 75, + ["mastery rating"] = 60, + ["haste rating"] = 50, + ["critical strike rating"] = 40, triggers = { helpfulSpell = true, - } + }, }, [ww_specNames["Holy"]] = { ["intellect"] = 100, - ["spirit"] = 95, - ["haste rating"] = 85, - ["mastery rating"] = 80, - ["critical strike rating"] = 30, - ["spell critical strike rating"] = 30, + ["spirit"] = 80, + ["haste rating"] = 75, + ["spell power"] = 75, + ["mastery rating"] = 70, + ["critical strike rating"] = 50, triggers = { helpfulSpell = true, - } + }, }, [ww_specNames["Shadow"]] = { - ["intellect"] = 100, - ["spell power"] = 79, - ["haste rating"] = 50, - ["critical strike rating"] = 40, - ["spell critical strike rating"] = 40, - ["mastery rating"] = 38, - ["hit rating"] = 37, - ["spell hit rating"] = 37, - ["spirit"] = 37, + ["intellect"] = 3.54, + ["spell power"] = 2.72, + ["haste rating"] = 2, + ["hit rating"] = 1.92, + ["spirit"] = 1.92, + ["mastery rating"] = 1.84, + ["critical strike rating"] = 1.67, triggers = { harmfulSpell = true, - } + }, }, }, ["ROGUE"] = { @@ -549,43 +550,44 @@ ww_defaultVars = { ww_specNames["Combat"], ww_specNames["Subtlety"], [ww_specNames["Assassination"]] = { - ["melee dps"] = 100, - ["agility"] = 100, - ["hit rating"] = 67, - ["mastery rating"] = 50, - ["haste rating"] = 46, - ["expertise rating"] = 42, - ["critical strike rating"] = 35, - ["melee critical strike rating"] = 35, + ["agility"] = 2.6, + ["melee dps"] = (3.36 + 1.04) / 2, + ["hit rating"] = 1.1 + 0.65, + ["mastery rating"] = 1.3, + ["haste rating"] = 1.2, + ["expertise rating"] = 1.1, + ["attack power"] = 1, + ["critical strike rating"] = 0.9, triggers = { meleeDamage = true, - } + }, }, [ww_specNames["Combat"]] = { - ["melee dps"] = 100, - ["agility"] = 100, - ["hit rating"] = 70, - ["expertise rating"] = 59, - ["haste rating"] = 56, - ["critical strike rating"] = 35, - ["melee critical strike rating"] = 35, - ["mastery rating"] = 33, + ["melee dps"] = (4.97 + 1.15) / 2, + ["agility"] = 2.7, + ["hit rating"] = 1.65 + 0.3, + ["expertise rating"] = 1.65, + ["haste rating"] = 1.5, + ["mastery rating"] = 1.2, + ["attack power"] = 1, + ["critical strike rating"] = 0.9, + ["melee weapon speed"] = (4 + -9) / 2, triggers = { meleeDamage = true, - } + }, }, [ww_specNames["Subtlety"]] = { - ["melee dps"] = 100, - ["agility"] = 100, - ["hit rating"] = 40, - ["haste rating"] = 37, - ["expertise rating"] = 33, - ["critical strike rating"] = 31, - ["melee critical strike rating"] = 31, - ["mastery rating"] = 20, + ["agility"] = 3.6, + ["melee dps"] = (4 + 1) / 2, + ["hit rating"] = 1.15 + 0.25, + ["haste rating"] = 1.35, + ["attack power"] = 1.26, + ["expertise rating"] = 1.15, + ["critical strike rating"] = 1.1, + ["mastery rating"] = 0.9, triggers = { meleeDamage = true, - } + }, }, }, ["SHAMAN"] = { @@ -593,48 +595,43 @@ ww_defaultVars = { ww_specNames["Enhancement"], ww_specNames["Restoration"], [ww_specNames["Elemental"]] = { - ["hit rating"] = 100, - ["spell hit rating"] = 100, - ["spell power"] = 80, - ["intellect"] = 80, - ["mastery rating"] = 75, - ["haste rating"] = 75, - ["critical strike rating"] = 40, - ["spell critical strike rating"] = 40, + ["intellect"] = 2.9, + ["spell power"] = 2.32, + ["hit rating"] = 1.74, + ["spirit"] = 1.74, + ["haste rating"] = 1.6, + ["mastery rating"] = 1.33, + ["critical strike rating"] = 1.02, triggers = { harmfulSpell = true, - } + }, }, [ww_specNames["Enhancement"]] = { - ["melee dps"] = 124, - ["agility"] = 100, - ["hit rating"] = 60, - ["expertise rating"] = 48, - ["mastery rating"] = 44, - ["strength"] = 42, - ["attack power"] = 40, - ["intellect"] = 36, - ["spell power"] = 36, - ["critical strike rating"] = 28, - ["melee critical strike rating"] = 28, - ["haste rating"] = 16, + ["melee dps"] = (4.34 + 3.96) / 2, + ["agility"] = 3.51, + ["hit rating"] = 2.15 + 1.3, + ["expertise rating"] = 2.15, + ["mastery rating"] = 1.73, + ["strength"] = 1.41, + ["attack power"] = 1.33, + ["critical strike rating"] = 1.26, + ["spell power"] = 1.06, + ["haste rating"] = 1.03, triggers = { harmfulSpell = true, meleeDamage = true, - } + }, }, [ww_specNames["Restoration"]] = { ["intellect"] = 100, - ["spell power"] = 83, - ["spirit"] = 75, - ["haste rating"] = 67, - ["critical strike rating"] = 58, - ["spell critical strike rating"] = 58, - ["mastery rating"] = 42, - ["stamina"] = 8, + ["spirit"] = 90, + ["spell power"] = 75, + ["haste rating"] = 60, + ["mastery rating"] = 55, + ["critical strike rating"] = 40, triggers = { helpfulSpell = true, - } + }, }, }, ["WARLOCK"] = { @@ -642,89 +639,95 @@ ww_defaultVars = { ww_specNames["Demonology"], ww_specNames["Destruction"], [ww_specNames["Affliction"]] = { - ["intellect"] = 100, - ["spell power"] = 81, - ["hit rating"] = 52, - ["spell hit rating"] = 52, - ["haste rating"] = 43, - ["critical strike rating"] = 32, - ["spell critical strike rating"] = 32, - ["mastery rating"] = 30, - ["stamina"] = 1, + ["intellect"] = 3.11, + ["spell power"] = 2.64, + ["hit rating"] = 1.65, + ["haste rating"] = 1.4, + ["critical strike rating"] = 1.15, + ["mastery rating"] = 1.15, triggers = { harmfulSpell = true, - } + }, }, [ww_specNames["Demonology"]] = { - ["intellect"] = 100, - ["spell power"] = 79, - ["hit rating"] = 63, - ["spell hit rating"] = 63, - ["haste rating"] = 40, - ["critical strike rating"] = 35, - ["spell critical strike rating"] = 35, - ["mastery rating"] = 31, - ["stamina"] = 1, + ["intellect"] = 3, + ["hit rating"] = 2.39, + ["spell power"] = 2.39, + ["haste rating"] = 1.5, + ["mastery rating"] = 1.38, + ["critical strike rating"] = 1.16, triggers = { harmfulSpell = true, - } + }, }, [ww_specNames["Destruction"]] = { - ["intellect"] = 100, - ["spell power"] = 77, - ["hit rating"] = 64, - ["spell hit rating"] = 64, - ["haste rating"] = 36, - ["critical strike rating"] = 34, - ["spell critical strike rating"] = 34, - ["mastery rating"] = 29, - ["stamina"] = 1, + ["intellect"] = 3.01, + ["spell power"] = 2.35, + ["haste rating"] = 1.54, + ["hit rating"] = 1.51, + ["critical strike rating"] = 1.21, + ["mastery rating"] = 0.75, triggers = { harmfulSpell = true, - } + }, }, }, ["WARRIOR"] = { ww_specNames["Arms"], ww_specNames["Fury"], + ww_specNames["Fury TG"], ww_specNames["Protection"], [ww_specNames["Arms"]] = { - ["strength"] = 100, - ["hit rating"] = 90, - ["expertise rating"] = 85, - ["critical strike rating"] = 80, - ["melee critical strike rating"] = 80, - ["mastery rating"] = 70, - ["haste rating"] = 50, + ["melee dps"] = 10.57, + ["strength"] = 2.02, + ["hit rating"] = 2, + ["expertise rating"] = 1.46, + ["critical strike rating"] = 1.34, + ["mastery rating"] = 0.9, + ["attack power"] = 0.88, + ["haste rating"] = 0.8, triggers = { meleeDamage = true, - } + }, }, [ww_specNames["Fury"]] = { - ["strength"] = 100, - ["expertise rating"] = 90, - ["hit rating"] = 90, - ["critical strike rating"] = 80, - ["melee critical strike rating"] = 80, - ["mastery rating"] = 70, - ["haste rating"] = 50, + ["melee dps"] = (5.21 + 3) / 2, + ["strength"] = 3.25, + ["hit rating"] = 3.2, + ["expertise rating"] = 2.29, + ["critical strike rating"] = 2.02, + ["attack power"] = 1.45, + ["haste rating"] = 1.33, + ["mastery rating"] = 1.24, triggers = { meleeDamage = true, - } + }, + }, + [ww_specNames["Fury TG"]] = { + ["melee dps"] = (5.91 + 2.7) / 2, + ["strength"] = 2.98, + ["expertise rating"] = 2.47, + ["hit rating"] = 2.47, + ["critical strike rating"] = 1.98, + ["mastery rating"] = 1.57, + ["haste rating"] = 1.37, + ["attack power"] = 1.36, + triggers = { + meleeDamage = true, + }, }, [ww_specNames["Protection"]] = { - ["stamina"] = 100, - ["mastery rating"] = 90, - ["parry rating"] = 85, - ["dodge rating"] = 80, - ["expertise rating"] = 70, - ["hit rating"] = 65, - ["strength"] = 60, - ["critical strike rating"] = 50, - ["melee critical strike rating"] = 50, + ["parry rating"] = 1.54, + ["dodge rating"] = 1.496, + ["mastery rating"] = 1, + ["stamina"] = 0.6, + ["strength"] = 0.437, + ["armor"] = 0.155, + ["expertise rating"] = 0.1, + ["hit rating"] = 0.05, triggers = { meleeDamage = true, - } + }, }, }, },