diff options
| author | click <none@none> | 2010-09-12 01:40:27 +0200 |
|---|---|---|
| committer | click <none@none> | 2010-09-12 01:40:27 +0200 |
| commit | bf664b7a449112fc6d00798b4f2995a0027996a1 (patch) | |
| tree | 44afbd94baa0e2c277859d70c23f465b4484f7b7 /src/server/scripts | |
| parent | 6fa05cfa3e9b417c7cda4f8926a6842c07ea32fd (diff) | |
Cleanup/Core: Remove whitespace and tabs
--HG--
branch : trunk
Diffstat (limited to 'src/server/scripts')
16 files changed, 133 insertions, 133 deletions
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp index 0afd99d0c5f..bb9a1c015c9 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp @@ -216,7 +216,7 @@ class boss_jeklik : public CreatureScript DoMeleeAttackIfReady(); } } - }; + }; CreatureAI* GetAI(Creature* creature) const { @@ -289,7 +289,7 @@ class mob_batrider : public CreatureScript DoMeleeAttackIfReady(); } - }; + }; CreatureAI* GetAI(Creature* creature) const { diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp index b4aab45f310..b94a41beb66 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp @@ -167,7 +167,7 @@ class boss_jindo : public CreatureScript DoMeleeAttackIfReady(); } - }; + }; CreatureAI* GetAI(Creature* creature) const { diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp index 083df57f385..d7de1912a81 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp @@ -411,7 +411,7 @@ class mob_zealot_lorkhan : public CreatureScript DoMeleeAttackIfReady(); } - }; + }; CreatureAI* GetAI(Creature* creature) const { diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp index 3dfe5056891..2c076c5cd07 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp @@ -192,7 +192,7 @@ class boss_venoxis : public CreatureScript } DoMeleeAttackIfReady(); } - }; + }; CreatureAI* GetAI(Creature* creature) const { diff --git a/src/server/scripts/Examples/example_spell.cpp b/src/server/scripts/Examples/example_spell.cpp index 0b43b272cb9..42126c953c3 100644 --- a/src/server/scripts/Examples/example_spell.cpp +++ b/src/server/scripts/Examples/example_spell.cpp @@ -229,7 +229,7 @@ class spell_ex_66244 : public SpellScriptLoader */ } - // function registering + // function registering void Register() { OnEffectApply += AuraEffectApplyFn(spell_ex_66244AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp index 94137ed29c5..63d961fce55 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp @@ -275,7 +275,7 @@ public: me->GetMotionMaster()->MovePoint(m_pPointData->uiLocId, m_pPointData->fX, m_pPointData->fY, m_pPointData->fZ); me->GetMotionMaster()->Clear(false); me->GetMotionMaster()->MoveIdle(); - + break; default: diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp index 6e52f36b64d..a520c03d1c6 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp @@ -68,14 +68,14 @@ enum BossSpells SPELL_EMERGE_ANUBARAK = 65982, SPELL_SUMMON_BEATLES = 66339, SPELL_SUMMON_BURROWER = 66332, - + // Burrow SPELL_CHURNING_GROUND = 66969, // Scarab SPELL_DETERMINATION = 66092, SPELL_ACID_MANDIBLE = 65774, //Passive - Triggered - + // Burrower SPELL_SPIDER_FRENZY = 66128, SPELL_EXPOSE_WEAKNESS = 67720, //Passive - Triggered @@ -136,7 +136,7 @@ public: } InstanceScript* m_pInstance; - + SummonList Summons; std::list<uint64> m_vBurrowGUID; uint64 m_aSphereGUID[6]; @@ -157,7 +157,7 @@ public: uint64 m_uiTargetGUID; uint8 m_uiScarabSummoned; - void Reset() + void Reset() { m_uiFreezeSlashTimer = 15*IN_MILLISECONDS; m_uiPenetratingColdTimer = 20*IN_MILLISECONDS; @@ -214,7 +214,7 @@ public: { Summons.DespawnAll(); DoScriptText(SAY_DEATH,me); - if (m_pInstance) + if (m_pInstance) m_pInstance->SetData(TYPE_ANUBARAK, DONE); } @@ -236,7 +236,7 @@ public: Summons.Summon(pSummoned); } - void SummonedCreatureDespawn(Creature* pSummoned) + void SummonedCreatureDespawn(Creature* pSummoned) { switch(pSummoned->GetEntry()) { @@ -318,10 +318,10 @@ public: // Just to make sure it won't happen again in this phase m_uiPursuingSpikeTimer = 90*IN_MILLISECONDS; } else m_uiPursuingSpikeTimer -= uiDiff; - + if (m_uiSummonScarabTimer <= uiDiff) { - /* WORKAROUND + /* WORKAROUND * - The correct implementation is more likely the comment below but it needs spell knowledge */ std::list<uint64>::iterator i = m_vBurrowGUID.begin(); @@ -347,7 +347,7 @@ public: m_uiSubmergeTimer = 80*IN_MILLISECONDS; } else m_uiSubmergeTimer -= uiDiff; break; - case 3: + case 3: m_uiStage = 0; DoCast(SPELL_SPIKE_TELE); Summons.DespawnEntry(NPC_SPIKE); @@ -384,7 +384,7 @@ public: } else m_uiSummonFrostSphereTimer -= uiDiff; } - if (HealthBelowPct(30) && m_uiStage == 0 && !m_bReachedPhase3) + if (HealthBelowPct(30) && m_uiStage == 0 && !m_bReachedPhase3) { m_bReachedPhase3 = true; DoCastAOE(SPELL_LEECHING_SWARM); @@ -530,15 +530,15 @@ public: DoCast(me,SPELL_EMERGE_EFFECT); me->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_OOC_NOT_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE); me->CombatStart(me->SelectNearestTarget()); - } - else + } + else { if (!me->HasAura(SPELL_PERMAFROST)) { DoCast(me,SPELL_SUBMERGE_EFFECT); me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_OOC_NOT_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE); me->CombatStop(); - } + } } m_uiSubmergeTimer = 20*IN_MILLISECONDS; } else m_uiSubmergeTimer -= uiDiff; @@ -611,7 +611,7 @@ public: } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) { if (m_uiPermafrostTimer) { @@ -688,7 +688,7 @@ public: if (m_uiIncreaseSpeedTimer) { - if (m_uiIncreaseSpeedTimer <= uiDiff) + if (m_uiIncreaseSpeedTimer <= uiDiff) { switch (m_uiSpeed) { diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp index fa3aad195f2..8041a6eeb9b 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -97,7 +97,7 @@ public: vOtherEntries.push_back(playerTeam == ALLIANCE ? NPC_HORDE_ROGUE : NPC_ALLIANCE_ROGUE); vOtherEntries.push_back(playerTeam == ALLIANCE ? NPC_HORDE_WARLOCK : NPC_ALLIANCE_WARLOCK); vOtherEntries.push_back(playerTeam == ALLIANCE ? NPC_HORDE_WARRIOR : NPC_ALLIANCE_WARRIOR); - + uint8 healersSubtracted = 2; if (m_pInstance->instance->GetSpawnMode() == RAID_DIFFICULTY_25MAN_NORMAL || m_pInstance->instance->GetSpawnMode() == RAID_DIFFICULTY_25MAN_HEROIC) healersSubtracted = 1; @@ -176,8 +176,8 @@ public: { switch(uiType) { - case 0: - SummonChampions((Team)uiData); + case 0: + SummonChampions((Team)uiData); break; case 1: for (std::list<uint64>::iterator i = Summons.begin(); i != Summons.end(); ++i) @@ -192,7 +192,7 @@ public: case 2: switch(uiData) { - case FAIL: + case FAIL: m_uiChampionsFailed++; if (m_uiChampionsFailed + m_uiChampionsKilled >= Summons.size()) { @@ -209,7 +209,7 @@ public: m_uiChampionsKilled = 0; m_bInProgress = true; Summons.DoZoneInCombat(); - m_pInstance->SetData(TYPE_CRUSADERS, IN_PROGRESS); + m_pInstance->SetData(TYPE_CRUSADERS, IN_PROGRESS); } break; case DONE: @@ -234,7 +234,7 @@ public: struct boss_faction_championsAI : public ScriptedAI { - boss_faction_championsAI(Creature* pCreature, uint32 aitype) : ScriptedAI(pCreature) + boss_faction_championsAI(Creature* pCreature, uint32 aitype) : ScriptedAI(pCreature) { m_pInstance = (InstanceScript *) pCreature->GetInstanceScript(); mAIType = aitype; @@ -256,7 +256,7 @@ struct boss_faction_championsAI : public ScriptedAI void JustReachedHome() { - if (m_pInstance) + if (m_pInstance) if (Creature* pChampionController = Unit::GetCreature((*me),m_pInstance->GetData64(NPC_CHAMPIONS_CONTROLLER))) pChampionController->AI()->SetData(2, FAIL); me->ForcedDespawn(); @@ -312,7 +312,7 @@ struct boss_faction_championsAI : public ScriptedAI void JustDied(Unit* /*killer*/) { if (mAIType != AI_PET) - if (m_pInstance) + if (m_pInstance) if (Creature* pChampionController = Unit::GetCreature((*me),m_pInstance->GetData64(NPC_CHAMPIONS_CONTROLLER))) pChampionController->AI()->SetData(2, DONE); } @@ -321,7 +321,7 @@ struct boss_faction_championsAI : public ScriptedAI { DoCast(me, SPELL_ANTI_AOE, true); me->SetInCombatWithZone(); - if (m_pInstance) + if (m_pInstance) if (Creature* pChampionController = Unit::GetCreature((*me),m_pInstance->GetData64(NPC_CHAMPIONS_CONTROLLER))) pChampionController->AI()->SetData(2, IN_PROGRESS); } @@ -344,7 +344,7 @@ struct boss_faction_championsAI : public ScriptedAI if (Creature* pTemp = Unit::GetCreature(*me,m_pInstance->GetData64(NPC_VARIAN))) DoScriptText(SAY_VARIAN_KILL_HORDE_PLAYER4+urand(0,3), pTemp); // + cause we are on negative } - else + else if (Creature* pTemp = me->FindNearestCreature(NPC_GARROSH, 300.f)) DoScriptText(SAY_GARROSH_KILL_ALLIANCE_PLAYER4+urand(0,3), pTemp); // + cause we are on negative @@ -357,7 +357,7 @@ struct boss_faction_championsAI : public ScriptedAI { std::list<Creature *> lst = DoFindFriendlyMissingBuff(40.0f, spell); std::list<Creature *>::const_iterator itr = lst.begin(); - if (lst.empty()) + if (lst.empty()) return NULL; advance(itr, rand()%lst.size()); return (*itr); @@ -462,7 +462,7 @@ public: struct mob_toc_druidAI : public boss_faction_championsAI { mob_toc_druidAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_HEALER) {} - + uint32 m_uiNatureGraspTimer; uint32 m_uiTranquilityTimer; uint32 m_uiBarkskinTimer; @@ -558,7 +558,7 @@ public: struct mob_toc_shamanAI : public boss_faction_championsAI { mob_toc_shamanAI(Creature *pCreature) : boss_faction_championsAI(pCreature, AI_HEALER) {} - + uint32 m_uiHeroismOrBloodlustTimer; uint32 m_uiHexTimer; uint32 m_uiCommonTimer; @@ -580,11 +580,11 @@ public: { if (me->getFaction()) //Am i alliance? { - if (!me->HasAura(AURA_EXHAUSTION)) + if (!me->HasAura(AURA_EXHAUSTION)) DoCastAOE(SPELL_HEROISM); } - else - if (!me->HasAura(AURA_SATED)) + else + if (!me->HasAura(AURA_SATED)) DoCastAOE(SPELL_BLOODLUST); m_uiHeroismOrBloodlustTimer = urand(30*IN_MILLISECONDS,60*IN_MILLISECONDS); } else m_uiHeroismOrBloodlustTimer -= uiDiff; @@ -758,7 +758,7 @@ public: struct mob_toc_priestAI : public boss_faction_championsAI { mob_toc_priestAI(Creature *pCreature) : boss_faction_championsAI(pCreature, AI_HEALER) {} - + uint32 m_uiPsychicScreamTimer; uint32 m_uiCommonTimer; @@ -1097,7 +1097,7 @@ public: } m_uiBlinkTimer = urand(7*IN_MILLISECONDS,25*IN_MILLISECONDS); } else m_uiBlinkTimer -= uiDiff; - + if (m_uiIceBlockTimer <= uiDiff) { if (HealthBelowPct(20)) @@ -1198,7 +1198,7 @@ public: DoCast(SPELL_DISENGAGE); m_uiDisengageTimer = urand(12*IN_MILLISECONDS,20*IN_MILLISECONDS); } else m_uiDisengageTimer -= uiDiff; - + if (m_uiDeterrenceTimer <= uiDiff) { if (HealthBelowPct(20)) @@ -1229,7 +1229,7 @@ public: { m_uiSummonPetTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS); } else m_uiSummonPetTimer -= uiDiff; - + if (m_uiCommonTimer <= uiDiff) { switch(urand(0,3)) @@ -1441,7 +1441,7 @@ public: DoCastVictim(SPELL_CHARGE); m_uiChargeTimer = urand(3*IN_MILLISECONDS,25*IN_MILLISECONDS); } else m_uiChargeTimer -= uiDiff; - + if (m_uiRetaliationTimer <= uiDiff) { DoCastVictim(SPELL_RETALIATION); @@ -1528,7 +1528,7 @@ public: DoCast(me,SPELL_ICEBOUND_FORTITUDE); m_uiIceboundFortitudeTimer = urand(5*IN_MILLISECONDS,90*IN_MILLISECONDS); } else m_uiIceboundFortitudeTimer -= uiDiff; - + if (m_uiChainsOfIceTimer <= uiDiff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) @@ -1548,7 +1548,7 @@ public: DoCast(pTarget,SPELL_STRANGULATE); m_uiStrangulateTimer = urand(10*IN_MILLISECONDS,90*IN_MILLISECONDS); } else m_uiStrangulateTimer -= uiDiff; - + if (m_uiFrostStrikeTimer <= uiDiff) { DoCastVictim(SPELL_FROST_STRIKE); @@ -1560,14 +1560,14 @@ public: DoCastVictim(SPELL_ICY_TOUCH); m_uiIcyTouchTimer = urand(8*IN_MILLISECONDS,12*IN_MILLISECONDS); } else m_uiIcyTouchTimer -= uiDiff; - + if (m_uiDeathGripTimer <= uiDiff) { if (me->IsInRange(me->getVictim(), 10.0f, 30.0f, false)) - DoCastVictim(SPELL_DEATH_GRIP); + DoCastVictim(SPELL_DEATH_GRIP); m_uiDeathGripTimer = urand(5*IN_MILLISECONDS,15*IN_MILLISECONDS); } else m_uiDeathGripTimer -= uiDiff; - + boss_faction_championsAI::UpdateAI(uiDiff); } }; @@ -1630,7 +1630,7 @@ public: DoCastAOE(SPELL_FAN_OF_KNIVES); m_uiFanOfKnivesTimer = urand(8*IN_MILLISECONDS,10*IN_MILLISECONDS); } else m_uiFanOfKnivesTimer -= uiDiff; - + if (m_uiHemorrhageTimer <= uiDiff) { DoCastVictim(SPELL_HEMORRHAGE); @@ -1727,8 +1727,8 @@ public: { Summons.Summon(pSummoned); } - - void SummonedCreatureDespawn(Creature* /*pSummoned*/) + + void SummonedCreatureDespawn(Creature* /*pSummoned*/) { --m_uiTotemCount; } @@ -1765,11 +1765,11 @@ public: { if (me->getFaction()) //Am i alliance? { - if (!me->HasAura(AURA_EXHAUSTION)) + if (!me->HasAura(AURA_EXHAUSTION)) DoCastAOE(SPELL_HEROISM); } - else - if (!me->HasAura(AURA_SATED)) + else + if (!me->HasAura(AURA_SATED)) DoCastAOE(SPELL_BLOODLUST); m_uiHeroismOrBloodlustTimer = urand(25*IN_MILLISECONDS,60*IN_MILLISECONDS); } else m_uiHeroismOrBloodlustTimer -= uiDiff; @@ -1867,7 +1867,7 @@ public: DoCast(pTarget,SPELL_REPENTANCE); m_uiRepeteanceTimer = 60*IN_MILLISECONDS; } else m_uiRepeteanceTimer -= uiDiff; - + if (m_uiCrusaderStrikeTimer <= uiDiff) { DoCastVictim(SPELL_CRUSADER_STRIKE); @@ -1898,7 +1898,7 @@ public: DoCastVictim(SPELL_JUDGEMENT_OF_COMMAND); m_uiJudgementOfCommandTimer = urand(8*IN_MILLISECONDS,15*IN_MILLISECONDS); } else m_uiJudgementOfCommandTimer -= uiDiff; - + boss_faction_championsAI::UpdateAI(uiDiff); } }; @@ -1944,7 +1944,7 @@ public: DoCastVictim(SPELL_DEVOUR_MAGIC); m_uiDevourMagicTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS); } else m_uiDevourMagicTimer -= uiDiff; - + if (m_uiSpellLockTimer <= uiDiff) { DoCastVictim(SPELL_SPELL_LOCK); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp index 02c590a6a54..697ad960e12 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -115,7 +115,7 @@ public: uint32 m_uiSummonNetherPortalTimer; uint32 m_uiSummonInfernalEruptionTimer; - void Reset() + void Reset() { if (m_pInstance) m_pInstance->SetData(TYPE_JARAXXUS, NOT_STARTED); @@ -341,7 +341,7 @@ public: { if (m_CountMax && m_CountMax == m_Count) me->ForcedDespawn(); - else + else { DoCast(SPELL_INFERNAL_ERUPTION); ++m_Count; @@ -403,7 +403,7 @@ public: DoCast(pTarget,SPELL_FEL_STREAK); m_uiFelStreakTimer = 30*IN_MILLISECONDS; } else m_uiFelStreakTimer -= uiDiff; - + DoMeleeAttackIfReady(); } }; @@ -441,7 +441,7 @@ public: me->SetReactState(REACT_PASSIVE); m_Timer = 10*IN_MILLISECONDS; m_Count = 0; - if (!IsHeroic()) + if (!IsHeroic()) { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_PACIFIED); m_CountMax = 1; @@ -466,14 +466,14 @@ public: { if (m_CountMax && m_CountMax == m_Count) me->ForcedDespawn(); - else + else { DoCast(SPELL_NETHER_PORTAL); ++m_Count; } m_Timer = 15*IN_MILLISECONDS; } else m_Timer -= uiDiff; - + if (!UpdateVictim()) return; } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp index a1d58c5eb88..f47cbb65997 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp @@ -15,7 +15,7 @@ */ /* ScriptData SDName: northrend_beasts -SD%Complete: 90% +SD%Complete: 90% SDComment: based on /dev/rsa SDCategory: EndScriptData */ @@ -131,16 +131,16 @@ public: uint32 m_uiSummonTimer; uint32 m_uiSummonCount; - void Reset() + void Reset() { m_uiImpaleTimer = urand(8*IN_MILLISECONDS,10*IN_MILLISECONDS); m_uiStaggeringStompTimer = 15*IN_MILLISECONDS; m_uiSummonTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS);; - if (getDifficulty() == RAID_DIFFICULTY_25MAN_NORMAL || + if (getDifficulty() == RAID_DIFFICULTY_25MAN_NORMAL || getDifficulty() == RAID_DIFFICULTY_25MAN_HEROIC) m_uiSummonCount = 5; - else + else m_uiSummonCount = 4; Summons.DespawnAll(); @@ -180,7 +180,7 @@ public: Summons.Summon(pSummoned); } - void SummonedCreatureDespawn(Creature* pSummoned) + void SummonedCreatureDespawn(Creature* pSummoned) { switch(pSummoned->GetEntry()) { @@ -216,7 +216,7 @@ public: } m_uiSummonTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS); } else m_uiSummonTimer -= uiDiff; - + DoMeleeAttackIfReady(); } }; @@ -332,7 +332,7 @@ public: m_uiFireBombTimer = 20000; } else m_uiFireBombTimer -= uiDiff; - + if (m_uiBatterTimer < uiDiff) { if (Unit *pTarget = Unit::GetPlayer(*me,m_uiTargetGUID)) @@ -340,7 +340,7 @@ public: m_uiBatterTimer = 10000; } else m_uiBatterTimer -= uiDiff; - + if (m_uiHeadCrackTimer < uiDiff) { if (Unit *pTarget = Unit::GetPlayer(*me,m_uiTargetGUID)) @@ -348,7 +348,7 @@ public: m_uiHeadCrackTimer = 35000; } else m_uiHeadCrackTimer -= uiDiff; - + DoMeleeAttackIfReady(); } }; @@ -404,7 +404,7 @@ struct boss_jormungarAI : public ScriptedAI { if (!pSister->isAlive()) m_pInstance->SetData(TYPE_NORTHREND_BEASTS, SNAKES_DONE); - else + else m_pInstance->SetData(TYPE_NORTHREND_BEASTS, SNAKES_SPECIAL); } } @@ -447,8 +447,8 @@ struct boss_jormungarAI : public ScriptedAI DoScriptText(SAY_BERSERK,me); switch (m_uiStage) { - case 0: break; - case 4: + case 0: break; + case 4: m_uiStage = 5; m_uiSubmergeTimer = 5*IN_MILLISECONDS; default: @@ -456,7 +456,7 @@ struct boss_jormungarAI : public ScriptedAI } } - switch (m_uiStage) + switch (m_uiStage) { case 0: // Mobile if (m_uiBiteTimer <= uiDiff) @@ -693,7 +693,7 @@ public: uint8 m_uiStage; Unit* pTarget; - void Reset() + void Reset() { m_uiFerociousButtTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS); m_uiArticBreathTimer = urand(25*IN_MILLISECONDS,40*IN_MILLISECONDS); @@ -727,7 +727,7 @@ public: { // Middle of the room m_uiStage = 1; - } + } else { // Landed from Hop backwards (start trample) @@ -783,7 +783,7 @@ public: if (!UpdateVictim()) return; - switch (m_uiStage) + switch (m_uiStage) { case 0: if (m_uiFerociousButtTimer <= uiDiff) @@ -798,13 +798,13 @@ public: DoCast(pTarget,SPELL_ARCTIC_BREATH); m_uiArticBreathTimer = urand(25*IN_MILLISECONDS,40*IN_MILLISECONDS); } else m_uiArticBreathTimer -= uiDiff; - + if (m_uiWhirlTimer <= uiDiff) { DoCastAOE(SPELL_WHIRL); m_uiWhirlTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS); } else m_uiWhirlTimer -= uiDiff; - + if (m_uiMassiveCrashTimer <= uiDiff) { me->GetMotionMaster()->MoveJump(ToCCommonLoc[1].GetPositionX(),ToCCommonLoc[1].GetPositionY(),ToCCommonLoc[1].GetPositionZ(),10.0f,20.0f); // 1: Middle of the room @@ -850,13 +850,13 @@ public: } else m_uiStage = 6; } else m_uiTrampleTimer -= uiDiff; break; - case 4: + case 4: DoScriptText(SAY_TRAMPLE_START,me); me->GetMotionMaster()->MoveCharge(m_fTrampleTargetX,m_fTrampleTargetY,m_fTrampleTargetZ+2, 42, 1); me->SetUInt64Value(UNIT_FIELD_TARGET, 0); m_uiStage = 5; break; - case 5: + case 5: if (m_bMovementFinish) { if (m_uiTrampleTimer <= uiDiff) DoCastAOE(SPELL_TRAMPLE); @@ -869,14 +869,14 @@ public: Map::PlayerList const &lPlayers = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator itr = lPlayers.begin(); itr != lPlayers.end(); ++itr) { - if (Unit* pPlayer = itr->getSource()) - if (pPlayer->isAlive() && pPlayer->IsWithinDistInMap(me, 6.0f)) + if (Unit* pPlayer = itr->getSource()) + if (pPlayer->isAlive() && pPlayer->IsWithinDistInMap(me, 6.0f)) { DoCastAOE(SPELL_TRAMPLE); m_uiTrampleTimer = IN_MILLISECONDS; break; } - } + } } else m_uiTrampleTimer -= uiDiff; break; case 6: diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp index 55c730d8f3b..0d374621389 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -162,7 +162,7 @@ struct boss_twin_baseAI : public ScriptedAI void JustReachedHome() { - if (m_pInstance) + if (m_pInstance) { m_pInstance->SetData(TYPE_VALKIRIES, FAIL); m_pInstance->SetData(DATA_HEALTH_TWIN_SHARED, me->GetMaxHealth()); @@ -210,7 +210,7 @@ struct boss_twin_baseAI : public ScriptedAI Summons.Summon(pSummoned); } - void SummonedCreatureDespawn(Creature* pSummoned) + void SummonedCreatureDespawn(Creature* pSummoned) { switch(pSummoned->GetEntry()) { @@ -282,7 +282,7 @@ struct boss_twin_baseAI : public ScriptedAI void JustDied(Unit* /*pKiller*/) { DoScriptText(SAY_DEATH,me); - if (m_pInstance) + if (m_pInstance) { m_pInstance->SetData(DATA_HEALTH_TWIN_SHARED, 0); if (Creature* pSister = GetSister()) @@ -299,7 +299,7 @@ struct boss_twin_baseAI : public ScriptedAI } // Called when sister pointer needed - Creature* GetSister() + Creature* GetSister() { return Unit::GetCreature((*me),m_pInstance->GetData64(m_uiSisterNpcId)); } @@ -337,7 +337,7 @@ struct boss_twin_baseAI : public ScriptedAI void UpdateAI(const uint32 uiDiff) { - if (!m_pInstance || !UpdateVictim()) + if (!m_pInstance || !UpdateVictim()) return; if (m_pInstance->GetData(DATA_HEALTH_TWIN_SHARED) != 0) @@ -397,7 +397,7 @@ struct boss_twin_baseAI : public ScriptedAI { SummonColorballs(12); m_uiWaveCount = 0; - } + } else { SummonColorballs(2); @@ -434,7 +434,7 @@ public: struct boss_fjolaAI : public boss_twin_baseAI { boss_fjolaAI(Creature* pCreature) : boss_twin_baseAI(pCreature) {} - + void Reset() { boss_twin_baseAI::Reset(); SetEquipmentSlots(false, EQUIP_MAIN_1, EQUIP_OFFHAND_1, EQUIP_RANGED_1); @@ -551,7 +551,7 @@ public: struct mob_unleashed_ballAI : public ScriptedAI { - mob_unleashed_ballAI(Creature *pCreature) : ScriptedAI(pCreature) + mob_unleashed_ballAI(Creature *pCreature) : ScriptedAI(pCreature) { m_pInstance = (InstanceScript*)pCreature->GetInstanceScript(); } @@ -577,7 +577,7 @@ struct mob_unleashed_ballAI : public ScriptedAI me->SetReactState(REACT_PASSIVE); me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); me->SetFlying(true); - SetCombatMovement(false); + SetCombatMovement(false); MoveToNextPoint(); m_uiRangeCheckTimer = IN_MILLISECONDS; } @@ -591,7 +591,7 @@ struct mob_unleashed_ballAI : public ScriptedAI case 0: if (urand(0,3) == 0) MoveToNextPoint(); - else + else me->DisappearAndDie(); break; } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp index 66f139debb5..39c0212fb65 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp @@ -97,7 +97,7 @@ public: m_uiMainGateDoorGUID = 0; m_uiEastPortcullisGUID = 0; m_uiWebDoorGUID = 0; - + m_uiNorthrendBeasts = NOT_STARTED; m_uiEventTimer = 1000; @@ -185,19 +185,19 @@ public: { case GO_CRUSADERS_CACHE_10: if (instance->GetSpawnMode() == RAID_DIFFICULTY_10MAN_NORMAL) - m_uiCrusadersCacheGUID = pGO->GetGUID(); + m_uiCrusadersCacheGUID = pGO->GetGUID(); break; case GO_CRUSADERS_CACHE_25: if (instance->GetSpawnMode() == RAID_DIFFICULTY_25MAN_NORMAL) - m_uiCrusadersCacheGUID = pGO->GetGUID(); + m_uiCrusadersCacheGUID = pGO->GetGUID(); break; case GO_CRUSADERS_CACHE_10_H: if (instance->GetSpawnMode() == RAID_DIFFICULTY_10MAN_HEROIC) - m_uiCrusadersCacheGUID = pGO->GetGUID(); + m_uiCrusadersCacheGUID = pGO->GetGUID(); break; case GO_CRUSADERS_CACHE_25_H: if (instance->GetSpawnMode() == RAID_DIFFICULTY_25MAN_HEROIC) - m_uiCrusadersCacheGUID = pGO->GetGUID(); + m_uiCrusadersCacheGUID = pGO->GetGUID(); break; case GO_ARGENT_COLISEUM_FLOOR: m_uiFloorGUID = pGO->GetGUID(); break; case GO_MAIN_GATE_DOOR: m_uiMainGateDoorGUID = pGO->GetGUID(); break; @@ -223,7 +223,7 @@ public: case TYPE_JARAXXUS: if (uiData == DONE) m_uiEvent = 2000; break; - case TYPE_CRUSADERS: + case TYPE_CRUSADERS: switch (uiData) { case IN_PROGRESS: m_uiResilienceWillFixItTimer = 0; break; @@ -242,7 +242,7 @@ public: break; } break; - case TYPE_VALKIRIES: + case TYPE_VALKIRIES: switch (uiData) { case FAIL: @@ -303,8 +303,8 @@ public: case TYPE_COUNTER: m_uiTrialCounter = uiData; uiData = DONE; break; case TYPE_EVENT: m_uiEvent = uiData; uiData = NOT_STARTED; break; case TYPE_EVENT_TIMER: m_uiEventTimer = uiData; uiData = NOT_STARTED; break; - case TYPE_NORTHREND_BEASTS: - m_uiNorthrendBeasts = uiData; + case TYPE_NORTHREND_BEASTS: + m_uiNorthrendBeasts = uiData; switch (uiData) { case GORMOK_DONE: @@ -314,7 +314,7 @@ public: break; case SNAKES_IN_PROGRESS: m_uiNotOneButTwoJormungarsTimer = 0; break; case SNAKES_SPECIAL: m_uiNotOneButTwoJormungarsTimer = 10*IN_MILLISECONDS; break; - case SNAKES_DONE: + case SNAKES_DONE: if (m_uiNotOneButTwoJormungarsTimer > 0) DoUpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET, SPELL_WORMS_KILLED_IN_10_SECONDS); m_uiEvent = 300; @@ -363,9 +363,9 @@ public: { sLog.outBasic("[ToCr] m_auiEncounter[uiType %u] %u = uiData %u;",uiType,m_auiEncounter[uiType],uiData); if (uiData == FAIL) - { - if (IsRaidWiped()) - { + { + if (IsRaidWiped()) + { --m_uiTrialCounter; m_bNeedSave = true; m_uiEvent = (uiType == TYPE_BEASTS? 666 : 0); @@ -425,8 +425,8 @@ public: case TYPE_EVENT: return m_uiEvent; case TYPE_NORTHREND_BEASTS: return m_uiNorthrendBeasts; case TYPE_EVENT_TIMER: return m_uiEventTimer; - case TYPE_EVENT_NPC: - switch (m_uiEvent) + case TYPE_EVENT_NPC: + switch (m_uiEvent) { case 110: case 140: diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp index e31083824a6..a9c2b4be8d7 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp @@ -97,7 +97,7 @@ enum class npc_announcer_toc10 : public CreatureScript { public: - + npc_announcer_toc10() : CreatureScript("npc_announcer_toc10") { } struct npc_announcer_toc10AI : public ScriptedAI @@ -126,10 +126,10 @@ class npc_announcer_toc10 : public CreatureScript InstanceScript* m_pInstance; m_pInstance = (InstanceScript*)pCreature->GetInstanceScript(); if (!m_pInstance) return false; - + char const* _message = "We are ready!"; - if (!pPlayer->getAttackers().empty() || m_pInstance->IsEncounterInProgress() || m_pInstance->GetData(TYPE_EVENT)) + if (!pPlayer->getAttackers().empty() || m_pInstance->IsEncounterInProgress() || m_pInstance->GetData(TYPE_EVENT)) return true; uint8 i; @@ -174,7 +174,7 @@ class npc_announcer_toc10 : public CreatureScript } else { - if (m_pInstance->GetData(TYPE_JARAXXUS) != DONE) + if (m_pInstance->GetData(TYPE_JARAXXUS) != DONE) { m_pInstance->SetData(TYPE_EVENT,1010); m_pInstance->SetData(TYPE_JARAXXUS,NOT_STARTED); @@ -230,7 +230,7 @@ class npc_announcer_toc10 : public CreatureScript class boss_lich_king_toc : public CreatureScript { public: - + boss_lich_king_toc() : CreatureScript("boss_lich_king_toc") { } struct boss_lich_king_tocAI : public ScriptedAI @@ -304,7 +304,7 @@ class boss_lich_king_toc : public CreatureScript m_uiUpdateTimer = 3000; m_pInstance->SetData(TYPE_EVENT,5060); break; - case 5060: + case 5060: DoScriptText(SAY_STAGE_4_05,me); me->HandleEmoteCommand(EMOTE_ONESHOT_KNEEL); m_uiUpdateTimer = 2500; @@ -342,7 +342,7 @@ class boss_lich_king_toc : public CreatureScript class npc_fizzlebang_toc : public CreatureScript { public: - + npc_fizzlebang_toc() : CreatureScript("npc_fizzlebang_toc") { } struct npc_fizzlebang_tocAI : public ScriptedAI @@ -394,7 +394,7 @@ class npc_fizzlebang_toc : public CreatureScript break; } } - + void JustSummoned(Creature* pSummoned) { Summons.Summon(pSummoned); @@ -467,17 +467,17 @@ class npc_fizzlebang_toc : public CreatureScript m_uiUpdateTimer = 5000; break; case 1142: - if (Creature* pTemp = Unit::GetCreature(*me,m_pInstance->GetData64(NPC_JARAXXUS))) + if (Creature* pTemp = Unit::GetCreature(*me,m_pInstance->GetData64(NPC_JARAXXUS))) pTemp->SetUInt64Value(UNIT_FIELD_TARGET, me->GetGUID()); - if (Creature* pTrigger = Unit::GetCreature(*me,m_uiTriggerGUID)) + if (Creature* pTrigger = Unit::GetCreature(*me,m_uiTriggerGUID)) pTrigger->ForcedDespawn(); - if (Creature* pPortal = Unit::GetCreature(*me,m_uiPortalGUID)) + if (Creature* pPortal = Unit::GetCreature(*me,m_uiPortalGUID)) pPortal->ForcedDespawn(); m_pInstance->SetData(TYPE_EVENT, 1144); m_uiUpdateTimer = 10000; break; case 1144: - if (Creature* pTemp = Unit::GetCreature(*me,m_pInstance->GetData64(NPC_JARAXXUS))) + if (Creature* pTemp = Unit::GetCreature(*me,m_pInstance->GetData64(NPC_JARAXXUS))) DoScriptText(SAY_STAGE_1_05,pTemp); m_pInstance->SetData(TYPE_EVENT, 1150); m_uiUpdateTimer = 5000; @@ -509,7 +509,7 @@ class npc_fizzlebang_toc : public CreatureScript class npc_tirion_toc : public CreatureScript { public: - + npc_tirion_toc() : CreatureScript("npc_tirion_toc") { } struct npc_tirion_tocAI : public ScriptedAI @@ -752,7 +752,7 @@ class npc_tirion_toc : public CreatureScript me->SetReactState(REACT_PASSIVE); } me->SummonCreature(NPC_DARKBANE, ToCCommonLoc[4].GetPositionX(), ToCCommonLoc[4].GetPositionY(), ToCCommonLoc[4].GetPositionZ(), 5, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME); - if (Creature* pTemp = Unit::GetCreature((*me),m_pInstance->GetData64(NPC_DARKBANE))) + if (Creature* pTemp = Unit::GetCreature((*me),m_pInstance->GetData64(NPC_DARKBANE))) { pTemp->GetMotionMaster()->MovePoint(0, ToCCommonLoc[7].GetPositionX(), ToCCommonLoc[7].GetPositionY(), ToCCommonLoc[7].GetPositionZ()); pTemp->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); @@ -823,7 +823,7 @@ class npc_tirion_toc : public CreatureScript class npc_garrosh_toc : public CreatureScript { public: - + npc_garrosh_toc() : CreatureScript("npc_garrosh_toc") { } struct npc_garrosh_tocAI : public ScriptedAI @@ -901,7 +901,7 @@ class npc_garrosh_toc : public CreatureScript class npc_varian_toc : public CreatureScript { public: - + npc_varian_toc() : CreatureScript("npc_varian_toc") { } struct npc_varian_tocAI : public ScriptedAI diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h index 9adbda74918..3a0a43773cb 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h @@ -14,10 +14,10 @@ enum TYPE_LICH_KING = 4, TYPE_ANUBARAK = 5, MAX_ENCOUNTERS = 6, - + TYPE_COUNTER = 8, TYPE_EVENT = 9, - + TYPE_EVENT_TIMER = 101, TYPE_EVENT_NPC = 102, TYPE_NORTHREND_BEASTS = 103, @@ -45,7 +45,7 @@ const Position ToCCommonLoc[]= {563.833008f, 187.244995f, 394.5f, 0}, // 2 Backdoor {577.347839f, 195.338888f, 395.14f, 0}, // 3 - Right {550.955933f, 195.338888f, 395.14f, 0}, // 4 - Left - {563.833008f, 195.244995f, 394.585561f, 0}, // 5 - Center + {563.833008f, 195.244995f, 394.585561f, 0}, // 5 - Center {573.5f, 180.5f, 395.14f, 0}, // 6 Move 0 Right {553.5f, 180.5f, 395.14f, 0}, // 7 Move 0 Left {585.5f, 170.0f, 395.14f, 0}, // 8 Move 1 Right diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp index d273d1ad453..20ee4dda01b 100644 --- a/src/server/scripts/Spells/spell_quest.cpp +++ b/src/server/scripts/Spells/spell_quest.cpp @@ -34,8 +34,8 @@ private: uint32 _despawnTime; public: - spell_generic_quest_update_entry_SpellScript(uint32 spellEffect, uint8 effIndex, uint32 originalEntry, uint32 newEntry, bool shouldAttack, uint32 despawnTime = 0) : - SpellScript(), _spellEffect(spellEffect), _effIndex(effIndex), _originalEntry(originalEntry), + spell_generic_quest_update_entry_SpellScript(uint32 spellEffect, uint8 effIndex, uint32 originalEntry, uint32 newEntry, bool shouldAttack, uint32 despawnTime = 0) : + SpellScript(), _spellEffect(spellEffect), _effIndex(effIndex), _originalEntry(originalEntry), _newEntry(newEntry), _shouldAttack(shouldAttack), _despawnTime(despawnTime) { } void HandleDummy(SpellEffIndex /*effIndex*/) diff --git a/src/server/scripts/World/chat_log.cpp b/src/server/scripts/World/chat_log.cpp index 330cf63adff..0a686ddf4bb 100644 --- a/src/server/scripts/World/chat_log.cpp +++ b/src/server/scripts/World/chat_log.cpp @@ -54,7 +54,7 @@ public: break; } } - + void OnChat(Player *player, uint32 /*type*/, uint32 /*lang*/, std::string msg, Player *receiver) { if (sWorld.getBoolConfig(CONFIG_CHATLOG_WHISPER)) |
