From aafb5fc34b5b05bf9ddf6f2538ef62e2bbd47239 Mon Sep 17 00:00:00 2001
From: Kevin Lyles <kevinlyles@gmail.com>
Date: Wed, 18 Nov 2009 04:37:36 -0600
Subject: [PATCH] Updated to current wowhead weights

---
 Upgrade.lua  |    7 +
 defaults.lua |  452 +++++++++++++++++++++++++++++++---------------------------
 2 files changed, 245 insertions(+), 214 deletions(-)

diff --git a/Upgrade.lua b/Upgrade.lua
index 947159a..d916485 100644
--- a/Upgrade.lua
+++ b/Upgrade.lua
@@ -112,6 +112,11 @@ function stringsToFuncs(strTable)
 	return funcTable
 end
 
+function noop_up(vars)
+	vars.dataMinorVersion = vars.dataMinorVersion + 1
+	return vars
+end
+
 noop_down = [[
 	return function(vars)
 		vars.dataMinorVersion = vars.dataMinorVersion - 1
@@ -269,6 +274,7 @@ upgradeAccountFunctions = {
 		[2] = function(vars) return upgradeAccountToGemQuality(vars) end,
 		[3] = function(vars) return upgradeAccountToOrderedLists(vars) end,
 		[4] = function(vars) return upgradeAccountToHandleModifierKeys(vars) end,
+		[5] = function(vars) return noop_up(vars) end,
 	},
 }
 
@@ -278,6 +284,7 @@ downgradeAccountFunctions = {
 		[3] = noop_down,
 		[4] = downgradeAccountFromOrderedLists,
 		[5] = noop_down,
+		[6] = noop_down,
 	},
 }
 
