Merge pull request #6 from ToxicKevinFerm/talents-glyphs

Add Cataclysm Talents and Glyphs

proto/common.proto

@@ -854,12 +854,15 @@ message ActionID {
 }
 
 message Glyphs {
- int32 major1 = 1;
- int32 major2 = 2;
- int32 major3 = 3;
- int32 minor1 = 4;
- int32 minor2 = 5;
- int32 minor3 = 6;
+ int32 prime1 = 1;
+ int32 prime2 = 2;
+ int32 prime3 = 3;
+ int32 major1 = 4;
+ int32 major2 = 5;
+ int32 major3 = 6;
+ int32 minor1 = 7;
+ int32 minor2 = 8;
+ int32 minor3 = 9;
 }
 
 // Custom options for a particular cooldown.

proto/death_knight.proto

@@ -8,138 +8,109 @@ import "common.proto";
 message DeathKnightTalents {
  // Blood
  int32 butchery = 1;
- int32 subversion = 2;
- int32 blade_barrier = 3;
- int32 bladed_armor = 4;
+ int32 blade_barrier = 2;
+ int32 bladed_armor = 3;
+ int32 improved_blood_tap = 4;
  int32 scent_of_blood = 5;
- int32 two_handed_weapon_specialization = 6;
- bool rune_tap = 7;
- int32 dark_conviction = 8;
- int32 death_rune_mastery = 9;
- int32 improved_rune_tap = 10;
- int32 spell_deflection = 11;
- int32 vendetta = 12;
- int32 bloody_strikes = 13;
- int32 veteran_of_the_third_war = 14;
- bool mark_of_blood = 15;
- int32 bloody_vengeance = 16;
- int32 abominations_might = 17;
- int32 bloodworms = 18;
- bool hysteria = 19;
- int32 improved_blood_presence = 20;
- int32 improved_death_strike = 21;
- int32 sudden_doom = 22;
- bool vampiric_blood = 23;
- int32 will_of_the_necropolis = 24;
- bool heart_strike = 25;
- int32 might_of_mograine = 26;
- int32 blood_gorged = 27;
- bool dancing_rune_weapon = 28;
+ int32 scarlet_fever = 6;
+ int32 hand_of_doom = 7;
+ int32 blood_caked_blade = 8;
+ bool bone_shield = 9;
+ int32 toughness = 10;
+ int32 abominations_might = 11;
+ int32 sanguine_fortitude = 12;
+ int32 blood_parasite = 13;
+ int32 improved_blood_presence = 14;
+ int32 will_of_the_necropolis = 15;
+ bool rune_tap = 16;
+ bool vampiric_blood = 17;
+ int32 improved_death_strike = 18;
+ int32 crimson_scourge = 19;
+ bool dancing_rune_weapon = 20;
 
  // Frost
- int32 improved_icy_touch = 29;
- int32 runic_power_mastery = 30;
- int32 toughness = 31;
- int32 icy_reach = 32;
- int32 black_ice = 33;
- int32 nerves_of_cold_steel = 34;
- int32 icy_talons = 35;
- bool lichborne = 36;
- int32 annihilation = 37;
- int32 killing_machine = 38;
- int32 chill_of_the_grave = 39;
- int32 endless_winter = 40;
- int32 frigid_dreadplate = 41;
- int32 glacier_rot = 42;
- bool deathchill = 43;
- bool improved_icy_talons = 44;
- int32 merciless_combat = 45;
- int32 rime = 46;
- int32 chilblains = 47;
- bool hungering_cold = 48;
- int32 improved_frost_presence = 49;
- int32 threat_of_thassarian = 50;
- int32 blood_of_the_north = 51;
- bool unbreakable_armor = 52;
- int32 acclimation = 53;
- bool frost_strike = 54;
- int32 guile_of_gorefiend = 55;
- int32 tundra_stalker = 56;
- bool howling_blast = 57;
+ int32 runic_power_mastery = 21;
+ int32 icy_reach = 22;
+ int32 nerves_of_cold_steel = 23;
+ int32 annihilation = 24;
+ bool lichborne = 25;
+ int32 on_a_pale_horse = 26;
+ int32 endless_winter = 27;
+ int32 merciless_combat = 28;
+ int32 chill_of_the_grave = 29;
+ int32 killing_machine = 30;
+ int32 rime = 31;
+ bool pillar_of_frost = 32;
+ bool improved_icy_talons = 33;
+ int32 brittle_bones = 34;
+ int32 chilblains = 35;
+ bool hungering_cold = 36;
+ int32 improved_frost_presence = 37;
+ int32 threat_of_thassarian = 38;
+ int32 might_of_the_frozen_wastes = 39;
+ bool howling_blast = 40;
 
  // Unholy
- int32 vicious_strikes = 58;
- int32 virulence = 59;
- int32 anticipation = 60;
- int32 epidemic = 61;
- int32 morbidity = 62;
- int32 unholy_command = 63;
- int32 ravenous_dead = 64;
- int32 outbreak = 65;
- int32 necrosis = 66;
- bool corpse_explosion = 67;
- int32 on_a_pale_horse = 68;
- int32 blood_caked_blade = 69;
- int32 night_of_the_dead = 70;
- bool unholy_blight = 71;
- int32 impurity = 72;
- int32 dirge = 73;
- int32 desecration = 74;
- int32 magic_suppression = 75;
- int32 reaping = 76;
- bool master_of_ghouls = 77;
- int32 desolation = 78;
- bool anti_magic_zone = 79;
- int32 improved_unholy_presence = 80;
- bool ghoul_frenzy = 81;
- int32 crypt_fever = 82;
- bool bone_shield = 83;
- int32 wandering_plague = 84;
- int32 ebon_plaguebringer = 85;
- bool scourge_strike = 86;
- int32 rage_of_rivendare = 87;
- bool summon_gargoyle = 88;
+ int32 unholy_command = 41;
+ int32 virulence = 42;
+ int32 epidemic = 43;
+ int32 desecration = 44;
+ int32 resilient_infection = 45;
+ int32 morbidity = 46;
+ int32 runic_corruption = 47;
+ bool unholy_frenzy = 48;
+ int32 contagion = 49;
+ int32 shadow_infusion = 50;
+ int32 deaths_advance = 51;
+ int32 magic_suppression = 52;
+ int32 rage_of_rivendare = 53;
+ bool unholy_blight = 54;
+ bool anti_magic_zone = 55;
+ int32 improved_unholy_presence = 56;
+ bool dark_transformation = 57;
+ int32 ebon_plaguebringer = 58;
+ int32 sudden_doom = 59;
+ bool summon_gargoyle = 60;
 }
 
