diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 33 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/Player.h | 1 | ||||
| -rw-r--r-- | src/server/game/Miscellaneous/SharedDefines.h | 6 |
3 files changed, 40 insertions, 0 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 0350d2b3833..8eb18fde4b1 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -164,6 +164,7 @@ Player::Player(WorldSession* session) : Unit(true), m_sceneMgr(this) m_combatExitTime = 0; m_regenTimer = 0; m_regenTimerCount = 0; + m_foodEmoteTimerCount = 0; m_weaponChangeTimer = 0; m_zoneUpdateId = uint32(-1); @@ -1677,6 +1678,7 @@ bool Player::IsImmunedToSpellEffect(SpellInfo const* spellInfo, SpellEffectInfo void Player::RegenerateAll() { m_regenTimerCount += m_regenTimer; + m_foodEmoteTimerCount += m_regenTimer; for (Powers power = POWER_MANA; power < MAX_POWERS; power = Powers(power + 1)) if (power != POWER_RUNES) @@ -1713,6 +1715,37 @@ void Player::RegenerateAll() } m_regenTimer = 0; + + // Handles the emotes for drinking and eating. + // According to sniffs there is a background timer going on that repeats independed from the time window where the aura applies. + // That's why we dont need to reset the timer on apply. In sniffs I have seen that the first call for the spell visual is totally random, then after + // 5 seconds over and over again which confirms my theory that we have a independed timer. + if (m_foodEmoteTimerCount >= 5000) + { + std::vector<AuraEffect*> auraList; + AuraEffectList const& ModRegenAuras = GetAuraEffectsByType(SPELL_AURA_MOD_REGEN); + AuraEffectList const& ModPowerRegenAuras = GetAuraEffectsByType(SPELL_AURA_MOD_POWER_REGEN); + + auraList.reserve(ModRegenAuras.size() + ModPowerRegenAuras.size()); + auraList.insert(auraList.end(), ModRegenAuras.begin(), ModRegenAuras.end()); + auraList.insert(auraList.end(), ModPowerRegenAuras.begin(), ModPowerRegenAuras.end()); + + for (auto itr = auraList.begin(); itr != auraList.end(); ++itr) + { + // Food emote comes above drinking emote if we have to decide (mage regen food for example) + if ((*itr)->GetBase()->HasEffectType(SPELL_AURA_MOD_REGEN) && (*itr)->GetSpellInfo()->HasAuraInterruptFlag(SpellAuraInterruptFlags::Standing)) + { + SendPlaySpellVisualKit(SPELL_VISUAL_KIT_FOOD, 0, 0); + break; + } + else if ((*itr)->GetBase()->HasEffectType(SPELL_AURA_MOD_POWER_REGEN) && (*itr)->GetSpellInfo()->HasAuraInterruptFlag(SpellAuraInterruptFlags::Standing)) + { + SendPlaySpellVisualKit(SPELL_VISUAL_KIT_DRINK, 0, 0); + break; + } + } + m_foodEmoteTimerCount -= 5000; + } } void Player::Regenerate(Powers power) diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 4695eb8d21a..9ddf57dafce 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -2691,6 +2691,7 @@ class TC_GAME_API Player : public Unit, public GridObject<Player> GuidList WhisperList; uint32 m_combatExitTime; uint32 m_regenTimerCount; + uint32 m_foodEmoteTimerCount; float m_powerFraction[MAX_POWERS_PER_CLASS]; uint32 m_contestedPvPTimer; diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index 402b89a8387..31ba35a7f3e 100644 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -354,6 +354,12 @@ enum SpellCategory SPELL_CATEGORY_DRINK = 59 }; +enum SpellVisualKit +{ + SPELL_VISUAL_KIT_FOOD = 406, + SPELL_VISUAL_KIT_DRINK = 438 +}; + const uint32 ItemQualityColors[MAX_ITEM_QUALITY] = { 0xff9d9d9d, // GREY |