Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Scripts/EasternKingdoms: temporally adjust Eye of Acherus to allow quest completion"

Browse Source 
This reverts commit f92e7416a5.
This commit is contained in:
Shauren
2025-10-26 11:16:06 +01:00
parent 436b4db38f
commit 524e0416ff
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/updates/world/3.3.5/2025_10_26_00_world.sql Normal file
View File

@@ -0,0 +1,2 @@
UPDATE `creature_template` SET `speed_run`=1,`flags_extra`=0 WHERE `entry`=28511;
UPDATE `creature_template_movement` SET `Flight`=0 WHERE `CreatureId`=28511;

24
src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
View File

@@ -438,15 +438,12 @@ struct npc_eye_of_acherus : public ScriptedAI
{
creature->SetDisplayId(creature->GetCreatureTemplate()->Modelid1);
creature->SetReactState(REACT_PASSIVE);
creature->SetDisableGravity(true);
creature->SetCanFly(true);
creature->SetSpeed(MOVE_FLIGHT, 35.f);
}
void Reset() override
void InitializeAI() override
{
DoCastSelf(SPELL_EYE_OF_ACHERUS_VISUAL);
DoCastSelf(SPELL_ROOT_SELF);
DoCastSelf(SPELL_EYE_OF_ACHERUS_VISUAL);
_events.ScheduleEvent(EVENT_ANNOUNCE_LAUNCH_TO_DESTINATION, 7s);
}
@@ -459,11 +456,6 @@ struct npc_eye_of_acherus : public ScriptedAI
}
}
void EnterEvadeMode(EvadeReason why) override
{
_EnterEvadeMode(why);
}
void UpdateAI(uint32 diff) override
{
_events.Update(diff);
@@ -473,14 +465,14 @@ struct npc_eye_of_acherus : public ScriptedAI
switch (eventId)
{
case EVENT_ANNOUNCE_LAUNCH_TO_DESTINATION:
//DoCastSelf(SPELL_EYE_OF_ACHERUS_FLIGHT_BOOST);
if (Unit* owner = me->GetCharmerOrOwner())
Talk(SAY_LAUNCH_TOWARDS_DESTINATION, owner);
_events.ScheduleEvent(EVENT_UNROOT, 1s + 200ms);
break;
case EVENT_UNROOT:
me->RemoveAurasDueToSpell(SPELL_ROOT_SELF);
_events.ScheduleEvent(EVENT_LAUNCH_TOWARDS_DESTINATION, 1ms);
DoCastSelf(SPELL_EYE_OF_ACHERUS_FLIGHT_BOOST);
_events.ScheduleEvent(EVENT_LAUNCH_TOWARDS_DESTINATION, 1s + 200ms);
break;
case EVENT_LAUNCH_TOWARDS_DESTINATION:
{
@@ -489,17 +481,17 @@ struct npc_eye_of_acherus : public ScriptedAI
Movement::PointsArray path(EyeOfAcherusPath, EyeOfAcherusPath + EyeOfAcherusPathSize);
init.MovebyPath(path);
init.SetFly();
init.SetSwim();
init.SetVelocity(35.f);
if (Unit* owner = me->GetCharmerOrOwner())
init.SetVelocity(owner->GetSpeed(MOVE_RUN));
};
me->GetMotionMaster()->LaunchMoveSpline(std::move(initializer), POINT_NEW_AVALON, MOTION_PRIORITY_NORMAL, POINT_MOTION_TYPE);
break;
}
case EVENT_GRANT_CONTROL:
//me->RemoveAurasDueToSpell(SPELL_EYE_OF_ACHERUS_FLIGHT_BOOST);
//DoCastSelf(SPELL_EYE_OF_ACHERUS_FLIGHT);
me->RemoveAurasDueToSpell(SPELL_ROOT_SELF);
DoCastSelf(SPELL_EYE_OF_ACHERUS_FLIGHT);
me->RemoveAurasDueToSpell(SPELL_EYE_OF_ACHERUS_FLIGHT_BOOST);
if (Unit* owner = me->GetCharmerOrOwner())
Talk(SAY_EYE_UNDER_CONTROL, owner);
break;