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

*Update movement enums - thanks to Zor for info.

Browse Source 
*Add functions for position data streaming.

--HG--
branch : trunk
This commit is contained in:
QAston
2010-08-04 14:39:45 +02:00
parent 850868c8a3
commit 6353e7dd8c
60 changed files with 428 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
View File

@@ -148,7 +148,7 @@ struct instance_deadmines : public ScriptedInstance
void MoveCreatureInside(Creature* pCreature)
{
pCreature->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
pCreature->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
pCreature->GetMotionMaster()->MovePoint(0, -102.7,-655.9, pCreature->GetPositionZ());
}

2
src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
View File

@@ -112,7 +112,7 @@ struct boss_nightbaneAI : public ScriptedAI
me->SetSpeed(MOVE_RUN, 2.0f);
me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
me->setActive(true);
if (pInstance)

2
src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
View File

@@ -159,7 +159,7 @@ struct boss_selin_fireheartAI : public ScriptedAI
float x, y, z; // coords that we move to, close to the crystal.
CrystalChosen->GetClosePoint(x, y, z, me->GetObjectSize(), CONTACT_DISTANCE);
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
me->GetMotionMaster()->MovePoint(1, x, y, z);
DrainingCrystal = true;
}

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

@@ -549,7 +549,7 @@ struct npc_dark_rider_of_acherusAI : public ScriptedAI
return;
TargetGUID = who->GetGUID();
me->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
me->SetSpeed(MOVE_RUN, 0.4f);
me->GetMotionMaster()->MoveChase(who);
me->SetUInt64Value(UNIT_FIELD_TARGET, TargetGUID);
@@ -819,7 +819,7 @@ struct npc_scarlet_miner_cartAI : public PassiveAI
if (Creature *miner = Unit::GetCreature(*me, minerGUID))
{
// very bad visual effect
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
//me->SetSpeed(MOVE_WALK, miner->GetSpeed(MOVE_WALK));
me->SetSpeed(MOVE_RUN, miner->GetSpeed(MOVE_RUN));
me->GetMotionMaster()->MoveFollow(miner, 1.0f, 0);

2
src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
View File

@@ -376,7 +376,7 @@ struct mob_scarlet_courierAI : public ScriptedAI
switch(uiStage)
{
case 1:
me->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
if (GameObject* tree = me->FindNearestGameObject(GO_INCONSPICUOUS_TREE, 40.0f))
{
DoScriptText(SAY_TREE1, me);

62
src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
View File

@@ -466,7 +466,7 @@ struct npc_highlord_darion_mograineAI : public npc_escortAI
switch (i)
{
case 0:
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
SetHoldState(true);
break;
case 1:
@@ -501,7 +501,7 @@ struct npc_highlord_darion_mograineAI : public npc_escortAI
bIsBattle = true;
break;
case 2:
me->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
DoCast(me, SPELL_THE_LIGHT_OF_DAWN);
break;
case 3:
@@ -515,30 +515,30 @@ struct npc_highlord_darion_mograineAI : public npc_escortAI
{
if (pTemp->HasAura(SPELL_THE_LIGHT_OF_DAWN, 0))
pTemp->RemoveAurasDueToSpell(SPELL_THE_LIGHT_OF_DAWN);
pTemp->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
pTemp->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[19].x, LightofDawnLoc[19].y, LightofDawnLoc[19].z);
}
if (Creature* pTemp = Unit::GetCreature(*me, uiThassarianGUID))
{
if (pTemp->HasAura(SPELL_THE_LIGHT_OF_DAWN, 0))
pTemp->RemoveAurasDueToSpell(SPELL_THE_LIGHT_OF_DAWN);
pTemp->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
pTemp->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[21].x, LightofDawnLoc[21].y, LightofDawnLoc[21].z);
}
if (Creature* pTemp = Unit::GetCreature(*me, uiKorfaxGUID))
{
pTemp->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
pTemp->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
pTemp->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_READY2H);
pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[10].x, LightofDawnLoc[10].y, LightofDawnLoc[10].z);
}
if (Creature* pTemp = Unit::GetCreature(*me, uiMaxwellGUID))
{
pTemp->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
pTemp->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[13].x, LightofDawnLoc[13].y, LightofDawnLoc[13].z);
}
if (Creature* pTemp = Unit::GetCreature(*me, uiEligorGUID))
{
pTemp->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
pTemp->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[16].x, LightofDawnLoc[16].y, LightofDawnLoc[16].z);
}
JumpToNextStep(10000);
@@ -628,7 +628,7 @@ struct npc_highlord_darion_mograineAI : public npc_escortAI
if (uiSummon_counter < ENCOUNTER_GHOUL_NUMBER)
{
Unit* pTemp = me->SummonCreature(NPC_ACHERUS_GHOUL, (me->GetPositionX()-20)+rand()%40, (me->GetPositionY()-20)+rand()%40, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000);
pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
pTemp->setFaction(2084);
uiGhoulGUID[uiSummon_counter] = pTemp->GetGUID();
++uiSummon_counter;
@@ -646,7 +646,7 @@ struct npc_highlord_darion_mograineAI : public npc_escortAI
if (uiSummon_counter < ENCOUNTER_ABOMINATION_NUMBER)
{
Unit* pTemp = me->SummonCreature(NPC_RAMPAGING_ABOMINATION, (me->GetPositionX()-20)+rand()%40, (me->GetPositionY()-20)+rand()%40, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000);
pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
pTemp->setFaction(2084);
uiAbominationGUID[uiSummon_counter] = pTemp->GetGUID();
++uiSummon_counter;
@@ -664,7 +664,7 @@ struct npc_highlord_darion_mograineAI : public npc_escortAI
if (uiSummon_counter < ENCOUNTER_WARRIOR_NUMBER)
{
Unit* pTemp = me->SummonCreature(NPC_WARRIOR_OF_THE_FROZEN_WASTES, (me->GetPositionX()-20)+rand()%40, (me->GetPositionY()-20)+rand()%40, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000);
pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
pTemp->setFaction(2084);
uiWarriorGUID[uiSummon_counter] = pTemp->GetGUID();
++uiSummon_counter;
@@ -682,7 +682,7 @@ struct npc_highlord_darion_mograineAI : public npc_escortAI
if (uiSummon_counter < ENCOUNTER_BEHEMOTH_NUMBER)
{
Unit* pTemp = me->SummonCreature(NPC_FLESH_BEHEMOTH, (me->GetPositionX()-20)+rand()%40, (me->GetPositionY()-20)+rand()%40, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000);
pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
pTemp->setFaction(2084);
uiBehemothGUID[uiSummon_counter] = pTemp->GetGUID();
++uiSummon_counter;
@@ -703,17 +703,17 @@ struct npc_highlord_darion_mograineAI : public npc_escortAI
SetHoldState(false);
if (Creature* pTemp = Unit::GetCreature(*me, uiKoltiraGUID))
{
pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z);
}
if (Creature* pTemp = Unit::GetCreature(*me, uiOrbazGUID))
{
pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z);
}
if (Creature* pTemp = Unit::GetCreature(*me, uiThassarianGUID))
{
pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z);
}
for (uint8 i = 0; i < ENCOUNTER_ABOMINATION_NUMBER; ++i)
@@ -788,7 +788,7 @@ struct npc_highlord_darion_mograineAI : public npc_escortAI
if (Unit* pTemp = me->SummonCreature(NPC_DARION_MOGRAINE, LightofDawnLoc[24].x, LightofDawnLoc[24].y, LightofDawnLoc[24].z, LightofDawnLoc[24].o, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000))
{
DoScriptText(SAY_LIGHT_OF_DAWN35, pTemp);
pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
uiDarionGUID = pTemp->GetGUID();
}
JumpToNextStep(4000);
@@ -904,7 +904,7 @@ struct npc_highlord_darion_mograineAI : public npc_escortAI
DoCast(me, SPELL_MOGRAINE_CHARGE); // jumping charge
// doesn't make it looks well, so workarounds, Darion charges, looks better
me->SetSpeed(MOVE_RUN, 3.0f);
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
SetHoldState(false);
JumpToNextStep(0);
break;
@@ -977,7 +977,7 @@ struct npc_highlord_darion_mograineAI : public npc_escortAI
Unit* pTemp;
pTemp = me->SummonCreature(NPC_DEFENDER_OF_THE_LIGHT, LightofDawnLoc[0].x+rand()%10, LightofDawnLoc[0].y+rand()%10, LightofDawnLoc[0].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 10000);
pTemp->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_ATTACK_UNARMED);
pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
pTemp->SetSpeed(MOVE_RUN, 2.0f);
pTemp->setFaction(me->getFaction());
pTemp->GetMotionMaster()->MovePoint(0, fLichPositionX, fLichPositionY, fLichPositionZ);
@@ -985,7 +985,7 @@ struct npc_highlord_darion_mograineAI : public npc_escortAI
pTemp = me->SummonCreature(NPC_RIMBLAT_EARTHSHATTER, LightofDawnLoc[0].x+rand()%10, LightofDawnLoc[0].y+rand()%10, LightofDawnLoc[0].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 10000);
pTemp->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_ATTACK_UNARMED);
pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
pTemp->SetSpeed(MOVE_RUN, 2.0f);
pTemp->setFaction(me->getFaction());
pTemp->GetMotionMaster()->MovePoint(0, fLichPositionX, fLichPositionY, fLichPositionZ);
@@ -994,7 +994,7 @@ struct npc_highlord_darion_mograineAI : public npc_escortAI
if (Creature* pTemp = Unit::GetCreature(*me, uiMaxwellGUID))
{
pTemp->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_ATTACK_UNARMED);
pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
pTemp->SetSpeed(MOVE_RUN, 2.0f);
pTemp->GetMotionMaster()->MovePoint(0, fLichPositionX, fLichPositionY, fLichPositionZ);
DoScriptText(SAY_LIGHT_OF_DAWN50, pTemp);
@@ -1002,7 +1002,7 @@ struct npc_highlord_darion_mograineAI : public npc_escortAI
if (Creature* pTemp = Unit::GetCreature(*me, uiKorfaxGUID))
{
pTemp->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_ATTACK_UNARMED);
pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
pTemp->SetSpeed(MOVE_RUN, 2.0f);
pTemp->HandleEmoteCommand(EMOTE_STATE_ATTACK_UNARMED);
pTemp->GetMotionMaster()->MovePoint(0, fLichPositionX, fLichPositionY, fLichPositionZ);
@@ -1010,7 +1010,7 @@ struct npc_highlord_darion_mograineAI : public npc_escortAI
if (Creature* pTemp = Unit::GetCreature(*me, uiEligorGUID))
{
pTemp->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_ATTACK_UNARMED);
pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
pTemp->SetSpeed(MOVE_RUN, 2.0f);
pTemp->GetMotionMaster()->MovePoint(0, fLichPositionX, fLichPositionY, fLichPositionZ);
}
@@ -1075,7 +1075,7 @@ struct npc_highlord_darion_mograineAI : public npc_escortAI
case 46: // Darion stand up, "not today"
me->SetSpeed(MOVE_RUN, 1.0f);
me->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
me->SetStandState(UNIT_STAND_STATE_STAND);
DoScriptText(SAY_LIGHT_OF_DAWN53, me);
SetHoldState(false); // Darion throws sword
@@ -1135,7 +1135,7 @@ struct npc_highlord_darion_mograineAI : public npc_escortAI
pTemp->CastSpell(pTemp, SPELL_TIRION_CHARGE, false); // jumping charge
pTemp->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_READY2H);
pTemp->SetSpeed(MOVE_RUN, 3.0f); // workarounds, make Tirion still running
pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[2].x, LightofDawnLoc[2].y, LightofDawnLoc[2].z);
if (Creature* pTemp = Unit::GetCreature(*me, uiLichKingGUID))
pTemp->Relocate(LightofDawnLoc[28].x, LightofDawnLoc[28].y, LightofDawnLoc[28].z); // workarounds, he should kick back by Tirion, but here we relocate him
@@ -1153,7 +1153,7 @@ struct npc_highlord_darion_mograineAI : public npc_escortAI
if (Creature* pTemp = Unit::GetCreature(*me, uiLichKingGUID))
{
pTemp->SetSpeed(MOVE_RUN, 1.0f);
me->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[29].x, LightofDawnLoc[29].y, LightofDawnLoc[29].z); // 26
}
JumpToNextStep(4000);
@@ -1213,7 +1213,7 @@ struct npc_highlord_darion_mograineAI : public npc_escortAI
case 62:
if (Creature* pTemp = Unit::GetCreature(*me, uiTirionGUID))
{
pTemp->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
pTemp->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[7].x, LightofDawnLoc[7].y, LightofDawnLoc[7].z);
}
JumpToNextStep(5500);
@@ -1394,7 +1394,7 @@ struct npc_highlord_darion_mograineAI : public npc_escortAI
me->DeleteThreatList();
me->CombatStop(true);
me->InterruptNonMeleeSpells(false);
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
for (uint8 i = 0; i < ENCOUNTER_DEFENDER_NUMBER; ++i)
DespawnNPC(uiDefenderGUID[i]);
@@ -1416,7 +1416,7 @@ struct npc_highlord_darion_mograineAI : public npc_escortAI
pTemp->CombatStop(true);
pTemp->AttackStop();
pTemp->setFaction(me->getFaction());
pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[9].x, LightofDawnLoc[9].y, LightofDawnLoc[9].z);
}
@@ -1427,7 +1427,7 @@ struct npc_highlord_darion_mograineAI : public npc_escortAI
pTemp->CombatStop(true);
pTemp->AttackStop();
pTemp->setFaction(me->getFaction());
pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[12].x, LightofDawnLoc[12].y, LightofDawnLoc[12].z);
}
@@ -1438,7 +1438,7 @@ struct npc_highlord_darion_mograineAI : public npc_escortAI
pTemp->CombatStop(true);
pTemp->AttackStop();
pTemp->setFaction(me->getFaction());
pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[15].x, LightofDawnLoc[15].y, LightofDawnLoc[15].z);
}
DespawnNPC(uiRayneGUID);
@@ -1450,7 +1450,7 @@ struct npc_highlord_darion_mograineAI : public npc_escortAI
pTemp->CombatStop(true);
pTemp->AttackStop();
pTemp->setFaction(me->getFaction());
pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[18].x, LightofDawnLoc[18].y, LightofDawnLoc[18].z);
pTemp->CastSpell(pTemp, SPELL_THE_LIGHT_OF_DAWN, false);
}
@@ -1465,7 +1465,7 @@ struct npc_highlord_darion_mograineAI : public npc_escortAI
pTemp->CombatStop(true);
pTemp->AttackStop();
pTemp->setFaction(me->getFaction());
pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[20].x, LightofDawnLoc[20].y, LightofDawnLoc[20].z);
pTemp->CastSpell(pTemp, SPELL_THE_LIGHT_OF_DAWN, false);
}

