diff options
| author | Shauren <shauren.trinity@gmail.com> | 2024-12-22 14:22:39 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2024-12-22 15:13:53 +0100 |
| commit | 38a5956b8544ee43ec4faeba42a40dbee4dcc65f (patch) | |
| tree | 3ee632a658b108edabdfaf4620adb66dcac3df5d | |
| parent | 2997e1dc025258f2e4fc52629cd0c6338c0e689b (diff) | |
Scripts/Spells: Added missing Throw Glaive part to Cycle of Hatred implementation
| -rw-r--r-- | sql/updates/world/master/2024_12_22_11_world.sql | 1 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_dh.cpp | 12 |
2 files changed, 11 insertions, 2 deletions
diff --git a/sql/updates/world/master/2024_12_22_11_world.sql b/sql/updates/world/master/2024_12_22_11_world.sql index 3dd216fdc3e..1168df9ad35 100644 --- a/sql/updates/world/master/2024_12_22_11_world.sql +++ b/sql/updates/world/master/2024_12_22_11_world.sql @@ -2,4 +2,5 @@ DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_dh_cycle_of_hatred'; INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES (188499, 'spell_dh_cycle_of_hatred'), (162794, 'spell_dh_cycle_of_hatred'), +(185123, 'spell_dh_cycle_of_hatred'), (342817, 'spell_dh_cycle_of_hatred'); diff --git a/src/server/scripts/Spells/spell_dh.cpp b/src/server/scripts/Spells/spell_dh.cpp index 1eb811ec470..11cb6165f5f 100644 --- a/src/server/scripts/Spells/spell_dh.cpp +++ b/src/server/scripts/Spells/spell_dh.cpp @@ -114,6 +114,7 @@ enum DemonHunterSpells SPELL_DH_FRAILTY = 224509, SPELL_DH_FURIOUS_GAZE = 343311, SPELL_DH_FURIOUS_GAZE_BUFF = 343312, + SPELL_DH_FURIOUS_THROWS = 393029, SPELL_DH_GLIDE = 131347, SPELL_DH_GLIDE_DURATION = 197154, SPELL_DH_GLIDE_KNOCKBACK = 196353, @@ -351,7 +352,7 @@ class spell_dh_collective_anguish_eye_beam : public AuraScript } }; -// Called by 188499 - Blade Dance, 162794 - Chaos Strike and 342817 - Glaive Tempest +// Called by 188499 - Blade Dance, 162794 - Chaos Strike, 185123 - Throw Glaive and 342817 - Glaive Tempest class spell_dh_cycle_of_hatred : public SpellScript { bool Validate(SpellInfo const* /*spellInfo*/) override @@ -361,7 +362,14 @@ class spell_dh_cycle_of_hatred : public SpellScript bool Load() override { - return GetCaster()->HasAura(SPELL_DH_CYCLE_OF_HATRED); + if (!GetCaster()->HasAura(SPELL_DH_CYCLE_OF_HATRED)) + return false; + + if (GetSpellInfo()->Id != SPELL_DH_THROW_GLAIVE) + return true; + + // Throw Glaive triggers this talent only with Furious Throws + return GetCaster()->HasAura(SPELL_DH_FURIOUS_THROWS); } void ReduceEyeBeamCooldown() const |