sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(Scripts/Ulduar): Fix Stormcaller Brundir flying under texture (#14940)

Browse Source
This commit is contained in:
Skjalf
2023-02-12 20:54:37 -03:00
committed by GitHub
parent 1edd29f28a
commit af8a927d85
1 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp
+12 -18
View File
@@ -101,6 +101,7 @@ enum eEnums
EVENT_LIGHTNING_TENDRILS = 24, EVENT_LIGHTNING_TENDRILS = 24,
EVENT_LIGHTNING_LAND = 25, EVENT_LIGHTNING_LAND = 25,
EVENT_LAND_LAND = 26, EVENT_LAND_LAND = 26,
EVENT_LIGHTNING_FLIGHT = 27,
EVENT_ENRAGE = 30 EVENT_ENRAGE = 30
}; };
@@ -611,7 +612,6 @@ public:
EventMap events; EventMap events;
InstanceScript* pInstance; InstanceScript* pInstance;
uint32 _phase; uint32 _phase;
bool _flyPhase;
ObjectGuid _flyTargetGUID; ObjectGuid _flyTargetGUID;
uint32 _channelTimer; uint32 _channelTimer;
@@ -624,7 +624,6 @@ public:
_channelTimer = 0; _channelTimer = 0;
_phase = 0; _phase = 0;
_flyPhase = false;
_flyTargetGUID.Clear(); _flyTargetGUID.Clear();
_stunnedAchievement = true; _stunnedAchievement = true;
@@ -754,19 +753,6 @@ public:
if (!UpdateVictim()) if (!UpdateVictim())
return; return;
if (_flyPhase)
{
if (Unit* flyTarget = ObjectAccessor::GetUnit(*me, _flyTargetGUID))
{
if (me->GetDistance2d(flyTarget) >= 6)
{
//float speed = me->GetDistance(_flyTarget->GetPositionX(), _flyTarget->GetPositionY(), _flyTarget->GetPositionZ()+15) / (1500.0f * 0.001f);
me->SendMonsterMove(flyTarget->GetPositionX(), flyTarget->GetPositionY(), flyTarget->GetPositionZ() + 15, 1500, SPLINEFLAG_FLYING);
me->SetPosition(flyTarget->GetPositionX(), flyTarget->GetPositionY(), flyTarget->GetPositionZ(), flyTarget->GetOrientation());
}
}
}
events.Update(diff); events.Update(diff);
if (me->HasUnitState(UNIT_STATE_CASTING)) if (me->HasUnitState(UNIT_STATE_CASTING))
return; return;
@@ -796,34 +782,34 @@ public:
events.DelayEvents(18000); events.DelayEvents(18000);
Talk(SAY_BRUNDIR_FLIGHT); Talk(SAY_BRUNDIR_FLIGHT);
_flyPhase = true;
Unit* oldVictim = me->GetVictim(); Unit* oldVictim = me->GetVictim();
_flyTargetGUID = oldVictim->GetGUID(); _flyTargetGUID = oldVictim->GetGUID();
me->SetRegeneratingHealth(false); me->SetRegeneratingHealth(false);
me->SetDisableGravity(true); me->SetDisableGravity(true);
me->SetHover(true);
me->CombatStop(); me->CombatStop();
me->StopMoving(); me->StopMoving();
me->SetReactState(REACT_PASSIVE); me->SetReactState(REACT_PASSIVE);
me->SetGuidValue(UNIT_FIELD_TARGET, ObjectGuid::Empty); me->SetGuidValue(UNIT_FIELD_TARGET, ObjectGuid::Empty);
me->SetUnitFlag(UNIT_FLAG_STUNNED); me->SetUnitFlag(UNIT_FLAG_STUNNED);
me->SendMonsterMove(oldVictim->GetPositionX(), oldVictim->GetPositionY(), oldVictim->GetPositionZ() + 15, 1500, SPLINEFLAG_FLYING);
me->CastSpell(me, SPELL_LIGHTNING_TENDRILS, true); me->CastSpell(me, SPELL_LIGHTNING_TENDRILS, true);
me->CastSpell(me, 61883, true); me->CastSpell(me, 61883, true);
events.ScheduleEvent(EVENT_LIGHTNING_LAND, 16000); events.ScheduleEvent(EVENT_LIGHTNING_LAND, 16000);
events.ScheduleEvent(EVENT_LIGHTNING_FLIGHT, 1s);
break; break;
} }
case EVENT_LIGHTNING_LAND: case EVENT_LIGHTNING_LAND:
{ {
float speed = me->GetDistance(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()) / (1000.0f * 0.001f); float speed = me->GetDistance(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()) / (1000.0f * 0.001f);
me->MonsterMoveWithSpeed(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), speed); me->MonsterMoveWithSpeed(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), speed);
_flyPhase = false;
events.ScheduleEvent(EVENT_LAND_LAND, 1000); events.ScheduleEvent(EVENT_LAND_LAND, 1000);
break; break;
} }
case EVENT_LAND_LAND: case EVENT_LAND_LAND:
me->SetCanFly(false); me->SetCanFly(false);
me->SetHover(false);
me->SetReactState(REACT_AGGRESSIVE); me->SetReactState(REACT_AGGRESSIVE);
me->SetDisableGravity(false); me->SetDisableGravity(false);
if (Unit* flyTarget = ObjectAccessor::GetUnit(*me, _flyTargetGUID)) if (Unit* flyTarget = ObjectAccessor::GetUnit(*me, _flyTargetGUID))
@@ -836,11 +822,19 @@ public:
me->RemoveAura(SPELL_LIGHTNING_TENDRILS); me->RemoveAura(SPELL_LIGHTNING_TENDRILS);
me->RemoveAura(61883); me->RemoveAura(61883);
DoResetThreatList(); DoResetThreatList();
events.CancelEvent(EVENT_LIGHTNING_FLIGHT);
break; break;
case EVENT_ENRAGE: case EVENT_ENRAGE:
Talk(SAY_BRUNDIR_BERSERK); Talk(SAY_BRUNDIR_BERSERK);
me->CastSpell(me, SPELL_BERSERK, true); me->CastSpell(me, SPELL_BERSERK, true);
break; break;
case EVENT_LIGHTNING_FLIGHT:
if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true))
{
me->GetMotionMaster()->MovePoint(0, *target);
}
events.ScheduleEvent(EVENT_LIGHTNING_FLIGHT, 6s);
break;
} }
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();