Stat and Enchant DB Fixes; Level 73 Encounters

assets/enchants/descriptions.json

@@ -1,82 +1,14 @@
 {
-  "1": "Scope (+10 Damage)",
   "1071": "",
-  "1144": "",
   "1257": "",
   "1441": "",
-  "15": "Scope (+1 Damage)",
   "1593": "",
-  "1594": "",
-  "16": "Scope (+5 Damage)",
-  "17": "+28 Attack Power/+12 Dodge Rating",
-  "1704": "",
-  "18": "+25 Agility",
-  "1843": "",
-  "1883": "",
-  "1884": "",
-  "1885": "",
-  "1886": "",
-  "1887": "",
   "1888": "",
-  "1889": "",
-  "1890": "",
-  "1891": "",
-  "1892": "",
-  "1893": "",
-  "1894": "",
-  "1896": "",
-  "1897": "",
-  "1898": "",
-  "1899": "",
-  "1900": "",
-  "1903": "",
-  "1904": "",
   "1950": "",
   "2322": "",
   "2343": "",
-  "24": "+35 Agility",
-  "241": "+15 Defense Rating and +10 Dodge Rating",
-  "242": "+6 Mana Regen and +22 Healing",
-  "243": "+15 Spell Critical Strike Rating and +12 Spell Damage and Healing",
-  "2443": "",
-  "246": "+18 Healing and Spell Damage/+10 Stamina",
-  "2463": "",
-  "247": "+10 Frost Resistance",
-  "248": "+15 Spell Power",
-  "2483": "",
-  "2484": "",
-  "2485": "",
-  "2486": "",
-  "2487": "",
-  "2488": "",
-  "249": "+7 All Resistances",
-  "250": "+29 Healing and +10 Spell Damage",
-  "2503": "",
-  "2504": "",
-  "2505": "",
   "2523": "",
-  "254": "+13 Defense Rating",
-  "2543": "",
-  "2544": "",
-  "2545": "",
-  "255": "+5 Mana Regen",
-  "256": "+13 Spell Critical Strike Rating",
-  "2563": "",
   "2564": "",
-  "2565": "",
-  "2566": "",
-  "2567": "",
-  "2568": "",
-  "2583": "",
-  "2584": "",
-  "2585": "",
-  "2586": "",
-  "2587": "",
-  "2588": "",
-  "2589": "",
-  "2590": "",
-  "2591": "",
-  "2603": "",
   "2604": "",
   "2605": "",
   "2606": "",
@@ -90,20 +22,16 @@
   "2621": "",
   "2622": "",
   "2646": "",
-  "2647": "",
   "2648": "",
   "2649": "",
   "2650": "",
-  "2653": "",
   "2654": "",
   "2655": "",
   "2656": "",
   "2657": "",
   "2658": "",
-  "2659": "",
   "2660": "",
   "2661": "",
-  "2662": "",
   "2664": "",
   "2666": "",
   "2667": "",
@@ -140,7 +68,6 @@
   "2930": "",
   "2931": "",
   "2933": "",
-  "2934": "",
   "2935": "",
   "2937": "",
   "2938": "",
@@ -169,7 +96,6 @@
   "2997": "",
   "2998": "",
   "2999": "",
-  "30": "+5 Agility",
   "3000": "",
   "3001": "",
   "3002": "",
@@ -186,97 +112,11 @@
   "3013": "",
   "3095": "",
   "3096": "",
-  "3150": "",
-  "32": "Minor Speed and +6 Agility",
   "3222": "",
   "3223": "",
   "3225": "",
   "3229": "",
   "3260": "",
-  "3269": "",
   "3273": "",
-  "3289": "",
-  "33": "+12 Agility",
-  "3315": "",
-  "34": "+12 Stamina",
-  "36": "+7 Stamina",
-  "368": "",
-  "369": "",
-  "37": "+3 Agility",
-  "41": "Minor Speed Increase",
-  "43": "+5 Spirit",
-  "44": "+5 Stamina",
-  "4419": "",
-  "4428": "",
-  "4429": "",
-  "4441": "",
-  "4442": "",
-  "4443": "",
-  "4444": "",
-  "4445": "",
-  "4446": "",
-  "463": "",
-  "464": "",
-  "4892": "",
-  "4893": "",
-  "4894": "",
-  "4895": "",
-  "4896": "",
-  "4898": "",
-  "5124": "",
-  "5125": "",
-  "63": "+12 Intellect",
-  "65": "+1 Agility",
-  "66": "+2 Defense Rating",
-  "663": "",
-  "664": "",
-  "684": "",
-  "723": "",
-  "724": "",
-  "744": "",
-  "783": "",
-  "803": "",
-  "804": "",
-  "805": "",
-  "823": "",
-  "843": "",
-  "844": "",
-  "845": "",
-  "846": "",
-  "847": "",
-  "848": "",
-  "849": "",
-  "850": "",
-  "851": "",
-  "852": "",
-  "853": "",
-  "854": "",
-  "856": "",
-  "857": "",
-  "863": "",
-  "865": "",
-  "866": "",
-  "884": "",
-  "903": "",
-  "904": "",
-  "905": "",
-  "906": "",
-  "907": "",
-  "908": "",
-  "909": "",
-  "910": "",
-  "911": "",
-  "912": "",
-  "913": "",
-  "923": "",
-  "924": "",
-  "925": "",
-  "926": "",
-  "927": "",
-  "928": "",
-  "929": "",
-  "930": "",
-  "931": "",
-  "943": "",
-  "963": ""
+  "368": ""
 }

