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

*Dalaran Mageguards now work as intended.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
maximius
2009-11-18 21:51:40 -08:00
parent cb8c4d84e6
commit 2878b4e701
1 changed files with 27 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bindings/scripts/scripts/northrend/dalaran.cpp
+27 -46
View File
@@ -36,16 +36,11 @@ enum Spells
SPELL_TRESPASSER_H = 54029 SPELL_TRESPASSER_H = 54029
}; };
inline float __round(float x, int precision) enum NPCs // All outdoor guards are within 35.0f of these NPCs
{ {
if (precision > 0) NPC_APPLEBOUGH_A = 29547,
{ NPC_SWEETBERRY_H = 29715,
precision = pow(10.0f, precision); };
x *= precision;
return int(x > 0.0 ? x + 0.5 : x - 0.5)/precision;
}
return int(x > 0.0 ? x + 0.5 : x - 0.5);
}
struct TRINITY_DLL_DECL npc_mageguard_dalaranAI : public Scripted_NoMovementAI struct TRINITY_DLL_DECL npc_mageguard_dalaranAI : public Scripted_NoMovementAI
{ {
@@ -54,34 +49,20 @@ struct TRINITY_DLL_DECL npc_mageguard_dalaranAI : public Scripted_NoMovementAI
pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
pCreature->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_NORMAL, true); pCreature->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_NORMAL, true);
pCreature->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_MAGIC, true); pCreature->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_MAGIC, true);
Reset();
} }
void Reset() {} void Reset(){}
void Aggro(Unit* pWho) void Aggro(Unit* pWho){}
{
return;
}
void AttackStart(Unit* pWho) void AttackStart(Unit* pWho){}
{
return;
}
void MoveInLineOfSight(Unit *pWho) void MoveInLineOfSight(Unit *pWho)
{ {
if (m_creature->isInCombat()) if (!pWho || me->GetZoneId() != 4395) // Must be in Dalaran
return; return;
if (!pWho) if (!me->IsWithinDist(pWho, 65.0f, false))
return;
if (pWho->GetZoneId() != 4395) // Dalaran
return;
if (!me->IsWithinDist(pWho, 100.0f, false))
return; return;
Player *pPlayer = pWho->GetCharmerOrOwnerPlayerOrPlayerItself(); Player *pPlayer = pWho->GetCharmerOrOwnerPlayerOrPlayerItself();
@@ -89,29 +70,29 @@ struct TRINITY_DLL_DECL npc_mageguard_dalaranAI : public Scripted_NoMovementAI
if (!pPlayer || pPlayer->isGameMaster()) if (!pPlayer || pPlayer->isGameMaster())
return; return;
float radians = me->GetAngle(pWho);
float xWeight = __round(cos(radians), 3);
float yWeight = __round(sin(radians), 3);
float x = pWho->GetPositionX(); float x = pWho->GetPositionX();
float y = pWho->GetPositionY(); float y = pWho->GetPositionY();
float myX = me->GetPositionX(); switch (m_creature->GetEntry())
float myY = me->GetPositionY(); {
if (x + (2.0f * xWeight) < myX && y + (2.0f * yWeight) < myY) case 29254:
switch (m_creature->GetEntry()) if (pPlayer->GetTeam() == HORDE)
{ if (const Creature *pOutdoorNPC = me->FindNearestCreature(NPC_APPLEBOUGH_A, 200.0f))
case 29254: if ((!me->HasInArc(M_PI, pWho) && me->IsWithinDist(pOutdoorNPC, 35.0f, false)) // Behind me, and "outdoors"
if (pPlayer->GetTeam() == HORDE) || ( me->HasInArc(M_PI, pWho) && !me->IsWithinDist(pOutdoorNPC, 35.0f, false))) // In front of me, and "indoors"
DoCast(pWho, SPELL_TRESPASSER_A); DoCast(pWho, SPELL_TRESPASSER_A); // Teleport the Horde unit out
break; break;
case 29255: case 29255:
if (pPlayer->GetTeam() == ALLIANCE) if (pPlayer->GetTeam() == ALLIANCE)
DoCast(pWho, SPELL_TRESPASSER_H); if (const Creature *pOutdoorNPC = me->FindNearestCreature(NPC_SWEETBERRY_H, 200.0f))
break; if ((!me->HasInArc(M_PI, pWho) && me->IsWithinDist(pOutdoorNPC, 35.0f, false)) // Behind me, and "outdoors"
} || ( me->HasInArc(M_PI, pWho) && !me->IsWithinDist(pOutdoorNPC, 35.0f, false))) // In front of me, and "indoors"
DoCast(pWho, SPELL_TRESPASSER_H); // Teleport the Alliance unit out
break;
}
return; return;
} }
void UpdateAI(const uint32 diff) {} void UpdateAI(const uint32 diff){}
}; };
CreatureAI* GetAI_npc_mageguard_dalaran(Creature* pCreature) CreatureAI* GetAI_npc_mageguard_dalaran(Creature* pCreature)