-enum DeathKnightMajorGlyph {
- DeathknightMajorGlyphNone = 0;
- GlyphOfAntiMagicShell = 43533;
- GlyphOfBloodStrike = 43826;
- GlyphOfBoneShield = 43536;
- GlyphOfChainsOfIce = 43537;
- GlyphOfDancingRuneWeapon = 45799;
- GlyphOfDarkCommand = 43538;
- GlyphOfDarkDeath = 45804;
+enum DeathKnightPrimeGlyph {
+ DeathKnightPrimeGlyphNone = 0;
  GlyphOfDeathAndDecay = 43542;
- GlyphOfDeathGrip = 43541;
+ GlyphOfDeathCoil = 45804;
  GlyphOfDeathStrike = 43827;
- GlyphOfDisease = 45805;
  GlyphOfFrostStrike = 43543;
  GlyphOfHeartStrike = 43534;
  GlyphOfHowlingBlast = 45806;
- GlyphOfHungeringCold = 45800;
- GlyphOfIceboundFortitude = 43545;
  GlyphOfIcyTouch = 43546;
  GlyphOfObliterate = 43547;
- GlyphOfPlagueStrike = 43548;
+ GlyphOfRaiseDead = 43549;
  GlyphOfRuneStrike = 43550;
- GlyphOfRuneTap = 43825;
  GlyphOfScourgeStrike = 43551;
+}
+enum DeathKnightMajorGlyph {
+ DeathKnightMajorGlyphNone = 0;
+ GlyphOfAntiMagicShell = 43533;
+ GlyphOfBloodBoil = 43826;
+ GlyphOfBoneShield = 43536;
+ GlyphOfChainsOfIce = 43537;
+ GlyphOfDancingRuneWeapon = 45799;
+ GlyphOfDarkSuccor = 68793;
+ GlyphOfDeathGrip = 43541;
+ GlyphOfHungeringCold = 45800;
+ GlyphOfPestilence = 43548;
+ GlyphOfPillarOfFrost = 43553;
+ GlyphOfRuneTap = 43825;
  GlyphOfStrangulate = 43552;
- GlyphOfTheGhoul = 43549;
- GlyphOfUnbreakableArmor = 43553;
- GlyphOfUnholyBlight = 45803;
  GlyphOfVampiricBlood = 43554;
 }
-
 enum DeathKnightMinorGlyph {
- DeathknightMinorGlyphNone = 0;
+ DeathKnightMinorGlyphNone = 0;
  GlyphOfBloodTap = 43535;
- GlyphOfCorpseExplosion = 43671;
+ GlyphOfDeathGate = 43673;
  GlyphOfDeathSEmbrace = 43539;
  GlyphOfHornOfWinter = 43544;
- GlyphOfPestilence = 43672;
- GlyphOfRaiseDead = 43673;
+ GlyphOfPathOfFrost = 43671;
+ GlyphOfResilientGrip = 43672;
 }
 
 message DeathKnightOptions {