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

Core/Spells: Support spells that have both charge recovery and separate cooldown

Browse Source
This commit is contained in:
Shauren
2025-08-29 21:47:39 +02:00
parent 8d8b0d1a36
commit b248e05906
2 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/server/game/Spells/SpellHistory.cpp
View File

@@ -252,8 +252,7 @@ void SpellHistory::HandleCooldowns(SpellInfo const* spellInfo, uint32 itemId, Sp
if (spell && spell->IsIgnoringCooldowns())
return;
if (ConsumeCharge(spellInfo->ChargeCategoryId))
return;
ConsumeCharge(spellInfo->ChargeCategoryId);
if (_owner->HasAuraTypeWithAffectMask(SPELL_AURA_IGNORE_SPELL_COOLDOWN, spellInfo))
return;
@@ -594,7 +593,7 @@ void SpellHistory::AddCooldown(uint32 spellId, uint32 itemId, TimePoint cooldown
void SpellHistory::ModifySpellCooldown(uint32 spellId, Duration cooldownMod, bool withoutCategoryCooldown)
{
auto itr = _spellCooldowns.find(spellId);
if (!cooldownMod.count() || itr == _spellCooldowns.end())
if (itr == _spellCooldowns.end())
return;
ModifySpellCooldown(itr, cooldownMod, withoutCategoryCooldown);
@@ -665,10 +664,8 @@ void SpellHistory::ModifyCooldown(SpellInfo const* spellInfo, Duration cooldownM
if (!cooldownMod.count())
return;
if (GetChargeRecoveryTime(spellInfo->ChargeCategoryId) > 0 && GetMaxCharges(spellInfo->ChargeCategoryId) > 0)
ModifyChargeRecoveryTime(spellInfo->ChargeCategoryId, cooldownMod);
else
ModifySpellCooldown(spellInfo->Id, cooldownMod, withoutCategoryCooldown);
ModifyChargeRecoveryTime(spellInfo->ChargeCategoryId, cooldownMod);
ModifySpellCooldown(spellInfo->Id, cooldownMod, withoutCategoryCooldown);
}
void SpellHistory::ResetCooldown(uint32 spellId, bool update /*= false*/)
@@ -851,29 +848,26 @@ bool SpellHistory::IsSchoolLocked(SpellSchoolMask schoolMask) const
return false;
}
bool SpellHistory::ConsumeCharge(uint32 chargeCategoryId)
void SpellHistory::ConsumeCharge(uint32 chargeCategoryId)
{
if (!sSpellCategoryStore.LookupEntry(chargeCategoryId))
return false;
return;
int32 chargeRecovery = GetChargeRecoveryTime(chargeCategoryId);
if (chargeRecovery > 0 && GetMaxCharges(chargeCategoryId) > 0)
{
if (_owner->HasAuraTypeWithMiscvalue(SPELL_AURA_IGNORE_SPELL_CHARGE_COOLDOWN, chargeCategoryId))
return true;
if (chargeRecovery <= 0 || GetMaxCharges(chargeCategoryId) <= 0)
return;
TimePoint recoveryStart;
std::deque<ChargeEntry>& charges = _categoryCharges[chargeCategoryId];
if (charges.empty())
recoveryStart = time_point_cast<Duration>(GameTime::GetTime<Clock>());
else
recoveryStart = charges.back().RechargeEnd;
if (_owner->HasAuraTypeWithMiscvalue(SPELL_AURA_IGNORE_SPELL_CHARGE_COOLDOWN, chargeCategoryId))
return;
charges.emplace_back(recoveryStart, Milliseconds(chargeRecovery));
return true;
}
TimePoint recoveryStart;
std::deque<ChargeEntry>& charges = _categoryCharges[chargeCategoryId];
if (charges.empty())
recoveryStart = time_point_cast<Duration>(GameTime::GetTime<Clock>());
else
recoveryStart = charges.back().RechargeEnd;
return false;
charges.emplace_back(recoveryStart, Milliseconds(chargeRecovery));
}
void SpellHistory::ModifyChargeRecoveryTime(uint32 chargeCategoryId, Duration cooldownMod)

2
src/server/game/Spells/SpellHistory.h
View File

@@ -182,7 +182,7 @@ public:
bool IsSchoolLocked(SpellSchoolMask schoolMask) const;
// Charges
bool ConsumeCharge(uint32 chargeCategoryId);
void ConsumeCharge(uint32 chargeCategoryId);
void ModifyChargeRecoveryTime(uint32 chargeCategoryId, Duration cooldownMod);
void UpdateChargeRecoveryRate(uint32 chargeCategoryId, float modChange, bool apply);
void RestoreCharge(uint32 chargeCategoryId);