nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-19 03:45:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into Playerbot

Browse Source
This commit is contained in:
Yunfan Li
2024-12-13 18:51:37 +08:00
parent 889b509313 a4e2b1d743
commit 7347f64938
48 changed files with 1584 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/server/game/Entities/Player/Player.cpp
View File

@@ -1026,6 +1026,9 @@ void Player::setDeathState(DeathState s, bool /*despawn = false*/)
return;
}
// clear all pending spell cast requests when dying
SpellQueue.clear();
// drunken state is cleared on death
SetDrunkValue(0);
// lost combo points at any target (targeted combo points clear in Unit::setDeathState)
@@ -1889,8 +1892,27 @@ void Player::Regenerate(Powers power)
}
}
break;
case POWER_ENERGY: // Regenerate energy (rogue)
addvalue += 0.01f * m_regenTimer * sWorld->getRate(RATE_POWER_ENERGY);
case POWER_ENERGY:
{
float baseRegenRate = 10.0f * sWorld->getRate(RATE_POWER_ENERGY);
float hasteModifier = 1.0f;
// Apply Vitality
if (HasAura(61329))
hasteModifier += 0.25f;
// Apply Overkill
if (HasAura(58426))
hasteModifier += 0.30f;
// Apply Adrenaline Rush
if (HasAura(13750))
hasteModifier += 1.0f;
float adjustedRegenRate = baseRegenRate * hasteModifier;
addvalue += adjustedRegenRate * 0.001f * m_regenTimer;
}
break;
case POWER_RUNIC_POWER:
{