diff options
| author | ariel- <ariel-@users.noreply.github.com> | 2018-01-02 01:30:41 -0300 |
|---|---|---|
| committer | funjoker <funjoker109@gmail.com> | 2021-05-06 07:06:27 +0200 |
| commit | 5ac40cf9d159a74ebb36d06821d4f895afc974c4 (patch) | |
| tree | 5a4a0065cf9f29889d883dd6da48796ee350dcab /src | |
| parent | b11c1e714184be6abeef61f38117c5c66c5d903e (diff) | |
Core/Scripts: fix issues with 'Squeeze' on Yogg-Saron encounter
- Unassigned spell script for 25-man difficulty
- Didn't remove aura on 25-man when tentacle killed
(cherry picked from commit de3fd4d076a1d02c5b75ab5d2f32bfb7ecb202a5)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp index 8706991b370..55c9960a561 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp @@ -270,7 +270,8 @@ enum Spells SPELL_TELEPORT_BACK_TO_MAIN_ROOM = 63992, SPELL_INSANE_VISUAL = 64464, SPELL_CONSTRICTOR_TENTACLE_SUMMON = 64133, - SPELL_SQUEEZE = 64125, + SPELL_SQUEEZE_10 = 64125, + SPELL_SQUEEZE_25 = 64126, SPELL_FLASH_FREEZE = 64175, SPELL_LOW_SANITY_SCREEN_EFFECT = 63752, @@ -1307,7 +1308,7 @@ class npc_constrictor_tentacle : public CreatureScript void PassengerBoarded(Unit* passenger, int8 /*seatId*/, bool apply) override { if (!apply) - passenger->RemoveAurasDueToSpell(SPELL_SQUEEZE); + passenger->RemoveAurasDueToSpell(RAID_MODE(SPELL_SQUEEZE_10, SPELL_SQUEEZE_25)); } void UpdateAI(uint32 /*diff*/) override @@ -2397,14 +2398,18 @@ class spell_yogg_saron_lunge : public SpellScriptLoader // 64131 bool Validate(SpellInfo const* /*spellInfo*/) override { - return ValidateSpellInfo({ SPELL_SQUEEZE }); + return ValidateSpellInfo({ SPELL_SQUEEZE_10, SPELL_SQUEEZE_25 }); } void HandleScript(SpellEffIndex /*effIndex*/) { if (Unit* target = GetHitUnit()) { - target->CastSpell(target, SPELL_SQUEEZE, true); + if (target->GetMap()->Is25ManRaid()) + target->CastSpell(target, SPELL_SQUEEZE_25, true); + else + target->CastSpell(target, SPELL_SQUEEZE_10, true); + target->CastSpell(GetCaster(), uint32(GetEffectValue()), true); } } @@ -2421,7 +2426,7 @@ class spell_yogg_saron_lunge : public SpellScriptLoader // 64131 } }; -class spell_yogg_saron_squeeze : public SpellScriptLoader // 64125 +class spell_yogg_saron_squeeze : public SpellScriptLoader // 64125, 64126 { public: spell_yogg_saron_squeeze() : SpellScriptLoader("spell_yogg_saron_squeeze") { } |