diff options
Diffstat (limited to 'src/server/scripts')
25 files changed, 80 insertions, 80 deletions
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp index d10d5aa0461..796d7bcadfb 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp @@ -45,9 +45,9 @@ public: struct boss_baron_geddonAI : public ScriptedAI { - boss_baron_geddonAI(Creature *pCreature) : ScriptedAI(pCreature) + boss_baron_geddonAI(Creature *pCreature) : ScriptedAI(pCreature) { - m_pInstance = pCreature->GetInstanceScript(); + m_pInstance = pCreature->GetInstanceScript(); } InstanceScript* m_pInstance; diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp index 9c38220bbfd..5cddc3348b9 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp @@ -47,9 +47,9 @@ public: struct boss_garrAI : public ScriptedAI { - boss_garrAI(Creature *pCreature) : ScriptedAI(pCreature) + boss_garrAI(Creature *pCreature) : ScriptedAI(pCreature) { - m_pInstance = pCreature->GetInstanceScript(); + m_pInstance = pCreature->GetInstanceScript(); } InstanceScript* m_pInstance; diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_gehennas.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_gehennas.cpp index af40d6c912a..70b379aa380 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_gehennas.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_gehennas.cpp @@ -42,9 +42,9 @@ public: struct boss_gehennasAI : public ScriptedAI { - boss_gehennasAI(Creature *pCreature) : ScriptedAI(pCreature) + boss_gehennasAI(Creature *pCreature) : ScriptedAI(pCreature) { - m_pInstance = pCreature->GetInstanceScript(); + m_pInstance = pCreature->GetInstanceScript(); } InstanceScript* m_pInstance; diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_lucifron.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_lucifron.cpp index d3683176f96..ed6dc98a3b2 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_lucifron.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_lucifron.cpp @@ -42,9 +42,9 @@ public: struct boss_lucifronAI : public ScriptedAI { - boss_lucifronAI(Creature *pCreature) : ScriptedAI(pCreature) + boss_lucifronAI(Creature *pCreature) : ScriptedAI(pCreature) { - m_pInstance = pCreature->GetInstanceScript(); + m_pInstance = pCreature->GetInstanceScript(); } InstanceScript* m_pInstance; diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp index d16dd730629..db48760c90f 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp @@ -46,9 +46,9 @@ public: struct boss_magmadarAI : public ScriptedAI { - boss_magmadarAI(Creature *pCreature) : ScriptedAI(pCreature) - { - m_pInstance = pCreature->GetInstanceScript(); + boss_magmadarAI(Creature *pCreature) : ScriptedAI(pCreature) + { + m_pInstance = pCreature->GetInstanceScript(); } InstanceScript* m_pInstance; diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp index 176a781c54c..91f1e8b3bab 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp @@ -79,24 +79,24 @@ public: } bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 /*uiAction*/) - { + { //ScriptedInstance* pInstance = pCreature->GetInstanceData(); BossAI* pBossAI = CAST_AI(boss_majordomoAI, pCreature->AI()); if (/*pInstance && */pBossAI) - { + { pPlayer->CLOSE_GOSSIP_MENU(); - CAST_AI(boss_majordomoAI, pCreature->AI())->StartRagsEvent(); + CAST_AI(boss_majordomoAI, pCreature->AI())->StartRagsEvent(); } - return true; + return true; } struct boss_majordomoAI : public BossAI { - boss_majordomoAI(Creature *pCreature) : BossAI(pCreature, BOSS_MAJORDOMO) + boss_majordomoAI(Creature *pCreature) : BossAI(pCreature, BOSS_MAJORDOMO) { - m_pInstance = pCreature->GetInstanceScript(); + m_pInstance = pCreature->GetInstanceScript(); } InstanceScript* m_pInstance; @@ -137,7 +137,7 @@ public: return; if (((!me->FindNearestCreature(ENTRY_FLAMEWALKER_HEALER,100.0f)) && (!me->FindNearestCreature(ENTRY_FLAMEWALKER_ELITE,100.0f))) && (!m_pInstance->GetData(DATA_MAJORDOMOISDEAD))) - { + { me->setFaction(35); me->AI()->EnterEvadeMode(); DoScriptText(SAY_DEFEAT, me); @@ -174,8 +174,8 @@ public: if (Teleport_Timer <= diff) { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 1)) - DoCast(pTarget, SPELL_TELEPORT); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 1)) + DoCast(pTarget, SPELL_TELEPORT); Teleport_Timer = 20000; } else Teleport_Timer -= diff; @@ -199,7 +199,7 @@ public: if (m_pInstance) m_pInstance->SetData(DATA_RAGNAROS, true); Phase = 4; - Phase_Timer = 16000; + Phase_Timer = 16000; } else Phase_Timer -= diff; } if (Phase == 4) diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp index 28adb9d84ec..deacf74bf4d 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp @@ -381,7 +381,7 @@ public: Intro_Timer = 4000; Intro = 1; } - + } }; @@ -400,13 +400,13 @@ public: struct mob_SonOfFlameAI : public ScriptedAI //didnt work correctly in EAI for me... { - mob_SonOfFlameAI(Creature *c) : ScriptedAI(c) + mob_SonOfFlameAI(Creature *c) : ScriptedAI(c) { pInstance = me->GetInstanceScript(); } InstanceScript* pInstance; - + void JustDied(Unit * /*victim*/) { if (pInstance) diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_shazzrah.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_shazzrah.cpp index 6a97a7a55eb..c460a9f52a1 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_shazzrah.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_shazzrah.cpp @@ -45,7 +45,7 @@ public: { boss_shazzrahAI(Creature *pCreature) : ScriptedAI(pCreature) { - m_pInstance = pCreature->GetInstanceScript(); + m_pInstance = pCreature->GetInstanceScript(); } InstanceScript* m_pInstance; diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp index 427db5e3fe3..0f2c42bc46f 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp @@ -49,9 +49,9 @@ public: struct boss_sulfuronAI : public ScriptedAI { - boss_sulfuronAI(Creature *pCreature) : ScriptedAI(pCreature) + boss_sulfuronAI(Creature *pCreature) : ScriptedAI(pCreature) { - m_pInstance = pCreature->GetInstanceScript(); + m_pInstance = pCreature->GetInstanceScript(); } InstanceScript* m_pInstance; diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp index e9e5ec9abb8..fd81e3337f0 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp @@ -54,7 +54,7 @@ const Position Pos[10] = {722.408f,-1152.41f,-120.029f,5.33087f}, {718.994f,-1156.36f,-119.805f,5.75738f}, {838.51f,-829.84f,-232.00f,2.00f}, -}; +}; class instance_molten_core : public InstanceMapScript { @@ -313,7 +313,7 @@ public: if (type == DATA_SHAZZRAH) IsBossDied[4] = true; - + if (type == DATA_GEDDON) IsBossDied[5] = true; @@ -354,7 +354,7 @@ public: if (IsBossDied[i] == false) return; } - + instance->SummonCreature(ID_DOMO, Pos[0]); instance->SummonCreature(ID_FLAMEWAKERHEALER, Pos[1]); instance->SummonCreature(ID_FLAMEWAKERHEALER, Pos[2]); diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.h b/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.h index 873fe98dd30..8a1cc8fab44 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.h +++ b/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.h @@ -20,7 +20,7 @@ #define DEF_MOLTEN_CORE_H enum eData -{ +{ DATA_FLAMEWAKERPRIEST, DATA_GARRISDEAD, DATA_GEDDONISDEAD, diff --git a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp index 8b1813d6857..8c4934b0b04 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp @@ -78,7 +78,7 @@ class boss_drakkari_colossus : public CreatureScript struct boss_drakkari_colossusAI : public BossAI { - boss_drakkari_colossusAI(Creature* creature) : BossAI(creature, DATA_DRAKKARI_COLOSSUS_EVENT) + boss_drakkari_colossusAI(Creature* creature) : BossAI(creature, DATA_DRAKKARI_COLOSSUS_EVENT) { me->SetReactState(REACT_PASSIVE); introDone = false; @@ -115,7 +115,7 @@ class boss_drakkari_colossus : public CreatureScript void EnterCombat(Unit* /*who*/) { _EnterCombat(); - + me->RemoveAura(SPELL_FREEZE_ANIM); // Note: This should not be called, but before use SetBossState function we should use BossAI @@ -185,7 +185,7 @@ class boss_drakkari_colossus : public CreatureScript phase = (phase == COLOSSUS_PHASE_NORMAL ? COLOSSUS_PHASE_FIRST_ELEMENTAL_SUMMON : COLOSSUS_PHASE_SECOND_ELEMENTAL_SUMMON); DoAction(ACTION_FREEZE_COLOSSUS); DoAction(ACTION_SUMMON_ELEMENTAL); - + } } } @@ -287,7 +287,7 @@ class boss_drakkari_elemental : public CreatureScript { if (!UpdateVictim()) return; - + events.Update(diff); if (me->HasUnitState(UNIT_STAT_CASTING)) @@ -339,7 +339,7 @@ class boss_drakkari_elemental : public CreatureScript if (me->HasUnitState(UNIT_STAT_CHARGING)) return; - // not sure about this, the idea of this code is to prevent bug the elemental + // not sure about this, the idea of this code is to prevent bug the elemental // if it is not in a acceptable distance to cast the charge spell. /*if (me->GetDistance(colossus) > 80.0f) { @@ -454,7 +454,7 @@ public: colossus->GetHomePosition().GetPosition(&colossusHomePosition); float distance = homePosition.GetExactDist(colossusHomePosition.GetPositionX(),colossusHomePosition.GetPositionY(),colossusHomePosition.GetPositionZ()); - + if (distance < 12.0f) { MoveMojos(colossus); diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp index df7954cf1f9..a5bcd92b8ee 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp @@ -105,7 +105,7 @@ public: if (instance->GetBossState(DATA_VAROS_EVENT) != DONE) DoCast(SPELL_ARCANE_SHIELD); - _Reset(); + _Reset(); if (instance->GetData(DATA_UROM_PLATAFORM) == 0) { diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp index 95a59c368f1..37fc2f3af44 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp @@ -36,7 +36,7 @@ enum Spells SPELL_CALL_AZURE_RING_CAPTAIN_3 = 51007, //Effect Send Event (18454) SPELL_CALL_AZURE_RING_CAPTAIN_4 = 51008, //Effect Send Event (18455)*/ SPELL_CALL_AMPLIFY_MAGIC = 51054, - + SPELL_ICE_BEAM = 49549, SPELL_ARCANE_BEAM_PERIODIC = 51019, SPELL_SUMMON_ARCANE_BEAM = 51017 @@ -62,7 +62,7 @@ public: struct boss_varosAI : public BossAI { - boss_varosAI(Creature* creature) : BossAI(creature, DATA_VAROS_EVENT) + boss_varosAI(Creature* creature) : BossAI(creature, DATA_VAROS_EVENT) { if (instance->GetBossState(DATA_DRAKOS_EVENT) != DONE) DoCast(me,SPELL_CENTRIFUGE_SHIELD); @@ -76,7 +76,7 @@ public: events.ScheduleEvent(EVENT_ENERGIZE_CORES_VISUAL, 5000); // not sure if this is handled by a timer or hp percentage events.ScheduleEvent(EVENT_CALL_AZURE, urand(15,30) * IN_MILLISECONDS); - + firstCoreEnergize = false; coreEnergizeOrientation = 0.0f; } @@ -134,7 +134,7 @@ public: break; case EVENT_CALL_AZURE: // not sure how blizz handles this, i cant see any pattern between the differnt spells - DoCast(me,SPELL_CALL_AZURE_RING_CAPTAIN); + DoCast(me,SPELL_CALL_AZURE_RING_CAPTAIN); Talk(SAY_AZURE); Talk(SAY_AZURE_EMOTE); events.ScheduleEvent(EVENT_CALL_AZURE, urand(20,25) * IN_MILLISECONDS); @@ -169,7 +169,7 @@ class npc_azure_ring_captain : public CreatureScript struct npc_azure_ring_captainAI : public ScriptedAI { npc_azure_ring_captainAI(Creature* creature) : ScriptedAI(creature) - { + { instance = creature->GetInstanceScript(); } @@ -180,7 +180,7 @@ class npc_azure_ring_captain : public CreatureScript me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING | MOVEMENTFLAG_FLYING); me->SetReactState(REACT_AGGRESSIVE); } - + void SpellHitTarget(Unit* target, SpellEntry const* spell) { if (spell->Id == SPELL_ICE_BEAM) @@ -194,16 +194,16 @@ class npc_azure_ring_captain : public CreatureScript { if (!UpdateVictim()) return; - + DoMeleeAttackIfReady(); } void MovementInform(uint32 type, uint32 id) - { + { if (type != POINT_MOTION_TYPE || id != ACTION_CALL_DRAGON_EVENT) return; - + me->GetMotionMaster()->MoveIdle(); if (Unit* target = ObjectAccessor::GetUnit(*me,targetGUID)) @@ -307,7 +307,7 @@ class spell_varos_energize_core_area_enemy : public SpellScriptLoader return; float orientation = CAST_AI(boss_varos::boss_varosAI,varos->AI())->GetCoreEnergizeOrientation(); - + for (std::list<Unit*>::iterator itr = targetList.begin() ; itr != targetList.end();) { Position pos; @@ -354,7 +354,7 @@ class spell_varos_energize_core_area_entry : public SpellScriptLoader return; float orientation = CAST_AI(boss_varos::boss_varosAI,varos->AI())->GetCoreEnergizeOrientation(); - + for (std::list<Unit*>::iterator itr = targetList.begin() ; itr != targetList.end();) { Position pos; diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.h b/src/server/scripts/Northrend/Nexus/Oculus/oculus.h index 19e47af305c..8c669b91917 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.h +++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.h @@ -45,7 +45,7 @@ enum Bosses NPC_AZURE_RING_GUARDIAN = 28236, NPC_CENTRIFUGE_CONSTRUCT = 27641, }; - + enum GameObjects { GO_DRAGON_CAGE_DOOR = 193995 diff --git a/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp index b805ad7fd6e..2de256945aa 100644 --- a/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp @@ -1333,7 +1333,7 @@ public: pTarget->AddAura(SPELL_GIFT_OF_TWILIGTH_SHA, pTarget); } } - + me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER,me); } diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp index a8af8e4ed41..a78d480b658 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp @@ -163,7 +163,7 @@ void StartEncounter(InstanceScript* pInstance, Creature* me, Unit* /*target*/) { if (pInstance->GetBossState(TYPE_ASSEMBLY) == IN_PROGRESS) return; // Prevent recursive calls - + pInstance->SetBossState(TYPE_ASSEMBLY, IN_PROGRESS); for (uint8 i = 0; i < 3; ++i) @@ -173,7 +173,7 @@ void StartEncounter(InstanceScript* pInstance, Creature* me, Unit* /*target*/) continue; if (Creature *boss = Unit::GetCreature(*me, guid)) - boss->SetInCombatWithZone(); + boss->SetInCombatWithZone(); } } @@ -554,7 +554,7 @@ public: { me->AddAura(SPELL_RUNE_OF_SUMMONING_VIS, me); summonCount = 0; - summonTimer = 2000; + summonTimer = 2000; } uint32 summonCount; diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp index acf09071eb4..d0acb967238 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp @@ -44,7 +44,7 @@ enum eSpells SPELL_SARONITE_BARRIER = 63364, SPELL_SEARING_FLAMES = 62661, SPELL_SHADOW_CRASH = 62660, - SPELL_SHADOW_CRASH_HIT = 62659, + SPELL_SHADOW_CRASH_HIT = 62659, SPELL_SURGE_OF_DARKNESS = 62662, SPELL_SARONITE_VAPORS = 63323, SPELL_SUMMON_SARONITE_VAPORS = 63081, @@ -75,7 +75,7 @@ enum eEvents EVENT_SARONITE_VAPORS = 5, EVENT_BERSERK = 6, }; - + #define ACHIEVEMENT_SMELL_SARONITE RAID_MODE(3181, 3188) #define ACHIEVEMENT_SHADOWDODGER RAID_MODE(2996, 2997) @@ -118,7 +118,7 @@ public: void EnterCombat(Unit * /*pWho*/) { _EnterCombat(); - + DoScriptText(SAY_AGGRO, me); DoCast(me, SPELL_AURA_OF_DESPAIR); CheckShamanisticRage(); @@ -157,12 +157,12 @@ public: break; case EVENT_MARK_OF_THE_FACELESS: Unit* pTarget; - /* He will not cast this on players within 15 yards of him. - However, if there are not at least 9 people outside of 15 yards + /* He will not cast this on players within 15 yards of him. + However, if there are not at least 9 people outside of 15 yards he will start casting it on players inside 15 yards melee and tank included. */ if (!(pTarget = CheckPlayersInRange(RAID_MODE(4,9), 15.0f, 50.f))) - pTarget = SelectTarget(SELECT_TARGET_RANDOM); + pTarget = SelectTarget(SELECT_TARGET_RANDOM); DoCast(pTarget, SPELL_MARK_OF_THE_FACELESS); events.ScheduleEvent(EVENT_MARK_OF_THE_FACELESS, urand(35000, 45000)); break; @@ -175,7 +175,7 @@ public: case EVENT_SARONITE_VAPORS: DoCast(SPELL_SUMMON_SARONITE_VAPORS); events.ScheduleEvent(EVENT_SARONITE_VAPORS, urand(30000, 35000)); - + if (++uiVaporCount == 6 && bSmellSaronite) { DoScriptText(SAY_HARDMODE, me); @@ -212,7 +212,7 @@ public: void JustDied(Unit * /*pWho*/) { _JustDied(); - + DoScriptText(SAY_DEATH, me); if (instance) @@ -337,7 +337,7 @@ public: { if (!UpdateVictim()) return; - + if (uiProfoundOfDarknessTimer <= uiDiff) { DoCastAOE(SPELL_PROFOUND_DARKNESS); @@ -345,7 +345,7 @@ public: } else uiProfoundOfDarknessTimer -= uiDiff; - + DoMeleeAttackIfReady(); } }; @@ -401,7 +401,7 @@ public: me->RemoveAllAuras(); DoCast(me, SPELL_SARONITE_VAPORS); me->DespawnOrUnsummon(30000); - + if (Creature * pVezax = me->GetCreature(*me, pInstance ? pInstance->GetData64(TYPE_VEZAX) : 0)) pVezax->AI()->DoAction(ACTION_VAPORS_DIE); } diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp index fad2baede99..8b0988b0eee 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp @@ -26,9 +26,9 @@ #define SPELL_PETRIFY_BREATH RAID_MODE(62030,63980) #define SPELL_STONE_GRIP RAID_MODE(62166,63981) -#define SPELL_STONE_GRIP_CANCEL 65594 +#define SPELL_STONE_GRIP_CANCEL 65594 #define SPELL_ARM_SWEEP RAID_MODE(63766,63983) -#define SPELL_ARM_VISUAL 64753 +#define SPELL_ARM_VISUAL 64753 #define SPELL_BERSERK 47008 // guess @@ -70,7 +70,7 @@ void EncounterInCombat(Creature* me, InstanceScript* pInstance) c = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_RIGHT_ARM) : 0); if (c && c != me && c->isAlive()) c->SetInCombatWithZone(); - + c = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_LEFT_ARM) : 0); if (c && c != me && c->isAlive()) c->SetInCombatWithZone(); diff --git a/src/server/scripts/Northrend/storm_peaks.cpp b/src/server/scripts/Northrend/storm_peaks.cpp index 56633f72147..f56c372faf4 100644 --- a/src/server/scripts/Northrend/storm_peaks.cpp +++ b/src/server/scripts/Northrend/storm_peaks.cpp @@ -540,7 +540,7 @@ public: enum brunhildar { NPC_QUEST_GIVER = 29592, - + SPELL_ICE_PRISON = 54894, SPELL_KILL_CREDIT_PRISONER = 55144, SPELL_KILL_CREDIT_DRAKE = 55143, @@ -548,7 +548,7 @@ enum brunhildar { SPELL_ICE_LANCE = 55046 }; -class npc_brunnhildar_prisoner : public CreatureScript +class npc_brunnhildar_prisoner : public CreatureScript { public: npc_brunnhildar_prisoner() : CreatureScript("npc_brunnhildar_prisoner") { } @@ -625,7 +625,7 @@ public: // drake is empty now, deliver credit for drake and despawn him if (drake->GetVehicleKit()->HasEmptySeat(1) && - drake->GetVehicleKit()->HasEmptySeat(2) && + drake->GetVehicleKit()->HasEmptySeat(2) && drake->GetVehicleKit()->HasEmptySeat(3)) { // not working rider->CastSpell(rider, SPELL_KILL_CREDIT_DRAKE, true); @@ -645,7 +645,7 @@ public: if (spell->Id != SPELL_ICE_LANCE) return; - + me->RemoveAura(SPELL_ICE_PRISON); enter_timer = 500; diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp index 6c2c0c30fe9..6e50ae1b9b6 100644 --- a/src/server/scripts/Spells/spell_dk.cpp +++ b/src/server/scripts/Spells/spell_dk.cpp @@ -449,7 +449,7 @@ class spell_dk_will_of_the_necropolis : public SpellScriptLoader int32 remainingHp = int32(GetTarget()->GetHealth() - dmgInfo.GetDamage()); int32 minHp = int32(GetTarget()->CountPctFromMaxHealth(SpellMgr::CalculateSpellEffectAmount(talentProto, EFFECT_0, GetCaster()))); - + // Damage that would take you below [effect0] health or taken while you are at [effect0] if (remainingHp < minHp) absorbAmount = CalculatePctN(dmgInfo.GetDamage(), absorbPct); diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index 9f1bda521c2..a2ad0347540 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -532,7 +532,7 @@ class spell_gen_animal_blood : public SpellScriptLoader return false; return true; } - + void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { // Remove all auras with spell id 46221, except the one currently being applied @@ -690,7 +690,7 @@ class spell_gen_parachute_ic : public SpellScriptLoader return; if (target->ToPlayer()->m_movementInfo.fallTime > 2000) - target->CastSpell(target,SPELL_PARACHUTE_IC,true); + target->CastSpell(target,SPELL_PARACHUTE_IC,true); } void Register() diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index e9f53237553..d1d8620b028 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -751,7 +751,7 @@ enum AirRifleSpells class spell_item_red_rider_air_rifle : public SpellScriptLoader { public: - spell_item_red_rider_air_rifle() : SpellScriptLoader("spell_item_red_rider_air_rifle") { } + spell_item_red_rider_air_rifle() : SpellScriptLoader("spell_item_red_rider_air_rifle") { } class spell_item_red_rider_air_rifle_SpellScript : public SpellScript { diff --git a/src/server/scripts/Spells/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp index 6561a1910a8..bf1d99513b6 100644 --- a/src/server/scripts/Spells/spell_mage.cpp +++ b/src/server/scripts/Spells/spell_mage.cpp @@ -227,7 +227,7 @@ public: bool Validate(SpellEntry const * /*spellEntry*/) { - return sSpellStore.LookupEntry(SPELL_MAGE_FROST_WARDING_TRIGGERED) + return sSpellStore.LookupEntry(SPELL_MAGE_FROST_WARDING_TRIGGERED) && sSpellStore.LookupEntry(SPELL_MAGE_FROST_WARDING_R1); } @@ -277,7 +277,7 @@ public: bool Validate(SpellEntry const * /*spellEntry*/) { - return sSpellStore.LookupEntry(SPELL_MAGE_INCANTERS_ABSORBTION_TRIGGERED) + return sSpellStore.LookupEntry(SPELL_MAGE_INCANTERS_ABSORBTION_TRIGGERED) && sSpellStore.LookupEntry(SPELL_MAGE_INCANTERS_ABSORBTION_R1); } @@ -322,7 +322,7 @@ public: bool Validate(SpellEntry const * /*spellEntry*/) { - return sSpellStore.LookupEntry(SPELL_MAGE_INCANTERS_ABSORBTION_TRIGGERED) + return sSpellStore.LookupEntry(SPELL_MAGE_INCANTERS_ABSORBTION_TRIGGERED) && sSpellStore.LookupEntry(SPELL_MAGE_INCANTERS_ABSORBTION_R1); } diff --git a/src/server/scripts/World/areatrigger_scripts.cpp b/src/server/scripts/World/areatrigger_scripts.cpp index 456f6bb3753..54c60da9909 100644 --- a/src/server/scripts/World/areatrigger_scripts.cpp +++ b/src/server/scripts/World/areatrigger_scripts.cpp @@ -295,7 +295,7 @@ class AreaTrigger_at_last_rites : public AreaTriggerScript bool OnTrigger(Player* player, AreaTriggerEntry const* trigger) { - if (!(player->GetQuestStatus(QUEST_LAST_RITES) == QUEST_STATUS_INCOMPLETE || + if (!(player->GetQuestStatus(QUEST_LAST_RITES) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(QUEST_LAST_RITES) == QUEST_STATUS_COMPLETE || player->GetQuestStatus(QUEST_BREAKING_THROUGH) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(QUEST_BREAKING_THROUGH) == QUEST_STATUS_COMPLETE)) |