From 428e855b3159e3910dca03e66d427583b2773cf3 Mon Sep 17 00:00:00 2001 From: Kevin Lyles Date: Sat, 3 Nov 2012 13:21:01 -0500 Subject: [PATCH] Updated to the latest weights --- defaults.lua | 518 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 257 insertions(+), 261 deletions(-) diff --git a/defaults.lua b/defaults.lua index 054b951..89aff2a 100644 --- a/defaults.lua +++ b/defaults.lua @@ -279,66 +279,53 @@ ww_defaultVars = { ww_specNames["Unholy"], ww_specNames["Unholy DW"], [ww_specNames["Blood"]] = { - ["mastery"] = 1.2, + ["mastery"] = 1.3, + ["strength"] = 1.2, ["dodge"] = 1, ["parry"] = 1, ["stamina"] = 0.65, - ["expertise"] = 0.4, - ["strength"] = 0.284, + ["armor"] = 0.4, + ["expertise"] = 0.2, ["hit"] = 0.2, - ["armor"] = 0.153, triggers = { meleeDamage = true, }, }, [ww_specNames["Frost"]] = { - ["melee dps"] = 10.09, - ["strength"] = 2.83, - ["hit"] = 2.26, - ["expertise"] = 1.75, - ["haste"] = 1.4, - ["mastery"] = 1.37, - ["critical strike"] = 1.34, - ["attack power"] = 1, + ["melee dps"] = 9.1, + ["strength"] = 2.72, + ["expertise"] = 2.45, + ["hit"] = 2.19, + ["haste"] = 1.53, + ["critical strike"] = 1.3, + ["attack power"] = 1.13, + ["mastery"] = 0.97, triggers = { meleeDamage = true, }, }, [ww_specNames["Frost DW"]] = { - ["melee dps"] = (6.69 + 4.12) / 2, - ["strength"] = 3.08, - ["hit"] = 2.14, - ["haste"] = 1.58, - ["expertise"] = 1.51, - ["mastery"] = 1.33, - ["attack power"] = 1.12, - ["critical strike"] = 1.09, + ["melee dps"] = (5.58 + 2.64) / 2, + ["strength"] = 3.06, + ["expertise"] = 3, + ["hit"] = 3, + ["mastery"] = 2.06, + ["haste"] = 2.03, + ["critical strike"] = 1.56, + ["attack power"] = 1.31, triggers = { meleeDamage = true, }, }, [ww_specNames["Unholy"]] = { - ["melee dps"] = 5.91, - ["strength"] = 3.24, - ["hit"] = 2.67, - ["haste"] = 1.64, - ["mastery"] = 1.33, - ["critical strike"] = 1.26, - ["expertise"] = 0.98, - ["attack power"] = 0.82, - triggers = { - meleeDamage = true, - }, - }, - [ww_specNames["Unholy DW"]] = { - ["melee dps"] = (3.5 + 3.2) / 2, - ["strength"] = 3.1, - ["hit"] = 1.1, - ["haste"] = 1.01, - ["mastery"] = 0.9, - ["expertise"] = 0.82, - ["attack power"] = 0.79, - ["critical strike"] = 0.76, + ["melee dps"] = 4.61, + ["strength"] = 3.36, + ["expertise"] = 2.2, + ["hit"] = 2.2, + ["haste"] = 1.66, + ["critical strike"] = 1.48, + ["attack power"] = 1.35, + ["mastery"] = 1.18, triggers = { meleeDamage = true, }, @@ -350,54 +337,54 @@ ww_defaultVars = { ww_specNames["Feral Tank"], ww_specNames["Restoration"], [ww_specNames["Balance"]] = { - ["intellect"] = 2.97, - ["hit"] = 2.4, - ["spirit"] = 2.4, - ["spell power"] = 2.3, - ["haste"] = 2.15, - ["mastery"] = 1.45, - ["critical strike"] = 0.87, + ["intellect"] = 3.66, + ["hit"] = 3.31, + ["spirit"] = 3.31, + ["spell power"] = 3.03, + ["haste"] = 2, + ["critical strike"] = 1.91, + ["mastery"] = 1.65, triggers = { harmfulSpell = true, }, }, [ww_specNames["Feral DPS"]] = { - ["melee dps"] = 6.604, - ["agility"] = 3.775, - ["strength"] = 1.445, - ["attack power"] = 1.376, - ["critical strike"] = 1.291, - ["haste"] = 1.291, - ["mastery"] = 1.291, - ["expertise"] = 1.24, - ["hit"] = 1.24, + ["melee dps"] = 4.76, + ["agility"] = 4.95, + ["strength"] = 2.03, + ["mastery"] = 2.02, + ["attack power"] = 1.92, + ["expertise"] = 1.56, + ["hit"] = 1.56, + ["critical strike"] = 1.54, + ["haste"] = 1.44, triggers = { meleeDamage = true, }, }, [ww_specNames["Feral Tank"]] = { - ["agility"] = 1, - ["dodge"] = 0.88, - ["armor"] = 0.71, - ["mastery"] = 0.48, + ["agility"] = 1.7, + ["dodge"] = 1.4, + ["mastery"] = 0.75, + ["critical strike"] = 0.7, + ["haste"] = 0.4, + ["expertise"] = 0.35, + ["hit"] = 0.35, ["stamina"] = 0.31, - ["expertise"] = 0.3, - ["critical strike"] = 0.28, - ["hit"] = 0.15, - ["strength"] = 0.126, - ["attack power"] = 0.12, - ["haste"] = 0.04, + ["armor"] = 0.3, + ["strength"] = 0.053, + ["attack power"] = 0.05, triggers = { meleeDamage = true, }, }, [ww_specNames["Restoration"]] = { - ["intellect"] = 100, - ["spell power"] = 85, - ["spirit"] = 75, - ["haste"] = 65, - ["mastery"] = 60, - ["critical strike"] = 50, + ["intellect"] = 1, + ["spell power"] = 0.85, + ["haste"] = 0.8, + ["spirit"] = 0.75, + ["mastery"] = 0.65, + ["critical strike"] = 0.6, triggers = { helpfulSpell = true, }, @@ -408,39 +395,43 @@ ww_defaultVars = { ww_specNames["Marksmanship"], ww_specNames["Survival"], [ww_specNames["Beast Mastery"]] = { - ["ranged dps"] = 5.03, - ["agility"] = 3.17, - ["hit"] = 2.58, - ["critical strike"] = 2.31, - ["haste"] = 1.37, - ["attack power"] = 1.2, - ["mastery"] = 0.73, + ["ranged dps"] = 3.93, + ["ranged weapon speed"] = 3.23, + ["agility"] = 4.36, + ["expertise"] = 2.8, + ["hit"] = 2.8, + ["attack power"] = 1.67, + ["critical strike"] = 1.6, + ["haste"] = 1.4, + ["mastery"] = 1.31, triggers = { rangedDamage = true, }, }, [ww_specNames["Marksmanship"]] = { - ["ranged weapon speed"] = 11.78, - ["ranged dps"] = 7.68, - ["agility"] = 3.72, - ["hit"] = 3.49, - ["critical strike"] = 1.66, - ["haste"] = 1.61, - ["mastery"] = 1.38, - ["attack power"] = 1.19, + ["ranged weapon speed"] = 8.03, + ["ranged dps"] = 6.68, + ["agility"] = 3.37, + ["expertise"] = 3.19, + ["hit"] = 3.19, + ["critical strike"] = 1.45, + ["haste"] = 1.32, + ["attack power"] = 1.24, + ["mastery"] = 0.92, triggers = { rangedDamage = true, }, }, [ww_specNames["Survival"]] = { - ["ranged weapon speed"] = 7.63, - ["ranged dps"] = 5.33, - ["agility"] = 3.33, - ["hit"] = 2.66, - ["haste"] = 1.5, - ["attack power"] = 1.04, - ["critical strike"] = 1.02, - ["mastery"] = 0.95, + ["ranged dps"] = 3.34, + ["ranged weapon speed"] = 3.18, + ["agility"] = 4.26, + ["expertise"] = 2.86, + ["hit"] = 2.86, + ["attack power"] = 1.67, + ["critical strike"] = 1.26, + ["haste"] = 1.2, + ["mastery"] = 0.73, triggers = { rangedDamage = true, }, @@ -451,34 +442,34 @@ ww_defaultVars = { ww_specNames["Fire"], ww_specNames["Frost"], [ww_specNames["Arcane"]] = { - ["intellect"] = 5.16, - ["hit"] = 3.21, - ["spell power"] = 2.8, - ["mastery"] = 1.4, - ["critical strike"] = 1.34, - ["haste"] = 1.28, + ["intellect"] = 4.43, + ["spell power"] = 3.68, + ["hit"] = 3.19, + ["mastery"] = 2.49, + ["haste"] = 2.2, + ["critical strike"] = 1.67, triggers = { harmfulSpell = true, }, }, [ww_specNames["Fire"]] = { - ["intellect"] = 3.43, - ["hit"] = 2.72, - ["spell power"] = 2.57, - ["haste"] = 1.59, - ["critical strike"] = 1.55, - ["mastery"] = 1.3, + ["intellect"] = 4.8, + ["hit"] = 3.79, + ["spell power"] = 3.62, + ["critical strike"] = 3.12, + ["haste"] = 2.62, + ["mastery"] = 2.23, triggers = { harmfulSpell = true, }, }, [ww_specNames["Frost"]] = { - ["intellect"] = 3.68, - ["hit"] = 3.08, - ["spell power"] = 2.66, - ["critical strike"] = 1.97, - ["haste"] = 1.61, - ["mastery"] = 1.43, + ["intellect"] = 4.41, + ["spell power"] = 3.59, + ["hit"] = 3, + ["haste"] = 1.93, + ["critical strike"] = 1.79, + ["mastery"] = 1.65, triggers = { harmfulSpell = true, }, @@ -535,28 +526,28 @@ ww_defaultVars = { }, [ww_specNames["Windwalker"]] = { ["melee dps"] = 5.2, - ["hit"] = 3.4, + ["hit"] = 3.5, ["agility"] = 3, - ["expertise"] = 2.5, - ["critical strike"] = 1.6, - ["haste"] = 1.4, + ["expertise"] = 2.75, + ["haste"] = 1.6, + ["critical strike"] = 1.3, ["strength"] = 1.16, ["attack power"] = 1.1, - ["mastery"] = 0.9, + ["mastery"] = 0.75, triggers = { meleeDamage = true, }, }, [ww_specNames["Windwalker DW"]] = { ["melee dps"] = 5.2, - ["hit"] = 3.4, + ["hit"] = 3.5, ["agility"] = 3, - ["expertise"] = 2.5, - ["critical strike"] = 1.6, - ["haste"] = 1.4, + ["expertise"] = 2.75, + ["haste"] = 1.6, + ["critical strike"] = 1.3, ["strength"] = 1.16, ["attack power"] = 1.1, - ["mastery"] = 0.9, + ["mastery"] = 0.75, triggers = { meleeDamage = true, }, @@ -567,39 +558,40 @@ ww_defaultVars = { ww_specNames["Protection"], ww_specNames["Retribution"], [ww_specNames["Holy"]] = { - ["intellect"] = 100, - ["spell power"] = 80, - ["spirit"] = 75, - ["haste"] = 40, - ["critical strike"] = 35, - ["mastery"] = 30, + ["intellect"] = 1, + ["spell power"] = 0.75, + ["spirit"] = 0.75, + ["haste"] = 0.55, + ["critical strike"] = 0.5, + ["mastery"] = 0.5, triggers = { helpfulSpell = true, }, }, [ww_specNames["Protection"]] = { - ["dodge"] = 1.23, - ["parry"] = 1.23, + ["stamina"] = 2.68, + ["hit"] = 2, + ["expertise"] = 1.9, ["mastery"] = 1, - ["stamina"] = 0.6, - ["strength"] = 0.349, - ["armor"] = 0.155, - ["expertise"] = 0.1, - ["hit"] = 0.05, + ["haste"] = 0.9, + ["armor"] = 0.64, + ["strength"] = 0.5, + ["dodge"] = 0.25, + ["parry"] = 0.25, triggers = { meleeDamage = true, }, }, [ww_specNames["Retribution"]] = { - ["melee weapon speed"] = 18.848, - ["melee dps"] = 9, - ["strength"] = 2.33, - ["hit"] = 1.55 + 0.22, - ["expertise"] = 1.3, - ["mastery"] = 1.13, - ["attack power"] = 1, - ["critical strike"] = 0.98, - ["haste"] = 0.79, + ["melee weapon speed"] = 6.08, + ["melee dps"] = 5.94, + ["strength"] = 3.52, + ["hit"] = 2.5, + ["haste"] = 1.93, + ["mastery"] = 1.58, + ["expertise"] = 2.5, + ["attack power"] = 1.48, + ["critical strike"] = 1.46, triggers = { harmfulSpell = true, meleeDamage = true, @@ -611,35 +603,35 @@ ww_defaultVars = { ww_specNames["Holy"], ww_specNames["Shadow"], [ww_specNames["Discipline"]] = { - ["intellect"] = 100, - ["spirit"] = 80, - ["spell power"] = 75, - ["mastery"] = 60, - ["haste"] = 50, - ["critical strike"] = 40, + ["intellect"] = 1, + ["spell power"] = 0.81, + ["spirit"] = 0.8, + ["critical strike"] = 0.6, + ["mastery"] = 0.55, + ["haste"] = 0.5, triggers = { helpfulSpell = true, }, }, [ww_specNames["Holy"]] = { - ["intellect"] = 100, - ["spirit"] = 80, - ["haste"] = 75, - ["spell power"] = 75, - ["mastery"] = 70, - ["critical strike"] = 50, + ["intellect"] = 1, + ["spell power"] = 0.85, + ["spirit"] = 0.81, + ["haste"] = 0.62, + ["critical strike"] = 0.43, + ["mastery"] = 0.33, triggers = { helpfulSpell = true, }, }, [ww_specNames["Shadow"]] = { - ["intellect"] = 3.54, - ["spell power"] = 2.72, - ["haste"] = 2, - ["hit"] = 1.92, - ["spirit"] = 1.92, - ["mastery"] = 1.84, - ["critical strike"] = 1.67, + ["intellect"] = 3.89, + ["spell power"] = 3.14, + ["hit"] = 2.39, + ["spirit"] = 2.39, + ["haste"] = 2.32, + ["critical strike"] = 1.73, + ["mastery"] = 1.49, triggers = { harmfulSpell = true, }, @@ -650,41 +642,44 @@ ww_defaultVars = { ww_specNames["Combat"], ww_specNames["Subtlety"], [ww_specNames["Assassination"]] = { - ["agility"] = 2.6, - ["melee dps"] = (3.36 + 1.04) / 2, - ["hit"] = 1.1 + 0.65, - ["mastery"] = 1.3, - ["haste"] = 1.2, - ["expertise"] = 1.1, - ["attack power"] = 1, - ["critical strike"] = 0.9, + ["melee dps"] = (4.35 + 1.04) / 2, + ["agility"] = 4.74, + ["hit"] = 3.13, + ["expertise"] = 2, + ["mastery"] = 1.95, + ["strength"] = 1.8, + ["haste"] = 1.75, + ["attack power"] = 1.71, + ["critical strike"] = 1.7, triggers = { meleeDamage = true, }, }, [ww_specNames["Combat"]] = { - ["melee dps"] = (4.97 + 1.15) / 2, - ["agility"] = 2.7, - ["hit"] = 1.65 + 0.3, - ["expertise"] = 1.65, - ["haste"] = 1.5, - ["mastery"] = 1.2, - ["attack power"] = 1, - ["critical strike"] = 0.9, - ["melee weapon speed"] = (4 + -9) / 2, + ["melee dps"] = (6.85 + 2.15) / 2, + ["melee weapon speed"] = 5 / 2, + ["agility"] = 4, + ["expertise"] = 3.9, + ["hit"] = 3.9, + ["haste"] = 2.2, + ["mastery"] = 1.7, + ["critical strike"] = 1.57, + ["strength"] = 1.54, + ["attack power"] = 1.47, triggers = { meleeDamage = true, }, }, [ww_specNames["Subtlety"]] = { - ["agility"] = 3.6, - ["melee dps"] = (4 + 1) / 2, - ["hit"] = 1.15 + 0.25, - ["haste"] = 1.35, - ["attack power"] = 1.26, - ["expertise"] = 1.15, - ["critical strike"] = 1.1, - ["mastery"] = 0.9, + ["melee dps"] = (5.85 + 1) / 2, + ["agility"] = 4.74, + ["hit"] = 2.18, + ["expertise"] = 1.84, + ["haste"] = 1.78, + ["critical strike"] = 1.61, + ["mastery"] = 1.39, + ["strength"] = 1.34, + ["attack power"] = 1.28, triggers = { meleeDamage = true, }, @@ -695,40 +690,40 @@ ww_defaultVars = { ww_specNames["Enhancement"], ww_specNames["Restoration"], [ww_specNames["Elemental"]] = { - ["intellect"] = 2.9, - ["spell power"] = 2.32, - ["hit"] = 1.74, - ["spirit"] = 1.74, - ["haste"] = 1.6, - ["mastery"] = 1.33, - ["critical strike"] = 1.02, + ["intellect"] = 3.74, + ["spell power"] = 3.12, + ["hit"] = 1.8, + ["spirit"] = 1.8, + ["haste"] = 1.65, + ["mastery"] = 1.46, + ["critical strike"] = 1.39, triggers = { harmfulSpell = true, }, }, [ww_specNames["Enhancement"]] = { - ["melee dps"] = (4.34 + 3.96) / 2, - ["agility"] = 3.51, - ["hit"] = 2.15 + 1.3, - ["expertise"] = 2.15, + ["melee weapon speed"] = (4.93 + 3.92) / 2, + ["melee dps"] = (3.48 + 3.08) / 2, + ["agility"] = 3.82, + ["expertise"] = 3.8, + ["hit"] = 3.8, ["mastery"] = 1.73, - ["strength"] = 1.41, - ["attack power"] = 1.33, - ["critical strike"] = 1.26, - ["spell power"] = 1.06, - ["haste"] = 1.03, + ["strength"] = 1.6, + ["critical strike"] = 1.58, + ["attack power"] = 1.52, + ["haste"] = 1.43, triggers = { harmfulSpell = true, meleeDamage = true, }, }, [ww_specNames["Restoration"]] = { - ["intellect"] = 100, - ["spirit"] = 90, - ["spell power"] = 75, - ["haste"] = 60, - ["mastery"] = 55, - ["critical strike"] = 40, + ["intellect"] = 1, + ["spell power"] = 0.75, + ["spirit"] = 0.65, + ["haste"] = 0.6, + ["mastery"] = 0.55, + ["critical strike"] = 0.4, triggers = { helpfulSpell = true, }, @@ -739,34 +734,34 @@ ww_defaultVars = { ww_specNames["Demonology"], ww_specNames["Destruction"], [ww_specNames["Affliction"]] = { - ["intellect"] = 3.11, - ["spell power"] = 2.64, - ["hit"] = 1.65, - ["haste"] = 1.4, - ["critical strike"] = 1.15, - ["mastery"] = 1.15, + ["intellect"] = 4.53, + ["spell power"] = 3.71, + ["mastery"] = 2.82, + ["haste"] = 2.57, + ["hit"] = 2.15, + ["critical strike"] = 1.78, triggers = { harmfulSpell = true, }, }, [ww_specNames["Demonology"]] = { - ["intellect"] = 3, - ["hit"] = 2.39, - ["spell power"] = 2.39, - ["haste"] = 1.5, - ["mastery"] = 1.38, - ["critical strike"] = 1.16, + ["intellect"] = 4.12, + ["spell power"] = 3.4, + ["hit"] = 3, + ["mastery"] = 2, + ["haste"] = 1.95, + ["critical strike"] = 1.9, triggers = { harmfulSpell = true, }, }, [ww_specNames["Destruction"]] = { - ["intellect"] = 3.01, - ["spell power"] = 2.35, - ["haste"] = 1.54, - ["hit"] = 1.51, - ["critical strike"] = 1.21, - ["mastery"] = 0.75, + ["intellect"] = 4.1, + ["spell power"] = 3.33, + ["hit"] = 2.8, + ["mastery"] = 1.75, + ["critical strike"] = 1.7, + ["haste"] = 1.65, triggers = { harmfulSpell = true, }, @@ -778,53 +773,54 @@ ww_defaultVars = { ww_specNames["Fury TG"], ww_specNames["Protection"], [ww_specNames["Arms"]] = { - ["melee dps"] = 10.57, - ["strength"] = 2.02, - ["hit"] = 2, - ["expertise"] = 1.46, - ["critical strike"] = 1.34, - ["mastery"] = 0.9, - ["attack power"] = 0.88, - ["haste"] = 0.8, + ["melee dps"] = 10.33, + ["strength"] = 2.25, + ["hit"] = 1.75, + ["expertise"] = 1.5, + ["critical strike"] = 1.25, + ["attack power"] = 1.1, + ["mastery"] = 1, + ["haste"] = 0.75, triggers = { meleeDamage = true, }, }, [ww_specNames["Fury"]] = { - ["melee dps"] = (5.21 + 3) / 2, - ["strength"] = 3.25, - ["hit"] = 3.2, - ["expertise"] = 2.29, - ["critical strike"] = 2.02, - ["attack power"] = 1.45, - ["haste"] = 1.33, - ["mastery"] = 1.24, + ["melee dps"] = (7.95 + 4.59) / 2, + ["expertise"] = 5.85, + ["hit"] = 5.85, + ["critical strike"] = 4.28, + ["strength"] = 2.98, + ["mastery"] = 1.98, + ["attack power"] = 1.42, + ["haste"] = 1.39, triggers = { meleeDamage = true, }, }, [ww_specNames["Fury TG"]] = { - ["melee dps"] = (5.91 + 2.7) / 2, - ["strength"] = 2.98, - ["expertise"] = 2.47, - ["hit"] = 2.47, - ["critical strike"] = 1.98, - ["mastery"] = 1.57, - ["haste"] = 1.37, - ["attack power"] = 1.36, + ["melee dps"] = (6.69 + 3.31) / 2, + ["expertise"] = 4.07, + ["hit"] = 4.07, + ["critical strike"] = 2.94, + ["strength"] = 2.47, + ["mastery"] = 1.55, + ["attack power"] = 1.1, + ["haste"] = 0.83, triggers = { meleeDamage = true, }, }, [ww_specNames["Protection"]] = { - ["parry"] = 1.54, - ["dodge"] = 1.496, + ["stamina"] = 1.34, ["mastery"] = 1, - ["stamina"] = 0.6, - ["strength"] = 0.437, - ["armor"] = 0.155, - ["expertise"] = 0.1, - ["hit"] = 0.05, + ["dodge"] = 0.8, + ["parry"] = 0.8, + ["strength"] = 0.77, + ["expertise"] = 0.56, + ["hit"] = 0.56, + ["armor"] = 0.25, + ["haste"] = 0.1, triggers = { meleeDamage = true, }, -- 1.7.9.5