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

*Massive cleanup redux.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
maximius
2009-10-17 16:20:24 -07:00
parent e585187b24
commit 3f338cc1c3
862 changed files with 2736 additions and 4797 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bindings/scripts/ScriptMgr.cpp
+2 -2
View File
@@ -70,7 +70,7 @@ void ScriptsFree()
delete []SpellSummary;
// Free resources before library unload
for(uint16 i =0;i<MAX_SCRIPTS;++i)
for (uint16 i =0; i<MAX_SCRIPTS; ++i)
delete m_scripts[i];
num_sc_scripts = 0;
@@ -105,7 +105,7 @@ void ScriptsInit(char const* cfg_file = "trinitycore.conf")
bar.step();
outstring_log("");
for(uint16 i =0;i<MAX_SCRIPTS;++i)
for (uint16 i =0; i<MAX_SCRIPTS; ++i)
m_scripts[i]=NULL;
FillSpellSummary();
src/bindings/scripts/base/escort_ai.cpp
+2 -2
View File
@@ -127,7 +127,7 @@ void npc_escortAI::JustDied(Unit* pKiller)
{
if (Group* pGroup = pPlayer->GetGroup())
{
for(GroupReference* pRef = pGroup->GetFirstMember(); pRef != NULL; pRef = pRef->next())
for (GroupReference* pRef = pGroup->GetFirstMember(); pRef != NULL; pRef = pRef->next())
{
if (Player* pMember = pRef->getSource())
{
@@ -192,7 +192,7 @@ bool npc_escortAI::IsPlayerOrGroupInRange()
{
if (Group* pGroup = pPlayer->GetGroup())
{
for(GroupReference* pRef = pGroup->GetFirstMember(); pRef != NULL; pRef = pRef->next())
for (GroupReference* pRef = pGroup->GetFirstMember(); pRef != NULL; pRef = pRef->next())
{
Player* pMember = pRef->getSource();
src/bindings/scripts/base/follower_ai.cpp
+3 -3
View File
@@ -125,7 +125,7 @@ void FollowerAI::JustDied(Unit* pKiller)
{
if (Group* pGroup = pPlayer->GetGroup())
{
for(GroupReference* pRef = pGroup->GetFirstMember(); pRef != NULL; pRef = pRef->next())
for (GroupReference* pRef = pGroup->GetFirstMember(); pRef != NULL; pRef = pRef->next())
{
if (Player* pMember = pRef->getSource())
{
@@ -210,7 +210,7 @@ void FollowerAI::UpdateAI(const uint32 uiDiff)
if (Group* pGroup = pPlayer->GetGroup())
{
for(GroupReference* pRef = pGroup->GetFirstMember(); pRef != NULL; pRef = pRef->next())
for (GroupReference* pRef = pGroup->GetFirstMember(); pRef != NULL; pRef = pRef->next())
{
Player* pMember = pRef->getSource();
@@ -317,7 +317,7 @@ Player* FollowerAI::GetLeaderForFollower()
{
if (Group* pGroup = pLeader->GetGroup())
{
for(GroupReference* pRef = pGroup->GetFirstMember(); pRef != NULL; pRef = pRef->next())
for (GroupReference* pRef = pGroup->GetFirstMember(); pRef != NULL; pRef = pRef->next())
{
Player* pMember = pRef->getSource();
src/bindings/scripts/include/sc_creature.cpp
+10 -11
View File
@@ -20,7 +20,7 @@ struct TSpellSummary
void SummonList::DoZoneInCombat(uint32 entry)
{
for(iterator i = begin(); i != end();)
for (iterator i = begin(); i != end(); )
{
Creature *summon = Unit::GetCreature(*m_creature, *i);
++i;
@@ -32,7 +32,7 @@ void SummonList::DoZoneInCombat(uint32 entry)
void SummonList::DoAction(uint32 entry, uint32 info)
{
for(iterator i = begin(); i != end();)
for (iterator i = begin(); i != end(); )
{
Creature *summon = Unit::GetCreature(*m_creature, *i);
++i;
@@ -44,7 +44,7 @@ void SummonList::DoAction(uint32 entry, uint32 info)
void SummonList::DespawnEntry(uint32 entry)
{
for(iterator i = begin(); i != end();)
for (iterator i = begin(); i != end(); )
{
Creature *summon = Unit::GetCreature(*m_creature, *i);
if(!summon)
@@ -313,7 +313,7 @@ void FillSpellSummary()
SpellEntry const* pTempSpell;
for(uint32 i = 0; i < GetSpellStore()->GetNumRows(); ++i)
for (uint32 i = 0; i < GetSpellStore()->GetNumRows(); ++i)
{
SpellSummary[i].Effects = 0;
SpellSummary[i].Targets = 0;
@@ -323,7 +323,7 @@ void FillSpellSummary()
if (!pTempSpell)
continue;
for(uint32 j = 0; j < 3; ++j)
for (uint32 j = 0; j < 3; ++j)
{
//Spell targets self
if (pTempSpell->EffectImplicitTargetA[j] == TARGET_UNIT_CASTER )
@@ -402,7 +402,7 @@ void ScriptedAI::DoResetThreat()
std::list<HostilReference*>& threatlist = m_creature->getThreatManager().getThreatList();
for(std::list<HostilReference*>::iterator itr = threatlist.begin(); itr != threatlist.end(); ++itr)
for (std::list<HostilReference*>::iterator itr = threatlist.begin(); itr != threatlist.end(); ++itr)
{
Unit* pUnit = Unit::GetUnit((*m_creature), (*itr)->getUnitGuid());
@@ -453,7 +453,7 @@ void ScriptedAI::DoTeleportAll(float fX, float fY, float fZ, float fO)
return;
Map::PlayerList const &PlayerList = map->GetPlayers();
for(Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
if (Player* i_pl = i->getSource())
if (i_pl->isAlive())
i_pl->TeleportTo(m_creature->GetMapId(), fX, fY, fZ, fO, TELE_TO_NOT_LEAVE_COMBAT);
@@ -634,7 +634,7 @@ void BossAI::TeleportCheaters()
float x, y, z;
me->GetPosition(x, y, z);
std::list<HostilReference*> &m_threatlist = me->getThreatManager().getThreatList();
for(std::list<HostilReference*>::iterator itr = m_threatlist.begin(); itr!= m_threatlist.end(); ++itr)
for (std::list<HostilReference*>::iterator itr = m_threatlist.begin(); itr!= m_threatlist.end(); ++itr)
if((*itr)->getTarget()->GetTypeId() == TYPEID_PLAYER && !CheckBoundary((*itr)->getTarget()))
(*itr)->getTarget()->NearTeleportTo(x, y, z, 0);
}
@@ -644,7 +644,7 @@ bool BossAI::CheckBoundary(Unit *who)
if(!boundary || !who)
return true;
for(BossBoundaryMap::const_iterator itr = boundary->begin(); itr != boundary->end(); ++itr)
for (BossBoundaryMap::const_iterator itr = boundary->begin(); itr != boundary->end(); ++itr)
{
switch(itr->first)
{
@@ -718,7 +718,7 @@ void LoadOverridenSQLData()
void LoadOverridenDBCData()
{
SpellEntry *spellInfo;
for(uint32 i = 0; i < GetSpellStore()->GetNumRows(); ++i)
for (uint32 i = 0; i < GetSpellStore()->GetNumRows(); ++i)
{
spellInfo = GET_SPELL(i);
if(!spellInfo)
@@ -749,7 +749,6 @@ void LoadOverridenDBCData()
}
}
Creature* GetClosestCreatureWithEntry(WorldObject* pSource, uint32 Entry, float MaxSearchRange)
{
Creature* pCreature = NULL;
src/bindings/scripts/include/sc_creature.h
-1
View File
@@ -180,7 +180,6 @@ struct TRINITY_DLL_DECL Scripted_NoMovementAI : public ScriptedAI
{
Scripted_NoMovementAI(Creature* creature) : ScriptedAI(creature) {}
//Called at each attack of m_creature by any victim
void AttackStart(Unit* who);
};
src/bindings/scripts/scripts/custom/npc_wyrmresttempel_taxi.cpp
-4
View File
@@ -26,7 +26,6 @@ bool GossipSelect_npc_wyrmresttempel_middle_taxi(Player* pPlayer, Creature* pCre
pPlayer->GetSession()->SendDoFlight(6376, 881);
}
if (uiAction == GOSSIP_ACTION_INFO_DEF + 2)
{
pPlayer->GetSession()->SendDoFlight(6376, 882);
@@ -46,8 +45,6 @@ pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MIDDLE, GOSSIP_SENDER_MAIN, GO
return true;
}
bool GossipSelect_npc_wyrmresttempel_bottom_taxi(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction)
{
if (uiAction == GOSSIP_ACTION_INFO_DEF + 4)
@@ -55,7 +52,6 @@ bool GossipSelect_npc_wyrmresttempel_bottom_taxi(Player* pPlayer, Creature* pCre
pPlayer->GetSession()->SendDoFlight(6376, 878);
}
if (uiAction == GOSSIP_ACTION_INFO_DEF + 3)
{
pPlayer->GetSession()->SendDoFlight(6376, 883);
src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp
+2 -2
View File
@@ -148,7 +148,7 @@ struct TRINITY_DLL_DECL npc_grimstoneAI : public npc_escortAI
MobCount = 0;
MobDeath_Timer = 0;
for(uint8 i = 0; i < MAX_MOB_AMOUNT; ++i)
for (uint8 i = 0; i < MAX_MOB_AMOUNT; ++i)
RingMobGUID[i] = 0;
RingBossGUID = 0;
@@ -241,7 +241,7 @@ struct TRINITY_DLL_DECL npc_grimstoneAI : public npc_escortAI
return;
}
for(uint8 i = 0; i < MAX_MOB_AMOUNT; ++i)
for (uint8 i = 0; i < MAX_MOB_AMOUNT; ++i)
{
Creature *mob = Unit::GetCreature(*m_creature,RingMobGUID[i]);
if (mob && !mob->isAlive() && mob->isDead())
src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/instance_blackrock_depths.cpp
+3 -3
View File
@@ -138,7 +138,7 @@ struct TRINITY_DLL_DECL instance_blackrock_depths : public ScriptedInstance
TombTimer = TIMER_TOMBOFTHESEVEN;
TombEventCounter = 0;
for(uint8 i = 0; i < 7; ++i)
for (uint8 i = 0; i < 7; ++i)
TombBossGUIDs[i] = 0;
}
@@ -324,7 +324,7 @@ struct TRINITY_DLL_DECL instance_blackrock_depths : public ScriptedInstance
loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3]
>> m_auiEncounter[4] >> m_auiEncounter[5] >> GhostKillCount;
for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
if (m_auiEncounter[i] == IN_PROGRESS)
m_auiEncounter[i] = NOT_STARTED;
if (GhostKillCount > 0 && GhostKillCount < 7)
@@ -353,7 +353,7 @@ struct TRINITY_DLL_DECL instance_blackrock_depths : public ScriptedInstance
{
HandleGameObject(GoTombExitGUID,false);//event reseted, close exit door
HandleGameObject(GoTombEnterGUID,true);//event reseted, open entrance door
for(uint8 i = 0; i < 7; ++i)
for (uint8 i = 0; i < 7; ++i)
{
if (Creature* boss = instance->GetCreature(TombBossGUIDs[i]))
{
src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_chromaggus.cpp
+1 -1
View File
@@ -247,7 +247,7 @@ struct TRINITY_DLL_DECL boss_chromaggusAI : public ScriptedAI
std::list<HostilReference*>::iterator i;
for (i = m_creature->getThreatManager().getThreatList().begin();i != m_creature->getThreatManager().getThreatList().end();)
for (i = m_creature->getThreatManager().getThreatList().begin(); i != m_creature->getThreatManager().getThreatList().end(); )
{
Unit* pUnit = NULL;
pUnit = Unit::GetUnit((*m_creature), (*i)->getUnitGuid());
src/bindings/scripts/scripts/eastern_kingdoms/eversong_woods.cpp
+1 -3
View File
@@ -182,7 +182,6 @@ struct TRINITY_DLL_DECL npc_secondTrialAI : public ScriptedAI
uint32 timerJudLight;
uint32 timerCommand;
void Reset() {
timer = 2000;
@@ -388,7 +387,6 @@ struct TRINITY_DLL_DECL master_kelerun_bloodmournAI : public ScriptedAI
void SummonedCreatureDespawn(Creature* c) {}
};
bool GossipHello_master_kelerun_bloodmourn(Player* pPlayer, Creature* pCreature)
{
// quest only available if not already started
@@ -442,7 +440,7 @@ void npc_secondTrialAI::JustDied(Unit* Killer) {
if (Group *pGroup = CAST_PLR(Killer)->GetGroup())
{
for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
for (GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
{
Player *pGroupGuy = itr->getSource();
src/bindings/scripts/scripts/eastern_kingdoms/hinterlands.cpp
+3 -3
View File
@@ -79,7 +79,7 @@ struct MANGOS_DLL_DECL npc_00x09hlAI : public npc_escortAI
switch(uiPointId)
{
case 27:
for(uint8 i = 0; i < 3; ++i)
for (uint8 i = 0; i < 3; ++i)
{
const Position src = {147.927444f, -3851.513428f, 130.893f, 0};
Position pos;
@@ -88,7 +88,7 @@ struct MANGOS_DLL_DECL npc_00x09hlAI : public npc_escortAI
}
break;
case 44:
for(uint8 i = 0; i < 3; ++i)
for (uint8 i = 0; i < 3; ++i)
{
const Position src = {-141.151581f, -4291.213867f, 120.130f, 0};
Position dst;
@@ -231,7 +231,7 @@ struct TRINITY_DLL_DECL npc_rinjiAI : public npc_escortAI
m_afAmbushSpawn[m_iSpawnId].m_fX, m_afAmbushSpawn[m_iSpawnId].m_fY, m_afAmbushSpawn[m_iSpawnId].m_fZ, 0.0f,
TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000);
for(int i = 0; i < 2; ++i)
for (int i = 0; i < 2; ++i)
{
m_creature->SummonCreature(NPC_OUTRUNNER,
m_afAmbushSpawn[m_iSpawnId].m_fX, m_afAmbushSpawn[m_iSpawnId].m_fY, m_afAmbushSpawn[m_iSpawnId].m_fZ, 0.0f,
src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_midnight.cpp
+1 -1
View File
@@ -246,7 +246,7 @@ struct TRINITY_DLL_DECL boss_attumenAI : public ScriptedAI
Unit *target;
std::list<HostilReference *> t_list = m_creature->getThreatManager().getThreatList();
std::vector<Unit *> target_list;
for(std::list<HostilReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr)
for (std::list<HostilReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr)
{
target = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid());
if (target && !target->IsWithinDist(m_creature, ATTACK_DISTANCE, false))
src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_moroes.cpp
+9 -10
View File
@@ -62,7 +62,7 @@ struct TRINITY_DLL_DECL boss_moroesAI : public ScriptedAI
{
boss_moroesAI(Creature *c) : ScriptedAI(c)
{
for(uint8 i = 0; i < 4; ++i)
for (uint8 i = 0; i < 4; ++i)
{
AddId[i] = 0;
}
@@ -158,15 +158,14 @@ struct TRINITY_DLL_DECL boss_moroesAI : public ScriptedAI
Creature *pCreature = NULL;
std::vector<uint32> AddList;
for(uint8 i = 0; i < 6; ++i)
for (uint8 i = 0; i < 6; ++i)
AddList.push_back(Adds[i]);
while(AddList.size() > 4)
AddList.erase((AddList.begin())+(rand()%AddList.size()));
uint8 i = 0;
for(std::vector<uint32>::iterator itr = AddList.begin(); itr != AddList.end(); ++itr)
for (std::vector<uint32>::iterator itr = AddList.begin(); itr != AddList.end(); ++itr)
{
uint32 entry = *itr;
@@ -180,7 +179,7 @@ struct TRINITY_DLL_DECL boss_moroesAI : public ScriptedAI
}
}else
{
for(uint8 i = 0; i < 4; ++i)
for (uint8 i = 0; i < 4; ++i)
{
Creature *pCreature = m_creature->SummonCreature(AddId[i], Locations[i][0], Locations[i][1], POS_Z, Locations[i][2], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
if (pCreature)
@@ -193,7 +192,7 @@ struct TRINITY_DLL_DECL boss_moroesAI : public ScriptedAI
bool isAddlistEmpty()
{
for(uint8 i = 0; i < 4; ++i)
for (uint8 i = 0; i < 4; ++i)
{
if (AddId[i] == 0)
return true;
@@ -203,7 +202,7 @@ struct TRINITY_DLL_DECL boss_moroesAI : public ScriptedAI
void DeSpawnAdds()
{
for(uint8 i = 0; i < 4 ; ++i)
for (uint8 i = 0; i < 4 ; ++i)
{
Creature* Temp = NULL;
if (AddGUID[i])
@@ -217,7 +216,7 @@ struct TRINITY_DLL_DECL boss_moroesAI : public ScriptedAI
void AddsAttack()
{
for(uint8 i = 0; i < 4; ++i)
for (uint8 i = 0; i < 4; ++i)
{
Creature* Temp = NULL;
if (AddGUID[i])
@@ -323,7 +322,7 @@ struct TRINITY_DLL_DECL boss_moroes_guestAI : public ScriptedAI
boss_moroes_guestAI(Creature* c) : ScriptedAI(c)
{
for(uint8 i = 0; i < 4; ++i)
for (uint8 i = 0; i < 4; ++i)
GuestGUID[i] = 0;
pInstance = c->GetInstanceData();
@@ -344,7 +343,7 @@ struct TRINITY_DLL_DECL boss_moroes_guestAI : public ScriptedAI
Creature* Moroes = (Unit::GetCreature((*m_creature), GuestGUID[0]));
if (Moroes)
{
for(uint8 i = 0; i < 3; ++i)
for (uint8 i = 0; i < 3; ++i)
{
uint64 GUID = CAST_AI(boss_moroesAI, Moroes->AI())->AddGUID[i];
if (GUID && GUID != m_creature->GetGUID())
src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_netherspite.cpp
+7 -7
View File
@@ -62,14 +62,14 @@ struct TRINITY_DLL_DECL boss_netherspiteAI : public ScriptedAI
{
pInstance = c->GetInstanceData();
for(int i=0; i<3; ++i)
for (int i=0; i<3; ++i)
{
PortalGUID[i] = 0;
BeamTarget[i] = 0;
BeamerGUID[i] = 0;
}
// need core fix
for(int i=0; i<3; ++i)
for (int i=0; i<3; ++i)
{
if(SpellEntry *spell = (SpellEntry*)GetSpellStore()->LookupEntry(PlayerBuff[i]))
spell->AttributesEx |= SPELL_ATTR_EX_NEGATIVE;
@@ -134,7 +134,7 @@ struct TRINITY_DLL_DECL boss_netherspiteAI : public ScriptedAI
pos[GREEN_PORTAL] = (r%2 ? 0: (r>1 ? 2: 1));
pos[BLUE_PORTAL] = (r>1 ? 1: 2); // Blue Portal not on the left side (0)
for(int i=0; i<3; ++i)
for (int i=0; i<3; ++i)
if(Creature *portal = m_creature->SummonCreature(PortalID[i],PortalCoord[pos[i]][0],PortalCoord[pos[i]][1],PortalCoord[pos[i]][2],0,TEMPSUMMON_TIMED_DESPAWN,60000))
{
PortalGUID[i] = portal->GetGUID();
@@ -144,7 +144,7 @@ struct TRINITY_DLL_DECL boss_netherspiteAI : public ScriptedAI
void DestroyPortals()
{
for(int i=0; i<3; ++i)
for (int i=0; i<3; ++i)
{
if(Creature *portal = Unit::GetCreature(*m_creature, PortalGUID[i]))
portal->DisappearAndDie();
@@ -157,7 +157,7 @@ struct TRINITY_DLL_DECL boss_netherspiteAI : public ScriptedAI
void UpdatePortals() // Here we handle the beams' behavior
{
for(int j=0; j<3; ++j) // j = color
for (int j=0; j<3; ++j) // j = color
if(Creature *portal = Unit::GetCreature(*m_creature, PortalGUID[j]))
{
// the one who's been casted upon before
@@ -170,7 +170,7 @@ struct TRINITY_DLL_DECL boss_netherspiteAI : public ScriptedAI
Map::PlayerList const& players = map->GetPlayers();
// get the best suitable target
for(Map::PlayerList::const_iterator i = players.begin(); i!=players.end(); ++i)
for (Map::PlayerList::const_iterator i = players.begin(); i!=players.end(); ++i)
{
Player* p = i->getSource();
if(p && p->isAlive() // alive
@@ -235,7 +235,7 @@ struct TRINITY_DLL_DECL boss_netherspiteAI : public ScriptedAI
PortalPhase = false;
DoScriptText(EMOTE_PHASE_BANISH,m_creature);
for(int i=0; i<3; ++i)
for (int i=0; i<3; ++i)
m_creature->RemoveAurasDueToSpell(NetherBuff[i]);
}
src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp
+11 -11
View File
@@ -188,10 +188,10 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
InfernalCleanup();
positions.clear();
for(uint8 i =0; i < 5; ++i)
for (uint8 i =0; i < 5; ++i)
enfeeble_targets[i] = 0;
for(uint8 i = 0; i < TOTAL_INFERNAL_POINTS; ++i)
for (uint8 i = 0; i < TOTAL_INFERNAL_POINTS; ++i)
positions.push_back(&InfernalPoints[i]);
EnfeebleTimer = 30000;
@@ -224,7 +224,7 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
InfernalCleanup();
positions.clear();
for(uint8 i = 0; i < TOTAL_INFERNAL_POINTS; ++i)
for (uint8 i = 0; i < TOTAL_INFERNAL_POINTS; ++i)
positions.push_back(&InfernalPoints[i]);
if (pInstance)
@@ -242,7 +242,7 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
void InfernalCleanup()
{
//Infernal Cleanup
for(std::vector<uint64>::iterator itr = infernals.begin(); itr!= infernals.end(); ++itr)
for (std::vector<uint64>::iterator itr = infernals.begin(); itr!= infernals.end(); ++itr)
{
Unit *pInfernal = Unit::GetUnit(*m_creature, *itr);
if (pInfernal && pInfernal->isAlive())
@@ -256,7 +256,7 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
void AxesCleanup()
{
for(uint8 i=0; i<2; ++i)
for (uint8 i=0; i<2; ++i)
{
Unit *axe = Unit::GetUnit(*m_creature, axes[i]);
if (axe && axe->isAlive())
@@ -291,7 +291,7 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
//begin + 1 , so we don't target the one with the highest threat
std::list<HostilReference *>::iterator itr = t_list.begin();
std::advance(itr, 1);
for(; itr!= t_list.end(); ++itr) //store the threat list in a different container
for (; itr!= t_list.end(); ++itr) //store the threat list in a different container
{
Unit *target = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid());
//only on alive players
@@ -304,7 +304,7 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
targets.erase(targets.begin()+rand()%targets.size());
int i = 0;
for(std::vector<Unit *>::iterator iter = targets.begin(); iter!= targets.end(); ++iter, ++i)
for (std::vector<Unit *>::iterator iter = targets.begin(); iter!= targets.end(); ++iter, ++i)
{
Unit *target = *iter;
if (target)
@@ -321,7 +321,7 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
void EnfeebleResetHealth()
{
for(uint8 i = 0; i < 5; ++i)
for (uint8 i = 0; i < 5; ++i)
{
Unit *target = Unit::GetUnit(*m_creature, enfeeble_targets[i]);
if (target && target->isAlive())
@@ -431,7 +431,7 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
DoScriptText(SAY_AXE_TOSS2, m_creature);
Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0);
for(uint32 i=0; i<2; ++i)
for (uint32 i=0; i<2; ++i)
{
Creature *axe = m_creature->SummonCreature(MALCHEZARS_AXE, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000);
if (axe)
@@ -478,7 +478,7 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0);
if (target)
{
for(uint8 i = 0; i < 2; ++i)
for (uint8 i = 0; i < 2; ++i)
{
Unit *axe = Unit::GetUnit(*m_creature, axes[i]);
if (axe)
@@ -570,7 +570,7 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
void Cleanup(Creature *infernal, InfernalPoint *point)
{
for(std::vector<uint64>::iterator itr = infernals.begin(); itr!= infernals.end(); ++itr)
for (std::vector<uint64>::iterator itr = infernals.begin(); itr!= infernals.end(); ++itr)
if (*itr == infernal->GetGUID())
{
infernals.erase(itr);
src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp
+2 -2
View File
@@ -181,7 +181,7 @@ struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI
return;
//store the threat list in a different container
for(std::list<HostilReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr)
for (std::list<HostilReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr)
{
Unit *target = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid());
//only on alive players
@@ -194,7 +194,7 @@ struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI
targets.erase(targets.begin()+rand()%targets.size());
uint32 i = 0;
for(std::vector<Unit*>::iterator itr = targets.begin(); itr!= targets.end(); ++itr)
for (std::vector<Unit*>::iterator itr = targets.begin(); itr!= targets.end(); ++itr)
{
if (*itr)
{
src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_terestian_illhoof.cpp
+3 -3
View File
@@ -167,7 +167,7 @@ struct TRINITY_DLL_DECL boss_terestianAI : public ScriptedAI
{
boss_terestianAI(Creature *c) : ScriptedAI(c)
{
for(uint8 i = 0; i < 2; ++i)
for (uint8 i = 0; i < 2; ++i)
PortalGUID[i] = 0;
pInstance = c->GetInstanceData();
}
@@ -187,7 +187,7 @@ struct TRINITY_DLL_DECL boss_terestianAI : public ScriptedAI
void Reset()
{
for(uint8 i = 0; i < 2; ++i)
for (uint8 i = 0; i < 2; ++i)
{
if (PortalGUID[i])
{
@@ -253,7 +253,7 @@ struct TRINITY_DLL_DECL boss_terestianAI : public ScriptedAI
void JustDied(Unit *killer)
{
for(uint8 i = 0; i < 2; ++i)
for (uint8 i = 0; i < 2; ++i)
{
if (PortalGUID[i])
{
src/bindings/scripts/scripts/eastern_kingdoms/karazhan/def_karazhan.h
-1
View File
@@ -2,7 +2,6 @@
* This program is free software licensed under GPL version 2
* Please see the included DOCS/LICENSE.TXT for more information */
#ifndef DEF_KARAZHAN_H
#define DEF_KARAZHAN_H
src/bindings/scripts/scripts/eastern_kingdoms/karazhan/instance_karazhan.cpp
+1 -1
View File
@@ -286,7 +286,7 @@ struct TRINITY_DLL_DECL instance_karazhan : public ScriptedInstance
loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3]
>> m_auiEncounter[4] >> m_auiEncounter[5] >> m_auiEncounter[6] >> m_auiEncounter[7]
>> m_auiEncounter[8] >> m_auiEncounter[9] >> m_auiEncounter[10] >> m_auiEncounter[11];
for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
if (m_auiEncounter[i] == IN_PROGRESS) // Do not load an encounter as "In Progress" - reset it instead.
m_auiEncounter[i] = NOT_STARTED;
OUT_LOAD_INST_DATA_COMPLETE;
src/bindings/scripts/scripts/eastern_kingdoms/karazhan/karazhan.cpp
+2 -3
View File
@@ -240,7 +240,7 @@ struct TRINITY_DLL_DECL npc_barnesAI : public npc_escortAI
break;
}
for(; index < count; ++index)
for (; index < count; ++index)
{
uint32 entry = ((uint32)Spawns[index][0]);
float PosX = Spawns[index][1];
@@ -294,7 +294,7 @@ struct TRINITY_DLL_DECL npc_barnesAI : public npc_escortAI
return;
RaidWiped = true;
for(Map::PlayerList::const_iterator i = PlayerList.begin();i != PlayerList.end(); ++i)
for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
{
if (i->getSource()->isAlive() && !i->getSource()->isGameMaster())
{
@@ -507,7 +507,6 @@ struct TRINITY_DLL_DECL npc_image_of_medivhAI : public ScriptedAI
YellTimer = 10000;
}
uint32 NextStep(uint32 Step)
{
Unit* arca = Unit::GetUnit((*m_creature),ArcanagosGUID);
src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp
+2 -4
View File
@@ -181,7 +181,7 @@ struct TRINITY_DLL_DECL boss_felblood_kaelthasAI : public ScriptedAI
std::list<HostilReference*>& m_threatlist = m_creature->getThreatManager().getThreatList();
std::list<HostilReference*>::iterator i = m_threatlist.begin();
for(i = m_threatlist.begin(); i != m_threatlist.end(); ++i)
for (i = m_threatlist.begin(); i != m_threatlist.end(); ++i)
{
Unit* pUnit = Unit::GetUnit((*m_creature), (*i)->getUnitGuid());
if (pUnit && pUnit->isAlive())
@@ -383,8 +383,7 @@ struct TRINITY_DLL_DECL boss_felblood_kaelthasAI : public ScriptedAI
GravityLapseTimer = 30000;
GravityLapsePhase = 4;
for(uint8 i = 0; i < 3; ++i)
for (uint8 i = 0; i < 3; ++i)
{
Unit* target = NULL;
target = SelectUnit(SELECT_TARGET_RANDOM,0);
@@ -542,7 +541,6 @@ struct TRINITY_DLL_DECL mob_felkael_phoenixAI : public ScriptedAI
}else Death_Timer -= diff;
}
}
if (!UpdateVictim())
src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp
+10 -10
View File
@@ -135,7 +135,7 @@ struct TRINITY_DLL_DECL boss_priestess_delrissaAI : public ScriptedAI
{
DoScriptText(SAY_AGGRO, m_creature);
for(uint8 i = 0; i < MAX_ACTIVE_LACKEY; ++i)
for (uint8 i = 0; i < MAX_ACTIVE_LACKEY; ++i)
{
if (Unit* pAdd = Unit::GetUnit(*m_creature, m_auiLackeyGUID[i]))
{
@@ -166,7 +166,7 @@ struct TRINITY_DLL_DECL boss_priestess_delrissaAI : public ScriptedAI
LackeyEntryList.resize((sizeof(m_auiAddEntries) / sizeof(uint32)));
//fill vector array with entries from Creature array
for(uint8 i = 0; i < LackeyEntryList.size(); ++i)
for (uint8 i = 0; i < LackeyEntryList.size(); ++i)
LackeyEntryList[i] = m_auiAddEntries[i];
//remove random entries
@@ -174,7 +174,7 @@ struct TRINITY_DLL_DECL boss_priestess_delrissaAI : public ScriptedAI
LackeyEntryList.erase(LackeyEntryList.begin() + rand()%LackeyEntryList.size());
//summon all the remaining in vector
for(std::vector<uint32>::iterator itr = LackeyEntryList.begin(); itr != LackeyEntryList.end(); ++itr)
for (std::vector<uint32>::iterator itr = LackeyEntryList.begin(); itr != LackeyEntryList.end(); ++itr)
{
if (Creature* pAdd = m_creature->SummonCreature((*itr), LackeyLocations[j][0], LackeyLocations[j][1], fZLocation, fOrientation, TEMPSUMMON_CORPSE_DESPAWN, 0))
m_auiLackeyGUID[j] = pAdd->GetGUID();
@@ -184,7 +184,7 @@ struct TRINITY_DLL_DECL boss_priestess_delrissaAI : public ScriptedAI
}
else
{
for(std::vector<uint32>::iterator itr = LackeyEntryList.begin(); itr != LackeyEntryList.end(); ++itr)
for (std::vector<uint32>::iterator itr = LackeyEntryList.begin(); itr != LackeyEntryList.end(); ++itr)
{
Unit* pAdd = Unit::GetUnit(*m_creature, m_auiLackeyGUID[j]);
@@ -247,7 +247,7 @@ struct TRINITY_DLL_DECL boss_priestess_delrissaAI : public ScriptedAI
{
uint32 health = m_creature->GetHealth();
Unit* target = m_creature;
for(uint8 i = 0; i < MAX_ACTIVE_LACKEY; ++i)
for (uint8 i = 0; i < MAX_ACTIVE_LACKEY; ++i)
{
if (Unit* pAdd = Unit::GetUnit(*m_creature, m_auiLackeyGUID[i]))
{
@@ -386,7 +386,7 @@ struct TRINITY_DLL_DECL boss_priestess_lackey_commonAI : public ScriptedAI
if (pInstance)
{
for(uint8 i = 0; i < MAX_ACTIVE_LACKEY; ++i)
for (uint8 i = 0; i < MAX_ACTIVE_LACKEY; ++i)
{
if (Unit* pAdd = Unit::GetUnit(*m_creature, m_auiLackeyGUIDs[i]))
{
@@ -457,7 +457,7 @@ struct TRINITY_DLL_DECL boss_priestess_lackey_commonAI : public ScriptedAI
if (Creature* Delrissa = (Unit::GetCreature(*m_creature, pInstance->GetData64(DATA_DELRISSA))))
{
for(uint8 i = 0; i < MAX_ACTIVE_LACKEY; ++i)
for (uint8 i = 0; i < MAX_ACTIVE_LACKEY; ++i)
m_auiLackeyGUIDs[i] = CAST_AI(boss_priestess_delrissaAI, Delrissa->AI())->m_auiLackeyGUID[i];
}
}
@@ -810,7 +810,7 @@ struct TRINITY_DLL_DECL boss_yazzaiAI : public boss_priestess_lackey_commonAI
{
bool InMeleeRange = false;
std::list<HostilReference*>& t_list = m_creature->getThreatManager().getThreatList();
for(std::list<HostilReference*>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr)
for (std::list<HostilReference*>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr)
{
if (Unit* target = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()))
{
@@ -890,7 +890,7 @@ struct TRINITY_DLL_DECL boss_warlord_salarisAI : public boss_priestess_lackey_co
{
bool InMeleeRange = false;
std::list<HostilReference*>& t_list = m_creature->getThreatManager().getThreatList();
for(std::list<HostilReference*>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr)
for (std::list<HostilReference*>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr)
{
if (Unit* target = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()))
{
@@ -1218,7 +1218,7 @@ struct TRINITY_DLL_DECL boss_zelfanAI : public boss_priestess_lackey_commonAI
if (Recombobulate_Timer < diff)
{
for(uint8 i = 0; i < MAX_ACTIVE_LACKEY; ++i)
for (uint8 i = 0; i < MAX_ACTIVE_LACKEY; ++i)
{
if (Unit* pAdd = Unit::GetUnit(*m_creature, m_auiLackeyGUIDs[i]))
{
src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp
+7 -7
View File
@@ -60,7 +60,7 @@ struct TRINITY_DLL_DECL boss_selin_fireheartAI : public ScriptedAI
if (pInstance)
{
uint32 size = pInstance->GetData(DATA_FEL_CRYSTAL_SIZE);
for(uint8 i = 0; i < size; ++i)
for (uint8 i = 0; i < size; ++i)
{
uint64 guid = pInstance->GetData64(DATA_FEL_CRYSTAL);
debug_log("TSCR: Selin: Adding Fel Crystal %u to list", guid);
@@ -90,8 +90,8 @@ struct TRINITY_DLL_DECL boss_selin_fireheartAI : public ScriptedAI
{
if (pInstance)
{
//for(uint8 i = 0; i < CRYSTALS_NUMBER; ++i)
for(std::list<uint64>::iterator itr = Crystals.begin(); itr != Crystals.end(); ++itr)
//for (uint8 i = 0; i < CRYSTALS_NUMBER; ++i)
for (std::list<uint64>::iterator itr = Crystals.begin(); itr != Crystals.end(); ++itr)
{
//Unit* pUnit = Unit::GetUnit(*m_creature, FelCrystals[i]);
Unit* pUnit = Unit::GetUnit(*m_creature, *itr);
@@ -133,8 +133,8 @@ struct TRINITY_DLL_DECL boss_selin_fireheartAI : public ScriptedAI
CrystalGUID = 0;
Unit* pCrystal = NULL;
Unit* CrystalChosen = NULL;
//for(uint8 i = 0; i < CRYSTALS_NUMBER; ++i)
for(std::list<uint64>::iterator itr = Crystals.begin(); itr != Crystals.end(); ++itr)
//for (uint8 i = 0; i < CRYSTALS_NUMBER; ++i)
for (std::list<uint64>::iterator itr = Crystals.begin(); itr != Crystals.end(); ++itr)
{
pCrystal = NULL;
//pCrystal = Unit::GetUnit(*m_creature, FelCrystals[i]);
@@ -170,8 +170,8 @@ struct TRINITY_DLL_DECL boss_selin_fireheartAI : public ScriptedAI
if (Crystals.empty())
return;
//for(uint8 i = 0; i < CRYSTALS_NUMBER; ++i)
for(std::list<uint64>::iterator itr = Crystals.begin(); itr != Crystals.end(); ++itr)
//for (uint8 i = 0; i < CRYSTALS_NUMBER; ++i)
for (std::list<uint64>::iterator itr = Crystals.begin(); itr != Crystals.end(); ++itr)
{
//Creature* pCrystal = (Unit::GetCreature(*m_creature, FelCrystals[i]));
Creature* pCrystal = Unit::GetCreature(*m_creature, *itr);
src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/instance_magisters_terrace.cpp
+1 -1
View File
@@ -77,7 +77,7 @@ struct TRINITY_DLL_DECL instance_magisters_terrace : public ScriptedInstance
bool IsEncounterInProgress() const
{
for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
if (m_auiEncounter[i] == IN_PROGRESS)
return true;
return false;
src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.cpp
+1 -1
View File
@@ -88,7 +88,7 @@ struct TRINITY_DLL_DECL npc_kalecgosAI : public ScriptedAI
SpellEntry const* pSpell = GetSpellStore()->LookupEntry(SPELL_ORB_KILL_CREDIT);
for(Map::PlayerList::const_iterator i = lList.begin(); i != lList.end(); ++i)
for (Map::PlayerList::const_iterator i = lList.begin(); i != lList.end(); ++i)
{
if (Player* pPlayer = i->getSource())
{
src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_ragnaros.cpp
+2 -2
View File
@@ -220,7 +220,7 @@ struct TRINITY_DLL_DECL boss_ragnarosAI : public ScriptedAI
DoScriptText(SAY_REINFORCEMENTS1, m_creature);
// summon 10 elementals
for(uint8 i = 0; i < 9; ++i)
for (uint8 i = 0; i < 9; ++i)
{
if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
{
@@ -239,7 +239,7 @@ struct TRINITY_DLL_DECL boss_ragnarosAI : public ScriptedAI
{
DoScriptText(SAY_REINFORCEMENTS2, m_creature);
for(uint8 i = 0; i < 9; ++i)
for (uint8 i = 0; i < 9; ++i)
{
if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
{
src/bindings/scripts/scripts/eastern_kingdoms/molten_core/instance_molten_core.cpp
-2
View File
@@ -93,7 +93,6 @@ struct TRINITY_DLL_DECL instance_molten_core : public ScriptedInstance
return false;
};
void OnGameObjectCreate(GameObject* pGo, bool add)
{
switch(pGo->GetEntry())
@@ -125,7 +124,6 @@ struct TRINITY_DLL_DECL instance_molten_core : public ScriptedInstance
}
}
void OnCreatureCreate(Creature* pCreature, bool add)
{
switch (pCreature->GetEntry())
src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp
+2 -2
View File
@@ -204,7 +204,7 @@ void npc_unworthy_initiateAI::UpdateAI(const uint32 diff)
float dist = 99.0f;
GameObject *prison = NULL;
for(uint8 i = 0; i < 12; ++i)
for (uint8 i = 0; i < 12; ++i)
{
if (GameObject* temp_prison = me->FindNearestGameObject(acherus_soul_prison[i],30))
{
@@ -733,7 +733,7 @@ struct TRINITY_DLL_DECL npc_scarlet_ghoulAI : public ScriptedAI
if (!MinionList.empty())
{
for(std::list<Creature*>::iterator itr = MinionList.begin(); itr != MinionList.end(); ++itr)
for (std::list<Creature*>::iterator itr = MinionList.begin(); itr != MinionList.end(); ++itr)
{
if (CAST_CRE(*itr)->GetOwner()->GetGUID() == m_creature->GetOwner()->GetGUID())
{
src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter2.cpp
+1 -2
View File
@@ -241,7 +241,7 @@ struct TRINITY_DLL_DECL npc_koltira_deathweaverAI : public npc_escortAI
void SummonAcolyte(uint32 uiAmount)
{
for(uint32 i = 0; i < uiAmount; ++i)
for (uint32 i = 0; i < uiAmount; ++i)
me->SummonCreature(NPC_CRIMSON_ACOLYTE, 1642.329, -6045.818, 127.583, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
}
@@ -490,7 +490,6 @@ CreatureAI* GetAI_mob_high_inquisitor_valroth(Creature* pCreature)
return new mob_high_inquisitor_valrothAI (pCreature);
}
/*######
## npc_a_special_surprise
######*/
src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter5.cpp
+31 -31
View File
@@ -242,7 +242,7 @@ void UpdateWorldState(Map *map, uint32 id, uint32 state)
if (!players.isEmpty())
{
for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
{
if (Player* pPlayer = itr->getSource())
pPlayer->SendUpdateWorldState(id,state);
@@ -376,13 +376,13 @@ struct TRINITY_DLL_DECL npc_highlord_darion_mograineAI : public npc_escortAI
uiEligorGUID = NULL;
uiRayneGUID = NULL;
for(uint8 i = 0; i < ENCOUNTER_DEFENDER_NUMBER; ++i)
for (uint8 i = 0; i < ENCOUNTER_DEFENDER_NUMBER; ++i)
{
if (Creature* pTemp = Unit::GetCreature(*me, uiDefenderGUID[i]))
pTemp->setDeathState(JUST_DIED);
uiDefenderGUID[i] = 0;
}
for(uint8 i = 0; i < ENCOUNTER_EARTHSHATTER_NUMBER; ++i)
for (uint8 i = 0; i < ENCOUNTER_EARTHSHATTER_NUMBER; ++i)
{
if (Creature* pTemp = Unit::GetCreature(*me, uiEarthshatterGUID[i]))
pTemp->setDeathState(JUST_DIED);
@@ -402,25 +402,25 @@ struct TRINITY_DLL_DECL npc_highlord_darion_mograineAI : public npc_escortAI
uiOrbazGUID = NULL;
uiThassarianGUID = NULL;
uiLichKingGUID = NULL;
for(uint8 i = 0; i < ENCOUNTER_ABOMINATION_NUMBER; ++i)
for (uint8 i = 0; i < ENCOUNTER_ABOMINATION_NUMBER; ++i)
{
if (Creature* pTemp = Unit::GetCreature(*me, uiAbominationGUID[i]))
pTemp->setDeathState(JUST_DIED);
uiAbominationGUID[i] = 0;
}
for(uint8 i = 0; i < ENCOUNTER_BEHEMOTH_NUMBER; ++i)
for (uint8 i = 0; i < ENCOUNTER_BEHEMOTH_NUMBER; ++i)
{
if (Creature* pTemp = Unit::GetCreature(*me, uiBehemothGUID[i]))
pTemp->setDeathState(JUST_DIED);
uiBehemothGUID[i] = 0;
}
for(uint8 i = 0; i < ENCOUNTER_GHOUL_NUMBER; ++i)
for (uint8 i = 0; i < ENCOUNTER_GHOUL_NUMBER; ++i)
{
if (Creature* pTemp = Unit::GetCreature(*me, uiGhoulGUID[i]))
pTemp->setDeathState(JUST_DIED);
uiGhoulGUID[i] = 0;
}
for(uint8 i = 0; i < ENCOUNTER_WARRIOR_NUMBER; ++i)
for (uint8 i = 0; i < ENCOUNTER_WARRIOR_NUMBER; ++i)
{
if (Creature* pTemp = Unit::GetCreature(*me, uiWarriorGUID[i]))
pTemp->setDeathState(JUST_DIED);
@@ -478,13 +478,13 @@ struct TRINITY_DLL_DECL npc_highlord_darion_mograineAI : public npc_escortAI
if (Creature* pTemp = Unit::GetCreature(*me, uiMaxwellGUID))
DoScriptText(SAY_LIGHT_OF_DAWN08, pTemp);
for(uint8 i = 0; i < ENCOUNTER_GHOUL_NUMBER; ++i)
for (uint8 i = 0; i < ENCOUNTER_GHOUL_NUMBER; ++i)
NPCChangeTarget(uiGhoulGUID[i]);
for(uint8 i = 0; i < ENCOUNTER_WARRIOR_NUMBER; ++i)
for (uint8 i = 0; i < ENCOUNTER_WARRIOR_NUMBER; ++i)
NPCChangeTarget(uiWarriorGUID[i]);
for(uint8 i = 0; i < ENCOUNTER_ABOMINATION_NUMBER; ++i)
for (uint8 i = 0; i < ENCOUNTER_ABOMINATION_NUMBER; ++i)
NPCChangeTarget(uiAbominationGUID[i]);
for(uint8 i = 0; i < ENCOUNTER_BEHEMOTH_NUMBER; ++i)
for (uint8 i = 0; i < ENCOUNTER_BEHEMOTH_NUMBER; ++i)
NPCChangeTarget(uiBehemothGUID[i]);
NPCChangeTarget(uiKoltiraGUID);
NPCChangeTarget(uiOrbazGUID);
@@ -710,16 +710,16 @@ struct TRINITY_DLL_DECL npc_highlord_darion_mograineAI : public npc_escortAI
pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z);
}
for(uint8 i = 0; i < ENCOUNTER_ABOMINATION_NUMBER; ++i)
for (uint8 i = 0; i < ENCOUNTER_ABOMINATION_NUMBER; ++i)
if (Creature* pTemp = Unit::GetCreature(*me, uiAbominationGUID[i]))
pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z);
for(uint8 i = 0; i < ENCOUNTER_BEHEMOTH_NUMBER; ++i)
for (uint8 i = 0; i < ENCOUNTER_BEHEMOTH_NUMBER; ++i)
if (Creature* pTemp = Unit::GetCreature(*me, uiBehemothGUID[i]))
pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z);
for(uint8 i = 0; i < ENCOUNTER_GHOUL_NUMBER; ++i)
for (uint8 i = 0; i < ENCOUNTER_GHOUL_NUMBER; ++i)
if (Creature* pTemp = Unit::GetCreature(*me, uiGhoulGUID[i]))
pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z);
for(uint8 i = 0; i < ENCOUNTER_WARRIOR_NUMBER; ++i)
for (uint8 i = 0; i < ENCOUNTER_WARRIOR_NUMBER; ++i)
if (Creature* pTemp = Unit::GetCreature(*me, uiWarriorGUID[i]))
pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z);
JumpToNextStep(5000);
@@ -1344,13 +1344,13 @@ struct TRINITY_DLL_DECL npc_highlord_darion_mograineAI : public npc_escortAI
// Check targets
if (uiTargetcheck < diff)
{
for(uint8 i = 0; i < ENCOUNTER_GHOUL_NUMBER; ++i)
for (uint8 i = 0; i < ENCOUNTER_GHOUL_NUMBER; ++i)
NPCChangeTarget(uiGhoulGUID[i]);
for(uint8 i = 0; i < ENCOUNTER_WARRIOR_NUMBER; ++i)
for (uint8 i = 0; i < ENCOUNTER_WARRIOR_NUMBER; ++i)
NPCChangeTarget(uiWarriorGUID[i]);
for(uint8 i = 0; i < ENCOUNTER_ABOMINATION_NUMBER; ++i)
for (uint8 i = 0; i < ENCOUNTER_ABOMINATION_NUMBER; ++i)
NPCChangeTarget(uiAbominationGUID[i]);
for(uint8 i = 0; i < ENCOUNTER_BEHEMOTH_NUMBER; ++i)
for (uint8 i = 0; i < ENCOUNTER_BEHEMOTH_NUMBER; ++i)
NPCChangeTarget(uiBehemothGUID[i]);
NPCChangeTarget(uiKoltiraGUID);
NPCChangeTarget(uiOrbazGUID);
@@ -1384,17 +1384,17 @@ struct TRINITY_DLL_DECL npc_highlord_darion_mograineAI : public npc_escortAI
me->InterruptNonMeleeSpells(false);
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
for(uint8 i = 0; i < ENCOUNTER_DEFENDER_NUMBER; ++i)
for (uint8 i = 0; i < ENCOUNTER_DEFENDER_NUMBER; ++i)
DespawnNPC(uiDefenderGUID[i]);
for(uint8 i = 0; i < ENCOUNTER_EARTHSHATTER_NUMBER; ++i)
for (uint8 i = 0; i < ENCOUNTER_EARTHSHATTER_NUMBER; ++i)
DespawnNPC(uiEarthshatterGUID[i]);
for(uint8 i = 0; i < ENCOUNTER_ABOMINATION_NUMBER; ++i)
for (uint8 i = 0; i < ENCOUNTER_ABOMINATION_NUMBER; ++i)
DespawnNPC(uiAbominationGUID[i]);
for(uint8 i = 0; i < ENCOUNTER_BEHEMOTH_NUMBER; ++i)
for (uint8 i = 0; i < ENCOUNTER_BEHEMOTH_NUMBER; ++i)
DespawnNPC(uiBehemothGUID[i]);
for(uint8 i = 0; i < ENCOUNTER_GHOUL_NUMBER; ++i)
for (uint8 i = 0; i < ENCOUNTER_GHOUL_NUMBER; ++i)
DespawnNPC(uiGhoulGUID[i]);
for(uint8 i = 0; i < ENCOUNTER_WARRIOR_NUMBER; ++i)
for (uint8 i = 0; i < ENCOUNTER_WARRIOR_NUMBER; ++i)
DespawnNPC(uiWarriorGUID[i]);
if (Creature* pTemp = Unit::GetCreature(*me, uiKorfaxGUID))
@@ -1496,7 +1496,7 @@ struct TRINITY_DLL_DECL npc_highlord_darion_mograineAI : public npc_escortAI
Unit* pTemp = NULL;
// Death
for(uint8 i = 0; i < ENCOUNTER_GHOUL_NUMBER; ++i)
for (uint8 i = 0; i < ENCOUNTER_GHOUL_NUMBER; ++i)
{
if (!(pTemp = Unit::GetCreature(*me, uiGhoulGUID[i])))
{
@@ -1505,7 +1505,7 @@ struct TRINITY_DLL_DECL npc_highlord_darion_mograineAI : public npc_escortAI
uiGhoulGUID[i] = pTemp->GetGUID();
}
}
for(uint8 i = 0; i < ENCOUNTER_ABOMINATION_NUMBER; ++i)
for (uint8 i = 0; i < ENCOUNTER_ABOMINATION_NUMBER; ++i)
{
if (!(pTemp = Unit::GetCreature(*me, uiAbominationGUID[i])))
{
@@ -1514,7 +1514,7 @@ struct TRINITY_DLL_DECL npc_highlord_darion_mograineAI : public npc_escortAI
uiAbominationGUID[i] = pTemp->GetGUID();
}
}
for(uint8 i = 0; i < ENCOUNTER_WARRIOR_NUMBER; ++i)
for (uint8 i = 0; i < ENCOUNTER_WARRIOR_NUMBER; ++i)
{
if (!(pTemp = Unit::GetCreature(*me, uiWarriorGUID[i])))
{
@@ -1523,7 +1523,7 @@ struct TRINITY_DLL_DECL npc_highlord_darion_mograineAI : public npc_escortAI
uiWarriorGUID[i] = pTemp->GetGUID();
}
}
for(uint8 i = 0; i < ENCOUNTER_BEHEMOTH_NUMBER; ++i)
for (uint8 i = 0; i < ENCOUNTER_BEHEMOTH_NUMBER; ++i)
{
if (!(pTemp = Unit::GetCreature(*me, uiBehemothGUID[i])))
{
@@ -1534,7 +1534,7 @@ struct TRINITY_DLL_DECL npc_highlord_darion_mograineAI : public npc_escortAI
}
// Dawn
for(uint8 i = 0; i < ENCOUNTER_DEFENDER_NUMBER; ++i)
for (uint8 i = 0; i < ENCOUNTER_DEFENDER_NUMBER; ++i)
{
if (!(pTemp = Unit::GetCreature(*me, uiDefenderGUID[i])))
{
@@ -1544,7 +1544,7 @@ struct TRINITY_DLL_DECL npc_highlord_darion_mograineAI : public npc_escortAI
uiDefenderGUID[i] = pTemp->GetGUID();
}
}
for(uint8 i = 0; i < ENCOUNTER_EARTHSHATTER_NUMBER; ++i)
for (uint8 i = 0; i < ENCOUNTER_EARTHSHATTER_NUMBER; ++i)
{
if (!(pTemp = Unit::GetCreature(*me, uiEarthshatterGUID[i])))
{
src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp
+2 -2
View File
@@ -506,7 +506,7 @@ struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI
std::list<Player*> temp;
std::list<Player*>::iterator j;
for(Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
if ((m_creature->IsWithinLOSInMap(i->getSource()) || !checkLoS) && m_creature->getVictim() != i->getSource() &&
m_creature->IsWithinDistInMap(i->getSource(), range) && i->getSource()->isAlive())
temp.push_back(i->getSource());
@@ -560,7 +560,7 @@ struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI
caster->GetMotionMaster()->MoveFollow(m_creature,6,urand(0,5));
//DoResetThreat();//not sure if need
std::list<HostilReference*>::iterator itr;
for(itr = caster->getThreatManager().getThreatList().begin(); itr != caster->getThreatManager().getThreatList().end(); ++itr)
for (itr = caster->getThreatManager().getThreatList().begin(); itr != caster->getThreatManager().getThreatList().end(); ++itr)
{
Unit* pUnit = Unit::GetUnit((*m_creature), (*itr)->getUnitGuid());
if (pUnit && pUnit->isAlive() && pUnit != caster)
src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_herod.cpp
+1 -2
View File
@@ -47,7 +47,6 @@ struct TRINITY_DLL_DECL boss_herodAI : public ScriptedAI
uint32 Cleave_Timer;
uint32 Whirlwind_Timer;
void Reset()
{
Enrage = false;
@@ -68,7 +67,7 @@ struct TRINITY_DLL_DECL boss_herodAI : public ScriptedAI
void JustDied(Unit* killer)
{
for(uint8 i = 0; i < 20; ++i)
for (uint8 i = 0; i < 20; ++i)
m_creature->SummonCreature(ENTRY_SCARLET_TRAINEE, 1939.18, -431.58, 17.09, 6.22, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000);
}
src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp
-1
View File
@@ -158,7 +158,6 @@ struct TRINITY_DLL_DECL boss_scarlet_commander_mograineAI : public ScriptedAI
}
}
void UpdateAI(const uint32 uiDiff)
{
if (!UpdateVictim())
src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/instance_scarlet_monastery.cpp
+1 -1
View File
@@ -103,7 +103,7 @@ struct TRINITY_DLL_DECL instance_scarlet_monastery : public ScriptedInstance
case DATA_HORSEMAN_EVENT:
if (data == DONE)
{
for(std::set<uint64>::iterator itr = HorsemanAdds.begin(); itr != HorsemanAdds.end(); ++itr)
for (std::set<uint64>::iterator itr = HorsemanAdds.begin(); itr != HorsemanAdds.end(); ++itr)
{
Creature* add = instance->GetCreature(*itr);
if (add && add->isAlive())
src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_jandice_barov.cpp
+1 -4
View File
@@ -119,7 +119,7 @@ struct TRINITY_DLL_DECL boss_jandicebarovAI : public ScriptedAI
//Summon 10 Illusions attacking random gamers
Unit* target = NULL;
for(uint8 i = 0; i < 10; ++i)
for (uint8 i = 0; i < 10; ++i)
{
target = SelectUnit(SELECT_TARGET_RANDOM,0);
if (target)
@@ -132,7 +132,6 @@ struct TRINITY_DLL_DECL boss_jandicebarovAI : public ScriptedAI
Illusion_Timer = 25000;
}else Illusion_Timer -= diff;
// //Illusion_Timer
// if (Illusion_Timer < diff)
// {
@@ -195,7 +194,6 @@ struct TRINITY_DLL_DECL mob_illusionofjandicebarovAI : public ScriptedAI
}
};
CreatureAI* GetAI_boss_jandicebarov(Creature* pCreature)
{
return new boss_jandicebarovAI (pCreature);
@@ -206,7 +204,6 @@ CreatureAI* GetAI_mob_illusionofjandicebarov(Creature* pCreature)
return new mob_illusionofjandicebarovAI (pCreature);
}
void AddSC_boss_jandicebarov()
{
Script *newscript;
src/bindings/scripts/scripts/eastern_kingdoms/scholomance/instance_scholomance.cpp
+1 -1
View File
@@ -65,7 +65,7 @@ struct TRINITY_DLL_DECL instance_scholomance : public ScriptedInstance
GateBarovGUID = 0;
GateIlluciaGUID = 0;
for(uint8 i = 0; i < 6; ++i)
for (uint8 i = 0; i < 6; ++i)
IsBossDied[i] = false;
}
src/bindings/scripts/scripts/eastern_kingdoms/shadowfang_keep/instance_shadowfang_keep.cpp
+1 -1
View File
@@ -182,7 +182,7 @@ struct TRINITY_DLL_DECL instance_shadowfang_keep : public ScriptedInstance
std::istringstream loadStream(in);
loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3];
for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
{
if (m_auiEncounter[i] == IN_PROGRESS)
m_auiEncounter[i] = NOT_STARTED;
src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_cannon_master_willey.cpp
-1
View File
@@ -106,7 +106,6 @@ struct TRINITY_DLL_DECL boss_cannon_master_willeyAI : public ScriptedAI
{
}
void UpdateAI(const uint32 diff)
{
//Return since we have no target
src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_ramstein_the_gorger.cpp
+1 -1
View File
@@ -53,7 +53,7 @@ struct TRINITY_DLL_DECL boss_ramstein_the_gorgerAI : public ScriptedAI
void JustDied(Unit* Killer)
{
for(uint8 i = 0; i < 30; ++i)
for (uint8 i = 0; i < 30; ++i)
{
if (Creature* mob = m_creature->SummonCreature(C_MINDLESS_UNDEAD,3969.35+irand(-10,10),-3391.87+irand(-10,10),119.11,5.91,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,1800000))
mob->AI()->AttackStart(m_creature->SelectNearestTarget(500));
src/bindings/scripts/scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp
+6 -6
View File
@@ -76,10 +76,10 @@ struct TRINITY_DLL_DECL instance_stratholme : public ScriptedInstance
void Initialize()
{
for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
Encounter[i] = NOT_STARTED;
for(uint8 i = 0; i < 5; ++i)
for (uint8 i = 0; i < 5; ++i)
IsSilverHandDead[i] = false;
BaronRun_Timer = 0;
@@ -226,7 +226,7 @@ struct TRINITY_DLL_DECL instance_stratholme : public ScriptedInstance
UpdateGoState(portGauntletGUID,GO_STATE_READY,false);
uint32 count = abomnationGUID.size();
for(std::set<uint64>::iterator i = abomnationGUID.begin(); i != abomnationGUID.end(); ++i)
for (std::set<uint64>::iterator i = abomnationGUID.begin(); i != abomnationGUID.end(); ++i)
{
if (Creature* pAbom = instance->GetCreature(*i))
{
@@ -264,7 +264,7 @@ struct TRINITY_DLL_DECL instance_stratholme : public ScriptedInstance
if (!players.isEmpty())
{
for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
{
if (Player* pPlayer = itr->getSource())
{
@@ -332,7 +332,7 @@ struct TRINITY_DLL_DECL instance_stratholme : public ScriptedInstance
loadStream >> Encounter[0] >> Encounter[1] >> Encounter[2] >> Encounter[3]
>> Encounter[4] >> Encounter[5];
for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
if (Encounter[i] == IN_PROGRESS)
Encounter[i] = NOT_STARTED;
@@ -394,7 +394,7 @@ struct TRINITY_DLL_DECL instance_stratholme : public ScriptedInstance
{
if (Creature* pBaron = instance->GetCreature(baronGUID))
{
for(uint8 i = 0; i < 4; ++i)
for (uint8 i = 0; i < 4; ++i)
pBaron->SummonCreature(C_BLACK_GUARD,4032.84,-3390.24,119.73,4.71,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,1800000);
UpdateGoState(ziggurat4GUID,GO_STATE_ACTIVE,false);
src/bindings/scripts/scripts/eastern_kingdoms/stratholme/stratholme.cpp
+2 -2
View File
@@ -47,7 +47,7 @@ bool GOHello_go_gauntlet_gate(Player* pPlayer, GameObject* pGo)
if (Group *pGroup = pPlayer->GetGroup())
{
for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
for (GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
{
Player* pGroupie = itr->getSource();
if (!pGroupie)
@@ -197,7 +197,7 @@ struct TRINITY_DLL_DECL mobs_spectral_ghostly_citizenAI : public ScriptedAI
{
if (Tagged)
{
for(uint32 i = 1; i <= 4; ++i)
for (uint32 i = 1; i <= 4; ++i)
{
//100%, 50%, 33%, 25% chance to spawn
if (urand(1,i) == 1)
src/bindings/scripts/scripts/eastern_kingdoms/sunken_temple/instance_sunken_temple.cpp
-1
View File
@@ -128,7 +128,6 @@ struct TRINITY_DLL_DECL instance_sunken_temple : public ScriptedInstance
}
};
virtual void Update(uint32 diff) // correct order goes form 1-6
{
switch(State)
src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_eredar_twins.cpp
+1 -1
View File
@@ -298,7 +298,7 @@ struct TRINITY_DLL_DECL boss_sacrolashAI : public ScriptedAI
{
Unit* target = NULL;
Creature* temp = NULL;
for(uint8 i = 0;i<3; ++i)
for (uint8 i = 0; i<3; ++i)
{
target = SelectUnit(SELECT_TARGET_RANDOM, 0);
temp = DoSpawnCreature(MOB_SHADOW_IMAGE,0,0,0,0,TEMPSUMMON_CORPSE_DESPAWN,10000);
src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_felmyst.cpp
+2 -2
View File
@@ -432,7 +432,7 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI
}
Event = EVENT_NULL;
for(uint32 i = 1; i <= MaxTimer[Phase]; ++i)
for (uint32 i = 1; i <= MaxTimer[Phase]; ++i)
{
if (Timer[i])
if (Timer[i] <= diff)
@@ -533,7 +533,7 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI
cell_lock->Visit(cell_lock, cSearcher, *(m_creature->GetMap()));
}
for(std::list<Creature*>::iterator i = templist.begin(); i != templist.end(); ++i)
for (std::list<Creature*>::iterator i = templist.begin(); i != templist.end(); ++i)
{
if (entry == MOB_VAPOR_TRAIL && Phase == PHASE_FLIGHT)
{
src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp
+4 -5
View File
@@ -88,7 +88,6 @@ enum SWPActions
DO_BANISH = 2
};
#define GO_FAILED "You are unable to use this currently."
#define EMOTE_UNABLE_TO_FIND "is unable to find Kalecgos"
@@ -303,7 +302,7 @@ struct TRINITY_DLL_DECL boss_kalecgosAI : public ScriptedAI
{
std::list<HostilReference*> &m_threatlist = me->getThreatManager().getThreatList();
std::list<Unit*> targetList;
for(std::list<HostilReference*>::iterator itr = m_threatlist.begin(); itr!= m_threatlist.end(); ++itr)
for (std::list<HostilReference*>::iterator itr = m_threatlist.begin(); itr!= m_threatlist.end(); ++itr)
if((*itr)->getTarget() && (*itr)->getTarget()->GetTypeId() == TYPEID_PLAYER && (*itr)->getTarget()->GetGUID() != me->getVictim()->GetGUID() && !(*itr)->getTarget()->HasAura(AURA_SPECTRAL_EXHAUSTION) && (*itr)->getTarget()->GetPositionZ() > me->GetPositionZ()-5)
targetList.push_back((*itr)->getTarget());
if(targetList.empty())
@@ -520,7 +519,7 @@ struct TRINITY_DLL_DECL boss_sathrovarrAI : public ScriptedAI
Map* pMap = me->GetMap();
if (!pMap->IsDungeon()) return;
Map::PlayerList const &PlayerList = pMap->GetPlayers();
for(Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
{
if(i->getSource()->GetPositionZ() <= DRAGON_REALM_Z-5)
{
@@ -600,7 +599,7 @@ struct TRINITY_DLL_DECL boss_sathrovarrAI : public ScriptedAI
if (ResetThreat < diff)
{
for(std::list<HostilReference*>::iterator itr = me->getThreatManager().getThreatList().begin(); itr != me->getThreatManager().getThreatList().end(); ++itr)
for (std::list<HostilReference*>::iterator itr = me->getThreatManager().getThreatList().begin(); itr != me->getThreatManager().getThreatList().end(); ++itr)
{
if(Unit* pUnit = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()))
{
@@ -735,7 +734,7 @@ bool GOkalecgos_teleporter(Player* pPlayer, GameObject* pGo)
Map* pMap = pGo->GetMap();
if (!pMap->IsDungeon()) return true;
Map::PlayerList const &PlayerList = pMap->GetPlayers();
for(Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
{
if(i->getSource() && i->getSource()->GetPositionZ() < DEMON_REALM_Z + 5)
SpectralPlayers++;
src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp
+16 -17
View File
@@ -115,7 +115,6 @@ enum SpellIds
/* Shield Orb Spells*/
SPELL_SHADOW_BOLT = 45680, //45679 would be correct but triggers to often //TODO fix console error
/* Anveena's spells and cosmetics (Or, generally, everything that has "Anveena" in name) */
SPELL_ANVEENA_PRISON = 46367, // She hovers locked within a bubble
SPELL_ANVEENA_ENERGY_DRAIN = 46410, // Sunwell energy glow animation (Control mob uses this)
@@ -282,7 +281,7 @@ bool GOHello_go_orb_of_the_blue_flight(Player* pPlayer, GameObject* pGo)
pGo->GetPosition(x,y,z);
// this won't work. need rewritten
/*
for(uint8 i = 0; i < 4; ++i)
for (uint8 i = 0; i < 4; ++i)
{
if (DynamicObject* Dyn = Kalec->GetDynObject(SPELL_RING_OF_BLUE_FLAMES))
{
@@ -316,7 +315,7 @@ struct TRINITY_DLL_DECL boss_kalecgos_kjAI : public ScriptedAI
bool Searched;
void InitializeAI(){
for(uint8 i = 0; i < 4; ++i)
for (uint8 i = 0; i < 4; ++i)
Orb[i] = NULL;
FindOrbs();
OrbsEmpowered = 0;
@@ -347,7 +346,7 @@ struct TRINITY_DLL_DECL boss_kalecgos_kjAI : public ScriptedAI
if (orbList.empty())
return;
uint8 i = 0;
for(std::list<GameObject*>::iterator itr = orbList.begin(); itr != orbList.end(); ++itr, ++i){
for (std::list<GameObject*>::iterator itr = orbList.begin(); itr != orbList.end(); ++itr, ++i){
Orb[i] = pInstance ? pInstance->instance->GetGameObject(pInstance->GetData64((*itr)->GetGUID())) : NULL;
}
}
@@ -355,7 +354,7 @@ struct TRINITY_DLL_DECL boss_kalecgos_kjAI : public ScriptedAI
void ResetOrbs()
{
m_creature->RemoveDynObject(SPELL_RING_OF_BLUE_FLAMES);
for(uint8 i = 0; i < 4; ++i)
for (uint8 i = 0; i < 4; ++i)
if (Orb[i]) Orb[i]->SetUInt32Value(GAMEOBJECT_FACTION, 0);
}
@@ -367,7 +366,7 @@ struct TRINITY_DLL_DECL boss_kalecgos_kjAI : public ScriptedAI
if (all)
{
m_creature->RemoveDynObject(SPELL_RING_OF_BLUE_FLAMES);
for(uint8 i = 0; i < 4; ++i)
for (uint8 i = 0; i < 4; ++i)
{
if (!Orb[i]) return;
Orb[i]->CastSpell(m_creature, SPELL_RING_OF_BLUE_FLAMES);
@@ -382,7 +381,7 @@ struct TRINITY_DLL_DECL boss_kalecgos_kjAI : public ScriptedAI
/*
float x,y,z, dx,dy,dz;
Orb[random]->GetPosition(x,y,z);
for(uint8 i = 0; i < 4; ++i){
for (uint8 i = 0; i < 4; ++i){
DynamicObject* Dyn = m_creature->GetDynObject(SPELL_RING_OF_BLUE_FLAMES);
if (Dyn){
Dyn->GetPosition(dx,dy,dz);
@@ -493,7 +492,7 @@ struct TRINITY_DLL_DECL boss_kiljaedenAI : public Scripted_NoMovementAI
void ChangeTimers(bool status, uint32 WTimer)
{
for(uint8 i = 0; i < 10; ++i)
for (uint8 i = 0; i < 10; ++i)
TimerIsDeactiveted[i] = status;
TimerIsDeactiveted[TIMER_KALEC_JOIN] = IsKalecJoined;
@@ -558,11 +557,11 @@ struct TRINITY_DLL_DECL boss_kiljaedenAI : public Scripted_NoMovementAI
{
DoScriptText(RAND(SAY_KJ_REFLECTION1,SAY_KJ_REFLECTION2), m_creature);
DoCast(m_creature, SPELL_SINISTER_REFLECTION, true);
for(uint8 i = 0; i < 4; ++i)
for (uint8 i = 0; i < 4; ++i)
{
float x,y,z;
Unit* target;
for(uint8 z = 0; z < 6; ++z)
for (uint8 z = 0; z < 6; ++z)
{
target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true);
if (!target->HasAura(SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT,0))break;
@@ -588,7 +587,7 @@ struct TRINITY_DLL_DECL boss_kiljaedenAI : public Scripted_NoMovementAI
} else WaitTimer -= diff;
}
for(uint8 t = 0; t < ActiveTimers; ++t)
for (uint8 t = 0; t < ActiveTimers; ++t)
{
if (Timer[t] < diff && !TimerIsDeactiveted[t])
{
@@ -614,7 +613,7 @@ struct TRINITY_DLL_DECL boss_kiljaedenAI : public Scripted_NoMovementAI
if (!m_creature->IsNonMeleeSpellCasted(false))
{
m_creature->RemoveAurasDueToSpell(SPELL_SOUL_FLAY);
for(uint8 z = 0; z < 6; ++z)
for (uint8 z = 0; z < 6; ++z)
{
randomPlayer = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true);
if (!randomPlayer->HasAura(SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT,0)) break;
@@ -637,7 +636,7 @@ struct TRINITY_DLL_DECL boss_kiljaedenAI : public Scripted_NoMovementAI
}
break;
case TIMER_SUMMON_SHILEDORB:
for(uint8 i = 1; i < Phase; ++i)
for (uint8 i = 1; i < Phase; ++i)
{
float sx, sy;
sx = ShieldOrbLocations[0][0] + sin(ShieldOrbLocations[i][0]);
@@ -704,7 +703,7 @@ struct TRINITY_DLL_DECL boss_kiljaedenAI : public Scripted_NoMovementAI
break;
case TIMER_ARMAGEDDON: //Phase 4
Unit* target;
for(uint8 z = 0; z < 6; ++z)
for (uint8 z = 0; z < 6; ++z)
{
target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true);
if (!target->HasAura(SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT,0)) break;
@@ -722,7 +721,7 @@ struct TRINITY_DLL_DECL boss_kiljaedenAI : public Scripted_NoMovementAI
}
}
//Time runs over!
for(uint8 i = 0; i < ActiveTimers; ++i)
for (uint8 i = 0; i < ActiveTimers; ++i)
if (!TimerIsDeactiveted[i])
{
Timer[i] -= diff;
@@ -945,7 +944,7 @@ struct TRINITY_DLL_DECL mob_hand_of_the_deceiverAI : public ScriptedAI
if (Portal)
{
std::list<HostilReference*>::iterator itr;
for(itr = m_creature->getThreatManager().getThreatList().begin(); itr != m_creature->getThreatManager().getThreatList().end(); ++itr)
for (itr = m_creature->getThreatManager().getThreatList().begin(); itr != m_creature->getThreatManager().getThreatList().end(); ++itr)
{
Unit* pUnit = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid());
if (pUnit)
@@ -1343,7 +1342,7 @@ struct TRINITY_DLL_DECL mob_sinster_reflectionAI : public ScriptedAI
break;
}
debug_log("Sinister-Timer");
for(uint8 i = 0; i < 3; ++i)
for (uint8 i = 0; i < 3; ++i)
Timer[i] -= diff;
}
src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_muru.cpp
+4 -4
View File
@@ -325,13 +325,13 @@ struct TRINITY_DLL_DECL boss_muruAI : public Scripted_NoMovementAI
else
{
DarkFiend = false;
for(uint8 i = 0; i < 8; ++i)
for (uint8 i = 0; i < 8; ++i)
m_creature->SummonCreature(CREATURE_DARK_FIENDS,DarkFiends[i][0],DarkFiends[i][1],DarkFiends[i][2], DarkFiends[i][3], TEMPSUMMON_CORPSE_DESPAWN, 0);
Timer[TIMER_DARKNESS] = 42000;
}
break;
case TIMER_HUMANOIDES:
for(uint8 i = 0; i < 6; ++i)
for (uint8 i = 0; i < 6; ++i)
m_creature->SummonCreature(Humanoides[i][0],Humanoides[i][1],Humanoides[i][2],Humanoides[i][3], Humanoides[i][4], TEMPSUMMON_CORPSE_DESPAWN, 0);
Timer[TIMER_HUMANOIDES] = 60000;
break;
@@ -351,7 +351,7 @@ struct TRINITY_DLL_DECL boss_muruAI : public Scripted_NoMovementAI
}
//Timer
for(uint8 i = 0; i < 4; ++i)
for (uint8 i = 0; i < 4; ++i)
{
if (i != TIMER_PHASE)Timer[i] -= diff;
else if (Phase == 2) Timer[i] -= diff;
@@ -459,7 +459,7 @@ struct TRINITY_DLL_DECL npc_dark_fiendAI : public ScriptedAI
void SpellHit(Unit* caster, const SpellEntry* Spell)
{
for(uint8 i = 0; i < 3; ++i)
for (uint8 i = 0; i < 3; ++i)
if (Spell->Effect[i] == 38)
m_creature->DisappearAndDie();
}
src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/instance_sunwell_plateau.cpp
+3 -3
View File
@@ -89,7 +89,7 @@ struct TRINITY_DLL_DECL instance_sunwell_plateau : public ScriptedInstance
bool IsEncounterInProgress() const
{
for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
if (m_auiEncounter[i] == IN_PROGRESS)
return true;
@@ -102,7 +102,7 @@ struct TRINITY_DLL_DECL instance_sunwell_plateau : public ScriptedInstance
if (!players.isEmpty())
{
for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
{
Player* plr = itr->getSource();
if (plr && !plr->HasAura(45839,0))
@@ -272,7 +272,7 @@ struct TRINITY_DLL_DECL instance_sunwell_plateau : public ScriptedInstance
std::istringstream stream(in);
stream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3]
>> m_auiEncounter[4] >> m_auiEncounter[5];
for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
if (m_auiEncounter[i] == IN_PROGRESS) // Do not load an encounter as "In Progress" - reset it instead.
m_auiEncounter[i] = NOT_STARTED;
OUT_LOAD_INST_DATA_COMPLETE;
src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/sunwell_plateau.cpp
-1
View File
@@ -51,7 +51,6 @@ enum LiadrinnSpeeches
LIADRIN_SAY3 = -1580109
};
/*######
## npc_captain_selana
######*/
src/bindings/scripts/scripts/eastern_kingdoms/uldaman/boss_archaedas.cpp
-9
View File
@@ -26,7 +26,6 @@ EndScriptData */
#include "precompiled.h"
#define SAY_AGGRO "Who dares awaken Archaedas? Who dares the wrath of the makers!"
#define SOUND_AGGRO 5855
@@ -92,7 +91,6 @@ struct TRINITY_DLL_DECL boss_archaedasAI : public ScriptedAI
}
}
void EnterCombat(Unit *who)
{
m_creature->setFaction (14);
@@ -135,7 +133,6 @@ struct TRINITY_DLL_DECL boss_archaedasAI : public ScriptedAI
if (!UpdateVictim())
return;
// wake a wall minion
if (WallMinionTimer < diff) {
pInstance->SetData (NULL, 2);
@@ -167,7 +164,6 @@ struct TRINITY_DLL_DECL boss_archaedasAI : public ScriptedAI
vaultWalkersAwake = true;
}
if (Tremor_Timer < diff)
{
//Cast
@@ -202,7 +198,6 @@ SDComment: These mobs are initially frozen until Archaedas awakens them
one at a time.
EndScriptData */
#define SPELL_ARCHAEDAS_AWAKEN 10347
struct TRINITY_DLL_DECL mob_archaedas_minionsAI : public ScriptedAI
@@ -273,7 +268,6 @@ struct TRINITY_DLL_DECL mob_archaedas_minionsAI : public ScriptedAI
if (!UpdateVictim())
return;
DoMeleeAttackIfReady();
}
};
@@ -290,7 +284,6 @@ SDComment: Needs 1 person to activate the Archaedas script
SDCategory: Uldaman
EndScriptData */
#define OBJECT_ALTAR_OF_ARCHAEDAS 133234
#define NUMBER_NEEDED_TO_ACTIVATE 1 // as of patch 3.0.8 the altars can be opened by a single player (previously 3)
@@ -300,7 +293,6 @@ EndScriptData */
//uint64 altarOfArchaedasCount[5];
//int32 altarOfArchaedasCounter=0;
bool GOHello_go_altar_of_archaedas(Player* pPlayer, GameObject* pGo)
{
//bool alreadyUsed;
@@ -413,7 +405,6 @@ SDComment: Need 1 person to activate to open the altar. One by one the StoneKee
SDCategory: Uldaman
EndScriptData */
#define SPELL_BOSS_OBJECT_VISUAL 11206
#define NUMBER_NEEDED_TO_ACTIVATE 1 // as of patch 3.0.8 the altars can be opened by a single player (previously 3)
src/bindings/scripts/scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp
+8 -14
View File
@@ -14,10 +14,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "precompiled.h"
#define SPELL_ARCHAEDAS_AWAKEN 10347
#define SPELL_AWAKEN_VAULT_WALKER 10258
@@ -98,7 +96,7 @@ struct TRINITY_DLL_DECL instance_uldaman : public ScriptedInstance
void ActivateStoneKeepers()
{
for(std::vector<uint64>::iterator i = stoneKeeper.begin(); i != stoneKeeper.end(); ++i)
for (std::vector<uint64>::iterator i = stoneKeeper.begin(); i != stoneKeeper.end(); ++i)
{
Creature *target = instance->GetCreature(*i);
if (!target || !target->isAlive() || target->getFaction()==14)
@@ -118,7 +116,7 @@ struct TRINITY_DLL_DECL instance_uldaman : public ScriptedInstance
if (!archaedas)
return;
for(std::vector<uint64>::iterator i = archaedasWallMinions.begin(); i != archaedasWallMinions.end(); ++i)
for (std::vector<uint64>::iterator i = archaedasWallMinions.begin(); i != archaedasWallMinions.end(); ++i)
{
Creature *target = instance->GetCreature(*i);
if (!target || !target->isAlive() || target->getFaction()==14)
@@ -133,7 +131,7 @@ struct TRINITY_DLL_DECL instance_uldaman : public ScriptedInstance
void DeActivateMinions()
{
// first despawn any aggroed wall minions
for(std::vector<uint64>::iterator i = archaedasWallMinions.begin(); i != archaedasWallMinions.end(); ++i)
for (std::vector<uint64>::iterator i = archaedasWallMinions.begin(); i != archaedasWallMinions.end(); ++i)
{
Creature *target = instance->GetCreature(*i);
if (!target || target->isDead() || target->getFaction()!=14)
@@ -143,7 +141,7 @@ struct TRINITY_DLL_DECL instance_uldaman : public ScriptedInstance
}
// Vault Walkers
for(std::vector<uint64>::iterator i = vaultWalker.begin(); i != vaultWalker.end(); ++i)
for (std::vector<uint64>::iterator i = vaultWalker.begin(); i != vaultWalker.end(); ++i)
{
Creature *target = instance->GetCreature(*i);
if (!target || target->isDead() || target->getFaction()!=14)
@@ -153,7 +151,7 @@ struct TRINITY_DLL_DECL instance_uldaman : public ScriptedInstance
}
// Earthen Guardians
for(std::vector<uint64>::iterator i = earthenGuardian.begin(); i != earthenGuardian.end(); ++i)
for (std::vector<uint64>::iterator i = earthenGuardian.begin(); i != earthenGuardian.end(); ++i)
{
Creature *target = instance->GetCreature(*i);
if (!target || target->isDead() || target->getFaction()!=14)
@@ -179,7 +177,7 @@ struct TRINITY_DLL_DECL instance_uldaman : public ScriptedInstance
void RespawnMinions()
{
// first respawn any aggroed wall minions
for(std::vector<uint64>::iterator i = archaedasWallMinions.begin(); i != archaedasWallMinions.end(); ++i)
for (std::vector<uint64>::iterator i = archaedasWallMinions.begin(); i != archaedasWallMinions.end(); ++i)
{
Creature *target = instance->GetCreature(*i);
if (target && target->isDead())
@@ -191,7 +189,7 @@ struct TRINITY_DLL_DECL instance_uldaman : public ScriptedInstance
}
// Vault Walkers
for(std::vector<uint64>::iterator i = vaultWalker.begin(); i != vaultWalker.end(); ++i)
for (std::vector<uint64>::iterator i = vaultWalker.begin(); i != vaultWalker.end(); ++i)
{
Creature *target = instance->GetCreature(*i);
if (target && target->isDead())
@@ -203,7 +201,7 @@ struct TRINITY_DLL_DECL instance_uldaman : public ScriptedInstance
}
// Earthen Guardians
for(std::vector<uint64>::iterator i = earthenGuardian.begin(); i != earthenGuardian.end(); ++i)
for (std::vector<uint64>::iterator i = earthenGuardian.begin(); i != earthenGuardian.end(); ++i)
{
Creature *target = instance->GetCreature(*i);
if (target && target->isDead())
@@ -227,7 +225,6 @@ struct TRINITY_DLL_DECL instance_uldaman : public ScriptedInstance
if (data==5) RespawnMinions();
}
void SetData64 (uint32 type, uint64 data)
{
// Archaedas
@@ -237,7 +234,6 @@ struct TRINITY_DLL_DECL instance_uldaman : public ScriptedInstance
}
}
void OnCreatureCreate(Creature* pCreature, bool add)
{
switch (pCreature->GetEntry()) {
@@ -288,8 +284,6 @@ struct TRINITY_DLL_DECL instance_uldaman : public ScriptedInstance
} // end GetData64
};
InstanceData* GetInstanceData_instance_uldaman(Map* pMap)
{
return new instance_uldaman(pMap);
src/bindings/scripts/scripts/eastern_kingdoms/undercity.cpp
+1 -1
View File
@@ -125,7 +125,7 @@ bool ChooseReward_npc_lady_sylvanas_windrunner(Player* pPlayer, Creature* pCreat
CAST_AI(npc_lady_sylvanas_windrunnerAI, pCreature->AI())->DoPlaySoundToSet(pCreature,SOUND_CREDIT);
pCreature->CastSpell(pCreature,SPELL_SYLVANAS_CAST,false);
for(uint8 i = 0; i < 4; ++i)
for (uint8 i = 0; i < 4; ++i)
pCreature->SummonCreature(ENTRY_HIGHBORNE_LAMENTER, HighborneLoc[i][0], HighborneLoc[i][1], HIGHBORNE_LOC_Y, HighborneLoc[i][2], TEMPSUMMON_TIMED_DESPAWN, 160000);
}
src/bindings/scripts/scripts/eastern_kingdoms/wetlands.cpp
+1 -1
View File
@@ -75,7 +75,7 @@ struct TRINITY_DLL_DECL npc_tapoke_slim_jahnAI : public npc_escortAI
if (HasEscortState(STATE_ESCORT_ESCORTING) && !m_bFriendSummoned && pPlayer)
{
for(uint8 i = 0; i < 3; ++i)
for (uint8 i = 0; i < 3; ++i)
m_creature->CastSpell(m_creature, SPELL_CALL_FRIENDS, true);
m_bFriendSummoned = true;
src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_akilzon.cpp
+4 -4
View File
@@ -101,7 +101,7 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI
CloudGUID = 0;
CycloneGUID = 0;
DespawnSummons();
for(uint8 i = 0; i < 8; ++i)
for (uint8 i = 0; i < 8; ++i)
BirdGUIDs[i] = 0;
StormCount = 0;
@@ -175,7 +175,7 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI
{
// deal damage
int32 bp0 = 800;
for(uint8 i = 2; i < StormCount; ++i)
for (uint8 i = 2; i < StormCount; ++i)
bp0 *= 2;
CellPair p(Trinity::ComputeCellPair(m_creature->GetPositionX(), m_creature->GetPositionY()));
@@ -197,7 +197,7 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI
cell_lock->Visit(cell_lock, grid_unit_searcher, *(m_creature->GetMap()));
}
//dealdamege
for(std::list<Unit*>::iterator i = tempUnitMap.begin(); i != tempUnitMap.end(); ++i)
for (std::list<Unit*>::iterator i = tempUnitMap.begin(); i != tempUnitMap.end(); ++i)
{
if (!Cloud->IsWithinDist(*i, 6, false))
{
@@ -207,7 +207,7 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI
// visual
float x,y,z;
z = m_creature->GetPositionZ();
for(uint8 i = 0; i < 5+rand()%5; ++i)
for (uint8 i = 0; i < 5+rand()%5; ++i)
{
x = 343+rand()%60;
y = 1380+rand()%60;
src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_hexlord.cpp
+7 -11
View File
@@ -204,7 +204,7 @@ struct TRINITY_DLL_DECL boss_hex_lord_malacrassAI : public ScriptedAI
{
pInstance = c->GetInstanceData();
SelectAddEntry();
for(uint8 i = 0; i < 4; ++i)
for (uint8 i = 0; i < 4; ++i)
AddGUID[i] = 0;
}
@@ -253,7 +253,7 @@ struct TRINITY_DLL_DECL boss_hex_lord_malacrassAI : public ScriptedAI
m_creature->MonsterYell(YELL_AGGRO, LANG_UNIVERSAL, NULL);
DoPlaySoundToSet(m_creature, SOUND_YELL_AGGRO);
for(uint8 i = 0; i < 4; ++i)
for (uint8 i = 0; i < 4; ++i)
{
Unit* Temp = Unit::GetUnit((*m_creature),AddGUID[i]);
if (Temp && Temp->isAlive())
@@ -289,7 +289,7 @@ struct TRINITY_DLL_DECL boss_hex_lord_malacrassAI : public ScriptedAI
m_creature->MonsterYell(YELL_DEATH, LANG_UNIVERSAL, NULL);
DoPlaySoundToSet(m_creature, SOUND_YELL_DEATH);
for(uint8 i = 0; i < 4 ; ++i)
for (uint8 i = 0; i < 4 ; ++i)
{
Unit* Temp = Unit::GetUnit((*m_creature),AddGUID[i]);
if (Temp && Temp->isAlive())
@@ -301,20 +301,20 @@ struct TRINITY_DLL_DECL boss_hex_lord_malacrassAI : public ScriptedAI
{
std::vector<uint32> AddList;
for(uint8 i = 0; i < 8; ++i)
for (uint8 i = 0; i < 8; ++i)
AddList.push_back(AddEntryList[i]);
while(AddList.size() > 4)
AddList.erase(AddList.begin()+rand()%AddList.size());
uint8 i = 0;
for(std::vector<uint32>::iterator itr = AddList.begin(); itr != AddList.end(); ++itr, ++i)
for (std::vector<uint32>::iterator itr = AddList.begin(); itr != AddList.end(); ++itr, ++i)
AddEntry[i] = *itr;
}
void SpawnAdds()
{
for(uint8 i = 0; i < 4; ++i)
for (uint8 i = 0; i < 4; ++i)
{
Creature *pCreature = (Unit::GetCreature((*m_creature), AddGUID[i]));
if (!pCreature || !pCreature->isAlive())
@@ -349,7 +349,7 @@ struct TRINITY_DLL_DECL boss_hex_lord_malacrassAI : public ScriptedAI
if (CheckAddState_Timer < diff)
{
for(uint8 i = 0; i < 4; ++i)
for (uint8 i = 0; i < 4; ++i)
{
Unit* Temp = Unit::GetUnit((*m_creature),AddGUID[i]);
if (Temp && Temp->isAlive() && !Temp->getVictim())
@@ -706,7 +706,6 @@ struct TRINITY_DLL_DECL boss_slitherAI : public boss_hexlord_addAI
uint32 venomspit_timer;
void Reset()
{
venomspit_timer = 5000;
@@ -753,7 +752,6 @@ struct TRINITY_DLL_DECL boss_fenstalkerAI : public boss_hexlord_addAI
uint32 volatileinf_timer;
void Reset()
{
volatileinf_timer = 15000;
@@ -780,7 +778,6 @@ struct TRINITY_DLL_DECL boss_fenstalkerAI : public boss_hexlord_addAI
#define SPELL_COLD_STARE 43593
#define SPELL_MIGHTY_BLOW 43592
struct TRINITY_DLL_DECL boss_koraggAI : public boss_hexlord_addAI
{
boss_koraggAI(Creature *c) : boss_hexlord_addAI(c) {}
@@ -788,7 +785,6 @@ struct TRINITY_DLL_DECL boss_koraggAI : public boss_hexlord_addAI
uint32 coldstare_timer;
uint32 mightyblow_timer;
void Reset()
{
coldstare_timer = 15000;
src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_janalai.cpp
+8 -8
View File
@@ -149,7 +149,7 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI
isFlameBreathing = false;
for(uint8 i = 0; i < 40; ++i)
for (uint8 i = 0; i < 40; ++i)
FireBombGUIDs[i] = 0;
HatchAllEggs(1);
@@ -190,14 +190,14 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI
{
uint8 WallNum;
Creature* wall = NULL;
for(uint8 i = 0; i < 4; ++i)
for (uint8 i = 0; i < 4; ++i)
{
if (i == 0 || i == 2)
WallNum = 3;
else
WallNum = 2;
for(uint8 j = 0; j < WallNum; j++)
for (uint8 j = 0; j < WallNum; j++)
{
if (WallNum == 3)
wall = m_creature->SummonCreature(MOB_FIRE_BOMB, FireWallCoords[i][0],FireWallCoords[i][1]+5*(j-1),FireWallCoords[i][2],FireWallCoords[i][3],TEMPSUMMON_TIMED_DESPAWN,15000);
@@ -211,7 +211,7 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI
void SpawnBombs()
{
float dx, dy;
for(int i(0); i < 40; ++i)
for (int i(0); i < 40; ++i)
{
dx =(rand()%(area_dx))-(area_dx/2);
dy =(rand()%(area_dy))-(area_dy/2);
@@ -247,7 +247,7 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI
if (!templist.size())
return false;
for(std::list<Creature*>::iterator i = templist.begin(); i != templist.end(); ++i)
for (std::list<Creature*>::iterator i = templist.begin(); i != templist.end(); ++i)
{
if (uiAction == 1)
(*i)->SetDisplayId(10056);
@@ -277,7 +277,7 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI
CellLock<GridReadGuard> cell_lock(cell, pair);
cell_lock->Visit(cell_lock, cSearcher, *(m_creature->GetMap()));
}
for(std::list<Creature*>::iterator i = templist.begin(); i != templist.end(); ++i)
for (std::list<Creature*>::iterator i = templist.begin(); i != templist.end(); ++i)
{
(*i)->CastSpell(*i, SPELL_FIRE_BOMB_DAMAGE, true);
(*i)->RemoveAllAuras();
@@ -376,7 +376,7 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI
Map* pMap = m_creature->GetMap();
if (!pMap->IsDungeon()) return;
Map::PlayerList const &PlayerList = pMap->GetPlayers();
for(Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
{
if (Player* i_pl = i->getSource())
if (i_pl->isAlive())
@@ -514,7 +514,7 @@ struct TRINITY_DLL_DECL mob_amanishi_hatcherAI : public ScriptedAI
//error_log("Eggs %d at %d", templist.size(), side);
for(std::list<Creature*>::iterator i = templist.begin(); i != templist.end() && num > 0; ++i)
for (std::list<Creature*>::iterator i = templist.begin(); i != templist.end() && num > 0; ++i)
{
if ((*i)->GetDisplayId() != 11686)
{
src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_nalorakk.cpp
+1 -2
View File
@@ -88,7 +88,6 @@ float NalorakkWay[8][3] =
#define YELL_SHIFTEDTOBEAR "You call on da beast, you gonna get more dan you bargain for!"
#define SOUND_YELL_TOBEAR 12072
struct TRINITY_DLL_DECL boss_nalorakkAI : public ScriptedAI
{
boss_nalorakkAI(Creature *c) : ScriptedAI(c)
@@ -169,7 +168,7 @@ struct TRINITY_DLL_DECL boss_nalorakkAI : public ScriptedAI
if (!templist.size())
return;
for(std::list<Creature*>::iterator i = templist.begin(); i != templist.end(); ++i)
for (std::list<Creature*>::iterator i = templist.begin(); i != templist.end(); ++i)
{
if ((*i) && m_creature->IsWithinDistInMap((*i),25))
{
src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_zuljin.cpp
+3 -4
View File
@@ -98,7 +98,6 @@ EndScriptData */
#define SPELL_BERSERK 45078
#define PHASE_BEAR 0
#define PHASE_EAGLE 1
#define PHASE_LYNX 2
@@ -287,7 +286,7 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI
void SpawnAdds()
{
Creature *pCreature = NULL;
for(uint8 i = 0; i < 4; ++i)
for (uint8 i = 0; i < 4; ++i)
{
pCreature = m_creature->SummonCreature(SpiritInfo[i].entry, SpiritInfo[i].x, SpiritInfo[i].y, SpiritInfo[i].z, SpiritInfo[i].orient, TEMPSUMMON_DEAD_DESPAWN, 0);
if (pCreature)
@@ -302,7 +301,7 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI
void DespawnAdds()
{
for(uint8 i = 0; i < 4; ++i)
for (uint8 i = 0; i < 4; ++i)
{
Unit* Temp = NULL;
if (SpiritGUID[i])
@@ -355,7 +354,7 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI
{
m_creature->GetMotionMaster()->Clear();
m_creature->CastSpell(m_creature, SPELL_ENERGY_STORM, true); // enemy aura
for(uint8 i = 0; i < 4; ++i)
for (uint8 i = 0; i < 4; ++i)
{
Creature* Vortex = DoSpawnCreature(CREATURE_FEATHER_VORTEX, 0, 0, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
if (Vortex)
src/bindings/scripts/scripts/eastern_kingdoms/zulaman/instance_zulaman.cpp
+2 -2
View File
@@ -92,13 +92,13 @@ struct TRINITY_DLL_DECL instance_zulaman : public ScriptedInstance
BossKilled = 0;
ChestLooted = 0;
for(uint8 i = 0; i < RAND_VENDOR; ++i)
for (uint8 i = 0; i < RAND_VENDOR; ++i)
RandVendor[i] = NOT_STARTED;
}
bool IsEncounterInProgress() const
{
for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
if (m_auiEncounter[i] == IN_PROGRESS) return true;
return false;
src/bindings/scripts/scripts/eastern_kingdoms/zulaman/zulaman.cpp
+1 -1
View File
@@ -147,7 +147,7 @@ bool GossipSelect_npc_zulaman_hostage(Player* pPlayer, Creature* pCreature, uint
float x, y, z;
pCreature->GetPosition(x, y, z);
uint32 entry = pCreature->GetEntry();
for(uint8 i = 0; i < 4; ++i)
for (uint8 i = 0; i < 4; ++i)
{
if (HostageEntry[i] == entry)
{
src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_hazzarah.cpp
+1 -1
View File
@@ -72,7 +72,7 @@ struct TRINITY_DLL_DECL boss_hazzarahAI : public ScriptedAI
//We will summon 3 illusions that will spawn on a random gamer and attack this gamer
//We will just use one model for the beginning
Unit* target = NULL;
for(uint8 i = 0; i < 3; ++i)
for (uint8 i = 0; i < 3; ++i)
{
target = SelectUnit(SELECT_TARGET_RANDOM,0);
if (!target)
src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp
+1 -1
View File
@@ -219,7 +219,7 @@ struct TRINITY_DLL_DECL boss_mandokirAI : public ScriptedAI
TargetInRange = 0;
std::list<HostilReference*>::iterator i = m_creature->getThreatManager().getThreatList().begin();
for(; i != m_creature->getThreatManager().getThreatList().end(); ++i)
for (; i != m_creature->getThreatManager().getThreatList().end(); ++i)
{
Unit* pUnit = Unit::GetUnit(*m_creature, (*i)->getUnitGuid());
if (pUnit && m_creature->IsWithinMeleeRange(pUnit))
src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_venoxis.cpp
+1 -1
View File
@@ -112,7 +112,7 @@ struct TRINITY_DLL_DECL boss_venoxisAI : public ScriptedAI
if (HolyNova_Timer < diff)
{
TargetInRange = 0;
for(uint8 i=0; i<10; ++i)
for (uint8 i=0; i<10; ++i)
{
if (Unit* target = SelectUnit(SELECT_TARGET_TOPAGGRO,i))
if (m_creature->IsWithinMeleeRange(target))
src/bindings/scripts/scripts/kalimdor/azuremyst_isle.cpp
+2 -3
View File
@@ -323,7 +323,6 @@ struct TRINITY_DLL_DECL npc_magwinAI : public npc_escortAI
{
npc_magwinAI(Creature *c) : npc_escortAI(c) {}
void WaypointReached(uint32 i)
{
Player* pPlayer = GetPlayerForEscort();
@@ -487,7 +486,7 @@ struct TRINITY_DLL_DECL npc_geezleAI : public ScriptedAI
Trinity::PlayerListSearcher<Trinity::AnyPlayerInObjectRangeCheck> searcher(m_creature, players, checker);
m_creature->VisitNearbyWorldObject(radius, searcher);
for(std::list<Player*>::iterator itr = players.begin(); itr != players.end(); ++itr)
for (std::list<Player*>::iterator itr = players.begin(); itr != players.end(); ++itr)
{
if((*itr)->GetQuestStatus(QUEST_TREES_COMPANY)==QUEST_STATUS_INCOMPLETE
&&(*itr)->HasAuraEffect(SPELL_TREE_DISGUISE,3) )
@@ -504,7 +503,7 @@ struct TRINITY_DLL_DECL npc_geezleAI : public ScriptedAI
if (!FlagList.empty())
{
for(std::list<GameObject*>::iterator itr = FlagList.begin(); itr != FlagList.end(); ++itr)
for (std::list<GameObject*>::iterator itr = FlagList.begin(); itr != FlagList.end(); ++itr)
{
if (despawn)
{
src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp
+2 -2
View File
@@ -84,14 +84,14 @@ struct TRINITY_DLL_DECL boss_meathookAI : public ScriptedAI
std::list<HostilReference*>::iterator itr;
int st=0;
for(itr = m_threatlist.begin(); itr != m_threatlist.end(); ++itr)
for (itr = m_threatlist.begin(); itr != m_threatlist.end(); ++itr)
{
//st++;
m_creature->getThreatManager().
}
Unit* targets[st];
int st2=0;
for(int i=1; i<=st; ++i){
for (int i=1; i<=st; ++i){
if (!IsWithinLOSInMap(targets[i])
st2++;
}
src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.cpp
+1 -1
View File
@@ -311,7 +311,7 @@ struct TRINITY_DLL_DECL npc_time_riftAI : public ScriptedAI
if (entry == C_WHELP)
{
for(uint8 i = 0; i < 3; ++i)
for (uint8 i = 0; i < 3; ++i)
DoSummonAtRift(entry);
}else DoSummonAtRift(entry);
}
src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/instance_dark_portal.cpp
+1 -2
View File
@@ -192,7 +192,7 @@ struct TRINITY_DLL_DECL instance_dark_portal : public ScriptedInstance
if (!players.isEmpty())
{
for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
{
if (Player* pPlayer = itr->getSource())
{
@@ -288,7 +288,6 @@ struct TRINITY_DLL_DECL instance_dark_portal : public ScriptedInstance
pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
if (Creature* pBoss = SummonedPortalBoss(pTemp))
{
if (pBoss->GetEntry() == C_AEONUS)
src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_anetheron.cpp
+1 -1
View File
@@ -167,7 +167,7 @@ struct TRINITY_DLL_DECL boss_anetheronAI : public hyjal_trashAI
if (SleepTimer < diff)
{
for(uint8 i=0;i<3; ++i)
for (uint8 i=0; i<3; ++i)
{
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM,0,100,true))
target->CastSpell(target,SPELL_SLEEP,true);
src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp
+1 -1
View File
@@ -308,7 +308,7 @@ struct TRINITY_DLL_DECL boss_archimondeAI : public hyjal_trashAI
std::list<Unit*> targets;
std::list<HostilReference*>::iterator itr = m_threatlist.begin();
for(; itr != m_threatlist.end(); ++itr)
for (; itr != m_threatlist.end(); ++itr)
{
Unit* pUnit = Unit::GetUnit((*m_creature), (*itr)->getUnitGuid());
if (pUnit && pUnit->isAlive())
src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp
+1 -1
View File
@@ -153,7 +153,7 @@ struct TRINITY_DLL_DECL boss_kazrogalAI : public hyjal_trashAI
m_creature->CastCustomSpell(m_creature, SPELL_MARK, NULL, NULL, NULL, false, NULL, NULL, m_creature->GetGUID());
std::list<HostilReference *> t_list = m_creature->getThreatManager().getThreatList();
for(std::list<HostilReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr)
for (std::list<HostilReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr)
{
Unit *target = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid());
if (target && target->GetTypeId() == TYPEID_PLAYER && target->getPowerType() == POWER_MANA)
src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal.cpp
-1
View File
@@ -43,7 +43,6 @@ EndContentData */
#define GOSSIP_ITEM_GM1 "[GM] Toggle Debug Timers"
CreatureAI* GetAI_npc_jaina_proudmoore(Creature* pCreature)
{
hyjalAI* ai = new hyjalAI(pCreature);
src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.cpp
+20 -24
View File
@@ -58,7 +58,6 @@ float JainaDummySpawn[2][4]=
{5484.98, -2721.69, 1483.39, 6.00656}
};
// Locations for summoning waves in Horde base
float HordeBase[4][3]=
{
@@ -314,7 +313,7 @@ hyjalAI::hyjalAI(Creature *c) : npc_escortAI(c), Summons(m_creature)
pInstance = c->GetInstanceData();
VeinsSpawned[0] = false;
VeinsSpawned[1] = false;
for(uint8 i=0;i<14; ++i)
for (uint8 i=0; i<14; ++i)
VeinGUID[i] = 0;
InfernalCount = 0;
TeleportTimer = 1000;
@@ -384,15 +383,12 @@ void hyjalAI::Reset()
bRetreat = false;
Debug = false;
//Flags
m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
//Initialize spells
memset(Spell, 0, sizeof(Spell));
//Reset Instance Data for trash count
if (pInstance)
{
@@ -427,7 +423,7 @@ void hyjalAI::EnterEvadeMode()
void hyjalAI::EnterCombat(Unit *who)
{
if (IsDummy)return;
for(uint8 i = 0; i < 3; ++i)
for (uint8 i = 0; i < 3; ++i)
if (Spell[i].Cooldown)
SpellTimer[i] = Spell[i].Cooldown;
@@ -447,7 +443,7 @@ void hyjalAI::SummonCreature(uint32 entry, float Base[4][3])
uint32 random = rand()%4;
float SpawnLoc[3];
for(uint8 i = 0; i < 3; ++i)
for (uint8 i = 0; i < 3; ++i)
{
SpawnLoc[i] = Base[random][i];
}
@@ -540,7 +536,7 @@ void hyjalAI::SummonNextWave(Wave wave[18], uint32 Count, float Base[4][3])
InfernalCount = 0;//reset infernal count every new wave
EnemyCount = pInstance->GetData(DATA_TRASH);
for(uint8 i = 0; i < 18; ++i)
for (uint8 i = 0; i < 18; ++i)
{
if (wave[Count].Mob[i])
SummonCreature(wave[Count].Mob[i], Base);
@@ -616,7 +612,7 @@ uint32 hyjalAI::GetInstanceData(uint32 Event)
void hyjalAI::Talk(uint32 id)
{
std::list<uint8> index;
for(uint8 i = 0; i < 9; ++i)
for (uint8 i = 0; i < 9; ++i)
{
if (Faction == 0) // Alliance
{
@@ -760,7 +756,7 @@ void hyjalAI::UpdateAI(const uint32 diff)
m_creature->SetVisibility(VISIBILITY_OFF);
HideNearPos(m_creature->GetPositionX(), m_creature->GetPositionY());
HideNearPos(5037.76, -1889.71);
for(uint8 i = 0; i < 92; ++i)//summon fires
for (uint8 i = 0; i < 92; ++i)//summon fires
m_creature->SummonGameObject(FLAMEOBJECT,AllianceFirePos[i][0],AllianceFirePos[i][1],AllianceFirePos[i][2],AllianceFirePos[i][3],AllianceFirePos[i][4],AllianceFirePos[i][5],AllianceFirePos[i][6],AllianceFirePos[i][7],0);
}
@@ -773,7 +769,7 @@ 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
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);
}
@@ -850,7 +846,7 @@ void hyjalAI::UpdateAI(const uint32 diff)
if (CheckTimer < diff)
{
for(uint8 i = 0; i < 2; ++i)
for (uint8 i = 0; i < 2; ++i)
{
if (BossGUID[i])
{
@@ -882,7 +878,7 @@ void hyjalAI::UpdateAI(const uint32 diff)
if (!UpdateVictim())
return;
for(uint8 i = 0; i < 3; ++i)
for (uint8 i = 0; i < 3; ++i)
{
if (Spell[i].SpellId)
{
@@ -954,7 +950,7 @@ void hyjalAI::HideNearPos(float x, float y)
if (!creatures.empty())
{
for(std::list<Creature*>::iterator itr = creatures.begin(); itr != creatures.end(); ++itr)
for (std::list<Creature*>::iterator itr = creatures.begin(); itr != creatures.end(); ++itr)
{
(*itr)->SetVisibility(VISIBILITY_OFF);
(*itr)->setFaction(35);//make them friendly so mobs won't attack them
@@ -1013,7 +1009,7 @@ void hyjalAI::WaypointReached(uint32 i)
if (!creatures.empty())
{
for(std::list<Creature*>::iterator itr = creatures.begin(); itr != creatures.end(); ++itr)
for (std::list<Creature*>::iterator itr = creatures.begin(); itr != creatures.end(); ++itr)
{
if ((*itr) && (*itr)->isAlive() && (*itr) != m_creature && (*itr)->GetEntry() != JAINA)
{
@@ -1055,7 +1051,7 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff)
if (!creatures.empty())
{
for(std::list<Creature*>::iterator itr = creatures.begin(); itr != creatures.end(); ++itr)
for (std::list<Creature*>::iterator itr = creatures.begin(); itr != creatures.end(); ++itr)
{
if ((*itr) && (*itr)->isAlive())
{
@@ -1079,10 +1075,10 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff)
switch(faction)
{
case 0://alliance
for(uint8 i = 0; i < 92; ++i)//summon fires
for (uint8 i = 0; i < 92; ++i)//summon fires
m_creature->SummonGameObject(FLAMEOBJECT,AllianceFirePos[i][0],AllianceFirePos[i][1],AllianceFirePos[i][2],AllianceFirePos[i][3],AllianceFirePos[i][4],AllianceFirePos[i][5],AllianceFirePos[i][6],AllianceFirePos[i][7],0);
for(uint8 i = 0; i < 25; ++i)//summon 25 ghouls
for (uint8 i = 0; i < 25; ++i)//summon 25 ghouls
{
uint8 r = rand()%4;
Creature* pUnit = m_creature->SummonCreature(GHOUL, AllianceBase[r][0]+irand(-15,15), AllianceBase[r][1]+irand(-15,15), AllianceBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000);
@@ -1094,7 +1090,7 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff)
pUnit->setActive(true);
}
}
for(uint8 i = 0; i < 3; ++i)//summon 3 abominations
for (uint8 i = 0; i < 3; ++i)//summon 3 abominations
{
uint8 r = rand()%4;
Creature* pUnit = m_creature->SummonCreature(ABOMINATION, AllianceBase[r][0]+irand(-15,15), AllianceBase[r][1]+irand(-15,15), AllianceBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000);
@@ -1106,7 +1102,7 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff)
pUnit->setActive(true);
}
}
for(uint8 i = 0; i < 5; ++i)//summon 5 gargoyles
for (uint8 i = 0; i < 5; ++i)//summon 5 gargoyles
{
Creature* pUnit = m_creature->SummonCreature(GARGOYLE, AllianceOverrunGargPos[i][0], AllianceOverrunGargPos[i][1], AllianceOverrunGargPos[i][2], AllianceOverrunGargPos[i][3], TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000);
if (pUnit)
@@ -1120,10 +1116,10 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff)
}
break;
case 1://horde
for(uint8 i = 0; i < 65; ++i)//summon fires
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);
for(uint8 i = 0; i < 26; ++i)//summon infernals
for (uint8 i = 0; i < 26; ++i)//summon infernals
{
Creature* pUnit = m_creature->SummonCreature(GIANT_INFERNAL, InfernalSPWP[i][0], InfernalSPWP[i][1], InfernalSPWP[i][2], InfernalSPWP[i][3], TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000);
if (pUnit)
@@ -1135,7 +1131,7 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff)
pUnit->setActive(true);
}
}
for(uint8 i = 0; i < 25; ++i)//summon 25 ghouls
for (uint8 i = 0; i < 25; ++i)//summon 25 ghouls
{
uint8 r = rand()%4;
Creature* pUnit = m_creature->SummonCreature(GHOUL, HordeBase[r][0]+irand(-15,15), HordeBase[r][1]+irand(-15,15), HordeBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000);
@@ -1147,7 +1143,7 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff)
pUnit->setActive(true);
}
}
for(uint8 i = 0; i < 5; ++i)//summon 5 abominations
for (uint8 i = 0; i < 5; ++i)//summon 5 abominations
{
uint8 r = rand()%4;
Creature* pUnit = m_creature->SummonCreature(ABOMINATION, HordeBase[r][0]+irand(-15,15), HordeBase[r][1]+irand(-15,15), HordeBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000);
src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp
+8 -17
View File
@@ -179,7 +179,7 @@ void hyjal_trashAI::UpdateAI(const uint32 diff)
}
if (m_creature->GetEntry() == ABOMINATION)
{
for(uint8 i = 0; i < 4; ++i)
for (uint8 i = 0; i < 4; ++i)
AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]);
switch(OverrunType)
{
@@ -228,7 +228,7 @@ void hyjal_trashAI::UpdateAI(const uint32 diff)
Start(true, true);
break;
default:
for(uint8 i = 22; i < 36; ++i)
for (uint8 i = 22; i < 36; ++i)
AddWaypoint(i-18, AllianceOverrunWP[i][0]+irand(-3,3), AllianceOverrunWP[i][1]+irand(-3,3), AllianceOverrunWP[i][2]);
SetDespawnAtEnd(true);
@@ -239,7 +239,7 @@ void hyjal_trashAI::UpdateAI(const uint32 diff)
}
if (m_creature->GetEntry() == GHOUL)
{
for(uint8 i = 0; i < 4; ++i)
for (uint8 i = 0; i < 4; ++i)
AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]);
switch(OverrunType)
{
@@ -301,7 +301,7 @@ void hyjal_trashAI::UpdateAI(const uint32 diff)
Start(true, true);
break;
default:
for(uint8 i = 22; i < 36; ++i)
for (uint8 i = 22; i < 36; ++i)
AddWaypoint(i-18, AllianceOverrunWP[i][0]+irand(-3,3), AllianceOverrunWP[i][1]+irand(-3,3), AllianceOverrunWP[i][2]);
SetDespawnAtEnd(true);
LastOverronPos = 17;
@@ -314,7 +314,7 @@ void hyjal_trashAI::UpdateAI(const uint32 diff)
{
if (m_creature->GetEntry() == GHOUL)
{
for(uint8 i = 0; i < 6; ++i)
for (uint8 i = 0; i < 6; ++i)
AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]);
switch(OverrunType)
{
@@ -339,7 +339,7 @@ void hyjal_trashAI::UpdateAI(const uint32 diff)
Start(true, true);
break;
default:
for(uint8 i = 0; i < 16; ++i)
for (uint8 i = 0; i < 16; ++i)
AddWaypoint(i+6, HordeOverrunWP[i][0]+irand(-10,10), HordeOverrunWP[i][1]+irand(-10,10), HordeOverrunWP[i][2]);
SetDespawnAtEnd(true);
LastOverronPos = 21;
@@ -349,9 +349,9 @@ void hyjal_trashAI::UpdateAI(const uint32 diff)
}
if (m_creature->GetEntry() == ABOMINATION)
{
for(uint8 i = 0; i < 6; ++i)
for (uint8 i = 0; i < 6; ++i)
AddWaypoint(i, HordeWPs[i][0]+irand(-10,10), HordeWPs[i][1]+irand(-10,10), HordeWPs[i][2]);
for(uint8 i = 0; i < 16; ++i)
for (uint8 i = 0; i < 16; ++i)
AddWaypoint(i+6, HordeOverrunWP[i][0]+irand(-10,10), HordeOverrunWP[i][1]+irand(-10,10), HordeOverrunWP[i][2]);
SetDespawnAtEnd(true);
LastOverronPos = 21;
@@ -497,7 +497,6 @@ struct mob_giant_infernalAI : public hyjal_trashAI
}
};
CreatureAI* GetAI_mob_giant_infernal(Creature* pCreature)
{
return new mob_giant_infernalAI(pCreature);
@@ -593,7 +592,6 @@ struct mob_abominationAI : public hyjal_trashAI
}
};
CreatureAI* GetAI_mob_abomination(Creature* pCreature)
{
return new mob_abominationAI(pCreature);
@@ -693,7 +691,6 @@ struct mob_ghoulAI : public hyjal_trashAI
}
};
CreatureAI* GetAI_mob_ghoul(Creature* pCreature)
{
return new mob_ghoulAI(pCreature);
@@ -812,7 +809,6 @@ struct mob_necromancerAI : public hyjal_trashAI
}
};
CreatureAI* GetAI_mob_necromancer(Creature* pCreature)
{
return new mob_necromancerAI(pCreature);
@@ -913,7 +909,6 @@ struct mob_bansheeAI : public hyjal_trashAI
}
};
CreatureAI* GetAI_mob_banshee(Creature* pCreature)
{
return new mob_bansheeAI(pCreature);
@@ -999,7 +994,6 @@ struct mob_crypt_fiendAI : public hyjal_trashAI
}
};
CreatureAI* GetAI_mob_crypt_fiend(Creature* pCreature)
{
return new mob_crypt_fiendAI(pCreature);
@@ -1085,7 +1079,6 @@ struct mob_fel_stalkerAI : public hyjal_trashAI
}
};
CreatureAI* GetAI_mob_fel_stalker(Creature* pCreature)
{
return new mob_fel_stalkerAI(pCreature);
@@ -1196,7 +1189,6 @@ struct mob_frost_wyrmAI : public hyjal_trashAI
}
};
CreatureAI* GetAI_mob_frost_wyrm(Creature* pCreature)
{
return new mob_frost_wyrmAI(pCreature);
@@ -1330,7 +1322,6 @@ struct mob_gargoyleAI : public hyjal_trashAI
}
};
CreatureAI* GetAI_mob_gargoyle(Creature* pCreature)
{
return new mob_gargoyleAI(pCreature);
src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.h
+1 -1
View File
@@ -32,4 +32,4 @@ struct TRINITY_DLL_DECL hyjal_trashAI : public npc_escortAI
//private:
};
#endif
#endif
src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp
+3 -4
View File
@@ -61,7 +61,6 @@ struct TRINITY_DLL_DECL instance_mount_hyjal : public ScriptedInstance
uint32 Trash;
uint32 hordeRetreat;
uint32 allianceRetreat;
bool ArchiYell;
@@ -98,7 +97,7 @@ struct TRINITY_DLL_DECL instance_mount_hyjal : public ScriptedInstance
bool IsEncounterInProgress() const
{
for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
if (m_auiEncounter[i] == IN_PROGRESS) return true;
return false;
@@ -221,7 +220,7 @@ struct TRINITY_DLL_DECL instance_mount_hyjal : public ScriptedInstance
{
if (!m_uiAncientGemGUID.empty())
{
for(std::list<uint64>::iterator itr = m_uiAncientGemGUID.begin(); itr != m_uiAncientGemGUID.end(); ++itr)
for (std::list<uint64>::iterator itr = m_uiAncientGemGUID.begin(); itr != m_uiAncientGemGUID.end(); ++itr)
{
//don't know how long it expected
DoRespawnGameObject(*itr,DAY);
@@ -302,7 +301,7 @@ struct TRINITY_DLL_DECL instance_mount_hyjal : public ScriptedInstance
OUT_LOAD_INST_DATA(in);
std::istringstream loadStream(in);
loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3] >> m_auiEncounter[4] >> allianceRetreat >> hordeRetreat >> RaidDamage;
for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
if (m_auiEncounter[i] == IN_PROGRESS) // Do not load an encounter as IN_PROGRESS - reset it instead.
m_auiEncounter[i] = NOT_STARTED;
OUT_LOAD_INST_DATA_COMPLETE;
src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp
+2 -2
View File
@@ -64,7 +64,7 @@ struct TRINITY_DLL_DECL instance_old_hillsbrad : public ScriptedInstance
if (!players.isEmpty())
{
for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
{
if (Player* plr = itr->getSource())
return plr;
@@ -81,7 +81,7 @@ struct TRINITY_DLL_DECL instance_old_hillsbrad : public ScriptedInstance
if (!players.isEmpty())
{
for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
{
if (Player* pPlayer = itr->getSource())
pPlayer->KilledMonsterCredit(LODGE_QUEST_TRIGGER,0);
src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp
+1 -2
View File
@@ -346,7 +346,7 @@ struct TRINITY_DLL_DECL npc_thrall_old_hillsbradAI : public npc_escortAI
Map::PlayerList const& players = pMap->GetPlayers();
if (!players.isEmpty() && pMap->IsDungeon())
{
for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
{
if (Player* pPlayer = itr->getSource())
pPlayer->KilledMonsterCredit(20156,m_creature->GetGUID());
@@ -364,7 +364,6 @@ struct TRINITY_DLL_DECL npc_thrall_old_hillsbradAI : public npc_escortAI
}
}
void Reset()
{
LowHp = false;
src/bindings/scripts/scripts/kalimdor/moonglade.cpp
+1 -1
View File
@@ -325,7 +325,7 @@ public:
return;
if (pPlayer->GetQuestStatus(10965) == QUEST_STATUS_INCOMPLETE)
{
for(uint8 i = 0; i < 41; ++i)
for (uint8 i = 0; i < 41; ++i)
{
AddWaypoint(i, Clintar_spirit_WP[i][0], Clintar_spirit_WP[i][1], Clintar_spirit_WP[i][2], (uint32)Clintar_spirit_WP[i][4]);
}
src/bindings/scripts/scripts/kalimdor/onyxias_lair/boss_onyxia.cpp
+3 -3
View File
@@ -205,7 +205,7 @@ struct TRINITY_DLL_DECL boss_onyxiaAI : public ScriptedAI
{
InitialSpawn = false;
for(uint32 i = 0; i < 10; ++i)
for (uint32 i = 0; i < 10; ++i)
{
uint32 random = rand()%4;
Creature* Whelp = m_creature->SummonCreature(CREATURE_WHELP, SpawnLocations[random][0], SpawnLocations[random][1], SpawnLocations[random][2], 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30000);
@@ -265,7 +265,7 @@ struct TRINITY_DLL_DECL boss_onyxiaAI : public ScriptedAI
if (Phase == 2)
{
uint32 max = rand()%10;
for(uint32 i = 0; i < max; ++i)
for (uint32 i = 0; i < max; ++i)
{
uint32 random = rand()%3;
Creature* Whelp = m_creature->SummonCreature(CREATURE_WHELP, SpawnLocations[random][0], SpawnLocations[random][1], SpawnLocations[random][2], 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30000);
@@ -279,7 +279,7 @@ struct TRINITY_DLL_DECL boss_onyxiaAI : public ScriptedAI
uint32 max = rand() % 10 +1;
if (max < 5)
{
for(uint32 i = 0; i < max; ++i)
for (uint32 i = 0; i < max; ++i)
{
uint32 random = rand()%4;
Creature* Whelp = m_creature->SummonCreature(CREATURE_WHELP, SpawnLocations[random][0], SpawnLocations[random][1], SpawnLocations[random][2], 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30000);
src/bindings/scripts/scripts/kalimdor/razorfen_kraul/def_razorfen_kraul.h
+1 -1
View File
@@ -18,4 +18,4 @@
#define DEF_RAZORFEN_KRAUL_H
#define TYPE_WARD_KEEPERS 1
#endif
#endif
src/bindings/scripts/scripts/kalimdor/razorfen_kraul/instance_razorfen_kraul.cpp
+2 -3
View File
@@ -24,7 +24,6 @@ EndScriptData */
#include "precompiled.h"
#include "def_razorfen_kraul.h"
#define WARD_KEEPERS_NR 2
struct TRINITY_DLL_DECL instance_razorfen_kraul : public ScriptedInstance
@@ -48,7 +47,7 @@ struct TRINITY_DLL_DECL instance_razorfen_kraul : public ScriptedInstance
if (!players.isEmpty())
{
for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
{
if (Player* plr = itr->getSource())
return plr;
@@ -102,4 +101,4 @@ void AddSC_instance_razorfen_kraul()
newscript->Name = "instance_razorfen_kraul";
newscript->GetInstanceData = &GetInstanceData_instance_razorfen_kraul;
newscript->RegisterSelf();
}
}
src/bindings/scripts/scripts/kalimdor/silithus.cpp
+2 -2
View File
@@ -919,7 +919,7 @@ struct TRINITY_DLL_DECL npc_anachronos_quest_triggerAI : public ScriptedAI
uint8 KaldoreiSoldierCount = 0;
uint8 AnubisathConquerorCount = 0;
uint8 QirajiWaspCount = 0;
for(uint8 i = 0; i < 67; ++i)
for (uint8 i = 0; i < 67; ++i)
{
Creature* Spawn = NULL;
float X = SpawnLocation[locIndex + i].x;
@@ -967,7 +967,7 @@ struct TRINITY_DLL_DECL npc_anachronos_quest_triggerAI : public ScriptedAI
const Group::MemberSlotList members = EventGroup->GetMemberSlots();
for(Group::member_citerator itr = members.begin(); itr!= members.end(); itr++)
for (Group::member_citerator itr = members.begin(); itr!= members.end(); itr++)
{
GroupMember = (Unit::GetPlayer(itr->guid));
if(!GroupMember)
src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_bug_trio.cpp
+1 -1
View File
@@ -235,7 +235,7 @@ struct TRINITY_DLL_DECL boss_yaujAI : public ScriptedAI
pInstance->SetData(DATA_BUG_TRIO_DEATH, 1);
}
for(uint8 i = 0; i < 10; ++i)
for (uint8 i = 0; i < 10; ++i)
{
Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0);
Creature* Summoned = m_creature->SummonCreature(15621,m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(),0,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,90000);
src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp
+1 -1
View File
@@ -567,7 +567,7 @@ struct TRINITY_DLL_DECL cthunAI : public ScriptedAI
if (!PlayerList.isEmpty())
{
for(Map::PlayerList::const_iterator itr = PlayerList.begin(); itr != PlayerList.end(); ++itr)
for (Map::PlayerList::const_iterator itr = PlayerList.begin(); itr != PlayerList.end(); ++itr)
{
if (Player* pPlr = itr->getSource())
pPlr->PlayDirectSound(RANDOM_SOUND_WHISPER,pPlr);
src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_sartura.cpp
-1
View File
@@ -35,7 +35,6 @@ EndScriptData */
#define SPELL_WHIRLWINDADD 26038
#define SPELL_KNOCKBACK 26027
struct TRINITY_DLL_DECL boss_sarturaAI : public ScriptedAI
{
boss_sarturaAI(Creature *c) : ScriptedAI(c) {}
src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp
+1 -1
View File
@@ -320,7 +320,7 @@ struct TRINITY_DLL_DECL boss_twinemperorsAI : public ScriptedAI
Creature *nearb = NULL;
for(std::list<Creature*>::iterator iter = lUnitList.begin(); iter != lUnitList.end(); ++iter)
for (std::list<Creature*>::iterator iter = lUnitList.begin(); iter != lUnitList.end(); ++iter)
{
Creature *c = *iter;
if (c)
src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp
+2 -2
View File
@@ -157,7 +157,7 @@ struct TRINITY_DLL_DECL aqsentinelAI : public ScriptedAI
if (assistList.empty())
return;
for(std::list<Creature*>::iterator iter = assistList.begin(); iter != assistList.end(); ++iter)
for (std::list<Creature*>::iterator iter = assistList.begin(); iter != assistList.end(); ++iter)
AddBuddyToList((*iter));
}
@@ -263,7 +263,7 @@ struct TRINITY_DLL_DECL aqsentinelAI : public ScriptedAI
Unit *GetHatedManaUser()
{
std::list<HostilReference*>::iterator i;
for (i = m_creature->getThreatManager().getThreatList().begin();i != m_creature->getThreatManager().getThreatList().end(); ++i)
for (i = m_creature->getThreatManager().getThreatList().begin(); i != m_creature->getThreatManager().getThreatList().end(); ++i)
{
Unit* pUnit = Unit::GetUnit((*m_creature), (*i)->getUnitGuid());
if (pUnit->getPowerType()==POWER_MANA)
src/bindings/scripts/scripts/kalimdor/the_barrens.cpp
+4 -4
View File
@@ -327,7 +327,7 @@ struct TRINITY_DLL_DECL npc_twiggy_flatheadAI : public ScriptedAI
Wave = 0;
PlayerGUID = 0;
for(uint8 i = 0; i < 6; ++i)
for (uint8 i = 0; i < 6; ++i)
{
AffrayChallenger[i] = 0;
Challenger_down[i] = false;
@@ -366,7 +366,7 @@ struct TRINITY_DLL_DECL npc_twiggy_flatheadAI : public ScriptedAI
DoScriptText(SAY_TWIGGY_FLATHEAD_DOWN, m_creature);
pWarrior->FailQuest(1719);
for(uint8 i = 0; i < 6; ++i)
for (uint8 i = 0; i < 6; ++i)
{
if (AffrayChallenger[i])
{
@@ -407,7 +407,7 @@ struct TRINITY_DLL_DECL npc_twiggy_flatheadAI : public ScriptedAI
pWarrior->AreaExploredOrEventHappens(1719);
DoScriptText(SAY_TWIGGY_FLATHEAD_BEGIN, m_creature);
for(uint8 i = 0; i < 6; ++i)
for (uint8 i = 0; i < 6; ++i)
{
Creature* pCreature = m_creature->SummonCreature(AFFRAY_CHALLENGER, AffrayChallengerLoc[i][0], AffrayChallengerLoc[i][1], AffrayChallengerLoc[i][2], AffrayChallengerLoc[i][3], TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000);
if (!pCreature)
@@ -427,7 +427,7 @@ struct TRINITY_DLL_DECL npc_twiggy_flatheadAI : public ScriptedAI
{
if (Challenger_checker < diff)
{
for(uint8 i = 0; i < 6; ++i)
for (uint8 i = 0; i < 6; ++i)
{
if (AffrayChallenger[i])
{
src/bindings/scripts/scripts/kalimdor/thousand_needles.cpp
+3 -3
View File
@@ -68,7 +68,7 @@ struct TRINITY_DLL_DECL npc_kanatiAI : public npc_escortAI
void DoSpawnGalak()
{
for(int i = 0; i < 3; ++i)
for (int i = 0; i < 3; ++i)
m_creature->SummonCreature(NPC_GALAK_ASS,
m_afGalakLoc[0], m_afGalakLoc[1], m_afGalakLoc[2], 0.0f,
TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
@@ -157,7 +157,7 @@ struct TRINITY_DLL_DECL npc_lakota_windsongAI : public npc_escortAI
void DoSpawnBandits(int uiAmbushId)
{
for(int i = 0; i < 2; ++i)
for (int i = 0; i < 2; ++i)
m_creature->SummonCreature(NPC_GRIM_BANDIT,
m_afBanditLoc[i+uiAmbushId][0], m_afBanditLoc[i+uiAmbushId][1], m_afBanditLoc[i+uiAmbushId][2], 0.0f,
TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000);
@@ -230,7 +230,7 @@ struct TRINITY_DLL_DECL npc_paoka_swiftmountainAI : public npc_escortAI
void DoSpawnWyvern()
{
for(int i = 0; i < 3; ++i)
for (int i = 0; i < 3; ++i)
m_creature->SummonCreature(NPC_WYVERN,
m_afWyvernLoc[i][0], m_afWyvernLoc[i][1], m_afWyvernLoc[i][2], 0.0f,
TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000);
src/bindings/scripts/scripts/kalimdor/ungoro_crater.cpp
-1
View File
@@ -44,7 +44,6 @@ EndContentData */
#define ENTRY_TARLORD1 6519
#define ENTRY_STOMPER 6513
struct TRINITY_DLL_DECL npc_ameAI : public npc_escortAI
{
npc_ameAI(Creature *c) : npc_escortAI(c) {}
src/bindings/scripts/scripts/kalimdor/wailing_caverns/instance_wailing_caverns.cpp
+2 -2
View File
@@ -118,7 +118,7 @@ struct TRINITY_DLL_DECL instance_wailing_caverns : public ScriptedInstance
loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3]
>> m_auiEncounter[4] >> m_auiEncounter[5] >> m_auiEncounter[6] >> m_auiEncounter[7] >> m_auiEncounter[8];
for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
if (m_auiEncounter[i] != DONE)
m_auiEncounter[i] = NOT_STARTED;
@@ -139,4 +139,4 @@ void AddSC_instance_wailing_caverns()
newscript->Name = "instance_wailing_caverns";
newscript->GetInstanceData = &GetInstanceData_instance_wailing_caverns;
newscript->RegisterSelf();
}
}
src/bindings/scripts/scripts/kalimdor/wailing_caverns/wailing_caverns.cpp
+1 -1
View File
@@ -261,7 +261,7 @@ struct TRINITY_DLL_DECL npc_disciple_of_naralexAI : public npc_escortAI
if (pMap && pMap->IsDungeon())
{
Map::PlayerList const &players = pMap->GetPlayers();
for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
itr->getSource()->CompletedAchievement(AchievWC);
}
}
src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp
+1 -2
View File
@@ -69,7 +69,6 @@ struct TRINITY_DLL_DECL boss_elder_nadoxAI : public ScriptedAI
uint32 guard_spawn_Timer;
uint32 enrage_Timer;
ScriptedInstance *pInstance;
void Reset()
@@ -116,7 +115,7 @@ struct TRINITY_DLL_DECL boss_elder_nadoxAI : public ScriptedAI
if (pMap && pMap->IsDungeon())
{
Map::PlayerList const &players = pMap->GetPlayers();
for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
itr->getSource()->CompletedAchievement(AchievRespectYourElders);
}
}
src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp
+1 -1
View File
@@ -131,7 +131,7 @@ struct TRINITY_DLL_DECL boss_volazjAI : public ScriptedAI
if (HeroicMode && uiEncounterTimer < 120000 && pMap && pMap->IsDungeon() && AchievQuickDemise)
{
Map::PlayerList const &players = pMap->GetPlayers();
for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
itr->getSource()->CompletedAchievement(AchievQuickDemise);
}
}
src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp
+3 -3
View File
@@ -212,7 +212,7 @@ struct TRINITY_DLL_DECL boss_taldaramAI : public ScriptedAI
Unit *target = NULL;
std::list<HostilReference *> t_list = m_creature->getThreatManager().getThreatList();
std::vector<Unit *> target_list;
for(std::list<HostilReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr)
for (std::list<HostilReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr)
{
target = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid());
// exclude pets & totems
@@ -268,10 +268,10 @@ struct TRINITY_DLL_DECL boss_taldaramAI : public ScriptedAI
{
Map::PlayerList const &players = pMap->GetPlayers();
uint8 count = 0;
for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
++count;
if (count < 5)
for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
itr->getSource()->CompletedAchievement(AchievThePartyIsOver);
}
}
src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/instance_ahnkahet.cpp
+3 -4
View File
@@ -61,7 +61,7 @@ struct TRINITY_DLL_DECL instance_ahnkahet : public ScriptedInstance
Herald_Volazj =0;
Amanitar =0;
for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
m_auiEncounter[i] = NOT_STARTED;
spheres[0] = NOT_STARTED;
spheres[1] = NOT_STARTED;
@@ -69,13 +69,12 @@ struct TRINITY_DLL_DECL instance_ahnkahet : public ScriptedInstance
bool IsEncounterInProgress() const
{
for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
if (m_auiEncounter[i] == IN_PROGRESS) return true;
return false;
}
void OnCreatureCreate(Creature* pCreature, bool add)
{
switch(pCreature->GetEntry())
@@ -217,7 +216,7 @@ struct TRINITY_DLL_DECL instance_ahnkahet : public ScriptedInstance
m_auiEncounter[3] = data3;
m_auiEncounter[4] = data4;
for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
if (m_auiEncounter[i] == IN_PROGRESS)
m_auiEncounter[i] = NOT_STARTED;
src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp
+1 -4
View File
@@ -154,7 +154,6 @@ struct TRINITY_DLL_DECL boss_krik_thirAI : public ScriptedAI
if (!UpdateVictim())
return;
if(SummonTimer < diff)
{
Summon();
@@ -201,7 +200,7 @@ struct TRINITY_DLL_DECL boss_krik_thirAI : public ScriptedAI
HeroicMode && pMap && pMap->IsDungeon() && AchievWatchHimDie)
{
Map::PlayerList const &players = pMap->GetPlayers();
for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
itr->getSource()->CompletedAchievement(AchievWatchHimDie);
}
}
@@ -357,7 +356,6 @@ struct TRINITY_DLL_DECL npc_watcher_gashraAI : public ScriptedAI
InfectedBiteTimer = 4000;
}
void EnterCombat(Unit* who)
{
m_creature->CastSpell(m_creature,SPELL_ENRAGE,true);
@@ -513,7 +511,6 @@ CreatureAI* GetAI_npc_watcher_silthik (Creature* pCreature)
return new npc_watcher_silthikAI (pCreature);
}
void AddSC_boss_krik_thir()
{
Script *newscript;
src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp
+2 -3
View File
@@ -64,13 +64,12 @@ struct TRINITY_DLL_DECL instance_azjol_nerub : public ScriptedInstance
bool IsEncounterInProgress() const
{
for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
if (m_auiEncounter[i] == IN_PROGRESS) return true;
return false;
}
void OnCreatureCreate(Creature* pCreature, bool add)
{
switch(pCreature->GetEntry())
@@ -182,7 +181,7 @@ struct TRINITY_DLL_DECL instance_azjol_nerub : public ScriptedInstance
m_auiEncounter[1] = data1;
m_auiEncounter[2] = data2;
for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
if (m_auiEncounter[i] == IN_PROGRESS)
m_auiEncounter[i] = NOT_STARTED;
src/bindings/scripts/scripts/northrend/draktharon_keep/boss_novos.cpp
+1 -1
View File
@@ -170,7 +170,7 @@ struct TRINITY_DLL_DECL boss_novosAI : public Scripted_NoMovementAI
if (pMap && pMap->IsDungeon())
{
Map::PlayerList const &players = pMap->GetPlayers();
for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
itr->getSource()->CompletedAchievement(AchievOhNovos);
}
}
src/bindings/scripts/scripts/northrend/draktharon_keep/instance_drak_tharon_keep.cpp
+2 -2
View File
@@ -41,7 +41,7 @@ struct TRINITY_DLL_DECL instance_drak_tharon : public ScriptedInstance
bool IsEncounterInProgress() const
{
for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
if (m_auiEncounter[i] == IN_PROGRESS) return true;
return false;
@@ -177,7 +177,7 @@ struct TRINITY_DLL_DECL instance_drak_tharon : public ScriptedInstance
m_auiEncounter[2] = data2;
m_auiEncounter[3] = data3;
for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
if (m_auiEncounter[i] == IN_PROGRESS)
m_auiEncounter[i] = NOT_STARTED;
}else OUT_LOAD_INST_DATA_FAIL;

Some files were not shown because too many files have changed in this diff Show More