Fix DB Gen for Talents and Consumables

proto/common.proto

@@ -195,48 +195,53 @@ enum Stat {
 	StatShadowPower = 13;
 
 	// Caster Secondaries
-	StatSpellHit = 14;
-	StatSpellCrit = 15;
-	StatSpellHaste = 16;
+	StatSpellHitRating = 14;
+	StatSpellCritRating = 15;
+	StatSpellHasteRating = 16;
 	StatSpellPenetration = 17;
 	StatSpirit = 18;
 
 	// Physical Secondaries
 	StatAttackPower = 19;
 	StatRangedAttackPower = 20;
 	StatFeralAttackPower = 21;
-	StatMeleeHit = 22;
-	StatMeleeCrit = 23;
-	StatMeleeHaste = 24;
+	StatMeleeHitRating = 22;
+	StatMeleeCritRating = 23;
+	StatMeleeHasteRating = 24;
 	StatArmorPenetration = 25;
-	StatExpertise = 26;
+	StatExpertiseRating = 26;
+
+	// All-School Secondaries
+	StatAllHitRating = 27;
+	StatAllCritRating = 28;
+	StatAllHasteRating = 29;
 
 	// Tank Secondaries
-	StatDefense = 27;
-	StatBlock = 28;
-	StatBlockValue = 29;
-	StatDodge = 30;
-	StatParry = 31;
-	StatResilience = 32;
-	StatArmor = 33;
-	StatBonusArmor = 34;
+	StatDefenseRating = 30;
+	StatBlockRating = 31;
+	StatBlockValue = 32;
+	StatDodgeRating = 33;
+	StatParryRating = 34;
+	StatResilience = 35;
+	StatArmor = 36;
+	StatBonusArmor = 37;
 
 	// 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 = 35;
-	StatMana = 36;
-	StatMP5 = 37;
+	StatHealth = 38;
+	StatMana = 39;
+	StatMP5 = 40;
 
 	// Resistances
-	StatArcaneResistance = 38;
-	StatFireResistance = 39;
-	StatFrostResistance = 40;
-	StatNatureResistance = 41;
-	StatShadowResistance = 42;
+	StatArcaneResistance = 41;
+	StatFireResistance = 42;
+	StatFrostResistance = 43;
+	StatNatureResistance = 44;
+	StatShadowResistance = 45;
 
 	// Unsure if this will be used but including just in case
-	StatRage = 43;
+	StatRage = 46;
 
 	// DO NOT add new stats here without discussing it first; new stats come
 	// with a performance penalty.
@@ -286,9 +291,9 @@ enum PseudoStat {
 	PseudoStatSchoolHitNature = 11;
 	PseudoStatSchoolHitShadow = 12;
 
-	PseudoStatPhysicalHitPercent = 13;
+	PseudoStatMeleeHitPercent = 13;
 	PseudoStatSpellHitPercent = 14;
-	PseudoStatPhysicalCritPercent = 15;
+	PseudoStatMeleeCritPercent = 15;
 	PseudoStatSpellCritPercent = 16;
 	PseudoStatBlockPercent = 17;
 
@@ -299,6 +304,9 @@ enum PseudoStat {
 	PseudoStatRangedHastePercent = 22;
 	PseudoStatSpellHastePercent = 23;
 	PseudoStatBlockValuePerStrength = 24;
+
+	PseudoStatRangedHitPercent = 25;
+	PseudoStatRangedCritPercent = 26;
 }
 
 message UnitStats {

proto/druid.proto

@@ -8,6 +8,71 @@ import "common.proto";
 // BEGIN GENERATED
 // DruidTalents message.
 message DruidTalents {
+    // Balance
+    int32 starlight_wrath = 1;
+    bool natures_grasp = 2;
+    int32 improved_natures_grasp = 3;
+    int32 control_of_nature = 4;
+    int32 focused_starlight = 5;
+    int32 improved_moonfire = 6;
+    int32 brambles = 7;
+    bool insect_swarm = 8;
+    int32 natures_reach = 9;
+    int32 vengeance = 10;
+    int32 celestial_focus = 11;
+    int32 lunar_guidance = 12;
+    bool natures_grace = 13;
+    int32 moonglow = 14;
+    int32 moonfury = 15;
+    int32 balance_of_power = 16;
+    int32 dreamstate = 17;
+    bool moonkin_form = 18;
+    int32 improved_faerie_fire = 19;
+    int32 wrath_of_cenarius = 20;
+    bool force_of_nature = 21;
+    // Feral Combat
+    int32 ferocity = 22;
+    int32 feral_aggression = 23;
+    int32 feral_instinct = 24;
+    int32 brutal_impact = 25;
+    int32 thick_hide = 26;
+    int32 feral_swiftness = 27;
+    bool feral_charge = 28;
+    int32 sharpened_claws = 29;
+    int32 shredding_attacks = 30;
+    int32 predatory_strikes = 31;
+    int32 primal_fury = 32;
+    int32 savage_fury = 33;
+    bool faerie_fire_feral = 34;
+    int32 nurturing_instinct = 35;
+    int32 heart_of_the_wild = 36;
+    int32 survival_of_the_fittest = 37;
+    int32 primal_tenacity = 38;
+    bool leader_of_the_pack = 39;
+    int32 improved_leader_of_the_pack = 40;
+    int32 predatory_instincts = 41;
+    bool mangle = 42;
+    // Restoration
+    int32 improved_mark_of_the_wild = 43;
+    int32 furor = 44;
+    int32 naturalist = 45;
+    int32 natures_focus = 46;
+    int32 natural_shapeshifter = 47;
+    int32 intensity = 48;
+    int32 subtlety = 49;
+    bool omen_of_clarity = 50;
+    int32 tranquil_spirit = 51;
+    int32 improved_rejuvenation = 52;
+    bool natures_swiftness = 53;
+    int32 gift_of_nature = 54;
+    int32 improved_tranquility = 55;
+    int32 empowered_touch = 56;
+    int32 improved_regrowth = 57;
+    int32 living_spirit = 58;
+    bool swiftmend = 59;
+    int32 natural_perfection = 60;
+    int32 empowered_rejuvenation = 61;
+    bool tree_of_life = 62;
 }
 
 // END GENERATED

proto/hunter.proto

@@ -8,6 +8,73 @@ import "common.proto";
 // BEGIN GENERATED
 // HunterTalents message.
 message HunterTalents {
+    // Beast Mastery
+    int32 improved_aspect_of_the_hawk = 1;
+    int32 endurance_training = 2;
+    int32 focused_fire = 3;
+    int32 improved_aspect_of_the_monkey = 4;
+    int32 thick_hide = 5;
+    int32 improved_revive_pet = 6;
+    int32 pathfinding = 7;
+    bool bestial_swiftness = 8;
+    int32 unleashed_fury = 9;
+    int32 improved_mend_pet = 10;
+    int32 ferocity = 11;
+    int32 spirit_bond = 12;
+    bool intimidation = 13;
+    int32 bestial_discipline = 14;
+    int32 animal_handler = 15;
+    int32 frenzy = 16;
+    int32 ferocious_inspiration = 17;
+    bool bestial_wrath = 18;
+    int32 catlike_reflexes = 19;
+    int32 serpents_swiftness = 20;
+    bool the_beast_within = 21;
+    // Marksmanship
+    int32 improved_concussive_shot = 22;
+    int32 lethal_shots = 23;
+    int32 improved_hunters_mark = 24;
+    int32 efficiency = 25;
+    int32 go_for_the_throat = 26;
+    int32 improved_arcane_shot = 27;
+    bool aimed_shot = 28;
+    int32 rapid_killing = 29;
+    int32 improved_stings = 30;
+    int32 mortal_shots = 31;
+    int32 concussive_barrage = 32;
+    bool scatter_shot = 33;
+    int32 barrage = 34;
+    int32 combat_experience = 35;
+    int32 ranged_weapon_specialization = 36;
+    int32 careful_aim = 37;
+    bool trueshot_aura = 38;
+    int32 improved_barrage = 39;
+    int32 master_marksman = 40;
+    bool silencing_shot = 41;
+    // Survival
+    int32 monster_slaying = 42;
+    int32 humanoid_slaying = 43;
+    int32 hawk_eye = 44;
+    int32 savage_strikes = 45;
+    int32 entrapment = 46;
+    int32 deflection = 47;
+    int32 improved_wing_clip = 48;
+    int32 clever_traps = 49;
+    int32 survivalist = 50;
+    bool deterrence = 51;
+    int32 trap_mastery = 52;
+    int32 surefooted = 53;
+    int32 improved_feign_death = 54;
+    int32 survival_instincts = 55;
+    int32 killer_instinct = 56;
+    bool counterattack = 57;
+    int32 resourcefulness = 58;
+    int32 lightning_reflexes = 59;
+    int32 thrill_of_the_hunt = 60;
+    bool wyvern_sting = 61;
+    int32 expose_weakness = 62;
+    int32 master_tactician = 63;
+    bool readiness = 64;
 }
 
 // END GENERATED

proto/mage.proto

@@ -7,6 +7,76 @@ option go_package = "./proto";
 // BEGIN GENERATED
 // MageTalents message.
 message MageTalents {
+    // Arcane
+    int32 arcane_subtlety = 1;
+    int32 arcane_focus = 2;
+    int32 improved_arcane_missiles = 3;
+    int32 wand_specialization = 4;
+    int32 magic_absorption = 5;
+    int32 arcane_concentration = 6;
+    int32 magic_attunement = 7;
+    int32 arcane_impact = 8;
+    bool arcane_fortitude = 9;
+    int32 improved_mana_shield = 10;
+    int32 improved_counterspell = 11;
+    int32 arcane_meditation = 12;
+    int32 improved_blink = 13;
+    bool presence_of_mind = 14;
+    int32 arcane_mind = 15;
+    int32 prismatic_cloak = 16;
+    int32 arcane_instability = 17;
+    int32 arcane_potency = 18;
+    int32 empowered_arcane_missiles = 19;
+    bool arcane_power = 20;
+    int32 spell_power = 21;
+    int32 mind_mastery = 22;
+    bool slow = 23;
+    // Fire
+    int32 improved_fireball = 24;
+    int32 impact = 25;
+    int32 ignite = 26;
+    int32 flame_throwing = 27;
+    int32 improved_fire_blast = 28;
+    int32 incineration = 29;
+    int32 improved_flamestrike = 30;
+    bool pyroblast = 31;
+    int32 burning_soul = 32;
+    int32 improved_scorch = 33;
+    int32 molten_shields = 34;
+    int32 master_of_elements = 35;
+    int32 playing_with_fire = 36;
+    int32 critical_mass = 37;
+    bool blast_wave = 38;
+    int32 blazing_speed = 39;
+    int32 fire_power = 40;
+    int32 pyromaniac = 41;
+    bool combustion = 42;
+    int32 molten_fury = 43;
+    int32 empowered_fireball = 44;
+    bool dragons_breath = 45;
+    // Frost
+    int32 frost_warding = 46;
+    int32 improved_frostbolt = 47;
+    int32 elemental_precision = 48;
+    int32 ice_shards = 49;
+    int32 frostbite = 50;
+    int32 improved_frost_nova = 51;
+    int32 permafrost = 52;
+    int32 piercing_ice = 53;
+    bool icy_veins = 54;
+    int32 improved_blizzard = 55;
+    int32 arctic_reach = 56;
+    int32 frost_channeling = 57;
+    int32 shatter = 58;
+    int32 frozen_core = 59;
+    bool cold_snap = 60;
+    int32 improved_cone_of_cold = 61;
+    int32 ice_floes = 62;
+    int32 winters_chill = 63;
+    bool ice_barrier = 64;
+    int32 arctic_winds = 65;
+    int32 empowered_frostbolt = 66;
+    bool summon_water_elemental = 67;
 }
 
 // END GENERATED

proto/paladin.proto

@@ -6,6 +6,73 @@ option go_package = "./proto";
 // BEGIN GENERATED
 // PaladinTalents message.
 message PaladinTalents {
+    // Holy
+    int32 divine_strength = 1;
+    int32 divine_intellect = 2;
+    int32 spiritual_focus = 3;
+    int32 improved_seal_of_righteousness = 4;
+    int32 healing_light = 5;
+    bool aura_mastery = 6;
+    int32 improved_lay_on_hands = 7;
+    int32 unyielding_faith = 8;
+    int32 illumination = 9;
+    int32 improved_blessing_of_wisdom = 10;
+    int32 pure_of_heart = 11;
+    bool divine_favor = 12;
+    int32 sanctified_light = 13;
+    int32 purifying_power = 14;
+    int32 holy_power = 15;
+    int32 lights_grace = 16;
+    bool holy_shock = 17;
+    int32 blessed_life = 18;
+    int32 holy_guidance = 19;
+    bool divine_illumination = 20;
+    // Protection
+    int32 improved_devotion_aura = 21;
+    int32 redoubt = 22;
+    int32 precision = 23;
+    int32 guardians_favor = 24;
+    int32 toughness = 25;
+    bool blessing_of_kings = 26;
+    int32 improved_righteous_fury = 27;
+    int32 shield_specialization = 28;
+    int32 anticipation = 29;
+    int32 stoicism = 30;
+    int32 improved_hammer_of_justice = 31;
+    int32 improved_concentration_aura = 32;
+    int32 spell_warding = 33;
+    bool blessing_of_sanctuary = 34;
+    int32 reckoning = 35;
+    int32 sacred_duty = 36;
+    int32 one_handed_weapon_specialization = 37;
+    int32 improved_holy_shield = 38;
+    bool holy_shield = 39;
+    int32 ardent_defender = 40;
+    int32 combat_expertise = 41;
+    bool avengers_shield = 42;
+    // Retribution
+    int32 improved_blessing_of_might = 43;
+    int32 benediction = 44;
+    int32 improved_judgement = 45;
+    int32 improved_seal_of_the_crusader = 46;
+    int32 deflection = 47;
+    int32 vindication = 48;
+    int32 conviction = 49;
+    bool seal_of_command = 50;
+    int32 pursuit_of_justice = 51;
+    int32 eye_for_an_eye = 52;
+    int32 improved_retribution_aura = 53;
+    int32 crusade = 54;
+    int32 two_handed_weapon_specialization = 55;
+    bool sanctity_aura = 56;
+    int32 improved_sanctity_aura = 57;
+    int32 vengeance = 58;
+    int32 sanctified_judgement = 59;
+    int32 sanctified_seals = 60;
+    bool repentance = 61;
+    int32 divine_purpose = 62;
+    int32 fanaticism = 63;
+    bool crusader_strike = 64;
 }
 
 // END GENERATED