diff --git a/WowheadPoints.lua b/WowheadPoints.lua
index 335876f..4549add 100644
--- a/WowheadPoints.lua
+++ b/WowheadPoints.lua
@@ -5,52 +5,60 @@ local class = select(2, UnitClass("player"))
local info = {
DRUID = {
- ["Restoration (Healing)"] = {
+ ["Balance (DPS)"] = {
weights = {
- SPELL_POWER = 100,
+ HIT_RATING = 100,
MASTERY_RATING = 100,
- HASTE_RATING = 57,
- INTELLECT = 51,
- SPIRIT = 32,
- CRIT_RATING = 11
+ SPELL_POWER = 66,
+ HASTE_RATING = 54,
+ CRIT_RATING = 43,
+ INTELLECT = 22,
+ SPIRIT = 22,
},
},
["Feral (Tank)"] = {
weights = {
- AGILITY = 100,
- MASTERY_RATING = 100,
- STAMINA = 75,
- DODGE_RATING = 65,
- EXPERTISE_RATING = 16,
- ARMOR = 10,
+ STAMINA = 100,
+ ARMOR = 75,
+ AGILITY = 48,
+ DODGE_RATING = 41,
+ ----------------------------------------------
+ ADDITIONAL_ARMOR = 21,
+ ----------------------------------------------
+ MASTERY_RATING = 16,
+ CRIT_RATING = 13,
STRENGTH = 10,
- HIT_RATING = 8,
- HASTE_RATING = 5,
- FERAL_ATTACK_POWER = 4,
- CRIT_RATING = 3,
+ EXPERTISE_RATING = 10,
+ ----------------------------------------------
+ HEALTH = 7,
+ ----------------------------------------------
+ FERAL_ATTACK_POWER = 5,
+ ATTACK_POWER = 5,
+ HIT_RATING = 5,
+ HASTE_RATING = 1,
},
},
["Feral (DPS)"] = {
weights = {
+ DAMAGE_PER_SECOND = 151,
AGILITY = 100,
- MASTERY_RATING = 100,
- STRENGTH = 80,
- CRIT_RATING = 55,
- EXPERTISE_RATING = 50,
- HIT_RATING = 50,
- FERAL_ATTACK_POWER = 40,
- HASTE_RATING = 35,
+ STRENGTH = 78,
+ ATTACK_POWER = 37,
+ MASTERY_RATING = 35,
+ HASTE_RATING = 32,
+ EXPERTISE_RATING = 29,
+ HIT_RATING = 28,
+ CRIT_RATING = 28,
},
},
- ["Balance (DPS)"] = {
+ ["Restoration (Healing)"] = {
weights = {
- HIT_RATING = 100,
- MASTERY_RATING = 100,
- SPELL_POWER = 66,
- HASTE_RATING = 54,
- CRIT_RATING = 43,
- INTELLECT = 22,
- SPIRIT = 22,
+ SPELL_POWER = 100,
+ HASTE_RATING = 57,
+ INTELLECT = 51,
+ MASTERY_RATING = 45,
+ SPIRIT = 32,
+ CRIT_RATING = 11,
},
},
},
@@ -91,7 +99,7 @@ local info = {
CRIT_RATING = 80,
AGILITY = 65,
HASTE_RATING = 50,
- ARMOR = 1,
+ ARMOR = 2,
},
},
},
@@ -115,84 +123,84 @@ local info = {
},
["Frost (DPS)"] = {
weights = {
- DAMAGE_PER_SECOND = 337,
- MASTERY_RATING = 100,
- HIT_RATING = 100,
- STRENGTH = 97,
- EXPERTISE_RATING = 81,
- CRIT_RATING = 45,
- HASTE_RATING = 28,
- ARMOR = 1,
+ STRENGTH = 100,
+ DAMAGE_PER_SECOND = 100,
+ HIT_RATING = 43,
+ EXPERTISE_RATING = 41,
+ HASTE_RATING = 37,
+ MASTERY_RATING = 35,
+ ATTACK_POWER = 32,
+ CRIT_RATING = 26,
},
},
["Unholy (DPS)"] = {
weights = {
- DAMAGE_PER_SECOND = 209,
STRENGTH = 100,
- MASTERY_RATING = 100,
- HIT_RATING = 66,
- EXPERTISE_RATING = 51,
- HASTE_RATING = 48,
- CRIT_RATING = 45,
- ARMOR = 1,
+ DAMAGE_PER_SECOND = 100,
+ HIT_RATING = 25,
+ HASTE_RATING = 25,
+ ATTACK_POWER = 23,
+ EXPERTISE_RATING = 21,
+ CRIT_RATING = 20,
+ MASTERY_RATING = 8,
},
},
},
HUNTER = {
["Beast Mastery"] = {
weights = {
- DAMAGE_PER_SECOND = 213,
- HIT_RATING = 100,
- MASTERY_RATING = 100,
- AGILITY = 58,
- CRIT_RATING = 40,
- INTELLECT = 37,
- HASTE_RATING = 21,
+ AGILITY = 100,
+ DAMAGE_PER_SECOND = 100, -- This is actually RANGED_DPS.
+ HIT_RATING = 80,
+ CRIT_RATING = 60,
+ MASTERY_RATING = 40,
+ HASTE_RATING = 20,
+
+ -- Where is attack power?
+ -- Is intellect no longer used? Was a primary stat for BM
+
},
},
["Marksmanship"] = {
weights = {
- DAMAGE_PER_SECOND = 379,
- HIT_RATING = 100,
- MASTERY_RATING = 100,
- AGILITY = 74,
- CRIT_RATING = 57,
- INTELLECT = 39,
- HASTE_RATING = 24,
+ AGILITY = 100,
+ DAMAGE_PER_SECOND = 100, -- ranged dps
+ HIT_RATING = 80,
+ CRIT_RATING = 60,
+ MASTERY_RATING = 40,
+ HASTE_RATING = 20,
},
},
["Survival"] = {
weights = {
- DAMAGE_PER_SECOND = 181,
- HIT_RATING = 100,
- MASTERY_RATING = 100,
- AGILITY = 76,
- CRIT_RATING = 42,
- INTELLECT = 35,
- HASTE_RATING = 31,
+ AGILITY = 100,
+ DAMAGE_PER_SECOND = 100,
+ HIT_RATING = 80,
+ CRIT_RATING = 60,
+ MASTERY_RATING = 20,
+ HASTE_RATING = 40,
},
},
},
MAGE = {
["Arcane"] = {
weights = {
- HIT_RATING = 100,
- MASTERY_RATING = 100,
- HASTE_RATING = 54,
- SPELL_POWER = 49,
- CRIT_RATING = 37,
- INTELLECT = 34,
- SPIRIT = 14,
+ SPELL_POWER = 100,
+ INTELLECT = 100,
+ HIT_RATING = 80,
+ HASTE_RATING = 50,
+ CRIT_RATING = 45,
+ MASTERY_RATING = 40,
},
},
["Fire"] = {
weights = {
- HIT_RATING = 100,
- MASTERY_RATING = 100,
- HASTE_RATING = 53,
- SPELL_POWER = 46,
- CRIT_RATING = 43,
- INTELLECT = 13,
+ INTELLECT = 100,
+ HIT_RATING = 82,
+ SPELL_POWER = 68,
+ CRIT_RATING = 52,
+ MASTERY_RATING = 37,
+ HASTE_RATING = 35,
},
},
["Frost"] = {
@@ -209,11 +217,12 @@ local info = {
PALADIN = {
["Holy (Healing)"] = {
weights = {
+ SPELL_POWER = 100,
INTELLECT = 100,
- MASTERY_RATING = 100,
- SPELL_POWER = 58,
- CRIT_RATING = 46,
- HASTE_RATING = 35,
+ HASTE_RATING = 80,
+ SPIRIT = 50,
+ MASTERY_RATING = 50,
+ CRIT_RATING = 25,
},
},
["Protection (Tank)"] = {
@@ -230,26 +239,26 @@ local info = {
},
["Retribution (DPS)"] = {
weights = {
- MASTERY_RATING = 100,
- STAMINA = 100,
- AGILITY = 60,
- EXPERTISE_RATING = 59,
- DODGE_RATING = 55,
- PARRY_RATING = 30,
- STRENGTH = 16,
- ARMOR = 8,
+ STRENGTH = 100,
+ DAMAGE_PER_SECOND = 100,
+ ATTACK_POWER = 44,
+ HIT_RATING = 35,
+ EXPERTISE_RATING = 22,
+ HASTE_RATING = 18,
+ CRIT_RATING = 16,
+ MASTERY_RATING = 9,
},
},
},
PRIEST = {
["Discipline (Healing)"] = {
weights = {
- SPELL_POWER = 100,
- MASTERY_RATING = 100,
- INTELLECT = 65,
- HASTE_RATING = 59,
- CRIT_RATING = 48,
- SPIRIT = 22,
+ INTELLECT = 100,
+ SPIRIT = 80,
+ SPELL_POWER = 19,
+ CRIT_RATING = 11,
+ HASTE_RATING = 10,
+ MASTERY_RATING = 6,
},
},
["Holy (Healing)"] = {
@@ -264,121 +273,123 @@ local info = {
},
["Shadow Magic (DPS)"] = {
weights = {
- HIT_RATING = 100,
- MASTERY_RATING = 100,
- SPELL_POWER = 76,
- CRIT_RATING = 54,
+ INTELLECT = 100,
+ SPELL_POWER = 79,
HASTE_RATING = 50,
- INTELLECT = 16,
- SPIRIT = 16,
+ CRIT_RATING = 40,
+ MASTERY_RATING = 38,
+ SPIRIT = 37,
+ HIT_RATING = 37,
},
},
},
ROGUE = {
["Assassination"] = {
weights = {
- DAMAGE_PER_SECOND = 170,
+ DAMAGE_PER_SECOND = 100,
AGILITY = 100,
- MASTERY_RATING = 100,
- EXPERTISE_RATING = 87,
- HIT_RATING = 83,
- CRIT_RATING = 81,
- HASTE_RATING = 64,
- STRENGTH = 55,
+ MASTERY_RATING = 50,
+ EXPERTISE_RATING = 42,
+ HIT_RATING = 67,
+ CRIT_RATING = 35,
+ HASTE_RATING = 46,
},
},
["Combat"] = {
weights = {
- DAMAGE_PER_SECOND = 220,
+ DAMAGE_PER_SECOND = 100,
AGILITY = 100,
- MASTERY_RATING = 100,
- EXPERTISE_RATING = 82,
- HIT_RATING = 80,
- CRIT_RATING = 75,
- HASTE_RATING = 73,
- STRENGTH = 55,
+ MASTERY_RATING = 33,
+ EXPERTISE_RATING = 59,
+ HIT_RATING = 70,
+ CRIT_RATING = 35,
+ HASTE_RATING = 56,
},
},
["Subtlety"] = {
weights = {
- DAMAGE_PER_SECOND = 228,
- EXPERTISE_RATING = 100,
+ DAMAGE_PER_SECOND = 100, -- melee
+ EXPERTISE_RATING = 33,
AGILITY = 100,
- MASTERY_RATING = 100,
- HIT_RATING = 80,
- HASTE_RATING = 75,
- CRIT_RATING = 75,
- STRENGTH = 55,
+ MASTERY_RATING = 20,
+ HIT_RATING = 40,
+ HASTE_RATING = 37,
+ CRIT_RATING = 31,
+
+ -- where is attack power?
},
},
},
SHAMAN = {
["Elemental Combat (DPS)"] = {
weights = {
- MASTERY_RATING = 100,
HIT_RATING = 100,
- SPELL_POWER = 60,
- HASTE_RATING = 56,
- CRIT_RATING = 40,
- INTELLECT = 11,
+ SPELL_POWER = 80,
+ INTELLECT = 80,
+ HASTE_RATING = 60,
+ MASTERY_RATING = 40,
+ CRIT_RATING = 20,
},
},
["Enhancement (DPS)"] = {
weights = {
- DAMAGE_PER_SECOND = 135,
- HIT_RATING = 100,
- MASTERY_RATING = 100,
- EXPERTISE_RATING = 84,
- INTELLECT = 55,
- AGILITY = 55,
- CRIT_RATING = 55,
- HASTE_RATING = 42,
- STRENGTH = 35,
- SPELL_POWER = 29,
+ DAMAGE_PER_SECOND = 124,
+ AGILITY = 100,
+ HIT_RATING = 60,
+ EXPERTISE_RATING = 48,
+ MASTERY_RATING = 44,
+ STRENGTH = 42,
+ ATTACK_POWER = 40,
+ INTELLECT = 36,
+ SPELL_POWER = 36,
+ CRIT_RATING = 28,
+ HASTE_RATING = 16,
},
},
["Restoration (Healing)"] = {
weights = {
- MASTERY_RATING = 100,
- INTELLECT = 85,
- SPELL_POWER = 77,
- CRIT_RATING = 62,
- HASTE_RATING = 35,
+ INTELLECT = 100,
+ SPELL_POWER = 83,
+ SPIRIT = 75,
+ HASTE_RATING = 67,
+ CRIT_RATING = 58,
+ MASTERY_RATING = 42,
+ STAMINA = 8,
},
},
},
WARLOCK = {
["Affliction"] = {
weights = {
- HIT_RATING = 100,
- MASTERY_RATING = 100,
- SPELL_POWER = 72,
- HASTE_RATING = 61,
- CRIT_RATING = 38,
- SPIRIT = 34,
- INTELLECT = 15,
+ INTELLECT = 100,
+ SPELL_POWER = 81,
+ HIT_RATING = 52,
+ HASTE_RATING = 43,
+ CRIT_RATING = 32,
+ MASTERY_RATING = 30,
+ STAMINA = 1,
},
},
["Demonology"] = {
weights = {
- HIT_RATING = 100,
- MASTERY_RATING = 100,
- HASTE_RATING = 50,
- SPELL_POWER = 45,
- CRIT_RATING = 31,
- SPIRIT = 29,
- INTELLECT = 13,
+ INTELLECT = 100,
+ SPELL_POWER = 79,
+ HIT_RATING = 63,
+ HASTE_RATING = 40,
+ CRIT_RATING = 35,
+ MASTERY_RATING = 31,
+ STAMINA = 1,
},
},
["Destruction"] = {
weights = {
- MASTERY_RATING = 100,
- HIT_RATING = 100,
- SPELL_POWER = 47,
- HASTE_RATING = 46,
- SPIRIT = 26,
- CRIT_RATING = 16,
- INTELLECT = 13,
+ INTELLECT = 100,
+ SPELL_POWER = 77,
+ HIT_RATING = 64,
+ HASTE_RATING = 36,
+ CRIT_RATING = 34,
+ MASTERY_RATING = 29,
+ STAMINA = 1,
},
},
},