Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Spells: Expose spell channel duration to scripts

Browse Source 
(cherry picked from commit aefdd67ed1)

# Conflicts:
#	src/server/game/Spells/Spell.cpp
This commit is contained in:
Shauren
2025-05-17 19:39:10 +02:00
committed by Ovahlord
parent 550f66658d
commit b644a3ca1c
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -565,7 +565,7 @@ m_spellValue(new SpellValue(m_spellInfo, caster)), _spellEvent(nullptr)
m_runesState = 0;
m_casttime = 0; // setup to correct value in Spell::prepare, must not be used before.
m_timer = 0; // will set to castime in prepare
m_channeledDuration = 0; // will be setup in Spell::handle_immediate
m_channelDuration = 0; // will be setup in Spell::handle_immediate
m_launchHandled = false;
m_immediateHandled = false;
@@ -4019,7 +4019,7 @@ void Spell::handle_immediate()
else
duration = *m_spellValue->Duration;
m_channeledDuration = duration;
m_channelDuration = duration;
SendChannelStart(duration);
}
else if (duration == -1)
@@ -7849,7 +7849,7 @@ void Spell::DelayedChannel()
//check pushback reduce
// should be affected by modifiers, not take the dbc duration.
int32 duration = ((m_channeledDuration > 0) ? m_channeledDuration : m_spellInfo->GetDuration());
int32 duration = ((m_channelDuration > 0) ? m_channelDuration : m_spellInfo->GetDuration());
int32 delaytime = CalculatePct(duration, 25); // channeling delay is normally 25% of its time per hit

3
src/server/game/Spells/Spell.h
View File

@@ -615,6 +615,7 @@ class TC_GAME_API Spell
int32 GetCastTime() const { return m_casttime; }
int32 GetRemainingCastTime() const { return m_timer; }
int32 GetChannelDuration() const { return m_channelDuration; }
bool IsAutoRepeat() const { return m_autoRepeat; }
void SetAutoRepeat(bool rep) { m_autoRepeat = rep; }
void ReSetTimer() { m_timer = m_casttime > 0 ? m_casttime : 0; }
@@ -708,7 +709,7 @@ class TC_GAME_API Spell
std::vector<SpellPowerCost> m_powerCost; // Calculated spell cost initialized only in Spell::prepare
int32 m_casttime; // Calculated spell cast time initialized only in Spell::prepare
int32 m_channeledDuration; // Calculated channeled spell duration in order to calculate correct pushback.
int32 m_channelDuration; // Calculated channeled spell duration in order to calculate correct pushback.
bool m_canReflect; // can reflect this spell?
bool m_autoRepeat;
bool m_spendComboPoints; // For finishing moves that should consume all combo points after cast