diff --git a/defaults.lua b/defaults.lua
index 6445e46..d059b99 100644
--- a/defaults.lua
+++ b/defaults.lua
@@ -101,7 +101,7 @@ keyDetectors = {
 
 defaultVars = {
 	dataMajorVersion = 0,
-	dataMinorVersion = 5,
+	dataMinorVersion = 6,
 	weightsList = {
 		[1] = "DEATHKNIGHT",
 		[2] = "DRUID",
@@ -119,48 +119,51 @@ defaultVars = {
 			[3] = "Unholy DPS",
 			[4] = "Tank",
 			["Blood DPS"] = {
-				["dps"] = 361,
-				["hit rating"] = 100,
-				["strength"] = 97,
-				["expertise rating"] = 64,
-				["critical strike rating"] = 44,
-				["armor penetration rating"] = 40,
-				["attack power"] = 38,
-				["haste rating"] = 22,
+				["dps"] = 360,
+				["armor penetration rating"] = 100,
+				["strength"] = 99,
+				["hit rating"] = 91,
+				["expertise rating"] = 90,
+				["critical strike rating"] = 57,
+				["haste rating"] = 55,
+				["attack power"] = 36,
+				["armor"] = 1,
 			},
 			["Frost DPS"] = {
-				["dps"] = 417,
+				["dps"] = 337,
 				["hit rating"] = 100,
-				["strength"] = 99,
-				["expertise rating"] = 52,
-				["critical strike rating"] = 50,
-				["attack power"] = 42,
-				["armor penetration rating"] = 32,
-				["haste rating"] = 21,
+				["strength"] = 97,
+				["expertise rating"] = 81,
+				["armor penetration rating"] = 61,
+				["critical strike rating"] = 45,
+				["attack power"] = 35,
+				["haste rating"] = 28,
+				["armor"] = 1,
 			},
 			["Unholy DPS"] = {
-				["dps"] = 305,
-				["hit rating"] = 100,
+				["dps"] = 209,
 				["strength"] = 100,
-				["expertise rating"] = 56,
-				["critical strike rating"] = 46,
-				["attack power"] = 41,
-				["haste rating"] = 26,
-				["armor penetration rating"] = 22,
+				["hit rating"] = 66,
+				["expertise rating"] = 51,
+				["haste rating"] = 48,
+				["critical strike rating"] = 45,
+				["attack power"] = 34,
+				["armor penetration rating"] = 32,
+				["armor"] = 1,
 			},
 			["Tank"] = {
-				["dps"] = 432,
-				["parry rating"] = 103,
-				["hit rating"] = 100,
-				["strength"] = 99,
-				["defense rating"] = 88,
-				["expertise rating"] = 71,
-				["dodge rating"] = 63,
-				["agility"] = 63,
-				["stamina"] = 63,
-				["critical strike rating"] = 50,
-				["attack power"] = 42,
-				["armor penetration rating"] = 32,
+				["dps"] = 419,
+				["parry rating"] = 100,
+				["hit rating"] = 97,
+				["strength"] = 96,
+				["defense rating"] = 85,
+				["expertise rating"] = 69,
+				["dodge rating"] = 61,
+				["agility"] = 61,
+				["stamina"] = 61,
+				["critical strike rating"] = 49,
+				["attack power"] = 41,
+				["armor penetration rating"] = 31,
 				["armor"] = 5,
 			},
 		},
@@ -171,45 +174,44 @@ defaultVars = {
 			[4] = "Restoration",
 			["Balance"] = {
 				["hit rating"] = 100,
-				["haste rating"] = 46,
-				["spell power"] = 46,
+				["spell power"] = 66,
+				["haste rating"] = 54,
 				["critical strike rating"] = 43,
-				["intellect"] = 26,
-				["mp5"] = 15,
-				["spirit"] = 8,
+				["spirit"] = 22,
+				["intellect"] = 22,
 			},
 			["Feral DPS"] = {
-				["strength"] = 100,
-				["agility"] = 85,
-				["expertise rating"] = 58,
-				["hit rating"] = 58,
-				["critical strike rating"] = 52,
-				["feral attack power"] = 43,
-				["attack power"] = 43,
-				["armor penetration rating"] = 42,
-				["haste rating"] = 40,
+				["agility"] = 100,
+				["armor penetration rating"] = 90,
+				["strength"] = 80,
+				["critical strike rating"] = 55,
+				["expertise rating"] = 50,
+				["hit rating"] = 50,
+				["feral attack power"] = 40,
+				["attack power"] = 40,
+				["haste rating"] = 35,
 			},
 			["Feral Tank"] = {
 				["agility"] = 100,
-				["defense rating"] = 72,
-				["dodge rating"] = 70,
-				["stamina"] = 65,
-				["armor"] = 25,
+				["stamina"] = 75,
+				["dodge rating"] = 65,
+				["defense rating"] = 60,
 				["expertise rating"] = 16,
 				["strength"] = 10,
-				["hit rating"] = 6,
+				["armor"] = 10,
+				["hit rating"] = 8,
 				["haste rating"] = 5,
 				["feral attack power"] = 4,
 				["attack power"] = 4,
 				["critical strike rating"] = 3,
 			},
 			["Restoration"] = {
-				["mp5"] = 100,
-				["spell power"] = 53,
-				["spirit"] = 48,
-				["intellect"] = 28,
-				["critical strike rating"] = 14,
-				["haste rating"] = 12,
+				["spell power"] = 100,
+				["mp5"] = 73,
+				["haste rating"] = 57,
+				["intellect"] = 51,
+				["spirit"] = 32,
+				["critical strike rating"] = 11,
 			},
 		},
 		["HUNTER"] = {
@@ -217,37 +219,34 @@ defaultVars = {
 			[2] = "Marksmanship",
 			[3] = "Survival",
 			["Beast Mastery"] = {
-				["dps"] = 134,
+				["dps"] = 213,
 				["hit rating"] = 100,
-				["intellect"] = 94,
-				["agility"] = 59,
-				["armor penetration rating"] = 54,
-				["mp5"] = 48,
-				["haste rating"] = 43,
-				["attack power"] = 39,
-				["critical strike rating"] = 37,
+				["agility"] = 58,
+				["critical strike rating"] = 40,
+				["intellect"] = 37,
+				["attack power"] = 30,
+				["armor penetration rating"] = 28,
+				["haste rating"] = 21,
 			},
 			["Marksmanship"] = {
-				["dps"] = 151,
-				["intellect"] = 100,
-				["hit rating"] = 90,
-				["mp5"] = 70,
-				["agility"] = 63,
-				["armor penetration rating"] = 62,
-				["haste rating"] = 59,
-				["critical strike rating"] = 43,
-				["attack power"] = 38,
+				["dps"] = 379,
+				["hit rating"] = 100,
+				["agility"] = 74,
+				["critical strike rating"] = 57,
+				["armor penetration rating"] = 40,
+				["intellect"] = 39,
+				["attack power"] = 32,
+				["haste rating"] = 24,
 			},
 			["Survival"] = {
-				["dps"] = 147,
-				["intellect"] = 100,
-				["hit rating"] = 93,
-				["agility"] = 83,
-				["mp5"] = 72,
-				["haste rating"] = 70,
-				["armor penetration rating"] = 66,
-				["critical strike rating"] = 58,
-				["attack power"] = 35,
+				["dps"] = 181,
+				["hit rating"] = 100,
+				["agility"] = 76,
+				["critical strike rating"] = 42,
+				["intellect"] = 35,
+				["haste rating"] = 31,
+				["attack power"] = 29,
+				["armor penetration rating"] = 26,
 			},
 		},
 		["MAGE"] = {
@@ -256,31 +255,34 @@ defaultVars = {
 			[3] = "Frost",
 			["Arcane"] = {
 				["hit rating"] = 100,
-				["haste rating"] = 49,
-				["arcane spell damage"] = 44,
-				["spell power"] = 44,
-				["intellect"] = 39,
-				["critical strike rating"] = 34,
+				["haste rating"] = 54,
+				["arcane spell damage"] = 49,
+				["spell power"] = 49,
+				["critical strike rating"] = 37,
+				["intellect"] = 34,
+				["frost spell damage"] = 49,
+				["fire spell damage"] = 49,
 				["spirit"] = 14,
-				["mp5"] = 9,
 			},
 			["Fire"] = {
 				["hit rating"] = 100,
-				["critical strike rating"] = 55,
-				["fire spell damage"] = 49,
-				["spell power"] = 49,
-				["haste rating"] = 47,
-				["intellect"] = 35,
-				["mp5"] = 15,
+				["haste rating"] = 53,
+				["fire spell damage"] = 46,
+				["spell power"] = 46,
+				["critical strike rating"] = 43,
+				["frost spell damage"] = 23,
+				["arcane spell damage"] = 23,
+				["intellect"] = 13,
 			},
 			["Frost"] = {
 				["hit rating"] = 100,
-				["frost spell damage"] = 50,
-				["spell power"] = 50,
-				["haste rating"] = 46,
-				["critical strike rating"] = 33,
-				["intellect"] = 21,
-				["mp5"] = 13,
+				["haste rating"] = 42,
+				["frost spell damage"] = 39,
+				["spell power"] = 39,
+				["arcane spell damage"] = 19,
+				["fire spell damage"] = 19,
+				["critical strike rating"] = 19,
+				["intellect"] = 6,
 			},
 		},
 		["PALADIN"] = {
@@ -288,38 +290,39 @@ defaultVars = {
 			[2] = "Protection",
 			[3] = "Retribution",
 			["Holy"] = {
-				["haste rating"] = 100,
-				["spell power"] = 55,
-				["critical strike rating"] = 36,
-				["intellect"] = 29,
-				["mp5"] = 15,
+				["intellect"] = 100,
+				["mp5"] = 88,
+				["spell power"] = 58,
+				["critical strike rating"] = 46,
+				["haste rating"] = 35,
 			},
 			["Protection"] = {
-				["defense rating"] = 100,
-				["strength"] = 96,
-				["agility"] = 88,
-				["block rating"] = 80,
-				["dodge rating"] = 79,
-				["stamina"] = 76,
+				["stamina"] = 100,
+				["dodge rating"] = 94,
+				["block value"] = 86,
+				["defense rating"] = 86,
+				["expertise rating"] = 79,
+				["agility"] = 76,
 				["parry rating"] = 76,
-				["expertise rating"] = 53,
-				["block value"] = 52,
-				["hit rating"] = 50,
-				["attack power"] = 25,
-				["critical strike rating"] = 23,
-				["spell power"] = 20,
-				["armor"] = 9,
+				["hit rating"] = 58,
+				["block rating"] = 52,
+				["strength"] = 50,
+				["armor"] = 6,
+				["attack power"] = 6,
+				["spell power"] = 4,
+				["critical strike rating"] = 3,
 			},
 			["Retribution"] = {
-				["strength"] = 100,
-				["critical strike rating"] = 70,
-				["armor penetration rating"] = 67,
-				["agility"] = 67,
-				["hit rating"] = 59,
-				["expertise rating"] = 44,
-				["haste rating"] = 38,
-				["attack power"] = 38,
-				["spell power"] = 12,
+				["dps"] = 470,
+				["hit rating"] = 100,
+				["strength"] = 80,
+				["expertise rating"] = 66,
+				["critical strike rating"] = 40,
+				["attack power"] = 34,
+				["agility"] = 32,
+				["haste rating"] = 30,
+				["armor penetration rating"] = 22,
+				["spell power"] = 9,
 			},
 		},
 		["PRIEST"] = {
@@ -327,12 +330,12 @@ defaultVars = {
 			[2] = "Holy",
 			[3] = "Shadow",
 			["Discipline"] = {
-				["mp5"] = 100,
-				["intellect"] = 89,
-				["spell power"] = 60,
-				["critical strike rating"] = 36,
-				["spirit"] = 32,
-				["haste rating"] = 20,
+				["spell power"] = 100,
+				["mp5"] = 67,
+				["intellect"] = 65,
+				["haste rating"] = 59,
+				["critical strike rating"] = 48,
+				["spirit"] = 22,
 			},
 			["Holy"] = {
 				["mp5"] = 100,
@@ -344,27 +347,50 @@ defaultVars = {
 			},
 			["Shadow"] = {
 				["hit rating"] = 100,
-				["shadow spell damage"] = 61,
-				["spell power"] = 61,
-				["critical strike rating"] = 50,
-				["intellect"] = 43,
-				["mp5"] = 27,
-				["haste rating"] = 25,
-				["spirit"] = 6,
+				["shadow spell damage"] = 76,
+				["spell power"] = 76,
+				["critical strike rating"] = 54,
+				["haste rating"] = 50,
+				["spirit"] = 16,
+				["intellect"] = 16,
 			},
 		},
 		["ROGUE"] = {
-			[1] = "All",
-			["All"] = {
+			[1] = "Assassination",
+			[2] = "Combat",
+			[3] = "Subtlety",
+			["Assassination"] = {
+				["dps"] = 170,
 				["agility"] = 100,
+				["expertise rating"] = 87,
+				["hit rating"] = 83,
+				["critical strike rating"] = 81,
+				["attack power"] = 65,
+				["armor penetration rating"] = 65,
+				["haste rating"] = 64,
+				["strength"] = 55,
+			},
+			["Combat"] = {
+				["dps"] = 220,
+				["armor penetration rating"] = 100,
+				["agility"] = 100,
+				["expertise rating"] = 82,
+				["hit rating"] = 80,
+				["critical strike rating"] = 75,
+				["haste rating"] = 73,
+				["strength"] = 55,
+				["attack power"] = 50,
+			},
+			["Subtlety"] = {
+				["dps"] = 228,
 				["expertise rating"] = 100,
-				["haste rating"] = 82,
-				["hit rating"] = 82,
-				["critical strike rating"] = 82,
-				["armor penetration rating"] = 55,
-				["strength"] = 50,
-				["attack power"] = 46,
-				["stamina"] = 1,
+				["agility"] = 100,
+				["hit rating"] = 80,
+				["armor penetration rating"] = 75,
+				["critical strike rating"] = 75,
+				["haste rating"] = 75,
+				["strength"] = 55,
+				["attack power"] = 50,
 			},
 		},
 		["SHAMAN"] = {
@@ -373,30 +399,30 @@ defaultVars = {
 			[3] = "Restoration",
 			["Elemental"] = {
 				["hit rating"] = 100,
-				["spell power"] = 65,
-				["haste rating"] = 40,
-				["critical strike rating"] = 35,
-				["intellect"] = 10,
+				["spell power"] = 60,
+				["haste rating"] = 56,
+				["critical strike rating"] = 40,
+				["intellect"] = 11,
 			},
 			["Enhancement"] = {
-				["dps"] = 191,
+				["dps"] = 135,
 				["hit rating"] = 100,
 				["expertise rating"] = 84,
+				["agility"] = 55,
 				["intellect"] = 55,
 				["critical strike rating"] = 55,
-				["agility"] = 55,
 				["haste rating"] = 42,
-				["strength"] = 36,
-				["attack power"] = 33,
-				["spell power"] = 30,
+				["strength"] = 35,
+				["attack power"] = 32,
+				["spell power"] = 29,
 				["armor penetration rating"] = 26,
 			},
 			["Restoration"] = {
 				["mp5"] = 100,
-				["intellect"] = 87,
-				["spell power"] = 76,
-				["haste rating"] = 57,
-				["critical strike rating"] = 34,
+				["intellect"] = 85,
+				["spell power"] = 77,
+				["critical strike rating"] = 62,
+				["haste rating"] = 35,
 			},
 		},
 		["WARLOCK"] = {
@@ -404,37 +430,34 @@ defaultVars = {
 			[2] = "Demonology",
 			[3] = "Destruction",
 			["Affliction"] = {
-				["spell power"] = 100,
-				["shadow spell damage"] = 88,
-				["spirit"] = 74,
-				["hit rating"] = 32,
-				["haste rating"] = 25,
-				["critical strike rating"] = 24,
-				["mp5"] = 22,
-				["intellect"] = 14,
-				["fire spell damage"] = 13,
+				["hit rating"] = 100,
+				["shadow spell damage"] = 72,
+				["spell power"] = 72,
+				["haste rating"] = 61,
+				["critical strike rating"] = 38,
+				["fire spell damage"] = 36,
+				["spirit"] = 34,
+				["intellect"] = 15,
 			},
 			["Demonology"] = {
-				["spell power"] = 100,
-				["spirit"] = 96,
-				["shadow spell damage"] = 86,
-				["hit rating"] = 49,
-				["haste rating"] = 37,
-				["mp5"] = 33,
-				["critical strike rating"] = 21,
-				["fire spell damage"] = 15,
-				["intellect"] = 12,
+				["hit rating"] = 100,
+				["haste rating"] = 50,
+				["fire spell damage"] = 45,
+				["shadow spell damage"] = 45,
+				["spell power"] = 45,
+				["critical strike rating"] = 31,
+				["spirit"] = 29,
+				["intellect"] = 13,
 			},
 			["Destruction"] = {
-				["spell power"] = 100,
-				["spirit"] = 56,
-				["shadow spell damage"] = 55,
-				["hit rating"] = 50,
-				["haste rating"] = 48,
-				["mp5"] = 48,
-				["critical strike rating"] = 47,
-				["fire spell damage"] = 46,
-				["intellect"] = 45,
+				["hit rating"] = 100,
+				["fire spell damage"] = 47,
+				["spell power"] = 47,
+				["haste rating"] = 46,
+				["spirit"] = 26,
+				["shadow spell damage"] = 23,
+				["critical strike rating"] = 16,
+				["intellect"] = 13,
 			},
 		},
 		["WARRIOR"] = {
@@ -442,30 +465,31 @@ defaultVars = {
 			[2] = "Protection",
 			["DPS"] = {
 				["expertise rating"] = 100,
-				["attack power"] = 34,
-				["armor penetration rating"] = 33,
-				["strength"] = 22,
-				["hit rating"] = 18,
-				["critical strike rating"] = 18,
-				["agility"] = 12,
-				["haste rating"] = 3,
-				["armor"] = 1,
+				["strength"] = 82,
+				["critical strike rating"] = 66,
+				["agility"] = 53,
+				["armor penetration rating"] = 52,
+				["hit rating"] = 48,
+				["haste rating"] = 36,
+				["attack power"] = 31,
+				["armor"] = 5,
 			},
 			["Protection"] = {
 				["stamina"] = 100,
-				["defense rating"] = 166,
-				["dodge rating"] = 59,
-				["expertise rating"] = 58,
-				["agility"] = 53,
-				["parry rating"] = 50,
-				["block value"] = 22,
-				["strength"] = 17,
-				["hit rating"] = 7,
-				["armor"] = 7,
-				["critical strike rating"] = 5,
-				["armor penetration rating"] = 5,
-				["attack power"] = 3,
-				["haste rating"] = 3,
+				["dodge rating"] = 90,
+				["defense rating"] = 86,
+				["block value"] = 81,
+				["agility"] = 67,
+				["parry rating"] = 67,
+				["block rating"] = 48,
+				["strength"] = 48,
+				["expertise rating"] = 19,
+				["hit rating"] = 10,
+				["armor penetration rating"] = 10,
+				["critical strike rating"] = 7,
+				["armor"] = 6,
+				["haste rating"] = 1,
+				["attack power"] = 1,
 			},
 		},
 	},
-- 
1.7.9.5