diff options
62 files changed, 477 insertions, 477 deletions
diff --git a/src/bindings/scripts/scripts/custom/on_events.cpp b/src/bindings/scripts/scripts/custom/on_events.cpp index 842d07f35f0..e8d9a68e793 100644 --- a/src/bindings/scripts/scripts/custom/on_events.cpp +++ b/src/bindings/scripts/scripts/custom/on_events.cpp @@ -103,6 +103,6 @@ bool OnSpellCast(Unit *pUnitTarget, Item *pItemTarget, GameObject *pGoTarget, ui newscript->pOnServerShutdown = &OnServerShutdown; newscript->pOnServerStartup = &OnServerStartup; newscript->pOnSpellCast = &OnSpellCast; - + newscript->RegisterSelf(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_terestian_illhoof.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_terestian_illhoof.cpp index b9e1a2e8e5a..f60fab0bddb 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_terestian_illhoof.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_terestian_illhoof.cpp @@ -304,10 +304,10 @@ struct TRINITY_DLL_DECL boss_terestianAI : public ScriptedAI { if(!PortalGUID[0]) DoCast(m_creature->getVictim(), SPELL_FIENDISH_PORTAL, false); - + if(!PortalGUID[1]) DoCast(m_creature->getVictim(), SPELL_FIENDISH_PORTAL_1, false); - + if(PortalGUID[0] && PortalGUID[1]) { if (Creature* pPortal = Unit::GetCreature(*m_creature, PortalGUID[rand()%2])) diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp index 82c5b42a751..449ed462a44 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp @@ -765,7 +765,7 @@ struct TRINITY_DLL_DECL npc_scarlet_ghoulAI : public ScriptedAI } } } - + if (!UpdateVictim()) return; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp index 7507bc5372f..22328334919 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp @@ -236,7 +236,7 @@ struct TRINITY_DLL_DECL boss_kalecgosAI : public ScriptedAI JustReseted = false; }else ResetTimer -= diff; return; - } + } if (!UpdateVictim()) return; @@ -316,8 +316,8 @@ struct TRINITY_DLL_DECL boss_kalecgosAI : public ScriptedAI if((*i)) { (*i)->CastSpell((*i), SPELL_SPECTRAL_BLAST,true); - SpectralBlastTimer = 20000+rand()%5000; - }else SpectralBlastTimer = 1000; + SpectralBlastTimer = 20000+rand()%5000; + }else SpectralBlastTimer = 1000; }else SpectralBlastTimer -= diff; DoMeleeAttackIfReady(); @@ -560,7 +560,7 @@ struct TRINITY_DLL_DECL boss_sathrovarrAI : public ScriptedAI if (Creature *Kalecgos = Unit::GetCreature(*me, KalecgosGUID)) Kalecgos->AI()->EnterEvadeMode(); return; - } + } if (HealthBelowPct(10) && !isEnraged) { if(Creature* Kalecgos = Unit::GetCreature(*me, KalecgosGUID)) @@ -609,7 +609,7 @@ struct TRINITY_DLL_DECL boss_sathrovarrAI : public ScriptedAI me->getThreatManager().modifyThreatPercent(pUnit,-100); } } - } + } ResetThreat = 1000; }else ResetThreat -= diff; @@ -732,7 +732,7 @@ struct TRINITY_DLL_DECL boss_kalecAI : public ScriptedAI bool GOkalecgos_teleporter(Player* pPlayer, GameObject* pGo) { uint32 SpectralPlayers = 0; - Map* pMap = pGo->GetMap(); + 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) diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/instance_sunwell_plateau.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/instance_sunwell_plateau.cpp index 4cb4f3eab21..4195ebd91a5 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/instance_sunwell_plateau.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/instance_sunwell_plateau.cpp @@ -212,7 +212,7 @@ struct TRINITY_DLL_DECL instance_sunwell_plateau : public ScriptedInstance HandleGameObject(KalecgosWall[0],false); HandleGameObject(KalecgosWall[1],false); } - m_auiEncounter[0] = data; + m_auiEncounter[0] = data; }break; case DATA_BRUTALLUS_EVENT: m_auiEncounter[1] = data; break; case DATA_FELMYST_EVENT: diff --git a/src/bindings/scripts/scripts/kalimdor/azuremyst_isle.cpp b/src/bindings/scripts/scripts/kalimdor/azuremyst_isle.cpp index 5527ca61996..76d7ff0e4af 100644 --- a/src/bindings/scripts/scripts/kalimdor/azuremyst_isle.cpp +++ b/src/bindings/scripts/scripts/kalimdor/azuremyst_isle.cpp @@ -440,7 +440,7 @@ struct TRINITY_DLL_DECL npc_geezleAI : public ScriptedAI switch(Step) { - case 0: + case 0: if (Spark) Spark->GetMotionMaster()->MovePoint(0, -5080.70, -11253.61, 0.56); m_creature->GetMotionMaster()->MovePoint(0, -5092.26, -11252, 0.71); @@ -472,7 +472,7 @@ struct TRINITY_DLL_DECL npc_geezleAI : public ScriptedAI case 10: if (Spark) Spark->DisappearAndDie(); - DespawnNagaFlag(false); + DespawnNagaFlag(false); m_creature->DisappearAndDie(); default: return 99999999; } @@ -491,7 +491,7 @@ struct TRINITY_DLL_DECL npc_geezleAI : public ScriptedAI { if((*itr)->GetQuestStatus(QUEST_TREES_COMPANY)==QUEST_STATUS_INCOMPLETE &&(*itr)->HasAuraEffect(SPELL_TREE_DISGUISE,3) ) - { + { (*itr)->KilledMonsterCredit(MOB_SPARK,0); } } diff --git a/src/bindings/scripts/scripts/kalimdor/blackfathom_depths/instance_blackfathom_deeps.cpp b/src/bindings/scripts/scripts/kalimdor/blackfathom_depths/instance_blackfathom_deeps.cpp index cab14e26de8..0845396ffa3 100644 --- a/src/bindings/scripts/scripts/kalimdor/blackfathom_depths/instance_blackfathom_deeps.cpp +++ b/src/bindings/scripts/scripts/kalimdor/blackfathom_depths/instance_blackfathom_deeps.cpp @@ -128,7 +128,7 @@ struct TRINITY_DLL_DECL instance_blackfathom_deeps : public ScriptedInstance return 0; } - + void CheckFires() { GameObject *pShrine1 = instance->GetGameObject(m_uiShrine1GUID); @@ -151,7 +151,7 @@ InstanceData* GetInstanceData_instance_blackfathom_deeps(Map* pMap) bool GoHello_fire(Player *pPlayer, GameObject* pGo) { ScriptedInstance *pInstance = pGo->GetInstanceData(); - + if (pInstance) { pGo->SetGoState(GO_STATE_ACTIVE); @@ -167,7 +167,7 @@ void AddSC_instance_blackfathom_deeps() newscript->Name = "instance_blackfathom_deeps"; newscript->GetInstanceData = &GetInstanceData_instance_blackfathom_deeps; newscript->RegisterSelf(); - + newscript = new Script; newscript->Name = "go_blackfathom_fire"; newscript->pGOHello = &GoHello_fire; diff --git a/src/bindings/scripts/scripts/kalimdor/silithus.cpp b/src/bindings/scripts/scripts/kalimdor/silithus.cpp index 396b09ea331..45313fbbc73 100644 --- a/src/bindings/scripts/scripts/kalimdor/silithus.cpp +++ b/src/bindings/scripts/scripts/kalimdor/silithus.cpp @@ -800,7 +800,7 @@ struct TRINITY_DLL_DECL mob_qiraj_war_spawnAI : public ScriptedAI { Unit* target; Player* plr = m_creature->GetPlayer(PlayerGUID); - + if(!Timers) { if(m_creature->GetEntry() == 15424 || m_creature->GetEntry() == 15422 || m_creature->GetEntry() == 15414) //all but Kaldorei Soldiers @@ -850,7 +850,7 @@ struct TRINITY_DLL_DECL mob_qiraj_war_spawnAI : public ScriptedAI { uint8 tar; tar = rand()%3; - + if (tar == 0) target = m_creature->FindNearestCreature(15422,20,true); else if (tar == 1) @@ -870,7 +870,7 @@ struct TRINITY_DLL_DECL mob_qiraj_war_spawnAI : public ScriptedAI hasTarget = false; return; } - + DoMeleeAttackIfReady(); } }; @@ -928,7 +928,7 @@ struct TRINITY_DLL_DECL npc_anachronos_quest_triggerAI : public ScriptedAI float O = SpawnLocation[locIndex + i].o; uint32 desptimer = WavesInfo[WaveCount].DespTimer; Spawn = m_creature->SummonCreature(WavesInfo[WaveCount].CreatureId, X, Y, Z, O, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, desptimer); - + if(Spawn) { Spawn->LoadCreaturesAddon(); @@ -1098,12 +1098,12 @@ CreatureAI* GetAI_npc_anachronos_the_ancient(Creature* c) void AddSC_silithus() { Script *newscript; - + newscript = new Script; newscript->Name = "go_crystalline_tear"; newscript->pGOQuestAccept = &GOQuestAccept_GO_crystalline_tear; newscript->RegisterSelf(); - + newscript = new Script; newscript->Name = "npc_anachronos_quest_trigger"; newscript->GetAI = &GetAI_npc_anachronos_quest_trigger; diff --git a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp index acdb27f3f08..33c3ba42011 100644 --- a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp +++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp @@ -76,19 +76,19 @@ struct TRINITY_DLL_DECL boss_volazjAI : public ScriptedAI uiMindFlayTimer = 8000; uiShadowBoltVolleyTimer = 5000; uiShiverTimer = 15000; - + if (pInstance) pInstance->SetData(DATA_HERALD_VOLAZJ, NOT_STARTED); } - + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); - + if (pInstance) pInstance->SetData(DATA_HERALD_VOLAZJ, IN_PROGRESS); } - + void UpdateAI(const uint32 diff) { //Return since we have no target @@ -98,22 +98,22 @@ struct TRINITY_DLL_DECL boss_volazjAI : public ScriptedAI if (uiMindFlayTimer < diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_MIND_FLAY, H_SPELL_MIND_FLAY)); - uiMindFlayTimer = 20000; + uiMindFlayTimer = 20000; } else uiMindFlayTimer -= diff; - + if (uiShadowBoltVolleyTimer < diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_SHADOW_BOLT_VOLLEY, H_SPELL_SHADOW_BOLT_VOLLEY)); uiShadowBoltVolleyTimer = 5000; } else uiShadowBoltVolleyTimer -= diff; - + if (uiShiverTimer < diff) { if (Unit * target = SelectUnit(SELECT_TARGET_RANDOM, 0)) DoCast(target, HEROIC(SPELL_SHIVER, H_SPELL_SHIVER)); uiShiverTimer = 15000; } else uiShiverTimer -= diff; - + uiEncounterTimer += diff; DoMeleeAttackIfReady(); @@ -121,13 +121,13 @@ struct TRINITY_DLL_DECL boss_volazjAI : public ScriptedAI void JustDied(Unit* killer) { DoScriptText(SAY_DEATH_1, m_creature); - + if (pInstance) pInstance->SetData(DATA_HERALD_VOLAZJ, DONE); - + AchievementEntry const *AchievQuickDemise = GetAchievementStore()->LookupEntry(ACHIEVEMENT_QUICK_DEMISE); Map* pMap = m_creature->GetMap(); - + if (HeroicMode && uiEncounterTimer < 120000 && pMap && pMap->IsDungeon() && AchievQuickDemise) { Map::PlayerList const &players = pMap->GetPlayers(); diff --git a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp index 40fa9ee5cfa..b6b1ac586eb 100644 --- a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp +++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp @@ -48,7 +48,7 @@ enum Spells H_CREATURE_FLAME_SPHERE_2 = 31687 }; enum Misc -{ +{ DATA_EMBRACE_DMG = 20000, H_DATA_EMBRACE_DMG = 40000, DATA_SPHERE_DISTANCE = 15 @@ -70,7 +70,7 @@ enum Yells SAY_VANISH_1 = -1619027, SAY_VANISH_2 = -1619028 }; -enum CombatPhase +enum CombatPhase { NORMAL, CASTING_FLAME_SPHERES, @@ -87,7 +87,7 @@ struct TRINITY_DLL_DECL boss_taldaramAI : public ScriptedAI m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } - + uint32 uiBloodthirstTimer; uint32 uiVanishTimer; uint32 uiWaitTimer; @@ -100,13 +100,13 @@ struct TRINITY_DLL_DECL boss_taldaramAI : public ScriptedAI Unit *pEmbraceTarget; Unit *pSphereTarget; - + Creature* pSpheres[3]; - + CombatPhase Phase; - + ScriptedInstance* pInstance; - + void Reset() { uiBloodthirstTimer = 10000; @@ -120,14 +120,14 @@ struct TRINITY_DLL_DECL boss_taldaramAI : public ScriptedAI if (pInstance) pInstance->SetData(DATA_PRINCE_TALDARAM_EVENT, NOT_STARTED); } - + void EnterCombat(Unit* who) { if (pInstance) pInstance->SetData(DATA_PRINCE_TALDARAM_EVENT, IN_PROGRESS); DoScriptText(SAY_AGGRO, m_creature); } - + void UpdateAI(const uint32 diff) { if (!UpdateVictim()) @@ -167,7 +167,7 @@ struct TRINITY_DLL_DECL boss_taldaramAI : public ScriptedAI pSpheres[2]->GetMotionMaster()->MovePoint(0, x, y, pSpheres[2]->GetPositionZ()); } } - + Phase = NORMAL; uiPhaseTimer = 0; break; @@ -197,7 +197,7 @@ struct TRINITY_DLL_DECL boss_taldaramAI : public ScriptedAI DoCast(m_creature->getVictim(),SPELL_BLOODTHIRST); uiBloodthirstTimer = 10000; } else uiBloodthirstTimer -= diff; - + if (uiFlamesphereTimer < diff) { DoCast(m_creature, SPELL_CONJURE_FLAME_SPHERE); @@ -205,7 +205,7 @@ struct TRINITY_DLL_DECL boss_taldaramAI : public ScriptedAI uiPhaseTimer = 3000 + diff; uiFlamesphereTimer = 15000; } else uiFlamesphereTimer -= diff; - + if (uiVanishTimer < diff ) { //Count alive players @@ -231,13 +231,13 @@ struct TRINITY_DLL_DECL boss_taldaramAI : public ScriptedAI } uiVanishTimer = urand(25000,35000); } else uiVanishTimer -= diff; - + DoMeleeAttackIfReady(); break; } } else uiPhaseTimer -= diff; } - + void DamageTaken(Unit* done_by, uint32 &damage) { if (Phase == FEEDING && pEmbraceTarget && pEmbraceTarget->isAlive()) @@ -252,15 +252,15 @@ struct TRINITY_DLL_DECL boss_taldaramAI : public ScriptedAI } } } - + void JustDied(Unit* killer) { DoScriptText(SAY_DEATH, m_creature); - + if (pInstance) { pInstance->SetData(DATA_PRINCE_TALDARAM_EVENT, DONE); - + //The Party's Over achievement: AchievementEntry const *AchievThePartyIsOver = GetAchievementStore()->LookupEntry(ACHIEVEMENT_THE_PARTY_IS_OVER); Map* pMap = m_creature->GetMap(); @@ -289,14 +289,14 @@ struct TRINITY_DLL_DECL boss_taldaramAI : public ScriptedAI } DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), m_creature); } - + bool CheckSpheres() { if(!pInstance) return false; uiSphereGuids[0] = pInstance->GetData64(DATA_SPHERE1); uiSphereGuids[1] = pInstance->GetData64(DATA_SPHERE2); - + GameObject *pSpheres[2]; for (uint8 i=0; i < 2; ++i) { @@ -309,7 +309,7 @@ struct TRINITY_DLL_DECL boss_taldaramAI : public ScriptedAI RemovePrison(); return true; } - + void RemovePrison() { m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); @@ -324,14 +324,14 @@ struct TRINITY_DLL_DECL boss_taldaramAI : public ScriptedAI struct TRINITY_DLL_DECL mob_taldaram_flamesphereAI : public ScriptedAI { - mob_taldaram_flamesphereAI(Creature *c) : ScriptedAI(c) + mob_taldaram_flamesphereAI(Creature *c) : ScriptedAI(c) { pInstance = c->GetInstanceData(); } - + uint32 uiDespawnTimer; ScriptedInstance* pInstance; - + void Reset() { m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -343,15 +343,15 @@ struct TRINITY_DLL_DECL mob_taldaram_flamesphereAI : public ScriptedAI DoCast(m_creature, HEROIC(SPELL_FLAME_SPHERE_PERIODIC, H_SPELL_FLAME_SPHERE_PERIODIC)); uiDespawnTimer = 10000; } - + void EnterCombat(Unit *who) {} void MoveInLineOfSight(Unit *who) {} - + void JustDied(Unit* slayer) { DoCast(m_creature, SPELL_FLAME_SPHERE_DEATH_EFFECT); } - + void UpdateAI(const uint32 diff) { if (uiDespawnTimer < diff) @@ -381,13 +381,13 @@ bool GOHello_prince_taldaram_sphere(Player *pPlayer, GameObject *pGO) // maybe these are hacks :( pGO->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); pGO->SetGoState(GO_STATE_ACTIVE); - + switch(pGO->GetEntry()) { case 193093: pInstance->SetData(DATA_SPHERE1_EVENT,IN_PROGRESS); break; case 193094: pInstance->SetData(DATA_SPHERE2_EVENT,IN_PROGRESS); break; } - + CAST_AI(boss_taldaramAI, pPrinceTaldaram->AI())->CheckSpheres(); } return true; @@ -401,12 +401,12 @@ void AddSC_boss_taldaram() newscript->Name = "boss_taldaram"; newscript->GetAI = &GetAI_boss_taldaram; newscript->RegisterSelf(); - + newscript = new Script; newscript->Name = "mob_taldaram_flamesphere"; newscript->GetAI = &GetAI_mob_taldaram_flamesphere; newscript->RegisterSelf(); - + newscript = new Script; newscript->Name = "prince_taldaram_sphere"; newscript->pGOHello = &GOHello_prince_taldaram_sphere; diff --git a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/instance_ahnkahet.cpp b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/instance_ahnkahet.cpp index d74fce9e47c..c8a0fc22c3c 100644 --- a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/instance_ahnkahet.cpp +++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/instance_ahnkahet.cpp @@ -45,7 +45,7 @@ struct TRINITY_DLL_DECL instance_ahnkahet : public ScriptedInstance uint64 Jedoga_Shadowseeker; uint64 Herald_Volazj; uint64 Amanitar; - + uint64 Prince_TaldaramSpheres[2]; uint64 Prince_TaldaramPlatform; uint64 Prince_TaldaramGate; @@ -60,7 +60,7 @@ struct TRINITY_DLL_DECL instance_ahnkahet : public ScriptedInstance Jedoga_Shadowseeker =0; Herald_Volazj =0; Amanitar =0; - + for(uint8 i = 0; i < MAX_ENCOUNTER; ++i) m_auiEncounter[i] = NOT_STARTED; spheres[0] = NOT_STARTED; @@ -87,7 +87,7 @@ struct TRINITY_DLL_DECL instance_ahnkahet : public ScriptedInstance case 30258: Amanitar = pCreature->GetGUID(); break; } } - + void OnGameObjectCreate(GameObject* pGo, bool add) { switch(pGo->GetEntry()) diff --git a/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp b/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp index 80d2ed04652..d06335bdbd3 100644 --- a/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp +++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp @@ -44,7 +44,7 @@ struct TRINITY_DLL_DECL instance_azjol_nerub : public ScriptedInstance uint64 m_uiWatcherGashra; uint64 m_uiWatcherSilthik; uint64 m_uiWatcherNarjil; - + uint64 m_uiKrikthirDoor; uint32 m_auiEncounter[MAX_ENCOUNTER]; @@ -83,7 +83,7 @@ struct TRINITY_DLL_DECL instance_azjol_nerub : public ScriptedInstance case 28729: m_uiWatcherNarjil = pCreature->GetGUID(); break; } } - + void OnGameObjectCreate(GameObject* pGo, bool add) { switch (pGo->GetEntry()) diff --git a/src/bindings/scripts/scripts/northrend/borean_tundra.cpp b/src/bindings/scripts/scripts/northrend/borean_tundra.cpp index 9f87ed03d79..85fc89940db 100644 --- a/src/bindings/scripts/scripts/northrend/borean_tundra.cpp +++ b/src/bindings/scripts/scripts/northrend/borean_tundra.cpp @@ -380,7 +380,7 @@ bool GossipHello_npc_corastrasza(Player* pPlayer, Creature* pCreature) { if (pCreature->isQuestGiver()) pPlayer->PrepareQuestMenu(pCreature->GetGUID()); - + if (pPlayer->GetQuestStatus(QUEST_ACES_HIGH) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(QUEST_ACES_HIGH_DAILY) == QUEST_STATUS_INCOMPLETE) //It's the same dragon for both quests. { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_C_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); @@ -398,7 +398,7 @@ bool GossipSelect_npc_corastrasza(Player* pPlayer, Creature* pCreature, uint32 u pPlayer->CastSpell(pPlayer, SPELL_SUMMON_WYRMREST_SKYTALON, true); pPlayer->CastSpell(pPlayer, SPELL_WYRMREST_SKYTALON_RIDE_PERIODIC, true); - + } return true; @@ -419,10 +419,10 @@ enum eIruk bool GossipHello_npc_iruk(Player* pPlayer, Creature* pCreature) { - + if (pPlayer->GetQuestStatus(QUEST_SPIRITS_WATCH_OVER_US) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_I, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - + pPlayer->PlayerTalkClass->SendGossipMenu(GOSSIP_TEXT_I, pCreature->GetGUID()); return true; } @@ -435,7 +435,7 @@ bool GossipSelect_npc_iruk(Player* pPlayer, Creature* pCreature, uint32 uiSender pPlayer->CastSpell(pPlayer, SPELL_CREATURE_TOTEM_OF_ISSLIRUK, true); pPlayer->CLOSE_GOSSIP_MENU(); break; - + } return true; } @@ -470,7 +470,7 @@ struct TRINITY_DLL_DECL mob_nerubar_victimAI : public ScriptedAI CAST_PLR(Killer)->KilledMonsterCredit(WARSONG_PEON, 0); } else if(uiRand < 75) - Killer->CastSpell(m_creature,nerubarVictims[rand()%3],true); + Killer->CastSpell(m_creature,nerubarVictims[rand()%3],true); } } } diff --git a/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_dred.cpp b/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_dred.cpp index ae9fc231702..eedc97e3e36 100644 --- a/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_dred.cpp +++ b/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_dred.cpp @@ -29,7 +29,7 @@ struct TRINITY_DLL_DECL boss_dredAI : public ScriptedAI { pInstance = c->GetInstanceData(); } - + ScriptedInstance* pInstance; void Reset() @@ -37,13 +37,13 @@ struct TRINITY_DLL_DECL boss_dredAI : public ScriptedAI if (pInstance) pInstance->SetData(DATA_DRED_EVENT,NOT_STARTED); } - + void EnterCombat(Unit* who) { if (pInstance) pInstance->SetData(DATA_DRED_EVENT,IN_PROGRESS); } - + void UpdateAI(const uint32 diff) { //Return since we have no target @@ -52,7 +52,7 @@ struct TRINITY_DLL_DECL boss_dredAI : public ScriptedAI DoMeleeAttackIfReady(); } - + void JustDied(Unit* killer) { if (pInstance) diff --git a/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_novos.cpp b/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_novos.cpp index 93a89d303ac..2f07378c992 100644 --- a/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_novos.cpp +++ b/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_novos.cpp @@ -68,16 +68,16 @@ struct TRINITY_DLL_DECL boss_novosAI : public Scripted_NoMovementAI pInstance = c->GetInstanceData(); Reset(); } - + uint32 uiTimer; uint32 uiCrystalHandlerTimer; - + bool bAchiev; - + std::list<uint64> luiCrystals; - + CombatPhase Phase; - + ScriptedInstance* pInstance; void Reset() @@ -99,7 +99,7 @@ struct TRINITY_DLL_DECL boss_novosAI : public Scripted_NoMovementAI } } } - + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); @@ -120,7 +120,7 @@ struct TRINITY_DLL_DECL boss_novosAI : public Scripted_NoMovementAI m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - + void UpdateAI(const uint32 diff) { switch (Phase) @@ -160,7 +160,7 @@ struct TRINITY_DLL_DECL boss_novosAI : public Scripted_NoMovementAI { if (pInstance) pInstance->SetData(DATA_NOVOS_EVENT, DONE); - + if (HeroicMode && bAchiev) { AchievementEntry const *AchievOhNovos = GetAchievementStore()->LookupEntry(ACHIEVEMENT_OH_NOVOS); @@ -176,14 +176,14 @@ struct TRINITY_DLL_DECL boss_novosAI : public Scripted_NoMovementAI } } } - + void KilledUnit(Unit *victim) { if (victim == m_creature) return; DoScriptText(SAY_KILL, m_creature); } - + void RemoveCrystal() { if (!luiCrystals.empty()) @@ -211,9 +211,9 @@ struct TRINITY_DLL_DECL mob_crystal_handlerAI : public ScriptedAI { pInstance = c->GetInstanceData(); } - + ScriptedInstance *pInstance; - + void JustDied(Unit* killer) { if (Creature* pNovos = Unit::GetCreature(*m_creature, pInstance ? pInstance->GetData64(DATA_NOVOS) : 0)) @@ -227,9 +227,9 @@ struct TRINITY_DLL_DECL mob_novos_minionAI : public ScriptedAI { pInstance = c->GetInstanceData(); } - + ScriptedInstance *pInstance; - + void MovementInform(uint32 type, uint32 id) { if(type != POINT_MOTION_TYPE) @@ -262,7 +262,7 @@ void AddSC_boss_novos() newscript->Name = "boss_novos"; newscript->GetAI = &GetAI_boss_novos; newscript->RegisterSelf(); - + newscript = new Script; newscript->Name = "mob_crystal_handler"; newscript->GetAI = &GetAI_mob_crystal_handler; diff --git a/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp b/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp index d551e1d8265..185d062b11a 100644 --- a/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp +++ b/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp @@ -60,7 +60,7 @@ struct TRINITY_DLL_DECL boss_tharon_jaAI : public ScriptedAI { pInstance = c->GetInstanceData(); } - + ScriptedInstance* pInstance; void Reset() @@ -71,7 +71,7 @@ struct TRINITY_DLL_DECL boss_tharon_jaAI : public ScriptedAI void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); - + if (pInstance) pInstance->SetData(DATA_THARON_JA_EVENT, IN_PROGRESS); } @@ -85,16 +85,16 @@ struct TRINITY_DLL_DECL boss_tharon_jaAI : public ScriptedAI DoMeleeAttackIfReady(); } - + void KilledUnit(Unit *victim) { DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2),m_creature); } - + void JustDied(Unit* killer) { DoScriptText(SAY_DEATH,m_creature); - + if (pInstance) pInstance->SetData(DATA_THARON_JA_EVENT, DONE); } diff --git a/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_trollgore.cpp b/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_trollgore.cpp index 80afb5a469d..64c476296cc 100644 --- a/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_trollgore.cpp +++ b/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_trollgore.cpp @@ -38,7 +38,7 @@ struct TRINITY_DLL_DECL boss_trollgoreAI : public ScriptedAI { pInstance = c->GetInstanceData(); } - + ScriptedInstance* pInstance; void Reset() @@ -46,11 +46,11 @@ struct TRINITY_DLL_DECL boss_trollgoreAI : public ScriptedAI if (pInstance) pInstance->SetData(DATA_TROLLGORE_EVENT, NOT_STARTED); } - + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); - + if (pInstance) pInstance->SetData(DATA_TROLLGORE_EVENT, IN_PROGRESS); } @@ -67,7 +67,7 @@ struct TRINITY_DLL_DECL boss_trollgoreAI : public ScriptedAI void JustDied(Unit* killer) { DoScriptText(SAY_DEATH, m_creature); - + if (pInstance) pInstance->SetData(DATA_TROLLGORE_EVENT, DONE); } diff --git a/src/bindings/scripts/scripts/northrend/draktharon_keep/instance_drak_tharon_keep.cpp b/src/bindings/scripts/scripts/northrend/draktharon_keep/instance_drak_tharon_keep.cpp index 3c4900684bd..4b498223838 100644 --- a/src/bindings/scripts/scripts/northrend/draktharon_keep/instance_drak_tharon_keep.cpp +++ b/src/bindings/scripts/scripts/northrend/draktharon_keep/instance_drak_tharon_keep.cpp @@ -12,21 +12,21 @@ struct TRINITY_DLL_DECL instance_drak_tharon : public ScriptedInstance { instance_drak_tharon(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; - + uint64 uiTrollgore; uint64 uiNovos; uint64 uiDred; uint64 uiTharonJa; - + uint64 uiNovosCrystal1; uint64 uiNovosCrystal2; uint64 uiNovosCrystal3; uint64 uiNovosCrystal4; - + uint8 m_auiEncounter[MAX_ENCOUNTER]; - + std::string str_data; - + void Initialize() { uiTrollgore = 0; @@ -38,7 +38,7 @@ struct TRINITY_DLL_DECL instance_drak_tharon : public ScriptedInstance uiNovosCrystal3 = 0; uiNovosCrystal4 = 0; } - + bool IsEncounterInProgress() const { for(uint8 i = 0; i < MAX_ENCOUNTER; ++i) @@ -46,7 +46,7 @@ struct TRINITY_DLL_DECL instance_drak_tharon : public ScriptedInstance return false; } - + void OnGameObjectCreate(GameObject* pGo, bool add) { switch(pGo->GetEntry()) @@ -65,7 +65,7 @@ struct TRINITY_DLL_DECL instance_drak_tharon : public ScriptedInstance break; } } - + void OnCreatureCreate(Creature* pCreature, bool add) { switch(pCreature->GetEntry()) @@ -84,7 +84,7 @@ struct TRINITY_DLL_DECL instance_drak_tharon : public ScriptedInstance break; } } - + uint64 GetData64(uint32 identifier) { switch(identifier) @@ -98,10 +98,10 @@ struct TRINITY_DLL_DECL instance_drak_tharon : public ScriptedInstance case DATA_NOVOS_CRYSTAL_3: return uiNovosCrystal3; case DATA_NOVOS_CRYSTAL_4: return uiNovosCrystal4; } - + return 0; } - + void SetData(uint32 type, uint32 data) { switch(type) @@ -119,13 +119,13 @@ struct TRINITY_DLL_DECL instance_drak_tharon : public ScriptedInstance m_auiEncounter[3] = data; break; } - + if (data == DONE) { SaveToDB(); } } - + uint32 GetData(uint32 type) { switch (type) @@ -137,7 +137,7 @@ struct TRINITY_DLL_DECL instance_drak_tharon : public ScriptedInstance } return 0; } - + std::string GetSaveData() { OUT_SAVE_INST_DATA; diff --git a/src/bindings/scripts/scripts/northrend/gundrak/boss_eck.cpp b/src/bindings/scripts/scripts/northrend/gundrak/boss_eck.cpp index 2e9a4bd7a48..af0ebba511b 100644 --- a/src/bindings/scripts/scripts/northrend/gundrak/boss_eck.cpp +++ b/src/bindings/scripts/scripts/northrend/gundrak/boss_eck.cpp @@ -31,9 +31,9 @@ struct TRINITY_DLL_DECL boss_eckAI : public ScriptedAI uint32 uiBiteTimer; uint32 uiSpitTimer; uint32 uiSpringTimer; - + bool bBerserk; - + ScriptedInstance* pInstance; void Reset() @@ -42,9 +42,9 @@ struct TRINITY_DLL_DECL boss_eckAI : public ScriptedAI uiBiteTimer = 5000; uiSpitTimer = 10000; uiSpringTimer = 8000; - + bBerserk = false; - + if (pInstance) pInstance->SetData(DATA_ECK_THE_FEROCIOUS_EVENT, NOT_STARTED); } @@ -54,13 +54,13 @@ struct TRINITY_DLL_DECL boss_eckAI : public ScriptedAI if (pInstance) pInstance->SetData(DATA_ECK_THE_FEROCIOUS_EVENT, IN_PROGRESS); } - + void UpdateAI(const uint32 diff) { //Return since we have no target if (!UpdateVictim()) return; - + if (uiBiteTimer < diff) { DoCast(m_creature->getVictim(),SPELL_ECK_BITE); @@ -91,7 +91,7 @@ struct TRINITY_DLL_DECL boss_eckAI : public ScriptedAI DoCast(m_creature,SPELL_ECK_BERSERK); bBerserk = true; } - else + else { uiBerserkTimer -= diff; if (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 20) @@ -104,8 +104,8 @@ struct TRINITY_DLL_DECL boss_eckAI : public ScriptedAI DoMeleeAttackIfReady(); } - - void JustDied(Unit* killer) + + void JustDied(Unit* killer) { if (pInstance) pInstance->SetData(DATA_ECK_THE_FEROCIOUS_EVENT, DONE); diff --git a/src/bindings/scripts/scripts/northrend/gundrak/boss_gal_darah.cpp b/src/bindings/scripts/scripts/northrend/gundrak/boss_gal_darah.cpp index bcb65351b59..b82f937c157 100644 --- a/src/bindings/scripts/scripts/northrend/gundrak/boss_gal_darah.cpp +++ b/src/bindings/scripts/scripts/northrend/gundrak/boss_gal_darah.cpp @@ -55,18 +55,18 @@ struct TRINITY_DLL_DECL boss_gal_darahAI : public ScriptedAI { pInstance = c->GetInstanceData(); } - + uint32 uiStampedeTimer; uint32 uiWhirlingSlashTimer; uint32 uiPunctureTimer; uint32 uiEnrageTimer; uint32 uiImpalingChargeTimer; uint32 uiStompTimer; - + CombatPhase Phase; - + uint8 uiPhaseCounter; - + ScriptedInstance* pInstance; void Reset() @@ -77,27 +77,27 @@ struct TRINITY_DLL_DECL boss_gal_darahAI : public ScriptedAI uiEnrageTimer = 15000; uiImpalingChargeTimer = 20000; uiStompTimer = 25000; - + Phase = TROLL; - + if (pInstance) pInstance->SetData(DATA_GAL_DARAH_EVENT, NOT_STARTED); } - + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); - + if (pInstance) pInstance->SetData(DATA_GAL_DARAH_EVENT, IN_PROGRESS); } - + void UpdateAI(const uint32 diff) { //Return since we have no target if (!UpdateVictim()) return; - + switch (Phase) { case TROLL: @@ -116,7 +116,7 @@ struct TRINITY_DLL_DECL boss_gal_darahAI : public ScriptedAI DoScriptText(RAND(SAY_SUMMON_RHINO_1,SAY_SUMMON_RHINO_2,SAY_SUMMON_RHINO_3),m_creature); uiStampedeTimer = 15000; } else uiStampedeTimer -= diff; - + if (uiWhirlingSlashTimer < diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_WHIRLING_SLASH, H_SPELL_WHIRLING_SLASH)); @@ -140,19 +140,19 @@ struct TRINITY_DLL_DECL boss_gal_darahAI : public ScriptedAI DoCast(m_creature->getVictim(), HEROIC(SPELL_PUNCTURE, H_SPELL_PUNCTURE)); uiPunctureTimer = 8000; } else uiPunctureTimer -= diff; - + if (uiEnrageTimer < diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_ENRAGE, H_SPELL_ENRAGE)); uiEnrageTimer = 20000; } else uiEnrageTimer -= diff; - + if(uiStompTimer < diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_STOMP, H_SPELL_STOMP)); uiStompTimer = 20000; } else uiStompTimer -= diff; - + if (uiImpalingChargeTimer < diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) @@ -166,15 +166,15 @@ struct TRINITY_DLL_DECL boss_gal_darahAI : public ScriptedAI DoMeleeAttackIfReady(); } - + void JustDied(Unit* killer) { DoScriptText(SAY_DEATH, m_creature); - + if (pInstance) pInstance->SetData(DATA_GAL_DARAH_EVENT, DONE); } - + void KilledUnit(Unit *victim) { if (victim == m_creature) diff --git a/src/bindings/scripts/scripts/northrend/gundrak/boss_moorabi.cpp b/src/bindings/scripts/scripts/northrend/gundrak/boss_moorabi.cpp index 96830423bcc..a352310a78d 100644 --- a/src/bindings/scripts/scripts/northrend/gundrak/boss_moorabi.cpp +++ b/src/bindings/scripts/scripts/northrend/gundrak/boss_moorabi.cpp @@ -11,16 +11,16 @@ Script Data End */ //Spells -#define SPELL_DETERMINED_STAB 55104 -#define SPELL_GROUND_TREMOR 55142 -#define SPELL_NUMBING_SHOUT 55106 +#define SPELL_DETERMINED_STAB 55104 +#define SPELL_GROUND_TREMOR 55142 +#define SPELL_NUMBING_SHOUT 55106 -#define SPELL_DETERMINED_GORE 55102 -#define SPELL_DETERMINED_GORE_1 59444 -#define SPELL_QUAKE 55101 -#define SPELL_NUMBING_ROAR 55100 +#define SPELL_DETERMINED_GORE 55102 +#define SPELL_DETERMINED_GORE_1 59444 +#define SPELL_QUAKE 55101 +#define SPELL_NUMBING_ROAR 55100 -#define SPELL_MOJO_FRENZY 55163 +#define SPELL_MOJO_FRENZY 55163 #define SPELL_TRANSFORMATION 55098 //Periodic, The caster transforms into a powerful mammoth, increasing Physical damage done by 25% and granting immunity to Stun effects. #define ACHIEVEMENT_LESS_RABI 2040 @@ -49,7 +49,7 @@ struct TRINITY_DLL_DECL boss_moorabiAI : public ScriptedAI uint32 SPELL_GROUND_TREMOR_TIMER; uint32 SPELL_DETERMINED_STAB_TIMER; uint32 SPELL_TRANSFORMATION_TIMER; - + void Reset() { SPELL_GROUND_TREMOR_TIMER = 18000; @@ -57,7 +57,7 @@ struct TRINITY_DLL_DECL boss_moorabiAI : public ScriptedAI SPELL_DETERMINED_STAB_TIMER = 20000; SPELL_TRANSFORMATION_TIMER = 12000; Phase = false; - + if (pInstance) pInstance->SetData(DATA_MOORABI_EVENT, NOT_STARTED); } @@ -66,7 +66,7 @@ struct TRINITY_DLL_DECL boss_moorabiAI : public ScriptedAI { DoScriptText(SAY_AGGRO, m_creature); m_creature->CastSpell(m_creature,SPELL_MOJO_FRENZY,true); - + if (pInstance) pInstance->SetData(DATA_MOORABI_EVENT, IN_PROGRESS); } @@ -76,7 +76,7 @@ struct TRINITY_DLL_DECL boss_moorabiAI : public ScriptedAI //Return since we have no target if (!UpdateVictim()) return; - + if(Phase == false && m_creature->HasAura(SPELL_TRANSFORMATION)) Phase = true; @@ -107,7 +107,7 @@ struct TRINITY_DLL_DECL boss_moorabiAI : public ScriptedAI { //CAST TRANSFORMATION if (SPELL_TRANSFORMATION_TIMER < diff) - { + { DoScriptText(EMOTE_TRANSFORM, m_creature); DoScriptText(SAY_TRANSFORM, m_creature); m_creature->CastSpell(m_creature,SPELL_TRANSFORMATION,false); @@ -130,7 +130,7 @@ struct TRINITY_DLL_DECL boss_moorabiAI : public ScriptedAI } else SPELL_NUMBING_SHOUT_TIMER -= diff; if (SPELL_DETERMINED_STAB_TIMER < diff) - { + { m_creature->CastSpell(m_creature->getVictim(),SPELL_DETERMINED_STAB,true); SPELL_DETERMINED_STAB_TIMER = 8000; } else SPELL_DETERMINED_STAB_TIMER -= diff; @@ -156,7 +156,7 @@ struct TRINITY_DLL_DECL boss_moorabiAI : public ScriptedAI } } } - + if (pInstance) pInstance->SetData(DATA_MOORABI_EVENT, DONE); } diff --git a/src/bindings/scripts/scripts/northrend/gundrak/boss_slad_ran.cpp b/src/bindings/scripts/scripts/northrend/gundrak/boss_slad_ran.cpp index 88922449b8b..95f74af7e35 100644 --- a/src/bindings/scripts/scripts/northrend/gundrak/boss_slad_ran.cpp +++ b/src/bindings/scripts/scripts/northrend/gundrak/boss_slad_ran.cpp @@ -71,16 +71,16 @@ struct TRINITY_DLL_DECL boss_slad_ranAI : public ScriptedAI { pInstance = c->GetInstanceData(); } - + uint32 uiPoisonNovaTimer; uint32 uiPowerfullBiteTimer; uint32 uiVenomBoltTimer; uint32 uiSpawnTimer; - + uint8 uiPhase; ScriptedInstance* pInstance; - + void Reset() { uiPoisonNovaTimer = 10000; @@ -88,43 +88,43 @@ struct TRINITY_DLL_DECL boss_slad_ranAI : public ScriptedAI uiVenomBoltTimer = 15000; uiSpawnTimer = 5000; uiPhase = 0; - + if (pInstance) pInstance->SetData(DATA_SLAD_RAN_EVENT, NOT_STARTED); } - + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); - + if (pInstance) pInstance->SetData(DATA_SLAD_RAN_EVENT, IN_PROGRESS); } - + void UpdateAI(const uint32 diff) { //Return since we have no target if (!UpdateVictim()) return; - + if (uiPoisonNovaTimer < diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_POISON_NOVA, H_SPELL_POISON_NOVA)); uiPoisonNovaTimer = 15000; } else uiPoisonNovaTimer -= diff; - + if (uiPowerfullBiteTimer < diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_POWERFULL_BITE, H_SPELL_POWERFULL_BITE)); uiPowerfullBiteTimer = 10000; } else uiPowerfullBiteTimer -= diff; - + if (uiVenomBoltTimer < diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_VENOM_BOLT, H_SPELL_VENOM_BOLT)); uiVenomBoltTimer = 10000; } else uiVenomBoltTimer -= diff; - + if (uiPhase) { if(uiSpawnTimer < diff) @@ -152,15 +152,15 @@ struct TRINITY_DLL_DECL boss_slad_ranAI : public ScriptedAI DoMeleeAttackIfReady(); } - + void JustDied(Unit* killer) { DoScriptText(SAY_DEATH, m_creature); - + if (pInstance) pInstance->SetData(DATA_SLAD_RAN_EVENT, DONE); } - + void KilledUnit(Unit *victim) { DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), m_creature); @@ -169,21 +169,21 @@ struct TRINITY_DLL_DECL boss_slad_ranAI : public ScriptedAI void JustSummoned(Creature* summoned) { summoned->GetMotionMaster()->MovePoint(0,m_creature->GetPositionX(),m_creature->GetPositionY(),m_creature->GetPositionZ()); - + } }; struct TRINITY_DLL_DECL mob_slad_ran_constrictorAI : public ScriptedAI { mob_slad_ran_constrictorAI(Creature *c) : ScriptedAI(c) {} - + uint32 uiGripOfSladRanTimer; - + void Reset() { uiGripOfSladRanTimer = 1000; } - + void UpdateAI(const uint32 diff) { if (!UpdateVictim()) @@ -194,28 +194,28 @@ struct TRINITY_DLL_DECL mob_slad_ran_constrictorAI : public ScriptedAI uiGripOfSladRanTimer = 5000; } else uiGripOfSladRanTimer -= diff;; } - + ScriptedInstance* pInstance; }; struct TRINITY_DLL_DECL mob_slad_ran_viperAI : public ScriptedAI { mob_slad_ran_viperAI(Creature *c) : ScriptedAI(c) {} - + uint32 uiVenomousBiteTimer; - + ScriptedInstance* pInstance; - + void Reset() { uiVenomousBiteTimer = 2000; } - + void UpdateAI(const uint32 diff) { if (!UpdateVictim()) return; - + if (uiVenomousBiteTimer < diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_VENOMOUS_BITE, H_SPELL_VENOMOUS_BITE)); @@ -247,12 +247,12 @@ void AddSC_boss_slad_ran() newscript->Name = "boss_slad_ran"; newscript->GetAI = &GetAI_boss_slad_ran; newscript->RegisterSelf(); - + newscript = new Script; newscript->Name = "mob_slad_ran_constrictor"; newscript->GetAI = &GetAI_mob_slad_ran_constrictor; newscript->RegisterSelf(); - + newscript = new Script; newscript->Name = "mob_slad_ran_viper"; newscript->GetAI = &GetAI_mob_slad_ran_viper; diff --git a/src/bindings/scripts/scripts/northrend/gundrak/instance_gundrak.cpp b/src/bindings/scripts/scripts/northrend/gundrak/instance_gundrak.cpp index 30ef5c8e181..3b8dd7edea2 100644 --- a/src/bindings/scripts/scripts/northrend/gundrak/instance_gundrak.cpp +++ b/src/bindings/scripts/scripts/northrend/gundrak/instance_gundrak.cpp @@ -18,15 +18,15 @@ struct TRINITY_DLL_DECL instance_gundrak : public ScriptedInstance bHeroicMode = pMap->IsHeroic(); Initialize(); }; - + bool bHeroicMode; - + uint64 uiSladRan; uint64 uiMoorabi; uint64 uiDrakkariColossus; uint64 uiGalDarah; uint64 uiEckTheFerocious; - + uint64 uiSladRanAltar; uint64 uiMoorabiAltar; uint64 uiDrakkariColossusAltar; @@ -38,11 +38,11 @@ struct TRINITY_DLL_DECL instance_gundrak : public ScriptedInstance uint64 uiGalDarahDoor2; uint64 uiBridge; uint64 uiCollision; - + uint32 m_auiEncounter[MAX_ENCOUNTER]; - + std::string str_data; - + void Initialize() { uiSladRan = 0; @@ -50,25 +50,25 @@ struct TRINITY_DLL_DECL instance_gundrak : public ScriptedInstance uiDrakkariColossus = 0; uiGalDarah = 0; uiEckTheFerocious = 0; - + uiSladRanAltar = 0; uiMoorabiAltar = 0; uiDrakkariColossusAltar = 0; - + uiSladRanStatue = 0; uiMoorabiStatue = 0; uiDrakkariColossusStatue = 0; - + uiEckTheFerociousDoor = 0; uiGalDarahDoor1 = 0; uiGalDarahDoor2 = 0; - + uiBridge = 0; uiCollision = 0; - + memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); } - + bool IsEncounterInProgress() const { for(uint8 i = 0; i < MAX_ENCOUNTER; ++i) @@ -76,7 +76,7 @@ struct TRINITY_DLL_DECL instance_gundrak : public ScriptedInstance return false; } - + void OnCreatureCreate(Creature* pCreature, bool add) { switch(pCreature->GetEntry()) @@ -88,7 +88,7 @@ struct TRINITY_DLL_DECL instance_gundrak : public ScriptedInstance case 29932: uiEckTheFerocious = pCreature->GetGUID(); break; } } - + void OnGameObjectCreate(GameObject* pGo, bool add) { switch(pGo->GetEntry()) @@ -142,7 +142,7 @@ struct TRINITY_DLL_DECL instance_gundrak : public ScriptedInstance break; } } - + void SetData(uint32 type, uint32 data) { switch(type) @@ -188,11 +188,11 @@ struct TRINITY_DLL_DECL instance_gundrak : public ScriptedInstance m_auiEncounter[4] = data; break; } - + if (data == DONE) SaveToDB(); } - + uint32 GetData(uint32 type) { switch(type) @@ -206,7 +206,7 @@ struct TRINITY_DLL_DECL instance_gundrak : public ScriptedInstance return 0; } - + uint64 GetData64(uint32 type) { switch(type) @@ -221,7 +221,7 @@ struct TRINITY_DLL_DECL instance_gundrak : public ScriptedInstance return 0; } - + std::string GetSaveData() { OUT_SAVE_INST_DATA; @@ -235,7 +235,7 @@ struct TRINITY_DLL_DECL instance_gundrak : public ScriptedInstance OUT_SAVE_INST_DATA_COMPLETE; return str_data; } - + void Load(const char* in) { if (!in) @@ -267,13 +267,13 @@ struct TRINITY_DLL_DECL instance_gundrak : public ScriptedInstance OUT_LOAD_INST_DATA_COMPLETE; } - + void CheckAltars() { GameObject* pSladRanAltar = instance->GetGameObject(uiSladRanAltar); GameObject* pMoorabiAltar = instance->GetGameObject(uiMoorabiAltar); GameObject* pDrakkariColossusAltar = instance->GetGameObject(uiDrakkariColossusAltar); - + if (pSladRanAltar && pSladRanAltar->GetGoState() == GO_STATE_ACTIVE && pMoorabiAltar && pMoorabiAltar->GetGoState() == GO_STATE_ACTIVE && pDrakkariColossusAltar && pDrakkariColossusAltar->GetGoState() == GO_STATE_ACTIVE) @@ -288,10 +288,10 @@ bool GOHello_altar(Player *pPlayer, GameObject *pGO) { ScriptedInstance *pInstance = pGO->GetInstanceData(); uint32 uiStatue; - + pGO->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); pGO->SetGoState(GO_STATE_ACTIVE); - + if (pInstance) { switch(pGO->GetEntry()) @@ -319,7 +319,7 @@ void AddSC_instance_gundrak() newscript->Name = "instance_gundrak"; newscript->GetInstanceData = &GetInstanceData_instance_gundrak; newscript->RegisterSelf(); - + newscript = new Script; newscript->Name = "go_gundrak_altar"; newscript->pGOHello = &GOHello_altar; diff --git a/src/bindings/scripts/scripts/northrend/howling_fjord.cpp b/src/bindings/scripts/scripts/northrend/howling_fjord.cpp index d6c2189babe..cabb00d748f 100644 --- a/src/bindings/scripts/scripts/northrend/howling_fjord.cpp +++ b/src/bindings/scripts/scripts/northrend/howling_fjord.cpp @@ -44,7 +44,7 @@ enum Entries }; bool QuestAccept_npc_apothecary_hanes(Player* pPlayer, Creature* pCreature, Quest const* quest) -{ +{ if (quest->GetQuestId() == QUEST_TRAIL_OF_FIRE) { switch (pPlayer->GetTeam()) @@ -81,7 +81,7 @@ struct TRINITY_DLL_DECL npc_Apothecary_HanesAI : public npc_escortAI void UpdateEscortAI(const uint32 diff) { if(HealthBelowPct(75)) - { + { if(PotTimer < diff) { DoCast(me,17534,true); @@ -113,31 +113,31 @@ struct TRINITY_DLL_DECL npc_Apothecary_HanesAI : public npc_escortAI Trigger->CastSpell(Trigger, SPELL_COSMETIC_LOW_POLY_FIRE, false); SetRun(false); break; - case 6: + case 6: if (Unit* Trigger = m_creature->FindNearestCreature(NPC_HANES_FIRE_TRIGGER,10.0f)) Trigger->CastSpell(Trigger, SPELL_COSMETIC_LOW_POLY_FIRE, false); SetRun(true); break; - case 8: + case 8: if (Unit* Trigger = m_creature->FindNearestCreature(NPC_HANES_FIRE_TRIGGER,10.0f)) Trigger->CastSpell(Trigger, SPELL_COSMETIC_LOW_POLY_FIRE, false); SetRun(false); break; - case 9: + case 9: if (Unit* Trigger = m_creature->FindNearestCreature(NPC_HANES_FIRE_TRIGGER,10.0f)) Trigger->CastSpell(Trigger, SPELL_COSMETIC_LOW_POLY_FIRE, false); break; case 10: SetRun(true); break; - case 13: + case 13: SetRun(false); break; - case 14: + case 14: if (Unit* Trigger = m_creature->FindNearestCreature(NPC_HANES_FIRE_TRIGGER,10.0f)) Trigger->CastSpell(Trigger, SPELL_COSMETIC_LOW_POLY_FIRE, false); SetRun(true); - break; + break; } } }; diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_anubrekhan.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_anubrekhan.cpp index bd2ed8f8ab6..2de7abcf392 100644 --- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_anubrekhan.cpp +++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_anubrekhan.cpp @@ -40,7 +40,7 @@ struct TRINITY_DLL_DECL boss_anubrekhanAI : public BossAI void Prepare() { HasTaunted = false; - + if (HeroicMode) { DoSpawnCreature(MOB_CRYPT_GUARD, 0, -10, 0, me->GetOrientation(), TEMPSUMMON_CORPSE_TIMED_DESPAWN, 60000); diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_grobbulus.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_grobbulus.cpp index 9326f30092e..38edde2c327 100644 --- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_grobbulus.cpp +++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_grobbulus.cpp @@ -34,7 +34,7 @@ struct TRINITY_DLL_DECL boss_grobbulusAI : public BossAI { - boss_grobbulusAI(Creature *c) : BossAI(c, BOSS_GROBBULUS) + boss_grobbulusAI(Creature *c) : BossAI(c, BOSS_GROBBULUS) { me->ApplySpellImmune(0, IMMUNITY_ID, SPELL_POISON_CLOUD_ADD, true); } diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_patchwerk.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_patchwerk.cpp index 0071bb76db8..5077f0267ed 100644 --- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_patchwerk.cpp +++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_patchwerk.cpp @@ -64,7 +64,7 @@ struct TRINITY_DLL_DECL boss_patchwerkAI : public BossAI 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(AchievMakeQuickWerkOfHim); } } diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_razuvious.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_razuvious.cpp index 8eff3c08076..7f92978e8b1 100644 --- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_razuvious.cpp +++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_razuvious.cpp @@ -61,7 +61,7 @@ struct TRINITY_DLL_DECL boss_razuviousAI : public BossAI if (!(rand()%3)) DoPlaySoundToSet(me, SOUND_SLAY); } - + void DamageTaken(Unit* pDone_by, uint32& uiDamage) { // Damage done by the controlled Death Knight understudies should also count toward damage done by players @@ -70,7 +70,7 @@ struct TRINITY_DLL_DECL boss_razuviousAI : public BossAI me->LowerPlayerDamageReq(uiDamage); } } - + void JustDied(Unit* killer) { _JustDied(); diff --git a/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_magus_telestra.cpp b/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_magus_telestra.cpp index 97ae9a03fa5..d043705ab54 100644 --- a/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_magus_telestra.cpp +++ b/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_magus_telestra.cpp @@ -91,7 +91,7 @@ struct TRINITY_DLL_DECL boss_magus_telestraAI : public ScriptedAI bool AchievementTimerRunning; uint8 AchievementProgress; - uint32 AchievementTimer; + uint32 AchievementTimer; void Reset() { @@ -109,7 +109,7 @@ struct TRINITY_DLL_DECL boss_magus_telestraAI : public ScriptedAI AchievementProgress = 0; AchievementTimer = 0; AchievementTimerRunning = false; - + AppearDelay = false; m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -218,7 +218,7 @@ struct TRINITY_DLL_DECL boss_magus_telestraAI : public ScriptedAI if (ArcaneMagusGUID) ArcaneMagus = Unit::GetUnit((*m_creature), ArcaneMagusGUID); if (FireMagus && FireMagus->isDead()) - { + { FireMagusDead = true; if (!AchievementTimerRunning) AchievementTimerRunning = true; diff --git a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_krystallus.cpp b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_krystallus.cpp index b3d749316b7..ed5291a6887 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_krystallus.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_krystallus.cpp @@ -38,64 +38,64 @@ struct TRINITY_DLL_DECL boss_krystallusAI : public ScriptedAI { pInstance = c->GetInstanceData(); } - + uint32 uiBoulderTossTimer; uint32 uiGroundSpikeTimer; uint32 uiGroundSlamTimer; uint32 uiShatterTimer; uint32 uiStompTimer; - + bool bIsSlam; - + ScriptedInstance* pInstance; void Reset() { bIsSlam = false; - + uiBoulderTossTimer = 3000 + rand()%6000; uiGroundSpikeTimer = 9000 + rand()%5000; uiGroundSlamTimer = 15000 + rand()%3000; uiStompTimer = 20000 + rand()%9000; uiShatterTimer = 0; - + if (pInstance) pInstance->SetData(DATA_KRYSTALLUS_EVENT, NOT_STARTED); } void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); - + if (pInstance) pInstance->SetData(DATA_KRYSTALLUS_EVENT, IN_PROGRESS); } - + void UpdateAI(const uint32 diff) { //Return since we have no target if (!UpdateVictim()) return; - + if (uiBoulderTossTimer < diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, HEROIC(SPELL_BOULDER_TOSS, H_SPELL_BOULDER_TOSS)); uiBoulderTossTimer = 9000 + rand()%6000; } else uiBoulderTossTimer -= diff; - + if (uiGroundSpikeTimer < diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_GROUND_SPIKE); uiGroundSpikeTimer = 12000 + rand()%5000; } else uiGroundSpikeTimer -= diff; - + if (uiStompTimer < diff) { DoCast(m_creature, HEROIC(SPELL_STOMP, H_SPELL_STOMP)); uiStompTimer = 20000 + rand()%9000; } else uiStompTimer -= diff; - + if (uiGroundSlamTimer < diff) { DoCast(m_creature, SPELL_GROUND_SLAM); @@ -103,7 +103,7 @@ struct TRINITY_DLL_DECL boss_krystallusAI : public ScriptedAI uiShatterTimer = 10000; uiGroundSlamTimer = 15000 + rand()%3000; } else uiGroundSlamTimer -= diff; - + if (bIsSlam) { if(uiShatterTimer < diff) @@ -115,15 +115,15 @@ struct TRINITY_DLL_DECL boss_krystallusAI : public ScriptedAI DoMeleeAttackIfReady(); } - + void JustDied(Unit* killer) { DoScriptText(SAY_DEATH, m_creature); - + if (pInstance) pInstance->SetData(DATA_KRYSTALLUS_EVENT, DONE); } - + void KilledUnit(Unit *victim) { if (victim == m_creature) diff --git a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp index 9b1ad662bb6..f8fcd720dfa 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp @@ -41,7 +41,7 @@ enum Achievements struct TRINITY_DLL_DECL boss_maiden_of_griefAI : public ScriptedAI { - boss_maiden_of_griefAI(Creature *c) : ScriptedAI(c) + boss_maiden_of_griefAI(Creature *c) : ScriptedAI(c) { pInstance = m_creature->GetInstanceData(); IsHeroic = m_creature->GetMap()->IsHeroic(); @@ -56,7 +56,7 @@ struct TRINITY_DLL_DECL boss_maiden_of_griefAI : public ScriptedAI uint32 PillarOfWoeTimer; uint32 AchievTimer; - void Reset() + void Reset() { PartingSorrowTimer = 25000 + rand()%5000; StormOfGriefTimer = 10000; @@ -81,7 +81,7 @@ struct TRINITY_DLL_DECL boss_maiden_of_griefAI : public ScriptedAI //Return since we have no target if (!UpdateVictim()) return; - + //Achievement counter if (pInstance) if (pInstance->GetData(DATA_MAIDEN_OF_GRIEF_EVENT) == IN_PROGRESS) @@ -134,10 +134,10 @@ struct TRINITY_DLL_DECL boss_maiden_of_griefAI : public ScriptedAI if (pInstance) pInstance->SetData(DATA_MAIDEN_OF_GRIEF_EVENT, DONE); - + AchievementEntry const *AchievGoodGrief = GetAchievementStore()->LookupEntry(ACHIEVEMENT_GOOD_GRIEF); Map* pMap = m_creature->GetMap(); - + if (HeroicMode && AchievTimer < 60000 && pMap && pMap->IsDungeon() && AchievGoodGrief) { Map::PlayerList const &players = pMap->GetPlayers(); diff --git a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_sjonnir.cpp b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_sjonnir.cpp index 40325c75d32..69061ad1d1f 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_sjonnir.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_sjonnir.cpp @@ -71,9 +71,9 @@ struct TRINITY_DLL_DECL boss_sjonnirAI : public ScriptedAI { pInstance = c->GetInstanceData(); } - + bool bIsFrenzy; - + uint32 uiChainLightningTimer; uint32 uiLightningShieldTimer; uint32 uiStaticChargeTimer; @@ -82,13 +82,13 @@ struct TRINITY_DLL_DECL boss_sjonnirAI : public ScriptedAI uint32 uiFrenzyTimer; uint32 uiEncounterTimer; uint32 uiKilledIronSludges; - + ScriptedInstance* pInstance; void Reset() { bIsFrenzy = false; - + uiEncounterTimer = 0; uiChainLightningTimer = 3000 + rand()%5000; uiLightningShieldTimer = 20000 + rand()%5000; @@ -97,46 +97,46 @@ struct TRINITY_DLL_DECL boss_sjonnirAI : public ScriptedAI uiSummonTimer = 5000; uiFrenzyTimer = 300000; //5 minutes uiKilledIronSludges = 0; - + if (pInstance) pInstance->SetData(DATA_SJONNIR_EVENT, NOT_STARTED); } - + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); - + uiEncounterTimer = 0; - + if (pInstance) pInstance->SetData(DATA_SJONNIR_EVENT, IN_PROGRESS); } - + void UpdateAI(const uint32 diff) { //Return since we have no target if (!UpdateVictim()) return; - + if (uiChainLightningTimer < diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, HEROIC(SPELL_CHAIN_LIGHTING, H_SPELL_CHAIN_LIGHTING)); uiChainLightningTimer = 10000 + rand()%5000; } else uiChainLightningTimer -= diff; - + if (uiLightningShieldTimer < diff) { DoCast(m_creature, HEROIC(SPELL_LIGHTING_SHIELD, H_SPELL_LIGHTING_SHIELD)); uiLightningShieldTimer -= diff; } - + if (uiStaticChargeTimer < diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_STATIC_CHARGE, H_SPELL_STATIC_CHARGE)); uiStaticChargeTimer = 20000 + rand()%5000; } uiStaticChargeTimer -= diff; - + if (uiLightningRingTimer < diff) { if (m_creature->IsNonMeleeSpellCasted(false)) @@ -144,17 +144,17 @@ struct TRINITY_DLL_DECL boss_sjonnirAI : public ScriptedAI DoCast(m_creature, HEROIC(SPELL_LIGHTING_RING, H_SPELL_LIGHTING_RING)); uiLightningRingTimer = 30000 + rand()%5000; } else uiLightningRingTimer -= diff; - + if (uiSummonTimer < diff) { uint32 uiSummonPipe = rand()%2; - m_creature->SummonCreature(uiEncounterTimer > DATA_TIME_BEFORE_OOZE ? CREATURE_MALFORMED_OOZE : + m_creature->SummonCreature(uiEncounterTimer > DATA_TIME_BEFORE_OOZE ? CREATURE_MALFORMED_OOZE : RAND(CREATURE_FORGED_IRON_DWARF,CREATURE_FORGED_IRON_TROGG), PipeLocations[uiSummonPipe].x, PipeLocations[uiSummonPipe].y, PipeLocations[uiSummonPipe].z, 0.0f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); uiSummonTimer = 20000; } else uiSummonTimer -= diff; - + if (!bIsFrenzy) { if (uiFrenzyTimer < diff) @@ -164,23 +164,23 @@ struct TRINITY_DLL_DECL boss_sjonnirAI : public ScriptedAI } else uiFrenzyTimer -= diff; } - + uiEncounterTimer +=diff; DoMeleeAttackIfReady(); } - + void JustSummoned(Creature* summon) { summon->GetMotionMaster()->MovePoint(0, CenterPoint.x, CenterPoint.y, CenterPoint.z); /*if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) summon->AI()->AttackStart(pTarget);*/ } - + void JustDied(Unit* killer) { DoScriptText(SAY_DEATH, m_creature); - + if (HeroicMode && uiKilledIronSludges > 4) { AchievementEntry const *AchievAbuseTheOoze = GetAchievementStore()->LookupEntry(ACHIEVEMENT_ABUSE_THE_OOZE); @@ -195,7 +195,7 @@ struct TRINITY_DLL_DECL boss_sjonnirAI : public ScriptedAI } } } - + if (pInstance) pInstance->SetData(DATA_SJONNIR_EVENT, DONE); } @@ -205,7 +205,7 @@ struct TRINITY_DLL_DECL boss_sjonnirAI : public ScriptedAI return; DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), m_creature); } - + void KilledIronSludge() { ++uiKilledIronSludges; @@ -220,16 +220,16 @@ CreatureAI* GetAI_boss_sjonnir(Creature* pCreature) struct TRINITY_DLL_DECL mob_malformed_oozeAI : public ScriptedAI { mob_malformed_oozeAI(Creature *c) : ScriptedAI(c) {} - + uint32 uiMergeTimer; bool bIsMerging; - + void Reset() { uiMergeTimer = 5000; bIsMerging = false; } - + void UpdateAI(const uint32 diff) { if (bIsMerging) @@ -244,13 +244,13 @@ struct TRINITY_DLL_DECL mob_malformed_oozeAI : public ScriptedAI } else bIsMerging = false; } else uiMergeTimer -= diff; } - + if (!UpdateVictim()) return; - + DoMeleeAttackIfReady(); } - + void MovementInform(uint32 type, uint32 id) { if(type != POINT_MOTION_TYPE) @@ -270,9 +270,9 @@ struct TRINITY_DLL_DECL mob_iron_sludgeAI : public ScriptedAI { pInstance = c->GetInstanceData(); } - + ScriptedInstance* pInstance; - + void JustDied(Unit* pKiller) { if (pInstance) @@ -294,12 +294,12 @@ void AddSC_boss_sjonnir() newscript->Name = "boss_sjonnir"; newscript->GetAI = &GetAI_boss_sjonnir; newscript->RegisterSelf(); - + newscript = new Script; newscript->Name = "mob_malformed_ooze"; newscript->GetAI = &GetAI_mob_malformed_ooze; newscript->RegisterSelf(); - + newscript = new Script; newscript->Name = "mob_iron_sludge"; newscript->GetAI = &GetAI_mob_iron_sludge; diff --git a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp index 4af80a93abd..85d9367ae1d 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp @@ -13,16 +13,16 @@ struct TRINITY_DLL_DECL instance_halls_of_stone : public ScriptedInstance { instance_halls_of_stone(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; - + uint64 uiMaidenOfGrief; uint64 uiKrystallus; uint64 uiSjonnir; - + uint64 uiKaddrak; uint64 uiAbedneum; uint64 uiMarnak; uint64 uiBrann; - + uint64 uiMaidenOfGriefDoor; uint64 uiSjonnirDoor; uint64 uiBrannDoor; @@ -32,22 +32,22 @@ struct TRINITY_DLL_DECL instance_halls_of_stone : public ScriptedInstance uint64 uiKaddrakGo; uint64 uiAbedneumGo; uint64 uiMarnakGo; - + uint32 m_auiEncounter[MAX_ENCOUNTER]; - + std::string str_data; - + void Initialize() { uiMaidenOfGrief = 0; uiKrystallus = 0; uiSjonnir = 0; - + uiKaddrak = 0; uiMarnak = 0; uiAbedneum = 0; uiBrann = 0; - + uiMaidenOfGriefDoor = 0; uiSjonnirDoor = 0; uiBrannDoor = 0; @@ -57,11 +57,11 @@ struct TRINITY_DLL_DECL instance_halls_of_stone : public ScriptedInstance uiTribunalConsole = 0; uiTribunalChest = 0; uiTribunalSkyFloor = 0; - + for(uint8 i = 0; i < MAX_ENCOUNTER; ++i) m_auiEncounter[i] = NOT_STARTED; } - + void OnCreatureCreate(Creature* pCreature, bool add) { switch(pCreature->GetEntry()) @@ -75,7 +75,7 @@ struct TRINITY_DLL_DECL instance_halls_of_stone : public ScriptedInstance case 28070: uiBrann = pCreature->GetGUID(); break; } } - + void OnGameObjectCreate(GameObject* pGo, bool add) { switch(pGo->GetEntry()) @@ -121,7 +121,7 @@ struct TRINITY_DLL_DECL instance_halls_of_stone : public ScriptedInstance break; } } - + void SetData(uint32 type, uint32 data) { switch(type) @@ -145,11 +145,11 @@ struct TRINITY_DLL_DECL instance_halls_of_stone : public ScriptedInstance HandleGameObject(uiSjonnirDoor,true); break; } - + if (data == DONE) SaveToDB(); } - + uint32 GetData(uint32 type) { switch(type) @@ -159,10 +159,10 @@ struct TRINITY_DLL_DECL instance_halls_of_stone : public ScriptedInstance case DATA_SJONNIR_EVENT: return m_auiEncounter[2]; case DATA_BRANN_EVENT: return m_auiEncounter[3]; } - + return 0; } - + uint64 GetData64(uint32 identifier) { switch(identifier) @@ -179,10 +179,10 @@ struct TRINITY_DLL_DECL instance_halls_of_stone : public ScriptedInstance case DATA_GO_MARNAK: return uiMarnakGo; case DATA_GO_SKY_FLOOR: return uiTribunalSkyFloor; } - + return 0; } - + std::string GetSaveData() { OUT_SAVE_INST_DATA; diff --git a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_flame_leviathan.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_flame_leviathan.cpp index 8944d98ef9a..1aa70290b69 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_flame_leviathan.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_flame_leviathan.cpp @@ -286,7 +286,7 @@ struct TRINITY_DLL_DECL boss_flame_leviathan_overload_deviceAI : public PassiveA if(Unit *leviathan = me->GetVehicleBase()->GetVehicleBase()) player->GetMotionMaster()->MoveKnockbackFrom(leviathan->GetPositionX(), leviathan->GetPositionY(), 30, 30); } - } + } } } }; @@ -387,7 +387,7 @@ void AddSC_boss_flame_leviathan() newscript = new Script; newscript->Name = "boss_flame_leviathan_safety_container"; newscript->GetAI = &GetAI_boss_flame_leviathan_safety_containerAI; - newscript->RegisterSelf(); + newscript->RegisterSelf(); newscript = new Script; newscript->Name = "spell_pool_of_tar"; diff --git a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/ulduar_teleporter.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/ulduar_teleporter.cpp index 19637c4961a..3ea183059da 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/ulduar_teleporter.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/ulduar_teleporter.cpp @@ -71,7 +71,7 @@ bool GOSelect_ulduar_teleporter( Player *pPlayer, GameObject *pGO, uint32 sender pPlayer->TeleportTo(603, 1498.09, -24.246, 420.967, 0); pPlayer->CLOSE_GOSSIP_MENU(); break; case WALKWAY: - pPlayer->TeleportTo(603, 1859.45, -24.1, 448.9, 0); + pPlayer->TeleportTo(603, 1859.45, -24.1, 448.9, 0); pPlayer->CLOSE_GOSSIP_MENU(); break; case CONSERVATORY: pPlayer->TeleportTo(603, 2086.27, -24.3134, 421.239, 0); diff --git a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp index bbbc7058ad9..df72278c684 100644 --- a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp +++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp @@ -25,7 +25,7 @@ enum Spells SPELL_SPIRIT_STRIKE = 48423, H_SPELL_SPIRIT_STRIKE = 59304, SPELL_ANCESTORS_VENGEANCE = 16939, - + SPELL_SUMMON_AVENGING_SPIRIT = 48592, SPELL_SUMMON_SPIRIT_FOUNT = 48386, @@ -96,14 +96,14 @@ struct TRINITY_DLL_DECL boss_ymironAI : public ScriptedAI m_uiActiveOrder[r] = temp; } } - + bool m_bIsWalking; bool m_bIsPause; bool m_bIsActiveWithBJORN; bool m_bIsActiveWithHALDOR; bool m_bIsActiveWithRANULF; bool m_bIsActiveWithTORGYN; - + uint8 m_uiActiveOrder[4]; uint8 m_uiActivedNumber; @@ -151,7 +151,7 @@ struct TRINITY_DLL_DECL boss_ymironAI : public ScriptedAI DespawnBoatGhosts(m_uiActivedCreatureGUID); DespawnBoatGhosts(m_uiOrbGUID); - + if (pInstance) pInstance->SetData(DATA_KING_YMIRON_EVENT, NOT_STARTED); } @@ -212,7 +212,7 @@ struct TRINITY_DLL_DECL boss_ymironAI : public ScriptedAI //Return since we have no target if (!UpdateVictim()) return; - + if (!m_bIsPause) { // Normal spells ------------------------------------------------------------------------ @@ -328,7 +328,7 @@ struct TRINITY_DLL_DECL boss_ymironAI : public ScriptedAI void JustDied(Unit* killer) { DoScriptText(SAY_DEATH, m_creature); - + DespawnBoatGhosts(m_uiActivedCreatureGUID); DespawnBoatGhosts(m_uiOrbGUID); diff --git a/src/bindings/scripts/scripts/northrend/violet_hold/boss_cyanigosa.cpp b/src/bindings/scripts/scripts/northrend/violet_hold/boss_cyanigosa.cpp index a55e68ebb91..6d4822a01d9 100644 --- a/src/bindings/scripts/scripts/northrend/violet_hold/boss_cyanigosa.cpp +++ b/src/bindings/scripts/scripts/northrend/violet_hold/boss_cyanigosa.cpp @@ -44,13 +44,13 @@ struct TRINITY_DLL_DECL boss_cyanigosaAI : public ScriptedAI { pInstance = c->GetInstanceData(); } - + uint32 uiArcaneVacumTimer; uint32 uiBlizzardTimer; uint32 uiManaDestructionTimer; uint32 uiTailSweepTimer; uint32 uiUncontrollableEnergyTimer; - + ScriptedInstance* pInstance; void Reset() @@ -58,28 +58,28 @@ struct TRINITY_DLL_DECL boss_cyanigosaAI : public ScriptedAI if (pInstance) pInstance->SetData(DATA_CYANIGOSA_EVENT, NOT_STARTED); } - + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); - + if (pInstance) pInstance->SetData(DATA_CYANIGOSA_EVENT, IN_PROGRESS); } - + void MoveInLineOfSight(Unit* who) {} - + void UpdateAI(const uint32 diff) { //Return since we have no target if (!UpdateVictim()) return; - + if (uiArcaneVacumTimer < diff) { DoCast(m_creature, SPELL_ARCANE_VACUM); } else uiArcaneVacumTimer -= diff; - + if (uiBlizzardTimer < diff) { Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); @@ -88,17 +88,17 @@ struct TRINITY_DLL_DECL boss_cyanigosaAI : public ScriptedAI if (pTarget) DoCast(pTarget, HeroicMode ? H_SPELL_BLIZZARD : SPELL_BLIZZARD); } else uiBlizzardTimer -= diff; - + if (uiTailSweepTimer < diff) { DoCast(m_creature, HeroicMode ? H_SPELL_TAIL_SWEEP : SPELL_TAIL_SWEEP); } else uiTailSweepTimer -= diff; - + if (uiUncontrollableEnergyTimer < diff) { DoCast(m_creature->getVictim(), HeroicMode ? H_SPELL_UNCONTROLLABLE_ENERGY : SPELL_UNCONTROLLABLE_ENERGY); } else uiUncontrollableEnergyTimer -= diff; - + if (HeroicMode) if (uiManaDestructionTimer < diff) { @@ -111,15 +111,15 @@ struct TRINITY_DLL_DECL boss_cyanigosaAI : public ScriptedAI DoMeleeAttackIfReady(); } - + void JustDied(Unit* killer) { DoScriptText(SAY_DEATH, m_creature); - + if (pInstance) pInstance->SetData(DATA_CYANIGOSA_EVENT, DONE); } - + void KilledUnit(Unit *victim) { if (victim == m_creature) diff --git a/src/bindings/scripts/scripts/northrend/violet_hold/boss_erekem.cpp b/src/bindings/scripts/scripts/northrend/violet_hold/boss_erekem.cpp index fbbbe84cba1..cf6686421d1 100644 --- a/src/bindings/scripts/scripts/northrend/violet_hold/boss_erekem.cpp +++ b/src/bindings/scripts/scripts/northrend/violet_hold/boss_erekem.cpp @@ -44,16 +44,16 @@ struct TRINITY_DLL_DECL boss_erekemAI : public ScriptedAI { pInstance = c->GetInstanceData(); } - + uint32 uiBloodlustTimer; uint32 uiChainHealTimer; uint32 uiEarthShockTimer; uint32 uiLightningBoltTimer; uint32 uiEarthShieldTimer; - + Creature* pGuard1; Creature* pGuard2; - + ScriptedInstance* pInstance; void Reset() @@ -71,12 +71,12 @@ struct TRINITY_DLL_DECL boss_erekemAI : public ScriptedAI pInstance->SetData(DATA_2ND_BOSS_EVENT, NOT_STARTED); } } - + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); DoCast(m_creature, HEROIC(SPELL_EARTH_SHIELD, H_SPELL_EARTH_SHIELD)); - + if (pInstance) { if (pInstance->GetData(DATA_WAVE_COUNT) == 6) @@ -85,15 +85,15 @@ struct TRINITY_DLL_DECL boss_erekemAI : public ScriptedAI pInstance->SetData(DATA_2ND_BOSS_EVENT, IN_PROGRESS); } } - + void MoveInLineOfSight(Unit* who) {} - + void UpdateAI(const uint32 diff) { //Return since we have no target if (!UpdateVictim()) return; - + //spam stormstrike in hc mode if spawns are dead if (HeroicMode) { @@ -102,13 +102,13 @@ struct TRINITY_DLL_DECL boss_erekemAI : public ScriptedAI DoCast(m_creature->getVictim(), SPELL_STORMSTRIKE); } } - + if (uiEarthShieldTimer < diff) { DoCast(m_creature, HEROIC(SPELL_EARTH_SHIELD, H_SPELL_EARTH_SHIELD)); uiEarthShieldTimer = 20000; } else uiEarthShieldTimer -= diff; - + if (uiChainHealTimer < diff) { if (Creature *pTarget = GetChainHealTarget()) @@ -118,20 +118,20 @@ struct TRINITY_DLL_DECL boss_erekemAI : public ScriptedAI uiChainHealTimer = ((pGuard1 && !pGuard1->isAlive()) || (pGuard2 && !pGuard2->isAlive()) ? 3000 : 8000) + rand()%3000; } } else uiChainHealTimer -= diff; - + if (uiBloodlustTimer < diff) { DoCast(m_creature,SPELL_BLOODLUST); uiBloodlustTimer = urand(35000,45000); } else uiBloodlustTimer -= diff; - - + + if (uiEarthShockTimer < diff) { DoCast(m_creature->getVictim(), SPELL_EARTH_SHOCK); uiEarthShockTimer = urand(8000,13000); } else uiEarthShockTimer -= diff; - + if (uiLightningBoltTimer < diff) { Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); @@ -144,11 +144,11 @@ struct TRINITY_DLL_DECL boss_erekemAI : public ScriptedAI DoMeleeAttackIfReady(); } - + void JustDied(Unit* killer) { DoScriptText(SAY_DEATH, m_creature); - + if (pInstance) { if (pInstance->GetData(DATA_WAVE_COUNT) == 6) @@ -163,14 +163,14 @@ struct TRINITY_DLL_DECL boss_erekemAI : public ScriptedAI } } } - + void KilledUnit(Unit *victim) { if (victim == m_creature) return; DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), m_creature); } - + Creature* GetChainHealTarget() { Creature* pTarget = NULL; @@ -189,27 +189,27 @@ struct TRINITY_DLL_DECL mob_erekem_guardAI : public ScriptedAI { pInstance = c->GetInstanceData(); } - + uint32 uiEarthShieldTimer; uint32 uiLightningBoltTimer; uint32 uiBloodlustTimer; - + ScriptedInstance* pInstance; - + void Reset() { uiEarthShieldTimer = 20000; uiLightningBoltTimer = urand(0,5000); uiBloodlustTimer = urand(8000,18000); } - + void EnterCombat(Unit* who) { DoCast(m_creature, H_SPELL_EARTH_SHIELD); } - + void MoveInLineOfSight(Unit* who) {} - + void UpdateAI(const uint32 diff) { if (uiEarthShieldTimer < diff) @@ -217,14 +217,14 @@ struct TRINITY_DLL_DECL mob_erekem_guardAI : public ScriptedAI DoCast(m_creature, H_SPELL_EARTH_SHIELD); uiEarthShieldTimer = 20000; } else uiEarthShieldTimer -= diff; - + if (uiLightningBoltTimer < diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_LIGHTNING_BOLT); uiLightningBoltTimer = urand(18000,24000); } else uiLightningBoltTimer -= diff; - + if (uiBloodlustTimer < diff) { DoCast(m_creature,SPELL_BLOODLUST); @@ -247,7 +247,7 @@ void AddSC_boss_erekem() newscript->Name = "boss_erekem"; newscript->GetAI = &GetAI_boss_erekem; newscript->RegisterSelf(); - + newscript->Name = "mob_erekem_guard"; newscript->GetAI = &GetAI_mob_erekem_guard; newscript->RegisterSelf(); diff --git a/src/bindings/scripts/scripts/northrend/violet_hold/boss_ichoron.cpp b/src/bindings/scripts/scripts/northrend/violet_hold/boss_ichoron.cpp index 51cc1557352..3d9f5bc659c 100644 --- a/src/bindings/scripts/scripts/northrend/violet_hold/boss_ichoron.cpp +++ b/src/bindings/scripts/scripts/northrend/violet_hold/boss_ichoron.cpp @@ -51,17 +51,17 @@ struct TRINITY_DLL_DECL boss_ichoronAI : public ScriptedAI { pInstance = c->GetInstanceData(); } - + CombatPhase Phase; - + ScriptedInstance* pInstance; void Reset() { Phase = BUBBLED; - + DoCast(m_creature, SPELL_PROTECTIVE_BUBBLE); - + if (pInstance) { if (pInstance->GetData(DATA_WAVE_COUNT) == 6) @@ -73,7 +73,7 @@ struct TRINITY_DLL_DECL boss_ichoronAI : public ScriptedAI void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); - + if (pInstance) { if (pInstance->GetData(DATA_WAVE_COUNT) == 6) @@ -82,7 +82,7 @@ struct TRINITY_DLL_DECL boss_ichoronAI : public ScriptedAI pInstance->SetData(DATA_2ND_BOSS_EVENT, IN_PROGRESS); } } - + void UpdateAI(const uint32 diff) { //Return since we have no target @@ -91,11 +91,11 @@ struct TRINITY_DLL_DECL boss_ichoronAI : public ScriptedAI DoMeleeAttackIfReady(); } - + void JustDied(Unit* killer) { DoScriptText(SAY_DEATH, m_creature); - + if (pInstance) { if (pInstance->GetData(DATA_WAVE_COUNT) == 6) @@ -110,7 +110,7 @@ struct TRINITY_DLL_DECL boss_ichoronAI : public ScriptedAI } } } - + void KilledUnit(Unit *victim) { if (victim == m_creature) diff --git a/src/bindings/scripts/scripts/northrend/violet_hold/boss_lavanthor.cpp b/src/bindings/scripts/scripts/northrend/violet_hold/boss_lavanthor.cpp index 30d8e5d7526..fc493735a72 100644 --- a/src/bindings/scripts/scripts/northrend/violet_hold/boss_lavanthor.cpp +++ b/src/bindings/scripts/scripts/northrend/violet_hold/boss_lavanthor.cpp @@ -29,12 +29,12 @@ struct TRINITY_DLL_DECL boss_lavanthorAI : public ScriptedAI { pInstance = c->GetInstanceData(); } - + uint32 uiFireboltTimer; uint32 uiFlameBreathTimer; uint32 uiLavaBurnTimer; uint32 uiCauterizingFlamesTimer; - + ScriptedInstance* pInstance; void Reset() @@ -51,7 +51,7 @@ struct TRINITY_DLL_DECL boss_lavanthorAI : public ScriptedAI pInstance->SetData(DATA_2ND_BOSS_EVENT, NOT_STARTED); } } - + void EnterCombat(Unit* who) { if (pInstance) @@ -62,33 +62,33 @@ struct TRINITY_DLL_DECL boss_lavanthorAI : public ScriptedAI pInstance->SetData(DATA_2ND_BOSS_EVENT, IN_PROGRESS); } } - + void MoveInLineOfSight(Unit* who) {} - + void UpdateAI(const uint32 diff) { //Return since we have no target if (!UpdateVictim()) return; - + if (uiFireboltTimer < diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_FIREBOLT, H_SPELL_FIREBOLT)); uiFireboltTimer = urand(5000,13000); } else uiFireboltTimer -= diff; - + if (uiFlameBreathTimer < diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_FLAME_BREATH, H_SPELL_FLAME_BREATH)); uiFlameBreathTimer = urand(10000,15000); } else uiFlameBreathTimer -= diff; - + if (uiLavaBurnTimer < diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_LAVA_BURN, H_SPELL_LAVA_BURN)); uiLavaBurnTimer = urand(15000,23000); } - + if (HeroicMode) { if (uiCauterizingFlamesTimer < diff) @@ -100,7 +100,7 @@ struct TRINITY_DLL_DECL boss_lavanthorAI : public ScriptedAI DoMeleeAttackIfReady(); } - + void JustDied(Unit* killer) { if (pInstance) diff --git a/src/bindings/scripts/scripts/northrend/violet_hold/boss_moragg.cpp b/src/bindings/scripts/scripts/northrend/violet_hold/boss_moragg.cpp index 8bc82b6b40a..53501a6425a 100644 --- a/src/bindings/scripts/scripts/northrend/violet_hold/boss_moragg.cpp +++ b/src/bindings/scripts/scripts/northrend/violet_hold/boss_moragg.cpp @@ -26,17 +26,17 @@ struct TRINITY_DLL_DECL boss_moraggAI : public ScriptedAI { pInstance = c->GetInstanceData(); } - + uint32 uiOpticLinkTimer; uint32 uiCorrosiveSalivaTimer; - + ScriptedInstance* pInstance; void Reset() { uiOpticLinkTimer = 10000; uiCorrosiveSalivaTimer = 5000; - + if (pInstance) { if (pInstance->GetData(DATA_WAVE_COUNT) == 6) @@ -45,7 +45,7 @@ struct TRINITY_DLL_DECL boss_moraggAI : public ScriptedAI pInstance->SetData(DATA_2ND_BOSS_EVENT, NOT_STARTED); } } - + void EnterCombat(Unit* who) { if (pInstance) @@ -56,22 +56,22 @@ struct TRINITY_DLL_DECL boss_moraggAI : public ScriptedAI pInstance->SetData(DATA_2ND_BOSS_EVENT, IN_PROGRESS); } } - + void MoveInLineOfSight(Unit* who) {} - + void UpdateAI(const uint32 diff) { //Return since we have no target if (!UpdateVictim()) return; - + if (uiOpticLinkTimer < diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget,SPELL_OPTIC_LINK); uiOpticLinkTimer = 15000; } else uiOpticLinkTimer -= diff; - + if (uiCorrosiveSalivaTimer < diff) { DoCast(m_creature->getVictim(), SPELL_CORROSIVE_SALIVA); diff --git a/src/bindings/scripts/scripts/northrend/violet_hold/boss_xevozz.cpp b/src/bindings/scripts/scripts/northrend/violet_hold/boss_xevozz.cpp index 6fe3587345e..3f607bcd3f3 100644 --- a/src/bindings/scripts/scripts/northrend/violet_hold/boss_xevozz.cpp +++ b/src/bindings/scripts/scripts/northrend/violet_hold/boss_xevozz.cpp @@ -60,7 +60,7 @@ struct TRINITY_DLL_DECL boss_xevozzAI : public ScriptedAI { pInstance = c->GetInstanceData(); } - + ScriptedInstance* pInstance; void Reset() @@ -73,7 +73,7 @@ struct TRINITY_DLL_DECL boss_xevozzAI : public ScriptedAI pInstance->SetData(DATA_2ND_BOSS_EVENT, NOT_STARTED); } } - + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); @@ -85,9 +85,9 @@ struct TRINITY_DLL_DECL boss_xevozzAI : public ScriptedAI pInstance->SetData(DATA_2ND_BOSS_EVENT, IN_PROGRESS); } } - + void MoveInLineOfSight(Unit* who) {} - + void UpdateAI(const uint32 diff) { //Return since we have no target @@ -96,7 +96,7 @@ struct TRINITY_DLL_DECL boss_xevozzAI : public ScriptedAI DoMeleeAttackIfReady(); } - + void JustDied(Unit* killer) { DoScriptText(SAY_DEATH, m_creature); diff --git a/src/bindings/scripts/scripts/northrend/violet_hold/boss_zuramat.cpp b/src/bindings/scripts/scripts/northrend/violet_hold/boss_zuramat.cpp index 98b4581af3d..d573060f50e 100644 --- a/src/bindings/scripts/scripts/northrend/violet_hold/boss_zuramat.cpp +++ b/src/bindings/scripts/scripts/northrend/violet_hold/boss_zuramat.cpp @@ -47,7 +47,7 @@ struct TRINITY_DLL_DECL boss_zuramatAI : public ScriptedAI } uint32 void_shift; - + ScriptedInstance* pInstance; void Reset() @@ -60,7 +60,7 @@ struct TRINITY_DLL_DECL boss_zuramatAI : public ScriptedAI pInstance->SetData(DATA_2ND_BOSS_EVENT, NOT_STARTED); } } - + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); @@ -72,9 +72,9 @@ struct TRINITY_DLL_DECL boss_zuramatAI : public ScriptedAI pInstance->SetData(DATA_2ND_BOSS_EVENT, IN_PROGRESS); } } - + void MoveInLineOfSight(Unit* who) {} - + void UpdateAI(const uint32 diff) { //Return since we have no target @@ -86,7 +86,7 @@ struct TRINITY_DLL_DECL boss_zuramatAI : public ScriptedAI void JustDied(Unit* killer) { DoScriptText(SAY_DEATH, m_creature); - + if (pInstance) { if (pInstance->GetData(DATA_WAVE_COUNT) == 6) @@ -101,12 +101,12 @@ struct TRINITY_DLL_DECL boss_zuramatAI : public ScriptedAI } } } - + void KilledUnit(Unit *victim) { if (victim == m_creature) return; - + DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), m_creature); } }; diff --git a/src/bindings/scripts/scripts/northrend/violet_hold/instance_violet_hold.cpp b/src/bindings/scripts/scripts/northrend/violet_hold/instance_violet_hold.cpp index db4c81675ff..cc1d72b4e3a 100644 --- a/src/bindings/scripts/scripts/northrend/violet_hold/instance_violet_hold.cpp +++ b/src/bindings/scripts/scripts/northrend/violet_hold/instance_violet_hold.cpp @@ -36,12 +36,12 @@ const Location PortalLocation[] = { {1936.07, 803.198, 53.3749, 3.12414}, {1877.51, 850.104, 44.6599, 4.7822 }, - {1890.64, 753.471, 48.7224, 1.71042} + {1890.64, 753.471, 48.7224, 1.71042} }; struct TRINITY_DLL_DECL instance_violet_hold : public ScriptedInstance { instance_violet_hold(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; - + uint64 uiMoragg; uint64 uiErekem; uint64 uiIchoron; @@ -50,7 +50,7 @@ struct TRINITY_DLL_DECL instance_violet_hold : public ScriptedInstance uint64 uiZuramat; uint64 uiCyanigosa; uint64 uiSinclari; - + uint64 uiMoraggCell; uint64 uiErekemCell; uint64 uiErekemRightGuardCell; @@ -60,18 +60,18 @@ struct TRINITY_DLL_DECL instance_violet_hold : public ScriptedInstance uint64 uiXevozzCell; uint64 uiZuramatCell; uint64 uiMainDoor; - + uint8 uiWaveCount; uint8 uiLocation; uint8 uiFirstBoss; uint8 uiSecondBoss; - + uint8 m_auiEncounter[MAX_ENCOUNTER]; - + bool HeroicMode; - + std::string str_data; - + void Initialize() { uiMoragg = 0; @@ -82,7 +82,7 @@ struct TRINITY_DLL_DECL instance_violet_hold : public ScriptedInstance uiZuramat = 0; uiCyanigosa = 0; uiSinclari = 0; - + uiMoraggCell = 0; uiErekemCell = 0; uiErekemRightGuardCell = 0; @@ -92,15 +92,15 @@ struct TRINITY_DLL_DECL instance_violet_hold : public ScriptedInstance uiXevozzCell = 0; uiZuramatCell = 0; uiMainDoor = 0; - + uiWaveCount = 0; uiLocation = 0; uiFirstBoss = 0; uiSecondBoss = 0; - + memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); } - + bool IsEncounterInProgress() const { for(uint8 i = 0; i < MAX_ENCOUNTER; ++i) @@ -108,7 +108,7 @@ struct TRINITY_DLL_DECL instance_violet_hold : public ScriptedInstance return false; } - + void OnCreatureCreate(Creature* pCreature, bool add) { switch(pCreature->GetEntry()) @@ -139,7 +139,7 @@ struct TRINITY_DLL_DECL instance_violet_hold : public ScriptedInstance break; } } - + void OnGameObjectCreate(GameObject* pGo, bool add) { switch(pGo->GetEntry()) @@ -182,7 +182,7 @@ struct TRINITY_DLL_DECL instance_violet_hold : public ScriptedInstance break; } } - + void SetData(uint32 type, uint32 data) { switch(type) @@ -248,7 +248,7 @@ struct TRINITY_DLL_DECL instance_violet_hold : public ScriptedInstance break; } } - + uint32 GetData(uint32 type) { switch(type) @@ -258,10 +258,10 @@ struct TRINITY_DLL_DECL instance_violet_hold : public ScriptedInstance case DATA_CYANIGOSA_EVENT: return m_auiEncounter[2]; case DATA_WAVE_COUNT: return uiWaveCount; } - + return 0; } - + void StartBossEncounter(uint8 uiBoss) { Creature* pBoss = NULL; @@ -322,7 +322,7 @@ struct TRINITY_DLL_DECL instance_violet_hold : public ScriptedInstance break; } } - + uint64 GetData64(uint32 identifier) { switch(identifier) @@ -345,10 +345,10 @@ struct TRINITY_DLL_DECL instance_violet_hold : public ScriptedInstance case DATA_MAIN_DOOR: return uiMainDoor; case DATA_SINCLARI: return uiSinclari; } - + return 0; } - + std::string GetSaveData() { OUT_SAVE_INST_DATA; @@ -362,7 +362,7 @@ struct TRINITY_DLL_DECL instance_violet_hold : public ScriptedInstance OUT_SAVE_INST_DATA_COMPLETE; return str_data; } - + void Load(const char* in) { if (!in) @@ -388,7 +388,7 @@ struct TRINITY_DLL_DECL instance_violet_hold : public ScriptedInstance for(uint8 i = 0; i < MAX_ENCOUNTER; ++i) if (m_auiEncounter[i] == IN_PROGRESS) m_auiEncounter[i] = NOT_STARTED; - + uiFirstBoss = data3; uiSecondBoss = data4; }else OUT_LOAD_INST_DATA_FAIL; diff --git a/src/bindings/scripts/scripts/northrend/violet_hold/violet_hold.cpp b/src/bindings/scripts/scripts/northrend/violet_hold/violet_hold.cpp index 6119261c801..900b0021336 100644 --- a/src/bindings/scripts/scripts/northrend/violet_hold/violet_hold.cpp +++ b/src/bindings/scripts/scripts/northrend/violet_hold/violet_hold.cpp @@ -38,21 +38,21 @@ struct TRINITY_DLL_DECL npc_teleportation_portalAI : public ScriptedAI { pInstance = c->GetInstanceData(); } - + uint32 uiDespawnTimer; uint32 uiSpawnTimer; ScriptedInstance *pInstance; - + void reset() { uiDespawnTimer = NEXT_WAVE_TIME; uiSpawnTimer = 500; } - + void EnterCombat(Unit *who) {} void MoveInLineOfSight(Unit *who) {} - + void UpdateAI(const uint32 diff) { if (uiSpawnTimer < diff) @@ -71,7 +71,7 @@ struct TRINITY_DLL_DECL npc_teleportation_portalAI : public ScriptedAI m_creature->DisappearAndDie(); } else uiDespawnTimer -= diff; } - + void JustDied(Unit* killer) { if (pInstance) @@ -93,7 +93,7 @@ void AddSC_violet_hold() newscript->pGossipHello = &GossipHello_npc_sinclari; newscript->pGossipSelect = &GossipSelect_npc_sinclari; newscript->RegisterSelf(); - + newscript = new Script; newscript->Name = "npc_teleportation_portal_vh"; newscript->GetAI = &GetAI_npc_teleportation_portal; diff --git a/src/bindings/scripts/scripts/outland/auchindoun/mana_tombs/boss_nexusprince_shaffar.cpp b/src/bindings/scripts/scripts/outland/auchindoun/mana_tombs/boss_nexusprince_shaffar.cpp index e352533c7c5..9d19da0916f 100644 --- a/src/bindings/scripts/scripts/outland/auchindoun/mana_tombs/boss_nexusprince_shaffar.cpp +++ b/src/bindings/scripts/scripts/outland/auchindoun/mana_tombs/boss_nexusprince_shaffar.cpp @@ -46,7 +46,7 @@ enum ePrince SPELL_ETHEREAL_BEACON = 32371, // Summons NPC_BEACON SPELL_ETHEREAL_BEACON_VISUAL = 32368, - + NPC_BEACON = 18431, NPC_SHAFFAR = 18344, @@ -351,7 +351,7 @@ void AddSC_boss_nexusprince_shaffar() newscript->Name = "mob_ethereal_beacon"; newscript->GetAI = &GetAI_mob_ethereal_beacon; newscript->RegisterSelf(); - + newscript = new Script; newscript->Name = "mob_ethereal_apprentice"; newscript->GetAI = &GetAI_mob_ethereal_apprentice; diff --git a/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_murmur.cpp b/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_murmur.cpp index 8f4cbf9a1cf..7782b5fed62 100644 --- a/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_murmur.cpp +++ b/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_murmur.cpp @@ -84,7 +84,7 @@ struct TRINITY_DLL_DECL boss_murmurAI : public ScriptedAI } } } - + void EnterCombat(Unit *who) { } // Sonic Boom instant damage (needs core fix instead of this) diff --git a/src/bindings/scripts/scripts/outland/black_temple/boss_illidan.cpp b/src/bindings/scripts/scripts/outland/black_temple/boss_illidan.cpp index f9125a37117..e081e33eb06 100644 --- a/src/bindings/scripts/scripts/outland/black_temple/boss_illidan.cpp +++ b/src/bindings/scripts/scripts/outland/black_temple/boss_illidan.cpp @@ -993,7 +993,7 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI uint32 WalkCount; uint32 TalkCount; uint32 Check_Timer; - + void Reset() { WalkCount = 0; @@ -1036,7 +1036,7 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI Phase = PHASE_AKAMA_NULL; Timer = 0; - ChannelCount = 0; + ChannelCount = 0; TalkCount = 0; Check_Timer = 5000; @@ -1059,7 +1059,7 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI void EnterCombat(Unit *who) {} void MoveInLineOfSight(Unit* who) {} - void MovementInform(uint32 MovementType, uint32 Data) + void MovementInform(uint32 MovementType, uint32 Data) { if(MovementType == POINT_MOTION_TYPE) Timer = 1; @@ -1093,7 +1093,7 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI pInstance->SetData(DATA_ILLIDANSTORMRAGEEVENT, IN_PROGRESS); for(uint8 i = 0; i < 2; ++i) - pInstance->HandleGameObject(DoorGUID[i], false); + pInstance->HandleGameObject(DoorGUID[i], false); if (GETCRE(Illidan, IllidanGUID)) { Illidan->RemoveAurasDueToSpell(SPELL_KNEEL); @@ -1121,7 +1121,7 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI if (Creature* Channel = m_creature->SummonCreature(ILLIDAN_DOOR_TRIGGER, x, y, z+5, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 360000)) { ChannelGUID = Channel->GetGUID(); - Channel->SetDisplayId(11686); // Invisible but spell visuals can still be seen. + Channel->SetDisplayId(11686); // Invisible but spell visuals can still be seen. DoCast(Channel, SPELL_AKAMA_DOOR_FAIL); } @@ -1146,7 +1146,7 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI return; switch(NextPhase) { - case PHASE_CHANNEL: + case PHASE_CHANNEL: BeginChannel(); Timer = 5000; ChannelCount = 0; @@ -1341,8 +1341,8 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI { case PHASE_CHANNEL: if(JustCreated) - HandleChannelSequence(); - else{ + HandleChannelSequence(); + else{ EnterPhase(PHASE_WALK); } break; diff --git a/src/bindings/scripts/scripts/outland/black_temple/boss_shade_of_akama.cpp b/src/bindings/scripts/scripts/outland/black_temple/boss_shade_of_akama.cpp index 97d28ef29be..ada3230a6f6 100644 --- a/src/bindings/scripts/scripts/outland/black_temple/boss_shade_of_akama.cpp +++ b/src/bindings/scripts/scripts/outland/black_temple/boss_shade_of_akama.cpp @@ -130,7 +130,7 @@ struct TRINITY_DLL_DECL mob_ashtongue_sorcererAI : public ScriptedAI void Reset() { StartBanishing = false; - CheckTimer = 5000; + CheckTimer = 5000; } void JustDied(Unit* killer); @@ -240,12 +240,12 @@ struct TRINITY_DLL_DECL boss_shade_of_akamaAI : public ScriptedAI { summons.DespawnAll(); } - void JustSummoned(Creature *summon) + void JustSummoned(Creature *summon) { if (summon->GetEntry() == CREATURE_DEFENDER || summon->GetEntry() == 23523 || summon->GetEntry() == 23318 || summon->GetEntry() == 23524) summons.Summon(summon); } - void SummonedCreatureDespawn(Creature *summon) + void SummonedCreatureDespawn(Creature *summon) { if (summon->GetEntry() == CREATURE_DEFENDER || summon->GetEntry() == 23523 || summon->GetEntry() == 23318 || summon->GetEntry() == 23524) summons.Despawn(summon); @@ -552,12 +552,12 @@ struct TRINITY_DLL_DECL npc_akamaAI : public ScriptedAI summons.DespawnAll(); } - void JustSummoned(Creature *summon) + void JustSummoned(Creature *summon) { if (summon->GetEntry() == CREATURE_BROKEN) summons.Summon(summon); } - void SummonedCreatureDespawn(Creature *summon) + void SummonedCreatureDespawn(Creature *summon) { if (summon->GetEntry() == CREATURE_BROKEN) summons.Despawn(summon); diff --git a/src/bindings/scripts/scripts/outland/black_temple/boss_supremus.cpp b/src/bindings/scripts/scripts/outland/black_temple/boss_supremus.cpp index 40383c56f36..a4e1b2d5428 100644 --- a/src/bindings/scripts/scripts/outland/black_temple/boss_supremus.cpp +++ b/src/bindings/scripts/scripts/outland/black_temple/boss_supremus.cpp @@ -248,7 +248,7 @@ struct TRINITY_DLL_DECL npc_volcanoAI : public Scripted_NoMovementAI m_creature->RemoveAura(SPELL_VOLCANIC_ERUPTION); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) { if (wait<=diff)//wait 3secs before casting { diff --git a/src/bindings/scripts/scripts/outland/black_temple/def_black_temple.h b/src/bindings/scripts/scripts/outland/black_temple/def_black_temple.h index ea60c281918..b7432cd5b20 100644 --- a/src/bindings/scripts/scripts/outland/black_temple/def_black_temple.h +++ b/src/bindings/scripts/scripts/outland/black_temple/def_black_temple.h @@ -6,7 +6,7 @@ #define DEF_BLACK_TEMPLE_H enum eTypes -{ +{ DATA_AKAMA = 1, DATA_AKAMA_SHADE = 2, DATA_GURTOGGBLOODBOILEVENT = 3, diff --git a/src/bindings/scripts/scripts/outland/black_temple/instance_black_temple.cpp b/src/bindings/scripts/scripts/outland/black_temple/instance_black_temple.cpp index 173632009ba..cd67af9a8f3 100644 --- a/src/bindings/scripts/scripts/outland/black_temple/instance_black_temple.cpp +++ b/src/bindings/scripts/scripts/outland/black_temple/instance_black_temple.cpp @@ -44,7 +44,7 @@ struct TRINITY_DLL_DECL instance_black_temple : public ScriptedInstance uint32 m_auiEncounter[MAX_ENCOUNTER]; std::string str_data; - + uint64 Najentus; uint64 Akama; // This is the Akama that starts the Illidan encounter. uint64 Akama_Shade; // This is the Akama that starts the Shade of Akama encounter. diff --git a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp index f97ff703aae..1146cf96b24 100644 --- a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp +++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp @@ -75,7 +75,7 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI TempSpell->Effect[0] = 0;//remove all spell effect, only anim is needed TempSpell->Effect[1] = 0; TempSpell->Effect[2] = 0; - } + } } ScriptedInstance* pInstance; @@ -104,7 +104,7 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI } void Reset() { - m_creature->AddUnitMovementFlag(MOVEMENTFLAG_SWIMMING + MOVEMENTFLAG_LEVITATING); + m_creature->AddUnitMovementFlag(MOVEMENTFLAG_SWIMMING + MOVEMENTFLAG_LEVITATING); SpoutAnimTimer = 1000; RotTimer = 0; WaterboltTimer = 15000;//give time to get in range when fight starts @@ -177,7 +177,7 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI { if(Submerged) { - m_creature->SetVisibility(VISIBILITY_ON); + m_creature->SetVisibility(VISIBILITY_ON); Submerged = false; WaitTimer2 = 500; } @@ -186,7 +186,7 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI m_creature->RemoveAllAuras(); m_creature->RemoveFlag(UNIT_NPC_EMOTESTATE,EMOTE_STATE_SUBMERGED); DoCast(m_creature,SPELL_EMERGE,false); - WaitTimer2 = 60000;//never reached + WaitTimer2 = 60000;//never reached WaitTimer = 3000; }else WaitTimer2 -= diff; @@ -197,10 +197,10 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); }else WaitTimer -= diff; - } + } return; } - + if(m_creature->getThreatManager().getThreatList().empty())//check if should evade @@ -234,14 +234,14 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI if (WhirlTimer < diff) { WhirlTimer = 18000; - DoCast(m_creature,SPELL_WHIRL); + DoCast(m_creature,SPELL_WHIRL); }else WhirlTimer -= diff; if(CheckTimer < diff)//check if there are players in melee range { InRange = false; Map* pMap = m_creature->GetMap(); - Map::PlayerList const &PlayerList = pMap->GetPlayers(); + Map::PlayerList const &PlayerList = pMap->GetPlayers(); if (!PlayerList.isEmpty()) { for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) @@ -269,7 +269,7 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI if(SpoutAnimTimer < diff) { DoCast(m_creature,SPELL_SPOUT_ANIM,true); - SpoutAnimTimer = 1000; + SpoutAnimTimer = 1000; }else SpoutAnimTimer -= diff; if(RotTimer < diff) @@ -343,7 +343,7 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI else Summoned = m_creature->SummonCreature(MOB_COILFANG_GUARDIAN,AddPos[i][0],AddPos[i][1],AddPos[i][2], 0, TEMPSUMMON_CORPSE_DESPAWN, 0); if (Summoned) - Summons.Summon(Summoned); + Summons.Summon(Summoned); } Spawned = true; } diff --git a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp index 9f13332b23c..bd917a6e5c7 100644 --- a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp +++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp @@ -139,7 +139,7 @@ struct TRINITY_DLL_DECL instance_serpentshrine_cavern : public ScriptedInstance SetData(DATA_STRANGE_POOL, IN_PROGRESS);//just fished, signal Lurker script to emerge and start fight, we use IN_PROGRESS so it won't get saved and lurker will be alway invis at start if server restarted }else FishingTimer -= diff; } - //Water checks + //Water checks if(WaterCheckTimer < diff) { if(TrashCount >= MIN_KILLS) @@ -176,11 +176,11 @@ struct TRINITY_DLL_DECL instance_serpentshrine_cavern : public ScriptedInstance DoSpawnFrenzy = false; } } - } + } if(!pPlayer->IsInWater()) pPlayer->RemoveAurasDueToSpell(SPELL_SCALDINGWATER); } - + } WaterCheckTimer = 500;//remove stress from core }else WaterCheckTimer -= diff; @@ -214,7 +214,7 @@ struct TRINITY_DLL_DECL instance_serpentshrine_cavern : public ScriptedInstance BridgePart[2] = pGo->GetGUID(); pGo->setActive(true); break; - case GAMEOBJECT_FISHINGNODE_ENTRY://no way checking if fish is hooked, so we create a timed event + case GAMEOBJECT_FISHINGNODE_ENTRY://no way checking if fish is hooked, so we create a timed event if(LurkerSubEvent == LURKER_NOT_STARTED) { FishingTimer = 10000+rand()%30000;//random time before lurker emerges @@ -241,7 +241,7 @@ struct TRINITY_DLL_DECL instance_serpentshrine_cavern : public ScriptedInstance TrashCount++; break;*/ } - } + } void SetData64(uint32 type, uint64 data) { @@ -272,7 +272,7 @@ struct TRINITY_DLL_DECL instance_serpentshrine_cavern : public ScriptedInstance { switch(type) { - case DATA_STRANGE_POOL: + case DATA_STRANGE_POOL: { StrangePool = data; if(data == NOT_STARTED) @@ -287,7 +287,7 @@ struct TRINITY_DLL_DECL instance_serpentshrine_cavern : public ScriptedInstance HandleGameObject(BridgePart[0], true); } ControlConsole = data;break; - case DATA_TRASH : + case DATA_TRASH : { if(data == 1 && TrashCount < MIN_KILLS) TrashCount++;//+1 died diff --git a/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/instance_steam_vault.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/instance_steam_vault.cpp index 29616a123ad..1ee00f2ef81 100644 --- a/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/instance_steam_vault.cpp +++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/instance_steam_vault.cpp @@ -130,7 +130,7 @@ struct TRINITY_DLL_DECL instance_steam_vault : public ScriptedInstance if (GetData(TYPE_HYDROMANCER_THESPIA) == SPECIAL) HandleGameObject(MainChambersDoor, true); - + debug_log("TSCR: Instance Steamvault: Access panel used."); } m_auiEncounter[1] = data; diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_broggok.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_broggok.cpp index edf78bebd0e..d359c9c25f7 100644 --- a/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_broggok.cpp +++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_broggok.cpp @@ -27,23 +27,23 @@ EndScriptData */ enum eEnums { SAY_AGGRO = -1542008, - + SPELL_SLIME_SPRAY = 30913, SPELL_POISON_CLOUD = 30916, SPELL_POISON_BOLT = 30917, - + SPELL_POISON = 30914 }; struct TRINITY_DLL_DECL boss_broggokAI : public ScriptedAI { - boss_broggokAI(Creature *c) : ScriptedAI(c) + boss_broggokAI(Creature *c) : ScriptedAI(c) { pInstance = c->GetInstanceData(); } ScriptedInstance* pInstance; - + uint32 AcidSpray_Timer; uint32 PoisonSpawn_Timer; uint32 PoisonBolt_Timer; @@ -103,9 +103,9 @@ struct TRINITY_DLL_DECL boss_broggokAI : public ScriptedAI DoMeleeAttackIfReady(); } - + void JustDied(Unit* who) - { + { if (pInstance) { pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR4), true); @@ -113,7 +113,7 @@ struct TRINITY_DLL_DECL boss_broggokAI : public ScriptedAI pInstance->SetData(TYPE_BROGGOK_EVENT, DONE); } } - + }; CreatureAI* GetAI_boss_broggok(Creature* pCreature) diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp index 50497d0c073..d47c3eecceb 100644 --- a/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp +++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp @@ -42,13 +42,13 @@ enum eKelidan SPELL_CORRUPTION = 30938, SPELL_EVOCATION = 30935, - + SPELL_FIRE_NOVA = 33132, H_SPELL_FIRE_NOVA = 37371, - + SPELL_SHADOW_BOLT_VOLLEY = 28599, H_SPELL_SHADOW_BOLT_VOLLEY = 40070, - + SPELL_BURNING_NOVA = 30940, SPELL_VORTEX = 37370, @@ -99,7 +99,7 @@ struct TRINITY_DLL_DECL boss_kelidan_the_breakerAI : public ScriptedAI if (pInstance) pInstance->SetData(TYPE_KELIDAN_THE_BREAKER_EVENT, NOT_STARTED); } - + void EnterCombat(Unit *who) { DoScriptText(SAY_WAKE, m_creature); @@ -180,7 +180,7 @@ struct TRINITY_DLL_DECL boss_kelidan_the_breakerAI : public ScriptedAI if (!pInstance) return; - + pInstance->SetData(TYPE_KELIDAN_THE_BREAKER_EVENT, DONE); pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR1), true); pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR6), true); @@ -252,7 +252,7 @@ struct TRINITY_DLL_DECL boss_kelidan_the_breakerAI : public ScriptedAI DoMeleeAttackIfReady(); } - + }; CreatureAI* GetAI_boss_kelidan_the_breaker(Creature* pCreature) @@ -268,7 +268,7 @@ enum eShadowmoon { SPELL_SHADOW_BOLT = 12739, H_SPELL_SHADOW_BOLT = 15472, - + SPELL_MARK_OF_SHADOW = 30937, SPELL_CHANNELING = 39123 }; diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_the_maker.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_the_maker.cpp index 44ed2bda8f3..9c19888c92c 100644 --- a/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_the_maker.cpp +++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_the_maker.cpp @@ -62,18 +62,18 @@ struct TRINITY_DLL_DECL boss_the_makerAI : public ScriptedAI if (!pInstance) return; - + pInstance->SetData(TYPE_THE_MAKER_EVENT, NOT_STARTED); pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR2), true); } - + void EnterCombat(Unit *who) { DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), m_creature); - + if (!pInstance) return; - + pInstance->SetData(TYPE_THE_MAKER_EVENT, IN_PROGRESS); pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR2), false); } @@ -86,14 +86,14 @@ struct TRINITY_DLL_DECL boss_the_makerAI : public ScriptedAI void JustDied(Unit* Killer) { DoScriptText(SAY_DIE, m_creature); - + if (!pInstance) return; - + pInstance->SetData(TYPE_THE_MAKER_EVENT, DONE); pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR2), true); pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR3), true); - + } diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_nethekurse.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_nethekurse.cpp index c970e59e4d4..4ae379d988e 100644 --- a/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_nethekurse.cpp +++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_nethekurse.cpp @@ -176,7 +176,7 @@ struct TRINITY_DLL_DECL boss_grand_warlock_nethekurseAI : public ScriptedAI { if (who->GetTypeId() != TYPEID_PLAYER) return; - + DoScriptText(SAY_INTRO, m_creature); IntroOnce = true; IsIntroEvent = true; @@ -201,7 +201,7 @@ struct TRINITY_DLL_DECL boss_grand_warlock_nethekurseAI : public ScriptedAI summoned->setFaction(16); summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - + //triggered spell of consumption does not properly show it's SpellVisual, wrong spellid? summoned->CastSpell(summoned,SPELL_TEMPORARY_VISUAL,true); summoned->CastSpell(summoned,SPELL_CONSUMPTION,false,0,0,m_creature->GetGUID()); diff --git a/src/bindings/scripts/scripts/outland/nagrand.cpp b/src/bindings/scripts/scripts/outland/nagrand.cpp index 839c632a0eb..f4f3792283f 100644 --- a/src/bindings/scripts/scripts/outland/nagrand.cpp +++ b/src/bindings/scripts/scripts/outland/nagrand.cpp @@ -606,7 +606,7 @@ struct TRINITY_DLL_DECL npc_maghar_captiveAI : public npc_escortAI pSummoned->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); pSummoned->GetMotionMaster()->MovePoint(0, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ()); pSummoned->AI()->AttackStart(m_creature); - + } void SpellHitTarget(Unit* pTarget, const SpellEntry* pSpell) diff --git a/src/bindings/scripts/scripts/world/go_scripts.cpp b/src/bindings/scripts/scripts/world/go_scripts.cpp index fd77f0f6331..668dd513191 100644 --- a/src/bindings/scripts/scripts/world/go_scripts.cpp +++ b/src/bindings/scripts/scripts/world/go_scripts.cpp @@ -503,7 +503,7 @@ bool GOHello_go_matrix_punchograph(Player* pPlayer, GameObject* pGo) switch(pGo->GetEntry()) { case MATRIX_PUNCHOGRAPH_3005_A: - if(pPlayer->HasItemCount(ITEM_WHITE_PUNCH_CARD, 1)) + if(pPlayer->HasItemCount(ITEM_WHITE_PUNCH_CARD, 1)) { pPlayer->DestroyItemCount(ITEM_WHITE_PUNCH_CARD, 1, true); pPlayer->CastSpell(pPlayer,SPELL_YELLOW_PUNCH_CARD,true); diff --git a/src/bindings/scripts/system/ScriptLoader.cpp b/src/bindings/scripts/system/ScriptLoader.cpp index b7e85a4d2dd..aa36753cf84 100644 --- a/src/bindings/scripts/system/ScriptLoader.cpp +++ b/src/bindings/scripts/system/ScriptLoader.cpp @@ -697,11 +697,11 @@ void AddScripts() AddSC_boss_drakkari_colossus(); AddSC_boss_gal_darah(); AddSC_boss_eck(); - AddSC_instance_gundrak(); + AddSC_instance_gundrak(); AddSC_boss_taldaram(); //Azjol-Nerub Ahn'kahet AddSC_boss_elder_nadox(); AddSC_boss_volazj(); - AddSC_instance_ahnkahet(); + AddSC_instance_ahnkahet(); AddSC_boss_krik_thir(); //Azjol-Nerub Azjol-Nerub AddSC_instance_azjol_nerub(); AddSC_boss_anubrekhan(); //Naxxramas |