aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Maelstrom
diff options
context:
space:
mode:
authorTreeston <treeston.mmoc@gmail.com>2017-12-31 03:23:42 +0100
committerShauren <shauren.trinity@gmail.com>2021-04-16 20:22:13 +0200
commitbce43de7f3fba618c370f2aba327d23dd30d1cdd (patch)
tree85b786bfa8f5103aaafa0ec01e93b337c29d4a15 /src/server/scripts/Maelstrom
parent8eb3c61f1aea5610cf68fb622f41850d2b934c51 (diff)
Core/AI: Some more refactoring prep for #19930. CreatureAI::EnterCombat is now called CreatureAI::JustEngagedWith. There's also two new methods on UnitAI, though they're never invoked right now.
(cherry picked from commit 6113b9dec2e0081c36c36c2974a28ed0693bc601)
Diffstat (limited to 'src/server/scripts/Maelstrom')
-rw-r--r--src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp4
-rw-r--r--src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp4
-rw-r--r--src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp
index d162024e595..6bf44a561b6 100644
--- a/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp
+++ b/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp
@@ -150,9 +150,9 @@ class boss_high_priestess_azil : public CreatureScript
events.ScheduleEvent(EVENT_SUMMON_WAVE_WEST, 40000);
}
- void EnterCombat(Unit* /*victim*/) override
+ void JustEngagedWith(Unit* /*victim*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
DoCast(me, SPELL_ENERGY_SHIELD);
Talk(SAY_AGGRO);
diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp
index 4d801eba6d7..b921caeb8d8 100644
--- a/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp
+++ b/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp
@@ -92,9 +92,9 @@ class boss_ozruk : public CreatureScript
events.ScheduleEvent(EVENT_ELEMENTIUM_SPIKE_SHIELD, 13000);
}
- void EnterCombat(Unit* /*victim*/) override
+ void JustEngagedWith(Unit* /*victim*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
Talk(SAY_AGGRO);
}
diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp
index 594b4eea8a2..7ded04b5d98 100644
--- a/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp
+++ b/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp
@@ -139,9 +139,9 @@ class boss_slabhide : public CreatureScript
_isFlying = false;
}
- void EnterCombat(Unit* /*victim*/) override
+ void JustEngagedWith(Unit* /*victim*/) override
{
- _EnterCombat();
+ _JustEngagedWith();
events.ScheduleEvent(EVENT_HANDLE_ROCK_WALLS, 4000);
events.ScheduleEvent(EVENT_LAVA_FISSURE, urand(6000, 8000));