aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2024-02-28 21:10:51 +0100
committerShauren <shauren.trinity@gmail.com>2024-02-28 21:10:51 +0100
commit792a4d6c8bab4a8e874c6f0e583f915d05b8d8b3 (patch)
tree374b377589706d2d9a6eaf453d47437696354f99
parent59f92412d0f2172772155591ee7fa98a54dab06a (diff)
Scripts/Serpentshrine Cavern: Removed Spout hack and use correct spell ids
-rw-r--r--src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
index f645ab15b64..a28c4e9a41d 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
@@ -36,7 +36,6 @@ EndScriptData */
enum Spells
{
SPELL_SPOUT = 37433,
- SPELL_SPOUT_ANIM = 42835,
SPELL_SPOUT_BREATH = 37431,
SPELL_KNOCKBACK = 19813,
SPELL_GEYSER = 37478,
@@ -227,6 +226,7 @@ struct boss_the_lurker_below : public BossAI
{
Talk(EMOTE_SPOUT);
me->SetReactState(REACT_PASSIVE);
+ DoCast(me, SPELL_SPOUT_BREATH, true);
me->GetMotionMaster()->MoveRotate(0, urand(0, 1) ? ROTATE_DIRECTION_LEFT : ROTATE_DIRECTION_RIGHT, 20s, float(M_PI) / 7.0f);
SpoutTimer = 45000;
WhirlTimer = 20000; // whirl directly after spout
@@ -264,16 +264,10 @@ struct boss_the_lurker_below : public BossAI
if (RotTimer)
{
- instance->instance->DoOnPlayers([&](Player* player)
- {
- if (player->IsAlive() && me->HasInArc(diff/20000.f*float(M_PI)*2.f, player) && me->IsWithinDist(player, SPOUT_DIST) && !player->IsInWater())
- DoCast(player, SPELL_SPOUT, true); // only knock back players in arc, in 100yards, not in water
- });
-
if (SpoutAnimTimer <= diff)
{
- DoCast(me, SPELL_SPOUT_ANIM, true);
- SpoutAnimTimer = 1000;
+ DoCast(me, SPELL_SPOUT, true);
+ SpoutAnimTimer = 200;
} else SpoutAnimTimer -= diff;
if (RotTimer <= diff)