Core/Movement: Use SetLevitate(true/false) instead of AddUnit/RemoveUnit.
This commit is contained in:
@@ -121,7 +121,7 @@ public:
|
||||
MovePhase = 0;
|
||||
|
||||
me->SetSpeed(MOVE_RUN, 2.0f);
|
||||
me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
|
||||
me->SetLevitate(true);
|
||||
me->SetWalk(false);
|
||||
me->setActive(true);
|
||||
|
||||
@@ -240,7 +240,7 @@ public:
|
||||
|
||||
me->InterruptSpell(CURRENT_GENERIC_SPELL);
|
||||
me->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF);
|
||||
me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
|
||||
me->SetLevitate(true);
|
||||
(*me).GetMotionMaster()->Clear(false);
|
||||
(*me).GetMotionMaster()->MovePoint(0, IntroWay[2][0], IntroWay[2][1], IntroWay[2][2]);
|
||||
|
||||
@@ -263,7 +263,7 @@ public:
|
||||
{
|
||||
if (MovePhase >= 7)
|
||||
{
|
||||
me->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
|
||||
me->SetLevitate(false);
|
||||
me->HandleEmoteCommand(EMOTE_ONESHOT_LAND);
|
||||
me->GetMotionMaster()->MovePoint(8, IntroWay[7][0], IntroWay[7][1], IntroWay[7][2]);
|
||||
}
|
||||
@@ -277,7 +277,7 @@ public:
|
||||
{
|
||||
if (MovePhase >= 7)
|
||||
{
|
||||
me->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
|
||||
me->SetLevitate(false);
|
||||
me->HandleEmoteCommand(EMOTE_ONESHOT_LAND);
|
||||
me->GetMotionMaster()->MovePoint(8, IntroWay[7][0], IntroWay[7][1], IntroWay[7][2]);
|
||||
}
|
||||
|
||||
@@ -527,7 +527,7 @@ public:
|
||||
if (!Arcanagos)
|
||||
return;
|
||||
ArcanagosGUID = Arcanagos->GetGUID();
|
||||
Arcanagos->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
|
||||
Arcanagos->SetLevitate(true);
|
||||
(*Arcanagos).GetMotionMaster()->MovePoint(0, ArcanagosPos[0], ArcanagosPos[1], ArcanagosPos[2]);
|
||||
Arcanagos->SetOrientation(ArcanagosPos[3]);
|
||||
me->SetOrientation(MedivPos[3]);
|
||||
|
||||
@@ -497,7 +497,7 @@ public:
|
||||
void Reset()
|
||||
{
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE + UNIT_FLAG_NON_ATTACKABLE);
|
||||
me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
|
||||
me->SetLevitate(true);
|
||||
DoCast(me, SPELL_PHOENIX_BURN, true);
|
||||
BurnTimer = 2000;
|
||||
Death_Timer = 3000;
|
||||
@@ -651,7 +651,7 @@ public:
|
||||
ChangeTargetTimer = urand(6000, 12000);
|
||||
|
||||
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
|
||||
me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
|
||||
me->SetLevitate(true);
|
||||
me->setFaction(14);
|
||||
DoCast(me, SPELL_ARCANE_SPHERE_PASSIVE, true);
|
||||
}
|
||||
|
||||
@@ -216,7 +216,7 @@ public:
|
||||
break;
|
||||
case 3:
|
||||
DoCast(me, SPELL_INTRO_FROST_BLAST);
|
||||
Madrigosa->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
|
||||
Madrigosa->SetLevitate(true);
|
||||
me->AttackStop();
|
||||
Madrigosa->AttackStop();
|
||||
IntroFrostBoltTimer = 3000;
|
||||
|
||||
@@ -137,7 +137,7 @@ public:
|
||||
|
||||
uiFlightCount = 0;
|
||||
|
||||
me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
|
||||
me->SetLevitate(true);
|
||||
me->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 10);
|
||||
me->SetFloatValue(UNIT_FIELD_COMBATREACH, 10);
|
||||
|
||||
@@ -391,7 +391,7 @@ public:
|
||||
}
|
||||
break;
|
||||
case 10:
|
||||
me->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
|
||||
me->SetLevitate(false);
|
||||
me->HandleEmoteCommand(EMOTE_ONESHOT_LAND);
|
||||
EnterPhase(PHASE_GROUND);
|
||||
AttackStart(SelectTarget(SELECT_TARGET_TOPAGGRO));
|
||||
|
||||
@@ -159,7 +159,7 @@ public:
|
||||
if (!bJustReset) //first reset at create
|
||||
{
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE + UNIT_FLAG_NOT_SELECTABLE);
|
||||
me->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
|
||||
me->SetLevitate(false);
|
||||
me->SetVisible(true);
|
||||
me->SetStandState(UNIT_STAND_STATE_SLEEP);
|
||||
}
|
||||
@@ -231,7 +231,7 @@ public:
|
||||
if (ResetTimer <= diff)
|
||||
{
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE);
|
||||
me->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
|
||||
me->SetLevitate(false);
|
||||
me->SetVisible(true);
|
||||
me->SetStandState(UNIT_STAND_STATE_SLEEP);
|
||||
ResetTimer = 10000;
|
||||
@@ -400,7 +400,7 @@ public:
|
||||
TalkTimer = 10000;
|
||||
break;
|
||||
case 3:
|
||||
me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
|
||||
me->SetLevitate(true);
|
||||
me->GetMotionMaster()->MovePoint(0, FLY_X, FLY_Y, FLY_Z);
|
||||
TalkTimer = 600000;
|
||||
break;
|
||||
@@ -418,7 +418,7 @@ public:
|
||||
TalkTimer = 3000;
|
||||
break;
|
||||
case 2:
|
||||
me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
|
||||
me->SetLevitate(true);
|
||||
me->GetMotionMaster()->MovePoint(0, FLY_X, FLY_Y, FLY_Z);
|
||||
TalkTimer = 15000;
|
||||
break;
|
||||
|
||||
@@ -1196,7 +1196,7 @@ public:
|
||||
|
||||
void Reset()
|
||||
{
|
||||
me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
|
||||
me->SetLevitate(true);
|
||||
bPointReached = true;
|
||||
uiTimer = urand(500, 1000);
|
||||
uiCheckTimer = 1000;
|
||||
|
||||
@@ -114,7 +114,7 @@ public:
|
||||
summoned->CastSpell(target, SPELL_RIBBON_OF_SOULS, false);
|
||||
}
|
||||
|
||||
summoned->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
|
||||
summoned->SetLevitate(true);
|
||||
targetGUID = summoned->GetGUID();
|
||||
}
|
||||
}
|
||||
@@ -185,7 +185,7 @@ public:
|
||||
{
|
||||
if (EventMove_Timer <= diff)
|
||||
{
|
||||
me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
|
||||
me->SetLevitate(true);
|
||||
me->MonsterMoveWithSpeed(me->GetPositionX(), me->GetPositionY(), HIGHBORNE_LOC_Y_NEW, me->GetDistance(me->GetPositionX(), me->GetPositionY(), HIGHBORNE_LOC_Y_NEW) / (5000 * 0.001f));
|
||||
me->SetPosition(me->GetPositionX(), me->GetPositionY(), HIGHBORNE_LOC_Y_NEW, me->GetOrientation());
|
||||
EventMove = false;
|
||||
|
||||
@@ -359,7 +359,7 @@ public:
|
||||
break;
|
||||
case 23:
|
||||
Ughost = me->SummonCreature(NPC_GHOST_UTHER, 971.86f, -1825.42f, 81.99f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
|
||||
Ughost->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
|
||||
Ughost->SetLevitate(true);
|
||||
DoScriptText(SAY_WP_4, Ughost, me);
|
||||
m_uiChatTimer = 4000;
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user