Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Spells: corrected refunding runes - they don't get put on a cooldown and don't send cooldowns for spells which had their runes refunded

Browse Source
This commit is contained in:
Ovahlord
2025-01-12 01:29:04 +01:00
parent b195f45635
commit dbe2f1ee7e
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/server/game/Entities/Player/Player.h
View File

@@ -393,7 +393,6 @@ struct Areas
constexpr uint8 MAX_RUNES = 6;
constexpr float RUNE_BASE_COOLDOWN = 1.0f;
constexpr float RUNE_MISS_COOLDOWN = 0.15f; // cooldown applied on runes when the spell misses
enum class RuneType : uint8
{

24
src/server/game/Spells/Spell.cpp
View File

@@ -4826,8 +4826,11 @@ void Spell::SendSpellGo()
&& (HasPowerTypeCost(POWER_RUNE_BLOOD) || HasPowerTypeCost(POWER_RUNE_FROST) || HasPowerTypeCost(POWER_RUNE_UNHOLY))
&& !(_triggeredCastFlags & TRIGGERED_IGNORE_POWER_COST))
{
castFlags |= CAST_FLAG_NO_GCD; // not needed, but Blizzard sends it
castFlags |= CAST_FLAG_RUNE_LIST; // rune cooldowns list
castFlags |= CAST_FLAG_NO_GCD; // not needed, but it's being sent according to sniffs
// Only send rune cooldowns when there has been a change
if (m_runesState != m_caster->ToPlayer()->GetRunesState())
castFlags |= CAST_FLAG_RUNE_LIST; // rune cooldowns list
}
if (m_targets.HasTraj())
@@ -5534,6 +5537,12 @@ void Spell::TakeRunePower(bool didHit)
if (m_caster->GetTypeId() != TYPEID_PLAYER || m_caster->ToPlayer()->GetClass() != CLASS_DEATH_KNIGHT)
return;
Player* player = m_caster->ToPlayer();
m_runesState = player->GetRunesState(); // store previous state
if (!didHit)
return;
int32 totalRuneCost = std::accumulate(m_powerCost.begin(), m_powerCost.end(), 0, [](int32 totalCost, SpellPowerCost const& cost)
{
return totalCost + ((cost.Power == POWER_RUNE_BLOOD || cost.Power == POWER_RUNE_FROST || cost.Power == POWER_RUNE_UNHOLY) ? cost.Amount : 0);
@@ -5543,8 +5552,6 @@ void Spell::TakeRunePower(bool didHit)
if (!totalRuneCost)
return;
Player* player = m_caster->ToPlayer();
m_runesState = player->GetRunesState(); // store previous state
player->ClearLastUsedRuneMask();
std::array<int32, AsUnderlyingType(RuneType::Max)> runeCost = { }; // blood, frost, unholy, death
@@ -5569,7 +5576,7 @@ void Spell::TakeRunePower(bool didHit)
RuneType rune = player->GetCurrentRune(i);
if (!player->GetRuneCooldown(i) && runeCost[AsUnderlyingType(rune)] > 0)
{
player->SetRuneCooldown(i, didHit ? RUNE_BASE_COOLDOWN : RUNE_MISS_COOLDOWN);
player->SetRuneCooldown(i, RUNE_BASE_COOLDOWN);
player->SetLastUsedRune(rune);
player->SetLastUsedRuneIndex(i);
--runeCost[AsUnderlyingType(rune)];
@@ -5586,14 +5593,11 @@ void Spell::TakeRunePower(bool didHit)
RuneType rune = player->GetCurrentRune(i);
if (G3D::fuzzyEq(player->GetRuneCooldown(i), 0.0f) && rune == RuneType::Death)
{
player->SetRuneCooldown(i, didHit ? RUNE_BASE_COOLDOWN : RUNE_MISS_COOLDOWN);
player->SetRuneCooldown(i, RUNE_BASE_COOLDOWN);
player->SetLastUsedRune(rune);
player->SetLastUsedRuneIndex(i);
runeCost[AsUnderlyingType(rune)]--;
// keep Death Rune type if missed
if (didHit)
player->RestoreBaseRune(i);
player->RestoreBaseRune(i);
if (runeCost[AsUnderlyingType(RuneType::Death)] == 0)
break;