2
src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp
View File

@@ -62,7 +62,7 @@ struct npc_valkyr_battle_maidenAI : public PassiveAI
switch(phase)
{
case 0:
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
me->HandleEmoteCommand(EMOTE_STATE_FLYGRABCLOSED);
FlyBackTimer = 500;
break;

2
src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
View File

@@ -481,7 +481,7 @@ struct mob_amanishi_hatcherAI : public ScriptedAI
void Reset()
{
me->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
side =(me->GetPositionY() < 1150);
waypoint = 0;
isHatching = false;

2
src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
View File

@@ -127,7 +127,7 @@ struct boss_nalorakkAI : public ScriptedAI
inMove = false;
waitTimer = 0;
me->SetSpeed(MOVE_RUN,2);
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
}else
{
(*me).GetMotionMaster()->MovePoint(0,NalorakkWay[7][0],NalorakkWay[7][1],NalorakkWay[7][2]);

4
src/server/scripts/EasternKingdoms/ghostlands.cpp
View File

@@ -178,8 +178,8 @@ struct npc_ranger_lilathaAI : public npc_escortAI
me->AI()->AttackStart(Summ1);
break;
}
case 19: me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); break;
case 25: me->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); break;
case 19: me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); break;
case 25: me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); break;
case 30:
if (pPlayer && pPlayer->GetTypeId() == TYPEID_PLAYER)
CAST_PLR(pPlayer)->GroupEventHappens(QUEST_ESCAPE_FROM_THE_CATACOMBS,me);

