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

Make some cleanup.

Browse Source 
My thank goes to Az@zel for the code analysis.

--HG--
branch : trunk
This commit is contained in:
Anubisss
2010-12-16 18:08:23 +01:00
parent bb7bd9ef45
commit 6d9029c12e
14 changed files with 56 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
+15 -15
View File
@@ -104,17 +104,17 @@ public:
ai->Reset();
ai->EnterEvadeMode();
ai->Spell[0].SpellId = SPELL_BLIZZARD;
ai->Spell[0].Cooldown = 15000 + rand()%20000;
ai->Spell[0].TargetType = TARGETTYPE_RANDOM;
ai->Spells[0].SpellId = SPELL_BLIZZARD;
ai->Spells[0].Cooldown = 15000 + rand()%20000;
ai->Spells[0].TargetType = TARGETTYPE_RANDOM;
ai->Spell[1].SpellId = SPELL_PYROBLAST;
ai->Spell[1].Cooldown = 5500 + rand()%4000;
ai->Spell[1].TargetType = TARGETTYPE_RANDOM;
ai->Spells[1].SpellId = SPELL_PYROBLAST;
ai->Spells[1].Cooldown = 5500 + rand()%4000;
ai->Spells[1].TargetType = TARGETTYPE_RANDOM;
ai->Spell[2].SpellId = SPELL_SUMMON_ELEMENTALS;
ai->Spell[2].Cooldown = 15000 + rand()%30000;
ai->Spell[2].TargetType = TARGETTYPE_SELF;
ai->Spells[2].SpellId = SPELL_SUMMON_ELEMENTALS;
ai->Spells[2].Cooldown = 15000 + rand()%30000;
ai->Spells[2].TargetType = TARGETTYPE_SELF;
return ai;
}
@@ -188,13 +188,13 @@ public:
ai->Reset();
ai->EnterEvadeMode();
ai->Spell[0].SpellId = SPELL_CHAIN_LIGHTNING;
ai->Spell[0].Cooldown = 3000 + rand()%5000;
ai->Spell[0].TargetType = TARGETTYPE_VICTIM;
ai->Spells[0].SpellId = SPELL_CHAIN_LIGHTNING;
ai->Spells[0].Cooldown = 3000 + rand()%5000;
ai->Spells[0].TargetType = TARGETTYPE_VICTIM;
ai->Spell[1].SpellId = SPELL_SUMMON_DIRE_WOLF;
ai->Spell[1].Cooldown = 6000 + rand()%35000;
ai->Spell[1].TargetType = TARGETTYPE_RANDOM;
ai->Spells[1].SpellId = SPELL_SUMMON_DIRE_WOLF;
ai->Spells[1].Cooldown = 6000 + rand()%35000;
ai->Spells[1].TargetType = TARGETTYPE_RANDOM;
return ai;
}
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
+9 -9
View File
@@ -389,7 +389,7 @@ void hyjalAI::Reset()
me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
//Initialize spells
memset(Spell, 0, sizeof(Spell));
memset(Spells, 0, sizeof(Spell) * HYJAL_AI_MAX_SPELLS);
//Reset Instance Data for trash count
if (pInstance)
@@ -425,9 +425,9 @@ void hyjalAI::EnterEvadeMode()
void hyjalAI::EnterCombat(Unit * /*who*/)
{
if (IsDummy)return;
for (uint8 i = 0; i < 3; ++i)
if (Spell[i].Cooldown)
SpellTimer[i] = Spell[i].Cooldown;
for (uint8 i = 0; i < HYJAL_AI_MAX_SPELLS; ++i)
if (Spells[i].Cooldown)
SpellTimer[i] = Spells[i].Cooldown;
Talk(ATTACKED);
}
@@ -881,9 +881,9 @@ void hyjalAI::UpdateAI(const uint32 diff)
if (!UpdateVictim())
return;
for (uint8 i = 0; i < 3; ++i)
for (uint8 i = 0; i < HYJAL_AI_MAX_SPELLS; ++i)
{
if (Spell[i].SpellId)
if (Spells[i].SpellId)
{
if (SpellTimer[i] <= diff)
{
@@ -892,7 +892,7 @@ void hyjalAI::UpdateAI(const uint32 diff)
Unit *pTarget = NULL;
switch(Spell[i].TargetType)
switch(Spells[i].TargetType)
{
case TARGETTYPE_SELF: pTarget = me; break;
case TARGETTYPE_RANDOM: pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); break;
@@ -901,8 +901,8 @@ void hyjalAI::UpdateAI(const uint32 diff)
if (pTarget && pTarget->isAlive())
{
DoCast(pTarget, Spell[i].SpellId);
SpellTimer[i] = Spell[i].Cooldown;
DoCast(pTarget, Spells[i].SpellId);
SpellTimer[i] = Spells[i].Cooldown;
}
} else SpellTimer[i] -= diff;
}
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h
+3 -1
View File
@@ -22,6 +22,8 @@
#include "hyjal.h"
#include "ScriptedEscortAI.h"
#define HYJAL_AI_MAX_SPELLS 3
// Trash Mobs summoned in waves
#define NECROMANCER 17899//done
#define ABOMINATION 17898//done
@@ -252,7 +254,7 @@ struct hyjalAI : public npc_escortAI
uint32 SpellId;
uint32 Cooldown;
uint32 TargetType;
}Spell[3];
} Spells[HYJAL_AI_MAX_SPELLS];
private:
uint32 SpellTimer[3];