spell_hunter

src/server/scripts/Spells/spell_hunter.cpp

@@ -50,6 +50,7 @@ enum HunterSpells
     SPELL_HUNTER_BINDING_SHOT_VISUAL = 117614,
     SPELL_HUNTER_BINDING_SHOT_VISUAL_ARROW = 118306,
     SPELL_HUNTER_CONCUSSIVE_SHOT = 5116,
+    SPELL_HUNTER_DISRUPTIVE_ROUNDS_ENERGIZE = 459976,
     SPELL_HUNTER_EMERGENCY_SALVE_TALENT = 459517,
     SPELL_HUNTER_EMERGENCY_SALVE_DISPEL = 459521,
     SPELL_HUNTER_ENTRAPMENT_TALENT = 393344,
@@ -156,11 +157,6 @@ enum HunterSpells
     SPELL_HUNTER_WILDSPEAKER_RAGE = 1235388,
 };
 
-enum MiscSpells
-{
-    SPELL_DRAENEI_GIFT_OF_THE_NAARU = 59543,
-};
-
 // 131894 - A Murder of Crows
 class spell_hun_a_murder_of_crows : public AuraScript
 {
@@ -425,6 +421,28 @@ class spell_hun_concussive_shot : public SpellScript
     }
 };
 
+// 343244 - Disruptive Rounds
+class spell_hun_disruptive_rounds : public AuraScript
+{
+    bool Validate(SpellInfo const* /*spellInfo*/) override
+    {
+        return ValidateSpellInfo({ SPELL_HUNTER_DISRUPTIVE_ROUNDS_ENERGIZE });
+    }
+
+    static void HandleProc(AuraScript const&, ProcEventInfo const& eventInfo)
+    {
+        eventInfo.GetActor()->CastSpell(eventInfo.GetActor(), SPELL_HUNTER_DISRUPTIVE_ROUNDS_ENERGIZE, CastSpellExtraArgsInit{
+            .TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR,
+            .TriggeringSpell = eventInfo.GetProcSpell()
+            });
+    }
+
+    void Register() override
+    {
+        OnProc += AuraProcFn(spell_hun_disruptive_rounds::HandleProc);
+    }
+};
+
 // 459517 - Concussive Shot (attached to 186265 - Aspect of the Turtle and 5384 - Feign Death)
 class spell_hun_emergency_salve : public SpellScript
 {
@@ -1287,7 +1305,7 @@ class spell_hun_pet_heart_of_the_phoenix : public SpellScript
     }
 };
 
-// 781 - Disengage
+// 109215 Posthaste (attached to 781 - Disengage)
 class spell_hun_posthaste : public SpellScript
 {
     bool Validate(SpellInfo const* /*spellInfo*/) override
@@ -1295,13 +1313,18 @@ class spell_hun_posthaste : public SpellScript
         return ValidateSpellInfo({ SPELL_HUNTER_POSTHASTE_TALENT, SPELL_HUNTER_POSTHASTE_INCREASE_SPEED });
     }
 
-    void HandleAfterCast()
+    bool Load() override
     {
-        if (GetCaster()->HasAura(SPELL_HUNTER_POSTHASTE_TALENT))
+        return GetCaster()->HasAura(SPELL_HUNTER_POSTHASTE_TALENT);
+    }
+
+    void HandleAfterCast() const
     {
         GetCaster()->RemoveMovementImpairingAuras(true);
-            GetCaster()->CastSpell(GetCaster(), SPELL_HUNTER_POSTHASTE_INCREASE_SPEED, GetSpell());
+        GetCaster()->CastSpell(GetCaster(), SPELL_HUNTER_POSTHASTE_INCREASE_SPEED, CastSpellExtraArgsInit{
-        }
+            .TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR,
+            .TriggeringSpell = GetSpell()
+            });
     }
 
     void Register() override
@@ -1863,7 +1886,7 @@ class spell_hun_t29_2p_marksmanship_bonus : public AuraScript
     }
 };
 
-// Called by 136 - Mend Pet
+// 343242 Wilderness Medicine (attached to 136 - Mend Pet)
 class spell_hun_wilderness_medicine : public AuraScript
 {
     bool Validate(SpellInfo const* /*spellInfo*/) override
@@ -2524,6 +2547,7 @@ void AddSC_hunter_spell_scripts()
     RegisterSpellScript(spell_hun_bullseye);
     RegisterSpellScript(spell_hun_cobra_sting);
     RegisterSpellScript(spell_hun_concussive_shot);
+    RegisterSpellScript(spell_hun_disruptive_rounds);
     RegisterSpellScript(spell_hun_emergency_salve);
     RegisterSpellScript(spell_hun_exhilaration);
     RegisterSpellScript(spell_hun_explosive_shot);