2
src/server/scripts/EasternKingdoms/hinterlands.cpp
View File

@@ -243,7 +243,7 @@ struct npc_rinjiAI : public npc_escortAI
void JustSummoned(Creature* pSummoned)
{
pSummoned->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
pSummoned->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
pSummoned->GetMotionMaster()->MovePoint(0, m_afAmbushMoveTo[m_iSpawnId].m_fX, m_afAmbushMoveTo[m_iSpawnId].m_fY, m_afAmbushMoveTo[m_iSpawnId].m_fZ);
}

6
src/server/scripts/EasternKingdoms/redridge_mountains.cpp
View File

@@ -62,8 +62,8 @@ struct npc_corporal_keeshanAI : public npc_escortAI
if (!pPlayer)
return;
if (uiI >= 65 && me->GetUnitMovementFlags() == MOVEMENTFLAG_WALK_MODE)
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
if (uiI >= 65 && me->GetUnitMovementFlags() == MOVEMENTFLAG_WALKING)
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
switch(uiI)
{
@@ -73,7 +73,7 @@ struct npc_corporal_keeshanAI : public npc_escortAI
uiPhase = 1;
break;
case 65:
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
break;
case 115:
pPlayer->AreaExploredOrEventHappens(QUEST_MISSING_IN_ACTION);

2
src/server/scripts/EasternKingdoms/stormwind_city.cpp
View File

@@ -417,7 +417,7 @@ struct npc_marzon_silent_bladeAI : public ScriptedAI
{
npc_marzon_silent_bladeAI(Creature* pCreature) : ScriptedAI(pCreature)
{
me->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
}
void Reset()

4
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
View File

@@ -490,7 +490,7 @@ void hyjalAI::SummonCreature(uint32 entry, float Base[4][3])
// Increment Enemy Count to be used in World States and instance script
++EnemyCount;
pCreature->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
pCreature->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
pCreature->setActive(true);
switch(entry)
{
@@ -1014,7 +1014,7 @@ void hyjalAI::WaypointReached(uint32 i)
if ((*itr) && (*itr)->isAlive() && (*itr) != me && (*itr)->GetEntry() != JAINA)
{
if (!(*itr)->IsWithinDist(me, 60))
(*itr)->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
(*itr)->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
float x, y, z;
(*itr)->SetDefaultMovementType(IDLE_MOTION_TYPE);
(*itr)->GetMotionMaster()->Initialize();

12
src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
View File

@@ -485,11 +485,11 @@ struct npc_arthasAI : public npc_escortAI
break;
//After waypoint 0
case 1:
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
if (Unit* pUther = me->SummonCreature(NPC_UTHER,1794.357f,1272.183f,140.558f,1.37f,TEMPSUMMON_DEAD_DESPAWN,180000))
{
uiUtherGUID = pUther->GetGUID();
pUther->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
pUther->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
pUther->GetMotionMaster()->MovePoint(0, 1897.018f, 1287.487f, 143.481f);
pUther->SetUInt64Value(UNIT_FIELD_TARGET, me->GetGUID());
me->SetUInt64Value(UNIT_FIELD_TARGET, uiUtherGUID);
@@ -574,7 +574,7 @@ struct npc_arthasAI : public npc_escortAI
case 17:
if (Creature* pUther = Unit::GetCreature(*me, uiUtherGUID))
{
pUther->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
pUther->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
pUther->GetMotionMaster()->MovePoint(0, 1794.357f,1272.183f,140.558f);
}
JumpToNextStep(1000);
@@ -583,7 +583,7 @@ struct npc_arthasAI : public npc_escortAI
if (Creature* pJaina = Unit::GetCreature(*me, uiJainaGUID))
{
me->SetUInt64Value(UNIT_FIELD_TARGET, uiJainaGUID);
pJaina->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
pJaina->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
pJaina->GetMotionMaster()->MovePoint(0, 1794.357f,1272.183f,140.558f);
}
JumpToNextStep(1000);
@@ -649,7 +649,7 @@ struct npc_arthasAI : public npc_escortAI
if (Creature* pCityman = Unit::GetCreature(*me, uiCitymenGUID[0]))
{
pCityman->SetUInt64Value(UNIT_FIELD_TARGET, me->GetGUID());
pCityman->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
pCityman->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
pCityman->GetMotionMaster()->MovePoint(0, 2088.625f,1279.191f,140.743f);
}
JumpToNextStep(2000);
@@ -822,7 +822,7 @@ struct npc_arthasAI : public npc_escortAI
if (Unit* pBoss = me->SummonCreature(uiBossID,2232.19f,1331.933f,126.662f,3.15f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,900000))
{
uiBossGUID = pBoss->GetGUID();
pBoss->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
pBoss->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
pBoss->GetMotionMaster()->MovePoint(0, 2194.110f,1332.00f,130.00f);
}
}

2
src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
View File

@@ -301,7 +301,7 @@ struct npc_thrall_old_hillsbradAI : public npc_escortAI
SetRun();
break;
case 91:
me->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
SetRun(false);
break;
case 93:

2
src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
View File

@@ -291,7 +291,7 @@ struct instance_zulfarrak : public ScriptedInstance
{
if (npc->isAlive())
{
npc->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
npc->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
npc->GetMotionMaster()->MovePoint(1,x,y,z);
npc->SetHomePosition(x,y,z,o);
}

2
src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
View File

@@ -196,7 +196,7 @@ void initBlyCrewMember(ScriptedInstance* pInstance, uint32 entry,float x,float y
if (Creature* crew = pInstance->instance->GetCreature(pInstance->GetData64(entry)))
{
crew->SetReactState(REACT_AGGRESSIVE);
crew->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
crew->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
crew->SetHomePosition(x,y,z,0);
crew->GetMotionMaster()->MovePoint(1,x,y,z);
crew->setFaction(FACTION_FREED);

2
src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp
View File

@@ -192,7 +192,7 @@ struct boss_jedoga_shadowseekerAI : public ScriptedAI
/* me->SetUnitMovementFlags(MOVEMENTFLAG_JUMPING);
me->SendMonsterMove(JedogaPosition[1], MOVEFLAG_JUMP, 0);
me->Relocate(JedogaPosition[1][0], JedogaPosition[1][1], JedogaPosition[1][2], JedogaPosition[1][3]);
me->SetUnitMovementFlags(MOVEMENTFLAG_WALK_MODE);
me->SetUnitMovementFlags(MOVEMENTFLAG_WALKING);
*/
me->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, false);
me->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_MAGIC, false);

2
src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp
View File

@@ -312,7 +312,7 @@ struct boss_taldaramAI : public ScriptedAI
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
me->RemoveAurasDueToSpell(SPELL_BEAM_VISUAL);
me->SetUnitMovementFlags(MOVEMENTFLAG_WALK_MODE);
me->SetUnitMovementFlags(MOVEMENTFLAG_WALKING);
me->SetHomePosition(me->GetPositionX(), me->GetPositionY(), DATA_GROUND_POSITION_Z, me->GetOrientation());
uint64 prison_GUID = pInstance->GetData64(DATA_PRINCE_TALDARAM_PLATFORM);
pInstance->HandleGameObject(prison_GUID,true);

2
src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
View File

@@ -184,7 +184,7 @@ struct boss_four_horsemenAI : public BossAI
{
movementStarted = true;
me->SetReactState(REACT_PASSIVE);
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
me->SetSpeed(MOVE_RUN, me->GetSpeedRate(MOVE_RUN), true);
switch(id)

4
src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp
View File

@@ -269,7 +269,7 @@ struct boss_uromAI : public ScriptedAI
me->NearTeleportTo(pPos.GetPositionX(),pPos.GetPositionY(),pPos.GetPositionZ(),pPos.GetOrientation());
me->GetMotionMaster()->MoveChase(me->getVictim(),0,0);
me->SetUnitMovementFlags(MOVEMENTFLAG_WALK_MODE);
me->SetUnitMovementFlags(MOVEMENTFLAG_WALKING);
bCanCast = false;
bCanGoBack = false;
@@ -332,7 +332,7 @@ struct boss_uromAI : public ScriptedAI
LeaveCombat();
break;
case SPELL_TELEPORT:
me->AddUnitMovementFlag(MOVEMENTFLAG_FLY_MODE); // with out it the npc will fall down while is casting
me->AddUnitMovementFlag(MOVEMENTFLAG_CAN_FLY); // with out it the npc will fall down while is casting
bCanCast = true;
break;
default:

4
src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp
View File

@@ -480,8 +480,8 @@ struct boss_sartharionAI : public ScriptedAI
{
if (pTemp->isAlive() && !pTemp->getVictim())
{
if (pTemp->HasUnitMovementFlag(MOVEMENTFLAG_WALK_MODE))
pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
if (pTemp->HasUnitMovementFlag(MOVEMENTFLAG_WALKING))
pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
if (pTemp->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
pTemp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);

2
src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
View File

@@ -199,7 +199,7 @@ struct boss_kelesethAI : public ScriptedAI
Skeleton = me->SummonCreature(CREATURE_SKELETON, SkeletonSpawnPoint[i][0], SkeletonSpawnPoint[i][1] , SKELETONSPAWN_Z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000);
if (Skeleton)
{
Skeleton->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
Skeleton->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
Skeleton->GetMotionMaster()->MovePoint(0, me->GetPositionX(), me->GetPositionY() , me->GetPositionZ());
Skeleton->AddThreat(me->getVictim(), 0.0f);
DoZoneInCombat(Skeleton);

2
src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
View File

@@ -230,7 +230,7 @@ struct boss_skadiAI : public ScriptedAI
m_pInstance->SetData(DATA_SKADI_THE_RUTHLESS_EVENT, IN_PROGRESS);
m_pInstance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT);
me->GetMotionMaster()->MoveJump(Location[0].GetPositionX(), Location[0].GetPositionY(), Location[0].GetPositionZ(), 5.0f, 10.0f);
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
m_uiMountTimer = 1000;
Summons.DespawnEntry(CREATURE_GRAUF);
}

6
src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
View File

@@ -254,7 +254,7 @@ struct boss_svala_sorrowgraveAI : public ScriptedAI
Phase = NORMAL;
DoTeleportTo(296.632, -346.075, 90.6307);
me->SetUnitMovementFlags(MOVEMENTFLAG_WALK_MODE);
me->SetUnitMovementFlags(MOVEMENTFLAG_WALKING);
summons.DespawnAll();
@@ -315,7 +315,7 @@ struct boss_svala_sorrowgraveAI : public ScriptedAI
DoCast(pSacrificeTarget, SPELL_RITUAL_OF_THE_SWORD);
//Spell doesn't teleport
DoTeleportPlayer(pSacrificeTarget, 296.632, -346.075, 90.63, 4.6);
me->SetUnitMovementFlags(MOVEMENTFLAG_FLY_MODE);
me->SetUnitMovementFlags(MOVEMENTFLAG_CAN_FLY);
DoTeleportTo(296.632, -346.075, 120.85);
Phase = SACRIFICING;
if (pInstance)
@@ -344,7 +344,7 @@ struct boss_svala_sorrowgraveAI : public ScriptedAI
//go down
Phase = NORMAL;
pSacrificeTarget = NULL;
me->SetUnitMovementFlags(MOVEMENTFLAG_WALK_MODE);
me->SetUnitMovementFlags(MOVEMENTFLAG_WALKING);
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
me->GetMotionMaster()->MoveChase(pTarget);

2
src/server/scripts/Northrend/VioletHold/violet_hold.cpp
View File

@@ -308,7 +308,7 @@ struct npc_sinclariAI : public ScriptedAI
{
if (Creature* pGuard = *itr)
{
pGuard->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
pGuard->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
pGuard->GetMotionMaster()->MovePoint(0, MovePosition);
}
}

12
src/server/scripts/Northrend/borean_tundra.cpp
View File

@@ -945,16 +945,16 @@ struct npc_thassarianAI : public npc_escortAI
uiArthas = pArthas->GetGUID();
pArthas->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
pArthas->SetReactState(REACT_PASSIVE);
pArthas->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
pArthas->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
pArthas->GetMotionMaster()->MovePoint(0, 3737.374756,3564.841309,477.433014);
}
if (Creature *pTalbot = me->SummonCreature(NPC_COUNSELOR_TALBOT, 3747.23, 3614.936, 473.321, 4.462012, TEMPSUMMON_CORPSE_TIMED_DESPAWN,120000))
{
uiTalbot = pTalbot->GetGUID();
pTalbot->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
pTalbot->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
pTalbot->GetMotionMaster()->MovePoint(0, 3738.000977,3568.882080,477.433014);
}
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
break;
case 4:
@@ -1033,13 +1033,13 @@ struct npc_thassarianAI : public npc_escortAI
if (Creature* pArlos = me->SummonCreature(NPC_GENERAL_ARLOS, 3745.527100, 3615.655029, 473.321533, 4.447805, TEMPSUMMON_CORPSE_TIMED_DESPAWN,120000))
{
uiArlos = pArlos->GetGUID();
pArlos->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
pArlos->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
pArlos->GetMotionMaster()->MovePoint(0, 3735.570068, 3572.419922, 477.441010);
}
if (Creature *pLeryssa = me->SummonCreature(NPC_LERYSSA, 3749.654541, 3614.959717, 473.323486, 4.524959, TEMPSUMMON_CORPSE_TIMED_DESPAWN,120000))
{
uiLeryssa = pLeryssa->GetGUID();
pLeryssa->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
pLeryssa->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
pLeryssa->SetReactState(REACT_PASSIVE);
pLeryssa->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
pLeryssa->GetMotionMaster()->MovePoint(0, 3741.969971, 3571.439941, 477.441010);
@@ -1342,7 +1342,7 @@ struct npc_counselor_talbotAI : public ScriptedAI
pArlos->Kill(pArlos, false);
pLeryssa->RemoveAura(SPELL_STUN);
pLeryssa->clearUnitState(UNIT_STAT_STUNNED);
pLeryssa->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
pLeryssa->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
pLeryssa->GetMotionMaster()->MovePoint(0,3722.114502, 3564.201660, 477.441437);
if (pKiller->GetTypeId() == TYPEID_PLAYER)

2
src/server/scripts/Northrend/grizzly_hills.cpp
View File

@@ -256,7 +256,7 @@ struct npc_emilyAI : public npc_escortAI
pPlayer->GroupEventHappens(QUEST_PERILOUS_ADVENTURE, me);
DoScriptText(SAY_QUEST_COMPLETE, me, pPlayer);
}
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
break;
case 25:
DoScriptText(SAY_VICTORY4, me);

2
src/server/scripts/Northrend/howling_fjord.cpp
View File

@@ -174,7 +174,7 @@ struct npc_plaguehound_trackerAI : public npc_escortAI
if (!pPlayer)
return;
me->SetUnitMovementFlags(MOVEMENTFLAG_WALK_MODE);
me->SetUnitMovementFlags(MOVEMENTFLAG_WALKING);
Start(false, false, pPlayer->GetGUID());
}

2
src/server/scripts/Northrend/zuldrak.cpp
View File

@@ -1249,7 +1249,7 @@ struct npc_crusade_recruitAI : public ScriptedAI
break;
case 2:
// walk forward
me->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
me->GetMotionMaster()->MovePoint(0,me->GetPositionX() + (cos(m_heading) * 10), me->GetPositionY() + (sin(m_heading) * 10), me->GetPositionZ());
m_uiTimer = 5000;
m_uiPhase = 3;

6
src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
View File

@@ -1134,7 +1134,7 @@ struct npc_akama_illidanAI : public ScriptedAI
void BeginWalk()
{
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
me->SetSpeed(MOVE_RUN, 1.0f);
me->GetMotionMaster()->MovePoint(0, AkamaWP[WalkCount].x, AkamaWP[WalkCount].y, AkamaWP[WalkCount].z);
}
@@ -1925,7 +1925,7 @@ void boss_illidan_stormrageAI::HandleTalkSequence()
// Equip our warglaives!
SetEquipmentSlots(false, EQUIP_ID_MAIN_HAND, EQUIP_ID_OFF_HAND, EQUIP_NO_CHANGE);
me->SetByteValue(UNIT_FIELD_BYTES_2, 0, SHEATH_STATE_MELEE);
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
break;
case 9:
if (GETCRE(Akama, AkamaGUID))
@@ -2029,7 +2029,7 @@ void boss_illidan_stormrageAI::CastEyeBlast()
if (!Trigger) return;
Trigger->SetSpeed(MOVE_WALK, 3);
Trigger->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
Trigger->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
Trigger->GetMotionMaster()->MovePoint(0, final.x, final.y, final.z);
//Trigger->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);

8
src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
View File

@@ -318,7 +318,7 @@ struct boss_shade_of_akamaAI : public ScriptedAI
if (Sorcerer)
{
CAST_AI(mob_ashtongue_sorcererAI, Sorcerer->AI())->ShadeGUID = me->GetGUID();
Sorcerer->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
Sorcerer->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
Sorcerer->GetMotionMaster()->MovePoint(0, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ());
Sorcerer->SetUInt64Value(UNIT_FIELD_TARGET, me->GetGUID());
Sorcerers.push_back(Sorcerer->GetGUID());
@@ -333,7 +333,7 @@ struct boss_shade_of_akamaAI : public ScriptedAI
Creature* Spawn = me->SummonCreature(spawnEntries[i], X, Y, Z_SPAWN, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 25000);
if (Spawn)
{
Spawn->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
Spawn->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
Spawn->GetMotionMaster()->MovePoint(0, AGGRO_X, AGGRO_Y, AGGRO_Z);
Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 1);
Spawn->AI()->AttackStart(pTarget);
@@ -394,7 +394,7 @@ struct boss_shade_of_akamaAI : public ScriptedAI
Creature* Defender = me->SummonCreature(CREATURE_DEFENDER, SpawnLocations[ran].x, SpawnLocations[ran].y, Z_SPAWN, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 25000);
if (Defender)
{
Defender->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
Defender->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
bool move = true;
if (AkamaGUID)
{
@@ -686,7 +686,7 @@ struct npc_akamaAI : public ScriptedAI
{
ShadeHasDied = true;
WayPointId = 0;
me->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
me->GetMotionMaster()->MovePoint(WayPointId, AkamaWP[0].x, AkamaWP[0].y, AkamaWP[0].z);
}
if (Shade && Shade->isAlive())

2
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
View File

@@ -624,7 +624,7 @@ struct mob_enchanted_elementalAI : public ScriptedAI
if (move <= diff)
{
me->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
if (phase == 1)
me->GetMotionMaster()->MovePoint(0, x, y, z);
if (phase == 1 && me->IsWithinDist3d(x,y,z, 0.1))

2
src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
View File

@@ -134,7 +134,7 @@ struct boss_nazanAI : public ScriptedAI
BellowingRoar_Timer = 6000;
ConeOfFire_Timer = 12000;
me->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
me->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
me->GetMotionMaster()->Clear();
if (Unit* pVictim = SelectUnit(SELECT_TARGET_NEAREST,0))
me->AI()->AttackStart(pVictim);

2
src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
View File

@@ -77,7 +77,7 @@ struct boss_warchief_kargath_bladefistAI : public ScriptedAI
removeAdds();
me->SetSpeed(MOVE_RUN,2);
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
summoned = 2;
InBlade = false;

2
src/server/scripts/Outland/nagrand.cpp
View File

@@ -605,7 +605,7 @@ struct npc_maghar_captiveAI : public npc_escortAI
if (pSummoned->isTotem())
return;
pSummoned->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
pSummoned->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
pSummoned->GetMotionMaster()->MovePoint(0, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ());
pSummoned->AI()->AttackStart(me);

2
src/server/scripts/Outland/shadowmoon_valley.cpp
View File

@@ -340,7 +340,7 @@ struct mob_dragonmaw_peonAI : public ScriptedAI
float x, y, z;
caster->GetClosePoint(x, y, z, me->GetObjectSize());
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
me->GetMotionMaster()->MovePoint(1, x, y, z);
}
}

2
src/server/scripts/Outland/terokkar_forest.cpp
View File

@@ -443,7 +443,7 @@ struct npc_isla_starmaneAI : public npc_escortAI
me->SetInFront(pPlayer); break;
case 30: me->HandleEmoteCommand(EMOTE_ONESHOT_WAVE); break;
case 31: DoCast(me, SPELL_CAT);
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); break;
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); break;
}
}

4
src/server/scripts/World/npcs_special.cpp
View File

@@ -628,7 +628,7 @@ struct npc_injured_patientAI : public ScriptedAI
DoScriptText(RAND(SAY_DOC1,SAY_DOC2,SAY_DOC3), me);
uint32 mobId = me->GetEntry();
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
switch (mobId)
{
@@ -1840,7 +1840,7 @@ struct npc_ebon_gargoyleAI : CasterAI
me->SetReactState(REACT_PASSIVE);
// Fly Away
me->AddUnitMovementFlag(MOVEMENTFLAG_FLY_MODE|MOVEMENTFLAG_ASCEND|MOVEMENTFLAG_FLYING);
me->AddUnitMovementFlag(MOVEMENTFLAG_CAN_FLY|MOVEMENTFLAG_ASCENDING|MOVEMENTFLAG_FLYING);
me->SetSpeed(MOVE_FLIGHT, 0.75f, true);
me->SetSpeed(MOVE_RUN, 0.75f, true);
float x = me->GetPositionX() + 20 * cos(me->GetOrientation());