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

*Dalaran Mageguards now only consider you to be behind them if you are close to them, and they reset their orientation after casting the Trespasser spell. Closes #329

Browse Source 
--HG--
branch : trunk
This commit is contained in:
maximius
2009-11-19 18:21:43 -08:00
parent 02eeffd22f
commit d7ed79825c
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bindings/scripts/scripts/northrend/dalaran.cpp
+10 -11
View File
@@ -18,7 +18,7 @@
/* Script Data Start /* Script Data Start
SDName: Dalaran SDName: Dalaran
SDAuthor: WarHead SDAuthor: WarHead, MaXiMiUS
SD%Complete: 99% SD%Complete: 99%
SDComment: For what is 63990+63991? Same function but don't work correct... SDComment: For what is 63990+63991? Same function but don't work correct...
SDCategory: Dalaran SDCategory: Dalaran
@@ -59,7 +59,7 @@ struct TRINITY_DLL_DECL npc_mageguard_dalaranAI : public Scripted_NoMovementAI
void MoveInLineOfSight(Unit *pWho) void MoveInLineOfSight(Unit *pWho)
{ {
if (!pWho || me->GetZoneId() != 4395) // Must be in Dalaran if (!pWho || !pWho->IsInWorld() || pWho->GetZoneId() != 4395)
return; return;
if (!me->IsWithinDist(pWho, 65.0f, false)) if (!me->IsWithinDist(pWho, 65.0f, false))
@@ -67,34 +67,33 @@ struct TRINITY_DLL_DECL npc_mageguard_dalaranAI : public Scripted_NoMovementAI
Player *pPlayer = pWho->GetCharmerOrOwnerPlayerOrPlayerItself(); Player *pPlayer = pWho->GetCharmerOrOwnerPlayerOrPlayerItself();
if (!pPlayer || pPlayer->isGameMaster()) if (!pPlayer || pPlayer->isGameMaster() || pPlayer->IsBeingTeleported())
return; return;
float x = pWho->GetPositionX();
float y = pWho->GetPositionY();
switch (m_creature->GetEntry()) switch (m_creature->GetEntry())
{ {
case 29254: case 29254:
if (pPlayer->GetTeam() == HORDE) if (pPlayer->GetTeam() == HORDE)
if (Creature *pOutdoorNPC = me->FindNearestCreature(NPC_APPLEBOUGH_A, 35.0f)) if (Creature *pOutdoorNPC = me->FindNearestCreature(NPC_APPLEBOUGH_A, 35.0f))
{ {
if (!me->HasInArc(1.5*M_PI, pWho)) // Behind me, and "outdoors" if (me->isInBackInMap(pWho, 12.0f))
DoCast(pWho, SPELL_TRESPASSER_A); // Teleport the Horde unit out DoCast(pWho, SPELL_TRESPASSER_A);
} }
else if (me->HasInArc(M_PI, pWho)) // In front of me, and "indoors" else // In my line of sight, and "indoors"
DoCast(pWho, SPELL_TRESPASSER_A); // Teleport the Horde unit out DoCast(pWho, SPELL_TRESPASSER_A); // Teleport the Horde unit out
break; break;
case 29255: case 29255:
if (pPlayer->GetTeam() == ALLIANCE) if (pPlayer->GetTeam() == ALLIANCE)
if (Creature *pOutdoorNPC = me->FindNearestCreature(NPC_SWEETBERRY_H, 35.0f)) if (Creature *pOutdoorNPC = me->FindNearestCreature(NPC_SWEETBERRY_H, 35.0f))
{ {
if (!me->HasInArc(1.5*M_PI, pWho)) // Behind me, and "outdoors" if (me->isInBackInMap(pWho, 12.0f))
DoCast(pWho, SPELL_TRESPASSER_H); // Teleport the Alliance unit out DoCast(pWho, SPELL_TRESPASSER_A);
} }
else if (me->HasInArc(M_PI, pWho)) // In front of me, and "indoors" else // In my line of sight, and "indoors"
DoCast(pWho, SPELL_TRESPASSER_H); // Teleport the Alliance unit out DoCast(pWho, SPELL_TRESPASSER_H); // Teleport the Alliance unit out
break; break;
} }
me->SetOrientation(me->GetHomePosition().GetOrientation());
return; return;
} }