[12200] Implement storing talent tree roles

Signed-off-by: Yaki Khadafi <elsoldollo@gmail.com>
mokerjoke · Sep 8, 2012 · 26b2b40 · 26b2b40
1 parent 29d1817
commit 26b2b40
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 5 deletions.
diff --git a/src/game/DBCEnums.h b/src/game/DBCEnums.h
@@ -422,6 +422,15 @@ enum ItemLimitCategory
     ITEM_LIMIT_CATEGORY_MANA_GEM   = 4,
 };
 
+enum TalentTreeRole
+{
+    TALENT_ROLE_TANK    = 0x2,
+    TALENT_ROLE_HEALER  = 0x4,
+    TALENT_ROLE_DPS     = 0x8,
+};
+
+#define MAX_MASTERY_SPELLS 2
+
 enum TotemCategoryType
 {
     TOTEM_CATEGORY_TYPE_KNIFE   = 1,

diff --git a/src/game/DBCStores.cpp b/src/game/DBCStores.cpp
@@ -207,6 +207,8 @@ DBCStorage <TalentTreePrimarySpellsEntry> sTalentTreePrimarySpellsStore(TalentTr
 typedef std::map<uint32, std::vector<uint32> > TalentTreeSpellsMap;
 TalentTreeSpellsMap sTalentTreeMasterySpellsMap;
 TalentTreeSpellsMap sTalentTreePrimarySpellsMap;
+typedef std::map<uint32, uint32> TalentTreeRolesMap;
+TalentTreeRolesMap sTalentTreeRolesMap;
 
 // store absolute bit position for first rank for talent inspect
 static uint32 sTalentTabPages[MAX_CLASSES][3];
@@ -688,6 +690,8 @@ void LoadDBCStores(const std::string& dataPath)
             for (uint32 cls = 1; cls < MAX_CLASSES; ++cls)
                 if (talentTabInfo->ClassMask & (1 << (cls - 1)))
                     sTalentTabPages[cls][talentTabInfo->tabpage] = talentTabId;
+
+            sTalentTreeRolesMap[talentTabId] = talentTabInfo->rolesMask;
         }
     }
 
@@ -1085,6 +1089,15 @@ std::vector<uint32> const* GetTalentTreePrimarySpells(uint32 talentTree)
     return &itr->second;
 }
 
+uint32 GetTalentTreeRolesMask(uint32 talentTree)
+{
+    TalentTreeRolesMap::const_iterator itr = sTalentTreeRolesMap.find(talentTree);
+    if (itr == sTalentTreeRolesMap.end())
+        return NULL;
+
+    return itr->second;
+}
+
 bool IsPointInAreaTriggerZone(AreaTriggerEntry const* atEntry, uint32 mapid, float x, float y, float z, float delta)
 {
     if (mapid != atEntry->mapid)

diff --git a/src/game/DBCStores.h b/src/game/DBCStores.h
@@ -91,6 +91,7 @@ inline Difficulty GetPrevDifficulty(Difficulty diff, bool isRaid)
 uint32 const* /*[3]*/ GetTalentTabPages(uint32 cls);
 std::vector<uint32> const* GetTalentTreeMasterySpells(uint32 talentTree);
 std::vector<uint32> const* GetTalentTreePrimarySpells(uint32 talentTree);
+uint32 GetTalentTreeRolesMask(uint32 talentTree);
 
 bool IsPointInAreaTriggerZone(AreaTriggerEntry const* atEntry, uint32 mapid, float x, float y, float z, float delta = 0.0f);
 

diff --git a/src/game/DBCStructure.h b/src/game/DBCStructure.h
@@ -2137,8 +2137,6 @@ struct TalentEntry
     //uint64  allowForPet;                                  // 17       m_categoryMask its a 64 bit mask for pet 1<<m_categoryEnumID in CreatureFamily.dbc
 };
 
-#define MAX_MASTERY_SPELLS 2
-
 struct TalentTabEntry
 {
     uint32  TalentTabID;                                    // 0        m_ID
@@ -2149,7 +2147,7 @@ struct TalentTabEntry
     uint32  tabpage;                                        // 5        m_orderIndex
     //char* internalname;                                   // 6        m_backgroundFile
     //char* description;                                    // 7
-    //uint32 rolesMask;                                     // 8        4.0.0
+    uint32 rolesMask;                                       // 8        4.0.0
     uint32 masterySpells[MAX_MASTERY_SPELLS];               // 9-10     passive mastery bonus spells
 };
 

diff --git a/src/game/DBCfmt.h b/src/game/DBCfmt.h
@@ -130,7 +130,7 @@ const char SpellShapeshiftFormfmt[]="nxxiixiiixxiiiiiiiixx";
 //const char StableSlotPricesfmt[] = "ni"; // removed
 const char SummonPropertiesfmt[] = "niiiii";
 const char TalentEntryfmt[]="niiiiiiiiixxixxxxxx";
-const char TalentTabEntryfmt[]="nxxiiixxxii";
+const char TalentTabEntryfmt[]="nxxiiixxiii";
 const char TalentTreePrimarySpellsfmt[]="diix";
 const char TaxiNodesEntryfmt[]="nifffsiixxx";
 const char TaxiPathEntryfmt[]="niii";

diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "12199"
+ #define REVISION_NR "12200"
 #endif // __REVISION_NR_H__