mirror of
https://github.com/mangosfour/server.git
synced 2025-12-16 22:37:02 +00:00
Merge branch 'master' into 310
Conflicts: src/game/MiscHandler.cpp src/game/Player.cpp src/game/Player.h src/shared/Database/DBCStores.cpp
This commit is contained in:
commit
9debf4dfc0
15 changed files with 182 additions and 48 deletions
|
|
@ -698,6 +698,23 @@ struct CreatureTypeEntry
|
|||
//uint32 no_expirience; // 18 no exp? critters, non-combat pets, gas cloud.
|
||||
};
|
||||
|
||||
/* not used
|
||||
struct CurrencyCategoryEntry
|
||||
{
|
||||
uint32 ID; // 0
|
||||
uint32 Unk1; // 1 0 for known categories and 3 for unknown one (3.0.9)
|
||||
char* Name[16]; // 2-17 name
|
||||
// // 18 string flags
|
||||
};
|
||||
*/
|
||||
|
||||
struct CurrencyTypesEntry
|
||||
{
|
||||
//uint32 ID; // 0 not used
|
||||
uint32 ItemId; // 1 used as real index
|
||||
uint32 BitIndex; // 2 bit index in PLAYER_FIELD_KNOWN_CURRENCIES (1 << (index-1))
|
||||
};
|
||||
|
||||
struct DurabilityCostsEntry
|
||||
{
|
||||
uint32 Itemlvl; // 0
|
||||
|
|
@ -902,6 +919,13 @@ struct ItemEntry
|
|||
uint32 Sheath; // 7
|
||||
};
|
||||
|
||||
struct ItemBagFamilyEntry
|
||||
{
|
||||
uint32 ID; // 0
|
||||
//char* name[16] // 1-16 m_name_lang
|
||||
// // 17 name flags
|
||||
};
|
||||
|
||||
struct ItemDisplayInfoEntry
|
||||
{
|
||||
uint32 ID; // 0 m_ID
|
||||
|
|
@ -1400,13 +1424,16 @@ struct StableSlotPricesEntry
|
|||
uint32 Flags; // 5
|
||||
};*/
|
||||
|
||||
#define MAX_TALENT_RANK 5
|
||||
#define MAX_PET_TALENT_RANK 3 // use in calculations, expected <= MAX_TALENT_RANK
|
||||
|
||||
struct TalentEntry
|
||||
{
|
||||
uint32 TalentID; // 0
|
||||
uint32 TalentTab; // 1 index in TalentTab.dbc (TalentTabEntry)
|
||||
uint32 Row; // 2
|
||||
uint32 Col; // 3
|
||||
uint32 RankID[5]; // 4-8
|
||||
uint32 RankID[MAX_TALENT_RANK]; // 4-8
|
||||
// 9-12 not used, always 0, maybe not used high ranks
|
||||
uint32 DependsOn; // 13 index in Talent.dbc (TalentEntry)
|
||||
// 14-15 not used
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue