Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 01:15:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

*fix Jaina stucking bug after evade

Browse Source 
*small fixes to retreat events (spell visuals)

--HG--
branch : trunk
This commit is contained in:
Rat
2009-04-08 19:55:47 +02:00
parent 73ec2d50fa
commit 0c2dd85c2c
3 changed files with 58 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/bindings/scripts/scripts/npc/npc_escortAI.h
View File

@@ -66,6 +66,7 @@ struct TRINITY_DLL_DECL npc_escortAI : public ScriptedAI
void SetCanMelee(bool usemelee) { CanMelee = usemelee; }
void SetDespawnAtEnd(bool despawn) { DespawnAtEnd = despawn; }
void SetDespawnAtFar(bool despawn) { DespawnAtFar = despawn; }
bool GetAttack() { return Attack; }//used in EnterEvadeMode override
// EscortAI variables
protected:

55
src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.cpp
View File

@@ -299,6 +299,8 @@ hyjalAI::hyjalAI(Creature *c) : npc_escortAI(c), Summons(m_creature)
RespawnTimer = 10000;
DoRespawn = false;
DoHide = false;
MassTeleportTimer = 0;
DoMassTeleport = false;
}
void hyjalAI::JustSummoned(Creature *summoned)
@@ -388,7 +390,8 @@ void hyjalAI::Reset()
void hyjalAI::EnterEvadeMode()
{
m_creature->InterruptNonMeleeSpells(true);
m_creature->RemoveAllAuras();
if(m_creature->GetEntry() != JAINA)
m_creature->RemoveAllAuras();
m_creature->DeleteThreatList();
m_creature->CombatStop();
m_creature->LoadCreaturesAddon();
@@ -403,6 +406,7 @@ void hyjalAI::EnterEvadeMode()
void hyjalAI::Aggro(Unit *who)
{
if(IsDummy)return;
for(uint8 i = 0; i < 2; ++i)
if(Spell[i].Cooldown)
SpellTimer[i] = Spell[i].Cooldown;
@@ -410,6 +414,18 @@ void hyjalAI::Aggro(Unit *who)
Talk(ATTACKED);
}
void hyjalAI::MoveInLineOfSight(Unit *who)
{
if(IsDummy)return;
if (IsBeingEscorted && !GetAttack())
return;
if(m_creature->getVictim() || !m_creature->canStartAttack(who))
return;
AttackStart(who);
}
void hyjalAI::SummonCreature(uint32 entry, float Base[4][3])
{
uint32 random = rand()%4;
@@ -682,7 +698,9 @@ void hyjalAI::Retreat()
{
JainaDummy->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
((hyjalAI*)JainaDummy->AI())->IsDummy = true;
JainaDummy->CastSpell(JainaDummy, SPELL_TELEPORT_VISUAL, true);
DummyGuid = JainaDummy->GetGUID();
//((hyjalAI*)JainaDummy->AI())->MassTeleportTimer = 20000;
//((hyjalAI*)JainaDummy->AI())->DoMassTeleport = true;
}
AddWaypoint(0,JainaDummySpawn[1][0],JainaDummySpawn[1][1],JainaDummySpawn[1][2]);
Start(false, false, false);
@@ -754,6 +772,11 @@ void hyjalAI::UpdateAI(const uint32 diff)
{
if(IsDummy)
{
if(MassTeleportTimer < diff && DoMassTeleport)
{
m_creature->CastSpell(m_creature,SPELL_MASS_TELEPORT,false);
DoMassTeleport = false;
}else MassTeleportTimer -= diff;
return;
}
if(DoHide)
@@ -780,6 +803,9 @@ void hyjalAI::UpdateAI(const uint32 diff)
HideNearPos(m_creature->GetPositionX(), m_creature->GetPositionY());
HideNearPos(5563, -2763.19);
HideNearPos(5542.2, -2629.36);
for(uint8 i = 0; i < 65; i++)//summon fires
m_creature->SummonGameObject(FLAMEOBJECT,HordeFirePos[i][0],HordeFirePos[i][1],HordeFirePos[i][2],HordeFirePos[i][3],HordeFirePos[i][4],HordeFirePos[i][5],HordeFirePos[i][6],HordeFirePos[i][7],0);
}
else m_creature->SetVisibility(VISIBILITY_ON);
break;
@@ -808,15 +834,16 @@ void hyjalAI::UpdateAI(const uint32 diff)
}
if(Overrun)
DoOverrun(Faction, diff);
if(m_creature->GetEntry() == 17772)
/* if(m_creature->GetEntry() == 17772)
{
if(!m_creature->HasAura(SPELL_BRILLIANCE_AURA,0))
DoCast(m_creature, SPELL_BRILLIANCE_AURA, true);
}
}*/
if(bRetreat)
{
if(RetreatTimer < diff)
{
IsDummy = true;
bRetreat = false;
HideNearPos(m_creature->GetPositionX(), m_creature->GetPositionY());
switch(m_creature->GetEntry())
@@ -995,7 +1022,19 @@ void hyjalAI::WaypointReached(uint32 i)
{
m_creature->Yell("Hurry, we don't have much time",0,0);
WaitForTeleport = true;
TeleportTimer = 15000;
TeleportTimer = 20000;
if(m_creature->GetEntry() == JAINA)
m_creature->CastSpell(m_creature,SPELL_MASS_TELEPORT,false);
if(m_creature->GetEntry() == THRALL && DummyGuid)
{
Unit* Dummy = Unit::GetUnit((*m_creature),DummyGuid);
if(Dummy)
{
((hyjalAI*)((Creature*)Dummy)->AI())->DoMassTeleport = true;
((hyjalAI*)((Creature*)Dummy)->AI())->MassTeleportTimer = 20000;
Dummy->CastSpell(m_creature,SPELL_MASS_TELEPORT,false);
}
}
//do some talking
//all alive guards walk near here
CellPair pair(Trinity::ComputeCellPair(m_creature->GetPositionX(), m_creature->GetPositionY()));
@@ -1064,6 +1103,7 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff)
{
(*itr)->CastSpell(*itr, SPELL_TELEPORT_VISUAL, true);
(*itr)->setFaction(35);//make them friendly so mobs won't attack them
(*itr)->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
}
}
DoCast(m_creature, SPELL_TELEPORT_VISUAL);
@@ -1121,7 +1161,10 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff)
}
}
break;
case 1://horde
case 1://horde
for(uint8 i = 0; i < 65; i++)//summon fires
m_creature->SummonGameObject(FLAMEOBJECT,HordeFirePos[i][0],HordeFirePos[i][1],HordeFirePos[i][2],HordeFirePos[i][3],HordeFirePos[i][4],HordeFirePos[i][5],HordeFirePos[i][6],HordeFirePos[i][7],0);
break;
}
}

