josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Small fix in dirty larry

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Blaymoira
2009-02-14 18:56:39 +01:00
parent 738a96f9e2
commit 3e0c846d2b
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bindings/scripts/scripts/npc/npc_escortAI.cpp
-1
View File
@@ -299,5 +299,4 @@ void npc_escortAI::Start(bool bAttack, bool bDefend, bool bRun, uint64 pGUID)
//Disable questgiver flag //Disable questgiver flag
m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE + UNIT_FLAG_NOT_ATTACKABLE_2);
} }
src/bindings/scripts/scripts/zone/shattrath/shattrath_city.cpp
+7
View File
@@ -452,18 +452,21 @@ struct TRINITY_DLL_DECL npc_dirty_larryAI : public ScriptedAI
SayTimer = 0; SayTimer = 0;
Step = 0; Step = 0;
m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
m_creature->setFaction(1194); m_creature->setFaction(1194);
Unit* Creepjack = FindCreature(NPC_CREEPJACK, 20, m_creature); Unit* Creepjack = FindCreature(NPC_CREEPJACK, 20, m_creature);
if(Creepjack) if(Creepjack)
{ {
((Creature*)Creepjack)->AI()->EnterEvadeMode(); ((Creature*)Creepjack)->AI()->EnterEvadeMode();
Creepjack->setFaction(1194); Creepjack->setFaction(1194);
Creepjack->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
} }
Unit* Malone = FindCreature(NPC_MALONE, 20, m_creature); Unit* Malone = FindCreature(NPC_MALONE, 20, m_creature);
if(Malone) if(Malone)
{ {
((Creature*)Malone)->AI()->EnterEvadeMode(); ((Creature*)Malone)->AI()->EnterEvadeMode();
Malone->setFaction(1194); Malone->setFaction(1194);
Malone->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
} }
} }
@@ -514,6 +517,7 @@ struct TRINITY_DLL_DECL npc_dirty_larryAI : public ScriptedAI
Creepjack->Attack(player, true); Creepjack->Attack(player, true);
Creepjack->setFaction(14); Creepjack->setFaction(14);
Creepjack->GetMotionMaster()->MoveChase(player); Creepjack->GetMotionMaster()->MoveChase(player);
Creepjack->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
} }
Unit* Malone = FindCreature(NPC_MALONE, 20, m_creature); Unit* Malone = FindCreature(NPC_MALONE, 20, m_creature);
if(Malone) if(Malone)
@@ -521,6 +525,7 @@ struct TRINITY_DLL_DECL npc_dirty_larryAI : public ScriptedAI
Malone->Attack(player, true); Malone->Attack(player, true);
Malone->setFaction(14); Malone->setFaction(14);
Malone->GetMotionMaster()->MoveChase(player); Malone->GetMotionMaster()->MoveChase(player);
Malone->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
} }
DoStartMovement(player); DoStartMovement(player);
AttackStart(player); AttackStart(player);
@@ -535,12 +540,14 @@ struct TRINITY_DLL_DECL npc_dirty_larryAI : public ScriptedAI
{ {
((Creature*)Creepjack)->AI()->EnterEvadeMode(); ((Creature*)Creepjack)->AI()->EnterEvadeMode();
Creepjack->setFaction(1194); Creepjack->setFaction(1194);
Creepjack->GetMotionMaster()->MoveTargetedHome();
} }
Unit* Malone = FindCreature(NPC_MALONE, 20, m_creature); Unit* Malone = FindCreature(NPC_MALONE, 20, m_creature);
if(Malone) if(Malone)
{ {
((Creature*)Malone)->AI()->EnterEvadeMode(); ((Creature*)Malone)->AI()->EnterEvadeMode();
Malone->setFaction(1194); Malone->setFaction(1194);
Malone->GetMotionMaster()->MoveTargetedHome();
} }
m_creature->setFaction(1194); m_creature->setFaction(1194);
Done = true; Done = true;