From 761c8dffad76c77c90c0e3cfa269f6c4715c8c6b Mon Sep 17 00:00:00 2001 From: UltraNix <80540499+UltraNix@users.noreply.github.com> Date: Sun, 12 Mar 2023 04:21:51 +0100 Subject: [PATCH] fix(Scripts/BlackMorass): Fixed rift mobs texts on summon. (#15339) --- .../CavernsOfTime/TheBlackMorass/boss_aeonus.cpp | 3 --- .../TheBlackMorass/boss_chrono_lord_deja.cpp | 7 ------- .../CavernsOfTime/TheBlackMorass/boss_temporus.cpp | 7 ------- .../CavernsOfTime/TheBlackMorass/the_black_morass.cpp | 9 ++++++++- 4 files changed, 8 insertions(+), 18 deletions(-) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp index e8c9a2ce9..da71faa29 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp @@ -21,7 +21,6 @@ enum Enums { - SAY_ENTER = 0, SAY_AGGRO = 1, SAY_BANISH = 2, SAY_SLAY = 3, @@ -53,8 +52,6 @@ struct boss_aeonus : public BossAI void IsSummonedBy(WorldObject* /*summoner*/) override { - Talk(SAY_ENTER); - me->SetReactState(REACT_DEFENSIVE); if (Creature* medivh = instance->GetCreature(DATA_MEDIVH)) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp index 617fb5b38..ee0bf883a 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp @@ -21,7 +21,6 @@ enum Enums { - SAY_ENTER = 0, SAY_AGGRO = 1, SAY_BANISH = 2, SAY_SLAY = 3, @@ -47,12 +46,6 @@ enum Enums } } - void InitializeAI() override - { - OwnTalk(SAY_ENTER); - ScriptedAI::InitializeAI(); - } - void JustEngagedWith(Unit* /*who*/) override { OwnTalk(SAY_AGGRO); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp index 85577952a..e784ce409 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp @@ -21,7 +21,6 @@ enum Enums { - SAY_ENTER = 0, SAY_AGGRO = 1, SAY_BANISH = 2, SAY_SLAY = 3, @@ -44,12 +43,6 @@ struct boss_temporus : public BossAI Talk(id); } - void InitializeAI() override - { - OwnTalk(SAY_ENTER); - ScriptedAI::InitializeAI(); - } - void JustEngagedWith(Unit* /*who*/) override { _JustEngagedWith(); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp index 99f4c96b2..9df152bd1 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp @@ -250,7 +250,9 @@ enum timeRift { EVENT_SUMMON_AT_RIFT = 1, EVENT_CHECK_DEATH = 2, - EVENT_SUMMON_BOSS = 3 + EVENT_SUMMON_BOSS = 3, + + SAY_RIFT_MOB_SUMMONED = 0 }; struct npc_time_rift : public NullCreatureAI @@ -399,6 +401,11 @@ struct npc_time_rift : public NullCreatureAI { me->CastSpell(summon, SPELL_RIFT_CHANNEL, false); } + + if (summon->IsAIEnabled) + { + summon->AI()->Talk(SAY_RIFT_MOB_SUMMONED); + } } } }