From 9de3528233219a7f22e3866e728f60b579366f7b Mon Sep 17 00:00:00 2001 From: Shocker Date: Sun, 21 Oct 2012 22:17:49 +0300 Subject: Core/Player: Define talent trees (tabs) --- src/server/game/Entities/Player/Player.h | 34 ++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'src') diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 583423a28d5..bca2110d72f 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -115,6 +115,40 @@ struct PlayerTalent uint8 spec : 8; }; +enum TalentTree // talent tabs +{ + TALENT_TREE_WARRIOR_ARMS = 746, + TALENT_TREE_WARRIOR_FURY = 815, + TALENT_TREE_WARRIOR_PROTECTION = 845, + TALENT_TREE_PALADIN_HOLY = 831, + TALENT_TREE_PALADIN_PROTECTION = 839, + TALENT_TREE_PALADIN_RETRIBUTION = 855, + TALENT_TREE_HUNTER_BEAST_MASTERY = 811, + TALENT_TREE_HUNTER_MARKSMANSHIP = 807, + TALENT_TREE_HUNTER_SURVIVAL = 809, + TALENT_TREE_ROGUE_ASSASSINATION = 182, + TALENT_TREE_ROGUE_COMBAT = 181, + TALENT_TREE_ROGUE_SUBTLETY = 183, + TALENT_TREE_PRIEST_DISCIPLINE = 760, + TALENT_TREE_PRIEST_HOLY = 813, + TALENT_TREE_PRIEST_SHADOW = 759, + TALENT_TREE_DEATH_KNIGHT_BLOOD = 398, + TALENT_TREE_DEATH_KNIGHT_FROST = 399, + TALENT_TREE_DEATH_KNIGHT_UNHOLY = 400, + TALENT_TREE_SHAMAN_ELEMENTAL = 261, + TALENT_TREE_SHAMAN_ENHANCEMENT = 263, + TALENT_TREE_SHAMAN_RESTORATION = 262, + TALENT_TREE_MAGE_ARCANE = 799, + TALENT_TREE_MAGE_FIRE = 851, + TALENT_TREE_MAGE_FROST = 823, + TALENT_TREE_WARLOCK_AFFLICTION = 871, + TALENT_TREE_WARLOCK_DEMONOLOGY = 867, + TALENT_TREE_WARLOCK_DESTRUCTION = 865, + TALENT_TREE_DRUID_BALANCE = 752, + TALENT_TREE_DRUID_FERAL_COMBAT = 750, + TALENT_TREE_DRUID_RESTORATION = 748 +}; + // Spell modifier (used for modify other spells) struct SpellModifier { -- cgit v1.2.3 From 66889f11b72966fbdfc10abc460ec7345b29855a Mon Sep 17 00:00:00 2001 From: Shocker Date: Sun, 21 Oct 2012 22:25:52 +0300 Subject: Core/Spells: Use previous defines in a druid spell script --- src/server/scripts/Spells/spell_druid.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src') diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp index 5cba8edb37e..f8adb13d058 100644 --- a/src/server/scripts/Spells/spell_druid.cpp +++ b/src/server/scripts/Spells/spell_druid.cpp @@ -158,7 +158,6 @@ enum EclipseSpells SPELL_DRUID_SOLAR_ECLIPSE_MARKER = 67483, // Will make the yellow arrow on eclipse bar point to the yellow side (solar) SPELL_DRUID_SOLAR_ECLIPSE = 48517, SPELL_DRUID_LUNAR_ECLIPSE = 48518, - TALENT_TREE_BALANCE = 752, }; // Wrath, Starfire, and Starsurge @@ -191,7 +190,7 @@ public: Player* caster = GetCaster()->ToPlayer(); // No boomy, no deal. - if (caster->GetPrimaryTalentTree(caster->GetActiveSpec()) != TALENT_TREE_BALANCE) + if (caster->GetPrimaryTalentTree(caster->GetActiveSpec()) != TALENT_TREE_DRUID_BALANCE) return; switch(GetSpellInfo()->Id) -- cgit v1.2.3 From cff550449d90c50af96f2b765fd1230b2f629464 Mon Sep 17 00:00:00 2001 From: Shocker Date: Sun, 21 Oct 2012 22:32:18 +0300 Subject: Core/Player: Correct value for TALENT_TREE_PRIEST_SHADOW --- src/server/game/Entities/Player/Player.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index bca2110d72f..9b2b508dbe7 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -131,7 +131,7 @@ enum TalentTree // talent tabs TALENT_TREE_ROGUE_SUBTLETY = 183, TALENT_TREE_PRIEST_DISCIPLINE = 760, TALENT_TREE_PRIEST_HOLY = 813, - TALENT_TREE_PRIEST_SHADOW = 759, + TALENT_TREE_PRIEST_SHADOW = 795, TALENT_TREE_DEATH_KNIGHT_BLOOD = 398, TALENT_TREE_DEATH_KNIGHT_FROST = 399, TALENT_TREE_DEATH_KNIGHT_UNHOLY = 400, -- cgit v1.2.3