assets/locales/en/translation.json

@@ -194,8 +194,7 @@
 			"frost_resistance": "Frost Resistance",
 			"fire_resistance": "Fire Resistance",
 			"nature_resistance": "Nature Resistance",
-			"shadow_resistance": "Shadow Resistance",
-			"rage": "Rage"
+			"shadow_resistance": "Shadow Resistance"
 		},
 		"mastery_spell_names": {
 			"unknown": "Unknown",

proto/common.proto

@@ -173,65 +173,63 @@ enum Stat {
 	StatAgility = 1;
 	StatStamina = 2;
 	StatIntellect = 3;
-	// Unsure if this will be used but including just in case
-	StatRage = 4;
 
 	// Spell Power and Spell Power derivatives
-	StatSpellPower = 5;
-	StatHealingPower = 6;
-	StatSpellDamage = 7;
-	StatArcanePower = 8;
-	StatFirePower = 9;
-	StatFrostPower = 10;
-	StatHolyPower = 11;
-	StatNaturePower = 12;
-	StatShadowPower = 13;
+	StatSpellPower = 4;
+	StatHealingPower = 5;
+	StatSpellDamage = 6;
+	StatArcanePower = 7;
+	StatFirePower = 8;
+	StatFrostPower = 9;
+	StatHolyPower = 10;
+	StatNaturePower = 11;
+	StatShadowPower = 12;
 
 	// Caster Secondaries
-	StatSpellHitRating = 14;
-	StatSpellCritRating = 15;
-	StatSpellHasteRating = 16;
-	StatSpellPenetration = 17;
-	StatSpirit = 18;
+	StatSpellHitRating = 13;
+	StatSpellCritRating = 14;
+	StatSpellHasteRating = 15;
+	StatSpellPenetration = 16;
+	StatSpirit = 17;
 
 	// Physical Secondaries
-	StatAttackPower = 19;
-	StatRangedAttackPower = 20;
-	StatFeralAttackPower = 21;
-	StatMeleeHitRating = 22;
-	StatMeleeCritRating = 23;
-	StatMeleeHasteRating = 24;
-	StatArmorPenetration = 25;
-	StatExpertiseRating = 26;
-
-	// All-School Secondaries
-	StatAllHitRating = 27;
-	StatAllCritRating = 28;
-	StatAllHasteRating = 29;
+	StatAttackPower = 18;
+	StatRangedAttackPower = 19;
+	StatFeralAttackPower = 20;
+	StatMeleeHitRating = 21;
+	StatMeleeCritRating = 22;
+	StatMeleeHasteRating = 23;
+	StatArmorPenetration = 24;
+	StatExpertiseRating = 25;
+
+	// Melee/Ranged School Secondaries
+	StatAllPhysHitRating = 26;
+	StatAllPhysCritRating = 27;
+	StatAllPhysHasteRating = 28;
 
 	// Tank Secondaries
-	StatDefenseRating = 30;
-	StatBlockRating = 31;
-	StatBlockValue = 32;
-	StatDodgeRating = 33;
-	StatParryRating = 34;
-	StatResilienceRating = 35;
-	StatArmor = 36;
-	StatBonusArmor = 37;
+	StatDefenseRating = 29;
+	StatBlockRating = 30;
+	StatBlockValue = 31;
+	StatDodgeRating = 32;
+	StatParryRating = 33;
+	StatResilienceRating = 34;
+	StatArmor = 35;
+	StatBonusArmor = 36;
 
 	// Composite stats that are built up from the above gear stats + buffs.
 	// These still belong in the Stat enum because they can be present on
 	// some enchants and because the base values need to be stored for NPCs.
-	StatHealth = 38;
-	StatMana = 39;
-	StatMP5 = 40;
+	StatHealth = 37;
+	StatMana = 38;
+	StatMP5 = 39;
 
 	// Resistances
-	StatArcaneResistance = 41;
-	StatFireResistance = 42;
-	StatFrostResistance = 43;
-	StatNatureResistance = 44;
-	StatShadowResistance = 45;
+	StatArcaneResistance = 40;
+	StatFireResistance = 41;
+	StatFrostResistance = 42;
+	StatNatureResistance = 43;
+	StatShadowResistance = 44;
 
 	// DO NOT add new stats here without discussing it first; new stats come
 	// with a performance penalty.

schemas/character.schema.json

@@ -395,6 +395,9 @@
         "off_hand": {
           "type": "string"
         },
+        "ranged": {
+          "type": "string"
+        },
         "weapons": {
           "type": "string"
         }
@@ -419,6 +422,7 @@
         "trinkets",
         "main_hand",
         "off_hand",
+        "ranged",
         "weapons"
       ]
     }

schemas/translation.schema.json

@@ -716,9 +716,6 @@
             },
             "shadow_resistance": {
               "type": "string"
-            },
-            "rage": {
-              "type": "string"
             }
           },
           "additionalProperties": false,
@@ -787,8 +784,7 @@
             "frost_resistance",
             "fire_resistance",
             "nature_resistance",
-            "shadow_resistance",
-            "rage"
+            "shadow_resistance"
           ]
         },
         "mastery_spell_names": {