Hyjal: Implement EternalSilence residual silence after getting out of…

… water
cmangos · Nov 8, 2021 · 106846e · 106846e
1 parent ef15dd2
commit 106846e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/sql/scriptdev2/spell.sql b/sql/scriptdev2/spell.sql
@@ -249,6 +249,7 @@ INSERT INTO spell_scripts(Id, ScriptName) VALUES
 (45960,'spell_nether_vapor_lightning'),
 (39497,'spell_remove_weapons'),
 (31298,'spell_anetheron_sleep'),
+(42201,'spell_eternal_silence'),
 (41910,'spell_alar_phoenix_ember_blast'),
 (30632,'spell_magtheridon_debris'),
 (32286,'spell_focus_target_visual'),

diff --git a/src/game/AI/ScriptDevAI/scripts/kalimdor/caverns_of_time/hyjal/hyjal.cpp b/src/game/AI/ScriptDevAI/scripts/kalimdor/caverns_of_time/hyjal/hyjal.cpp
@@ -1885,17 +1885,23 @@ bool instance_mount_hyjal::CheckConditionCriteriaMeet(Player const* player, uint
     return false;
 }
 
-InstanceData* GetInstanceData_instance_mount_hyjal(Map* map)
+struct EternalSilence : public AuraScript
 {
-    return new instance_mount_hyjal(map);
-}
+    void OnApply(Aura* aura, bool apply) const override
+    {
+        if (!apply) // residue of eternity
+            aura->GetTarget()->CastSpell(nullptr, 42205, TRIGGERED_OLD_TRIGGERED);
+    }
+};
 
 void AddSC_instance_mount_hyjal()
 {
     Script* pNewScript;
 
     pNewScript = new Script;
     pNewScript->Name = "instance_hyjal";
-    pNewScript->GetInstanceData = &GetInstanceData_instance_mount_hyjal;
+    pNewScript->GetInstanceData = &GetNewInstanceScript<instance_mount_hyjal>;
     pNewScript->RegisterSelf();
+
+    RegisterAuraScript<EternalSilence>("spell_eternal_silence");
 }