diff options
| -rw-r--r-- | src/game/DBCStores.cpp | 8 | ||||
| -rw-r--r-- | src/game/DBCStores.h | 3 | ||||
| -rw-r--r-- | src/game/DBCStructure.h | 11 | ||||
| -rw-r--r-- | src/game/DBCfmt.h | 3 | ||||
| -rw-r--r-- | src/game/SharedDefines.h | 61 |
5 files changed, 77 insertions, 9 deletions
diff --git a/src/game/DBCStores.cpp b/src/game/DBCStores.cpp index 4d1ba2a5cff..0e3b82c02c3 100644 --- a/src/game/DBCStores.cpp +++ b/src/game/DBCStores.cpp @@ -58,7 +58,8 @@ DBCStorage <CurrencyTypesEntry> sCurrencyTypesStore(CurrencyTypesfmt); DBCStorage <DurabilityQualityEntry> sDurabilityQualityStore(DurabilityQualityfmt); DBCStorage <DurabilityCostsEntry> sDurabilityCostsStore(DurabilityCostsfmt); -DBCStorage <EmotesTextEntry> sEmotesTextStore(EmoteEntryfmt); +DBCStorage <EmotesEntry> sEmotesStore(EmotesEntryfmt); +DBCStorage <EmotesTextEntry> sEmotesTextStore(EmotesTextEntryfmt); typedef std::map<uint32,SimpleFactionsList> FactionTeamMap; static FactionTeamMap sFactionTeamMap; @@ -203,7 +204,7 @@ void LoadDBCStores(const std::string& dataPath) { std::string dbcPath = dataPath+"dbc/"; - const uint32 DBCFilesCount = 77; + const uint32 DBCFilesCount = 78; barGoLink bar( DBCFilesCount ); @@ -248,6 +249,7 @@ void LoadDBCStores(const std::string& dataPath) LoadDBC(availableDbcLocales,bar,bad_dbc_files,sCurrencyTypesStore, dbcPath,"CurrencyTypes.dbc"); LoadDBC(availableDbcLocales,bar,bad_dbc_files,sDurabilityCostsStore, dbcPath,"DurabilityCosts.dbc"); LoadDBC(availableDbcLocales,bar,bad_dbc_files,sDurabilityQualityStore, dbcPath,"DurabilityQuality.dbc"); + LoadDBC(availableDbcLocales,bar,bad_dbc_files,sEmotesStore, dbcPath,"Emotes.dbc"); LoadDBC(availableDbcLocales,bar,bad_dbc_files,sEmotesTextStore, dbcPath,"EmotesText.dbc"); LoadDBC(availableDbcLocales,bar,bad_dbc_files,sFactionStore, dbcPath,"Faction.dbc"); for (uint32 i=0;i<sFactionStore.GetNumRows(); ++i) @@ -734,3 +736,5 @@ TRINITY_DLL_SPEC DBCStorage <SpellRangeEntry> const* GetSpellRangeStore() TRINITY_DLL_SPEC DBCStorage <FactionEntry> const* GetFactionStore() { return &sFactionStore; } TRINITY_DLL_SPEC DBCStorage <ItemEntry> const* GetItemDisplayStore() { return &sItemStore; } TRINITY_DLL_SPEC DBCStorage <CreatureDisplayInfoEntry> const* GetCreatureDisplayStore() { return &sCreatureDisplayInfoStore; } +TRINITY_DLL_SPEC DBCStorage <EmotesEntry> const* GetEmotesStore() { return &sEmotesStore; } +TRINITY_DLL_SPEC DBCStorage <EmotesTextEntry> const* GetEmotesTextStore() { return &sEmotesTextStore; } diff --git a/src/game/DBCStores.h b/src/game/DBCStores.h index c7c7b54608e..3c0681285d6 100644 --- a/src/game/DBCStores.h +++ b/src/game/DBCStores.h @@ -80,6 +80,7 @@ extern DBCStorage <CreatureTypeEntry> sCreatureTypeStore; extern DBCStorage <CurrencyTypesEntry> sCurrencyTypesStore; extern DBCStorage <DurabilityCostsEntry> sDurabilityCostsStore; extern DBCStorage <DurabilityQualityEntry> sDurabilityQualityStore; +extern DBCStorage <EmotesEntry> sEmotesStore; extern DBCStorage <EmotesTextEntry> sEmotesTextStore; extern DBCStorage <FactionEntry> sFactionStore; extern DBCStorage <FactionTemplateEntry> sFactionTemplateStore; @@ -155,4 +156,6 @@ TRINITY_DLL_SPEC DBCStorage <SpellRangeEntry> const* GetSpellRangeSto TRINITY_DLL_SPEC DBCStorage <FactionEntry> const* GetFactionStore(); TRINITY_DLL_SPEC DBCStorage <ItemEntry> const* GetItemDisplayStore(); TRINITY_DLL_SPEC DBCStorage <CreatureDisplayInfoEntry> const* GetCreatureDisplayStore(); +TRINITY_DLL_SPEC DBCStorage <EmotesEntry> const* GetEmotesStore(); +TRINITY_DLL_SPEC DBCStorage <EmotesTextEntry> const* GetEmotesTextStore(); #endif diff --git a/src/game/DBCStructure.h b/src/game/DBCStructure.h index e804cba5066..c5e600c4a2c 100644 --- a/src/game/DBCStructure.h +++ b/src/game/DBCStructure.h @@ -750,6 +750,17 @@ struct DurabilityQualityEntry float quality_mod; // 1 }; +struct EmotesEntry +{ + uint32 Id; // 0 + //char* Name; // 1, internal name + //uint32 AnimationId; // 2, ref to animationData + uint32 Flags; // 3, bitmask, may be unit_flags + uint32 EmoteType; // 4, Can be 0, 1 or 2 (determine how emote are shown) + uint32 UnitStandState; // 5, uncomfirmed, may be enum UnitStandStateType + //uint32 SoundId; // 6, ref to soundEntries +}; + struct EmotesTextEntry { uint32 Id; diff --git a/src/game/DBCfmt.h b/src/game/DBCfmt.h index 23f9cc9c516..2090359768c 100644 --- a/src/game/DBCfmt.h +++ b/src/game/DBCfmt.h @@ -44,7 +44,8 @@ const char CreatureTypefmt[]="nxxxxxxxxxxxxxxxxxx"; const char CurrencyTypesfmt[]="xnxi"; const char DurabilityCostsfmt[]="niiiiiiiiiiiiiiiiiiiiiiiiiiiii"; const char DurabilityQualityfmt[]="nf"; -const char EmoteEntryfmt[]="nxixxxxxxxxxxxxxxxx"; +const char EmotesEntryfmt[]="nxxiiix"; +const char EmotesTextEntryfmt[]="nxixxxxxxxxxxxxxxxx"; const char FactionEntryfmt[]="niiiiiiiiiiiiiiiiiissssssssssssssssxxxxxxxxxxxxxxxxxx"; const char FactionTemplateEntryfmt[]="niiiiiiiiiiiii"; const char GemPropertiesEntryfmt[]="nixxi"; diff --git a/src/game/SharedDefines.h b/src/game/SharedDefines.h index e93c82b7314..68a4288003b 100644 --- a/src/game/SharedDefines.h +++ b/src/game/SharedDefines.h @@ -1413,7 +1413,7 @@ enum Emote EMOTE_ONESHOT_POINT = 25, EMOTE_STATE_STAND = 26, EMOTE_STATE_READYUNARMED = 27, - EMOTE_STATE_WORK = 28, + EMOTE_STATE_WORK_SHEATHED = 28, EMOTE_STATE_POINT = 29, EMOTE_STATE_NONE = 30, EMOTE_ONESHOT_WOUND = 33, @@ -1446,13 +1446,13 @@ enum Emote EMOTE_ONESHOT_SALUTE_NOSHEATH = 113, EMOTE_STATE_USESTANDING_NOSHEATHE = 133, EMOTE_ONESHOT_LAUGH_NOSHEATHE = 153, - EMOTE_STATE_WORK_NOSHEATHE = 173, + EMOTE_STATE_WORK = 173, EMOTE_STATE_SPELLPRECAST = 193, EMOTE_ONESHOT_READYRIFLE = 213, EMOTE_STATE_READYRIFLE = 214, - EMOTE_STATE_WORK_NOSHEATHE_MINING = 233, - EMOTE_STATE_WORK_NOSHEATHE_CHOPWOOD= 234, - EMOTE_zzOLDONESHOT_LIFTOFF = 253, + EMOTE_STATE_WORK_MINING = 233, + EMOTE_STATE_WORK_CHOPWOOD = 234, + EMOTE_STATE_APPLAUD = 253, EMOTE_ONESHOT_LIFTOFF = 254, EMOTE_ONESHOT_YES = 273, EMOTE_ONESHOT_NO = 274, @@ -1501,8 +1501,57 @@ enum Emote EMOTE_ONESHOT_CUSTOMSPELL09 = 410, EMOTE_ONESHOT_CUSTOMSPELL10 = 411, EMOTE_STATE_EXCLAIM = 412, + EMOTE_STATE_DANCE_CUSTOM = 413, EMOTE_STATE_SIT_CHAIR_MED = 415, - EMOTE_STATE_SPELLEFFECT_HOLD = 422 + EMOTE_STATE_CUSTOM_SPELL_01 = 416, + EMOTE_STATE_CUSTOM_SPELL_02 = 417, + EMOTE_STATE_EAT = 418, + EMOTE_STATE_CUSTOM_SPELL_04 = 419, + EMOTE_STATE_CUSTOM_SPELL_03 = 420, + EMOTE_STATE_CUSTOM_SPELL_05 = 421, + EMOTE_STATE_SPELLEFFECT_HOLD = 422, + EMOTE_STATE_EAT_NO_SHEATHE = 423, + EMOTE_STATE_MOUNT = 424, + EMOTE_STATE_READY2HL = 425, + EMOTE_STATE_SIT_CHAIR_HIGH = 426, + EMOTE_STATE_FALL = 427, + EMOTE_STATE_LOOT = 428, + EMOTE_STATE_SUBMERGED_NEW = 429, + EMOTE_ONESHOT_COWER = 430, + EMOTE_STATE_COWER = 431, + EMOTE_ONESHOT_USESTANDING = 432, + EMOTE_STATE_STEALTH_STAND = 433, + EMOTE_ONESHOT_OMNICAST_GHOUL = 434, + EMOTE_ONESHOT_ATTACKBOW = 435, + EMOTE_ONESHOT_ATTACKRIFLE = 436, + EMOTE_STATE_SWIM_IDLE = 437, + EMOTE_STATE_ATTACK_UNARMED = 438, + EMOTE_ONESHOT_SPELLCAST_W_SOUND = 439, + EMOTE_ONESHOT_DODGE = 440, + EMOTE_ONESHOT_PARRY1H = 441, + EMOTE_ONESHOT_PARRY2H = 442, + EMOTE_ONESHOT_PARRY2HL = 443, + EMOTE_STATE_FLYFALL = 444, + EMOTE_ONESHOT_FLYDEATH = 445, + EMOTE_STATE_FLY_FALL = 446, + EMOTE_ONESHOT_FLY_SIT_GROUND_DOWN = 447, + EMOTE_ONESHOT_FLY_SIT_GROUND_UP = 448, + EMOTE_ONESHOT_EMERGE = 449, + EMOTE_ONESHOT_DRAGONSPIT = 450, + EMOTE_STATE_SPECIALUNARMED = 451, + EMOTE_ONESHOT_FLYGRAB = 452, + EMOTE_STATE_FLYGRABCLOSED = 453, + EMOTE_ONESHOT_FLYGRABTHROWN = 454, + EMOTE_STATE_FLY_SIT_GROUND = 455, + EMOTE_STATE_WALKBACKWARDS = 456, + EMOTE_ONESHOT_FLYTALK = 457, + EMOTE_ONESHOT_FLYATTACK1H = 458, + EMOTE_STATE_CUSTOMSPELL08 = 459, + EMOTE_ONESHOT_FLY_DRAGONSPIT = 460, + EMOTE_STATE_SIT_CHAIR_LOW = 461, + EMOTE_ONE_SHOT_STUN = 462, + EMOTE_ONESHOT_SPELLCAST_OMNI = 463, + EMOTE_STATE_READYTHROWN = 464 }; enum Anim |