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

Code Style: Remove trailing spaces

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Spp
2010-04-07 18:09:10 +02:00
parent f490ad5ac2
commit b27ce42704
153 changed files with 773 additions and 773 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/scripts/kalimdor/blackfathom_depths/boss_aku_mai.cpp
+9 -9
View File
@@ -31,12 +31,12 @@ struct boss_aku_maiAI : public ScriptedAI
{
pInstance = c->GetInstanceData();
}
uint32 uiPoisonCloudTimer;
bool bIsEnraged;
ScriptedInstance *pInstance;
void Reset()
{
uiPoisonCloudTimer = urand(5000,9000);
@@ -44,24 +44,24 @@ struct boss_aku_maiAI : public ScriptedAI
if (pInstance)
pInstance->SetData(TYPE_AKU_MAI, NOT_STARTED);
}
void EnterCombat(Unit* who)
{
if (pInstance)
pInstance->SetData(TYPE_AKU_MAI, IN_PROGRESS);
}
void JustDied(Unit* killer)
{
if (pInstance)
pInstance->SetData(TYPE_AKU_MAI, DONE);
}
void UpdateAI(const uint32 diff)
{
if (!UpdateVictim())
return;
if (uiPoisonCloudTimer < diff)
{
DoCastVictim(SPELL_POISON_CLOUD);
@@ -73,7 +73,7 @@ struct boss_aku_maiAI : public ScriptedAI
DoCast(m_creature,SPELL_FRENZIED_RAGE);
bIsEnraged = true;
}
DoMeleeAttackIfReady();
}
};
@@ -86,7 +86,7 @@ CreatureAI* GetAI_boss_aku_mai(Creature* pCreature)
void AddSC_boss_aku_mai()
{
Script *newscript;
newscript = new Script;
newscript->Name = "boss_aku_mai";
newscript->GetAI = &GetAI_boss_aku_mai;
src/scripts/kalimdor/blackfathom_depths/boss_gelihast.cpp
+1 -1
View File
@@ -64,7 +64,7 @@ struct boss_gelihastAI : public ScriptedAI
DoCastVictim(SPELL_NET);
uiNetTimer = urand(4000,7000);
} else uiNetTimer -= diff;
DoMeleeAttackIfReady();
}
};
src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_epoch.cpp
+3 -3
View File
@@ -75,7 +75,7 @@ struct boss_epochAI : public ScriptedAI
uiTimeWarpTimer = 25300;
uiTimeStopTimer = 21300;
uiWoundingStrikeTimer = 5300;
if (pInstance)
pInstance->SetData(DATA_EPOCH_EVENT, NOT_STARTED);
}
@@ -83,7 +83,7 @@ struct boss_epochAI : public ScriptedAI
void EnterCombat(Unit* who)
{
DoScriptText(SAY_AGGRO, m_creature);
if (pInstance)
pInstance->SetData(DATA_EPOCH_EVENT, IN_PROGRESS);
}
@@ -126,7 +126,7 @@ struct boss_epochAI : public ScriptedAI
void JustDied(Unit* killer)
{
DoScriptText(SAY_DEATH, m_creature);
if (pInstance)
pInstance->SetData(DATA_EPOCH_EVENT, DONE);
}
src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_infinite.cpp
+3 -3
View File
@@ -39,7 +39,7 @@ struct boss_infinite_corruptorAI : public ScriptedAI
{
pInstance = c->GetInstanceData();
}
ScriptedInstance* pInstance;
void Reset()
@@ -47,7 +47,7 @@ struct boss_infinite_corruptorAI : public ScriptedAI
if (pInstance)
pInstance->SetData(DATA_INFINITE_EVENT, NOT_STARTED);
}
void EnterCombat(Unit* who)
{
if (pInstance)
@@ -64,7 +64,7 @@ struct boss_infinite_corruptorAI : public ScriptedAI
DoMeleeAttackIfReady();
}
void JustDied(Unit* killer)
{
if (pInstance)
src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp
+3 -3
View File
@@ -87,7 +87,7 @@ struct boss_mal_ganisAI : public ScriptedAI
bool bYelled2;
CombatPhases Phase;
ScriptedInstance* pInstance;
void Reset()
@@ -100,7 +100,7 @@ struct boss_mal_ganisAI : public ScriptedAI
uiVampiricTouchTimer = urand(10000,15000);
uiSleepTimer = urand(15000,20000);
uiOutroTimer = 1000;
if (pInstance)
pInstance->SetData(DATA_MAL_GANIS_EVENT, NOT_STARTED);
}
@@ -218,7 +218,7 @@ struct boss_mal_ganisAI : public ScriptedAI
m_creature->SetVisibility(VISIBILITY_OFF);
m_creature->Kill(m_creature);
break;
}
} else uiOutroTimer -= diff;
break;
src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp
+5 -5
View File
@@ -48,7 +48,7 @@ enum Yells
struct boss_meathookAI : public ScriptedAI
{
boss_meathookAI(Creature *c) : ScriptedAI(c)
boss_meathookAI(Creature *c) : ScriptedAI(c)
{
pInstance = c->GetInstanceData();
if (pInstance)
@@ -58,7 +58,7 @@ struct boss_meathookAI : public ScriptedAI
uint32 uiChainTimer;
uint32 uiDiseaseTimer;
uint32 uiFrenzyTimer;
ScriptedInstance* pInstance;
void Reset()
@@ -66,7 +66,7 @@ struct boss_meathookAI : public ScriptedAI
uiChainTimer = urand(12000,17000); //seen on video 13, 17, 15, 12, 16
uiDiseaseTimer = urand(2000,4000); //approx 3s
uiFrenzyTimer = urand(21000,26000); //made it up
if (pInstance)
pInstance->SetData(DATA_MEATHOOK_EVENT, NOT_STARTED);
}
@@ -74,7 +74,7 @@ struct boss_meathookAI : public ScriptedAI
void EnterCombat(Unit* who)
{
DoScriptText(SAY_AGGRO, m_creature);
if (pInstance)
pInstance->SetData(DATA_MEATHOOK_EVENT, IN_PROGRESS);
}
@@ -110,7 +110,7 @@ struct boss_meathookAI : public ScriptedAI
void JustDied(Unit* killer)
{
DoScriptText(SAY_DEATH, m_creature);
if (pInstance)
pInstance->SetData(DATA_MEATHOOK_EVENT, DONE);
}
src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_salramm.cpp
+4 -4
View File
@@ -72,7 +72,7 @@ struct boss_salrammAI : public ScriptedAI
uint32 uiShadowBoltTimer;
uint32 uiStealFleshTimer;
uint32 uiSummonGhoulsTimer;
ScriptedInstance* pInstance;
void Reset()
@@ -82,7 +82,7 @@ struct boss_salrammAI : public ScriptedAI
uiShadowBoltTimer = urand(8000,12000); // approx 10s
uiStealFleshTimer = 12345;
uiSummonGhoulsTimer = urand(19000,24000); //on a video approx 24s after aggro
if (pInstance)
pInstance->SetData(DATA_SALRAMM_EVENT, NOT_STARTED);
}
@@ -90,7 +90,7 @@ struct boss_salrammAI : public ScriptedAI
void EnterCombat(Unit* who)
{
DoScriptText(SAY_AGGRO, m_creature);
if (pInstance)
pInstance->SetData(DATA_SALRAMM_EVENT, IN_PROGRESS);
}
@@ -140,7 +140,7 @@ struct boss_salrammAI : public ScriptedAI
void JustDied(Unit* killer)
{
DoScriptText(SAY_DEATH, m_creature);
if (pInstance)
pInstance->SetData(DATA_SALRAMM_EVENT, DONE);
}
src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.cpp
+44 -44
View File
@@ -248,21 +248,21 @@ struct npc_arthasAI : public npc_escortAI
uint64 uiEpochGUID;
uint64 uiMalganisGUID;
uint64 uiInfiniteGUID;
uint32 uiExorcismTimer;
void Reset()
{
void Reset()
{
uiUtherGUID = 0;
uiJainaGUID = 0;
for (uint8 i = 0; i < 2; ++i)
for (uint8 i = 0; i < 2; ++i)
uiCitymenGUID[i] = 0;
for (uint8 i = 0; i < ENCOUNTER_WAVES_MAX_SPAWNS; ++i)
for (uint8 i = 0; i < ENCOUNTER_WAVES_MAX_SPAWNS; ++i)
uiWaveGUID[i] = 0;
for (uint8 i = 0; i < ENCOUNTER_DRACONIAN_NUMBER; ++i)
for (uint8 i = 0; i < ENCOUNTER_DRACONIAN_NUMBER; ++i)
uiInfiniteDraconianGUID[i] = 0;
uiStalkerGUID = 0;
@@ -283,7 +283,7 @@ struct npc_arthasAI : public npc_escortAI
uiGossipStep = 0;
break;
}
uiPhaseTimer = 1000;
uiPhaseTimer = 1000;
uiExorcismTimer = 7300;
uiWave = 0;
}
@@ -299,7 +299,7 @@ struct npc_arthasAI : public npc_escortAI
if (pInstance)
pInstance->SetData(DATA_ARTHAS_EVENT, FAIL);
}
void SpawnTimeRift(uint32 timeRiftID, uint64* guidVector)
{
m_creature->SummonCreature((uint32)RiftAndSpawnsLocations[timeRiftID][0],RiftAndSpawnsLocations[timeRiftID][1],RiftAndSpawnsLocations[timeRiftID][2],RiftAndSpawnsLocations[timeRiftID][3],RiftAndSpawnsLocations[timeRiftID][4],TEMPSUMMON_TIMED_DESPAWN,11000);
@@ -380,7 +380,7 @@ struct npc_arthasAI : public npc_escortAI
if (Unit* pDisguised1 = m_creature->SummonCreature(NPC_CITY_MAN4,2403.22f,1205.54f,134.04f,3.311264f,TEMPSUMMON_DEAD_DESPAWN,180000))
{
uiInfiniteDraconianGUID[1] = pDisguised1->GetGUID();
if (Unit* pDisguised2 = m_creature->SummonCreature(NPC_CITY_MAN,2400.82f,1201.69f,134.01f,1.534082f,TEMPSUMMON_DEAD_DESPAWN,180000))
{
uiInfiniteDraconianGUID[2] = pDisguised2->GetGUID();
@@ -733,8 +733,8 @@ struct npc_arthasAI : public npc_escortAI
pZombie->UpdateEntry(NPC_ZOMBIE, 0);
else //There's no one else to transform
uiStep++;
}
else
}
else
uiStep++;
uiPhaseTimer = 500;
break;
@@ -742,7 +742,7 @@ struct npc_arthasAI : public npc_escortAI
if (Creature* pMalganis = Unit::GetCreature(*me, uiMalganisGUID))
DoScriptText(SAY_PHASE207, pMalganis);
JumpToNextStep(17000);
break;
break;
case 39:
if (Creature* pMalganis = Unit::GetCreature(*me, uiMalganisGUID))
pMalganis->SetVisibility(VISIBILITY_OFF);
@@ -760,7 +760,7 @@ struct npc_arthasAI : public npc_escortAI
uiBossEvent = DATA_MEATHOOK_EVENT;
if (pInstance)
pInstance->SetData(DATA_ARTHAS_EVENT, IN_PROGRESS);
m_creature->SetReactState(REACT_DEFENSIVE);
SetDespawnAtFar(false);
JumpToNextStep(5000);
@@ -794,11 +794,11 @@ struct npc_arthasAI : public npc_escortAI
uint32 deadCounter = 0;
for (uint8 i = 0; i < ENCOUNTER_WAVES_MAX_SPAWNS; ++i)
{
if (uiWaveGUID[i] == 0)
if (uiWaveGUID[i] == 0)
break;
++mobCounter;
Unit* pTemp = Unit::GetCreature(*me, uiWaveGUID[i]);
if (!pTemp || pTemp->isDead())
if (!pTemp || pTemp->isDead())
++deadCounter;
}
@@ -806,8 +806,8 @@ struct npc_arthasAI : public npc_escortAI
JumpToNextStep(1000);
else
uiPhaseTimer = 1000;
}
else
}
else
JumpToNextStep(500);
break;
case 49: //Summon Boss
@@ -821,7 +821,7 @@ struct npc_arthasAI : public npc_escortAI
uiBossID = NPC_SALRAMM;
if (Unit* pBoss = m_creature->SummonCreature(uiBossID,2232.19f,1331.933f,126.662f,3.15f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,900000))
{
{
uiBossGUID = pBoss->GetGUID();
pBoss->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
pBoss->GetMotionMaster()->MovePoint(0, 2194.110f,1332.00f,130.00f);
@@ -841,13 +841,13 @@ struct npc_arthasAI : public npc_escortAI
else if (uiBossEvent == DATA_SALRAMM_EVENT)
{
SetHoldState(false);
bStepping = false;
bStepping = false;
uiBossEvent = DATA_EPOCH_EVENT;
}
}
else if (pInstance->GetData(uiBossEvent) == FAIL)
}
else if (pInstance->GetData(uiBossEvent) == FAIL)
npc_escortAI::EnterEvadeMode();
else
else
uiPhaseTimer = 10000;
}
break;
@@ -866,7 +866,7 @@ struct npc_arthasAI : public npc_escortAI
if (Creature* pDisguised0 = Unit::GetCreature(*me, uiInfiniteDraconianGUID[0]))
DoScriptText(SAY_PHASE302, pDisguised0);
JumpToNextStep(7000);
break;
break;
case 63:
DoScriptText(SAY_PHASE303, m_creature);
SetHoldState(false);
@@ -877,7 +877,7 @@ struct npc_arthasAI : public npc_escortAI
case 64:
m_creature->HandleEmoteCommand(54);
JumpToNextStep(1000);
break;
break;
case 65:
if (Creature* pDisguised0 = Unit::GetCreature(*me, uiInfiniteDraconianGUID[0]))
pDisguised0->HandleEmoteCommand(11);
@@ -936,12 +936,12 @@ struct npc_arthasAI : public npc_escortAI
}
JumpToNextStep(5000);
break;
case 72:
case 72:
case 74:
case 76:
if (m_creature->isInCombat())
uiPhaseTimer = 1000;
else
else
{
if (uiStep == 72) DoScriptText(SAY_PHASE308,m_creature);
if (uiStep == 74) DoScriptText(SAY_PHASE308,m_creature);
@@ -955,7 +955,7 @@ struct npc_arthasAI : public npc_escortAI
case 78:
if (m_creature->isInCombat())
uiPhaseTimer = 1000;
else
else
{
DoScriptText(SAY_PHASE312,m_creature);
JumpToNextStep(5000);
@@ -975,7 +975,7 @@ struct npc_arthasAI : public npc_escortAI
m_creature->SetUInt64Value(UNIT_FIELD_TARGET, uiEpochGUID);
}
JumpToNextStep(18000);
break;
break;
case 81:
if (pInstance)
if (pInstance->GetData(DATA_EPOCH_EVENT) != DONE)
@@ -990,13 +990,13 @@ struct npc_arthasAI : public npc_escortAI
{
//Make Epoch attackable
pEpoch->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_UNK_9);
pEpoch->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
pEpoch->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
pEpoch->SetReactState(REACT_AGGRESSIVE);
}
}
JumpToNextStep(1000);
break;
break;
case 83:
if (pInstance)
{
@@ -1008,9 +1008,9 @@ struct npc_arthasAI : public npc_escortAI
uiBossEvent = DATA_MAL_GANIS_EVENT;
JumpToNextStep(15000);
}
else if (pInstance->GetData(DATA_EPOCH_EVENT) == FAIL)
else if (pInstance->GetData(DATA_EPOCH_EVENT) == FAIL)
npc_escortAI::EnterEvadeMode();
else
else
uiPhaseTimer = 10000;
}
break;
@@ -1032,7 +1032,7 @@ struct npc_arthasAI : public npc_escortAI
{
GameObject* pGate = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_MAL_GANIS_GATE_1));
pGate->SetGoState(GO_STATE_ACTIVE);
}
}
SetHoldState(false);
bStepping = false;
JumpToNextStep(0);
@@ -1059,9 +1059,9 @@ struct npc_arthasAI : public npc_escortAI
SetHoldState(false);
JumpToNextStep(1000);
}
else if (pInstance->GetData(DATA_MAL_GANIS_EVENT) == FAIL)
else if (pInstance->GetData(DATA_MAL_GANIS_EVENT) == FAIL)
npc_escortAI::EnterEvadeMode();
else
else
uiPhaseTimer = 10000;
}
break;
@@ -1083,19 +1083,19 @@ struct npc_arthasAI : public npc_escortAI
break;
}
} else uiPhaseTimer -= diff;
}
}
//Battling skills
if (!m_creature->getVictim())
return;
if (uiExorcismTimer < diff)
{
if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0))
DoCast(target, DUNGEON_MODE(SPELL_EXORCISM_N, SPELL_EXORCISM_H));
uiExorcismTimer = 7300;
} else uiExorcismTimer -= diff;
if (HealthBelowPct(40))
DoCast(m_creature, SPELL_HOLY_LIGHT);
}
@@ -1116,7 +1116,7 @@ CreatureAI* GetAI_npc_arthas(Creature* pCreature)
bool GossipHello_npc_arthas(Player* pPlayer, Creature* pCreature)
{
npc_arthasAI* pAI = CAST_AI(npc_arthasAI,pCreature->AI());
if (pAI && pAI->bStepping == false)
{
switch (pAI->uiGossipStep)
@@ -1161,7 +1161,7 @@ bool GossipSelect_npc_arthas(Player *pPlayer, Creature *pCreature, uint32 sender
if (!pAI)
return false;
switch (action)
{
case GOSSIP_ACTION_INFO_DEF:
src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.h
+1 -1
View File
@@ -46,7 +46,7 @@ enum Data64
enum Creatures
{
NPC_MEATHOOK = 26529,
NPC_MEATHOOK = 26529,
NPC_SALRAMM = 26530,
NPC_EPOCH = 26532,
NPC_MAL_GANIS = 26533,
src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp
+11 -11
View File
@@ -24,15 +24,15 @@
/* Culling of Stratholme encounters:
0 - Meathook
1 - Salramm the Fleshcrafter
2 - Chrono-Lord Epoch
3 - Mal'Ganis
2 - Chrono-Lord Epoch
3 - Mal'Ganis
4 - Infinite Corruptor (Heroic only)
*/
struct instance_culling_of_stratholme : public ScriptedInstance
{
instance_culling_of_stratholme(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
uint64 uiArthas;
uint64 uiMeathook;
uint64 uiSalramm;
@@ -45,10 +45,10 @@ struct instance_culling_of_stratholme : public ScriptedInstance
uint64 uiMalGanisGate2;
uint64 uiExitGate;
uint64 uiMalGanisChest;
uint32 m_auiEncounter[MAX_ENCOUNTER];
std::string str_data;
bool IsEncounterInProgress() const
{
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
@@ -56,7 +56,7 @@ struct instance_culling_of_stratholme : public ScriptedInstance
return false;
}
void OnCreatureCreate(Creature* pCreature, bool add)
{
switch(pCreature->GetEntry())
@@ -108,7 +108,7 @@ struct instance_culling_of_stratholme : public ScriptedInstance
break;
}
}
void SetData(uint32 type, uint32 data)
{
switch(type)
@@ -144,11 +144,11 @@ struct instance_culling_of_stratholme : public ScriptedInstance
m_auiEncounter[4] = data;
break;
}
if (data == DONE)
SaveToDB();
}
uint32 GetData(uint32 type)
{
switch(type)
@@ -161,7 +161,7 @@ struct instance_culling_of_stratholme : public ScriptedInstance
}
return 0;
}
uint64 GetData64(uint32 identifier)
{
switch(identifier)
@@ -180,7 +180,7 @@ struct instance_culling_of_stratholme : public ScriptedInstance
}
return 0;
}
std::string GetSaveData()
{
OUT_SAVE_INST_DATA;
src/scripts/kalimdor/desolace.cpp
+1 -1
View File
@@ -179,7 +179,7 @@ void AddSC_desolace()
newscript->pEffectDummyCreature = &EffectDummyCreature_npc_aged_dying_ancient_kodo;
newscript->pGossipHello = &GossipHello_npc_aged_dying_ancient_kodo;
newscript->RegisterSelf();
newscript = new Script;
newscript->Name = "go_iruxos";
newscript->pGOHello = &GOHello_go_iruxos;
src/scripts/kalimdor/durotar.cpp
+8 -8
View File
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
*/
#include "ScriptedPch.h"
@@ -39,24 +39,24 @@ enum LazyPeon
struct npc_lazy_peonAI : public ScriptedAI
{
npc_lazy_peonAI(Creature *c) : ScriptedAI(c) {}
uint64 uiPlayerGUID;
uint32 m_uiRebuffTimer;
uint32 work;
void Reset ()
{
uiPlayerGUID = 0;
work = false;
}
void MovementInform(uint32 type, uint32 id)
{
if (id == 1)
work = true;
}
void SpellHit(Unit *caster, const SpellEntry *spell)
{
if (spell->Id == SPELL_AWAKEN_PEON && caster->GetTypeId() == TYPEID_PLAYER
@@ -69,7 +69,7 @@ struct npc_lazy_peonAI : public ScriptedAI
m_creature->GetMotionMaster()->MovePoint(1,Lumberpile->GetPositionX()-1,Lumberpile->GetPositionY(),Lumberpile->GetPositionZ());
}
}
void UpdateAI(const uint32 uiDiff)
{
if (work = true)
@@ -95,7 +95,7 @@ CreatureAI* GetAI_npc_lazy_peon(Creature* pCreature)
void AddSC_durotar()
{
Script* newscript;
newscript = new Script;
newscript->Name = "npc_lazy_peon";
newscript->GetAI = &GetAI_npc_lazy_peon;
src/scripts/kalimdor/razorfen_downs/instance_razorfen_downs.cpp
+4 -4
View File
@@ -109,7 +109,7 @@ struct instance_razorfen_downs : public ScriptedInstance
if (uiType == DATA_GONG_WAVES)
{
uiGongWaves = uiData;
switch(uiGongWaves)
{
case 9:
@@ -127,10 +127,10 @@ struct instance_razorfen_downs : public ScriptedInstance
return;
pGo->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1);
uint32 uiCreature = 0;
uint8 uiSummonTimes = 0;
switch(uiGongWaves)
{
case 1:
@@ -147,7 +147,7 @@ struct instance_razorfen_downs : public ScriptedInstance
default:
break;
}
if (Creature* pCreature = pGo->SummonCreature(uiCreature,2502.635,844.140,46.896,0.633))
{
src/scripts/kalimdor/razorfen_downs/razorfen_downs.cpp
+1 -1
View File
@@ -117,7 +117,7 @@ struct npc_tomb_creatureAI : public ScriptedAI
{
if (!UpdateVictim())
return;
//from acid
if (m_creature->GetEntry() == CREATURE_TOMB_REAVER)
{
src/scripts/kalimdor/ruins_of_ahnqiraj/boss_ayamiss.cpp
+3 -3
View File
@@ -48,7 +48,7 @@ struct boss_ayamissAI : public ScriptedAI
uint32 POISONSTINGER_Timer;
uint32 SUMMONSWARMER_Timer;
uint32 phase;
ScriptedInstance *pInstance;
void Reset()
@@ -57,7 +57,7 @@ struct boss_ayamissAI : public ScriptedAI
POISONSTINGER_Timer = 30000;
SUMMONSWARMER_Timer = 60000;
phase=1;
if (pInstance)
pInstance->SetData(DATA_AYAMISS_EVENT, NOT_STARTED);
}
@@ -67,7 +67,7 @@ struct boss_ayamissAI : public ScriptedAI
if (pInstance)
pInstance->SetData(DATA_AYAMISS_EVENT, IN_PROGRESS);
}
void JustDied(Unit *killer)
{
if (pInstance)
src/scripts/kalimdor/ruins_of_ahnqiraj/boss_buru.cpp
+4 -4
View File
@@ -35,21 +35,21 @@ struct boss_buruAI : public ScriptedAI
{
pInstance = c->GetInstanceData();
}
ScriptedInstance *pInstance;
void Reset()
{
if (pInstance)
pInstance->SetData(DATA_BURU_EVENT, NOT_STARTED);
}
void EnterCombat(Unit *who)
{
if (pInstance)
pInstance->SetData(DATA_BURU_EVENT, IN_PROGRESS);
}
void JustDied(Unit *killer)
{
if (pInstance)
src/scripts/kalimdor/ruins_of_ahnqiraj/boss_kurinnaxx.cpp
+8 -8
View File
@@ -40,14 +40,14 @@ struct boss_kurinnaxxAI : public ScriptedAI
{
pInstance = c->GetInstanceData();
}
uint32 uiMortalWoundTimer;
uint32 uiSandtrapTimer;
uint32 uiWideSlashTimer;
uint32 uiSummonPlayerTimer;
uint32 uiTrashTimer;
bool bIsEnraged;
ScriptedInstance* pInstance;
void Reset()
@@ -58,17 +58,17 @@ struct boss_kurinnaxxAI : public ScriptedAI
uiWideSlashTimer = urand(10000,15000);
uiTrashTimer = urand(20000,25000);
uiSummonPlayerTimer = urand(30000,40000);
if (pInstance)
pInstance->SetData(DATA_KURINNAXX_EVENT, NOT_STARTED);
}
void EnterCombat(Unit *who)
{
{
if (pInstance)
pInstance->SetData(DATA_KURINNAXX_EVENT, IN_PROGRESS);
}
void JustDied(Unit *killer)
{
if (pInstance)
@@ -101,21 +101,21 @@ struct boss_kurinnaxxAI : public ScriptedAI
DoCast(pTarget, SPELL_SANDTRAP);
uiSandtrapTimer = 30000;
} else uiSandtrapTimer -= diff;
//Wide Slash spell
if (uiWideSlashTimer <= diff)
{
DoCast(m_creature->getVictim(), SPELL_WIDE_SLASH);
uiWideSlashTimer = urand(10000,15000);
} else uiWideSlashTimer -= diff;
//Trash spell
if (uiTrashTimer <= diff)
{
DoCast(m_creature, SPELL_TRASH);
uiTrashTimer = urand(20000,25000);
} else uiTrashTimer -= diff;
//Summon Player spell
if (uiSummonPlayerTimer <= diff)
{
src/scripts/kalimdor/ruins_of_ahnqiraj/boss_moam.cpp
+11 -11
View File
@@ -56,12 +56,12 @@ struct boss_moamAI : public ScriptedAI
{
pInstance = c->GetInstanceData();
}
uint32 uiTrampleTimer;
uint32 uiDrainManaTimer;
uint32 uiPhaseTimer;
CombatPhase Phase;
ScriptedInstance *pInstance;
void Reset()
@@ -71,7 +71,7 @@ struct boss_moamAI : public ScriptedAI
uiPhaseTimer = 90000;
Phase = NORMAL;
m_creature->SetPower(POWER_MANA,0);
if (pInstance)
pInstance->SetData(DATA_MOAM_EVENT, NOT_STARTED);
}
@@ -79,17 +79,17 @@ struct boss_moamAI : public ScriptedAI
void EnterCombat(Unit *who)
{
DoScriptText(EMOTE_AGGRO, m_creature);
if (pInstance)
pInstance->SetData(DATA_MOAM_EVENT, IN_PROGRESS);
}
void JustDied(Unit *killer)
{
if (pInstance)
pInstance->SetData(DATA_MOAM_EVENT, DONE);
}
void DrainMana()
{
for (uint8 i=0;i<6;++i)
@@ -108,7 +108,7 @@ struct boss_moamAI : public ScriptedAI
{
if (!UpdateVictim())
return;
//If we are 100%MANA cast Arcane Erruption
if (m_creature->GetPower(POWER_MANA) == m_creature->GetMaxPower(POWER_MANA))
{
@@ -116,23 +116,23 @@ struct boss_moamAI : public ScriptedAI
DoScriptText(EMOTE_MANA_FULL, m_creature);
m_creature->SetPower(POWER_MANA,0);
}
//Trample Spell
if (uiTrampleTimer <= diff)
{
DoCast(m_creature->getVictim(), SPELL_TRAMPLE);
uiTrampleTimer = urand(3000,7000);
} else uiTrampleTimer -= diff;
//Drain Mana
if (uiDrainManaTimer <= diff)
{
DrainMana();
uiDrainManaTimer = urand(3000,7000);
} else uiDrainManaTimer -= diff;
DoMeleeAttackIfReady();
//After 90secs change phase
if (uiPhaseTimer <= diff)
{
src/scripts/kalimdor/ruins_of_ahnqiraj/boss_ossirian.cpp
+4 -4
View File
@@ -43,21 +43,21 @@ struct boss_ossirianAI : public ScriptedAI
{
pInstance = c->GetInstanceData();
}
ScriptedInstance *pInstance;
void Reset()
{
if (pInstance)
pInstance->SetData(DATA_OSSIRIAN_EVENT, NOT_STARTED);
}
void EnterCombat(Unit *who)
{
if (pInstance)
pInstance->SetData(DATA_OSSIRIAN_EVENT, IN_PROGRESS);
}
void JustDied(Unit *killer)
{
if (pInstance)
src/scripts/kalimdor/ruins_of_ahnqiraj/boss_rajaxx.cpp
+4 -4
View File
@@ -49,21 +49,21 @@ struct boss_rajaxxAI : public ScriptedAI
{
pInstance = c->GetInstanceData();
}
ScriptedInstance *pInstance;
void Reset()
{
if (pInstance)
pInstance->SetData(DATA_RAJAXX_EVENT, NOT_STARTED);
}
void EnterCombat(Unit *who)
{
if (pInstance)
pInstance->SetData(DATA_RAJAXX_EVENT, IN_PROGRESS);
}
void JustDied(Unit *killer)
{
if (pInstance)
src/scripts/kalimdor/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp
+14 -14
View File
@@ -37,7 +37,7 @@ EndScriptData */
struct instance_ruins_of_ahn_qiraj : public ScriptedInstance
{
instance_ruins_of_ahn_qiraj(Map* pMap) : ScriptedInstance(pMap) { Initialize(); }
uint64 uiKurinaxx;
uint64 uiRajaxx;
uint64 uiMoam;
@@ -47,11 +47,11 @@ struct instance_ruins_of_ahn_qiraj : public ScriptedInstance
uint8 m_auiEncounter[MAX_ENCOUNTER];
std::string str_data;
void Initialize()
{
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
uiKurinaxx = 0;
uiRajaxx = 0;
uiMoam = 0;
@@ -59,7 +59,7 @@ struct instance_ruins_of_ahn_qiraj : public ScriptedInstance
uiAyamiss = 0;
uiOssirian = 0;
}
bool IsEncounterInProgress() const
{
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
@@ -67,7 +67,7 @@ struct instance_ruins_of_ahn_qiraj : public ScriptedInstance
return false;
}
void OnCreatureCreate(Creature* pCreature, bool add)
{
switch (pCreature->GetEntry())
@@ -92,7 +92,7 @@ struct instance_ruins_of_ahn_qiraj : public ScriptedInstance
break;
}
}
uint32 GetData(uint32 identifier)
{
switch(identifier)
@@ -104,10 +104,10 @@ struct instance_ruins_of_ahn_qiraj : public ScriptedInstance
case DATA_AYAMISS_EVENT: return m_auiEncounter[4];
case DATA_OSSIRIAN_EVENT: return m_auiEncounter[5];
}
return 0;
}
void SetData(uint32 identifier, uint32 data)
{
switch(identifier)
@@ -131,11 +131,11 @@ struct instance_ruins_of_ahn_qiraj : public ScriptedInstance
m_auiEncounter[5] = data;
break;
}
if (data == DONE)
SaveToDB();
}
uint64 GetData64(uint32 uiIdentifier)
{
switch(uiIdentifier)
@@ -147,10 +147,10 @@ struct instance_ruins_of_ahn_qiraj : public ScriptedInstance
case DATA_AYAMISS: return uiAyamiss;
case DATA_OSSIRIAN: return uiOssirian;
}
return 0;
}
std::string GetSaveData()
{
OUT_SAVE_INST_DATA;
@@ -164,7 +164,7 @@ struct instance_ruins_of_ahn_qiraj : public ScriptedInstance
OUT_SAVE_INST_DATA_COMPLETE;
return str_data;
}
void Load(const char* in)
{
if (!in)
@@ -189,7 +189,7 @@ struct instance_ruins_of_ahn_qiraj : public ScriptedInstance
m_auiEncounter[3] = data3;
m_auiEncounter[4] = data4;
m_auiEncounter[5] = data5;
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
if (m_auiEncounter[i] == IN_PROGRESS)
m_auiEncounter[i] = NOT_STARTED;
src/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp
+5 -5
View File
@@ -29,7 +29,7 @@ EndScriptData */
*
* The first phase is the EYE phase: the Eye of C'Thun is active and C'thun is not active.
* During this phase, the "Eye of C'Thun" alternates between 2 sub-phases:
* - PHASE_EYE_GREEN_BEAM:
* - PHASE_EYE_GREEN_BEAM:
* 50 sec phase during which the Eye mainly casts its Green Beam every 3 sec.
* - PHASE_EYE_RED_BEAM:
* 35 sec phase during which the Eye casts its red beam every sec.
@@ -39,7 +39,7 @@ EndScriptData */
* This phase starts with the transformation of the Eye into C'Thun (PHASE_CTHUN_TRANSITION).
* After the transformation, C'Thun alternates between 2 sub-phases:
* - PHASE_CTHUN_STOMACH:
* - C'Thun is almost insensible to all damage (99% damage reduction).
* - C'Thun is almost insensible to all damage (99% damage reduction).
* - It spawns 2 tentacles in its stomach.
* - C'Thun swallows players.
* - This sub-phase ends when the 2 tentacles are killed. Swallowed players are regurgitate.
@@ -50,7 +50,7 @@ EndScriptData */
*
* This CTHUN phase ends when C'Thun is killed
*
* Note:
* Note:
* - the current phase is stored in the instance data to be easily shared between the eye and cthun.
*/
@@ -94,7 +94,7 @@ enum Spells
{
//***** Main Phase 1 ********
//Eye Spells
SPELL_FREEZE_ANIM = 16245,
SPELL_FREEZE_ANIM = 16245,
SPELL_GREEN_BEAM = 26134,
SPELL_DARK_GLARE = 26029,
SPELL_RED_COLORATION = 22518, //Probably not the right spell but looks similar
@@ -331,7 +331,7 @@ struct eye_of_cthunAI : public Scripted_NoMovementAI
//Freeze animation
DoCast(m_creature, SPELL_FREEZE_ANIM);
m_creature->SetOrientation(DarkGlareAngle);
m_creature->StopMoving();
m_creature->StopMoving();
//Darkbeam for 35 seconds
PhaseTimer = 35000;
src/scripts/kalimdor/zulfarrak/instance_zulfarrak.cpp
+2 -2
View File
@@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "ScriptedPch.h"
#define NPC_GAHZRILLA 7273
@@ -42,7 +42,7 @@ struct instance_zulfarrak : public ScriptedInstance
}
}
};
InstanceData* GetInstanceData_instance_zulfarrak(Map* pMap)
{
return new instance_zulfarrak(pMap);