11
src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.h
View File

@@ -28,7 +28,7 @@
#define TYRANDE 17948
#define ANCIENT_VEIN 185557
#define FLAMEOBJECT 182592
#define FLAMEOBJECT 182592
// Bosses summoned after every 8 waves
#define RAGE_WINTERCHILL 17767
@@ -37,10 +37,11 @@
#define AZGALOR 17842
#define ARCHIMONDE 17968
#define SPELL_TELEPORT_VISUAL 41232
#define SPELL_TELEPORT_VISUAL 41232
#define SPELL_MASS_TELEPORT 16807
//Spells for Jaina
#define SPELL_BRILLIANCE_AURA 31260 // The database must handle this spell via creature_addon
#define SPELL_BRILLIANCE_AURA 31260 // The database must handle this spell via creature_addon(it should, but is removed in evade..)
#define SPELL_BLIZZARD 31266
#define SPELL_PYROBLAST 31263
#define SPELL_SUMMON_ELEMENTALS 31264
@@ -185,6 +186,7 @@ struct TRINITY_DLL_DECL hyjalAI : public npc_escortAI
void RespawnNearPos(float x, float y);
void WaypointReached(uint32 i);
void DoOverrun(uint32 faction, const uint32 diff);
void MoveInLineOfSight(Unit *who);
void SummonCreature(uint32 entry, float Base[4][3]); // Summons a creature for that wave in that base
@@ -232,6 +234,9 @@ struct TRINITY_DLL_DECL hyjalAI : public npc_escortAI
bool DoRespawn;
bool DoHide;
bool IsDummy;
uint32 MassTeleportTimer;
bool DoMassTeleport;
uint64 DummyGuid;
struct Spell
{