Skip to content

Commit 4e5adca

Browse files
committed
fix(Scripts/Northrend): improve EoE encounter visuals
Update and fix teleport visual spell Set Npc flags of Hover Disk
1 parent 0b93955 commit 4e5adca

File tree

3 files changed

+24
-4
lines changed

3 files changed

+24
-4
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
--
2+
-- npcflag +SPELLCLICK
3+
-- unit_flag -NON_ATTACKABLE, +NOT_SELECTABLE
4+
UPDATE `creature_template` SET `faction` = 14, `npcflag` = `npcflag` | 16777216, `unit_flags` = (`unit_flags` & (~2)) | 33554432 WHERE (`entry` IN (30248, 31749));
5+
DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` = 31749;
6+
INSERT INTO `npc_spellclick_spells` (`npc_entry`, `spell_id`, `cast_flags`, `user_type`) VALUES(31749, 61421, 0, 0);

src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -887,7 +887,10 @@ struct npc_nexus_lord : public ScriptedAI
887887
{
888888
me->SetReactState(REACT_PASSIVE);
889889
timer = 0;
890-
me->CastSpell(me, SPELL_TELEPORT_VISUAL, true);
890+
ScheduleUniqueTimedEvent(0s, [&]
891+
{
892+
DoCastSelf(SPELL_TELEPORT_VISUAL, true);
893+
}, EVENT_TELEPORT_VISUAL);
891894
}
892895

893896
uint16 timer;
@@ -952,7 +955,10 @@ struct npc_scion_of_eternity : public ScriptedAI
952955
npc_scion_of_eternity(Creature* creature) : ScriptedAI(creature)
953956
{
954957
me->SetReactState(REACT_PASSIVE);
955-
me->CastSpell(me, SPELL_TELEPORT_VISUAL, true);
958+
ScheduleUniqueTimedEvent(0s, [&]
959+
{
960+
DoCastSelf(SPELL_TELEPORT_VISUAL, true);
961+
}, EVENT_TELEPORT_VISUAL);
956962
ScheduleTimedEvent(20s, 25s, [&]
957963
{
958964
GuidVector guids;
@@ -994,6 +1000,7 @@ struct npc_hover_disk : public VehicleAI
9941000
npc_hover_disk(Creature* creature) : VehicleAI(creature)
9951001
{
9961002
events.Reset();
1003+
me->SetAnimTier(AnimTier::Fly);
9971004
}
9981005

9991006
EventMap events;
@@ -1003,6 +1010,7 @@ struct npc_hover_disk : public VehicleAI
10031010
events.Reset();
10041011
if (!who)
10051012
return;
1013+
10061014
if (apply)
10071015
{
10081016
if (who->IsPlayer())
@@ -1032,6 +1040,9 @@ struct npc_hover_disk : public VehicleAI
10321040
me->DisableSpline();
10331041
me->SetCanFly(false);
10341042
me->GetMotionMaster()->MoveLand(0, me->GetPositionX(), me->GetPositionY(), 267.24f, 10.0f);
1043+
me->SetImmuneToNPC(true);
1044+
me->RemoveUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
1045+
me->SetFaction(FACTION_FRIENDLY);
10351046

10361047
if (who->IsPlayer())
10371048
{
@@ -1150,7 +1161,10 @@ struct npc_alexstrasza : public ScriptedAI
11501161

11511162
struct npc_eoe_wyrmrest_skytalon : public VehicleAI
11521163
{
1153-
npc_eoe_wyrmrest_skytalon(Creature* creature) : VehicleAI(creature) { }
1164+
npc_eoe_wyrmrest_skytalon(Creature* creature) : VehicleAI(creature)
1165+
{
1166+
me->SetAnimTier(AnimTier::Fly);
1167+
}
11541168

11551169
void IsSummonedBy(WorldObject* summoner) override
11561170
{

src/server/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ enum eSpells
7373
SPELL_POWER_SPARK_GROUND_BUFF = 55852,
7474
SPELL_POWER_SPARK_MALYGOS_BUFF = 56152,
7575

76-
SPELL_TELEPORT_VISUAL = 52096,
76+
SPELL_TELEPORT_VISUAL = 41232,
7777

7878
SPELL_SCION_ARCANE_BARRAGE = 56397,
7979
SPELL_ARCANE_SHOCK = 57058,

0 commit comments

Comments
 (0)