diff options
337 files changed, 4622 insertions, 4837 deletions
diff --git a/src/bindings/scripts/ScriptMgr.cpp b/src/bindings/scripts/ScriptMgr.cpp index 3848e026d1f..4bf18585a00 100644 --- a/src/bindings/scripts/ScriptMgr.cpp +++ b/src/bindings/scripts/ScriptMgr.cpp @@ -184,14 +184,14 @@ void DoScriptText(int32 iTextEntry, WorldObject* pSource, Unit* pTarget) if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) pSource->MonsterWhisper(iTextEntry, pTarget->GetGUID()); else - error_log("TSCR: DoScriptText entry %i cannot whisper without target unit (TYPEID_PLAYER).", iTextEntry); + error_log("TSCR: DoScriptText entry %i cannot whisper without pTarget unit (TYPEID_PLAYER).", iTextEntry); }break; case CHAT_TYPE_BOSS_WHISPER: { if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) pSource->MonsterWhisper(iTextEntry, pTarget->GetGUID(), true); else - error_log("TSCR: DoScriptText entry %i cannot whisper without target unit (TYPEID_PLAYER).", iTextEntry); + error_log("TSCR: DoScriptText entry %i cannot whisper without pTarget unit (TYPEID_PLAYER).", iTextEntry); }break; case CHAT_TYPE_ZONE_YELL: pSource->MonsterYellToZone(iTextEntry, pData->uiLanguage, pTarget ? pTarget->GetGUID() : 0); diff --git a/src/bindings/scripts/ScriptMgr.h b/src/bindings/scripts/ScriptMgr.h index 9456a0da661..9b6202a01a0 100644 --- a/src/bindings/scripts/ScriptMgr.h +++ b/src/bindings/scripts/ScriptMgr.h @@ -87,7 +87,7 @@ struct Script }; //Generic scripting text function -void DoScriptText(int32 textEntry, WorldObject* pSource, Unit* target = NULL); +void DoScriptText(int32 textEntry, WorldObject* pSource, Unit *pTarget = NULL); #if COMPILER == COMPILER_GNU #define FUNC_PTR(name,callconvention,returntype,parameters) typedef returntype(*name)parameters __attribute__ ((callconvention)); diff --git a/src/bindings/scripts/base/simple_ai.cpp b/src/bindings/scripts/base/simple_ai.cpp index 2c537a92794..f942bab1ceb 100644 --- a/src/bindings/scripts/base/simple_ai.cpp +++ b/src/bindings/scripts/base/simple_ai.cpp @@ -121,33 +121,33 @@ void SimpleAI::KilledUnit(Unit *victim) if (!Kill_Spell) return; - Unit* target = NULL; + Unit *pTarget = NULL; switch (Kill_Target_Type) { case CAST_SELF: - target = m_creature; + pTarget = m_creature; break; case CAST_HOSTILE_TARGET: - target = m_creature->getVictim(); + pTarget = m_creature->getVictim(); break; case CAST_HOSTILE_SECOND_AGGRO: - target = SelectUnit(SELECT_TARGET_TOPAGGRO,1); + pTarget = SelectUnit(SELECT_TARGET_TOPAGGRO,1); break; case CAST_HOSTILE_LAST_AGGRO: - target = SelectUnit(SELECT_TARGET_BOTTOMAGGRO,0); + pTarget = SelectUnit(SELECT_TARGET_BOTTOMAGGRO,0); break; case CAST_HOSTILE_RANDOM: - target = SelectUnit(SELECT_TARGET_RANDOM,0); + pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); break; case CAST_KILLEDUNIT_VICTIM: - target = victim; + pTarget = victim; break; } //Target is ok, cast a spell on it - if (target) - DoCast(target, Kill_Spell); + if (pTarget) + DoCast(pTarget, Kill_Spell); } void SimpleAI::DamageTaken(Unit *killer, uint32 &damage) @@ -169,33 +169,33 @@ void SimpleAI::DamageTaken(Unit *killer, uint32 &damage) if (!Death_Spell) return; - Unit* target = NULL; + Unit *pTarget = NULL; switch (Death_Target_Type) { case CAST_SELF: - target = m_creature; + pTarget = m_creature; break; case CAST_HOSTILE_TARGET: - target = m_creature->getVictim(); + pTarget = m_creature->getVictim(); break; case CAST_HOSTILE_SECOND_AGGRO: - target = SelectUnit(SELECT_TARGET_TOPAGGRO,1); + pTarget = SelectUnit(SELECT_TARGET_TOPAGGRO,1); break; case CAST_HOSTILE_LAST_AGGRO: - target = SelectUnit(SELECT_TARGET_BOTTOMAGGRO,0); + pTarget = SelectUnit(SELECT_TARGET_BOTTOMAGGRO,0); break; case CAST_HOSTILE_RANDOM: - target = SelectUnit(SELECT_TARGET_RANDOM,0); + pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); break; case CAST_JUSTDIED_KILLER: - target = killer; + pTarget = killer; break; } //Target is ok, cast a spell on it - if (target) - DoCast(target, Death_Spell); + if (pTarget) + DoCast(pTarget, Death_Spell); } void SimpleAI::UpdateAI(const uint32 diff) @@ -220,34 +220,34 @@ void SimpleAI::UpdateAI(const uint32 diff) //Check Current spell if (!(Spell[i].InterruptPreviousCast && m_creature->IsNonMeleeSpellCasted(false))) { - Unit* target = NULL; + Unit *pTarget = NULL; switch (Spell[i].Cast_Target_Type) { case CAST_SELF: - target = m_creature; + pTarget = m_creature; break; case CAST_HOSTILE_TARGET: - target = m_creature->getVictim(); + pTarget = m_creature->getVictim(); break; case CAST_HOSTILE_SECOND_AGGRO: - target = SelectUnit(SELECT_TARGET_TOPAGGRO,1); + pTarget = SelectUnit(SELECT_TARGET_TOPAGGRO,1); break; case CAST_HOSTILE_LAST_AGGRO: - target = SelectUnit(SELECT_TARGET_BOTTOMAGGRO,0); + pTarget = SelectUnit(SELECT_TARGET_BOTTOMAGGRO,0); break; case CAST_HOSTILE_RANDOM: - target = SelectUnit(SELECT_TARGET_RANDOM,0); + pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); break; } //Target is ok, cast a spell on it and then do our random yell - if (target) + if (pTarget) { if (m_creature->IsNonMeleeSpellCasted(false)) m_creature->InterruptNonMeleeSpells(false); - DoCast(target, Spell[i].Spell_Id); + DoCast(pTarget, Spell[i].Spell_Id); //Yell and sound use the same number so that you can make //the Creature yell with the correct sound effect attached @@ -255,7 +255,7 @@ void SimpleAI::UpdateAI(const uint32 diff) //Random yell if (Spell[i].TextId[random_text]) - DoScriptText(Spell[i].TextId[random_text], m_creature, target); + DoScriptText(Spell[i].TextId[random_text], m_creature, pTarget); //Random sound if (Spell[i].Text_Sound[random_text]) @@ -269,7 +269,7 @@ void SimpleAI::UpdateAI(const uint32 diff) Spell_Timer[i] = Spell[i].Cooldown + (rand() % Spell[i].CooldownRandomAddition); else Spell_Timer[i] = Spell[i].Cooldown; - }else Spell_Timer[i] -= diff; + } else Spell_Timer[i] -= diff; } diff --git a/src/bindings/scripts/base/simple_ai.h b/src/bindings/scripts/base/simple_ai.h index 3a2e8a9341a..6e22f1668ea 100644 --- a/src/bindings/scripts/base/simple_ai.h +++ b/src/bindings/scripts/base/simple_ai.h @@ -8,10 +8,10 @@ enum CastTarget { CAST_SELF = 0, //Self cast - CAST_HOSTILE_TARGET, //Our current target (ie: highest aggro) + CAST_HOSTILE_TARGET, //Our current pTarget (ie: highest aggro) CAST_HOSTILE_SECOND_AGGRO, //Second highest aggro (generaly used for cleaves and some special attacks) CAST_HOSTILE_LAST_AGGRO, //Dead last on aggro (no idea what this could be used for) - CAST_HOSTILE_RANDOM, //Just any random target on our threat list + CAST_HOSTILE_RANDOM, //Just any random pTarget on our threat list CAST_FRIENDLY_RANDOM, //NOT YET IMPLEMENTED //Special cases diff --git a/src/bindings/scripts/include/sc_creature.cpp b/src/bindings/scripts/include/sc_creature.cpp index bc1d38b58b6..7e981c89912 100644 --- a/src/bindings/scripts/include/sc_creature.cpp +++ b/src/bindings/scripts/include/sc_creature.cpp @@ -164,7 +164,7 @@ Creature* ScriptedAI::DoSpawnCreature(uint32 uiId, float fX, float fY, float fZ, return m_creature->SummonCreature(uiId, m_creature->GetPositionX()+fX, m_creature->GetPositionY()+fY, m_creature->GetPositionZ()+fZ, fAngle, (TempSummonType)uiType, uiDespawntime); } -Unit* ScriptedAI::SelectUnit(SelectAggroTarget target, uint32 uiPosition) +Unit* ScriptedAI::SelectUnit(SelectAggroTarget pTarget, uint32 uiPosition) { //ThreatList m_threatlist; std::list<HostilReference*>& threatlist = m_creature->getThreatManager().getThreatList(); @@ -174,7 +174,7 @@ Unit* ScriptedAI::SelectUnit(SelectAggroTarget target, uint32 uiPosition) if (uiPosition >= threatlist.size() || !threatlist.size()) return NULL; - switch (target) + switch (pTarget) { case SELECT_TARGET_RANDOM: advance (itr , uiPosition + (rand() % (threatlist.size() - uiPosition ) )); @@ -197,7 +197,7 @@ Unit* ScriptedAI::SelectUnit(SelectAggroTarget target, uint32 uiPosition) SpellEntry const* ScriptedAI::SelectSpell(Unit* pTarget, int32 uiSchool, int32 uiMechanic, SelectTargetType selectTargets, uint32 uiPowerCostMin, uint32 uiPowerCostMax, float fRangeMin, float fRangeMax, SelectEffect selectEffects) { - //No target so we can't cast + //No pTarget so we can't cast if (!pTarget) return false; @@ -264,7 +264,7 @@ SpellEntry const* ScriptedAI::SelectSpell(Unit* pTarget, int32 uiSchool, int32 u if (fRangeMax && m_creature->GetSpellMaxRangeForTarget(pTarget, pTempRange) > fRangeMax) continue; - //Check if our target is in range + //Check if our pTarget is in range if (m_creature->IsWithinDistInMap(pTarget, m_creature->GetSpellMinRangeForTarget(pTarget, pTempRange)) || !m_creature->IsWithinDistInMap(pTarget, m_creature->GetSpellMaxRangeForTarget(pTarget, pTempRange))) continue; @@ -282,7 +282,7 @@ SpellEntry const* ScriptedAI::SelectSpell(Unit* pTarget, int32 uiSchool, int32 u bool ScriptedAI::CanCast(Unit* pTarget, SpellEntry const* pSpell, bool bTriggered) { - //No target so we can't cast + //No pTarget so we can't cast if (!pTarget || !pSpell) return false; diff --git a/src/bindings/scripts/include/sc_creature.h b/src/bindings/scripts/include/sc_creature.h index 32015dbb340..19d386c7f3e 100644 --- a/src/bindings/scripts/include/sc_creature.h +++ b/src/bindings/scripts/include/sc_creature.h @@ -49,7 +49,7 @@ struct TRINITY_DLL_DECL ScriptedAI : public CreatureAI //CreatureAI Functions //************* - void AttackStartNoMove(Unit *target); + void AttackStartNoMove(Unit *pTarget); // Called at any Damage from any attacker (before damage apply) void DamageTaken(Unit* pDone_by, uint32& uiDamage) {} @@ -73,7 +73,7 @@ struct TRINITY_DLL_DECL ScriptedAI : public CreatureAI void SpellHit(Unit* caster, const SpellEntry *spell) {} // Called when spell hits a target - void SpellHitTarget(Unit* target, const SpellEntry *spell) {} + void SpellHitTarget(Unit *pTarget, const SpellEntry *spell) {} //Called at waypoint reached or PointMovement end void MovementInform(uint32 type, uint32 id){} @@ -153,7 +153,7 @@ struct TRINITY_DLL_DECL ScriptedAI : public CreatureAI Creature* DoSpawnCreature(uint32 uiId, float fX, float fY, float fZ, float fAngle, uint32 uiType, uint32 uiDespawntime); //Selects a unit from the creature's current aggro list - Unit* SelectUnit(SelectAggroTarget target, uint32 uiPosition); + Unit* SelectUnit(SelectAggroTarget pTarget, uint32 uiPosition); bool HealthBelowPct(uint32 pct) const { return me->GetHealth() * 100 < m_creature->GetMaxHealth() * pct; } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp index 8835dfc910b..11812b92482 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp @@ -260,7 +260,7 @@ struct TRINITY_DLL_DECL npc_grimstoneAI : public npc_escortAI } } } - }else MobDeath_Timer -= diff; + } else MobDeath_Timer -= diff; } if (Event_Timer) @@ -328,7 +328,7 @@ struct TRINITY_DLL_DECL npc_grimstoneAI : public npc_escortAI break; } ++EventPhase; - }else Event_Timer -= diff; + } else Event_Timer -= diff; } if (CanWalk) @@ -395,7 +395,7 @@ struct TRINITY_DLL_DECL mob_phalanxAI : public ScriptedAI { DoCast(m_creature->getVictim(),SPELL_MIGHTYBLOW); MightyBlow_Timer = 10000; - }else MightyBlow_Timer -= diff; + } else MightyBlow_Timer -= diff; DoMeleeAttackIfReady(); } @@ -1199,7 +1199,7 @@ struct TRINITY_DLL_DECL npc_rocknotAI : public npc_escortAI DoGo(DATA_GO_BAR_KEG,0); BreakKeg_Timer = 0; BreakDoor_Timer = 1000; - }else BreakKeg_Timer -= diff; + } else BreakKeg_Timer -= diff; } if (BreakDoor_Timer) @@ -1218,7 +1218,7 @@ struct TRINITY_DLL_DECL npc_rocknotAI : public npc_escortAI pInstance->SetData(TYPE_BAR,DONE); BreakDoor_Timer = 0; - }else BreakDoor_Timer -= diff; + } else BreakDoor_Timer -= diff; } npc_escortAI::UpdateAI(diff); diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_ambassador_flamelash.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_ambassador_flamelash.cpp index 92cd5ab7bb5..551ddef325f 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_ambassador_flamelash.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_ambassador_flamelash.cpp @@ -34,10 +34,6 @@ struct TRINITY_DLL_DECL boss_ambassador_flamelashAI : public ScriptedAI uint32 FireBlast_Timer; uint32 Spirit_Timer; - int Rand; - int RandX; - int RandY; - Creature* Summoned; void Reset() { @@ -49,22 +45,8 @@ struct TRINITY_DLL_DECL boss_ambassador_flamelashAI : public ScriptedAI void SummonSpirits(Unit* victim) { - Rand = rand()%10; - switch (rand()%2) - { - case 0: RandX -= Rand; break; - case 1: RandX += Rand; break; - } - Rand = 0; - Rand = rand()%10; - switch (rand()%2) - { - case 0: RandY -= Rand; break; - case 1: RandY += Rand; break; - } - Summoned = DoSpawnCreature(9178, RandX, RandY, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000); - if (Summoned) - (Summoned->AI())->AttackStart(victim); + if (Creature *Spirit = DoSpawnCreature(9178, RAND(irand(0,-9),irand(0,9)), RAND(irand(0,-9),irand(0,9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000)) + Spirit->AI()->AttackStart(victim); } void UpdateAI(const uint32 diff) diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_anubshiah.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_anubshiah.cpp index 4d118b29b25..2575e9ad000 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_anubshiah.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_anubshiah.cpp @@ -71,8 +71,8 @@ struct TRINITY_DLL_DECL boss_anubshiahAI : public ScriptedAI //CurseOfTongues_Timer if (CurseOfTongues_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(target,SPELL_CURSEOFTONGUES); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(pTarget,SPELL_CURSEOFTONGUES); CurseOfTongues_Timer = 18000; } else CurseOfTongues_Timer -= diff; @@ -93,8 +93,8 @@ struct TRINITY_DLL_DECL boss_anubshiahAI : public ScriptedAI //EnvelopingWeb_Timer if (EnvelopingWeb_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(target,SPELL_ENVELOPINGWEB); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(pTarget,SPELL_ENVELOPINGWEB); EnvelopingWeb_Timer = 12000; } else EnvelopingWeb_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_emperor_dagran_thaurissan.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_emperor_dagran_thaurissan.cpp index 3e84c680b45..ef5cac59b38 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_emperor_dagran_thaurissan.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_emperor_dagran_thaurissan.cpp @@ -69,8 +69,8 @@ struct TRINITY_DLL_DECL boss_draganthaurissanAI : public ScriptedAI if (HandOfThaurissan_Timer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(target,SPELL_HANDOFTHAURISSAN); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget,SPELL_HANDOFTHAURISSAN); //3 Hands of Thaurissan will be casted //if (Counter < 3) @@ -83,7 +83,7 @@ struct TRINITY_DLL_DECL boss_draganthaurissanAI : public ScriptedAI HandOfThaurissan_Timer = 5000; //Counter=0; //} - }else HandOfThaurissan_Timer -= diff; + } else HandOfThaurissan_Timer -= diff; //AvatarOfFlame_Timer if (AvatarOfFlame_Timer <= diff) diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_general_angerforge.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_general_angerforge.cpp index 1c034d0cbee..e10463203b5 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_general_angerforge.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_general_angerforge.cpp @@ -39,14 +39,6 @@ struct TRINITY_DLL_DECL boss_general_angerforgeAI : public ScriptedAI uint32 Cleave_Timer; uint32 Adds_Timer; bool Medics; - int Rand1; - int Rand1X; - int Rand1Y; - int Rand2; - int Rand2X; - int Rand2Y; - Creature* SummonedAdds; - Creature* SummonedMedics; void Reset() { @@ -63,44 +55,14 @@ struct TRINITY_DLL_DECL boss_general_angerforgeAI : public ScriptedAI void SummonAdds(Unit* victim) { - Rand1 = rand()%15; - switch (rand()%2) - { - case 0: Rand1X = 0 - Rand1; break; - case 1: Rand1X = 0 + Rand1; break; - } - Rand1 = 0; - Rand1 = rand()%15; - switch (rand()%2) - { - case 0: Rand1Y = 0 - Rand1; break; - case 1: Rand1Y = 0 + Rand1; break; - } - Rand1 = 0; - SummonedAdds = DoSpawnCreature(8901, Rand1X, Rand1Y, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000); - if (SummonedAdds) - (SummonedAdds->AI())->AttackStart(victim); + if (Creature *SummonedAdd = DoSpawnCreature(8901, RAND(irand(0,-14),irand(0,14)), RAND(irand(0,-14),irand(0,14)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000)) + SummonedAdd->AI()->AttackStart(victim); } void SummonMedics(Unit* victim) { - Rand2 = rand()%10; - switch (rand()%2) - { - case 0: Rand2X = 0 - Rand2; break; - case 1: Rand2X = 0 + Rand2; break; - } - Rand2 = 0; - Rand2 = rand()%10; - switch (rand()%2) - { - case 0: Rand2Y = 0 - Rand2; break; - case 1: Rand2Y = 0 + Rand2; break; - } - Rand2 = 0; - SummonedMedics = DoSpawnCreature(8894, Rand2X, Rand2Y, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000); - if (SummonedMedics) - (SummonedMedics->AI())->AttackStart(victim); + if (Creature *SummonedMedic = DoSpawnCreature(8894, RAND(irand(0,-9),irand(0,9)), RAND(irand(0,-9),irand(0,9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000)) + SummonedMedic->AI()->AttackStart(victim); } void UpdateAI(const uint32 diff) diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_gorosh_the_dervish.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_gorosh_the_dervish.cpp index 781005ecd41..f5e648f060e 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_gorosh_the_dervish.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_gorosh_the_dervish.cpp @@ -57,14 +57,14 @@ struct TRINITY_DLL_DECL boss_gorosh_the_dervishAI : public ScriptedAI { DoCast(m_creature,SPELL_WHIRLWIND); WhirlWind_Timer = 15000; - }else WhirlWind_Timer -= diff; + } else WhirlWind_Timer -= diff; //MortalStrike_Timer if (MortalStrike_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_MORTALSTRIKE); MortalStrike_Timer = 15000; - }else MortalStrike_Timer -= diff; + } else MortalStrike_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_high_interrogator_gerstahn.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_high_interrogator_gerstahn.cpp index 44b1dca390e..e3fba2c39f8 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_high_interrogator_gerstahn.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_high_interrogator_gerstahn.cpp @@ -61,16 +61,16 @@ struct TRINITY_DLL_DECL boss_high_interrogator_gerstahnAI : public ScriptedAI //ShadowWordPain_Timer if (ShadowWordPain_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(target,SPELL_SHADOWWORDPAIN); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(pTarget,SPELL_SHADOWWORDPAIN); ShadowWordPain_Timer = 7000; } else ShadowWordPain_Timer -= diff; //ManaBurn_Timer if (ManaBurn_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(target,SPELL_MANABURN); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(pTarget,SPELL_MANABURN); ManaBurn_Timer = 10000; } else ManaBurn_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_magmus.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_magmus.cpp index 08a80f8d3cd..2f44e0e1801 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_magmus.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_magmus.cpp @@ -57,7 +57,7 @@ struct TRINITY_DLL_DECL boss_magmusAI : public ScriptedAI { DoCast(m_creature->getVictim(),SPELL_FIERYBURST); FieryBurst_Timer = 6000; - }else FieryBurst_Timer -= diff; + } else FieryBurst_Timer -= diff; //WarStomp_Timer if (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 51) @@ -66,7 +66,7 @@ struct TRINITY_DLL_DECL boss_magmusAI : public ScriptedAI { DoCast(m_creature->getVictim(),SPELL_WARSTOMP); WarStomp_Timer = 8000; - }else WarStomp_Timer -= diff; + } else WarStomp_Timer -= diff; } DoMeleeAttackIfReady(); diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_moira_bronzebeard.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_moira_bronzebeard.cpp index b48b0a91d1f..9138e5b17dc 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_moira_bronzebeard.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_moira_bronzebeard.cpp @@ -69,21 +69,21 @@ struct TRINITY_DLL_DECL boss_moira_bronzebeardAI : public ScriptedAI { DoCast(m_creature->getVictim(),SPELL_MINDBLAST); MindBlast_Timer = 14000; - }else MindBlast_Timer -= diff; + } else MindBlast_Timer -= diff; //ShadowWordPain_Timer if (ShadowWordPain_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_SHADOWWORDPAIN); ShadowWordPain_Timer = 18000; - }else ShadowWordPain_Timer -= diff; + } else ShadowWordPain_Timer -= diff; //Smite_Timer if (Smite_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_SMITE); Smite_Timer = 10000; - }else Smite_Timer -= diff; + } else Smite_Timer -= diff; } }; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_tomb_of_seven.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_tomb_of_seven.cpp index 7165b31e539..f3fb0b564f9 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_tomb_of_seven.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_tomb_of_seven.cpp @@ -170,8 +170,8 @@ struct TRINITY_DLL_DECL boss_doomrelAI : public ScriptedAI //Immolate_Timer if (Immolate_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(target,SPELL_IMMOLATE); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(pTarget,SPELL_IMMOLATE); Immolate_Timer = 25000; } else Immolate_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/instance_blackrock_depths.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/instance_blackrock_depths.cpp index be0caf09919..c7739f5594b 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/instance_blackrock_depths.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/instance_blackrock_depths.cpp @@ -343,8 +343,8 @@ struct TRINITY_DLL_DECL instance_blackrock_depths : public ScriptedInstance { boss->setFaction(FACTION_HOSTILE); boss->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); - if (Unit* target = boss->SelectNearestTarget(500)) - boss->AI()->AttackStart(target); + if (Unit *pTarget = boss->SelectNearestTarget(500)) + boss->AI()->AttackStart(pTarget); } } } @@ -401,7 +401,7 @@ struct TRINITY_DLL_DECL instance_blackrock_depths : public ScriptedInstance TombTimer = TIMER_TOMBOFTHESEVEN; TombEventCounter++; TombOfSevenEvent(); - }else TombTimer -= diff; + } else TombTimer -= diff; } if (GhostKillCount >= 7 && TombEventStarterGUID) TombOfSevenEnd(); diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_gyth.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_gyth.cpp index d4c0477907d..440570d2a50 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_gyth.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_gyth.cpp @@ -85,9 +85,9 @@ struct TRINITY_DLL_DECL boss_gythAI : public ScriptedAI Unit* Summoned = m_creature->SummonCreature(creatureId, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 240000); if (Summoned) { - Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (target) - Summoned->AddThreat(target, 1.0f); + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + if (pTarget) + Summoned->AddThreat(pTarget, 1.0f); } } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_overlord_wyrmthalak.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_overlord_wyrmthalak.cpp index 33de4b9e8be..7e21ee66794 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_overlord_wyrmthalak.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_overlord_wyrmthalak.cpp @@ -99,15 +99,12 @@ struct TRINITY_DLL_DECL boss_overlordwyrmthalakAI : public ScriptedAI //Summon two Beserks if (!Summoned && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 51) { - Unit* target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM,0); - - SummonedCreature = m_creature->SummonCreature(9216,ADD_1X,ADD_1Y,ADD_1Z,ADD_1O,TEMPSUMMON_TIMED_DESPAWN,300000); - if (SummonedCreature) - (SummonedCreature->AI())->AttackStart(target); - SummonedCreature = m_creature->SummonCreature(9268,ADD_2X,ADD_2Y,ADD_2Z,ADD_2O,TEMPSUMMON_TIMED_DESPAWN,300000); - if (SummonedCreature) - (SummonedCreature->AI())->AttackStart(target); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0, 100, true); + + if (SummonedCreature = m_creature->SummonCreature(9216,ADD_1X,ADD_1Y,ADD_1Z,ADD_1O,TEMPSUMMON_TIMED_DESPAWN,300000)) + SummonedCreature->AI()->AttackStart(pTarget); + if (SummonedCreature = m_creature->SummonCreature(9268,ADD_2X,ADD_2Y,ADD_2Z,ADD_2O,TEMPSUMMON_TIMED_DESPAWN,300000)) + SummonedCreature->AI()->AttackStart(pTarget); Summoned = true; } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_pyroguard_emberseer.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_pyroguard_emberseer.cpp index d812f9942c3..83ef1bb527c 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_pyroguard_emberseer.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_pyroguard_emberseer.cpp @@ -69,8 +69,8 @@ struct TRINITY_DLL_DECL boss_pyroguard_emberseerAI : public ScriptedAI //PyroBlast_Timer if (PyroBlast_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(target,SPELL_PYROBLAST); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(pTarget,SPELL_PYROBLAST); PyroBlast_Timer = 15000; } else PyroBlast_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_shadow_hunter_voshgajin.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_shadow_hunter_voshgajin.cpp index bf59559959d..c5fa53f5588 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_shadow_hunter_voshgajin.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_shadow_hunter_voshgajin.cpp @@ -59,13 +59,13 @@ struct TRINITY_DLL_DECL boss_shadowvoshAI : public ScriptedAI { DoCast(m_creature->getVictim(),SPELL_CURSEOFBLOOD); CurseOfBlood_Timer = 45000; - }else CurseOfBlood_Timer -= diff; + } else CurseOfBlood_Timer -= diff; //Hex_Timer if (Hex_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(target,SPELL_HEX); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(pTarget,SPELL_HEX); Hex_Timer = 15000; } else Hex_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_the_beast.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_the_beast.cpp index 568992db085..4a7816e8f55 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_the_beast.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_the_beast.cpp @@ -62,8 +62,8 @@ struct TRINITY_DLL_DECL boss_thebeastAI : public ScriptedAI //Immolate_Timer if (Immolate_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(target,SPELL_IMMOLATE); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(pTarget,SPELL_IMMOLATE); Immolate_Timer = 8000; } else Immolate_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_chromaggus.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_chromaggus.cpp index a703012e0fd..f434614567b 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_chromaggus.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_chromaggus.cpp @@ -62,8 +62,7 @@ struct TRINITY_DLL_DECL boss_chromaggusAI : public ScriptedAI //5 possiblities for the first breath, 4 for the second, 20 total possiblites //This way we don't end up casting 2 of the same breath //TL TL would be stupid - srand(time(NULL)); - switch (rand()%20) + switch (urand(0,19)) { //B1 - Incin case 0: @@ -240,15 +239,15 @@ struct TRINITY_DLL_DECL boss_chromaggusAI : public ScriptedAI //Cast affliction DoCast(pUnit, SpellAfflict, true); - //Chromatic mutation if target is effected by all afflictions + //Chromatic mutation if pTarget is effected by all afflictions if (pUnit->HasAura(SPELL_BROODAF_BLUE) && pUnit->HasAura(SPELL_BROODAF_BLACK) && pUnit->HasAura(SPELL_BROODAF_RED) && pUnit->HasAura(SPELL_BROODAF_BRONZE) && pUnit->HasAura(SPELL_BROODAF_GREEN)) { - //target->RemoveAllAuras(); - //DoCast(target,SPELL_CHROMATIC_MUT_1); + //pTarget->RemoveAllAuras(); + //DoCast(pTarget,SPELL_CHROMATIC_MUT_1); //Chromatic mutation is causing issues //Assuming it is caused by a lack of core support for Charm diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_flamegor.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_flamegor.cpp index f770a3444f2..6a02b3ffe43 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_flamegor.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_flamegor.cpp @@ -76,7 +76,7 @@ struct TRINITY_DLL_DECL boss_flamegorAI : public ScriptedAI { DoScriptText(EMOTE_FRENZY, m_creature); DoCast(m_creature,SPELL_FRENZY); - Frenzy_Timer = 8000 + (rand()%2000); + Frenzy_Timer = urand(8000, 10000); } else Frenzy_Timer -= diff; DoMeleeAttackIfReady(); diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_nefarian.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_nefarian.cpp index f15cb152341..41dd7b03aa1 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_nefarian.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_nefarian.cpp @@ -203,7 +203,7 @@ struct TRINITY_DLL_DECL boss_nefarianAI : public ScriptedAI } ClassCall_Timer = 35000 + (rand() % 5000); - }else ClassCall_Timer -= diff; + } else ClassCall_Timer -= diff; //Phase3 begins when we are below X health if (!Phase3 && (m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 20) diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_razorgore.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_razorgore.cpp index f4c4dd63f9a..900317a9c83 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_razorgore.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_razorgore.cpp @@ -102,8 +102,8 @@ struct TRINITY_DLL_DECL boss_razorgoreAI : public ScriptedAI // Aura Check. If the gamer is affected by confliguration we attack a random gamer. if (m_creature->getVictim() && m_creature->getVictim()->HasAura(SPELL_CONFLAGRATION)) - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true)) - m_creature->TauntApply(target); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true)) + m_creature->TauntApply(pTarget); DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_vaelastrasz.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_vaelastrasz.cpp index 7f04e4ff11d..0f31c306b28 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_vaelastrasz.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_vaelastrasz.cpp @@ -74,10 +74,10 @@ struct TRINITY_DLL_DECL boss_vaelAI : public ScriptedAI DoingSpeech = false; } - void BeginSpeech(Unit* target) + void BeginSpeech(Unit *pTarget) { //Stand up and begin speach - PlayerGUID = target->GetGUID(); + PlayerGUID = pTarget->GetGUID(); //10 seconds DoScriptText(SAY_LINE1, m_creature); @@ -167,18 +167,18 @@ struct TRINITY_DLL_DECL boss_vaelAI : public ScriptedAI //BurningAdrenalineCaster_Timer if (BurningAdrenalineCaster_Timer <= diff) { - Unit* target = NULL; + Unit *pTarget = NULL; uint8 i = 0; - while (i < 3) // max 3 tries to get a random target with power_mana + while (i < 3) // max 3 tries to get a random pTarget with power_mana { ++i; - if (target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true)) //not aggro leader - if (target->getPowerType() == POWER_MANA) + if (pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true)) //not aggro leader + if (pTarget->getPowerType() == POWER_MANA) i = 3; } - if (target) // cast on self (see below) - target->CastSpell(target,SPELL_BURNINGADRENALINE,1); + if (pTarget) // cast on self (see below) + pTarget->CastSpell(pTarget,SPELL_BURNINGADRENALINE,1); BurningAdrenalineCaster_Timer = 15000; } else BurningAdrenalineCaster_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_victor_nefarius.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_victor_nefarius.cpp index e13c6b04a04..5a922c413b7 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_victor_nefarius.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_victor_nefarius.cpp @@ -72,8 +72,7 @@ struct TRINITY_DLL_DECL boss_victor_nefariusAI : public ScriptedAI boss_victor_nefariusAI(Creature *c) : ScriptedAI(c) { NefarianGUID = 0; - srand(time(NULL)); - switch (rand()%20) + switch (urand(0,19)) { case 0: DrakType1 = CREATURE_BRONZE_DRAKANOID; @@ -184,7 +183,7 @@ struct TRINITY_DLL_DECL boss_victor_nefariusAI : public ScriptedAI m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void BeginEvent(Player* target) + void BeginEvent(Player *pTarget) { DoScriptText(SAY_GAMESBEGIN_2, m_creature); @@ -200,7 +199,7 @@ struct TRINITY_DLL_DECL boss_victor_nefariusAI : public ScriptedAI m_creature->SetUInt32Value(UNIT_NPC_FLAGS,0); m_creature->setFaction(103); m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - AttackStart(target); + AttackStart(pTarget); } void EnterCombat(Unit *who) @@ -214,7 +213,7 @@ struct TRINITY_DLL_DECL boss_victor_nefariusAI : public ScriptedAI if (who && who->GetTypeId() == TYPEID_PLAYER && m_creature->IsHostileTo(who)) { //Add them to our threat list - m_creature->AddThreat(who,0.0f); + m_creature->AddThreat(who, 0.0f); } } @@ -229,8 +228,8 @@ struct TRINITY_DLL_DECL boss_victor_nefariusAI : public ScriptedAI //ShadowBoltTimer if (ShadowBoltTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(target,SPELL_SHADOWBOLT); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(pTarget, SPELL_SHADOWBOLT); ShadowBoltTimer = urand(3000,10000); } else ShadowBoltTimer -= diff; @@ -238,8 +237,8 @@ struct TRINITY_DLL_DECL boss_victor_nefariusAI : public ScriptedAI //FearTimer if (FearTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(target,SPELL_FEAR); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(pTarget, SPELL_FEAR); FearTimer = 10000 + (rand()%10000); } else FearTimer -= diff; @@ -250,7 +249,7 @@ struct TRINITY_DLL_DECL boss_victor_nefariusAI : public ScriptedAI //Spawn 2 random types of creatures at the 2 locations uint32 CreatureID; Creature* Spawned = NULL; - Unit* target = NULL; + Unit *pTarget = NULL; //1 in 3 chance it will be a chromatic if (urand(0,2) == 0) @@ -262,10 +261,10 @@ struct TRINITY_DLL_DECL boss_victor_nefariusAI : public ScriptedAI //Spawn Creature and force it to start attacking a random target Spawned = m_creature->SummonCreature(CreatureID,ADD_X1,ADD_Y1,ADD_Z1,5.000,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); - if (target && Spawned) + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + if (pTarget && Spawned) { - Spawned->AI()->AttackStart(target); + Spawned->AI()->AttackStart(pTarget); Spawned->setFaction(103); } @@ -278,10 +277,10 @@ struct TRINITY_DLL_DECL boss_victor_nefariusAI : public ScriptedAI ++SpawnedAdds; Spawned = m_creature->SummonCreature(CreatureID,ADD_X2,ADD_Y2,ADD_Z2,5.000,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); - if (target && Spawned) + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + if (pTarget && Spawned) { - Spawned->AI()->AttackStart(target); + Spawned->AI()->AttackStart(pTarget); Spawned->setFaction(103); } @@ -306,10 +305,10 @@ struct TRINITY_DLL_DECL boss_victor_nefariusAI : public ScriptedAI //Spawn nef and have him attack a random target Creature* Nefarian = m_creature->SummonCreature(CREATURE_NEFARIAN,NEF_X,NEF_Y,NEF_Z,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,120000); - target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); - if (target && Nefarian) + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + if (pTarget && Nefarian) { - Nefarian->AI()->AttackStart(target); + Nefarian->AI()->AttackStart(pTarget); Nefarian->setFaction(103); NefarianGUID = Nefarian->GetGUID(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/boss_kruul.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/boss_kruul.cpp index 267bbdefe95..6d3ba9fda5e 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/boss_kruul.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/boss_kruul.cpp @@ -42,10 +42,6 @@ struct TRINITY_DLL_DECL boss_kruulAI : public ScriptedAI uint32 VoidBolt_Timer; uint32 Rage_Timer; uint32 Hound_Timer; - int Rand; - int RandX; - int RandY; - Creature* Summoned; void Reset() { @@ -66,28 +62,12 @@ struct TRINITY_DLL_DECL boss_kruulAI : public ScriptedAI { // When a player, pet or totem gets killed, Lord Kazzak casts this spell to instantly regenerate 70,000 health. DoCast(m_creature,SPELL_CAPTURESOUL); - } - void SummonHounds(Unit* victim) + void SummonHounds(Unit* pVictim) { - Rand = rand()%10; - switch (rand()%2) - { - case 0: RandX = 0 - Rand; break; - case 1: RandX = 0 + Rand; break; - } - Rand = 0; - Rand = rand()%10; - switch (rand()%2) - { - case 0: RandY = 0 - Rand; break; - case 1: RandY = 0 + Rand; break; - } - Rand = 0; - Summoned = DoSpawnCreature(19207, RandX, RandY, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000); - if (Summoned) - (Summoned->AI())->AttackStart(victim); + if (Creature *Hound = DoSpawnCreature(19207, RAND(irand(0,-9),irand(0,9)), RAND(irand(0,-9),irand(0,9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000)) + Hound->AI()->AttackStart(pVictim); } void UpdateAI(const uint32 diff) @@ -97,72 +77,64 @@ struct TRINITY_DLL_DECL boss_kruulAI : public ScriptedAI return; //ShadowVolley_Timer - if (ShadowVolley_Timer < diff) + if (ShadowVolley_Timer <= diff) { - if (rand()%100 < 46) - { + if (urand(0,99) < 45) DoCast(m_creature->getVictim(),SPELL_SHADOWVOLLEY); - } ShadowVolley_Timer = 5000; - }else ShadowVolley_Timer -= diff; + } else ShadowVolley_Timer -= diff; //Cleave_Timer - if (Cleave_Timer < diff) + if (Cleave_Timer <= diff) { - if (rand()%100 < 50) - { + if (urand(0,1)) DoCast(m_creature->getVictim(),SPELL_CLEAVE); - } Cleave_Timer = 10000; - }else Cleave_Timer -= diff; + } else Cleave_Timer -= diff; //ThunderClap_Timer - if (ThunderClap_Timer < diff) + if (ThunderClap_Timer <= diff) { - if (rand()%100 < 20) - { + if (urand(0,9) < 2) DoCast(m_creature->getVictim(),SPELL_THUNDERCLAP); - } ThunderClap_Timer = 12000; - }else ThunderClap_Timer -= diff; + } else ThunderClap_Timer -= diff; //TwistedReflection_Timer - if (TwistedReflection_Timer < diff) + if (TwistedReflection_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_TWISTEDREFLECTION); TwistedReflection_Timer = 30000; - }else TwistedReflection_Timer -= diff; + } else TwistedReflection_Timer -= diff; //VoidBolt_Timer - if (VoidBolt_Timer < diff) + if (VoidBolt_Timer <= diff) { - if (rand()%100 < 40) - { + if (urand(0,9) < 4) DoCast(m_creature->getVictim(),SPELL_VOIDBOLT); - } VoidBolt_Timer = 18000; - }else VoidBolt_Timer -= diff; + } else VoidBolt_Timer -= diff; //Rage_Timer - if (Rage_Timer < diff) + if (Rage_Timer <= diff) { DoCast(m_creature,SPELL_RAGE); Rage_Timer = 70000; - }else Rage_Timer -= diff; + } else Rage_Timer -= diff; //Hound_Timer - if (Hound_Timer < diff) + if (Hound_Timer <= diff) { SummonHounds(m_creature->getVictim()); SummonHounds(m_creature->getVictim()); SummonHounds(m_creature->getVictim()); Hound_Timer = 45000; - }else Hound_Timer -= diff; + } else Hound_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/deadmines/deadmines.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/deadmines/deadmines.cpp index 1e44bef76be..6df0b7bcc12 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/deadmines/deadmines.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/deadmines/deadmines.cpp @@ -29,7 +29,7 @@ EndScriptData */ # item_Defias_Gunpowder #####*/ -bool ItemUse_item_defias_gunpowder(Player* pPlayer, Item* _Item, SpellCastTargets const& targets) +bool ItemUse_item_defias_gunpowder(Player* pPlayer, Item* pItem, SpellCastTargets const& targets) { ScriptedInstance *pInstance = pPlayer->GetInstanceData(); @@ -46,7 +46,7 @@ bool ItemUse_item_defias_gunpowder(Player* pPlayer, Item* _Item, SpellCastTarget pInstance->SetData(EVENT_STATE, CANNON_GUNPOWDER_USED); } - pPlayer->DestroyItemCount(_Item->GetEntry(), 1, true); + pPlayer->DestroyItemCount(pItem->GetEntry(), 1, true); return true; } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/dun_morogh.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/dun_morogh.cpp index f2d589d5302..8e134ed19f6 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/dun_morogh.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/dun_morogh.cpp @@ -62,7 +62,7 @@ struct TRINITY_DLL_DECL npc_narm_faulkAI : public ScriptedAI { if (m_creature->IsStandState()) { - if (lifeTimer < diff) + if (lifeTimer <= diff) { EnterEvadeMode(); return; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/duskwood.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/duskwood.cpp index 394f652d8ff..83003f8c73c 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/duskwood.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/duskwood.cpp @@ -92,12 +92,12 @@ struct TRINITY_DLL_DECL boss_twilight_corrupterAI : public ScriptedAI { if(!UpdateVictim()) return; - if(SoulCorruption_Timer < diff) + if (SoulCorruption_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_SOUL_CORRUPTION); SoulCorruption_Timer = rand()%4000+15000; //gotta confirm Timers } else SoulCorruption_Timer-=diff; - if(CreatureOfNightmare_Timer < diff) + if (CreatureOfNightmare_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_SOUL_CORRUPTION); CreatureOfNightmare_Timer = 45000; //gotta confirm Timers diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/elwynn_forest.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/elwynn_forest.cpp index 40f0ceecd09..113dcbc02e5 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/elwynn_forest.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/elwynn_forest.cpp @@ -61,7 +61,7 @@ struct TRINITY_DLL_DECL npc_henze_faulkAI : public ScriptedAI { if (m_creature->IsStandState()) { - if (lifeTimer < diff) + if (lifeTimer <= diff) { EnterEvadeMode(); return; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/eversong_woods.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/eversong_woods.cpp index d1a4e59f0a5..cee99b1e7ad 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/eversong_woods.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/eversong_woods.cpp @@ -227,16 +227,16 @@ struct TRINITY_DLL_DECL npc_secondTrialAI : public ScriptedAI void UpdateAI(const uint32 diff) { if (questPhase == 1) - if (timer < diff) + if (timer <= diff) { m_creature->SetUInt32Value(UNIT_FIELD_BYTES_1, UNIT_STAND_STATE_STAND); m_creature->setFaction(FACTION_HOSTILE); questPhase = 0; - if (Unit *target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { - m_creature->AddThreat(target, 5000000.0f); - AttackStart(target); + m_creature->AddThreat(pTarget, 5000000.0f); + AttackStart(pTarget); } } else @@ -248,7 +248,7 @@ struct TRINITY_DLL_DECL npc_secondTrialAI : public ScriptedAI // healer if (spellFlashLight) if (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 70) - if (timerFlashLight < diff) + if (timerFlashLight <= diff) { DoCast(m_creature, SPELL_FLASH_OF_LIGHT); timerFlashLight = TIMER_FLASH_OF_LIGHT + rand()%TIMER_FLASH_OF_LIGHT; @@ -257,7 +257,7 @@ struct TRINITY_DLL_DECL npc_secondTrialAI : public ScriptedAI timerFlashLight -= diff; if (spellJustice) - if (timerJustice < diff) + if (timerJustice <= diff) { DoCast(m_creature, SPELL_SEAL_OF_JUSTICE); timerJustice = TIMER_SEAL_OF_JUSTICE + rand()%TIMER_SEAL_OF_JUSTICE; @@ -266,7 +266,7 @@ struct TRINITY_DLL_DECL npc_secondTrialAI : public ScriptedAI timerJustice -= diff; if (spellJudLight) - if (timerJudLight < diff) + if (timerJudLight <= diff) { DoCast(m_creature, SPELL_JUDGEMENT_OF_LIGHT); timerJudLight = TIMER_JUDGEMENT_OF_LIGHT + rand()%TIMER_JUDGEMENT_OF_LIGHT; @@ -275,7 +275,7 @@ struct TRINITY_DLL_DECL npc_secondTrialAI : public ScriptedAI timerJudLight -= diff; if (spellCommand) - if (timerCommand < diff) + if (timerCommand <= diff) { DoCast(m_creature, TIMER_SEAL_OF_COMMAND); timerCommand = TIMER_SEAL_OF_COMMAND + rand()%TIMER_SEAL_OF_COMMAND; @@ -321,7 +321,7 @@ struct TRINITY_DLL_DECL master_kelerun_bloodmournAI : public ScriptedAI // Quest accepted but object not activated, object despawned (if in sync 1 minute!) if (questPhase == 1) { - if (timer < diff) + if (timer <= diff) Reset(); else timer -= diff; @@ -329,7 +329,7 @@ struct TRINITY_DLL_DECL master_kelerun_bloodmournAI : public ScriptedAI // fight the 4 paladin mobs phase else if (questPhase == 2) { - if (timer < diff) + if (timer <= diff) { if (Creature* paladinSpawn = Unit::GetCreature((*m_creature), paladinGuid[paladinPhase])) { @@ -658,7 +658,7 @@ struct TRINITY_DLL_DECL npc_infused_crystalAI : public Scripted_NoMovementAI m_creature->SummonCreature(MOB_ENRAGED_WRAITH, SpawnLocations[ran2].x, SpawnLocations[ran2].y, SpawnLocations[ran2].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 10000); m_creature->SummonCreature(MOB_ENRAGED_WRAITH, SpawnLocations[ran3].x, SpawnLocations[ran3].y, SpawnLocations[ran3].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 10000); WaveTimer = 30000; - }else WaveTimer -= diff; + } else WaveTimer -= diff; } }; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/ghostlands.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/ghostlands.cpp index 8dd1a67a0fc..4549a80c369 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/ghostlands.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/ghostlands.cpp @@ -126,7 +126,7 @@ bool GOHello_gilded_brazier(Player* pPlayer, GameObject* pGo) { Creature *Stillblade = pPlayer->SummonCreature(17716, 8106.11, -7542.06, 151.775, 3.02598, TEMPSUMMON_DEAD_DESPAWN, 60000); if (Stillblade) - (Stillblade->AI())->AttackStart(pPlayer); + Stillblade->AI()->AttackStart(pPlayer); } return true; }; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/hinterlands.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/hinterlands.cpp index 28adee2f787..9ef00a73f3d 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/hinterlands.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/hinterlands.cpp @@ -279,7 +279,7 @@ struct TRINITY_DLL_DECL npc_rinjiAI : public npc_escortAI { if (HasEscortState(STATE_ESCORT_ESCORTING) && m_uiPostEventCount) { - if (m_uiPostEventTimer < uiDiff) + if (m_uiPostEventTimer <= uiDiff) { m_uiPostEventTimer = 3000; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/isle_of_queldanas.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/isle_of_queldanas.cpp index 9a9db09c514..c5fcaf081ed 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/isle_of_queldanas.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/isle_of_queldanas.cpp @@ -71,7 +71,7 @@ struct TRINITY_DLL_DECL npc_converted_sentryAI : public ScriptedAI if (m_creature->isPet()) CAST_PET(m_creature)->SetDuration(7500); Credit = true; - }else Timer -= diff; + } else Timer -= diff; } } }; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_curator.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_curator.cpp index 96b87752ca6..fcdb1f6df44 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_curator.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_curator.cpp @@ -103,7 +103,7 @@ struct TRINITY_DLL_DECL boss_curatorAI : public ScriptedAI //don't know if he's supposed to do summon/evocate after hard enrage (probably not) Enraged = true; - }else BerserkTimer -= diff; + } else BerserkTimer -= diff; if (Evocating) { @@ -120,13 +120,13 @@ struct TRINITY_DLL_DECL boss_curatorAI : public ScriptedAI { //Summon Astral Flare Creature* AstralFlare = DoSpawnCreature(17096, rand()%37, rand()%37, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); - Unit* target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM, 0); + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (AstralFlare && target) + if (AstralFlare && pTarget) { AstralFlare->CastSpell(AstralFlare, SPELL_ASTRAL_FLARE_PASSIVE, false); - AstralFlare->AI()->AttackStart(target); + AstralFlare->AI()->AttackStart(pTarget); } //Reduce Mana by 10% of max health @@ -155,7 +155,7 @@ struct TRINITY_DLL_DECL boss_curatorAI : public ScriptedAI } AddTimer = 10000; - }else AddTimer -= diff; + } else AddTimer -= diff; if (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() <= 15) { @@ -172,8 +172,8 @@ struct TRINITY_DLL_DECL boss_curatorAI : public ScriptedAI else HatefulBoltTimer = 15000; - if (Unit* target = SelectUnit(SELECT_TARGET_TOPAGGRO, 1)) - DoCast(target, SPELL_HATEFUL_BOLT); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_TOPAGGRO, 1)) + DoCast(pTarget, SPELL_HATEFUL_BOLT); } else HatefulBoltTimer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_maiden_of_virtue.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_maiden_of_virtue.cpp index 571dfbf3894..93430f5b079 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_maiden_of_virtue.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_maiden_of_virtue.cpp @@ -103,16 +103,16 @@ struct TRINITY_DLL_DECL boss_maiden_of_virtueAI : public ScriptedAI if (Holyfire_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(target,SPELL_HOLYFIRE); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(pTarget,SPELL_HOLYFIRE); Holyfire_Timer = urand(8000,23000); //Anywhere from 8 to 23 seconds, good luck having several of those in a row! } else Holyfire_Timer -= diff; if (Holywrath_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(target,SPELL_HOLYWRATH); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(pTarget,SPELL_HOLYWRATH); Holywrath_Timer = urand(20000,25000); //20-30 secs sounds nice } else Holywrath_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_midnight.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_midnight.cpp index 8dff9079231..eb3ad3ae9fa 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_midnight.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_midnight.cpp @@ -243,20 +243,20 @@ struct TRINITY_DLL_DECL boss_attumenAI : public ScriptedAI { if (ChargeTimer <= diff) { - Unit *target; + Unit *pTarget; std::list<HostilReference *> t_list = m_creature->getThreatManager().getThreatList(); std::vector<Unit *> target_list; for (std::list<HostilReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { - target = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); - if (target && !target->IsWithinDist(m_creature, ATTACK_DISTANCE, false)) - target_list.push_back(target); - target = NULL; + pTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); + if (pTarget && !pTarget->IsWithinDist(m_creature, ATTACK_DISTANCE, false)) + target_list.push_back(pTarget); + pTarget = NULL; } if (target_list.size()) - target = *(target_list.begin()+rand()%target_list.size()); + pTarget = *(target_list.begin()+rand()%target_list.size()); - DoCast(target, SPELL_BERSERKER_CHARGE); + DoCast(pTarget, SPELL_BERSERKER_CHARGE); ChargeTimer = 20000; } else ChargeTimer -= diff; } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_moroes.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_moroes.cpp index 1fc971b8b7a..b9dacd789d2 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_moroes.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_moroes.cpp @@ -271,12 +271,12 @@ struct TRINITY_DLL_DECL boss_moroesAI : public ScriptedAI if (Blind_Timer <= diff) { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, m_creature->GetMeleeReach()*5, true); - if (target && m_creature->IsWithinMeleeRange(target)) + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, m_creature->GetMeleeReach()*5, true); + if (pTarget && m_creature->IsWithinMeleeRange(pTarget)) { - DoCast(target, SPELL_BLIND); + DoCast(pTarget, SPELL_BLIND); Blind_Timer = 40000; - } else Blind_Timer = 1000 + diff; // if target is out of melee range, wait a bit. + } else Blind_Timer = 1000 + diff; // if pTarget is out of melee range, wait a bit. } else Blind_Timer -= diff; } @@ -286,8 +286,8 @@ struct TRINITY_DLL_DECL boss_moroesAI : public ScriptedAI { DoScriptText(RAND(SAY_SPECIAL_1,SAY_SPECIAL_2), m_creature); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - target->CastSpell(target, SPELL_GARROTE,true); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + pTarget->CastSpell(pTarget, SPELL_GARROTE,true); InVanish = false; } else Wait_Timer -= diff; @@ -398,17 +398,17 @@ struct TRINITY_DLL_DECL boss_baroness_dorothea_millstipeAI : public boss_moroes_ if (ManaBurn_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - if (target->getPowerType() == POWER_MANA) - DoCast(target,SPELL_MANABURN); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (pTarget->getPowerType() == POWER_MANA) + DoCast(pTarget,SPELL_MANABURN); ManaBurn_Timer = 5000; // 3 sec cast } else ManaBurn_Timer -= diff; if (ShadowWordPain_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { - DoCast(target,SPELL_SWPAIN); + DoCast(pTarget,SPELL_SWPAIN); ShadowWordPain_Timer = 7000; } } else ShadowWordPain_Timer -= diff; @@ -507,9 +507,9 @@ struct TRINITY_DLL_DECL boss_lady_catriona_von_indiAI : public boss_moroes_guest if (GreaterHeal_Timer <= diff) { - Unit* target = SelectGuestTarget(); + Unit *pTarget = SelectGuestTarget(); - DoCast(target, SPELL_GREATERHEAL); + DoCast(pTarget, SPELL_GREATERHEAL); GreaterHeal_Timer = 17000; } else GreaterHeal_Timer -= diff; @@ -521,8 +521,8 @@ struct TRINITY_DLL_DECL boss_lady_catriona_von_indiAI : public boss_moroes_guest if (DispelMagic_Timer <= diff) { - if (Unit* target = RAND(SelectGuestTarget(), SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))) - DoCast(target, SPELL_DISPELMAGIC); + if (Unit *pTarget = RAND(SelectGuestTarget(), SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))) + DoCast(pTarget, SPELL_DISPELMAGIC); DispelMagic_Timer = 25000; } else DispelMagic_Timer -= diff; @@ -571,26 +571,26 @@ struct TRINITY_DLL_DECL boss_lady_keira_berrybuckAI : public boss_moroes_guestAI if (HolyLight_Timer <= diff) { - Unit* target = SelectGuestTarget(); + Unit *pTarget = SelectGuestTarget(); - DoCast(target, SPELL_HOLYLIGHT); + DoCast(pTarget, SPELL_HOLYLIGHT); HolyLight_Timer = 10000; } else HolyLight_Timer -= diff; if (GreaterBless_Timer <= diff) { - Unit* target = SelectGuestTarget(); + Unit *pTarget = SelectGuestTarget(); - DoCast(target, SPELL_GREATERBLESSOFMIGHT); + DoCast(pTarget, SPELL_GREATERBLESSOFMIGHT); GreaterBless_Timer = 50000; } else GreaterBless_Timer -= diff; if (Cleanse_Timer <= diff) { - Unit* target = SelectGuestTarget(); + Unit *pTarget = SelectGuestTarget(); - DoCast(target, SPELL_CLEANSE); + DoCast(pTarget, SPELL_CLEANSE); Cleanse_Timer = 10000; } else Cleanse_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_netherspite.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_netherspite.cpp index e5e2a2494a9..d5c3fa987dc 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_netherspite.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_netherspite.cpp @@ -90,9 +90,9 @@ struct TRINITY_DLL_DECL boss_netherspiteAI : public ScriptedAI uint64 BeamerGUID[3]; // guid's of auxiliary beaming portals uint64 BeamTarget[3]; // guid's of portals' current targets - bool IsBetween(WorldObject* u1, WorldObject* target, WorldObject* u2) // the in-line checker + bool IsBetween(WorldObject* u1, WorldObject *pTarget, WorldObject* u2) // the in-line checker { - if(!u1 || !u2 || !target) + if(!u1 || !u2 || !pTarget) return false; float xn, yn, xp, yp, xh, yh; @@ -100,10 +100,10 @@ struct TRINITY_DLL_DECL boss_netherspiteAI : public ScriptedAI yn = u1->GetPositionY(); xp = u2->GetPositionX(); yp = u2->GetPositionY(); - xh = target->GetPositionX(); - yh = target->GetPositionY(); + xh = pTarget->GetPositionX(); + yh = pTarget->GetPositionY(); - // check if target is between (not checking distance from the beam yet) + // check if pTarget is between (not checking distance from the beam yet) if(dist(xn,yn,xh,yh)>=dist(xn,yn,xp,yp) || dist(xp,yp,xh,yh)>=dist(xn,yn,xp,yp)) return false; // check distance from the beam @@ -163,7 +163,7 @@ struct TRINITY_DLL_DECL boss_netherspiteAI : public ScriptedAI // the one who's been casted upon before Unit *current = Unit::GetUnit(*portal, BeamTarget[j]); // temporary store for the best suitable beam reciever - Unit *target = m_creature; + Unit *pTarget = m_creature; if(Map* map = m_creature->GetMap()) { @@ -174,41 +174,41 @@ struct TRINITY_DLL_DECL boss_netherspiteAI : public ScriptedAI { Player* p = i->getSource(); if(p && p->isAlive() // alive - && (!target || target->GetDistance2d(portal)>p->GetDistance2d(portal)) // closer than current best + && (!pTarget || pTarget->GetDistance2d(portal)>p->GetDistance2d(portal)) // closer than current best && !p->HasAura(PlayerDebuff[j],0) // not exhausted && !p->HasAura(PlayerBuff[(j+1)%3],0) // not on another beam && !p->HasAura(PlayerBuff[(j+2)%3],0) && IsBetween(m_creature, p, portal)) // on the beam - target = p; + pTarget = p; } } // buff the target - if(target->GetTypeId() == TYPEID_PLAYER) - target->AddAura(PlayerBuff[j], target); + if(pTarget->GetTypeId() == TYPEID_PLAYER) + pTarget->AddAura(PlayerBuff[j], pTarget); else - target->AddAura(NetherBuff[j], target); - // cast visual beam on the chosen target if switched - // simple target switching isn't working -> using BeamerGUID to cast (workaround) - if(!current || target != current) + pTarget->AddAura(NetherBuff[j], pTarget); + // cast visual beam on the chosen pTarget if switched + // simple pTarget switching isn't working -> using BeamerGUID to cast (workaround) + if(!current || pTarget != current) { - BeamTarget[j] = target->GetGUID(); + BeamTarget[j] = pTarget->GetGUID(); // remove currently beaming portal if(Creature *beamer = Unit::GetCreature(*portal, BeamerGUID[j])) { - beamer->CastSpell(target, PortalBeam[j], false); + beamer->CastSpell(pTarget, PortalBeam[j], false); beamer->DisappearAndDie(); BeamerGUID[j] = 0; } // create new one and start beaming on the target if(Creature *beamer = portal->SummonCreature(PortalID[j],portal->GetPositionX(),portal->GetPositionY(),portal->GetPositionZ(),portal->GetOrientation(),TEMPSUMMON_TIMED_DESPAWN,60000)) { - beamer->CastSpell(target, PortalBeam[j], false); + beamer->CastSpell(pTarget, PortalBeam[j], false); BeamerGUID[j] = beamer->GetGUID(); } } - // aggro target if Red Beam - if(j==RED_PORTAL && m_creature->getVictim() != target && target->GetTypeId() == TYPEID_PLAYER) - m_creature->getThreatManager().addThreat(target, 100000.0f+DoGetThreat(m_creature->getVictim())); + // aggro pTarget if Red Beam + if(j==RED_PORTAL && m_creature->getVictim() != pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) + m_creature->getThreatManager().addThreat(pTarget, 100000.0f+DoGetThreat(m_creature->getVictim())); } } @@ -270,12 +270,12 @@ struct TRINITY_DLL_DECL boss_netherspiteAI : public ScriptedAI } else VoidZoneTimer -= diff; // NetherInfusion Berserk - if(!Berserk && NetherInfusionTimer < diff) + if (!Berserk && NetherInfusionTimer <= diff) { m_creature->AddAura(SPELL_NETHER_INFUSION, m_creature); DoCast(m_creature, SPELL_NETHERSPITE_ROAR); Berserk = true; - }else NetherInfusionTimer -= diff; + } else NetherInfusionTimer -= diff; if(PortalPhase) // PORTAL PHASE { @@ -308,8 +308,8 @@ struct TRINITY_DLL_DECL boss_netherspiteAI : public ScriptedAI // Netherbreath if (NetherbreathTimer <= diff) { - if(Unit* target = SelectTarget(SELECT_TARGET_RANDOM,0,40,true)) - DoCast(target,SPELL_NETHERBREATH); + if(Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,40,true)) + DoCast(pTarget,SPELL_NETHERBREATH); NetherbreathTimer = urand(5000,7000); } else NetherbreathTimer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_nightbane.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_nightbane.cpp index 9ac5d88cd19..84a0ef601fc 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_nightbane.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_nightbane.cpp @@ -309,23 +309,23 @@ struct TRINITY_DLL_DECL boss_nightbaneAI : public ScriptedAI if (CharredEarthTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(target,SPELL_CHARRED_EARTH); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(pTarget,SPELL_CHARRED_EARTH); CharredEarthTimer = 20000; } else CharredEarthTimer -= diff; if (TailSweepTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - if (!m_creature->HasInArc(M_PI, target)) - DoCast(target,SPELL_TAIL_SWEEP); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (!m_creature->HasInArc(M_PI, pTarget)) + DoCast(pTarget,SPELL_TAIL_SWEEP); TailSweepTimer = 15000; } else TailSweepTimer -= diff; if (SearingCindersTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(target,SPELL_SEARING_CINDERS); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(pTarget,SPELL_SEARING_CINDERS); SearingCindersTimer = 10000; } else SearingCindersTimer -= diff; @@ -367,8 +367,8 @@ struct TRINITY_DLL_DECL boss_nightbaneAI : public ScriptedAI if (DistractingAshTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(target,SPELL_DISTRACTING_ASH); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(pTarget,SPELL_DISTRACTING_ASH); DistractingAshTimer = 2000; //timer wrong } else DistractingAshTimer -= diff; } @@ -384,8 +384,8 @@ struct TRINITY_DLL_DECL boss_nightbaneAI : public ScriptedAI if (FireballBarrageTimer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_FARTHEST, 0)) - DoCast(target,SPELL_FIREBALL_BARRAGE); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_FARTHEST, 0)) + DoCast(pTarget,SPELL_FIREBALL_BARRAGE); FireballBarrageTimer = 20000; } else FireballBarrageTimer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp index 17fbd03a9e1..9334420d1e3 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp @@ -288,15 +288,15 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI if (!t_list.size()) return; - //begin + 1 , so we don't target the one with the highest threat + //begin + 1 , so we don't pTarget the one with the highest threat std::list<HostilReference *>::iterator itr = t_list.begin(); std::advance(itr, 1); for (; itr!= t_list.end(); ++itr) //store the threat list in a different container { - Unit *target = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); + Unit *pTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); //only on alive players - if (target && target->isAlive() && target->GetTypeId() == TYPEID_PLAYER) - targets.push_back(target); + if (pTarget && pTarget->isAlive() && pTarget->GetTypeId() == TYPEID_PLAYER) + targets.push_back(pTarget); } //cut down to size if we have more than 5 targets @@ -306,14 +306,14 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI int i = 0; for (std::vector<Unit *>::iterator iter = targets.begin(); iter!= targets.end(); ++iter, ++i) { - Unit *target = *iter; - if (target) + Unit *pTarget = *iter; + if (pTarget) { - enfeeble_targets[i] = target->GetGUID(); - enfeeble_health[i] = target->GetHealth(); + enfeeble_targets[i] = pTarget->GetGUID(); + enfeeble_health[i] = pTarget->GetHealth(); - target->CastSpell(target, SPELL_ENFEEBLE, true, 0, 0, m_creature->GetGUID()); - target->SetHealth(1); + pTarget->CastSpell(pTarget, SPELL_ENFEEBLE, true, 0, 0, m_creature->GetGUID()); + pTarget->SetHealth(1); } } @@ -323,9 +323,9 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI { for (uint8 i = 0; i < 5; ++i) { - Unit *target = Unit::GetUnit(*m_creature, enfeeble_targets[i]); - if (target && target->isAlive()) - target->SetHealth(enfeeble_health[i]); + Unit *pTarget = Unit::GetUnit(*m_creature, enfeeble_targets[i]); + if (pTarget && pTarget->isAlive()) + pTarget->SetHealth(enfeeble_health[i]); enfeeble_targets[i] = 0; enfeeble_health[i] = 0; } @@ -372,7 +372,7 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI { EnfeebleResetHealth(); EnfeebleResetTimer=0; - }else EnfeebleResetTimer -= diff; + } else EnfeebleResetTimer -= diff; if (m_creature->hasUnitState(UNIT_STAT_STUNNED)) //While shifting to phase 2 malchezaar stuns himself return; @@ -430,7 +430,7 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI DoScriptText(SAY_AXE_TOSS2, m_creature); - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); for (uint8 i = 0; i < 2; ++i) { Creature *axe = m_creature->SummonCreature(MALCHEZARS_AXE, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000); @@ -439,12 +439,12 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI axe->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); axe->setFaction(m_creature->getFaction()); axes[i] = axe->GetGUID(); - if (target) + if (pTarget) { - axe->AI()->AttackStart(target); - // axe->getThreatManager().tauntApply(target); //Taunt Apply and fade out does not work properly + axe->AI()->AttackStart(pTarget); + // axe->getThreatManager().tauntApply(pTarget); //Taunt Apply and fade out does not work properly // So we'll use a hack to add a lot of threat to our target - axe->AddThreat(target, 10000000.0f); + axe->AddThreat(pTarget, 10000000.0f); } } } @@ -475,7 +475,7 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI { AxesTargetSwitchTimer = urand(7500,20000); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { for (uint8 i = 0; i < 2; ++i) { @@ -484,10 +484,10 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI float threat = 1000000.0f; if (axe->getVictim()) DoModifyThreatPercent(axe->getVictim(), -100); - if (target) - axe->AddThreat(target, threat); + if (pTarget) + axe->AddThreat(pTarget, threat); //axe->getThreatManager().tauntFadeOut(axe->getVictim()); - //axe->getThreatManager().tauntApply(target); + //axe->getThreatManager().tauntApply(pTarget); } } } @@ -495,8 +495,8 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI if (AmplifyDamageTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(target, SPELL_AMPLIFY_DAMAGE); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(pTarget, SPELL_AMPLIFY_DAMAGE); AmplifyDamageTimer = urand(20000,30000); } else AmplifyDamageTimer -= diff; } @@ -518,17 +518,17 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI { if (SWPainTimer <= diff) { - Unit* target = NULL; + Unit *pTarget = NULL; if (phase == 1) - target = m_creature->getVictim(); // the tank + pTarget = m_creature->getVictim(); // the tank else // anyone but the tank - target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); - if (target) - DoCast(target, SPELL_SW_PAIN); + if (pTarget) + DoCast(pTarget, SPELL_SW_PAIN); SWPainTimer = 20000; - }else SWPainTimer -= diff; + } else SWPainTimer -= diff; } if (phase != 3) diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp index 6b555a2ecba..c03afc3f0eb 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp @@ -183,10 +183,10 @@ struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI //store the threat list in a different container for (std::list<HostilReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { - Unit *target = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); + Unit *pTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); //only on alive players - if (target && target->isAlive() && target->GetTypeId() == TYPEID_PLAYER) - targets.push_back(target); + if (pTarget && pTarget->isAlive() && pTarget->GetTypeId() == TYPEID_PLAYER) + targets.push_back(pTarget); } //cut down to size if we have more than 3 targets @@ -221,7 +221,7 @@ struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_LIBRARY_DOOR), false); CloseDoorTimer = 0; } - }else CloseDoorTimer -= diff; + } else CloseDoorTimer -= diff; } //Cooldowns for casts @@ -295,9 +295,8 @@ struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI { if (!m_creature->IsNonMeleeSpellCasted(false)) { - Unit* target = NULL; - target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); - if (!target) + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + if (!pTarget) return; uint32 Spells[3]; @@ -324,7 +323,7 @@ struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI if (AvailableSpells) { CurrentNormalSpell = Spells[rand() % AvailableSpells]; - DoCast(target, CurrentNormalSpell); + DoCast(pTarget, CurrentNormalSpell); } } NormalCastTimer = 1000; @@ -365,16 +364,12 @@ struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI break; } - LastSuperSpell = Available[rand()%2]; + LastSuperSpell = Available[urand(0,1)]; switch (LastSuperSpell) { case SUPER_AE: - - if (rand()%2) - DoScriptText(SAY_EXPLOSION1, m_creature); - else - DoScriptText(SAY_EXPLOSION2, m_creature); + DoScriptText(RAND(SAY_EXPLOSION1,SAY_EXPLOSION2), m_creature); m_creature->CastSpell(m_creature, SPELL_BLINK_CENTER, true); m_creature->CastSpell(m_creature, SPELL_PLAYERPULL, true); @@ -383,10 +378,7 @@ struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI break; case SUPER_FLAME: - if (rand()%2) - DoScriptText(SAY_FLAMEWREATH1, m_creature); - else - DoScriptText(SAY_FLAMEWREATH2, m_creature); + DoScriptText(RAND(SAY_FLAMEWREATH1,SAY_FLAMEWREATH2), m_creature); FlameWreathTimer = 20000; FlameWreathCheckTime = 500; @@ -399,11 +391,7 @@ struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI break; case SUPER_BLIZZARD: - - if (rand()%2) - DoScriptText(SAY_BLIZZARD1, m_creature); - else - DoScriptText(SAY_BLIZZARD2, m_creature); + DoScriptText(RAND(SAY_BLIZZARD1,SAY_BLIZZARD2), m_creature); if (Creature* pSpawn = m_creature->SummonCreature(CREATURE_ARAN_BLIZZARD, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 25000)) { @@ -413,8 +401,8 @@ struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI break; } - SuperCastTimer = 35000 + (rand()%5000); - }else SuperCastTimer -= diff; + SuperCastTimer = urand(35000,40000); + } else SuperCastTimer -= diff; if (!ElementalsSpawned && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 40) { @@ -446,7 +434,7 @@ struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI DoScriptText(SAY_TIMEOVER, m_creature); BerserkTimer = 60000; - }else BerserkTimer -= diff; + } else BerserkTimer -= diff; //Flame Wreath check if (FlameWreathTimer) @@ -471,7 +459,7 @@ struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI } } FlameWreathCheckTime = 500; - }else FlameWreathCheckTime -= diff; + } else FlameWreathCheckTime -= diff; } if (ArcaneCooldown && FireCooldown && FrostCooldown) 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 2a6eebe0e69..e117771bb3a 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 @@ -45,7 +45,7 @@ EndScriptData */ #define SPELL_FIENDISH_PORTAL 30171 // Opens portal and summons Fiendish Portal, 2 sec cast #define SPELL_FIENDISH_PORTAL_1 30179 // Opens portal and summons Fiendish Portal, instant cast -#define SPELL_FIREBOLT 30050 // Blasts a target for 150 Fire damage. +#define SPELL_FIREBOLT 30050 // Blasts a pTarget for 150 Fire damage. #define SPELL_BROKEN_PACT 30065 // All damage taken increased by 25%. #define SPELL_AMPLIFY_FLAMES 30053 // Increases the Fire damage taken by an enemy by 500 for 25 sec. @@ -93,7 +93,7 @@ struct TRINITY_DLL_DECL mob_kilrekAI : public ScriptedAI if (Terestian && Terestian->isAlive()) DoCast(Terestian, SPELL_BROKEN_PACT, true); } - }else ERROR_INST_DATA(m_creature); + } else ERROR_INST_DATA(m_creature); } void UpdateAI(const uint32 diff) @@ -108,7 +108,7 @@ struct TRINITY_DLL_DECL mob_kilrekAI : public ScriptedAI DoCast(m_creature->getVictim(),SPELL_AMPLIFY_FLAMES); AmplifyTimer = urand(10000,20000); - }else AmplifyTimer -= diff; + } else AmplifyTimer -= diff; DoMeleeAttackIfReady(); } @@ -277,15 +277,15 @@ struct TRINITY_DLL_DECL boss_terestianAI : public ScriptedAI if (SacrificeTimer <= diff) { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); - if (target && target->isAlive()) + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); + if (pTarget && pTarget->isAlive()) { - DoCast(target, SPELL_SACRIFICE, true); - DoCast(target, SPELL_SUMMON_DEMONCHAINS, true); + DoCast(pTarget, SPELL_SACRIFICE, true); + DoCast(pTarget, SPELL_SUMMON_DEMONCHAINS, true); if (Creature* Chains = m_creature->FindNearestCreature(CREATURE_DEMONCHAINS, 5000)) { - CAST_AI(mob_demon_chainAI, Chains->AI())->SacrificeGUID = target->GetGUID(); + CAST_AI(mob_demon_chainAI, Chains->AI())->SacrificeGUID = pTarget->GetGUID(); Chains->CastSpell(Chains, SPELL_DEMON_CHAINS, true); DoScriptText(RAND(SAY_SACRIFICE1,SAY_SACRIFICE2), m_creature); SacrificeTimer = 30000; @@ -328,7 +328,7 @@ struct TRINITY_DLL_DECL boss_terestianAI : public ScriptedAI } }; -#define SPELL_FIREBOLT 30050 // Blasts a target for 181-209 Fire damage. +#define SPELL_FIREBOLT 30050 // Blasts a pTarget for 181-209 Fire damage. struct TRINITY_DLL_DECL mob_fiendish_impAI : public ScriptedAI { diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/bosses_opera.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/bosses_opera.cpp index 3bc4d73bd21..ce47f57a3be 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/bosses_opera.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/bosses_opera.cpp @@ -352,8 +352,8 @@ struct TRINITY_DLL_DECL boss_strawmanAI : public ScriptedAI if (BrainWipeTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(target, SPELL_BRAIN_WIPE); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(pTarget, SPELL_BRAIN_WIPE); BrainWipeTimer = 20000; } else BrainWipeTimer -= diff; @@ -528,7 +528,7 @@ struct TRINITY_DLL_DECL boss_roarAI : public ScriptedAI { m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); AggroTimer = 0; - }else AggroTimer -= diff; + } else AggroTimer -= diff; } if (!UpdateVictim()) @@ -800,15 +800,15 @@ struct TRINITY_DLL_DECL boss_bigbadwolfAI : public ScriptedAI { if (!IsChasing) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { DoScriptText(SAY_WOLF_HOOD, m_creature); - DoCast(target, SPELL_LITTLE_RED_RIDING_HOOD, true); - TempThreat = DoGetThreat(target); + DoCast(pTarget, SPELL_LITTLE_RED_RIDING_HOOD, true); + TempThreat = DoGetThreat(pTarget); if (TempThreat) - DoModifyThreatPercent(target, -100); - HoodGUID = target->GetGUID(); - m_creature->AddThreat(target, 1000000.0f); + DoModifyThreatPercent(pTarget, -100); + HoodGUID = pTarget->GetGUID(); + m_creature->AddThreat(pTarget, 1000000.0f); ChaseTimer = 20000; IsChasing = true; } @@ -817,12 +817,12 @@ struct TRINITY_DLL_DECL boss_bigbadwolfAI : public ScriptedAI { IsChasing = false; - if (Unit* target = Unit::GetUnit((*m_creature), HoodGUID)) + if (Unit *pTarget = Unit::GetUnit((*m_creature), HoodGUID)) { HoodGUID = 0; - if (DoGetThreat(target)) - DoModifyThreatPercent(target, -100); - m_creature->AddThreat(target, TempThreat); + if (DoGetThreat(pTarget)) + DoModifyThreatPercent(pTarget, -100); + m_creature->AddThreat(pTarget, TempThreat); TempThreat = 0; } @@ -911,19 +911,19 @@ void PretendToDie(Creature* pCreature) pCreature->SetStandState(UNIT_STAND_STATE_DEAD); }; -void Resurrect(Creature* target) +void Resurrect(Creature *pTarget) { - target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - target->SetHealth(target->GetMaxHealth()); - target->SetStandState(UNIT_STAND_STATE_STAND); - target->CastSpell(target, SPELL_RES_VISUAL, true); - if (target->getVictim()) + pTarget->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + pTarget->SetHealth(pTarget->GetMaxHealth()); + pTarget->SetStandState(UNIT_STAND_STATE_STAND); + pTarget->CastSpell(pTarget, SPELL_RES_VISUAL, true); + if (pTarget->getVictim()) { - target->GetMotionMaster()->MoveChase(target->getVictim()); - target->AI()->AttackStart(target->getVictim()); + pTarget->GetMotionMaster()->MoveChase(pTarget->getVictim()); + pTarget->AI()->AttackStart(pTarget->getVictim()); } else - target->GetMotionMaster()->Initialize(); + pTarget->GetMotionMaster()->Initialize(); }; struct TRINITY_DLL_DECL boss_julianneAI : public ScriptedAI @@ -1253,7 +1253,7 @@ void boss_julianneAI::UpdateAI(const uint32 diff) { DoScriptText(SAY_JULIANNE_ENTER, m_creature); EntryYellTimer = 0; - }else EntryYellTimer -= diff; + } else EntryYellTimer -= diff; } if (AggroYellTimer) @@ -1264,7 +1264,7 @@ void boss_julianneAI::UpdateAI(const uint32 diff) m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); m_creature->setFaction(16); AggroYellTimer = 0; - }else AggroYellTimer -= diff; + } else AggroYellTimer -= diff; } if (DrinkPoisonTimer) @@ -1276,7 +1276,7 @@ void boss_julianneAI::UpdateAI(const uint32 diff) Phase = PHASE_ROMULO; SummonRomuloTimer = 10000; DrinkPoisonTimer = 0; - }else DrinkPoisonTimer -= diff; + } else DrinkPoisonTimer -= diff; } if (Phase == PHASE_ROMULO && !SummonedRomulo) @@ -1309,7 +1309,7 @@ void boss_julianneAI::UpdateAI(const uint32 diff) ResurrectSelfTimer = 0; ResurrectTimer = 1000; - }else ResurrectSelfTimer -= diff; + } else ResurrectSelfTimer -= diff; } if (!UpdateVictim() || IsFakingDeath) @@ -1333,8 +1333,8 @@ void boss_julianneAI::UpdateAI(const uint32 diff) if (BlindingPassionTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(target, SPELL_BLINDING_PASSION); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(pTarget, SPELL_BLINDING_PASSION); BlindingPassionTimer = urand(30000,45000); } else BlindingPassionTimer -= diff; @@ -1388,10 +1388,10 @@ void boss_romuloAI::UpdateAI(const uint32 diff) if (BackwardLungeTimer <= diff) { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); - if (target && !m_creature->HasInArc(M_PI, target)) + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); + if (pTarget && !m_creature->HasInArc(M_PI, pTarget)) { - DoCast(target, SPELL_BACKWARD_LUNGE); + DoCast(pTarget, SPELL_BACKWARD_LUNGE); BackwardLungeTimer = urand(15000,30000); } } else BackwardLungeTimer -= diff; @@ -1404,8 +1404,8 @@ void boss_romuloAI::UpdateAI(const uint32 diff) if (DeadlySwatheTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(target, SPELL_DEADLY_SWATHE); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(pTarget, SPELL_DEADLY_SWATHE); DeadlySwatheTimer = urand(15000,25000); } else DeadlySwatheTimer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp index f599799989d..863abc53be9 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp @@ -273,7 +273,7 @@ struct TRINITY_DLL_DECL boss_felblood_kaelthasAI : public ScriptedAI // *Heroic mode only: if (Heroic) { - if (PyroblastTimer < diff) + if (PyroblastTimer <= diff) { m_creature->InterruptSpell(CURRENT_CHANNELED_SPELL); m_creature->InterruptSpell(CURRENT_GENERIC_SPELL); @@ -283,18 +283,18 @@ struct TRINITY_DLL_DECL boss_felblood_kaelthasAI : public ScriptedAI } else PyroblastTimer -= diff; } - if (FireballTimer < diff) + if (FireballTimer <= diff) { DoCast(m_creature->getVictim(), Heroic ? SPELL_FIREBALL_HEROIC : SPELL_FIREBALL_NORMAL); FireballTimer = urand(2000,6000); } else FireballTimer -= diff; - if (PhoenixTimer < diff) + if (PhoenixTimer <= diff) { - Unit* target = SelectUnit(SELECT_TARGET_RANDOM,1); + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,1); - uint32 random = rand()%2 + 1; + uint8 random = urand(1,2); float x = KaelLocations[random][0]; float y = KaelLocations[random][1]; @@ -303,25 +303,25 @@ struct TRINITY_DLL_DECL boss_felblood_kaelthasAI : public ScriptedAI { Phoenix->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE + UNIT_FLAG_NON_ATTACKABLE); SetThreatList(Phoenix); - Phoenix->AI()->AttackStart(target); + Phoenix->AI()->AttackStart(pTarget); } DoScriptText(SAY_PHOENIX, m_creature); PhoenixTimer = 60000; - }else PhoenixTimer -= diff; + } else PhoenixTimer -= diff; - if (FlameStrikeTimer < diff) + if (FlameStrikeTimer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { m_creature->InterruptSpell(CURRENT_CHANNELED_SPELL); m_creature->InterruptSpell(CURRENT_GENERIC_SPELL); - DoCast(target, SPELL_FLAMESTRIKE3, true); + DoCast(pTarget, SPELL_FLAMESTRIKE3, true); DoScriptText(SAY_FLAMESTRIKE, m_creature); } - FlameStrikeTimer = 15000 + rand()%10000; - }else FlameStrikeTimer -= diff; + FlameStrikeTimer = urand(15000,25000); + } else FlameStrikeTimer -= diff; // Below 50% if (m_creature->GetMaxHealth() * 0.5 > m_creature->GetHealth()) @@ -341,7 +341,7 @@ struct TRINITY_DLL_DECL boss_felblood_kaelthasAI : public ScriptedAI case 1: { - if (GravityLapseTimer < diff) + if (GravityLapseTimer <= diff) { switch(GravityLapsePhase) { @@ -385,15 +385,15 @@ struct TRINITY_DLL_DECL boss_felblood_kaelthasAI : public ScriptedAI for (uint8 i = 0; i < 3; ++i) { - Unit* target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM,0); + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); Creature* Orb = DoSpawnCreature(CREATURE_ARCANE_SPHERE, 5, 5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30000); - if (Orb && target) + if (Orb && pTarget) { //SetThreatList(Orb); - Orb->AddThreat(target, 1.0f); - Orb->AI()->AttackStart(target); + Orb->AddThreat(pTarget, 1.0f); + Orb->AI()->AttackStart(pTarget); } } @@ -410,7 +410,7 @@ struct TRINITY_DLL_DECL boss_felblood_kaelthasAI : public ScriptedAI GravityLapsePhase = 0; break; } - }else GravityLapseTimer -= diff; + } else GravityLapseTimer -= diff; } break; } @@ -441,7 +441,7 @@ struct TRINITY_DLL_DECL mob_felkael_flamestrikeAI : public ScriptedAI void MoveInLineOfSight(Unit *who) {} void UpdateAI(const uint32 diff) { - if (FlameStrikeTimer < diff) + if (FlameStrikeTimer <= diff) { DoCast(m_creature, Heroic ? SPELL_FLAMESTRIKE1_HEROIC : SPELL_FLAMESTRIKE1_NORMAL, true); m_creature->Kill(m_creature); @@ -532,13 +532,12 @@ struct TRINITY_DLL_DECL mob_felkael_phoenixAI : public ScriptedAI if (Rebirth) { - if (Death_Timer < diff) + if (Death_Timer <= diff) { m_creature->SummonCreature(CREATURE_PHOENIX_EGG, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 45000); - m_creature->setDeathState(JUST_DIED); - m_creature->RemoveCorpse(); + m_creature->DisappearAndDie(); Rebirth = false; - }else Death_Timer -= diff; + } else Death_Timer -= diff; } } @@ -546,10 +545,10 @@ struct TRINITY_DLL_DECL mob_felkael_phoenixAI : public ScriptedAI if (!UpdateVictim()) return; - if (BurnTimer < diff) + if (BurnTimer <= diff) { //spell Burn should possible do this, but it doesn't, so do this for now. - uint32 dmg = urand(1650,2050); + uint16 dmg = urand(1650,2050); m_creature->DealDamage(m_creature, dmg, 0, DOT, SPELL_SCHOOL_MASK_FIRE, NULL, false); BurnTimer += 2000; } BurnTimer -= diff; @@ -567,7 +566,6 @@ struct TRINITY_DLL_DECL mob_felkael_phoenix_eggAI : public ScriptedAI void Reset() { HatchTimer = 10000; - } void EnterCombat(Unit* who) {} @@ -575,7 +573,7 @@ struct TRINITY_DLL_DECL mob_felkael_phoenix_eggAI : public ScriptedAI void UpdateAI(const uint32 diff) { - if (HatchTimer < diff) + if (HatchTimer <= diff) { m_creature->SummonCreature(CREATURE_PHOENIX, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000); m_creature->Kill(m_creature); @@ -586,7 +584,7 @@ struct TRINITY_DLL_DECL mob_felkael_phoenix_eggAI : public ScriptedAI struct TRINITY_DLL_DECL mob_arcane_sphereAI : public ScriptedAI { - mob_arcane_sphereAI(Creature *c) : ScriptedAI(c) {Reset();} + mob_arcane_sphereAI(Creature *c) : ScriptedAI(c) { Reset(); } uint32 DespawnTimer; uint32 ChangeTargetTimer; @@ -606,21 +604,22 @@ struct TRINITY_DLL_DECL mob_arcane_sphereAI : public ScriptedAI void UpdateAI(const uint32 diff) { - if (DespawnTimer < diff) + if (DespawnTimer <= diff) m_creature->Kill(m_creature); - else DespawnTimer -= diff; + else + DespawnTimer -= diff; //Return since we have no target if (!UpdateVictim()) return; - if (ChangeTargetTimer < diff) + if (ChangeTargetTimer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { - m_creature->AddThreat(target, 1.0f); - m_creature->TauntApply(target); - AttackStart(target); + m_creature->AddThreat(pTarget, 1.0f); + m_creature->TauntApply(pTarget); + AttackStart(pTarget); } ChangeTargetTimer = urand(5000,15000); diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp index b78e1d66fe7..aa3c62b9ad2 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp @@ -246,72 +246,72 @@ struct TRINITY_DLL_DECL boss_priestess_delrissaAI : public ScriptedAI if (HealTimer <= diff) { uint32 health = m_creature->GetHealth(); - Unit* target = m_creature; + Unit *pTarget = m_creature; for (uint8 i = 0; i < MAX_ACTIVE_LACKEY; ++i) { if (Unit* pAdd = Unit::GetUnit(*m_creature, m_auiLackeyGUID[i])) { if (pAdd->isAlive() && pAdd->GetHealth() < health) - target = pAdd; + pTarget = pAdd; } } - DoCast(target, SPELL_FLASH_HEAL); + DoCast(pTarget, SPELL_FLASH_HEAL); HealTimer = 15000; - }else HealTimer -= diff; + } else HealTimer -= diff; if (RenewTimer <= diff) { - Unit* target = m_creature; + Unit *pTarget = m_creature; if (urand(0,1)) if (Unit* pAdd = Unit::GetUnit(*m_creature, m_auiLackeyGUID[rand()%MAX_ACTIVE_LACKEY])) if (pAdd->isAlive()) - target = pAdd; + pTarget = pAdd; - DoCast(target,Heroic ? SPELL_RENEW_HEROIC : SPELL_RENEW_NORMAL); + DoCast(pTarget,Heroic ? SPELL_RENEW_HEROIC : SPELL_RENEW_NORMAL); RenewTimer = 5000; } else RenewTimer -= diff; if (ShieldTimer <= diff) { - Unit* target = m_creature; + Unit *pTarget = m_creature; if (urand(0,1)) if (Unit* pAdd = Unit::GetUnit(*m_creature, m_auiLackeyGUID[rand()%MAX_ACTIVE_LACKEY])) if (pAdd->isAlive() && !pAdd->HasAura(SPELL_SHIELD)) - target = pAdd; + pTarget = pAdd; - DoCast(target, SPELL_SHIELD); + DoCast(pTarget, SPELL_SHIELD); ShieldTimer = 7500; } else ShieldTimer -= diff; if (DispelTimer <= diff) { - Unit* target = NULL; + Unit *pTarget = NULL; bool friendly = false; if (urand(0,1)) - target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); else { friendly = true; if (urand(0,1)) - target = m_creature; + pTarget = m_creature; else if (Unit* pAdd = Unit::GetUnit(*m_creature, m_auiLackeyGUID[rand()%MAX_ACTIVE_LACKEY])) if (pAdd->isAlive()) - target = pAdd; + pTarget = pAdd; } - if (target) - DoCast(target, SPELL_DISPEL_MAGIC); + if (pTarget) + DoCast(pTarget, SPELL_DISPEL_MAGIC); DispelTimer = 12000; } else DispelTimer -= diff; - if (SWPainTimer < diff) + if (SWPainTimer <= diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, Heroic ? SPELL_SW_PAIN_HEROIC : SPELL_SW_PAIN_NORMAL); @@ -754,14 +754,14 @@ struct TRINITY_DLL_DECL boss_yazzaiAI : public boss_priestess_lackey_commonAI boss_priestess_lackey_commonAI::UpdateAI(diff); - if (Polymorph_Timer < diff) + if (Polymorph_Timer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) { - DoCast(target, SPELL_POLYMORPH); + DoCast(pTarget, SPELL_POLYMORPH); Polymorph_Timer = 20000; } - }else Polymorph_Timer -= diff; + } else Polymorph_Timer -= diff; if (((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 35) && !HasIceBlocked) { @@ -769,42 +769,42 @@ struct TRINITY_DLL_DECL boss_yazzaiAI : public boss_priestess_lackey_commonAI HasIceBlocked = true; } - if (Blizzard_Timer < diff) + if (Blizzard_Timer <= diff) { if (Unit* pUnit = SelectUnit(SELECT_TARGET_RANDOM, 0)) DoCast(pUnit, SPELL_BLIZZARD); Blizzard_Timer = 8000; - }else Blizzard_Timer -= diff; + } else Blizzard_Timer -= diff; - if (Ice_Lance_Timer < diff) + if (Ice_Lance_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_ICE_LANCE); Ice_Lance_Timer = 12000; - }else Ice_Lance_Timer -= diff; + } else Ice_Lance_Timer -= diff; - if (Cone_of_Cold_Timer < diff) + if (Cone_of_Cold_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_CONE_OF_COLD); Cone_of_Cold_Timer = 10000; - }else Cone_of_Cold_Timer -= diff; + } else Cone_of_Cold_Timer -= diff; - if (Frostbolt_Timer < diff) + if (Frostbolt_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_FROSTBOLT); Frostbolt_Timer = 8000; - }else Frostbolt_Timer -= diff; + } else Frostbolt_Timer -= diff; - if (Blink_Timer < diff) + if (Blink_Timer <= diff) { bool InMeleeRange = false; std::list<HostilReference*>& t_list = m_creature->getThreatManager().getThreatList(); for (std::list<HostilReference*>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { - if (Unit* target = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid())) + if (Unit *pTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid())) { //if in melee range - if (target->IsWithinDistInMap(m_creature, 5)) + if (pTarget->IsWithinDistInMap(m_creature, 5)) { InMeleeRange = true; break; @@ -817,7 +817,7 @@ struct TRINITY_DLL_DECL boss_yazzaiAI : public boss_priestess_lackey_commonAI DoCast(m_creature, SPELL_BLINK); Blink_Timer = 8000; - }else Blink_Timer -= diff; + } else Blink_Timer -= diff; DoMeleeAttackIfReady(); } @@ -875,16 +875,16 @@ struct TRINITY_DLL_DECL boss_warlord_salarisAI : public boss_priestess_lackey_co boss_priestess_lackey_commonAI::UpdateAI(diff); - if (Intercept_Stun_Timer < diff) + if (Intercept_Stun_Timer <= diff) { bool InMeleeRange = false; std::list<HostilReference*>& t_list = m_creature->getThreatManager().getThreatList(); for (std::list<HostilReference*>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { - if (Unit* target = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid())) + if (Unit *pTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid())) { //if in melee range - if (target->IsWithinDistInMap(m_creature, ATTACK_DISTANCE)) + if (pTarget->IsWithinDistInMap(m_creature, ATTACK_DISTANCE)) { InMeleeRange = true; break; @@ -900,37 +900,37 @@ struct TRINITY_DLL_DECL boss_warlord_salarisAI : public boss_priestess_lackey_co } Intercept_Stun_Timer = 10000; - }else Intercept_Stun_Timer -= diff; + } else Intercept_Stun_Timer -= diff; - if (Disarm_Timer < diff) + if (Disarm_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_DISARM); Disarm_Timer = 6000; - }else Disarm_Timer -= diff; + } else Disarm_Timer -= diff; - if (Hamstring_Timer < diff) + if (Hamstring_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_HAMSTRING); Hamstring_Timer = 4500; - }else Hamstring_Timer -= diff; + } else Hamstring_Timer -= diff; - if (Mortal_Strike_Timer < diff) + if (Mortal_Strike_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_MORTAL_STRIKE); Mortal_Strike_Timer = 4500; - }else Mortal_Strike_Timer -= diff; + } else Mortal_Strike_Timer -= diff; - if (Piercing_Howl_Timer < diff) + if (Piercing_Howl_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_PIERCING_HOWL); Piercing_Howl_Timer = 10000; - }else Piercing_Howl_Timer -= diff; + } else Piercing_Howl_Timer -= diff; - if (Frightening_Shout_Timer < diff) + if (Frightening_Shout_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_FRIGHTENING_SHOUT); Frightening_Shout_Timer = 18000; - }else Frightening_Shout_Timer -= diff; + } else Frightening_Shout_Timer -= diff; DoMeleeAttackIfReady(); } @@ -997,13 +997,13 @@ struct TRINITY_DLL_DECL boss_garaxxasAI : public boss_priestess_lackey_commonAI if (m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE)) { - if (Wing_Clip_Timer < diff) + if (Wing_Clip_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_WING_CLIP); Wing_Clip_Timer = 4000; - }else Wing_Clip_Timer -= diff; + } else Wing_Clip_Timer -= diff; - if (Freezing_Trap_Timer < diff) + if (Freezing_Trap_Timer <= diff) { //attempt find go summoned from spell (casted by m_creature) GameObject* pGo = m_creature->GetGameObject(SPELL_FREEZING_TRAP); @@ -1017,35 +1017,35 @@ struct TRINITY_DLL_DECL boss_garaxxasAI : public boss_priestess_lackey_commonAI DoCast(m_creature->getVictim(), SPELL_FREEZING_TRAP); Freezing_Trap_Timer = 15000; } - }else Freezing_Trap_Timer -= diff; + } else Freezing_Trap_Timer -= diff; DoMeleeAttackIfReady(); } else { - if (Concussive_Shot_Timer < diff) + if (Concussive_Shot_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_CONCUSSIVE_SHOT); Concussive_Shot_Timer = 8000; - }else Concussive_Shot_Timer -= diff; + } else Concussive_Shot_Timer -= diff; - if (Multi_Shot_Timer < diff) + if (Multi_Shot_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_MULTI_SHOT); Multi_Shot_Timer = 10000; - }else Multi_Shot_Timer -= diff; + } else Multi_Shot_Timer -= diff; - if (Aimed_Shot_Timer < diff) + if (Aimed_Shot_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_AIMED_SHOT); Aimed_Shot_Timer = 6000; - }else Aimed_Shot_Timer -= diff; + } else Aimed_Shot_Timer -= diff; - if (Shoot_Timer < diff) + if (Shoot_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_SHOOT); Shoot_Timer = 2500; - }else Shoot_Timer -= diff; + } else Shoot_Timer -= diff; } } }; @@ -1097,20 +1097,20 @@ struct TRINITY_DLL_DECL boss_apokoAI : public boss_priestess_lackey_commonAI boss_priestess_lackey_commonAI::UpdateAI(diff); - if (Totem_Timer < diff) + if (Totem_Timer <= diff) { DoCast(m_creature, RAND(SPELL_WINDFURY_TOTEM,SPELL_FIRE_NOVA_TOTEM,SPELL_EARTHBIND_TOTEM)); ++Totem_Amount; Totem_Timer = Totem_Amount*2000; } else Totem_Timer -= diff; - if (War_Stomp_Timer < diff) + if (War_Stomp_Timer <= diff) { DoCast(m_creature, SPELL_WAR_STOMP); War_Stomp_Timer = 10000; } else War_Stomp_Timer -= diff; - if (Purge_Timer < diff) + if (Purge_Timer <= diff) { if (Unit* pUnit = SelectUnit(SELECT_TARGET_RANDOM, 0)) DoCast(pUnit, SPELL_PURGE); @@ -1118,13 +1118,13 @@ struct TRINITY_DLL_DECL boss_apokoAI : public boss_priestess_lackey_commonAI Purge_Timer = 15000; } else Purge_Timer -= diff; - if (Frost_Shock_Timer < diff) + if (Frost_Shock_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_FROST_SHOCK); Frost_Shock_Timer = 7000; } else Frost_Shock_Timer -= diff; - if (Healing_Wave_Timer < diff) + if (Healing_Wave_Timer <= diff) { // std::vector<Add*>::iterator itr = Group.begin() + rand()%Group.size(); // uint64 guid = (*itr)->guid; @@ -1187,25 +1187,25 @@ struct TRINITY_DLL_DECL boss_zelfanAI : public boss_priestess_lackey_commonAI boss_priestess_lackey_commonAI::UpdateAI(diff); - if (Goblin_Dragon_Gun_Timer < diff) + if (Goblin_Dragon_Gun_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_GOBLIN_DRAGON_GUN); Goblin_Dragon_Gun_Timer = 10000; - }else Goblin_Dragon_Gun_Timer -= diff; + } else Goblin_Dragon_Gun_Timer -= diff; - if (Rocket_Launch_Timer < diff) + if (Rocket_Launch_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_ROCKET_LAUNCH); Rocket_Launch_Timer = 9000; - }else Rocket_Launch_Timer -= diff; + } else Rocket_Launch_Timer -= diff; - if (Fel_Iron_Bomb_Timer < diff) + if (Fel_Iron_Bomb_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_FEL_IRON_BOMB); Fel_Iron_Bomb_Timer = 15000; - }else Fel_Iron_Bomb_Timer -= diff; + } else Fel_Iron_Bomb_Timer -= diff; - if (Recombobulate_Timer < diff) + if (Recombobulate_Timer <= diff) { for (uint8 i = 0; i < MAX_ACTIVE_LACKEY; ++i) { @@ -1219,13 +1219,13 @@ struct TRINITY_DLL_DECL boss_zelfanAI : public boss_priestess_lackey_commonAI } } Recombobulate_Timer = 2000; - }else Recombobulate_Timer -= diff; + } else Recombobulate_Timer -= diff; - if (High_Explosive_Sheep_Timer < diff) + if (High_Explosive_Sheep_Timer <= diff) { DoCast(m_creature, SPELL_HIGH_EXPLOSIVE_SHEEP); High_Explosive_Sheep_Timer = 65000; - }else High_Explosive_Sheep_Timer -= diff; + } else High_Explosive_Sheep_Timer -= diff; DoMeleeAttackIfReady(); } @@ -1253,7 +1253,7 @@ CreatureAI* GetAI_zelfan(Creature* pCreature) // // void UpdateAI(const uint32 diff) // { -// if (Explosion_Timer < diff) +// if (Explosion_Timer <= diff) // { // DoCast(m_creature->getVictim(), SPELL_SHEEP_EXPLOSION); // }else diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp index 80fc1fb48cd..d9fb4c5e7ce 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp @@ -110,7 +110,7 @@ struct TRINITY_DLL_DECL boss_selin_fireheartAI : public ScriptedAI // Small door opened after event are expected to be closed by default // Set Inst data for encounter pInstance->SetData(DATA_SELIN_EVENT, NOT_STARTED); - }else error_log(ERROR_INST_DATA); + } else error_log(ERROR_INST_DATA); DrainLifeTimer = 3000 + rand()%4000; DrainManaTimer = DrainLifeTimer + 5000; @@ -239,7 +239,7 @@ struct TRINITY_DLL_DECL boss_selin_fireheartAI : public ScriptedAI uint32 maxPowerMana = m_creature->GetMaxPower(POWER_MANA); if (maxPowerMana && ((m_creature->GetPower(POWER_MANA)*100 / maxPowerMana) < 10)) { - if (DrainLifeTimer < diff) + if (DrainLifeTimer <= diff) { DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_DRAIN_LIFE); DrainLifeTimer = 10000; @@ -248,7 +248,7 @@ struct TRINITY_DLL_DECL boss_selin_fireheartAI : public ScriptedAI // Heroic only if (Heroic) { - if (DrainManaTimer < diff) + if (DrainManaTimer <= diff) { DoCast(SelectUnit(SELECT_TARGET_RANDOM, 1), SPELL_DRAIN_MANA); DrainManaTimer = 10000; @@ -256,7 +256,7 @@ struct TRINITY_DLL_DECL boss_selin_fireheartAI : public ScriptedAI } } - if (FelExplosionTimer < diff) + if (FelExplosionTimer <= diff) { if (!m_creature->IsNonMeleeSpellCasted(false)) { @@ -269,7 +269,7 @@ struct TRINITY_DLL_DECL boss_selin_fireheartAI : public ScriptedAI maxPowerMana = m_creature->GetMaxPower(POWER_MANA); if (maxPowerMana && ((m_creature->GetPower(POWER_MANA)*100 / maxPowerMana) < 10)) { - if (DrainCrystalTimer < diff) + if (DrainCrystalTimer <= diff) { SelectNearestCrystal(); if (Heroic) DrainCrystalTimer = 10000 + rand()%5000; @@ -281,7 +281,7 @@ struct TRINITY_DLL_DECL boss_selin_fireheartAI : public ScriptedAI { if (IsDraining) { - if (EmpowerTimer < diff) + if (EmpowerTimer <= diff) { IsDraining = false; DrainingCrystal = false; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_vexallus.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_vexallus.cpp index 18cdea3680a..4b337a42627 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_vexallus.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_vexallus.cpp @@ -151,31 +151,31 @@ struct TRINITY_DLL_DECL boss_vexallusAI : public ScriptedAI m_creature->SummonCreature(NPC_PURE_ENERGY, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0); } - if (ChainLightningTimer < diff) + if (ChainLightningTimer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(target, Heroic ? SPELL_H_CHAIN_LIGHTNING : SPELL_CHAIN_LIGHTNING); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, Heroic ? SPELL_H_CHAIN_LIGHTNING : SPELL_CHAIN_LIGHTNING); ChainLightningTimer = 8000; - }else ChainLightningTimer -= diff; + } else ChainLightningTimer -= diff; - if (ArcaneShockTimer < diff) + if (ArcaneShockTimer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) - if (target) - DoCast(target, Heroic ? SPELL_H_ARCANE_SHOCK : SPELL_ARCANE_SHOCK); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + if (pTarget) + DoCast(pTarget, Heroic ? SPELL_H_ARCANE_SHOCK : SPELL_ARCANE_SHOCK); ArcaneShockTimer = 8000; - }else ArcaneShockTimer -= diff; + } else ArcaneShockTimer -= diff; } else { - if (OverloadTimer < diff) + if (OverloadTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_OVERLOAD); OverloadTimer = 2000; - }else OverloadTimer -= diff; + } else OverloadTimer -= diff; } DoMeleeAttackIfReady(); diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.cpp index 66c9ed81e8c..bdc524c4bf2 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.cpp @@ -112,7 +112,7 @@ struct TRINITY_DLL_DECL npc_kalecgosAI : public ScriptedAI m_creature->UpdateEntry(NPC_KAEL); m_uiTransformTimer = 0; - }else m_uiTransformTimer -= uiDiff; + } else m_uiTransformTimer -= uiDiff; } } }; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_baron_geddon.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_baron_geddon.cpp index 1a6ead66319..6192647af05 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_baron_geddon.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_baron_geddon.cpp @@ -64,29 +64,29 @@ struct TRINITY_DLL_DECL boss_baron_geddonAI : public ScriptedAI } //Inferno_Timer - if (Inferno_Timer < diff) + if (Inferno_Timer <= diff) { DoCast(m_creature,SPELL_INFERNO); Inferno_Timer = 45000; - }else Inferno_Timer -= diff; + } else Inferno_Timer -= diff; //IgniteMana_Timer - if (IgniteMana_Timer < diff) + if (IgniteMana_Timer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(target,SPELL_IGNITEMANA); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget,SPELL_IGNITEMANA); IgniteMana_Timer = 30000; - }else IgniteMana_Timer -= diff; + } else IgniteMana_Timer -= diff; //LivingBomb_Timer - if (LivingBomb_Timer < diff) + if (LivingBomb_Timer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(target,SPELL_LIVINGBOMB); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget,SPELL_LIVINGBOMB); LivingBomb_Timer = 35000; - }else LivingBomb_Timer -= diff; + } else LivingBomb_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_garr.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_garr.cpp index bfdc20a251a..ef1a6948692 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_garr.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_garr.cpp @@ -59,18 +59,18 @@ struct TRINITY_DLL_DECL boss_garrAI : public ScriptedAI return; //AntiMagicPulse_Timer - if (AntiMagicPulse_Timer < diff) + if (AntiMagicPulse_Timer <= diff) { DoCast(m_creature,SPELL_ANTIMAGICPULSE); AntiMagicPulse_Timer = 10000 + rand()%5000; - }else AntiMagicPulse_Timer -= diff; + } else AntiMagicPulse_Timer -= diff; //MagmaShackles_Timer - if (MagmaShackles_Timer < diff) + if (MagmaShackles_Timer <= diff) { DoCast(m_creature,SPELL_MAGMASHACKLES); MagmaShackles_Timer = 8000 + rand()%4000; - }else MagmaShackles_Timer -= diff; + } else MagmaShackles_Timer -= diff; DoMeleeAttackIfReady(); } @@ -97,13 +97,13 @@ struct TRINITY_DLL_DECL mob_fireswornAI : public ScriptedAI return; //Immolate_Timer - if (Immolate_Timer < diff) + if (Immolate_Timer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(target,SPELL_IMMOLATE); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget,SPELL_IMMOLATE); - Immolate_Timer = 5000 + rand()%5000; - }else Immolate_Timer -= diff; + Immolate_Timer = urand(5000,10000); + } else Immolate_Timer -= diff; //Cast Erruption and let them die if (m_creature->GetHealth() <= m_creature->GetMaxHealth() * 0.10) diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_gehennas.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_gehennas.cpp index 7a1810c6b60..27ecb3f6546 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_gehennas.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_gehennas.cpp @@ -50,28 +50,29 @@ struct TRINITY_DLL_DECL boss_gehennasAI : public ScriptedAI return; //ShadowBolt_Timer - if (ShadowBolt_Timer < diff) + if (ShadowBolt_Timer <= diff) { - if (Unit* bTarget = SelectUnit(SELECT_TARGET_RANDOM,1)) - DoCast(bTarget,SPELL_SHADOWBOLT); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 1)) + DoCast(pTarget, SPELL_SHADOWBOLT); + ShadowBolt_Timer = 7000; - }else ShadowBolt_Timer -= diff; + } else ShadowBolt_Timer -= diff; //RainOfFire_Timer - if (RainOfFire_Timer < diff) + if (RainOfFire_Timer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(target,SPELL_RAINOFFIRE); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_RAINOFFIRE); - RainOfFire_Timer = 4000 + rand()%8000; - }else RainOfFire_Timer -= diff; + RainOfFire_Timer = urand(4000,12000); + } else RainOfFire_Timer -= diff; //GehennasCurse_Timer - if (GehennasCurse_Timer < diff) + if (GehennasCurse_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_GEHENNASCURSE); - GehennasCurse_Timer = 22000 + rand()%8000; - }else GehennasCurse_Timer -= diff; + GehennasCurse_Timer = urand(22000,30000); + } else GehennasCurse_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_lucifron.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_lucifron.cpp index 509faaa6fd4..3dff3c7ccac 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_lucifron.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_lucifron.cpp @@ -52,25 +52,25 @@ struct TRINITY_DLL_DECL boss_lucifronAI : public ScriptedAI return; //Impending doom timer - if (ImpendingDoom_Timer < diff) + if (ImpendingDoom_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_IMPENDINGDOOM); ImpendingDoom_Timer = 20000; - }else ImpendingDoom_Timer -= diff; + } else ImpendingDoom_Timer -= diff; //Lucifron's curse timer - if (LucifronCurse_Timer < diff) + if (LucifronCurse_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_LUCIFRONCURSE); LucifronCurse_Timer = 15000; - }else LucifronCurse_Timer -= diff; + } else LucifronCurse_Timer -= diff; //Shadowshock - if (ShadowShock_Timer < diff) + if (ShadowShock_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_SHADOWSHOCK); ShadowShock_Timer = 6000; - }else ShadowShock_Timer -= diff; + } else ShadowShock_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_magmadar.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_magmadar.cpp index ce6348f005e..8728a593e1c 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_magmadar.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_magmadar.cpp @@ -58,28 +58,28 @@ struct TRINITY_DLL_DECL boss_magmadarAI : public ScriptedAI return; //Frenzy_Timer - if (Frenzy_Timer < diff) + if (Frenzy_Timer <= diff) { DoScriptText(EMOTE_FRENZY, m_creature); DoCast(m_creature,SPELL_FRENZY); Frenzy_Timer = 15000; - }else Frenzy_Timer -= diff; + } else Frenzy_Timer -= diff; //Panic_Timer - if (Panic_Timer < diff) + if (Panic_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_PANIC); Panic_Timer = 35000; - }else Panic_Timer -= diff; + } else Panic_Timer -= diff; //Lavabomb_Timer - if (Lavabomb_Timer < diff) + if (Lavabomb_Timer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(target,SPELL_LAVABOMB_ALT); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget,SPELL_LAVABOMB_ALT); Lavabomb_Timer = 12000; - }else Lavabomb_Timer -= diff; + } else Lavabomb_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_majordomo_executus.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_majordomo_executus.cpp index 905edf27ea8..859332be008 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_majordomo_executus.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_majordomo_executus.cpp @@ -91,29 +91,29 @@ struct TRINITY_DLL_DECL boss_majordomoAI : public ScriptedAI } //MagicReflection_Timer - // if (MagicReflection_Timer < diff) + // if (MagicReflection_Timer <= diff) // { // DoCast(m_creature, SPELL_MAGICREFLECTION); //60 seconds until we should cast this agian // MagicReflection_Timer = 30000; - // }else MagicReflection_Timer -= diff; + // } else MagicReflection_Timer -= diff; //DamageReflection_Timer - // if (DamageReflection_Timer < diff) + // if (DamageReflection_Timer <= diff) // { // DoCast(m_creature, SPELL_DAMAGEREFLECTION); //60 seconds until we should cast this agian // DamageReflection_Timer = 30000; - // }else DamageReflection_Timer -= diff; + // } else DamageReflection_Timer -= diff; //Blastwave_Timer - if (Blastwave_Timer < diff) + if (Blastwave_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_BLASTWAVE); Blastwave_Timer = 10000; - }else Blastwave_Timer -= diff; + } else Blastwave_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_ragnaros.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_ragnaros.cpp index 449fb9566dc..197c4e5703f 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_ragnaros.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_ragnaros.cpp @@ -136,7 +136,7 @@ struct TRINITY_DLL_DECL boss_ragnarosAI : public ScriptedAI void UpdateAI(const uint32 diff) { - if (WasBanished && Attack_Timer < diff) + if (WasBanished && Attack_Timer <= diff) { //Become unbanished again m_creature->setFaction(14); @@ -155,54 +155,50 @@ struct TRINITY_DLL_DECL boss_ragnarosAI : public ScriptedAI return; //WrathOfRagnaros_Timer - if (WrathOfRagnaros_Timer < diff) + if (WrathOfRagnaros_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_WRATHOFRAGNAROS); - if (rand()%2 == 0) - { + if (urand(0,1)) DoScriptText(SAY_WRATH, m_creature); - } WrathOfRagnaros_Timer = 30000; - }else WrathOfRagnaros_Timer -= diff; + } else WrathOfRagnaros_Timer -= diff; //HandOfRagnaros_Timer - if (HandOfRagnaros_Timer < diff) + if (HandOfRagnaros_Timer <= diff) { DoCast(m_creature,SPELL_HANDOFRAGNAROS); - if (rand()%2==0) - { + if (urand(0,1)) DoScriptText(SAY_HAND, m_creature); - } HandOfRagnaros_Timer = 25000; - }else HandOfRagnaros_Timer -= diff; + } else HandOfRagnaros_Timer -= diff; //LavaBurst_Timer - if (LavaBurst_Timer < diff) + if (LavaBurst_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_LAVABURST); LavaBurst_Timer = 10000; - }else LavaBurst_Timer -= diff; + } else LavaBurst_Timer -= diff; //Erruption_Timer - if (LavaBurst_Timer < diff) + if (LavaBurst_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_ERRUPTION); - Erruption_Timer = 20000 + rand()%25000; - }else Erruption_Timer -= diff; + Erruption_Timer = urand(20000,45000); + } else Erruption_Timer -= diff; //ElementalFire_Timer - if (ElementalFire_Timer < diff) + if (ElementalFire_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_ELEMENTALFIRE); - ElementalFire_Timer = 10000 + rand()%4000; - }else ElementalFire_Timer -= diff; + ElementalFire_Timer = urand(10000,14000); + } else ElementalFire_Timer -= diff; //Submerge_Timer - if (!WasBanished && Submerge_Timer < diff) + if (!WasBanished && Submerge_Timer <= diff) { //Creature spawning and ragnaros becomming unattackable //is not very well supported in the core @@ -254,7 +250,7 @@ struct TRINITY_DLL_DECL boss_ragnarosAI : public ScriptedAI } Submerge_Timer = 180000; - }else Submerge_Timer -= diff; + } else Submerge_Timer -= diff; //If we are within range melee the target if (m_creature->IsWithinMeleeRange(m_creature->getVictim())) @@ -269,7 +265,7 @@ struct TRINITY_DLL_DECL boss_ragnarosAI : public ScriptedAI else { //MagmaBurst_Timer - if (MagmaBurst_Timer < diff) + if (MagmaBurst_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_MAGMABURST); @@ -281,7 +277,7 @@ struct TRINITY_DLL_DECL boss_ragnarosAI : public ScriptedAI } MagmaBurst_Timer = 2500; - }else MagmaBurst_Timer -= diff; + } else MagmaBurst_Timer -= diff; } } }; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_shazzrah.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_shazzrah.cpp index 772a7452214..051ddce83a5 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_shazzrah.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_shazzrah.cpp @@ -57,53 +57,50 @@ struct TRINITY_DLL_DECL boss_shazzrahAI : public ScriptedAI return; //ArcaneExplosion_Timer - if (ArcaneExplosion_Timer < diff) + if (ArcaneExplosion_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_ARCANEEXPLOSION); ArcaneExplosion_Timer = 5000 + rand()%4000; - }else ArcaneExplosion_Timer -= diff; + } else ArcaneExplosion_Timer -= diff; //ShazzrahCurse_Timer - if (ShazzrahCurse_Timer < diff) + if (ShazzrahCurse_Timer <= diff) { - Unit* target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM,0); - if (target) DoCast(target,SPELL_SHAZZRAHCURSE); + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); + if (pTarget) DoCast(pTarget,SPELL_SHAZZRAHCURSE); ShazzrahCurse_Timer = 25000 + rand()%5000; - }else ShazzrahCurse_Timer -= diff; + } else ShazzrahCurse_Timer -= diff; //DeadenMagic_Timer - if (DeadenMagic_Timer < diff) + if (DeadenMagic_Timer <= diff) { DoCast(m_creature,SPELL_DEADENMAGIC); DeadenMagic_Timer = 35000; - }else DeadenMagic_Timer -= diff; + } else DeadenMagic_Timer -= diff; //Countspell_Timer - if (Countspell_Timer < diff) + if (Countspell_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_COUNTERSPELL); Countspell_Timer = 16000 + rand()%4000; - }else Countspell_Timer -= diff; + } else Countspell_Timer -= diff; //Blink_Timer - if (Blink_Timer < diff) + if (Blink_Timer <= diff) { // Teleporting him to a random gamer and casting Arcane Explosion after that. // Blink is not working cause of LoS System we need to do this hardcoded. - Unit* target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM,0); - - if (target) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0, 100, true)) { - DoTeleportTo(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ()); - DoCast(target,SPELL_ARCANEEXPLOSION); - DoResetThreat(); + DoTeleportTo(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ()); + DoCast(pTarget, SPELL_ARCANEEXPLOSION); + DoResetThreat(); } Blink_Timer = 45000; - }else Blink_Timer -= diff; + } else Blink_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_sulfuron_harbinger.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_sulfuron_harbinger.cpp index 67f7b117123..f64017fe6b0 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_sulfuron_harbinger.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_sulfuron_harbinger.cpp @@ -64,55 +64,55 @@ struct TRINITY_DLL_DECL boss_sulfuronAI : public ScriptedAI return; //DemoralizingShout_Timer - if (DemoralizingShout_Timer < diff) + if (DemoralizingShout_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_DEMORALIZINGSHOUT); DemoralizingShout_Timer = 15000 + rand()%5000; - }else DemoralizingShout_Timer -= diff; + } else DemoralizingShout_Timer -= diff; //Inspire_Timer - if (Inspire_Timer < diff) + if (Inspire_Timer <= diff) { - Creature* target = NULL; + Creature *pTarget = NULL; std::list<Creature*> pList = DoFindFriendlyMissingBuff(45.0f,SPELL_INSPIRE); if (!pList.empty()) { std::list<Creature*>::iterator i = pList.begin(); advance(i, (rand()%pList.size())); - target = (*i); + pTarget = (*i); } - if (target) - DoCast(target,SPELL_INSPIRE); + if (pTarget) + DoCast(pTarget,SPELL_INSPIRE); DoCast(m_creature,SPELL_INSPIRE); Inspire_Timer = 20000 + rand()%6000; - }else Inspire_Timer -= diff; + } else Inspire_Timer -= diff; //Knockdown_Timer - if (Knockdown_Timer < diff) + if (Knockdown_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_KNOCKDOWN); Knockdown_Timer = 12000 + rand()%3000; - }else Knockdown_Timer -= diff; + } else Knockdown_Timer -= diff; //Flamespear_Timer - if (Flamespear_Timer < diff) + if (Flamespear_Timer <= diff) { - Unit* target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM,0); - if (target) DoCast(target,SPELL_FLAMESPEAR); + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); + if (pTarget) DoCast(pTarget,SPELL_FLAMESPEAR); Flamespear_Timer = 12000 + rand()%4000; - }else Flamespear_Timer -= diff; + } else Flamespear_Timer -= diff; //DarkStrike_Timer - if (Darkstrike_Timer < diff) + if (Darkstrike_Timer <= diff) { DoCast(m_creature, SPELL_DARKSTRIKE); Darkstrike_Timer = 15000 + rand()%3000; - }else Darkstrike_Timer -= diff; + } else Darkstrike_Timer -= diff; DoMeleeAttackIfReady(); } @@ -143,7 +143,7 @@ struct TRINITY_DLL_DECL mob_flamewaker_priestAI : public ScriptedAI return; //Casting Heal to Sulfuron or other Guards. - if (Heal_Timer < diff) + if (Heal_Timer <= diff) { Unit* pUnit = DoSelectLowestHpFriendly(60.0f, 1); if (!pUnit) @@ -152,27 +152,27 @@ struct TRINITY_DLL_DECL mob_flamewaker_priestAI : public ScriptedAI DoCast(pUnit, SPELL_HEAL); Heal_Timer = 15000+rand()%5000; - }else Heal_Timer -= diff; + } else Heal_Timer -= diff; //ShadowWordPain_Timer - if (ShadowWordPain_Timer < diff) + if (ShadowWordPain_Timer <= diff) { - Unit* target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM,0); - if (target) DoCast(target,SPELL_SHADOWWORDPAIN); + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); + if (pTarget) DoCast(pTarget,SPELL_SHADOWWORDPAIN); ShadowWordPain_Timer = 18000+rand()%8000; - }else ShadowWordPain_Timer -= diff; + } else ShadowWordPain_Timer -= diff; //Immolate_Timer - if (Immolate_Timer < diff) + if (Immolate_Timer <= diff) { - Unit* target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM,0); - if (target) DoCast(target,SPELL_IMMOLATE); + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); + if (pTarget) DoCast(pTarget,SPELL_IMMOLATE); Immolate_Timer = 15000+rand()%10000; - }else Immolate_Timer -= diff; + } else Immolate_Timer -= diff; DoMeleeAttackIfReady(); } 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 2014365dda4..1c35eb87cdc 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp @@ -146,7 +146,7 @@ struct TRINITY_DLL_DECL npc_unworthy_initiateAI : public ScriptedAI } } - void EventStart(Creature* anchor, Player* target) + void EventStart(Creature* anchor, Player *pTarget) { wait_timer = 5000; phase = PHASE_TO_EQUIP; @@ -158,8 +158,8 @@ struct TRINITY_DLL_DECL npc_unworthy_initiateAI : public ScriptedAI float z; anchor->GetContactPoint(me, anchorX, anchorY, z, 1.0f); - playerGUID = target->GetGUID(); - DoScriptText(say_event_start[rand()%8], me, target); + playerGUID = pTarget->GetGUID(); + DoScriptText(say_event_start[rand()%8], me, pTarget); } void UpdateAI(const uint32 diff); @@ -247,8 +247,8 @@ void npc_unworthy_initiateAI::UpdateAI(const uint32 diff) me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); phase = PHASE_ATTACKING; - if (Player* target = Unit::GetPlayer(playerGUID)) - me->AI()->AttackStart(target); + if (Player *pTarget = Unit::GetPlayer(playerGUID)) + me->AI()->AttackStart(pTarget); wait_timer = 0; } } @@ -538,7 +538,7 @@ struct TRINITY_DLL_DECL npc_dark_rider_of_acherusAI : public ScriptedAI default: break; } - }else PhaseTimer -= diff; + } else PhaseTimer -= diff; } @@ -878,7 +878,7 @@ struct TRINITY_DLL_DECL npc_scarlet_minerAI : public npc_escortAI AddWaypoint(11, 2202.595947, -6061.325684, 5.882018 ); AddWaypoint(12, 2188.974609, -6080.866699, 3.370027 ); - if(rand()%2) + if(urand(0,1)) { AddWaypoint(13, 2176.483887, -6110.407227, 1.855181 ); AddWaypoint(14, 2172.516602, -6146.752441, 1.074235 ); @@ -956,7 +956,7 @@ struct TRINITY_DLL_DECL npc_scarlet_minerAI : public npc_escortAI car->AI()->DoAction(); IntroPhase = 0; } - }else IntroTimer-=diff; + } else IntroTimer-=diff; } npc_escortAI::UpdateAI(diff); } @@ -987,9 +987,9 @@ bool GOHello_go_inconspicuous_mine_car(Player* pPlayer, GameObject* pGO) { car->AI()->SetGUID(miner->GetGUID()); CAST_AI(npc_scarlet_minerAI, miner->AI())->InitCartQuest(pPlayer); - }else error_log("TSCR: GOHello_go_inconspicuous_mine_car vehicle entry is not correct."); - }else error_log("TSCR: GOHello_go_inconspicuous_mine_car player is not on the vehicle."); - }else error_log("TSCR: GOHello_go_inconspicuous_mine_car Scarlet Miner cant be found by script."); + } else error_log("TSCR: GOHello_go_inconspicuous_mine_car vehicle entry is not correct."); + } else error_log("TSCR: GOHello_go_inconspicuous_mine_car player is not on the vehicle."); + } else error_log("TSCR: GOHello_go_inconspicuous_mine_car Scarlet Miner cant be found by script."); } return true; } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter2.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter2.cpp index 28bc2ab8a9d..a9006e9f3ae 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter2.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter2.cpp @@ -118,7 +118,7 @@ struct TRINITY_DLL_DECL npc_crusade_persuadedAI : public ScriptedAI ++uiSpeech_counter; DoCastAOE(58111, true); - }else uiSpeech_timer -= diff; + } else uiSpeech_timer -= diff; return; } @@ -394,7 +394,7 @@ struct TRINITY_DLL_DECL mob_scarlet_courierAI : public ScriptedAI } uiStage_timer = 3000; uiStage = 0; - }else uiStage_timer -= diff; + } else uiStage_timer -= diff; } if(!UpdateVictim()) diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter5.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter5.cpp index 35baaef4b64..7eabd81ca1a 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter5.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter5.cpp @@ -582,7 +582,7 @@ struct TRINITY_DLL_DECL npc_highlord_darion_mograineAI : public npc_escortAI if (!bIsBattle) { - if (uiPhase_timer < diff) + if (uiPhase_timer <= diff) { // ******* Before battle ***************************************************************** switch(uiStep) @@ -1287,43 +1287,43 @@ struct TRINITY_DLL_DECL npc_highlord_darion_mograineAI : public npc_escortAI break; } - }else uiPhase_timer -= diff; + } else uiPhase_timer -= diff; } // ******* During battle ***************************************************************** else { - if (uiAnti_magic_zone < diff) + if (uiAnti_magic_zone <= diff) { DoCast(me, SPELL_ANTI_MAGIC_ZONE1); uiAnti_magic_zone = 25000 + rand()%5000; } else uiAnti_magic_zone -= diff; - if (uiDeath_strike < diff) + if (uiDeath_strike <= diff) { DoCast(me->getVictim(), SPELL_DEATH_STRIKE); uiDeath_strike = 5000 + rand()%5000; } else uiDeath_strike -= diff; - if (uiDeath_embrace < diff) + if (uiDeath_embrace <= diff) { DoCast(me->getVictim(), SPELL_DEATH_EMBRACE); uiDeath_embrace = 5000 + rand()%5000; } else uiDeath_embrace -= diff; - if (uiIcy_touch < diff) + if (uiIcy_touch <= diff) { DoCast(me->getVictim(), SPELL_ICY_TOUCH1); uiIcy_touch = 5000 + rand()%5000; } else uiIcy_touch -= diff; - if (uiUnholy_blight < diff) + if (uiUnholy_blight <= diff) { DoCast(me->getVictim(), SPELL_UNHOLY_BLIGHT); uiUnholy_blight = 5000 + rand()%5000; } else uiUnholy_blight -= diff; - if (uiFight_speech < diff) + if (uiFight_speech <= diff) { DoScriptText(RAND(SAY_LIGHT_OF_DAWN09,SAY_LIGHT_OF_DAWN10,SAY_LIGHT_OF_DAWN11, SAY_LIGHT_OF_DAWN12,SAY_LIGHT_OF_DAWN13,SAY_LIGHT_OF_DAWN14, @@ -1335,14 +1335,14 @@ struct TRINITY_DLL_DECL npc_highlord_darion_mograineAI : public npc_escortAI } else uiFight_speech -= diff; // Check spawns - if (uiSpawncheck < diff) + if (uiSpawncheck <= diff) { SpawnNPC(); uiSpawncheck = 1000; } else uiSpawncheck -= diff; // Check targets - if (uiTargetcheck < diff) + if (uiTargetcheck <= diff) { for (uint8 i = 0; i < ENCOUNTER_GHOUL_NUMBER; ++i) NPCChangeTarget(uiGhoulGUID[i]); @@ -1371,7 +1371,7 @@ struct TRINITY_DLL_DECL npc_highlord_darion_mograineAI : public npc_escortAI uiTirionGUID = pTemp->GetGUID(); } } - if (uiFight_duration < diff) + if (uiFight_duration <= diff) { bIsBattle = false; uiFight_duration = 300000; @@ -1614,8 +1614,8 @@ bool GossipSelect_npc_highlord_darion_mograine(Player* pPlayer, Creature* pCreat { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->CLOSE_GOSSIP_MENU(); - ((npc_highlord_darion_mograineAI*)pCreature->AI())->uiStep = 1; - ((npc_highlord_darion_mograineAI*)pCreature->AI())->Start(true, false, pPlayer->GetGUID()); + CAST_AI(npc_highlord_darion_mograineAI, pCreature->AI())->uiStep = 1; + CAST_AI(npc_highlord_darion_mograineAI, pCreature->AI())->Start(true, false, pPlayer->GetGUID()); break; } return true; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/the_scarlet_enclave.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/the_scarlet_enclave.cpp index 049c4b72cde..09c31e7e8a3 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/the_scarlet_enclave.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/the_scarlet_enclave.cpp @@ -48,7 +48,7 @@ struct TRINITY_DLL_DECL npc_valkyr_battle_maidenAI : public PassiveAI void UpdateAI(const uint32 diff) { - if(FlyBackTimer < diff) + if (FlyBackTimer <= diff) { Player *plr = NULL; if(me->isSummon()) @@ -91,7 +91,7 @@ struct TRINITY_DLL_DECL npc_valkyr_battle_maidenAI : public PassiveAI break; } ++phase; - }else FlyBackTimer-=diff; + } else FlyBackTimer-=diff; } }; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_arcanist_doan.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_arcanist_doan.cpp index 51a8d6efc8d..c1d88bf4e2a 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_arcanist_doan.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_arcanist_doan.cpp @@ -87,27 +87,27 @@ struct TRINITY_DLL_DECL boss_arcanist_doanAI : public ScriptedAI bShielded = true; } - if (Polymorph_Timer < diff) + if (Polymorph_Timer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,1)) - DoCast(target,SPELL_POLYMORPH); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,1)) + DoCast(pTarget,SPELL_POLYMORPH); Polymorph_Timer = 20000; - }else Polymorph_Timer -= diff; + } else Polymorph_Timer -= diff; //AoESilence_Timer - if (AoESilence_Timer < diff) + if (AoESilence_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_AOESILENCE); AoESilence_Timer = 15000 + rand()%5000; - }else AoESilence_Timer -= diff; + } else AoESilence_Timer -= diff; //ArcaneExplosion_Timer - if (ArcaneExplosion_Timer < diff) + if (ArcaneExplosion_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_ARCANEEXPLOSION); ArcaneExplosion_Timer = 8000; - }else ArcaneExplosion_Timer -= diff; + } else ArcaneExplosion_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_azshir_the_sleepless.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_azshir_the_sleepless.cpp index 1409b2ff693..92b31d28c38 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_azshir_the_sleepless.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_azshir_the_sleepless.cpp @@ -55,28 +55,28 @@ struct TRINITY_DLL_DECL boss_azshir_the_sleeplessAI : public ScriptedAI if (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() <= 50 && !m_creature->IsNonMeleeSpellCasted(false)) { //SoulSiphon_Timer - if (SoulSiphon_Timer < diff) + if (SoulSiphon_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_SOULSIPHON); return; SoulSiphon_Timer = 20000; - }else SoulSiphon_Timer -= diff; + } else SoulSiphon_Timer -= diff; } //CallOfTheGrave_Timer - if (CallOftheGrave_Timer < diff) + if (CallOftheGrave_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_CALLOFTHEGRAVE); CallOftheGrave_Timer = 30000; - }else CallOftheGrave_Timer -= diff; + } else CallOftheGrave_Timer -= diff; //Terrify_Timer - if (Terrify_Timer < diff) + if (Terrify_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_TERRIFY); Terrify_Timer = 20000; - }else Terrify_Timer -= diff; + } else Terrify_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_bloodmage_thalnos.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_bloodmage_thalnos.cpp index b7cba1ae97a..842d3a2ba05 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_bloodmage_thalnos.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_bloodmage_thalnos.cpp @@ -77,32 +77,32 @@ struct TRINITY_DLL_DECL boss_bloodmage_thalnosAI : public ScriptedAI } //FlameShock_Timer - if (FlameShock_Timer < diff) + if (FlameShock_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_FLAMESHOCK); FlameShock_Timer = 10000 + rand()%5000; - }else FlameShock_Timer -= diff; + } else FlameShock_Timer -= diff; //FlameSpike_Timer - if (FlameSpike_Timer < diff) + if (FlameSpike_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_FLAMESPIKE); FlameSpike_Timer = 30000; - }else FlameSpike_Timer -= diff; + } else FlameSpike_Timer -= diff; //FireNova_Timer - if (FireNova_Timer < diff) + if (FireNova_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_FIRENOVA); FireNova_Timer = 40000; - }else FireNova_Timer -= diff; + } else FireNova_Timer -= diff; //ShadowBolt_Timer - if (ShadowBolt_Timer < diff) + if (ShadowBolt_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_SHADOWBOLT); ShadowBolt_Timer = 2000; - }else ShadowBolt_Timer -= diff; + } else ShadowBolt_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp index 1ac67d1f8a3..3fce77333a4 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp @@ -230,9 +230,9 @@ struct TRINITY_DLL_DECL mob_headAI : public ScriptedAI } void EnterCombat(Unit *who) {} - void SaySound(int32 textEntry, Unit *target = 0) + void SaySound(int32 textEntry, Unit *pTarget = 0) { - DoScriptText(textEntry, m_creature, target); + DoScriptText(textEntry, m_creature, pTarget); //DoCast(m_creature,SPELL_HEAD_SPEAKS,true); Creature *speaker = DoSpawnCreature(HELPER,0,0,0,0,TEMPSUMMON_TIMED_DESPAWN,1000); if (speaker) @@ -297,7 +297,7 @@ struct TRINITY_DLL_DECL mob_headAI : public ScriptedAI { if (!withbody) { - if (wait < diff) + if (wait <= diff) { wait = 1000; if (!m_creature->getVictim()) return; @@ -305,7 +305,7 @@ struct TRINITY_DLL_DECL mob_headAI : public ScriptedAI m_creature->GetMotionMaster()->MoveFleeing(m_creature->getVictim()); } else wait -= diff; - if (laugh < diff) + if (laugh <= diff) { laugh = urand(15000,30000); DoPlaySoundToSet(m_creature, RandomLaugh[urand(0,2)]); @@ -320,7 +320,7 @@ struct TRINITY_DLL_DECL mob_headAI : public ScriptedAI { if (die) { - if (wait < diff) + if (wait <= diff) { die = false; if (Unit *body = Unit::GetUnit((*m_creature), bodyGUID)) @@ -488,9 +488,9 @@ struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI } } - void SaySound(int32 textEntry, Unit *target = 0) + void SaySound(int32 textEntry, Unit *pTarget = 0) { - DoScriptText(textEntry, m_creature, target); + DoScriptText(textEntry, m_creature, pTarget); laugh += 4000; } @@ -608,7 +608,7 @@ struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI { if (!IsFlying) { - if (say_timer < diff) + if (say_timer <= diff) { say_timer = 3000; Player *plr = SelectRandomPlayer(100.0f,false); @@ -647,7 +647,7 @@ struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI case 1: if (burned) break; - if (burn < diff) + if (burn <= diff) { if (Creature *flame = m_creature->SummonCreature(HELPER,Spawn[0].x,Spawn[0].y,Spawn[0].z,0,TEMPSUMMON_TIMED_DESPAWN,17000)) CAST_AI(mob_wisp_invisAI, flame->AI())->SetType(2); @@ -655,7 +655,7 @@ struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI } else burn -= diff; break; case 2: - if (conflagrate < diff) + if (conflagrate <= diff) { if (Unit *plr = SelectRandomPlayer(30.0f)) m_creature->CastSpell(plr,SPELL_CONFLAGRATION,false); @@ -663,7 +663,7 @@ struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI } else conflagrate -= diff; break; case 3: - if (summonadds < diff) + if (summonadds <= diff) { m_creature->InterruptNonMeleeSpells(false); DoCast(m_creature,SPELL_SUMMON_PUMPKIN); @@ -673,7 +673,7 @@ struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI break; } - if (laugh < diff) + if (laugh <= diff) { laugh = urand(11000,22000); m_creature->MonsterTextEmote(EMOTE_LAUGHS,NULL); @@ -683,7 +683,7 @@ struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI if (UpdateVictim()) { DoMeleeAttackIfReady(); - if (cleave < diff) + if (cleave <= diff) { DoCast(m_creature->getVictim(),SPELL_CLEAVE); cleave = urand(2000,6000); //1 cleave per 2.0-6.0sec @@ -692,7 +692,7 @@ struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI } else { - if (regen < diff) + if (regen <= diff) { regen = 1000; //"body calls head" if (m_creature->GetHealth()/m_creature->GetMaxHealth() == 1 && !returned) @@ -712,7 +712,7 @@ struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI } else regen -= diff; - if (whirlwind < diff) + if (whirlwind <= diff) { whirlwind = urand(4000,8000); if (urand(0,1)) diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_herod.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_herod.cpp index f810ded603b..c108575fc57 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_herod.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_herod.cpp @@ -86,19 +86,19 @@ struct TRINITY_DLL_DECL boss_herodAI : public ScriptedAI } //Cleave_Timer - if (Cleave_Timer < diff) + if (Cleave_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_CLEAVE); Cleave_Timer = 12000; - }else Cleave_Timer -= diff; + } else Cleave_Timer -= diff; // Whirlwind_Timer - if (Whirlwind_Timer < diff) + if (Whirlwind_Timer <= diff) { DoScriptText(SAY_WHIRLWIND, m_creature); DoCast(m_creature->getVictim(),SPELL_WHIRLWIND); Whirlwind_Timer = 30000; - }else Whirlwind_Timer -= diff; + } else Whirlwind_Timer -= diff; DoMeleeAttackIfReady(); } @@ -126,11 +126,11 @@ struct TRINITY_DLL_DECL mob_scarlet_traineeAI : public npc_escortAI { if (Start_Timer) { - if (Start_Timer < diff) + if (Start_Timer <= diff) { Start(true,true); Start_Timer = 0; - }else Start_Timer -= diff; + } else Start_Timer -= diff; } npc_escortAI::UpdateAI(diff); diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp index 13e9ef4af53..dc1081f97b9 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp @@ -66,29 +66,29 @@ struct TRINITY_DLL_DECL boss_high_inquisitor_fairbanksAI : public ScriptedAI return; //If we are <25% hp cast Heal - if (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() <= 25 && !m_creature->IsNonMeleeSpellCasted(false) && Heal_Timer < diff) + if (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() <= 25 && !m_creature->IsNonMeleeSpellCasted(false) && Heal_Timer <= diff) { DoCast(m_creature,SPELL_HEAL); Heal_Timer = 30000; - }else Heal_Timer -= diff; + } else Heal_Timer -= diff; //Fear_Timer - if (Fear_Timer < diff) + if (Fear_Timer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,1)) - DoCast(target,SPELL_FEAR); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,1)) + DoCast(pTarget,SPELL_FEAR); Fear_Timer = 40000; - }else Fear_Timer -= diff; + } else Fear_Timer -= diff; //Sleep_Timer - if (Sleep_Timer < diff) + if (Sleep_Timer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_TOPAGGRO,0)) - DoCast(target,SPELL_SLEEP); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_TOPAGGRO,0)) + DoCast(pTarget,SPELL_SLEEP); Sleep_Timer = 30000; - }else Sleep_Timer -= diff; + } else Sleep_Timer -= diff; //PowerWordShield_Timer if (!PowerWordShield && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() <= 25) @@ -98,20 +98,20 @@ struct TRINITY_DLL_DECL boss_high_inquisitor_fairbanksAI : public ScriptedAI } //Dispel_Timer - if (Dispel_Timer < diff) + if (Dispel_Timer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(target, SPELL_DISPELMAGIC); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget, SPELL_DISPELMAGIC); DispelMagic_Timer = 30000; - }else DispelMagic_Timer -= diff; + } else DispelMagic_Timer -= diff; //CurseOfBlood_Timer - if (CurseOfBlood_Timer < diff) + if (CurseOfBlood_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_CURSEOFBLOOD); CurseOfBlood_Timer = 25000; - }else CurseOfBlood_Timer -= diff; + } else CurseOfBlood_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_houndmaster_loksey.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_houndmaster_loksey.cpp index 2e79f2449d0..819801d639f 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_houndmaster_loksey.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_houndmaster_loksey.cpp @@ -51,11 +51,11 @@ struct TRINITY_DLL_DECL boss_houndmaster_lokseyAI : public ScriptedAI if (!UpdateVictim()) return; - if (BloodLust_Timer < diff) + if (BloodLust_Timer <= diff) { DoCast(m_creature,SPELL_BLOODLUST); BloodLust_Timer = 20000; - }else BloodLust_Timer -= diff; + } else BloodLust_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_interrogator_vishas.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_interrogator_vishas.cpp index 0101ddf26a1..509a3d05420 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_interrogator_vishas.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_interrogator_vishas.cpp @@ -92,11 +92,11 @@ struct TRINITY_DLL_DECL boss_interrogator_vishasAI : public ScriptedAI } //ShadowWordPain_Timer - if (ShadowWordPain_Timer < diff) + if (ShadowWordPain_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_SHADOWWORDPAIN); ShadowWordPain_Timer = 5000 + rand()%10000;; - }else ShadowWordPain_Timer -= diff; + } else ShadowWordPain_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp index 32a379a4017..74c5db7682a 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp @@ -262,7 +262,7 @@ struct TRINITY_DLL_DECL boss_high_inquisitor_whitemaneAI : public ScriptedAI if (m_bCanResurrect) { //When casting resuruction make sure to delay so on rez when reinstate battle deepsleep runs out - if (m_pInstance && m_uiWait_Timer < uiDiff) + if (m_pInstance && m_uiWait_Timer <= uiDiff) { if (Unit* Mograine = Unit::GetUnit((*m_creature), m_pInstance->GetData64(DATA_MOGRAINE))) { diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_scorn.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_scorn.cpp index 0b0b5114f92..499499ffed4 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_scorn.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_scorn.cpp @@ -55,32 +55,32 @@ struct TRINITY_DLL_DECL boss_scornAI : public ScriptedAI return; //LichSlap_Timer - if (LichSlap_Timer < diff) + if (LichSlap_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_LICHSLAP); LichSlap_Timer = 45000; - }else LichSlap_Timer -= diff; + } else LichSlap_Timer -= diff; //FrostboltVolley_Timer - if (FrostboltVolley_Timer < diff) + if (FrostboltVolley_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_FROSTBOLTVOLLEY); FrostboltVolley_Timer = 20000; - }else FrostboltVolley_Timer -= diff; + } else FrostboltVolley_Timer -= diff; //MindFlay_Timer - if (MindFlay_Timer < diff) + if (MindFlay_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_MINDFLAY); MindFlay_Timer = 20000; - }else MindFlay_Timer -= diff; + } else MindFlay_Timer -= diff; //FrostNova_Timer - if (FrostNova_Timer < diff) + if (FrostNova_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_FROSTNOVA); FrostNova_Timer = 15000; - }else FrostNova_Timer -= diff; + } else FrostNova_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_darkmaster_gandling.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_darkmaster_gandling.cpp index e861a168c80..8468432351c 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_darkmaster_gandling.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_darkmaster_gandling.cpp @@ -88,123 +88,123 @@ struct TRINITY_DLL_DECL boss_darkmaster_gandlingAI : public ScriptedAI return; //ArcaneMissiles_Timer - if (ArcaneMissiles_Timer < diff) + if (ArcaneMissiles_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_ARCANEMISSILES); ArcaneMissiles_Timer = 8000; - }else ArcaneMissiles_Timer -= diff; + } else ArcaneMissiles_Timer -= diff; //ShadowShield_Timer - if (ShadowShield_Timer < diff) + if (ShadowShield_Timer <= diff) { DoCast(m_creature,SPELL_SHADOWSHIELD); ShadowShield_Timer = 14000 + rand()%14000; - }else ShadowShield_Timer -= diff; + } else ShadowShield_Timer -= diff; //Curse_Timer - if (Curse_Timer < diff) + if (Curse_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_CURSE); Curse_Timer = 15000 + rand()%12000; - }else Curse_Timer -= diff; + } else Curse_Timer -= diff; //Teleporting Random Target to one of the six pre boss rooms and spawn 3-4 skeletons near the gamer. //We will only telport if gandling has more than 3% of hp so teleported gamers can always loot. if (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() > 3) { - if (Teleport_Timer < diff) + if (Teleport_Timer <= diff) { - Unit* target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM,0); - if (target && target->GetTypeId() == TYPEID_PLAYER) + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); + if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) { - if (DoGetThreat(target)) - DoModifyThreatPercent(target, -100); + if (DoGetThreat(pTarget)) + DoModifyThreatPercent(pTarget, -100); switch(rand()%6) { case 0: - DoTeleportPlayer(target, 250.0696,0.3921,84.8408,3.149); + DoTeleportPlayer(pTarget, 250.0696,0.3921,84.8408,3.149); Summoned = m_creature->SummonCreature(16119,254.2325,0.3417,84.8407,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); if (Summoned) - (Summoned->AI())->AttackStart(target); + Summoned->AI()->AttackStart(pTarget); Summoned = m_creature->SummonCreature(16119,257.7133,4.0226,84.8407,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); if (Summoned) - (Summoned->AI())->AttackStart(target); + Summoned->AI()->AttackStart(pTarget); Summoned = m_creature->SummonCreature(16119,258.6702,-2.60656,84.8407,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); if (Summoned) - (Summoned->AI())->AttackStart(target); + Summoned->AI()->AttackStart(pTarget); break; case 1: - DoTeleportPlayer(target, 181.4220,-91.9481,84.8410,1.608); + DoTeleportPlayer(pTarget, 181.4220,-91.9481,84.8410,1.608); Summoned = m_creature->SummonCreature(16119,184.0519,-73.5649,84.8407,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); if (Summoned) - (Summoned->AI())->AttackStart(target); + Summoned->AI()->AttackStart(pTarget); Summoned = m_creature->SummonCreature(16119,179.5951,-73.7045,84.8407,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); if (Summoned) - (Summoned->AI())->AttackStart(target); + Summoned->AI()->AttackStart(pTarget); Summoned = m_creature->SummonCreature(16119,180.6452,-78.2143,84.8407,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); if (Summoned) - (Summoned->AI())->AttackStart(target); + Summoned->AI()->AttackStart(pTarget); Summoned = m_creature->SummonCreature(16119,283.2274,-78.1518,84.8407,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); if (Summoned) - (Summoned->AI())->AttackStart(target); + Summoned->AI()->AttackStart(pTarget); break; case 2: - DoTeleportPlayer(target, 95.1547,-1.8173,85.2289,0.043); + DoTeleportPlayer(pTarget, 95.1547,-1.8173,85.2289,0.043); Summoned = m_creature->SummonCreature(16119,100.9404,-1.8016,85.2289,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); if (Summoned) - (Summoned->AI())->AttackStart(target); + Summoned->AI()->AttackStart(pTarget); Summoned = m_creature->SummonCreature(16119,101.3729,0.4882,85.2289,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); if (Summoned) - (Summoned->AI())->AttackStart(target); + Summoned->AI()->AttackStart(pTarget); Summoned = m_creature->SummonCreature(16119,101.4596,-4.4740,85.2289,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); if (Summoned) - (Summoned->AI())->AttackStart(target); + Summoned->AI()->AttackStart(pTarget); break; case 3: - DoTeleportPlayer(target, 250.0696,0.3921,72.6722,3.149); + DoTeleportPlayer(pTarget, 250.0696,0.3921,72.6722,3.149); Summoned = m_creature->SummonCreature(16119,240.34481,0.7368,72.6722,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); if (Summoned) - (Summoned->AI())->AttackStart(target); + Summoned->AI()->AttackStart(pTarget); Summoned = m_creature->SummonCreature(16119,240.3633,-2.9520,72.6722,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); if (Summoned) - (Summoned->AI())->AttackStart(target); + Summoned->AI()->AttackStart(pTarget); Summoned = m_creature->SummonCreature(16119,240.6702,3.34949,72.6722,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); if (Summoned) - (Summoned->AI())->AttackStart(target); + Summoned->AI()->AttackStart(pTarget); break; case 4: - DoTeleportPlayer(target, 181.4220,-91.9481,70.7734,1.608); + DoTeleportPlayer(pTarget, 181.4220,-91.9481,70.7734,1.608); Summoned = m_creature->SummonCreature(16119,184.0519,-73.5649,70.7734,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); if (Summoned) - (Summoned->AI())->AttackStart(target); + Summoned->AI()->AttackStart(pTarget); Summoned = m_creature->SummonCreature(16119,179.5951,-73.7045,70.7734,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); if (Summoned) - (Summoned->AI())->AttackStart(target); + Summoned->AI()->AttackStart(pTarget); Summoned = m_creature->SummonCreature(16119,180.6452,-78.2143,70.7734,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); if (Summoned) - (Summoned->AI())->AttackStart(target); + Summoned->AI()->AttackStart(pTarget); Summoned = m_creature->SummonCreature(16119,283.2274,-78.1518,70.7734,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); if (Summoned) - (Summoned->AI())->AttackStart(target); + Summoned->AI()->AttackStart(pTarget); break; case 5: - DoTeleportPlayer(target, 106.1541,-1.8994,75.3663,0.043); + DoTeleportPlayer(pTarget, 106.1541,-1.8994,75.3663,0.043); Summoned = m_creature->SummonCreature(16119,115.3945,-1.5555,75.3663,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); if (Summoned) - (Summoned->AI())->AttackStart(target); + Summoned->AI()->AttackStart(pTarget); Summoned = m_creature->SummonCreature(16119,257.7133,1.8066,75.3663,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); if (Summoned) - (Summoned->AI())->AttackStart(target); + Summoned->AI()->AttackStart(pTarget); Summoned = m_creature->SummonCreature(16119,258.6702,-5.1001,75.3663,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); if (Summoned) - (Summoned->AI())->AttackStart(target); + Summoned->AI()->AttackStart(pTarget); break; } } Teleport_Timer = 20000 + rand()%15000; - }else Teleport_Timer -= diff; + } else Teleport_Timer -= diff; } DoMeleeAttackIfReady(); diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_illucia_barov.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_illucia_barov.cpp index 533542d9383..bc499300839 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_illucia_barov.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_illucia_barov.cpp @@ -68,35 +68,35 @@ struct TRINITY_DLL_DECL boss_illuciabarovAI : public ScriptedAI return; //CurseOfAgony_Timer - if (CurseOfAgony_Timer < diff) + if (CurseOfAgony_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_CURSEOFAGONY); CurseOfAgony_Timer = 30000; - }else CurseOfAgony_Timer -= diff; + } else CurseOfAgony_Timer -= diff; //ShadowShock_Timer - if (ShadowShock_Timer < diff) + if (ShadowShock_Timer <= diff) { - Unit* target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM,0); - if (target) DoCast(target,SPELL_SHADOWSHOCK); + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); + if (pTarget) DoCast(pTarget,SPELL_SHADOWSHOCK); ShadowShock_Timer = 12000; - }else ShadowShock_Timer -= diff; + } else ShadowShock_Timer -= diff; //Silence_Timer - if (Silence_Timer < diff) + if (Silence_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_SILENCE); Silence_Timer = 14000; - }else Silence_Timer -= diff; + } else Silence_Timer -= diff; //Fear_Timer - if (Fear_Timer < diff) + if (Fear_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_FEAR); Fear_Timer = 30000; - }else Fear_Timer -= diff; + } else Fear_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_instructor_malicia.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_instructor_malicia.cpp index e5ea8666fdb..e70d4544c94 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_instructor_malicia.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_instructor_malicia.cpp @@ -75,31 +75,31 @@ struct TRINITY_DLL_DECL boss_instructormaliciaAI : public ScriptedAI return; //CallOfGraves_Timer - if (CallOfGraves_Timer < diff) + if (CallOfGraves_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_CALLOFGRAVES); CallOfGraves_Timer = 65000; - }else CallOfGraves_Timer -= diff; + } else CallOfGraves_Timer -= diff; //Corruption_Timer - if (Corruption_Timer < diff) + if (Corruption_Timer <= diff) { - Unit* target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM,0); - if (target) DoCast(target,SPELL_CORRUPTION); + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); + if (pTarget) DoCast(pTarget,SPELL_CORRUPTION); Corruption_Timer = 24000; - }else Corruption_Timer -= diff; + } else Corruption_Timer -= diff; //Renew_Timer - if (Renew_Timer < diff) + if (Renew_Timer <= diff) { DoCast(m_creature, SPELL_RENEW); Renew_Timer = 10000; - }else Renew_Timer -= diff; + } else Renew_Timer -= diff; //FlashHeal_Timer - if (FlashHeal_Timer < diff) + if (FlashHeal_Timer <= diff) { DoCast(m_creature,SPELL_FLASHHEAL); @@ -114,10 +114,10 @@ struct TRINITY_DLL_DECL boss_instructormaliciaAI : public ScriptedAI FlashCounter=0; FlashHeal_Timer = 30000; } - }else FlashHeal_Timer -= diff; + } else FlashHeal_Timer -= diff; //HealingTouch_Timer - if (HealingTouch_Timer < diff) + if (HealingTouch_Timer <= diff) { DoCast(m_creature,SPELL_HEALINGTOUCH); @@ -132,7 +132,7 @@ struct TRINITY_DLL_DECL boss_instructormaliciaAI : public ScriptedAI TouchCounter=0; HealingTouch_Timer = 30000; } - }else HealingTouch_Timer -= diff; + } else HealingTouch_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_jandice_barov.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_jandice_barov.cpp index 07b28454280..0a696959f01 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_jandice_barov.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_jandice_barov.cpp @@ -38,10 +38,6 @@ struct TRINITY_DLL_DECL boss_jandicebarovAI : public ScriptedAI //uint32 Illusioncounter; uint32 Invisible_Timer; bool Invisible; - int Rand; - int RandX; - int RandY; - Creature* Summoned; void Reset() { @@ -57,28 +53,13 @@ struct TRINITY_DLL_DECL boss_jandicebarovAI : public ScriptedAI void SummonIllusions(Unit* victim) { - Rand = rand()%10; - switch (rand()%2) - { - case 0: RandX = 0 - Rand; break; - case 1: RandX = 0 + Rand; break; - } - Rand = 0; - Rand = rand()%10; - switch (rand()%2) - { - case 0: RandY = 0 - Rand; break; - case 1: RandY = 0 + Rand; break; - } - Rand = 0; - Summoned = DoSpawnCreature(11439, RandX, RandY, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000); - if (Summoned) - (Summoned->AI())->AttackStart(victim); + if (Creature *Illusion = DoSpawnCreature(11439, RAND(irand(0,-9),irand(0,9)), RAND(irand(0,-9),irand(0,9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000)) + Illusion->AI()->AttackStart(victim); } void UpdateAI(const uint32 diff) { - if (Invisible && Invisible_Timer < diff) + if (Invisible && Invisible_Timer <= diff) { //Become visible again m_creature->setFaction(14); @@ -97,17 +78,17 @@ struct TRINITY_DLL_DECL boss_jandicebarovAI : public ScriptedAI return; //CurseOfBlood_Timer - if (CurseOfBlood_Timer < diff) + if (CurseOfBlood_Timer <= diff) { //Cast DoCast(m_creature->getVictim(),SPELL_CURSEOFBLOOD); //45 seconds CurseOfBlood_Timer = 30000; - }else CurseOfBlood_Timer -= diff; + } else CurseOfBlood_Timer -= diff; //Illusion_Timer - if (!Invisible && Illusion_Timer < diff) + if (!Invisible && Illusion_Timer <= diff) { //Inturrupt any spell casting @@ -118,22 +99,22 @@ struct TRINITY_DLL_DECL boss_jandicebarovAI : public ScriptedAI DoModifyThreatPercent(m_creature->getVictim(),-99); //Summon 10 Illusions attacking random gamers - Unit* target = NULL; + Unit *pTarget = NULL; for (uint8 i = 0; i < 10; ++i) { - target = SelectUnit(SELECT_TARGET_RANDOM,0); - if (target) - SummonIllusions(target); + pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); + if (pTarget) + SummonIllusions(pTarget); } Invisible = true; Invisible_Timer = 3000; //25 seconds until we should cast this agian Illusion_Timer = 25000; - }else Illusion_Timer -= diff; + } else Illusion_Timer -= diff; // //Illusion_Timer - // if (Illusion_Timer < diff) + // if (Illusion_Timer <= diff) // { // //Cast // DoCast(m_creature->getVictim(),SPELL_ILLUSION); @@ -150,7 +131,7 @@ struct TRINITY_DLL_DECL boss_jandicebarovAI : public ScriptedAI // Illusioncounter=0; // } // - // }else Illusion_Timer -= diff; + // } else Illusion_Timer -= diff; DoMeleeAttackIfReady(); } @@ -181,14 +162,14 @@ struct TRINITY_DLL_DECL mob_illusionofjandicebarovAI : public ScriptedAI return; //Cleave_Timer - if (Cleave_Timer < diff) + if (Cleave_Timer <= diff) { //Cast DoCast(m_creature->getVictim(),SPELL_CLEAVE); //5-8 seconds Cleave_Timer = 5000 + rand()%3000; - }else Cleave_Timer -= diff; + } else Cleave_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_kormok.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_kormok.cpp index 753f1969f7f..fb5e8cb97b9 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_kormok.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_kormok.cpp @@ -35,14 +35,6 @@ struct TRINITY_DLL_DECL boss_kormokAI : public ScriptedAI uint32 Minion_Timer; uint32 Mage_Timer; bool Mages; - int Rand1; - int Rand1X; - int Rand1Y; - int Rand2; - int Rand2X; - int Rand2Y; - Creature* SummonedMinions; - Creature* SummonedMages; void Reset() { @@ -57,46 +49,16 @@ struct TRINITY_DLL_DECL boss_kormokAI : public ScriptedAI { } - void SummonMinion(Unit* victim) + void SummonMinions(Unit* victim) { - Rand1 = rand()%8; - switch (rand()%2) - { - case 0: Rand1X = 0 - Rand1; break; - case 1: Rand1X = 0 + Rand1; break; - } - Rand1 = 0; - Rand1 = rand()%8; - switch (rand()%2) - { - case 0: Rand1Y = 0 - Rand1; break; - case 1: Rand1Y = 0 + Rand1; break; - } - Rand1 = 0; - SummonedMinions = DoSpawnCreature(16119, Rand1X, Rand1Y, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000); - if (SummonedMinions) - (SummonedMinions->AI())->AttackStart(victim); + if (Creature *SummonedMinion = DoSpawnCreature(16119, RAND(irand(0,-7),irand(0,7)), RAND(irand(0,-7),irand(0,7)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000)) + SummonedMinion->AI()->AttackStart(victim); } void SummonMages(Unit* victim) { - Rand2 = rand()%10; - switch (rand()%2) - { - case 0: Rand2X = 0 - Rand2; break; - case 1: Rand2X = 0 + Rand2; break; - } - Rand2 = 0; - Rand2 = rand()%10; - switch (rand()%2) - { - case 0: Rand2Y = 0 - Rand2; break; - case 1: Rand2Y = 0 + Rand2; break; - } - Rand2 = 0; - SummonedMages = DoSpawnCreature(16120, Rand2X, Rand2Y, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000); - if (SummonedMages) - (SummonedMages->AI())->AttackStart(victim); + if (Creature *SummonedMage = DoSpawnCreature(16120, RAND(irand(0,-9),irand(0,9)), RAND(irand(0,-9),irand(0,9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000)) + SummonedMage->AI()->AttackStart(victim); } void UpdateAI(const uint32 diff) @@ -105,30 +67,30 @@ struct TRINITY_DLL_DECL boss_kormokAI : public ScriptedAI return; //ShadowVolley_Timer - if (ShadowVolley_Timer < diff) + if (ShadowVolley_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_SHADOWBOLTVOLLEY); ShadowVolley_Timer = 15000; - }else ShadowVolley_Timer -= diff; + } else ShadowVolley_Timer -= diff; //BoneShield_Timer - if (BoneShield_Timer < diff) + if (BoneShield_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_BONESHIELD); BoneShield_Timer = 45000; - }else BoneShield_Timer -= diff; + } else BoneShield_Timer -= diff; //Minion_Timer - if (Minion_Timer < diff) + if (Minion_Timer <= diff) { //Cast - SummonMinion(m_creature->getVictim()); - SummonMinion(m_creature->getVictim()); - SummonMinion(m_creature->getVictim()); - SummonMinion(m_creature->getVictim()); + SummonMinions(m_creature->getVictim()); + SummonMinions(m_creature->getVictim()); + SummonMinions(m_creature->getVictim()); + SummonMinions(m_creature->getVictim()); Minion_Timer = 12000; - }else Minion_Timer -= diff; + } else Minion_Timer -= diff; //Summon 2 Bone Mages if (!Mages && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 26) diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_lord_alexei_barov.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_lord_alexei_barov.cpp index e5f11ee9c32..660b0817bee 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_lord_alexei_barov.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_lord_alexei_barov.cpp @@ -64,21 +64,21 @@ struct TRINITY_DLL_DECL boss_lordalexeibarovAI : public ScriptedAI return; //Immolate_Timer - if (Immolate_Timer < diff) + if (Immolate_Timer <= diff) { - Unit* target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM,0); - if (target) DoCast(target,SPELL_IMMOLATE); + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); + if (pTarget) DoCast(pTarget,SPELL_IMMOLATE); Immolate_Timer = 12000; - }else Immolate_Timer -= diff; + } else Immolate_Timer -= diff; //VeilofShadow_Timer - if (VeilofShadow_Timer < diff) + if (VeilofShadow_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_VEILOFSHADOW); VeilofShadow_Timer = 20000; - }else VeilofShadow_Timer -= diff; + } else VeilofShadow_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_lorekeeper_polkelt.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_lorekeeper_polkelt.cpp index d924656c7ef..8c9336edc0c 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_lorekeeper_polkelt.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_lorekeeper_polkelt.cpp @@ -68,32 +68,32 @@ struct TRINITY_DLL_DECL boss_lorekeeperpolkeltAI : public ScriptedAI return; //VolatileInfection_Timer - if (VolatileInfection_Timer < diff) + if (VolatileInfection_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_VOLATILEINFECTION); VolatileInfection_Timer = 32000; - }else VolatileInfection_Timer -= diff; + } else VolatileInfection_Timer -= diff; //Darkplague_Timer - if (Darkplague_Timer < diff) + if (Darkplague_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_DARKPLAGUE); Darkplague_Timer = 8000; - }else Darkplague_Timer -= diff; + } else Darkplague_Timer -= diff; //CorrosiveAcid_Timer - if (CorrosiveAcid_Timer < diff) + if (CorrosiveAcid_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_CORROSIVEACID); CorrosiveAcid_Timer = 25000; - }else CorrosiveAcid_Timer -= diff; + } else CorrosiveAcid_Timer -= diff; //NoxiousCatalyst_Timer - if (NoxiousCatalyst_Timer < diff) + if (NoxiousCatalyst_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_NOXIOUSCATALYST); NoxiousCatalyst_Timer = 38000; - }else NoxiousCatalyst_Timer -= diff; + } else NoxiousCatalyst_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_ras_frostwhisper.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_ras_frostwhisper.cpp index 0659ab2da4d..9199ce998db 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_ras_frostwhisper.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_ras_frostwhisper.cpp @@ -63,49 +63,49 @@ struct TRINITY_DLL_DECL boss_rasfrostAI : public ScriptedAI return; //IceArmor_Timer - if (IceArmor_Timer < diff) + if (IceArmor_Timer <= diff) { DoCast(m_creature, SPELL_ICEARMOR); IceArmor_Timer = 180000; - }else IceArmor_Timer -= diff; + } else IceArmor_Timer -= diff; //Frostbolt_Timer - if (Frostbolt_Timer < diff) + if (Frostbolt_Timer <= diff) { - Unit* target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM,0); - if (target) DoCast(target,SPELL_FROSTBOLT); + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); + if (pTarget) DoCast(pTarget,SPELL_FROSTBOLT); Frostbolt_Timer = 8000; - }else Frostbolt_Timer -= diff; + } else Frostbolt_Timer -= diff; //Freeze_Timer - if (Freeze_Timer < diff) + if (Freeze_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_FREEZE); Freeze_Timer = 24000; - }else Freeze_Timer -= diff; + } else Freeze_Timer -= diff; //Fear_Timer - if (Fear_Timer < diff) + if (Fear_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_FEAR); Fear_Timer = 30000; - }else Fear_Timer -= diff; + } else Fear_Timer -= diff; //ChillNova_Timer - if (ChillNova_Timer < diff) + if (ChillNova_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_CHILLNOVA); ChillNova_Timer = 14000; - }else ChillNova_Timer -= diff; + } else ChillNova_Timer -= diff; //FrostVolley_Timer - if (FrostVolley_Timer < diff) + if (FrostVolley_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_FROSTVOLLEY); FrostVolley_Timer = 15000; - }else FrostVolley_Timer -= diff; + } else FrostVolley_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_the_ravenian.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_the_ravenian.cpp index abe852580a7..f9dc3e8469f 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_the_ravenian.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_the_ravenian.cpp @@ -70,32 +70,32 @@ struct TRINITY_DLL_DECL boss_theravenianAI : public ScriptedAI return; //Trample_Timer - if (Trample_Timer < diff) + if (Trample_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_TRAMPLE); Trample_Timer = 10000; - }else Trample_Timer -= diff; + } else Trample_Timer -= diff; //Cleave_Timer - if (Cleave_Timer < diff) + if (Cleave_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_CLEAVE); Cleave_Timer = 7000; - }else Cleave_Timer -= diff; + } else Cleave_Timer -= diff; //SunderingCleave_Timer - if (SunderingCleave_Timer < diff) + if (SunderingCleave_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_SUNDERINCLEAVE); SunderingCleave_Timer = 20000; - }else SunderingCleave_Timer -= diff; + } else SunderingCleave_Timer -= diff; //KnockAway_Timer - if (KnockAway_Timer < diff) + if (KnockAway_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_KNOCKAWAY); KnockAway_Timer = 12000; - }else KnockAway_Timer -= diff; + } else KnockAway_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_vectus.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_vectus.cpp index f3eef33d24a..e33060fc102 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_vectus.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_vectus.cpp @@ -54,7 +54,7 @@ struct TRINITY_DLL_DECL boss_vectusAI : public ScriptedAI return; //FireShield_Timer - if (m_uiFireShield_Timer < uiDiff) + if (m_uiFireShield_Timer <= uiDiff) { DoCast(m_creature, SPELL_FIRESHIELD); m_uiFireShield_Timer = 90000; @@ -63,7 +63,7 @@ struct TRINITY_DLL_DECL boss_vectusAI : public ScriptedAI m_uiFireShield_Timer -= uiDiff; //BlastWave_Timer - if (m_uiBlastWave_Timer < uiDiff) + if (m_uiBlastWave_Timer <= uiDiff) { DoCast(m_creature->getVictim(), SPELL_BLAST_WAVE); m_uiBlastWave_Timer = 12000; @@ -74,7 +74,7 @@ struct TRINITY_DLL_DECL boss_vectusAI : public ScriptedAI //Frenzy_Timer if (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 25) { - if (m_uiFrenzy_Timer < uiDiff) + if (m_uiFrenzy_Timer <= uiDiff) { DoCast(m_creature, SPELL_FRENZY); DoScriptText(EMOTE_GENERIC_FRENZY_KILL, m_creature); diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/silvermoon_city.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/silvermoon_city.cpp index eb06008ed75..1d12e7e05bf 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/silvermoon_city.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/silvermoon_city.cpp @@ -65,7 +65,7 @@ struct TRINITY_DLL_DECL npc_blood_knight_stillbladeAI : public ScriptedAI { if (m_creature->IsStandState()) { - if (lifeTimer < diff) + if (lifeTimer <= diff) m_creature->AI()->EnterEvadeMode(); else lifeTimer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/silverpine_forest.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/silverpine_forest.cpp index 33f0098ee0a..54478287111 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/silverpine_forest.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/silverpine_forest.cpp @@ -284,7 +284,7 @@ struct TRINITY_DLL_DECL pyrewood_ambushAI : public ScriptedAI if(KillCount && Phase < 6) { - if(!UpdateVictim()) //reset() on target Despawn... + if(!UpdateVictim()) //reset() on pTarget Despawn... return; DoMeleeAttackIfReady(); diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/stranglethorn_vale.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/stranglethorn_vale.cpp index 6f2c787f950..4d6c718d995 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/stranglethorn_vale.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/stranglethorn_vale.cpp @@ -72,7 +72,7 @@ struct TRINITY_DLL_DECL mob_yennikuAI : public ScriptedAI { if (bReset) { - if (Reset_Timer < diff) + if (Reset_Timer <= diff) { EnterEvadeMode(); bReset = false; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_baron_rivendare.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_baron_rivendare.cpp index bdb314bf8bc..4112249fbd0 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_baron_rivendare.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_baron_rivendare.cpp @@ -111,8 +111,8 @@ struct TRINITY_DLL_DECL boss_baron_rivendareAI : public ScriptedAI void JustSummoned(Creature* summoned) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0)) - summoned->AI()->AttackStart(target); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + summoned->AI()->AttackStart(pTarget); } void JustDied(Unit* Killer) @@ -127,38 +127,38 @@ struct TRINITY_DLL_DECL boss_baron_rivendareAI : public ScriptedAI return; //ShadowBolt - if (ShadowBolt_Timer < diff) + if (ShadowBolt_Timer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) DoCast(m_creature->getVictim(),SPELL_SHADOWBOLT); ShadowBolt_Timer = 10000; - }else ShadowBolt_Timer -= diff; + } else ShadowBolt_Timer -= diff; //Cleave - if (Cleave_Timer < diff) + if (Cleave_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_CLEAVE); //13 seconds until we should cast this again Cleave_Timer = 7000 + (rand()%10000); - }else Cleave_Timer -= diff; + } else Cleave_Timer -= diff; //MortalStrike - if (MortalStrike_Timer < diff) + if (MortalStrike_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_MORTALSTRIKE); MortalStrike_Timer = 10000 + (rand()%15000); - }else MortalStrike_Timer -= diff; + } else MortalStrike_Timer -= diff; //RaiseDead - // if (RaiseDead_Timer < diff) + // if (RaiseDead_Timer <= diff) // { // DoCast(m_creature,SPELL_RAISEDEAD); // RaiseDead_Timer = 45000; - // }else RaiseDead_Timer -= diff; + // } else RaiseDead_Timer -= diff; //SummonSkeletons - if (SummonSkeletons_Timer < diff) + if (SummonSkeletons_Timer <= diff) { m_creature->SummonCreature(11197,ADD_1X,ADD_1Y,ADD_1Z,ADD_1O,TEMPSUMMON_TIMED_DESPAWN,29000); m_creature->SummonCreature(11197,ADD_2X,ADD_2Y,ADD_2Z,ADD_2O,TEMPSUMMON_TIMED_DESPAWN,29000); @@ -169,7 +169,7 @@ struct TRINITY_DLL_DECL boss_baron_rivendareAI : public ScriptedAI //34 seconds until we should cast this again SummonSkeletons_Timer = 40000; - }else SummonSkeletons_Timer -= diff; + } else SummonSkeletons_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_baroness_anastari.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_baroness_anastari.cpp index 5498e33f652..a55bb4ea41f 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_baroness_anastari.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_baroness_anastari.cpp @@ -67,45 +67,45 @@ struct TRINITY_DLL_DECL boss_baroness_anastariAI : public ScriptedAI return; //BansheeWail - if (BansheeWail_Timer < diff) + if (BansheeWail_Timer <= diff) { if (rand()%100 < 95) DoCast(m_creature->getVictim(),SPELL_BANSHEEWAIL); //4 seconds until we should cast this again BansheeWail_Timer = 4000; - }else BansheeWail_Timer -= diff; + } else BansheeWail_Timer -= diff; //BansheeCurse - if (BansheeCurse_Timer < diff) + if (BansheeCurse_Timer <= diff) { if (rand()%100 < 75) DoCast(m_creature->getVictim(),SPELL_BANSHEECURSE); //18 seconds until we should cast this again BansheeCurse_Timer = 18000; - }else BansheeCurse_Timer -= diff; + } else BansheeCurse_Timer -= diff; //Silence - if (Silence_Timer < diff) + if (Silence_Timer <= diff) { if (rand()%100 < 80) DoCast(m_creature->getVictim(),SPELL_SILENCE); //13 seconds until we should cast this again Silence_Timer = 13000; - }else Silence_Timer -= diff; + } else Silence_Timer -= diff; //Possess - /* if (Possess_Timer < diff) + /* if (Possess_Timer <= diff) { //Cast if (rand()%100 < 65) { - Unit* target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM,0); - if (target)DoCast(target,SPELL_POSSESS); + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); + if (pTarget)DoCast(pTarget,SPELL_POSSESS); } //50 seconds until we should cast this again Possess_Timer = 50000; - }else Possess_Timer -= diff; + } else Possess_Timer -= diff; */ DoMeleeAttackIfReady(); diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_cannon_master_willey.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_cannon_master_willey.cpp index 702810caba0..d04ea4901b6 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_cannon_master_willey.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_cannon_master_willey.cpp @@ -113,7 +113,7 @@ struct TRINITY_DLL_DECL boss_cannon_master_willeyAI : public ScriptedAI return; //Pummel - if (Pummel_Timer < diff) + if (Pummel_Timer <= diff) { //Cast if (rand()%100 < 90) //90% chance to cast @@ -122,10 +122,10 @@ struct TRINITY_DLL_DECL boss_cannon_master_willeyAI : public ScriptedAI } //12 seconds until we should cast this again Pummel_Timer = 12000; - }else Pummel_Timer -= diff; + } else Pummel_Timer -= diff; //KnockAway - if (KnockAway_Timer < diff) + if (KnockAway_Timer <= diff) { //Cast if (rand()%100 < 80) //80% chance to cast @@ -134,19 +134,19 @@ struct TRINITY_DLL_DECL boss_cannon_master_willeyAI : public ScriptedAI } //14 seconds until we should cast this again KnockAway_Timer = 14000; - }else KnockAway_Timer -= diff; + } else KnockAway_Timer -= diff; //Shoot - if (Shoot_Timer < diff) + if (Shoot_Timer <= diff) { //Cast DoCast(m_creature->getVictim(),SPELL_SHOOT); //1 seconds until we should cast this again Shoot_Timer = 1000; - }else Shoot_Timer -= diff; + } else Shoot_Timer -= diff; //SummonRifleman - if (SummonRifleman_Timer < diff) + if (SummonRifleman_Timer <= diff) { //Cast switch (rand()%9) @@ -199,7 +199,7 @@ struct TRINITY_DLL_DECL boss_cannon_master_willeyAI : public ScriptedAI } //30 seconds until we should cast this again SummonRifleman_Timer = 30000; - }else SummonRifleman_Timer -= diff; + } else SummonRifleman_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_dathrohan_balnazzar.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_dathrohan_balnazzar.cpp index 91477d3fef5..e6fb331579a 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_dathrohan_balnazzar.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_dathrohan_balnazzar.cpp @@ -116,32 +116,32 @@ struct TRINITY_DLL_DECL boss_dathrohan_balnazzarAI : public ScriptedAI if (!m_bTransformed) { //MindBlast - if (m_uiMindBlast_Timer < uiDiff) + if (m_uiMindBlast_Timer <= uiDiff) { DoCast(m_creature->getVictim(),SPELL_MINDBLAST); m_uiMindBlast_Timer = 15000 + rand()%5000; - }else m_uiMindBlast_Timer -= uiDiff; + } else m_uiMindBlast_Timer -= uiDiff; //CrusadersHammer - if (m_uiCrusadersHammer_Timer < uiDiff) + if (m_uiCrusadersHammer_Timer <= uiDiff) { DoCast(m_creature->getVictim(),SPELL_CRUSADERSHAMMER); m_uiCrusadersHammer_Timer = 12000; - }else m_uiCrusadersHammer_Timer -= uiDiff; + } else m_uiCrusadersHammer_Timer -= uiDiff; //CrusaderStrike - if (m_uiCrusaderStrike_Timer < uiDiff) + if (m_uiCrusaderStrike_Timer <= uiDiff) { DoCast(m_creature->getVictim(),SPELL_CRUSADERSTRIKE); m_uiCrusaderStrike_Timer = 15000; - }else m_uiCrusaderStrike_Timer -= uiDiff; + } else m_uiCrusaderStrike_Timer -= uiDiff; //HolyStrike - if (m_uiHolyStrike_Timer < uiDiff) + if (m_uiHolyStrike_Timer <= uiDiff) { DoCast(m_creature->getVictim(),SPELL_HOLYSTRIKE); m_uiHolyStrike_Timer = 15000; - }else m_uiHolyStrike_Timer -= uiDiff; + } else m_uiHolyStrike_Timer -= uiDiff; //BalnazzarTransform if (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 40) @@ -158,43 +158,43 @@ struct TRINITY_DLL_DECL boss_dathrohan_balnazzarAI : public ScriptedAI else { //MindBlast - if (m_uiMindBlast_Timer < uiDiff) + if (m_uiMindBlast_Timer <= uiDiff) { DoCast(m_creature->getVictim(),SPELL_MINDBLAST); m_uiMindBlast_Timer = 15000 + rand()%5000; - }else m_uiMindBlast_Timer -= uiDiff; + } else m_uiMindBlast_Timer -= uiDiff; //ShadowShock - if (m_uiShadowShock_Timer < uiDiff) + if (m_uiShadowShock_Timer <= uiDiff) { DoCast(m_creature->getVictim(),SPELL_SHADOWSHOCK); m_uiShadowShock_Timer = 11000; - }else m_uiShadowShock_Timer -= uiDiff; + } else m_uiShadowShock_Timer -= uiDiff; //PsychicScream - if (m_uiPsychicScream_Timer < uiDiff) + if (m_uiPsychicScream_Timer <= uiDiff) { if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) DoCast(pTarget,SPELL_PSYCHICSCREAM); m_uiPsychicScream_Timer = 20000; - }else m_uiPsychicScream_Timer -= uiDiff; + } else m_uiPsychicScream_Timer -= uiDiff; //DeepSleep - if (m_uiDeepSleep_Timer < uiDiff) + if (m_uiDeepSleep_Timer <= uiDiff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) DoCast(pTarget,SPELL_SLEEP); m_uiDeepSleep_Timer = 15000; - }else m_uiDeepSleep_Timer -= uiDiff; + } else m_uiDeepSleep_Timer -= uiDiff; //MindControl - if (m_uiMindControl_Timer < uiDiff) + if (m_uiMindControl_Timer <= uiDiff) { DoCast(m_creature->getVictim(),SPELL_MINDCONTROL); m_uiMindControl_Timer = 15000; - }else m_uiMindControl_Timer -= uiDiff; + } else m_uiMindControl_Timer -= uiDiff; } DoMeleeAttackIfReady(); diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_magistrate_barthilas.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_magistrate_barthilas.cpp index ed695161455..b360f034b87 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_magistrate_barthilas.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_magistrate_barthilas.cpp @@ -78,7 +78,7 @@ struct TRINITY_DLL_DECL boss_magistrate_barthilasAI : public ScriptedAI if (!UpdateVictim()) return; - if (FuriousAnger_Timer < diff) + if (FuriousAnger_Timer <= diff) { FuriousAnger_Timer = 4000; if (AngerCount > 25) @@ -86,28 +86,28 @@ struct TRINITY_DLL_DECL boss_magistrate_barthilasAI : public ScriptedAI ++AngerCount; m_creature->CastSpell(m_creature,SPELL_FURIOUS_ANGER,false); - }else FuriousAnger_Timer -= diff; + } else FuriousAnger_Timer -= diff; //DrainingBlow - if (DrainingBlow_Timer < diff) + if (DrainingBlow_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_DRAININGBLOW); DrainingBlow_Timer = 15000; - }else DrainingBlow_Timer -= diff; + } else DrainingBlow_Timer -= diff; //CrowdPummel - if (CrowdPummel_Timer < diff) + if (CrowdPummel_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_CROWDPUMMEL); CrowdPummel_Timer = 15000; - }else CrowdPummel_Timer -= diff; + } else CrowdPummel_Timer -= diff; //MightyBlow - if (MightyBlow_Timer < diff) + if (MightyBlow_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_MIGHTYBLOW); MightyBlow_Timer = 20000; - }else MightyBlow_Timer -= diff; + } else MightyBlow_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_maleki_the_pallid.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_maleki_the_pallid.cpp index 1cc4b37a699..2a8b1ae7ed4 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_maleki_the_pallid.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_maleki_the_pallid.cpp @@ -66,28 +66,28 @@ struct TRINITY_DLL_DECL boss_maleki_the_pallidAI : public ScriptedAI return; //Frostbolt - if (Frostbolt_Timer < diff) + if (Frostbolt_Timer <= diff) { if (rand()%100 < 90) DoCast(m_creature->getVictim(),SPELL_FROSTBOLT); Frostbolt_Timer = 3500; - }else Frostbolt_Timer -= diff; + } else Frostbolt_Timer -= diff; //IceTomb - if (IceTomb_Timer < diff) + if (IceTomb_Timer <= diff) { if (rand()%100 < 65) DoCast(m_creature->getVictim(),SPELL_ICETOMB); IceTomb_Timer = 28000; - }else IceTomb_Timer -= diff; + } else IceTomb_Timer -= diff; //DrainLife - if (DrainLife_Timer < diff) + if (DrainLife_Timer <= diff) { if (rand()%100 < 55) DoCast(m_creature->getVictim(),SPELL_DRAINLIFE); DrainLife_Timer = 31000; - }else DrainLife_Timer -= diff; + } else DrainLife_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_nerubenkan.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_nerubenkan.cpp index a5ea4a65bb6..312b09fc182 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_nerubenkan.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_nerubenkan.cpp @@ -40,16 +40,12 @@ struct TRINITY_DLL_DECL boss_nerubenkanAI : public ScriptedAI uint32 EncasingWebs_Timer; uint32 PierceArmor_Timer; - uint32 CryptScarabs_Timer; + uint32 CryptScarabs_Timer; uint32 RaiseUndeadScarab_Timer; - int Rand; - int RandX; - int RandY; - Creature* Summoned; void Reset() { - CryptScarabs_Timer = 3000; + CryptScarabs_Timer = 3000; EncasingWebs_Timer = 7000; PierceArmor_Timer = 19000; RaiseUndeadScarab_Timer = 3000; @@ -67,23 +63,8 @@ struct TRINITY_DLL_DECL boss_nerubenkanAI : public ScriptedAI void RaiseUndeadScarab(Unit* victim) { - Rand = rand()%10; - switch (rand()%2) - { - case 0: RandX = 0 - Rand; break; - case 1: RandX = 0 + Rand; break; - } - Rand = 0; - Rand = rand()%10; - switch (rand()%2) - { - case 0: RandY = 0 - Rand; break; - case 1: RandY = 0 + Rand; break; - } - Rand = 0; - Summoned = DoSpawnCreature(10876, RandX, RandY, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 180000); - if (Summoned) - (Summoned->AI())->AttackStart(victim); + if (Creature *UndeadScarab = DoSpawnCreature(10876, RAND(irand(0,-9),irand(0,9)), RAND(irand(0,-9),irand(0,9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 180000)) + UndeadScarab->AI()->AttackStart(victim); } void UpdateAI(const uint32 diff) @@ -92,33 +73,33 @@ struct TRINITY_DLL_DECL boss_nerubenkanAI : public ScriptedAI return; //EncasingWebs - if (EncasingWebs_Timer < diff) + if (EncasingWebs_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_ENCASINGWEBS); EncasingWebs_Timer = 30000; - }else EncasingWebs_Timer -= diff; + } else EncasingWebs_Timer -= diff; //PierceArmor - if (PierceArmor_Timer < diff) + if (PierceArmor_Timer <= diff) { - if (rand()%100 < 75) + if (urand(0,3) < 2) DoCast(m_creature->getVictim(),SPELL_PIERCEARMOR); PierceArmor_Timer = 35000; - }else PierceArmor_Timer -= diff; + } else PierceArmor_Timer -= diff; //CryptScarabs_Timer - if (CryptScarabs_Timer < diff) + if (CryptScarabs_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_CRYPT_SCARABS); CryptScarabs_Timer = 20000; - }else CryptScarabs_Timer -= diff; + } else CryptScarabs_Timer -= diff; //RaiseUndeadScarab - if (RaiseUndeadScarab_Timer < diff) + if (RaiseUndeadScarab_Timer <= diff) { RaiseUndeadScarab(m_creature->getVictim()); RaiseUndeadScarab_Timer = 16000; - }else RaiseUndeadScarab_Timer -= diff; + } else RaiseUndeadScarab_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_order_of_silver_hand.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_order_of_silver_hand.cpp index 94ed6b0a906..571a7eb8a31 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_order_of_silver_hand.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_order_of_silver_hand.cpp @@ -118,23 +118,23 @@ struct TRINITY_DLL_DECL boss_silver_hand_bossesAI : public ScriptedAI if (!UpdateVictim()) return; - if (HolyLight_Timer < diff) + if (HolyLight_Timer <= diff) { if (m_creature->GetHealth()*5 < m_creature->GetMaxHealth()) { DoCast(m_creature, SPELL_HOLY_LIGHT); HolyLight_Timer = 20000; } - }else HolyLight_Timer -= diff; + } else HolyLight_Timer -= diff; - if (DivineShield_Timer < diff) + if (DivineShield_Timer <= diff) { if (m_creature->GetHealth()*20 < m_creature->GetMaxHealth()) { DoCast(m_creature, SPELL_DIVINE_SHIELD); DivineShield_Timer = 40000; } - }else DivineShield_Timer -= diff; + } else DivineShield_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_postmaster_malown.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_postmaster_malown.cpp index ef43c7774bc..f639fcea2cb 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_postmaster_malown.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_postmaster_malown.cpp @@ -66,7 +66,7 @@ struct TRINITY_DLL_DECL boss_postmaster_malownAI : public ScriptedAI return; //WailingDead - if (WailingDead_Timer < diff) + if (WailingDead_Timer <= diff) { //Cast if (rand()%100 < 65) //65% chance to cast @@ -75,10 +75,10 @@ struct TRINITY_DLL_DECL boss_postmaster_malownAI : public ScriptedAI } //19 seconds until we should cast this again WailingDead_Timer = 19000; - }else WailingDead_Timer -= diff; + } else WailingDead_Timer -= diff; //Backhand - if (Backhand_Timer < diff) + if (Backhand_Timer <= diff) { //Cast if (rand()%100 < 45) //45% chance to cast @@ -87,10 +87,10 @@ struct TRINITY_DLL_DECL boss_postmaster_malownAI : public ScriptedAI } //8 seconds until we should cast this again Backhand_Timer = 8000; - }else Backhand_Timer -= diff; + } else Backhand_Timer -= diff; //CurseOfWeakness - if (CurseOfWeakness_Timer < diff) + if (CurseOfWeakness_Timer <= diff) { //Cast if (rand()%100 < 3) //3% chance to cast @@ -99,10 +99,10 @@ struct TRINITY_DLL_DECL boss_postmaster_malownAI : public ScriptedAI } //20 seconds until we should cast this again CurseOfWeakness_Timer = 20000; - }else CurseOfWeakness_Timer -= diff; + } else CurseOfWeakness_Timer -= diff; //CurseOfTongues - if (CurseOfTongues_Timer < diff) + if (CurseOfTongues_Timer <= diff) { //Cast if (rand()%100 < 3) //3% chance to cast @@ -111,10 +111,10 @@ struct TRINITY_DLL_DECL boss_postmaster_malownAI : public ScriptedAI } //22 seconds until we should cast this again CurseOfTongues_Timer = 22000; - }else CurseOfTongues_Timer -= diff; + } else CurseOfTongues_Timer -= diff; //CallOfTheGrave - if (CallOfTheGrave_Timer < diff) + if (CallOfTheGrave_Timer <= diff) { //Cast if (rand()%100 < 5) //5% chance to cast @@ -123,7 +123,7 @@ struct TRINITY_DLL_DECL boss_postmaster_malownAI : public ScriptedAI } //25 seconds until we should cast this again CallOfTheGrave_Timer = 25000; - }else CallOfTheGrave_Timer -= diff; + } else CallOfTheGrave_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_ramstein_the_gorger.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_ramstein_the_gorger.cpp index c645e17d3f4..73fb8a96a9e 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_ramstein_the_gorger.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_ramstein_the_gorger.cpp @@ -70,18 +70,18 @@ struct TRINITY_DLL_DECL boss_ramstein_the_gorgerAI : public ScriptedAI return; //Trample - if (Trample_Timer < diff) + if (Trample_Timer <= diff) { DoCast(m_creature,SPELL_TRAMPLE); Trample_Timer = 7000; - }else Trample_Timer -= diff; + } else Trample_Timer -= diff; //Knockout - if (Knockout_Timer < diff) + if (Knockout_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_KNOCKOUT); Knockout_Timer = 10000; - }else Knockout_Timer -= diff; + } else Knockout_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_timmy_the_cruel.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_timmy_the_cruel.cpp index e6e96c3a776..813586bcb42 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_timmy_the_cruel.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_timmy_the_cruel.cpp @@ -56,13 +56,13 @@ struct TRINITY_DLL_DECL boss_timmy_the_cruelAI : public ScriptedAI return; //RavenousClaw - if (RavenousClaw_Timer < diff) + if (RavenousClaw_Timer <= diff) { //Cast DoCast(m_creature->getVictim(),SPELL_RAVENOUSCLAW); //15 seconds until we should cast this again RavenousClaw_Timer = 15000; - }else RavenousClaw_Timer -= diff; + } else RavenousClaw_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp index 3b3d0c6a670..1fb28e0b0a2 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp @@ -385,7 +385,7 @@ struct TRINITY_DLL_DECL instance_stratholme : public ScriptedInstance SetData(TYPE_BARON_RUN, FAIL); BaronRun_Timer = 0; debug_log("TSCR: Instance Stratholme: Baron run event reached end. Event has state %u.",GetData(TYPE_BARON_RUN)); - }else BaronRun_Timer -= diff; + } else BaronRun_Timer -= diff; } if (SlaugtherSquare_Timer) @@ -402,7 +402,7 @@ struct TRINITY_DLL_DECL instance_stratholme : public ScriptedInstance debug_log("TSCR: Instance Stratholme: Black guard sentries spawned. Opening gates to baron."); } SlaugtherSquare_Timer = 0; - }else SlaugtherSquare_Timer -= diff; + } else SlaugtherSquare_Timer -= diff; } } }; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/stratholme.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/stratholme.cpp index 38129a208fd..58f1559286e 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/stratholme.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/stratholme.cpp @@ -148,7 +148,7 @@ struct TRINITY_DLL_DECL mob_restless_soulAI : public ScriptedAI { if (Tagged) { - if (Die_Timer < diff) + if (Die_Timer <= diff) { if (Unit* pTemp = Unit::GetUnit(*m_creature,Tagger)) pTemp->Kill(pTemp); @@ -210,7 +210,7 @@ struct TRINITY_DLL_DECL mobs_spectral_ghostly_citizenAI : public ScriptedAI { if (Tagged) { - if (Die_Timer < diff) + if (Die_Timer <= diff) m_creature->Kill(m_creature); else Die_Timer -= diff; } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_brutallus.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_brutallus.cpp index 2b8bf280ad5..dd0ad1a58bb 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_brutallus.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_brutallus.cpp @@ -256,13 +256,13 @@ struct TRINITY_DLL_DECL boss_brutallusAI : public ScriptedAI { if (IsIntro) { - if (IntroPhaseTimer < diff) + if (IntroPhaseTimer <= diff) DoIntro(); else IntroPhaseTimer -= diff; if (IntroPhase == 3 + 1) { - if (IntroFrostBoltTimer < diff) + if (IntroFrostBoltTimer <= diff) { if (Madrigosa) { @@ -276,28 +276,28 @@ struct TRINITY_DLL_DECL boss_brutallusAI : public ScriptedAI if (!UpdateVictim() || IsIntro) return; - if (SlashTimer < diff) + if (SlashTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_METEOR_SLASH); SlashTimer = 11000; } else SlashTimer -= diff; - if (StompTimer < diff) + if (StompTimer <= diff) { DoScriptText(RAND(YELL_LOVE1,YELL_LOVE2,YELL_LOVE3), m_creature); DoCast(m_creature->getVictim(), SPELL_STOMP); StompTimer = 30000; } else StompTimer -= diff; - if (BurnTimer < diff) + if (BurnTimer <= diff) { - if (Unit *target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - if(!target->HasAura(SPELL_BURN)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if(!pTarget->HasAura(SPELL_BURN)) { - target->CastSpell(target, SPELL_BURN, true); + pTarget->CastSpell(pTarget, SPELL_BURN, true); BurnTimer = urand(60000,180000); } else - BurnTimer = 1000 + diff; // if target has SPELL_BURN, wait a bit. + BurnTimer = 1000 + diff; // if pTarget has SPELL_BURN, wait a bit. else BurnTimer = urand(60000,180000); // no targets!? } else BurnTimer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_eredar_twins.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_eredar_twins.cpp index 8c4ae59cfda..7483f96c5e1 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_eredar_twins.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_eredar_twins.cpp @@ -78,7 +78,7 @@ enum Spells SPELL_PYROGENICS = 45230, //15secs SPELL_FLAME_TOUCHED = 45348, SPELL_CONFLAGRATION = 45342, //30-35 secs - SPELL_BLAZE = 45235, //on main target every 3 secs + SPELL_BLAZE = 45235, //on main pTarget every 3 secs SPELL_FLAME_SEAR = 46771, SPELL_BLAZE_SUMMON = 45236, //187366 GO SPELL_BLAZE_BURN = 45246 @@ -181,7 +181,7 @@ struct TRINITY_DLL_DECL boss_sacrolashAI : public ScriptedAI m_creature->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); } - void SpellHitTarget(Unit* target,const SpellEntry* spell) + void SpellHitTarget(Unit *pTarget,const SpellEntry* spell) { switch(spell->Id) { @@ -189,36 +189,36 @@ struct TRINITY_DLL_DECL boss_sacrolashAI : public ScriptedAI case SPELL_SHADOW_NOVA: case SPELL_CONFOUNDING_BLOW: case SPELL_SHADOW_FURY: - HandleTouchedSpells(target, SPELL_DARK_TOUCHED); + HandleTouchedSpells(pTarget, SPELL_DARK_TOUCHED); break; case SPELL_CONFLAGRATION: - HandleTouchedSpells(target, SPELL_FLAME_TOUCHED); + HandleTouchedSpells(pTarget, SPELL_FLAME_TOUCHED); break; } } - void HandleTouchedSpells(Unit* target, uint32 TouchedType) + void HandleTouchedSpells(Unit *pTarget, uint32 TouchedType) { switch(TouchedType) { case SPELL_FLAME_TOUCHED: - if (!target->HasAura(SPELL_DARK_FLAME)) + if (!pTarget->HasAura(SPELL_DARK_FLAME)) { - if (target->HasAura(SPELL_DARK_TOUCHED)) + if (pTarget->HasAura(SPELL_DARK_TOUCHED)) { - target->RemoveAurasDueToSpell(SPELL_DARK_TOUCHED); - target->CastSpell(target, SPELL_DARK_FLAME, true); - }else target->CastSpell(target, SPELL_FLAME_TOUCHED, true); + pTarget->RemoveAurasDueToSpell(SPELL_DARK_TOUCHED); + pTarget->CastSpell(pTarget, SPELL_DARK_FLAME, true); + } else pTarget->CastSpell(pTarget, SPELL_FLAME_TOUCHED, true); } break; case SPELL_DARK_TOUCHED: - if (!target->HasAura(SPELL_DARK_FLAME)) + if (!pTarget->HasAura(SPELL_DARK_FLAME)) { - if (target->HasAura(SPELL_FLAME_TOUCHED)) + if (pTarget->HasAura(SPELL_FLAME_TOUCHED)) { - target->RemoveAurasDueToSpell(SPELL_FLAME_TOUCHED); - target->CastSpell(target, SPELL_DARK_FLAME, true); - }else target->CastSpell(target, SPELL_DARK_TOUCHED, true); + pTarget->RemoveAurasDueToSpell(SPELL_FLAME_TOUCHED); + pTarget->CastSpell(pTarget, SPELL_DARK_FLAME, true); + } else pTarget->CastSpell(pTarget, SPELL_DARK_TOUCHED, true); } break; } @@ -247,75 +247,75 @@ struct TRINITY_DLL_DECL boss_sacrolashAI : public ScriptedAI if (SisterDeath) { - if (ConflagrationTimer < diff) + if (ConflagrationTimer <= diff) { if (!m_creature->IsNonMeleeSpellCasted(false)) { m_creature->InterruptSpell(CURRENT_GENERIC_SPELL); - Unit* target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (target) - DoCast(target, SPELL_CONFLAGRATION); + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + if (pTarget) + DoCast(pTarget, SPELL_CONFLAGRATION); ConflagrationTimer = 30000+(rand()%5000); } - }else ConflagrationTimer -= diff; + } else ConflagrationTimer -= diff; } else { - if (ShadownovaTimer < diff) + if (ShadownovaTimer <= diff) { if (!m_creature->IsNonMeleeSpellCasted(false)) { - Unit* target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (target) - DoCast(target, SPELL_SHADOW_NOVA); + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + if (pTarget) + DoCast(pTarget, SPELL_SHADOW_NOVA); if (!SisterDeath) { - if (target) - DoScriptText(EMOTE_SHADOW_NOVA, m_creature, target); + if (pTarget) + DoScriptText(EMOTE_SHADOW_NOVA, m_creature, pTarget); DoScriptText(YELL_SHADOW_NOVA, m_creature); } ShadownovaTimer = 30000+(rand()%5000); } - }else ShadownovaTimer -=diff; + } else ShadownovaTimer -=diff; } - if (ConfoundingblowTimer < diff) + if (ConfoundingblowTimer <= diff) { if (!m_creature->IsNonMeleeSpellCasted(false)) { - Unit* target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (target) - DoCast(target, SPELL_CONFOUNDING_BLOW); + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + if (pTarget) + DoCast(pTarget, SPELL_CONFOUNDING_BLOW); ConfoundingblowTimer = 20000 + (rand()%5000); } - }else ConfoundingblowTimer -=diff; + } else ConfoundingblowTimer -=diff; - if (ShadowimageTimer < diff) + if (ShadowimageTimer <= diff) { - Unit* target = NULL; + Unit *pTarget = NULL; Creature* temp = NULL; for (uint8 i = 0; i<3; ++i) { - target = SelectUnit(SELECT_TARGET_RANDOM, 0); + pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); temp = DoSpawnCreature(MOB_SHADOW_IMAGE,0,0,0,0,TEMPSUMMON_CORPSE_DESPAWN,10000); - if (temp && target) - temp->AI()->AttackStart(target); + if (temp && pTarget) + temp->AI()->AttackStart(pTarget); } ShadowimageTimer = 20000; - }else ShadowimageTimer -=diff; + } else ShadowimageTimer -=diff; - if (ShadowbladesTimer < diff) + if (ShadowbladesTimer <= diff) { if (!m_creature->IsNonMeleeSpellCasted(false)) { DoCast(m_creature, SPELL_SHADOW_BLADES); ShadowbladesTimer = 10000; } - }else ShadowbladesTimer -=diff; + } else ShadowbladesTimer -=diff; if (EnrageTimer < diff && !Enraged) { @@ -323,7 +323,7 @@ struct TRINITY_DLL_DECL boss_sacrolashAI : public ScriptedAI DoScriptText(YELL_ENRAGE, m_creature); DoCast(m_creature,SPELL_ENRAGE); Enraged = true; - }else EnrageTimer -= diff; + } else EnrageTimer -= diff; if (m_creature->isAttackReady() && !m_creature->IsNonMeleeSpellCasted(false)) { @@ -470,48 +470,48 @@ struct TRINITY_DLL_DECL boss_alythessAI : public Scripted_NoMovementAI m_creature->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); } - void SpellHitTarget(Unit* target,const SpellEntry* spell) + void SpellHitTarget(Unit *pTarget,const SpellEntry* spell) { switch(spell->Id) { case SPELL_BLAZE: - target->CastSpell(target, SPELL_BLAZE_SUMMON, true); + pTarget->CastSpell(pTarget, SPELL_BLAZE_SUMMON, true); case SPELL_CONFLAGRATION: case SPELL_FLAME_SEAR: - HandleTouchedSpells(target, SPELL_FLAME_TOUCHED); + HandleTouchedSpells(pTarget, SPELL_FLAME_TOUCHED); break; case SPELL_SHADOW_NOVA: - HandleTouchedSpells(target, SPELL_DARK_TOUCHED); + HandleTouchedSpells(pTarget, SPELL_DARK_TOUCHED); break; } } - void HandleTouchedSpells(Unit* target, uint32 TouchedType) + void HandleTouchedSpells(Unit *pTarget, uint32 TouchedType) { switch(TouchedType) { case SPELL_FLAME_TOUCHED: - if (!target->HasAura(SPELL_DARK_FLAME)) + if (!pTarget->HasAura(SPELL_DARK_FLAME)) { - if (target->HasAura(SPELL_DARK_TOUCHED)) + if (pTarget->HasAura(SPELL_DARK_TOUCHED)) { - target->RemoveAurasDueToSpell(SPELL_DARK_TOUCHED); - target->CastSpell(target, SPELL_DARK_FLAME, true); + pTarget->RemoveAurasDueToSpell(SPELL_DARK_TOUCHED); + pTarget->CastSpell(pTarget, SPELL_DARK_FLAME, true); }else { - target->CastSpell(target, SPELL_FLAME_TOUCHED, true); + pTarget->CastSpell(pTarget, SPELL_FLAME_TOUCHED, true); } } break; case SPELL_DARK_TOUCHED: - if (!target->HasAura(SPELL_DARK_FLAME)) + if (!pTarget->HasAura(SPELL_DARK_FLAME)) { - if (target->HasAura(SPELL_FLAME_TOUCHED)) + if (pTarget->HasAura(SPELL_FLAME_TOUCHED)) { - target->RemoveAurasDueToSpell(SPELL_FLAME_TOUCHED); - target->CastSpell(target, SPELL_DARK_FLAME, true); - }else target->CastSpell(target, SPELL_DARK_TOUCHED, true); + pTarget->RemoveAurasDueToSpell(SPELL_FLAME_TOUCHED); + pTarget->CastSpell(pTarget, SPELL_DARK_FLAME, true); + } else pTarget->CastSpell(pTarget, SPELL_DARK_TOUCHED, true); } break; } @@ -551,10 +551,10 @@ struct TRINITY_DLL_DECL boss_alythessAI : public Scripted_NoMovementAI { if (IntroStepCounter < 9) { - if (IntroYellTimer < diff) + if (IntroYellTimer <= diff) { IntroYellTimer = IntroStep(++IntroStepCounter); - }else IntroYellTimer -= diff; + } else IntroYellTimer -= diff; } if (!SisterDeath) @@ -578,69 +578,69 @@ struct TRINITY_DLL_DECL boss_alythessAI : public Scripted_NoMovementAI if (SisterDeath) { - if (ShadownovaTimer < diff) + if (ShadownovaTimer <= diff) { if (!m_creature->IsNonMeleeSpellCasted(false)) { - Unit* target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (target) - DoCast(target, SPELL_SHADOW_NOVA); + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + if (pTarget) + DoCast(pTarget, SPELL_SHADOW_NOVA); ShadownovaTimer= 30000+(rand()%5000); } - }else ShadownovaTimer -=diff; + } else ShadownovaTimer -=diff; } else { - if (ConflagrationTimer < diff) + if (ConflagrationTimer <= diff) { if (!m_creature->IsNonMeleeSpellCasted(false)) { m_creature->InterruptSpell(CURRENT_GENERIC_SPELL); - Unit* target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (target) - DoCast(target, SPELL_CONFLAGRATION); + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + if (pTarget) + DoCast(pTarget, SPELL_CONFLAGRATION); ConflagrationTimer = 30000+(rand()%5000); if (!SisterDeath) { - if (target) - DoScriptText(EMOTE_CONFLAGRATION, m_creature, target); + if (pTarget) + DoScriptText(EMOTE_CONFLAGRATION, m_creature, pTarget); DoScriptText(YELL_CANFLAGRATION, m_creature); } BlazeTimer = 4000; } - }else ConflagrationTimer -= diff; + } else ConflagrationTimer -= diff; } - if (FlamesearTimer < diff) + if (FlamesearTimer <= diff) { if (!m_creature->IsNonMeleeSpellCasted(false)) { DoCast(m_creature, SPELL_FLAME_SEAR); FlamesearTimer = 15000; } - }else FlamesearTimer -=diff; + } else FlamesearTimer -=diff; - if (PyrogenicsTimer < diff) + if (PyrogenicsTimer <= diff) { if (!m_creature->IsNonMeleeSpellCasted(false)) { DoCast(m_creature, SPELL_PYROGENICS,true); PyrogenicsTimer = 15000; } - }else PyrogenicsTimer -= diff; + } else PyrogenicsTimer -= diff; - if (BlazeTimer < diff) + if (BlazeTimer <= diff) { if (!m_creature->IsNonMeleeSpellCasted(false)) { DoCast(m_creature->getVictim(), SPELL_BLAZE); BlazeTimer = 3800; } - }else BlazeTimer -= diff; + } else BlazeTimer -= diff; if (EnrageTimer < diff && !Enraged) { @@ -648,7 +648,7 @@ struct TRINITY_DLL_DECL boss_alythessAI : public Scripted_NoMovementAI DoScriptText(YELL_BERSERK, m_creature); DoCast(m_creature, SPELL_ENRAGE); Enraged = true; - }else EnrageTimer -= diff; + } else EnrageTimer -= diff; } }; @@ -674,20 +674,20 @@ struct TRINITY_DLL_DECL mob_shadow_imageAI : public ScriptedAI void EnterCombat(Unit *who){} - void SpellHitTarget(Unit* target,const SpellEntry* spell) + void SpellHitTarget(Unit *pTarget,const SpellEntry* spell) { switch(spell->Id) { case SPELL_SHADOW_FURY: case SPELL_DARK_STRIKE: - if (!target->HasAura(SPELL_DARK_FLAME)) + if (!pTarget->HasAura(SPELL_DARK_FLAME)) { - if (target->HasAura(SPELL_FLAME_TOUCHED)) + if (pTarget->HasAura(SPELL_FLAME_TOUCHED)) { - target->RemoveAurasDueToSpell(SPELL_FLAME_TOUCHED); - target->CastSpell(target, SPELL_DARK_FLAME, true); - } else target->CastSpell(target,SPELL_DARK_TOUCHED,true); + pTarget->RemoveAurasDueToSpell(SPELL_FLAME_TOUCHED); + pTarget->CastSpell(pTarget, SPELL_DARK_FLAME, true); + } else pTarget->CastSpell(pTarget,SPELL_DARK_TOUCHED,true); } break; } @@ -698,7 +698,7 @@ struct TRINITY_DLL_DECL mob_shadow_imageAI : public ScriptedAI if (!m_creature->HasAura(SPELL_IMAGE_VISUAL)) DoCast(m_creature, SPELL_IMAGE_VISUAL); - if (KillTimer < diff) + if (KillTimer <= diff) { m_creature->Kill(m_creature); KillTimer = 9999999; @@ -707,13 +707,13 @@ struct TRINITY_DLL_DECL mob_shadow_imageAI : public ScriptedAI if (!UpdateVictim()) return; - if (ShadowfuryTimer < diff) + if (ShadowfuryTimer <= diff) { DoCast(m_creature, SPELL_SHADOW_FURY); ShadowfuryTimer = 10000; } else ShadowfuryTimer -=diff; - if (DarkstrikeTimer < diff) + if (DarkstrikeTimer <= diff) { if (!m_creature->IsNonMeleeSpellCasted(false)) { diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_felmyst.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_felmyst.cpp index 57d9d19a591..ab253a9c8cf 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_felmyst.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_felmyst.cpp @@ -301,15 +301,15 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI break; case 2:{ error_log("Summon Vapor case 2"); - Unit* target; - target = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true); - if (!target) target = Unit::GetUnit(*m_creature, pInstance ? pInstance->GetData64(DATA_PLAYER_GUID) : 0); - if (target) + Unit *pTarget; + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true); + if (!pTarget) pTarget = Unit::GetUnit(*m_creature, pInstance ? pInstance->GetData64(DATA_PLAYER_GUID) : 0); + if (pTarget) { - Creature* Vapor = m_creature->SummonCreature(MOB_VAPOR, target->GetPositionX()-5+rand()%10, target->GetPositionY()-5+rand()%10, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 9000); + Creature* Vapor = m_creature->SummonCreature(MOB_VAPOR, pTarget->GetPositionX()-5+rand()%10, pTarget->GetPositionY()-5+rand()%10, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 9000); if (Vapor) { - Vapor->AI()->AttackStart(target); + Vapor->AI()->AttackStart(pTarget); m_creature->InterruptNonMeleeSpells(false); m_creature->CastSpell(Vapor, SPELL_VAPOR_CHANNEL, false); // core bug Vapor->CastSpell(Vapor, SPELL_VAPOR_TRIGGER, true); @@ -326,16 +326,16 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI DespawnSummons(MOB_VAPOR_TRAIL); error_log("Summon Vapor case3"); //m_creature->CastSpell(m_creature, SPELL_VAPOR_SELECT); need core support - Unit* target; - target = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true); - if (!target) target = Unit::GetUnit(*m_creature, pInstance ? pInstance->GetData64(DATA_PLAYER_GUID) : 0); - if (target) + Unit *pTarget; + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true); + if (!pTarget) pTarget = Unit::GetUnit(*m_creature, pInstance ? pInstance->GetData64(DATA_PLAYER_GUID) : 0); + if (pTarget) { - //target->CastSpell(target, SPELL_VAPOR_SUMMON, true); need core support - Creature* Vapor = m_creature->SummonCreature(MOB_VAPOR, target->GetPositionX()-5+rand()%10, target->GetPositionY()-5+rand()%10, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 9000); + //pTarget->CastSpell(pTarget, SPELL_VAPOR_SUMMON, true); need core support + Creature* Vapor = m_creature->SummonCreature(MOB_VAPOR, pTarget->GetPositionX()-5+rand()%10, pTarget->GetPositionY()-5+rand()%10, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 9000); if (Vapor) { - Vapor->AI()->AttackStart(target); + Vapor->AI()->AttackStart(pTarget); m_creature->InterruptNonMeleeSpells(false); m_creature->CastSpell(Vapor, SPELL_VAPOR_CHANNEL, false); // core bug Vapor->CastSpell(Vapor, SPELL_VAPOR_TRIGGER, true); @@ -353,15 +353,15 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI Timer[EVENT_FLIGHT_SEQUENCE] = 1; break; case 5:{ - Unit* target; - target = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true); - if (!target) target = Unit::GetUnit(*m_creature, pInstance ? pInstance->GetData64(DATA_PLAYER_GUID) : 0); - if (target) + Unit *pTarget; + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true); + if (!pTarget) pTarget = Unit::GetUnit(*m_creature, pInstance ? pInstance->GetData64(DATA_PLAYER_GUID) : 0); + if (pTarget) { - BreathX = target->GetPositionX(); - BreathY = target->GetPositionY(); + BreathX = pTarget->GetPositionX(); + BreathY = pTarget->GetPositionY(); float x, y, z; - target->GetContactPoint(m_creature, x, y, z, 70); + pTarget->GetContactPoint(m_creature, x, y, z, 70); m_creature->GetMotionMaster()->MovePoint(0, x, y, z+10); }else { @@ -396,10 +396,10 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI if (BreathCount < 3) FlightCount = 4; break; case 9: - if (Unit* target = SelectUnit(SELECT_TARGET_TOPAGGRO, 0)) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_TOPAGGRO, 0)) { float x, y, z; - target->GetContactPoint(m_creature, x, y, z); + pTarget->GetContactPoint(m_creature, x, y, z); m_creature->GetMotionMaster()->MovePoint(0, x, y, z); } else @@ -439,7 +439,7 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI { if (!Event) Event = (EventFelmyst)i; - }else Timer[i] -= diff; + } else Timer[i] -= diff; } if (m_creature->IsNonMeleeSpellCasted(false)) @@ -467,9 +467,9 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI Timer[EVENT_GAS_NOVA] = 20000 + rand()%5 * 1000; break; case EVENT_ENCAPSULATE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true)) { - m_creature->CastSpell(target, SPELL_ENCAPSULATE_CHANNEL, false); + m_creature->CastSpell(pTarget, SPELL_ENCAPSULATE_CHANNEL, false); Timer[EVENT_ENCAPSULATE] = 25000 + rand()%5 * 1000; }break; case EVENT_FLIGHT: 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 c6ee37ad33f..adb8057936a 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 @@ -219,13 +219,13 @@ struct TRINITY_DLL_DECL boss_kalecgosAI : public ScriptedAI else BadEnding(); TalkSequence++; - }else TalkTimer -= diff; + } else TalkTimer -= diff; } else { if(JustReseted) { - if (ResetTimer < diff) + if (ResetTimer <= diff) { me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE + UNIT_FLAG_NOT_SELECTABLE); me->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING); @@ -233,13 +233,13 @@ struct TRINITY_DLL_DECL boss_kalecgosAI : public ScriptedAI me->SetStandState(UNIT_STAND_STATE_SLEEP); ResetTimer = 10000; JustReseted = false; - }else ResetTimer -= diff; + } else ResetTimer -= diff; return; } if (!UpdateVictim()) return; - if (CheckTimer < diff) + if (CheckTimer <= diff) { if(me->GetDistance(CENTER_X, CENTER_Y, DRAGON_REALM_Z) >= 75) { @@ -272,33 +272,33 @@ struct TRINITY_DLL_DECL boss_kalecgosAI : public ScriptedAI } } CheckTimer = 1000; - }else CheckTimer -= diff; + } else CheckTimer -= diff; - if (ArcaneBuffetTimer < diff) + if (ArcaneBuffetTimer <= diff) { DoCastAOE(SPELL_ARCANE_BUFFET); ArcaneBuffetTimer = 8000; - }else ArcaneBuffetTimer -= diff; + } else ArcaneBuffetTimer -= diff; - if (FrostBreathTimer < diff) + if (FrostBreathTimer <= diff) { DoCastAOE(SPELL_FROST_BREATH); FrostBreathTimer = 15000; - }else FrostBreathTimer -= diff; + } else FrostBreathTimer -= diff; - if (TailLashTimer < diff) + if (TailLashTimer <= diff) { DoCastAOE(SPELL_TAIL_LASH); TailLashTimer = 15000; - }else TailLashTimer -= diff; + } else TailLashTimer -= diff; - if (WildMagicTimer < diff) + if (WildMagicTimer <= diff) { DoCastAOE(WildMagic[rand()%6]); WildMagicTimer = 20000; - }else WildMagicTimer -= diff; + } else WildMagicTimer -= diff; - if (SpectralBlastTimer < diff) + if (SpectralBlastTimer <= diff) { std::list<HostilReference*> &m_threatlist = me->getThreatManager().getThreatList(); std::list<Unit*> targetList; @@ -316,8 +316,8 @@ struct TRINITY_DLL_DECL boss_kalecgosAI : public ScriptedAI { (*i)->CastSpell((*i), SPELL_SPECTRAL_BLAST,true); SpectralBlastTimer = 20000+rand()%5000; - }else SpectralBlastTimer = 1000; - }else SpectralBlastTimer -= diff; + } else SpectralBlastTimer = 1000; + } else SpectralBlastTimer -= diff; DoMeleeAttackIfReady(); } @@ -483,9 +483,9 @@ struct TRINITY_DLL_DECL boss_sathrovarrAI : public ScriptedAI damage = 0; } - void KilledUnit(Unit *target) + void KilledUnit(Unit *pTarget) { - if (target->GetGUID() == KalecGUID) + if (pTarget->GetGUID() == KalecGUID) { TeleportAllPlayersBack(); if (Creature *Kalecgos = Unit::GetCreature(*me, KalecgosGUID)) @@ -551,7 +551,7 @@ struct TRINITY_DLL_DECL boss_sathrovarrAI : public ScriptedAI if (!UpdateVictim()) return; - if (CheckTimer < diff) + if (CheckTimer <= diff) { Creature *Kalec = Unit::GetCreature(*me, KalecGUID); if(!Kalec || (Kalec && !Kalec->isAlive())) @@ -595,9 +595,9 @@ struct TRINITY_DLL_DECL boss_sathrovarrAI : public ScriptedAI } } CheckTimer = 1000; - }else CheckTimer -= diff; + } else CheckTimer -= diff; - if (ResetThreat < diff) + if (ResetThreat <= diff) { for (std::list<HostilReference*>::iterator itr = me->getThreatManager().getThreatList().begin(); itr != me->getThreatManager().getThreatList().end(); ++itr) { @@ -610,29 +610,29 @@ struct TRINITY_DLL_DECL boss_sathrovarrAI : public ScriptedAI } } ResetThreat = 1000; - }else ResetThreat -= diff; + } else ResetThreat -= diff; - if (ShadowBoltTimer < diff) + if (ShadowBoltTimer <= diff) { if(!(rand()%5))DoScriptText(SAY_SATH_SPELL1, me); DoCast(me, SPELL_SHADOW_BOLT); ShadowBoltTimer = 7000+(rand()%3000); - }else ShadowBoltTimer -= diff; + } else ShadowBoltTimer -= diff; - if (AgonyCurseTimer < diff) + if (AgonyCurseTimer <= diff) { - Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (!target) target = me->getVictim(); - DoCast(target, SPELL_AGONY_CURSE); + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + if (!pTarget) pTarget = me->getVictim(); + DoCast(pTarget, SPELL_AGONY_CURSE); AgonyCurseTimer = 20000; - }else AgonyCurseTimer -= diff; + } else AgonyCurseTimer -= diff; - if (CorruptionStrikeTimer < diff) + if (CorruptionStrikeTimer <= diff) { if(!(rand()%5))DoScriptText(SAY_SATH_SPELL2, me); DoCast(me->getVictim(), SPELL_CORRUPTION_STRIKE); CorruptionStrikeTimer = 13000; - }else CorruptionStrikeTimer -= diff; + } else CorruptionStrikeTimer -= diff; DoMeleeAttackIfReady(); } @@ -684,7 +684,7 @@ struct TRINITY_DLL_DECL boss_kalecAI : public ScriptedAI if (!UpdateVictim()) return; - if (YellTimer < diff) + if (YellTimer <= diff) { switch(YellSequence) { @@ -712,17 +712,17 @@ struct TRINITY_DLL_DECL boss_kalecAI : public ScriptedAI YellTimer = 5000; } - if (RevitalizeTimer < diff) + if (RevitalizeTimer <= diff) { DoCast(me, SPELL_REVITALIZE); RevitalizeTimer = 5000; - }else RevitalizeTimer -= diff; + } else RevitalizeTimer -= diff; - if (HeroicStrikeTimer < diff) + if (HeroicStrikeTimer <= diff) { DoCast(me->getVictim(), SPELL_HEROIC_STRIKE); HeroicStrikeTimer = 2000; - }else HeroicStrikeTimer -= diff; + } else HeroicStrikeTimer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp index b447d7fafef..e2d4c5c41f8 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp @@ -109,7 +109,7 @@ enum SpellIds SPELL_ARMAGEDDON_VISUAL = 45911, // Does the hellfire visual to indicate where the meteor missle lands SPELL_ARMAGEDDON_VISUAL2 = 45914, // Does the light visual to indicate where the meteor missle lands SPELL_ARMAGEDDON_VISUAL3 = 24207, // This shouldn't correct but same as seen on the movie - SPELL_ARMAGEDDON_SUMMON_TRIGGER = 45921, // Summons the triggers that cast the spells on himself need random target select + SPELL_ARMAGEDDON_SUMMON_TRIGGER = 45921, // Summons the triggers that cast the spells on himself need random pTarget select SPELL_ARMAGEDDON_DAMAGE = 45915, // This does the area damage /* Shield Orb Spells*/ @@ -560,16 +560,16 @@ struct TRINITY_DLL_DECL boss_kiljaedenAI : public Scripted_NoMovementAI for (uint8 i = 0; i < 4; ++i) { float x,y,z; - Unit* target; + Unit *pTarget; for (uint8 z = 0; z < 6; ++z) { - target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); - if (!target->HasAura(SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT,0))break; + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + if (!pTarget->HasAura(SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT,0))break; } - target->GetPosition(x,y,z); + pTarget->GetPosition(x,y,z); Creature* SinisterReflection = m_creature->SummonCreature(CREATURE_SINISTER_REFLECTION, x,y,z,0, TEMPSUMMON_CORPSE_DESPAWN, 0); if (SinisterReflection) - SinisterReflection->AI()->AttackStart(target); + SinisterReflection->AI()->AttackStart(pTarget); } } @@ -580,7 +580,7 @@ struct TRINITY_DLL_DECL boss_kiljaedenAI : public Scripted_NoMovementAI if (IsWaiting) { - if (WaitTimer < diff) + if (WaitTimer <= diff) { IsWaiting = false; ChangeTimers(false, 0); @@ -702,16 +702,16 @@ struct TRINITY_DLL_DECL boss_kiljaedenAI : public Scripted_NoMovementAI TimerIsDeactiveted[TIMER_ORBS_EMPOWER] = true; break; case TIMER_ARMAGEDDON: //Phase 4 - Unit* target; + Unit *pTarget; for (uint8 z = 0; z < 6; ++z) { - target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); - if (!target->HasAura(SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT,0)) break; + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + if (!pTarget->HasAura(SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT,0)) break; } - if (target) + if (pTarget) { float x, y, z; - target->GetPosition(x, y, z); + pTarget->GetPosition(x, y, z); m_creature->SummonCreature(CREATURE_ARMAGEDDON_TARGET, x,y,z,0, TEMPSUMMON_TIMED_DESPAWN,15000); } Timer[TIMER_ARMAGEDDON] = 2000; // No, I'm not kidding @@ -933,13 +933,13 @@ struct TRINITY_DLL_DECL mob_hand_of_the_deceiverAI : public ScriptedAI DoCast(m_creature, SPELL_SHADOW_INFUSION, true); // Shadow Bolt Volley - Shoots Shadow Bolts at all enemies within 30 yards, for ~2k Shadow damage. - if (ShadowBoltVolleyTimer < diff){ + if (ShadowBoltVolleyTimer <= diff){ DoCast(m_creature->getVictim(), SPELL_SHADOW_BOLT_VOLLEY); ShadowBoltVolleyTimer = 12000; - }else ShadowBoltVolleyTimer -= diff; + } else ShadowBoltVolleyTimer -= diff; // Felfire Portal - Creatres a portal, that spawns Volatile Felfire Fiends, which do suicide bombing. - if (FelfirePortalTimer < diff){ + if (FelfirePortalTimer <= diff){ Creature* Portal = DoSpawnCreature(CREATURE_FELFIRE_PORTAL, 0, 0,0, 0, TEMPSUMMON_TIMED_DESPAWN, 20000); if (Portal) { @@ -952,7 +952,7 @@ struct TRINITY_DLL_DECL mob_hand_of_the_deceiverAI : public ScriptedAI } } FelfirePortalTimer = 20000; - }else FelfirePortalTimer -= diff; + } else FelfirePortalTimer -= diff; DoMeleeAttackIfReady(); } @@ -993,13 +993,13 @@ struct TRINITY_DLL_DECL mob_felfire_portalAI : public Scripted_NoMovementAI if (!UpdateVictim()) return; - if (SpawnFiendTimer < diff) + if (SpawnFiendTimer <= diff) { Creature* Fiend = DoSpawnCreature(CREATURE_VOLATILE_FELFIRE_FIEND, 0, 0, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 20000); if (Fiend) Fiend->AddThreat(SelectUnit(SELECT_TARGET_RANDOM,0), 100000.0f); SpawnFiendTimer = urand(4000,8000); - }else SpawnFiendTimer -= diff; + } else SpawnFiendTimer -= diff; } }; @@ -1042,7 +1042,7 @@ struct TRINITY_DLL_DECL mob_volatile_felfire_fiendAI : public ScriptedAI if (ExplodeTimer) { - if (ExplodeTimer < diff) + if (ExplodeTimer <= diff) ExplodeTimer = 0; else ExplodeTimer -= diff; } @@ -1075,7 +1075,7 @@ struct TRINITY_DLL_DECL mob_armageddonAI : public Scripted_NoMovementAI void UpdateAI(const uint32 diff) { - if (Timer < diff) + if (Timer <= diff) { switch(Spell) { @@ -1161,7 +1161,7 @@ struct TRINITY_DLL_DECL mob_shield_orbAI : public ScriptedAI } else { - if (CheckTimer < diff) + if (CheckTimer <= diff) { DoTeleportTo(x,y,SHIELD_ORB_Z); PointReached = true; @@ -1169,7 +1169,7 @@ struct TRINITY_DLL_DECL mob_shield_orbAI : public ScriptedAI } - if (Timer < diff) + if (Timer <= diff) { if (Unit* random = Unit::GetUnit(*m_creature, pInstance ? pInstance->GetData64(DATA_PLAYER_GUID) : 0)) DoCast(random, SPELL_SHADOW_BOLT, false); @@ -1241,7 +1241,7 @@ struct TRINITY_DLL_DECL mob_sinster_reflectionAI : public ScriptedAI switch(Class){ case CLASS_DRUID: - if (Timer[1] < diff) + if (Timer[1] <= diff) { DoCast(m_creature->getVictim(), SPELL_SR_MOONFIRE, false); Timer[1] = 3000; @@ -1249,19 +1249,19 @@ struct TRINITY_DLL_DECL mob_sinster_reflectionAI : public ScriptedAI DoMeleeAttackIfReady(); break; case CLASS_HUNTER: - if (Timer[1] < diff) + if (Timer[1] <= diff) { DoCast(m_creature->getVictim(), SPELL_SR_MULTI_SHOT, false); Timer[1] = 9000; } - if (Timer[2] < diff) + if (Timer[2] <= diff) { DoCast(m_creature->getVictim(), SPELL_SR_SHOOT, false); Timer[2] = 5000; } if (m_creature->IsWithinMeleeRange(m_creature->getVictim(), 6)) { - if (Timer[3] < diff) + if (Timer[3] <= diff) { DoCast(m_creature->getVictim(), SPELL_SR_MULTI_SHOT, false); Timer[3] = 7000; @@ -1270,7 +1270,7 @@ struct TRINITY_DLL_DECL mob_sinster_reflectionAI : public ScriptedAI } break; case CLASS_MAGE: - if (Timer[1] < diff) + if (Timer[1] <= diff) { DoCast(m_creature->getVictim(), SPELL_SR_FIREBALL, false); Timer[1] = 3000; @@ -1278,12 +1278,12 @@ struct TRINITY_DLL_DECL mob_sinster_reflectionAI : public ScriptedAI DoMeleeAttackIfReady(); break; case CLASS_WARLOCK: - if (Timer[1] < diff) + if (Timer[1] <= diff) { DoCast(m_creature->getVictim(), SPELL_SR_SHADOW_BOLT, false); Timer[1] = 4000; } - if (Timer[2] < diff) + if (Timer[2] <= diff) { DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_SR_CURSE_OF_AGONY, true); Timer[2] = 3000; @@ -1291,7 +1291,7 @@ struct TRINITY_DLL_DECL mob_sinster_reflectionAI : public ScriptedAI DoMeleeAttackIfReady(); break; case CLASS_WARRIOR: - if (Timer[1] < diff) + if (Timer[1] <= diff) { DoCast(m_creature->getVictim(), SPELL_SR_WHIRLWIND, false); Timer[1] = 10000; @@ -1299,12 +1299,12 @@ struct TRINITY_DLL_DECL mob_sinster_reflectionAI : public ScriptedAI DoMeleeAttackIfReady(); break; case CLASS_PALADIN: - if (Timer[1] < diff) + if (Timer[1] <= diff) { DoCast(m_creature->getVictim(), SPELL_SR_HAMMER_OF_JUSTICE, false); Timer[1] = 7000; } - if (Timer[2] < diff) + if (Timer[2] <= diff) { DoCast(m_creature->getVictim(), SPELL_SR_HOLY_SHOCK, false); Timer[2] = 3000; @@ -1312,12 +1312,12 @@ struct TRINITY_DLL_DECL mob_sinster_reflectionAI : public ScriptedAI DoMeleeAttackIfReady(); break; case CLASS_PRIEST: - if (Timer[1] < diff) + if (Timer[1] <= diff) { DoCast(m_creature->getVictim(), SPELL_SR_HOLY_SMITE, false); Timer[1] = 5000; } - if (Timer[2] < diff) + if (Timer[2] <= diff) { DoCast(m_creature, SPELL_SR_RENEW, false); Timer[2] = 7000; @@ -1325,7 +1325,7 @@ struct TRINITY_DLL_DECL mob_sinster_reflectionAI : public ScriptedAI DoMeleeAttackIfReady(); break; case CLASS_SHAMAN: - if (Timer[1] < diff) + if (Timer[1] <= diff) { DoCast(m_creature->getVictim(), SPELL_SR_EARTH_SHOCK, false); Timer[1] = 5000; @@ -1333,7 +1333,7 @@ struct TRINITY_DLL_DECL mob_sinster_reflectionAI : public ScriptedAI DoMeleeAttackIfReady(); break; case CLASS_ROGUE: - if (Timer[1] < diff) + if (Timer[1] <= diff) { DoCast(m_creature->getVictim(), SPELL_SR_HEMORRHAGE, true); Timer[1] = 5000; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_muru.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_muru.cpp index 346d9bbf3e1..e82c76fc726 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_muru.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_muru.cpp @@ -179,9 +179,9 @@ struct TRINITY_DLL_DECL boss_entropiusAI : public ScriptedAI if (EnrageTimer < diff && !m_creature->HasAura(SPELL_ENRAGE, 0)) { DoCast(m_creature,SPELL_ENRAGE, false); - }else EnrageTimer -= diff; + } else EnrageTimer -= diff; - if (BlackHoleSummonTimer < diff) + if (BlackHoleSummonTimer <= diff) { Unit* random = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (!random) @@ -195,7 +195,7 @@ struct TRINITY_DLL_DECL boss_entropiusAI : public ScriptedAI random->CastSpell(random, SPELL_BLACKHOLE, false); BlackHoleSummonTimer = 15000; - }else BlackHoleSummonTimer -= diff; + } else BlackHoleSummonTimer -= diff; DoMeleeAttackIfReady(); } @@ -285,7 +285,7 @@ struct TRINITY_DLL_DECL boss_muruAI : public Scripted_NoMovementAI if (Phase == 3) { - if (Timer[TIMER_PHASE] <diff) + if (Timer[TIMER_PHASE] <= diff) { if(!pInstance) return; @@ -300,18 +300,18 @@ struct TRINITY_DLL_DECL boss_muruAI : public Scripted_NoMovementAI break; } Timer[TIMER_PHASE] = 3000; - }else Timer[TIMER_PHASE] -= diff; + } else Timer[TIMER_PHASE] -= diff; return; } if (EnrageTimer < diff && !m_creature->HasAura(SPELL_ENRAGE, 0)) { DoCast(m_creature, SPELL_ENRAGE, false); - }else EnrageTimer -= diff; + } else EnrageTimer -= diff; for (uint8 i = 0; i < 4; ++i) { - if (Timer[i] < diff) + if (Timer[i] <= diff) { switch(i) { @@ -428,12 +428,12 @@ struct TRINITY_DLL_DECL npc_muru_portalAI : public Scripted_NoMovementAI Reset(); return; } - if (SummonTimer < diff) + if (SummonTimer <= diff) { DoCastAOE(SPELL_SUMMON_VOID_SENTINEL, false); SummonTimer = 5000; SummonSentinel = false; - }else SummonTimer -= diff; + } else SummonTimer -= diff; } }; @@ -469,7 +469,7 @@ struct TRINITY_DLL_DECL npc_dark_fiendAI : public ScriptedAI if (!UpdateVictim()) return; - if (WaitTimer < diff) + if (WaitTimer <= diff) { if (!InAction) { @@ -526,13 +526,13 @@ struct TRINITY_DLL_DECL npc_void_sentinelAI : public ScriptedAI if (!UpdateVictim()) return; - if (PulseTimer < diff) + if (PulseTimer <= diff) { DoCastAOE(SPELL_SHADOW_PULSE, true); PulseTimer = 3000; } else PulseTimer -= diff; - if (VoidBlastTimer < diff) + if (VoidBlastTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_VOID_BLAST, false); VoidBlastTimer = 45000; @@ -573,7 +573,7 @@ struct TRINITY_DLL_DECL npc_blackholeAI : public ScriptedAI void UpdateAI(const uint32 diff) { - if (SpellTimer < diff) + if (SpellTimer <= diff) { Unit* Victim = Unit::GetUnit(*m_creature, pInstance ? pInstance->GetData64(DATA_PLAYER_GUID) : 0); switch (NeedForAHack) @@ -608,7 +608,7 @@ struct TRINITY_DLL_DECL npc_blackholeAI : public ScriptedAI } } else SpellTimer -= diff; - if (DespawnTimer < diff) + if (DespawnTimer <= diff) m_creature->DisappearAndDie(); else DespawnTimer -= diff; } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/tirisfal_glades.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/tirisfal_glades.cpp index ba2a9cd762a..2eae7e45b53 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/tirisfal_glades.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/tirisfal_glades.cpp @@ -92,7 +92,7 @@ struct TRINITY_DLL_DECL npc_calvin_montagueAI : public ScriptedAI { if (m_uiPhase) { - if (m_uiPhaseTimer < uiDiff) + if (m_uiPhaseTimer <= uiDiff) m_uiPhaseTimer = 7500; else { diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/uldaman/boss_archaedas.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/uldaman/boss_archaedas.cpp index e5de9848728..203e26c3a77 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/uldaman/boss_archaedas.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/uldaman/boss_archaedas.cpp @@ -134,7 +134,7 @@ struct TRINITY_DLL_DECL boss_archaedasAI : public ScriptedAI return; // wake a wall minion - if (WallMinionTimer < diff) { + if (WallMinionTimer <= diff) { pInstance->SetData (NULL, 2); WallMinionTimer = 10000; @@ -164,14 +164,14 @@ struct TRINITY_DLL_DECL boss_archaedasAI : public ScriptedAI vaultWalkersAwake = true; } - if (Tremor_Timer < diff) + if (Tremor_Timer <= diff) { //Cast DoCast(m_creature->getVictim(),SPELL_GROUND_TREMOR); //45 seconds until we should cast this agian Tremor_Timer = 45000; - }else Tremor_Timer -= diff; + } else Tremor_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/uldaman/boss_ironaya.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/uldaman/boss_ironaya.cpp index 06c0289812b..a74f4458fb7 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/uldaman/boss_ironaya.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/uldaman/boss_ironaya.cpp @@ -60,7 +60,7 @@ struct TRINITY_DLL_DECL boss_ironayaAI : public ScriptedAI { m_creature->CastSpell(m_creature->getVictim(),SPELL_KNOCKAWAY, true); - // current aggro target is knocked away pick new target + // current aggro pTarget is knocked away pick new target Unit* Target = SelectUnit(SELECT_TARGET_TOPAGGRO, 0); if (!Target || Target == m_creature->getVictim()) @@ -74,11 +74,11 @@ struct TRINITY_DLL_DECL boss_ironayaAI : public ScriptedAI } //Arcing_Timer - if (Arcing_Timer < diff) + if (Arcing_Timer <= diff) { DoCast(m_creature,SPELL_ARCINGSMASH); Arcing_Timer = 13000; - }else Arcing_Timer -= diff; + } else Arcing_Timer -= diff; if (!hasCastedWstomp && m_creature->GetHealth()*4 < m_creature->GetMaxHealth()) { diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp index f4d13731de1..b09ee3e22c9 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp @@ -98,12 +98,12 @@ struct TRINITY_DLL_DECL instance_uldaman : public ScriptedInstance { for (std::vector<uint64>::iterator i = stoneKeeper.begin(); i != stoneKeeper.end(); ++i) { - Creature *target = instance->GetCreature(*i); - if (!target || !target->isAlive() || target->getFaction()==14) + Creature *pTarget = instance->GetCreature(*i); + if (!pTarget || !pTarget->isAlive() || pTarget->getFaction()==14) continue; - target->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_DISABLE_MOVE); - target->setFaction(14); - target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + pTarget->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_DISABLE_MOVE); + pTarget->setFaction(14); + pTarget->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); return; // only want the first one we find } // if we get this far than all four are dead so open the door @@ -118,11 +118,11 @@ struct TRINITY_DLL_DECL instance_uldaman : public ScriptedInstance for (std::vector<uint64>::iterator i = archaedasWallMinions.begin(); i != archaedasWallMinions.end(); ++i) { - Creature *target = instance->GetCreature(*i); - if (!target || !target->isAlive() || target->getFaction()==14) + Creature *pTarget = instance->GetCreature(*i); + if (!pTarget || !pTarget->isAlive() || pTarget->getFaction()==14) continue; - archaedas->CastSpell(target, SPELL_AWAKEN_VAULT_WALKER, true); - target->CastSpell(target, SPELL_ARCHAEDAS_AWAKEN,true); + archaedas->CastSpell(pTarget, SPELL_AWAKEN_VAULT_WALKER, true); + pTarget->CastSpell(pTarget, SPELL_ARCHAEDAS_AWAKEN,true); return; // only want the first one we find } } @@ -133,31 +133,31 @@ struct TRINITY_DLL_DECL instance_uldaman : public ScriptedInstance // first despawn any aggroed wall minions for (std::vector<uint64>::iterator i = archaedasWallMinions.begin(); i != archaedasWallMinions.end(); ++i) { - Creature *target = instance->GetCreature(*i); - if (!target || target->isDead() || target->getFaction()!=14) + Creature *pTarget = instance->GetCreature(*i); + if (!pTarget || pTarget->isDead() || pTarget->getFaction()!=14) continue; - target->setDeathState(JUST_DIED); - target->RemoveCorpse(); + pTarget->setDeathState(JUST_DIED); + pTarget->RemoveCorpse(); } // Vault Walkers for (std::vector<uint64>::iterator i = vaultWalker.begin(); i != vaultWalker.end(); ++i) { - Creature *target = instance->GetCreature(*i); - if (!target || target->isDead() || target->getFaction()!=14) + Creature *pTarget = instance->GetCreature(*i); + if (!pTarget || pTarget->isDead() || pTarget->getFaction()!=14) continue; - target->setDeathState(JUST_DIED); - target->RemoveCorpse(); + pTarget->setDeathState(JUST_DIED); + pTarget->RemoveCorpse(); } // Earthen Guardians for (std::vector<uint64>::iterator i = earthenGuardian.begin(); i != earthenGuardian.end(); ++i) { - Creature *target = instance->GetCreature(*i); - if (!target || target->isDead() || target->getFaction()!=14) + Creature *pTarget = instance->GetCreature(*i); + if (!pTarget || pTarget->isDead() || pTarget->getFaction()!=14) continue; - target->setDeathState(JUST_DIED); - target->RemoveCorpse(); + pTarget->setDeathState(JUST_DIED); + pTarget->RemoveCorpse(); } } @@ -179,36 +179,36 @@ struct TRINITY_DLL_DECL instance_uldaman : public ScriptedInstance // first respawn any aggroed wall minions for (std::vector<uint64>::iterator i = archaedasWallMinions.begin(); i != archaedasWallMinions.end(); ++i) { - Creature *target = instance->GetCreature(*i); - if (target && target->isDead()) + Creature *pTarget = instance->GetCreature(*i); + if (pTarget && pTarget->isDead()) { - target->Respawn(); - target->GetMotionMaster()->MoveTargetedHome(); - SetFrozenState(target); + pTarget->Respawn(); + pTarget->GetMotionMaster()->MoveTargetedHome(); + SetFrozenState(pTarget); } } // Vault Walkers for (std::vector<uint64>::iterator i = vaultWalker.begin(); i != vaultWalker.end(); ++i) { - Creature *target = instance->GetCreature(*i); - if (target && target->isDead()) + Creature *pTarget = instance->GetCreature(*i); + if (pTarget && pTarget->isDead()) { - target->Respawn(); - target->GetMotionMaster()->MoveTargetedHome(); - SetFrozenState(target); + pTarget->Respawn(); + pTarget->GetMotionMaster()->MoveTargetedHome(); + SetFrozenState(pTarget); } } // Earthen Guardians for (std::vector<uint64>::iterator i = earthenGuardian.begin(); i != earthenGuardian.end(); ++i) { - Creature *target = instance->GetCreature(*i); - if (target && target->isDead()) + Creature *pTarget = instance->GetCreature(*i); + if (pTarget && pTarget->isDead()) { - target->Respawn(); - target->GetMotionMaster()->MoveTargetedHome(); - SetFrozenState(target); + pTarget->Respawn(); + pTarget->GetMotionMaster()->MoveTargetedHome(); + SetFrozenState(pTarget); } } } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/uldaman/uldaman.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/uldaman/uldaman.cpp index 4ba8ed0c65b..bdef0dc9b13 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/uldaman/uldaman.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/uldaman/uldaman.cpp @@ -56,13 +56,13 @@ struct TRINITY_DLL_DECL mob_jadespine_basiliskAI : public ScriptedAI return; //Cslumber_Timer - if (Cslumber_Timer < diff) + if (Cslumber_Timer <= diff) { //Cast // DoCast(m_creature->getVictim(),SPELL_CSLUMBER); m_creature->CastSpell(m_creature->getVictim(),SPELL_CSLUMBER, true); - //Stop attacking target thast asleep and pick new target + //Stop attacking pTarget thast asleep and pick new target Cslumber_Timer = 28000; Unit* Target = SelectUnit(SELECT_TARGET_TOPAGGRO, 0); @@ -73,7 +73,7 @@ struct TRINITY_DLL_DECL mob_jadespine_basiliskAI : public ScriptedAI if (Target) m_creature->TauntApply(Target); - }else Cslumber_Timer -= diff; + } else Cslumber_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/undercity.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/undercity.cpp index 6c761b9248e..dda49cc7a96 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/undercity.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/undercity.cpp @@ -76,11 +76,11 @@ struct TRINITY_DLL_DECL npc_lady_sylvanas_windrunnerAI : public ScriptedAI { if (summoned->GetEntry() == ENTRY_HIGHBORNE_BUNNY) { - if (Unit* target = Unit::GetUnit(*summoned,targetGUID)) + if (Unit *pTarget = Unit::GetUnit(*summoned,targetGUID)) { - target->SendMonsterMove(target->GetPositionX(), target->GetPositionY(), me->GetPositionZ()+15.0,0); - target->GetMap()->CreatureRelocation(m_creature, target->GetPositionX(), target->GetPositionY(), me->GetPositionZ()+15.0, 0.0f); - summoned->CastSpell(target, SPELL_RIBBON_OF_SOULS, false); + pTarget->SendMonsterMove(pTarget->GetPositionX(), pTarget->GetPositionY(), me->GetPositionZ()+15.0,0); + pTarget->GetMap()->CreatureRelocation(m_creature, pTarget->GetPositionX(), pTarget->GetPositionY(), me->GetPositionZ()+15.0, 0.0f); + summoned->CastSpell(pTarget, SPELL_RIBBON_OF_SOULS, false); } summoned->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); @@ -92,7 +92,7 @@ struct TRINITY_DLL_DECL npc_lady_sylvanas_windrunnerAI : public ScriptedAI { if (LamentEvent) { - if (LamentEvent_Timer < diff) + if (LamentEvent_Timer <= diff) { DoSummon(ENTRY_HIGHBORNE_BUNNY, me, 10.0f, 3000, TEMPSUMMON_TIMED_DESPAWN); @@ -103,7 +103,7 @@ struct TRINITY_DLL_DECL npc_lady_sylvanas_windrunnerAI : public ScriptedAI DoScriptText(EMOTE_LAMENT_END, m_creature); LamentEvent = false; } - }else LamentEvent_Timer -= diff; + } else LamentEvent_Timer -= diff; } if (!UpdateVictim()) @@ -159,21 +159,21 @@ struct TRINITY_DLL_DECL npc_highborne_lamenterAI : public ScriptedAI { if (EventMove) { - if (EventMove_Timer < diff) + if (EventMove_Timer <= diff) { m_creature->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); m_creature->SendMonsterMoveWithSpeed(m_creature->GetPositionX(),m_creature->GetPositionY(),HIGHBORNE_LOC_Y_NEW,5000); m_creature->GetMap()->CreatureRelocation(m_creature,m_creature->GetPositionX(),m_creature->GetPositionY(),HIGHBORNE_LOC_Y_NEW,m_creature->GetOrientation()); EventMove = false; - }else EventMove_Timer -= diff; + } else EventMove_Timer -= diff; } if (EventCast) { - if (EventCast_Timer < diff) + if (EventCast_Timer <= diff) { DoCast(m_creature,SPELL_HIGHBORNE_AURA); EventCast = false; - }else EventCast_Timer -= diff; + } else EventCast_Timer -= diff; } } }; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/westfall.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/westfall.cpp index 6a1df820efa..6142966c56a 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/westfall.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/westfall.cpp @@ -151,13 +151,13 @@ struct TRINITY_DLL_DECL npc_daphne_stilwellAI : public npc_escortAI if (!UpdateVictim()) return; - if (uiShootTimer < diff) + if (uiShootTimer <= diff) { uiShootTimer = 1500; if (!m_creature->IsWithinDist(m_creature->getVictim(), ATTACK_DISTANCE)) DoCast(m_creature->getVictim(), SPELL_SHOOT); - }else uiShootTimer -= diff; + } else uiShootTimer -= diff; } }; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_akilzon.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_akilzon.cpp index dd57c5c990f..48a0877a40f 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_akilzon.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_akilzon.cpp @@ -90,11 +90,11 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI if (pInstance) pInstance->SetData(DATA_AKILZONEVENT, NOT_STARTED); - StaticDisruption_Timer = (10+rand()%10)*1000; //10 to 20 seconds (bosskillers) - GustOfWind_Timer = (20+rand()%10)*1000; //20 to 30 seconds(bosskillers) - CallLighting_Timer = (10+rand()%10)*1000; //totaly random timer. can't find any info on this - ElectricalStorm_Timer = 60*1000; //60 seconds(bosskillers) - Enrage_Timer = 10*60*1000; //10 minutes till enrage(bosskillers) + StaticDisruption_Timer = urand(10000,20000); //10 to 20 seconds (bosskillers) + GustOfWind_Timer = urand(20000,30000); //20 to 30 seconds(bosskillers) + CallLighting_Timer = urand(10000,20000); //totaly random timer. can't find any info on this + ElectricalStorm_Timer = 60000; //60 seconds(bosskillers) + Enrage_Timer = 10*MINUTE*IN_MILISECONDS; //10 minutes till enrage(bosskillers) SummonEagles_Timer = 99999; TargetGUID = 0; @@ -132,16 +132,16 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI void KilledUnit(Unit* victim) { - switch(rand()%2) + switch (urand(0,1)) { - case 0: - m_creature->MonsterYell(SAY_ONSLAY1, LANG_UNIVERSAL, NULL); - DoPlaySoundToSet(m_creature, SOUND_ONSLAY1); - break; - case 1: - m_creature->MonsterYell(SAY_ONSLAY2, LANG_UNIVERSAL, NULL); - DoPlaySoundToSet(m_creature, SOUND_ONSLAY2); - break; + case 0: + m_creature->MonsterYell(SAY_ONSLAY1, LANG_UNIVERSAL, NULL); + DoPlaySoundToSet(m_creature, SOUND_ONSLAY1); + break; + case 1: + m_creature->MonsterYell(SAY_ONSLAY2, LANG_UNIVERSAL, NULL); + DoPlaySoundToSet(m_creature, SOUND_ONSLAY2); + break; } } @@ -161,10 +161,11 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI void SetWeather(uint32 weather, float grade) { Map* pMap = m_creature->GetMap(); - if (!pMap->IsDungeon()) return; + if (!pMap->IsDungeon()) + return; WorldPacket data(SMSG_WEATHER, (4+4+4)); - data << uint32(weather) << (float)grade << uint8(0); + data << uint32(weather) << float(grade) << uint8(0); pMap->SendToPlayers(&data); } @@ -222,7 +223,7 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI } } } - StormCount++; + ++StormCount; if (StormCount > 10) { StormCount = 0; // finish @@ -244,72 +245,79 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI if (StormCount) { - Unit* target = Unit::GetUnit(*m_creature, CloudGUID); - if (!target || !target->isAlive()) + Unit *pTarget = Unit::GetUnit(*m_creature, CloudGUID); + if (!pTarget || !pTarget->isAlive()) { EnterEvadeMode(); return; } else if (Unit* Cyclone = Unit::GetUnit(*m_creature, CycloneGUID)) - Cyclone->CastSpell(target, 25160, true); // keep casting or... + Cyclone->CastSpell(pTarget, 25160, true); // keep casting or... + + if (StormSequenceTimer <= diff) + HandleStormSequence(pTarget); + else + StormSequenceTimer -= diff; - if (StormSequenceTimer < diff) { - HandleStormSequence(target); - }else StormSequenceTimer -= diff; return; } - if (Enrage_Timer < diff) { + if (Enrage_Timer <= diff) + { m_creature->MonsterYell(SAY_ONENRAGE, LANG_UNIVERSAL, NULL); DoPlaySoundToSet(m_creature, SOUND_ONENRAGE); m_creature->CastSpell(m_creature, SPELL_BERSERK, true); Enrage_Timer = 600000; - }else Enrage_Timer -= diff; + } else Enrage_Timer -= diff; - if (StaticDisruption_Timer < diff) { - Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 1); - if (!target) target = m_creature->getVictim(); - TargetGUID = target->GetGUID(); - m_creature->CastSpell(target, SPELL_STATIC_DISRUPTION, false); + if (StaticDisruption_Timer <= diff) + { + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 1); + if (!pTarget) pTarget = m_creature->getVictim(); + TargetGUID = pTarget->GetGUID(); + m_creature->CastSpell(pTarget, SPELL_STATIC_DISRUPTION, false); m_creature->SetInFront(m_creature->getVictim()); StaticDisruption_Timer = (10+rand()%8)*1000; // < 20s - /*if (float dist = m_creature->IsWithinDist3d(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 5.0f) dist = 5.0f; + /*if (float dist = m_creature->IsWithinDist3d(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 5.0f) dist = 5.0f; SDisruptAOEVisual_Timer = 1000 + floor(dist / 30 * 1000.0f);*/ - }else StaticDisruption_Timer -= diff; + } else StaticDisruption_Timer -= diff; - if (GustOfWind_Timer < diff) { - Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 1); - if (!target) target = m_creature->getVictim(); - DoCast(target, SPELL_GUST_OF_WIND); + if (GustOfWind_Timer <= diff) + { + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 1); + if (!pTarget) pTarget = m_creature->getVictim(); + DoCast(pTarget, SPELL_GUST_OF_WIND); GustOfWind_Timer = (20+rand()%10)*1000; //20 to 30 seconds(bosskillers) } else GustOfWind_Timer -= diff; - if (CallLighting_Timer < diff) { + if (CallLighting_Timer <= diff) + { DoCast(m_creature->getVictim(), SPELL_CALL_LIGHTNING); CallLighting_Timer = (12 + rand()%5)*1000; //totaly random timer. can't find any info on this } else CallLighting_Timer -= diff; - if (!isRaining && ElectricalStorm_Timer < 8000 + rand()%5000) { + if (!isRaining && ElectricalStorm_Timer < 8000 + rand()%5000) + { SetWeather(WEATHER_STATE_HEAVY_RAIN, 0.9999f); isRaining = true; } - if (ElectricalStorm_Timer < diff) { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50, true); - if (!target) + if (ElectricalStorm_Timer <= diff) { + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 50, true); + if (!pTarget) { EnterEvadeMode(); return; } - target->CastSpell(target, 44007, true);//cloud visual - m_creature->CastSpell(target, SPELL_ELECTRICAL_STORM, false);//storm cyclon + visual + pTarget->CastSpell(pTarget, 44007, true);//cloud visual + m_creature->CastSpell(pTarget, SPELL_ELECTRICAL_STORM, false);//storm cyclon + visual float x,y,z; - target->GetPosition(x,y,z); - if (target) + pTarget->GetPosition(x,y,z); + if (pTarget) { - target->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING); - target->SendMonsterMove(x,y,m_creature->GetPositionZ()+15,0); + pTarget->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING); + pTarget->SendMonsterMove(x,y,m_creature->GetPositionZ()+15,0); } Unit *Cloud = m_creature->SummonTrigger(x, y, m_creature->GetPositionZ()+16, 0, 15000); if (Cloud) @@ -328,7 +336,7 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI StormSequenceTimer = 0; } else ElectricalStorm_Timer -= diff; - if (SummonEagles_Timer < diff) + if (SummonEagles_Timer <= diff) { m_creature->MonsterYell(SAY_ONSUMMON, LANG_UNIVERSAL, NULL); DoPlaySoundToSet(m_creature, SOUND_ONSUMMON); @@ -339,14 +347,15 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI for (uint8 i = 0; i < 8; ++i) { Unit* bird = Unit::GetUnit(*m_creature,BirdGUIDs[i]); - if (!bird)//they despawned on die + if (!bird) //they despawned on die { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) { - x = target->GetPositionX() + 10 - rand()%20; - y = target->GetPositionY() + 10 - rand()%20; - z = target->GetPositionZ() + 6 + rand()%5 + 10; - if (z > 95) z = 95 - rand()%5; + x = pTarget->GetPositionX() + irand(-10,10); + y = pTarget->GetPositionY() + irand(-10,10); + z = pTarget->GetPositionZ() + urand(16,20); + if (z > 95) + z = 95 - urand(0,5); } Creature *pCreature = m_creature->SummonCreature(MOB_SOARING_EAGLE, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); if (pCreature) @@ -389,8 +398,8 @@ struct TRINITY_DLL_DECL mob_soaring_eagleAI : public ScriptedAI arrived = true; if (TargetGUID) { - if (Unit* target = Unit::GetUnit(*m_creature, TargetGUID)) - m_creature->CastSpell(target, SPELL_EAGLE_SWOOP, true); + if (Unit *pTarget = Unit::GetUnit(*m_creature, TargetGUID)) + m_creature->CastSpell(pTarget, SPELL_EAGLE_SWOOP, true); TargetGUID = 0; m_creature->SetSpeed(MOVE_RUN, 1.2f); EagleSwoop_Timer = 5000 + rand()%5000; @@ -399,27 +408,30 @@ struct TRINITY_DLL_DECL mob_soaring_eagleAI : public ScriptedAI void UpdateAI(const uint32 diff) { - if (EagleSwoop_Timer < diff) EagleSwoop_Timer = 0; - else EagleSwoop_Timer -= diff; + if (EagleSwoop_Timer <= diff) + EagleSwoop_Timer = 0; + else + EagleSwoop_Timer -= diff; if (arrived) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) { float x, y, z; if (EagleSwoop_Timer) { - x = target->GetPositionX() + 10 - rand()%20; - y = target->GetPositionY() + 10 - rand()%20; - z = target->GetPositionZ() + 10 + rand()%5; - if (z > 95) z = 95 - rand()%5; + x = pTarget->GetPositionX() + irand(-10,10); + y = pTarget->GetPositionY() + irand(-10,10); + z = pTarget->GetPositionZ() + urand(10,15); + if (z > 95) + z = 95 - urand(0,5); } else { - target->GetContactPoint(m_creature, x, y, z); + pTarget->GetContactPoint(m_creature, x, y, z); z += 2; m_creature->SetSpeed(MOVE_RUN, 5.0f); - TargetGUID = target->GetGUID(); + TargetGUID = pTarget->GetGUID(); } m_creature->GetMotionMaster()->MovePoint(0, x, y, z); arrived = false; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_halazzi.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_halazzi.cpp index 8ef5743bc60..4d4f2e58d7a 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_halazzi.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_halazzi.cpp @@ -207,62 +207,62 @@ struct TRINITY_DLL_DECL boss_halazziAI : public ScriptedAI if (!UpdateVictim()) return; - if (BerserkTimer < diff) + if (BerserkTimer <= diff) { m_creature->MonsterYell(YELL_BERSERK, LANG_UNIVERSAL, NULL); DoPlaySoundToSet(m_creature, SOUND_BERSERK); DoCast(m_creature, SPELL_BERSERK, true); BerserkTimer = 60000; - }else BerserkTimer -= diff; + } else BerserkTimer -= diff; if (Phase == PHASE_LYNX || Phase == PHASE_ENRAGE) { - if (SaberlashTimer < diff) + if (SaberlashTimer <= diff) { // A tank with more than 490 defense skills should receive no critical hit //m_creature->CastSpell(m_creature, 41296, true); m_creature->CastSpell(m_creature->getVictim(), SPELL_SABER_LASH, true); //m_creature->RemoveAurasDueToSpell(41296); SaberlashTimer = 30000; - }else SaberlashTimer -= diff; + } else SaberlashTimer -= diff; - if (FrenzyTimer < diff) + if (FrenzyTimer <= diff) { DoCast(m_creature, SPELL_FRENZY); FrenzyTimer = (10+rand()%5)*1000; - }else FrenzyTimer -= diff; + } else FrenzyTimer -= diff; if (Phase == PHASE_LYNX) - if (CheckTimer < diff) + if (CheckTimer <= diff) { if (m_creature->GetHealth() * 4 < m_creature->GetMaxHealth() * (3 - TransformCount)) EnterPhase(PHASE_SPLIT); CheckTimer = 1000; - }else CheckTimer -= diff; + } else CheckTimer -= diff; } if (Phase == PHASE_HUMAN || Phase == PHASE_ENRAGE) { - if (TotemTimer < diff) + if (TotemTimer <= diff) { DoCast(m_creature, SPELL_SUMMON_TOTEM); TotemTimer = 20000; - }else TotemTimer -= diff; + } else TotemTimer -= diff; - if (ShockTimer < diff) + if (ShockTimer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) { - if (target->IsNonMeleeSpellCasted(false)) - DoCast(target,SPELL_EARTHSHOCK); + if (pTarget->IsNonMeleeSpellCasted(false)) + DoCast(pTarget,SPELL_EARTHSHOCK); else - DoCast(target,SPELL_FLAMESHOCK); + DoCast(pTarget,SPELL_FLAMESHOCK); ShockTimer = 10000 + rand()%5000; } - }else ShockTimer -= diff; + } else ShockTimer -= diff; if (Phase == PHASE_HUMAN) - if (CheckTimer < diff) + if (CheckTimer <= diff) { if (((m_creature->GetHealth()*100) / m_creature->GetMaxHealth() <= 20)/*m_creature->GetHealth() * 10 < m_creature->GetMaxHealth()*/) EnterPhase(PHASE_MERGE); @@ -273,12 +273,12 @@ struct TRINITY_DLL_DECL boss_halazziAI : public ScriptedAI EnterPhase(PHASE_MERGE); } CheckTimer = 1000; - }else CheckTimer -= diff; + } else CheckTimer -= diff; } if (Phase == PHASE_MERGE) { - if (CheckTimer < diff) + if (CheckTimer <= diff) { Unit *Lynx = Unit::GetUnit(*m_creature, LynxGUID); if (Lynx) @@ -294,7 +294,7 @@ struct TRINITY_DLL_DECL boss_halazziAI : public ScriptedAI } } CheckTimer = 1000; - }else CheckTimer -= diff; + } else CheckTimer -= diff; } DoMeleeAttackIfReady(); @@ -302,17 +302,17 @@ struct TRINITY_DLL_DECL boss_halazziAI : public ScriptedAI void KilledUnit(Unit* victim) { - switch(rand()%2) + switch (urand(0,1)) { - case 0: - m_creature->MonsterYell(YELL_KILL_ONE, LANG_UNIVERSAL, NULL); - DoPlaySoundToSet(m_creature, SOUND_KILL_ONE); - break; - - case 1: - m_creature->MonsterYell(YELL_KILL_TWO, LANG_UNIVERSAL, NULL); - DoPlaySoundToSet(m_creature, SOUND_KILL_TWO); - break; + case 0: + m_creature->MonsterYell(YELL_KILL_ONE, LANG_UNIVERSAL, NULL); + DoPlaySoundToSet(m_creature, SOUND_KILL_ONE); + break; + + case 1: + m_creature->MonsterYell(YELL_KILL_TWO, LANG_UNIVERSAL, NULL); + DoPlaySoundToSet(m_creature, SOUND_KILL_TWO); + break; } } @@ -337,7 +337,7 @@ struct TRINITY_DLL_DECL boss_spiritlynxAI : public ScriptedAI void Reset() { - FrenzyTimer = (30+rand()%20)*1000; //frenzy every 30-50 seconds + FrenzyTimer = urand(30000,50000); //frenzy every 30-50 seconds shredder_timer = 4000; } @@ -360,17 +360,17 @@ struct TRINITY_DLL_DECL boss_spiritlynxAI : public ScriptedAI if (!UpdateVictim()) return; - if (FrenzyTimer < diff) + if (FrenzyTimer <= diff) { DoCast(m_creature, SPELL_LYNX_FRENZY); - FrenzyTimer = (30+rand()%20)*1000; - }else FrenzyTimer -= diff; + FrenzyTimer = urand(30000,50000); //frenzy every 30-50 seconds + } else FrenzyTimer -= diff; - if (shredder_timer < diff) + if (shredder_timer <= diff) { DoCast(m_creature->getVictim(), SPELL_SHRED_ARMOR); shredder_timer = 4000; - }else shredder_timer -= diff; + } else shredder_timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_hexlord.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_hexlord.cpp index 16e64ed46fb..27a6fccd83c 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_hexlord.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_hexlord.cpp @@ -268,16 +268,16 @@ struct TRINITY_DLL_DECL boss_hex_lord_malacrassAI : public ScriptedAI void KilledUnit(Unit* victim) { - switch(rand()%2) + switch (urand(0,1)) { - case 0: - m_creature->MonsterYell(YELL_KILL_ONE, LANG_UNIVERSAL, NULL); - DoPlaySoundToSet(m_creature, SOUND_YELL_KILL_ONE); - break; - case 1: - m_creature->MonsterYell(YELL_KILL_TWO, LANG_UNIVERSAL, NULL); - DoPlaySoundToSet(m_creature, SOUND_YELL_KILL_TWO); - break; + case 0: + m_creature->MonsterYell(YELL_KILL_ONE, LANG_UNIVERSAL, NULL); + DoPlaySoundToSet(m_creature, SOUND_YELL_KILL_ONE); + break; + case 1: + m_creature->MonsterYell(YELL_KILL_TWO, LANG_UNIVERSAL, NULL); + DoPlaySoundToSet(m_creature, SOUND_YELL_KILL_TWO); + break; } } @@ -337,7 +337,7 @@ struct TRINITY_DLL_DECL boss_hex_lord_malacrassAI : public ScriptedAI if (!UpdateVictim()) return; - if (ResetTimer < diff) + if (ResetTimer <= diff) { if (m_creature->IsWithinDist3d(119.223,1035.45,29.4481, 10)) { @@ -345,9 +345,9 @@ struct TRINITY_DLL_DECL boss_hex_lord_malacrassAI : public ScriptedAI return; } ResetTimer = 5000; - }else ResetTimer -= diff; + } else ResetTimer -= diff; - if (CheckAddState_Timer < diff) + if (CheckAddState_Timer <= diff) { for (uint8 i = 0; i < 4; ++i) { @@ -356,36 +356,36 @@ struct TRINITY_DLL_DECL boss_hex_lord_malacrassAI : public ScriptedAI CAST_CRE(Temp)->AI()->AttackStart(m_creature->getVictim()); } CheckAddState_Timer = 5000; - }else CheckAddState_Timer -= diff; + } else CheckAddState_Timer -= diff; - if (DrainPower_Timer < diff) + if (DrainPower_Timer <= diff) { m_creature->CastSpell(m_creature, SPELL_DRAIN_POWER, true); m_creature->MonsterYell(YELL_DRAIN_POWER, LANG_UNIVERSAL, NULL); DoPlaySoundToSet(m_creature, SOUND_YELL_DRAIN_POWER); - DrainPower_Timer = 40000 + rand()%15000; // must cast in 60 sec, or buff/debuff will disappear - }else DrainPower_Timer -= diff; + DrainPower_Timer = urand(40000,55000); // must cast in 60 sec, or buff/debuff will disappear + } else DrainPower_Timer -= diff; - if (SpiritBolts_Timer < diff) + if (SpiritBolts_Timer <= diff) { if (DrainPower_Timer < 12000) // channel 10 sec - SpiritBolts_Timer = 13000; // cast drain power first + SpiritBolts_Timer = 13000; // cast drain power first else { m_creature->CastSpell(m_creature, SPELL_SPIRIT_BOLTS, false); m_creature->MonsterYell(YELL_SPIRIT_BOLTS, LANG_UNIVERSAL, NULL); DoPlaySoundToSet(m_creature, SOUND_YELL_SPIRIT_BOLTS); SpiritBolts_Timer = 40000; - SiphonSoul_Timer = 10000; // ready to drain + SiphonSoul_Timer = 10000; // ready to drain PlayerAbility_Timer = 99999; } - }else SpiritBolts_Timer -= diff; + } else SpiritBolts_Timer -= diff; - if (SiphonSoul_Timer < diff) + if (SiphonSoul_Timer <= diff) { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 70, true); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 70, true); Unit *trigger = DoSpawnCreature(MOB_TEMP_TRIGGER, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 30000); - if (!target || !trigger) + if (!pTarget || !trigger) { EnterEvadeMode(); return; @@ -394,63 +394,68 @@ struct TRINITY_DLL_DECL boss_hex_lord_malacrassAI : public ScriptedAI { trigger->SetDisplayId(11686); trigger->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - trigger->CastSpell(target, SPELL_SIPHON_SOUL, true); + trigger->CastSpell(pTarget, SPELL_SIPHON_SOUL, true); trigger->GetMotionMaster()->MoveChase(m_creature); - //m_creature->CastSpell(target, SPELL_SIPHON_SOUL, true); - //m_creature->SetUInt64Value(UNIT_FIELD_CHANNEL_OBJECT, target->GetGUID()); + //m_creature->CastSpell(pTarget, SPELL_SIPHON_SOUL, true); + //m_creature->SetUInt64Value(UNIT_FIELD_CHANNEL_OBJECT, pTarget->GetGUID()); //m_creature->SetUInt32Value(UNIT_CHANNEL_SPELL, SPELL_SIPHON_SOUL); - PlayerGUID = target->GetGUID(); - PlayerAbility_Timer = 8000 + rand()%2000; - PlayerClass = target->getClass() - 1; - if (PlayerClass == 10) PlayerClass = 9; // druid - if (PlayerClass == 4 && target->HasSpell(15473)) PlayerClass = 5; // shadow priest + PlayerGUID = pTarget->GetGUID(); + PlayerAbility_Timer = urand(8000,10000); + PlayerClass = pTarget->getClass() - 1; + + if (PlayerClass == CLASS_DRUID-1) + PlayerClass = CLASS_DRUID; + else if (PlayerClass == CLASS_PRIEST-1 && pTarget->HasSpell(15473)) + PlayerClass = CLASS_PRIEST; // shadow priest + SiphonSoul_Timer = 99999; // buff lasts 30 sec } - }else SiphonSoul_Timer -= diff; + } else SiphonSoul_Timer -= diff; - if (PlayerAbility_Timer < diff) + if (PlayerAbility_Timer <= diff) { - //Unit* target = Unit::GetUnit(*m_creature, PlayerGUID); - //if (target && target->isAlive()) - { + //Unit *pTarget = Unit::GetUnit(*m_creature, PlayerGUID); + //if (pTarget && pTarget->isAlive()) + //{ UseAbility(); - PlayerAbility_Timer = 8000 + rand()%2000; - } - }else PlayerAbility_Timer -= diff; + PlayerAbility_Timer = urand(8000,10000); + //} + } else PlayerAbility_Timer -= diff; DoMeleeAttackIfReady(); } void UseAbility() { - uint32 random = rand()%3; - Unit *target = NULL; + uint8 random = urand(0,2); + Unit *pTarget = NULL; switch(PlayerAbility[PlayerClass][random].target) { - case ABILITY_TARGET_SELF: - target = m_creature; - break; - case ABILITY_TARGET_VICTIM: - target = m_creature->getVictim(); - break; - case ABILITY_TARGET_ENEMY: - default: - target = SelectUnit(SELECT_TARGET_RANDOM, 0); - break; - case ABILITY_TARGET_HEAL: - target = DoSelectLowestHpFriendly(50, 0); - break; - case ABILITY_TARGET_BUFF: - { - std::list<Creature*> templist = DoFindFriendlyMissingBuff(50, PlayerAbility[PlayerClass][random].spell); - if (!templist.empty()) target = *(templist.begin()); - } - break; + case ABILITY_TARGET_SELF: + pTarget = m_creature; + break; + case ABILITY_TARGET_VICTIM: + pTarget = m_creature->getVictim(); + break; + case ABILITY_TARGET_ENEMY: + default: + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + break; + case ABILITY_TARGET_HEAL: + pTarget = DoSelectLowestHpFriendly(50, 0); + break; + case ABILITY_TARGET_BUFF: + { + std::list<Creature*> templist = DoFindFriendlyMissingBuff(50, PlayerAbility[PlayerClass][random].spell); + if (!templist.empty()) + pTarget = *(templist.begin()); + } + break; } - if (target) - m_creature->CastSpell(target, PlayerAbility[PlayerClass][random].spell, false); + if (pTarget) + m_creature->CastSpell(pTarget, PlayerAbility[PlayerClass][random].spell, false); } }; @@ -478,22 +483,22 @@ struct TRINITY_DLL_DECL boss_thurgAI : public boss_hexlord_addAI if (!UpdateVictim()) return; - if (bloodlust_timer < diff) + if (bloodlust_timer <= diff) { std::list<Creature*> templist = DoFindFriendlyMissingBuff(50, SPELL_BLOODLUST); if (!templist.empty()) { - if (Unit* target = *(templist.begin())) - m_creature->CastSpell(target, SPELL_BLOODLUST, false); + if (Unit *pTarget = *(templist.begin())) + m_creature->CastSpell(pTarget, SPELL_BLOODLUST, false); } bloodlust_timer = 12000; - }else bloodlust_timer -= diff; + } else bloodlust_timer -= diff; - if (cleave_timer < diff) + if (cleave_timer <= diff) { m_creature->CastSpell(m_creature->getVictim(),SPELL_CLEAVE, false); cleave_timer = 12000; //3 sec cast - }else cleave_timer -= diff; + } else cleave_timer -= diff; boss_hexlord_addAI::UpdateAI(diff); } @@ -540,46 +545,46 @@ struct TRINITY_DLL_DECL boss_alyson_antilleAI : public boss_hexlord_addAI if (!UpdateVictim()) return; - if (flashheal_timer < diff) + if (flashheal_timer <= diff) { - Unit* target = DoSelectLowestHpFriendly(99, 30000); - if (target) + Unit *pTarget = DoSelectLowestHpFriendly(99, 30000); + if (pTarget) { - if (target->IsWithinDistInMap(m_creature, 50)) - m_creature->CastSpell(target,SPELL_FLASH_HEAL, false); + if (pTarget->IsWithinDistInMap(m_creature, 50)) + m_creature->CastSpell(pTarget,SPELL_FLASH_HEAL, false); else { // bugged //m_creature->GetMotionMaster()->Clear(); - //m_creature->GetMotionMaster()->MoveChase(target, 20); + //m_creature->GetMotionMaster()->MoveChase(pTarget, 20); } } else { - if (rand()%2) + if (urand(0,1)) { - if (target = DoSelectLowestHpFriendly(50, 0)) - m_creature->CastSpell(target, SPELL_DISPEL_MAGIC, false); + if (pTarget = DoSelectLowestHpFriendly(50, 0)) + m_creature->CastSpell(pTarget, SPELL_DISPEL_MAGIC, false); } - else if (target = SelectUnit(SELECT_TARGET_RANDOM, 0)) - m_creature->CastSpell(target, SPELL_DISPEL_MAGIC, false); + else if (pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + m_creature->CastSpell(pTarget, SPELL_DISPEL_MAGIC, false); } flashheal_timer = 2500; - }else flashheal_timer -= diff; + } else flashheal_timer -= diff; - /*if (dispelmagic_timer < diff) + /*if (dispelmagic_timer <= diff) { - if (rand()%2) + if (urand(0,1)) { - Unit* target = SelectTarget(); + Unit *pTarget = SelectTarget(); - m_creature->CastSpell(target, SPELL_DISPEL_MAGIC, false); + m_creature->CastSpell(pTarget, SPELL_DISPEL_MAGIC, false); } else - m_creature->CastSpell(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_DISPEL_MAGIC, false); + m_creature->CastSpell(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_DISPEL_MAGIC, false); dispelmagic_timer = 12000; - }else dispelmagic_timer -= diff;*/ + } else dispelmagic_timer -= diff;*/ boss_hexlord_addAI::UpdateAI(diff); } @@ -619,11 +624,11 @@ struct TRINITY_DLL_DECL boss_gazakrothAI : public boss_hexlord_addAI if (!UpdateVictim()) return; - if (firebolt_timer < diff) + if (firebolt_timer <= diff) { m_creature->CastSpell(m_creature->getVictim(),SPELL_FIREBOLT, false); firebolt_timer = 700; - }else firebolt_timer -= diff; + } else firebolt_timer -= diff; boss_hexlord_addAI::UpdateAI(diff); } @@ -652,17 +657,17 @@ struct TRINITY_DLL_DECL boss_lord_raadanAI : public boss_hexlord_addAI if (!UpdateVictim()) return; - if (thunderclap_timer < diff) + if (thunderclap_timer <= diff) { m_creature->CastSpell(m_creature->getVictim(),SPELL_THUNDERCLAP, false); thunderclap_timer = 12000; - }else thunderclap_timer -= diff; + } else thunderclap_timer -= diff; - if (flamebreath_timer < diff) + if (flamebreath_timer <= diff) { m_creature->CastSpell(m_creature->getVictim(),SPELL_FLAME_BREATH, false); flamebreath_timer = 12000; - }else flamebreath_timer -= diff; + } else flamebreath_timer -= diff; boss_hexlord_addAI::UpdateAI(diff); } @@ -679,20 +684,18 @@ struct TRINITY_DLL_DECL boss_darkheartAI : public boss_hexlord_addAI void Reset() { psychicwail_timer = 8000; - boss_hexlord_addAI::Reset(); - } void UpdateAI(const uint32 diff) { if (!UpdateVictim()) return; - if (psychicwail_timer < diff) + if (psychicwail_timer <= diff) { m_creature->CastSpell(m_creature->getVictim(),SPELL_PSYCHIC_WAIL, false); psychicwail_timer = 12000; - }else psychicwail_timer -= diff; + } else psychicwail_timer -= diff; boss_hexlord_addAI::UpdateAI(diff); } @@ -732,12 +735,12 @@ struct TRINITY_DLL_DECL boss_slitherAI : public boss_hexlord_addAI if (!UpdateVictim()) return; - if (venomspit_timer < diff) + if (venomspit_timer <= diff) { - if (Unit* victim = SelectUnit(SELECT_TARGET_RANDOM, 0)) + if (Unit* victim = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) m_creature->CastSpell(victim,SPELL_VENOM_SPIT, false); venomspit_timer = 2500; - }else venomspit_timer -= diff; + } else venomspit_timer -= diff; boss_hexlord_addAI::UpdateAI(diff); } @@ -763,12 +766,12 @@ struct TRINITY_DLL_DECL boss_fenstalkerAI : public boss_hexlord_addAI if (!UpdateVictim()) return; - if (volatileinf_timer < diff) + if (volatileinf_timer <= diff) { // core bug m_creature->getVictim()->CastSpell(m_creature->getVictim(),SPELL_VOLATILE_INFECTION, false); volatileinf_timer = 12000; - }else volatileinf_timer -= diff; + } else volatileinf_timer -= diff; boss_hexlord_addAI::UpdateAI(diff); } @@ -797,12 +800,12 @@ struct TRINITY_DLL_DECL boss_koraggAI : public boss_hexlord_addAI if (!UpdateVictim()) return; - if (mightyblow_timer < diff) + if (mightyblow_timer <= diff) { m_creature->CastSpell(m_creature->getVictim(),SPELL_MIGHTY_BLOW, false); mightyblow_timer = 12000; } - if (coldstare_timer < diff) + if (coldstare_timer <= diff) { if (Unit* victim = SelectUnit(SELECT_TARGET_RANDOM, 0)) m_creature->CastSpell(victim,SPELL_COLD_STARE, false); diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_janalai.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_janalai.cpp index 6bb3c807441..b0c63e7afad 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_janalai.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_janalai.cpp @@ -177,11 +177,11 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI // DoZoneInCombat(); } - void DamageDeal(Unit* target, uint32 &damage) + void DamageDeal(Unit *pTarget, uint32 &damage) { if (isFlameBreathing) { - if (!m_creature->HasInArc(M_PI/6, target)) + if (!m_creature->HasInArc(M_PI/6, pTarget)) damage = 0; } } @@ -294,17 +294,17 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI DoCast(FireBomb, SPELL_FIRE_BOMB_THROW, true); FireBomb->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - BombCount++; + ++BombCount; if (BombCount == 40) { BombSequenceTimer = 5000; - }else BombSequenceTimer = 100; + } else BombSequenceTimer = 100; } else { Boom(); isBombing = false; - BombTimer = 20000+rand()%20000; + BombTimer = urand(20000,40000); m_creature->RemoveAurasDueToSpell(SPELL_FIRE_BOMB_CHANNEL); if (EnrageTimer <= 10000) EnrageTimer = 0; @@ -318,17 +318,17 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI if (isFlameBreathing) { if (!m_creature->IsNonMeleeSpellCasted(false)) - { isFlameBreathing = false; - }else return; + else + return; } if (isBombing) { - if (BombSequenceTimer < diff) - { + if (BombSequenceTimer <= diff) HandleBombSequence(); - }else BombSequenceTimer -= diff; + else + BombSequenceTimer -= diff; return; } @@ -339,7 +339,7 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI if (!enraged && m_creature->GetHealth() * 4 < m_creature->GetMaxHealth()) EnrageTimer = 0; - if (EnrageTimer < diff) + if (EnrageTimer <= diff) { if (!enraged) { @@ -353,9 +353,9 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI m_creature->CastSpell(m_creature, SPELL_BERSERK, true); EnrageTimer = 300000; } - }else EnrageTimer -= diff; + } else EnrageTimer -= diff; - if (BombTimer < diff) + if (BombTimer <= diff) { DoScriptText(SAY_FIRE_BOMBS, m_creature); @@ -377,14 +377,12 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI if (!pMap->IsDungeon()) return; Map::PlayerList const &PlayerList = pMap->GetPlayers(); for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) - { if (Player* i_pl = i->getSource()) if (i_pl->isAlive()) DoTeleportPlayer(i_pl, JanalainPos[0][0]-5+rand()%10, JanalainPos[0][1]-5+rand()%10, JanalainPos[0][2], 0); - } //m_creature->CastSpell(Temp, SPELL_SUMMON_PLAYERS, true); // core bug, spell does not work if too far return; - }else BombTimer -= diff; + } else BombTimer -= diff; if (!noeggs) { @@ -400,7 +398,7 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI HatchAllEggs(2); noeggs = true; } - else if (HatcherTimer < diff) + else if (HatcherTimer <= diff) { if (HatchAllEggs(0)) { @@ -411,25 +409,25 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI } else noeggs = true; - }else HatcherTimer -= diff; + } else HatcherTimer -= diff; } EnterEvadeIfOutOfCombatArea(diff); DoMeleeAttackIfReady(); - if (FireBreathTimer < diff) + if (FireBreathTimer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) { m_creature->AttackStop(); m_creature->GetMotionMaster()->Clear(); - m_creature->CastSpell(target, SPELL_FLAME_BREATH, false); + m_creature->CastSpell(pTarget, SPELL_FLAME_BREATH, false); m_creature->StopMoving(); isFlameBreathing = true; } FireBreathTimer = 8000; - }else FireBreathTimer -= diff; + } else FireBreathTimer -= diff; } }; @@ -515,18 +513,13 @@ struct TRINITY_DLL_DECL mob_amanishi_hatcherAI : public ScriptedAI //error_log("Eggs %d at %d", templist.size(), side); for (std::list<Creature*>::iterator i = templist.begin(); i != templist.end() && num > 0; ++i) - { if ((*i)->GetDisplayId() != 11686) { (*i)->CastSpell(*i, SPELL_HATCH_EGG, false); num--; } - } - if (num) - return false; // no more templist - else - return true; + return num != 0; // if num == 0, no more templist } void EnterCombat(Unit* who) {} @@ -548,8 +541,7 @@ struct TRINITY_DLL_DECL mob_amanishi_hatcherAI : public ScriptedAI { if (!pInstance || !(pInstance->GetData(DATA_JANALAIEVENT) == IN_PROGRESS)) { - m_creature->SetVisibility(VISIBILITY_OFF); - m_creature->setDeathState(JUST_DIED); + m_creature->DisappearAndDie(); return; } @@ -559,17 +551,17 @@ struct TRINITY_DLL_DECL mob_amanishi_hatcherAI : public ScriptedAI { m_creature->GetMotionMaster()->Clear(); m_creature->GetMotionMaster()->MovePoint(0,hatcherway[side][waypoint][0],hatcherway[side][waypoint][1],hatcherway[side][waypoint][2]); - waypoint++; + ++waypoint; WaitTimer = 0; } } else { - if (WaitTimer < diff) + if (WaitTimer <= diff) { if (HatchEggs(HatchNum)) { - HatchNum++; + ++HatchNum; WaitTimer = 10000; } else if (!hasChangedSide) @@ -581,11 +573,9 @@ struct TRINITY_DLL_DECL mob_amanishi_hatcherAI : public ScriptedAI hasChangedSide = true; } else - { - m_creature->SetVisibility(VISIBILITY_OFF); - m_creature->setDeathState(JUST_DIED); - } - }else WaitTimer -= diff; + m_creature->DisappearAndDie(); + + } else WaitTimer -= diff; } } }; @@ -622,19 +612,18 @@ struct TRINITY_DLL_DECL mob_hatchlingAI : public ScriptedAI { if (!pInstance || !(pInstance->GetData(DATA_JANALAIEVENT) == IN_PROGRESS)) { - m_creature->SetVisibility(VISIBILITY_OFF); - m_creature->setDeathState(JUST_DIED); + m_creature->DisappearAndDie(); return; } if (!UpdateVictim()) return; - if (BuffetTimer < diff) + if (BuffetTimer <= diff) { m_creature->CastSpell(m_creature->getVictim(), SPELL_FLAMEBUFFET, false); BuffetTimer = 10000; - }else BuffetTimer -= diff; + } else BuffetTimer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_nalorakk.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_nalorakk.cpp index 07766004f09..4382b28b5a9 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_nalorakk.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_nalorakk.cpp @@ -144,7 +144,7 @@ struct TRINITY_DLL_DECL boss_nalorakkAI : public ScriptedAI m_creature->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 1, 5122); } - void SendAttacker(Unit* target) + void SendAttacker(Unit *pTarget) { std::list<Creature*> templist; float x, y, z; @@ -173,7 +173,7 @@ struct TRINITY_DLL_DECL boss_nalorakkAI : public ScriptedAI if ((*i) && m_creature->IsWithinDistInMap((*i),25)) { (*i)->SetNoCallAssistance(true); - (*i)->AI()->AttackStart(target); + (*i)->AI()->AttackStart(pTarget); } } } @@ -278,16 +278,16 @@ struct TRINITY_DLL_DECL boss_nalorakkAI : public ScriptedAI void KilledUnit(Unit* victim) { - switch(rand()%2) + switch (urand(0,1)) { - case 0: - m_creature->MonsterYell(YELL_KILL_ONE, LANG_UNIVERSAL, NULL); - DoPlaySoundToSet(m_creature, SOUND_YELL_KILL_ONE); - break; - case 1: - m_creature->MonsterYell(YELL_KILL_TWO, LANG_UNIVERSAL, NULL); - DoPlaySoundToSet(m_creature, SOUND_YELL_KILL_TWO); - break; + case 0: + m_creature->MonsterYell(YELL_KILL_ONE, LANG_UNIVERSAL, NULL); + DoPlaySoundToSet(m_creature, SOUND_YELL_KILL_ONE); + break; + case 1: + m_creature->MonsterYell(YELL_KILL_TWO, LANG_UNIVERSAL, NULL); + DoPlaySoundToSet(m_creature, SOUND_YELL_KILL_TWO); + break; } } @@ -336,26 +336,26 @@ struct TRINITY_DLL_DECL boss_nalorakkAI : public ScriptedAI if (waitTimer) { if (inMove) - if (waitTimer < diff) + if (waitTimer <= diff) { (*m_creature).GetMotionMaster()->MovementExpired(); (*m_creature).GetMotionMaster()->MovePoint(MovePhase,NalorakkWay[MovePhase][0],NalorakkWay[MovePhase][1],NalorakkWay[MovePhase][2]); waitTimer = 0; - }else waitTimer -= diff; + } else waitTimer -= diff; } if (!UpdateVictim()) return; - if (Berserk_Timer < diff) + if (Berserk_Timer <= diff) { DoCast(m_creature, SPELL_BERSERK, true); m_creature->MonsterYell(YELL_BERSERK, LANG_UNIVERSAL, NULL); DoPlaySoundToSet(m_creature, SOUND_YELL_BERSERK); Berserk_Timer = 600000; - }else Berserk_Timer -= diff; + } else Berserk_Timer -= diff; - if (ShapeShift_Timer < diff) + if (ShapeShift_Timer <= diff) { if (inBearForm) { @@ -381,17 +381,17 @@ struct TRINITY_DLL_DECL boss_nalorakkAI : public ScriptedAI ShapeShift_Timer = 20000 + rand()%5000; // dur 30s inBearForm = true; } - }else ShapeShift_Timer -= diff; + } else ShapeShift_Timer -= diff; if (!inBearForm) { - if (BrutalSwipe_Timer < diff) + if (BrutalSwipe_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_BRUTALSWIPE); BrutalSwipe_Timer = 7000 + rand()%5000; - }else BrutalSwipe_Timer -= diff; + } else BrutalSwipe_Timer -= diff; - if (Mangle_Timer < diff) + if (Mangle_Timer <= diff) { if (m_creature->getVictim() && !m_creature->getVictim()->HasAura(SPELL_MANGLEEFFECT)) { @@ -399,37 +399,37 @@ struct TRINITY_DLL_DECL boss_nalorakkAI : public ScriptedAI Mangle_Timer = 1000; } else Mangle_Timer = 10000 + rand()%5000; - }else Mangle_Timer -= diff; + } else Mangle_Timer -= diff; - if (Surge_Timer < diff) + if (Surge_Timer <= diff) { m_creature->MonsterYell(YELL_SURGE, LANG_UNIVERSAL, NULL); DoPlaySoundToSet(m_creature, SOUND_YELL_SURGE); - Unit *target = SelectTarget(SELECT_TARGET_RANDOM, 1, 45, true); - if (target) - DoCast(target, SPELL_SURGE); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 45, true); + if (pTarget) + DoCast(pTarget, SPELL_SURGE); Surge_Timer = 15000 + rand()%5000; - }else Surge_Timer -= diff; + } else Surge_Timer -= diff; } else { - if (LaceratingSlash_Timer < diff) + if (LaceratingSlash_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_LACERATINGSLASH); LaceratingSlash_Timer = 18000 + rand()%5000; - }else LaceratingSlash_Timer -= diff; + } else LaceratingSlash_Timer -= diff; - if (RendFlesh_Timer < diff) + if (RendFlesh_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_RENDFLESH); RendFlesh_Timer = 5000 + rand()%5000; - }else RendFlesh_Timer -= diff; + } else RendFlesh_Timer -= diff; - if (DeafeningRoar_Timer < diff) + if (DeafeningRoar_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_DEAFENINGROAR); DeafeningRoar_Timer = 15000 + rand()%5000; - }else DeafeningRoar_Timer -= diff; + } else DeafeningRoar_Timer -= diff; } DoMeleeAttackIfReady(); diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_zuljin.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_zuljin.cpp index c8f85a81a71..28e6627028b 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_zuljin.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_zuljin.cpp @@ -228,16 +228,16 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI if (Intro_Timer) return; - switch(rand()%2) + switch (urand(0,1)) { - case 0: - m_creature->MonsterYell(YELL_KILL_ONE, LANG_UNIVERSAL, NULL); - DoPlaySoundToSet(m_creature, SOUND_KILL_ONE); - break; - case 1: - m_creature->MonsterYell(YELL_KILL_TWO, LANG_UNIVERSAL, NULL); - DoPlaySoundToSet(m_creature, SOUND_KILL_TWO); - break; + case 0: + m_creature->MonsterYell(YELL_KILL_ONE, LANG_UNIVERSAL, NULL); + DoPlaySoundToSet(m_creature, SOUND_KILL_ONE); + break; + case 1: + m_creature->MonsterYell(YELL_KILL_TWO, LANG_UNIVERSAL, NULL); + DoPlaySoundToSet(m_creature, SOUND_KILL_TWO); + break; } } @@ -277,7 +277,7 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI m_creature->CastSpell(m_creature->getVictim(), SPELL_OVERPOWER, false); Overpower_Timer = 5000; } - }else m_creature->AttackerStateUpdate(m_creature->getVictim()); + } else m_creature->AttackerStateUpdate(m_creature->getVictim()); m_creature->resetAttackTimer(); } } @@ -394,13 +394,13 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI EnterPhase(Phase + 1); } - if (Berserk_Timer < diff) + if (Berserk_Timer <= diff) { m_creature->CastSpell(m_creature, SPELL_BERSERK, true); m_creature->MonsterYell(YELL_BERSERK, LANG_UNIVERSAL, NULL); DoPlaySoundToSet(m_creature, SOUND_BERSERK); Berserk_Timer = 60000; - }else Berserk_Timer -= diff; + } else Berserk_Timer -= diff; switch (Phase) { @@ -412,35 +412,35 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI m_creature->MonsterYell(YELL_AGGRO, LANG_UNIVERSAL, NULL); DoPlaySoundToSet(m_creature, SOUND_AGGRO); Intro_Timer = 0; - }else Intro_Timer -= diff; + } else Intro_Timer -= diff; } - if (Whirlwind_Timer < diff) + if (Whirlwind_Timer <= diff) { DoCast(m_creature, SPELL_WHIRLWIND); Whirlwind_Timer = 15000 + rand()%5000; - }else Whirlwind_Timer -= diff; + } else Whirlwind_Timer -= diff; - if (Grievous_Throw_Timer < diff) + if (Grievous_Throw_Timer <= diff) { - if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0)) - m_creature->CastSpell(target, SPELL_GRIEVOUS_THROW, false); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + m_creature->CastSpell(pTarget, SPELL_GRIEVOUS_THROW, false); Grievous_Throw_Timer = 10000; - }else Grievous_Throw_Timer -= diff; + } else Grievous_Throw_Timer -= diff; break; case 1: - if (Creeping_Paralysis_Timer < diff) + if (Creeping_Paralysis_Timer <= diff) { DoCast(m_creature, SPELL_CREEPING_PARALYSIS); Creeping_Paralysis_Timer = 20000; - }else Creeping_Paralysis_Timer -= diff; + } else Creeping_Paralysis_Timer -= diff; - if (Overpower_Timer < diff) + if (Overpower_Timer <= diff) { // implemented in DoMeleeAttackIfReady() Overpower_Timer = 0; - }else Overpower_Timer -= diff; + } else Overpower_Timer -= diff; break; case 2: @@ -451,11 +451,11 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI { if (!TankGUID) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) { TankGUID = m_creature->getVictim()->GetGUID(); m_creature->SetSpeed(MOVE_RUN, 5.0f); - AttackStart(target); // change victim + AttackStart(pTarget); // change victim Claw_Rage_Timer = 0; Claw_Loop_Timer = 500; Claw_Counter = 0; @@ -463,17 +463,17 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI } else if (!Claw_Rage_Timer) // do not do this when Lynx_Rush { - if (Claw_Loop_Timer < diff) + if (Claw_Loop_Timer <= diff) { - Unit* target = m_creature->getVictim(); - if (!target || !target->isTargetableForAttack()) target = Unit::GetUnit(*m_creature, TankGUID); - if (!target || !target->isTargetableForAttack()) target = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (target) + Unit *pTarget = m_creature->getVictim(); + if (!pTarget || !pTarget->isTargetableForAttack()) pTarget = Unit::GetUnit(*m_creature, TankGUID); + if (!pTarget || !pTarget->isTargetableForAttack()) pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + if (pTarget) { - AttackStart(target); - if (m_creature->IsWithinMeleeRange(target)) + AttackStart(pTarget); + if (m_creature->IsWithinMeleeRange(pTarget)) { - m_creature->CastSpell(target, SPELL_CLAW_RAGE_DAMAGE, true); + m_creature->CastSpell(pTarget, SPELL_CLAW_RAGE_DAMAGE, true); Claw_Counter++; if (Claw_Counter == 12) { @@ -489,39 +489,39 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI } else { - EnterEvadeMode(); // if (target) + EnterEvadeMode(); // if (pTarget) return; } - }else Claw_Loop_Timer -= diff; + } else Claw_Loop_Timer -= diff; } //if (TankGUID) - }else Claw_Rage_Timer -= diff; + } else Claw_Rage_Timer -= diff; if (Lynx_Rush_Timer <= diff) { if (!TankGUID) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) { TankGUID = m_creature->getVictim()->GetGUID(); m_creature->SetSpeed(MOVE_RUN, 5.0f); - AttackStart(target); // change victim + AttackStart(pTarget); // change victim Lynx_Rush_Timer = 0; Claw_Counter = 0; } } else if (!Lynx_Rush_Timer) { - Unit* target = m_creature->getVictim(); - if (!target || !target->isTargetableForAttack()) + Unit *pTarget = m_creature->getVictim(); + if (!pTarget || !pTarget->isTargetableForAttack()) { - target = SelectUnit(SELECT_TARGET_RANDOM, 0); - AttackStart(target); + pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + AttackStart(pTarget); } - if (target) + if (pTarget) { - if (m_creature->IsWithinMeleeRange(target)) + if (m_creature->IsWithinMeleeRange(pTarget)) { - m_creature->CastSpell(target, SPELL_LYNX_RUSH_DAMAGE, true); + m_creature->CastSpell(pTarget, SPELL_LYNX_RUSH_DAMAGE, true); Claw_Counter++; if (Claw_Counter == 9) { @@ -536,34 +536,34 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI } else { - EnterEvadeMode(); // if (target) + EnterEvadeMode(); // if (pTarget) return; } } //if (TankGUID) - }else Lynx_Rush_Timer -= diff; + } else Lynx_Rush_Timer -= diff; break; case 4: - if (Flame_Whirl_Timer < diff) + if (Flame_Whirl_Timer <= diff) { DoCast(m_creature, SPELL_FLAME_WHIRL); Flame_Whirl_Timer = 12000; }Flame_Whirl_Timer -= diff; - if (Pillar_Of_Fire_Timer < diff) + if (Pillar_Of_Fire_Timer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(target, SPELL_SUMMON_PILLAR); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_SUMMON_PILLAR); Pillar_Of_Fire_Timer = 10000; - }else Pillar_Of_Fire_Timer -= diff; + } else Pillar_Of_Fire_Timer -= diff; - if (Flame_Breath_Timer < diff) + if (Flame_Breath_Timer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) - m_creature->SetInFront(target); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + m_creature->SetInFront(pTarget); DoCast(m_creature, SPELL_FLAME_BREATH); Flame_Breath_Timer = 10000; - }else Flame_Breath_Timer -= diff; + } else Flame_Breath_Timer -= diff; break; default: @@ -586,7 +586,7 @@ struct TRINITY_DLL_DECL feather_vortexAI : public ScriptedAI void Reset() {} - void EnterCombat(Unit* target) {} + void EnterCombat(Unit *pTarget) {} void SpellHit(Unit *caster, const SpellEntry *spell) { @@ -596,7 +596,7 @@ struct TRINITY_DLL_DECL feather_vortexAI : public ScriptedAI void UpdateAI(const uint32 diff) { - //if the vortex reach the target, it change his target to another player + //if the vortex reach the pTarget, it change his pTarget to another player if (m_creature->IsWithinMeleeRange(m_creature->getVictim())) AttackStart(SelectUnit(SELECT_TARGET_RANDOM, 0)); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/instance_zulaman.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/instance_zulaman.cpp index 0ab398e0ef4..fa4e19f7479 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/instance_zulaman.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/instance_zulaman.cpp @@ -190,7 +190,7 @@ struct TRINITY_DLL_DECL instance_zulaman : public ScriptedInstance BossKilled = data1; ChestLooted = data2; QuestMinute = data3; - }else error_log("TSCR: Zul'aman: corrupted save data."); + } else error_log("TSCR: Zul'aman: corrupted save data."); } void SetData(uint32 type, uint32 data) @@ -288,7 +288,7 @@ struct TRINITY_DLL_DECL instance_zulaman : public ScriptedInstance { if (QuestMinute) { - if (QuestTimer < diff) + if (QuestTimer <= diff) { QuestMinute--; SaveToDB(); @@ -297,7 +297,7 @@ struct TRINITY_DLL_DECL instance_zulaman : public ScriptedInstance { DoUpdateWorldState(3104, 1); DoUpdateWorldState(3106, QuestMinute); - }else DoUpdateWorldState(3104, 0); + } else DoUpdateWorldState(3104, 0); } QuestTimer -= diff; } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_arlokk.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_arlokk.cpp index fa51899be22..563481118db 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_arlokk.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_arlokk.cpp @@ -150,7 +150,7 @@ struct TRINITY_DLL_DECL boss_arlokkAI : public ScriptedAI if (!m_bIsPhaseTwo) { - if (m_uiShadowWordPain_Timer < uiDiff) + if (m_uiShadowWordPain_Timer <= uiDiff) { DoCast(m_creature->getVictim(),SPELL_SHADOWWORDPAIN); m_uiShadowWordPain_Timer = 15000; @@ -158,7 +158,7 @@ struct TRINITY_DLL_DECL boss_arlokkAI : public ScriptedAI else m_uiShadowWordPain_Timer -= uiDiff; - if (m_uiMark_Timer < uiDiff) + if (m_uiMark_Timer <= uiDiff) { m_pMarkedTarget = SelectUnit(SELECT_TARGET_RANDOM,0); @@ -175,7 +175,7 @@ struct TRINITY_DLL_DECL boss_arlokkAI : public ScriptedAI else { //Cleave_Timer - if (m_uiCleave_Timer < uiDiff) + if (m_uiCleave_Timer <= uiDiff) { DoCast(m_creature->getVictim(), SPELL_CLEAVE); m_uiCleave_Timer = 16000; @@ -184,7 +184,7 @@ struct TRINITY_DLL_DECL boss_arlokkAI : public ScriptedAI m_uiCleave_Timer -= uiDiff; //Gouge_Timer - if (m_uiGouge_Timer < uiDiff) + if (m_uiGouge_Timer <= uiDiff) { DoCast(m_creature->getVictim(), SPELL_GOUGE); @@ -198,7 +198,7 @@ struct TRINITY_DLL_DECL boss_arlokkAI : public ScriptedAI if (m_uiSummonCount <= 30) { - if (m_uiSummon_Timer < uiDiff) + if (m_uiSummon_Timer <= uiDiff) { DoSummonPhanters(); m_uiSummon_Timer = 5000; @@ -207,7 +207,7 @@ struct TRINITY_DLL_DECL boss_arlokkAI : public ScriptedAI m_uiSummon_Timer -= uiDiff; } - if (m_uiVanish_Timer < uiDiff) + if (m_uiVanish_Timer <= uiDiff) { //Invisble Model m_creature->SetDisplayId(MODEL_ID_BLANK); @@ -226,7 +226,7 @@ struct TRINITY_DLL_DECL boss_arlokkAI : public ScriptedAI if (m_bIsVanished) { - if (m_uiVisible_Timer < uiDiff) + if (m_uiVisible_Timer <= uiDiff) { //The Panther Model m_creature->SetDisplayId(MODEL_ID_PANTHER); diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_gahzranka.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_gahzranka.cpp index 3de88e3af0f..3de54f0d68a 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_gahzranka.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_gahzranka.cpp @@ -52,27 +52,27 @@ struct TRINITY_DLL_DECL boss_gahzrankaAI : public ScriptedAI return; //Frostbreath_Timer - if (Frostbreath_Timer < diff) + if (Frostbreath_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_FROSTBREATH); Frostbreath_Timer = 7000 + rand()%4000; - }else Frostbreath_Timer -= diff; + } else Frostbreath_Timer -= diff; //MassiveGeyser_Timer - if (MassiveGeyser_Timer < diff) + if (MassiveGeyser_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_MASSIVEGEYSER); DoResetThreat(); MassiveGeyser_Timer = 22000 + rand()%10000; - }else MassiveGeyser_Timer -= diff; + } else MassiveGeyser_Timer -= diff; //Slam_Timer - if (Slam_Timer < diff) + if (Slam_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_SLAM); Slam_Timer = 12000 + rand()%8000; - }else Slam_Timer -= diff; + } else Slam_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_grilek.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_grilek.cpp index eb46bb9bcd1..f75e7181b99 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_grilek.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_grilek.cpp @@ -51,28 +51,28 @@ struct TRINITY_DLL_DECL boss_grilekAI : public ScriptedAI return; //Avartar_Timer - if (Avartar_Timer < diff) + if (Avartar_Timer <= diff) { DoCast(m_creature, SPELL_AVARTAR); - Unit* target = NULL; + Unit *pTarget = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM,1); + pTarget = SelectUnit(SELECT_TARGET_RANDOM,1); if (DoGetThreat(m_creature->getVictim())) DoModifyThreatPercent(m_creature->getVictim(),-50); - if (target) - AttackStart(target); + if (pTarget) + AttackStart(pTarget); Avartar_Timer = 25000 + rand()%10000; - }else Avartar_Timer -= diff; + } else Avartar_Timer -= diff; //GroundTremor_Timer - if (GroundTremor_Timer < diff) + if (GroundTremor_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_GROUNDTREMOR); GroundTremor_Timer = 12000 + rand()%4000; - }else GroundTremor_Timer -= diff; + } else GroundTremor_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_hakkar.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_hakkar.cpp index f3c13643036..058312f8923 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_hakkar.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_hakkar.cpp @@ -105,130 +105,130 @@ struct TRINITY_DLL_DECL boss_hakkarAI : public ScriptedAI return; //BloodSiphon_Timer - if (BloodSiphon_Timer < diff) + if (BloodSiphon_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_BLOODSIPHON); BloodSiphon_Timer = 90000; - }else BloodSiphon_Timer -= diff; + } else BloodSiphon_Timer -= diff; //CorruptedBlood_Timer - if (CorruptedBlood_Timer < diff) + if (CorruptedBlood_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_CORRUPTEDBLOOD); CorruptedBlood_Timer = 30000 + rand()%15000; - }else CorruptedBlood_Timer -= diff; + } else CorruptedBlood_Timer -= diff; //CauseInsanity_Timer - /*if (CauseInsanity_Timer < diff) + /*if (CauseInsanity_Timer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(target,SPELL_CAUSEINSANITY); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget,SPELL_CAUSEINSANITY); CauseInsanity_Timer = 35000 + rand()%8000; - }else CauseInsanity_Timer -= diff;*/ + } else CauseInsanity_Timer -= diff;*/ //WillOfHakkar_Timer - if (WillOfHakkar_Timer < diff) + if (WillOfHakkar_Timer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(target,SPELL_WILLOFHAKKAR); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget,SPELL_WILLOFHAKKAR); WillOfHakkar_Timer = 25000 + rand()%10000; - }else WillOfHakkar_Timer -= diff; + } else WillOfHakkar_Timer -= diff; - if (!Enraged && Enrage_Timer < diff) + if (!Enraged && Enrage_Timer <= diff) { DoCast(m_creature, SPELL_ENRAGE); Enraged = true; - }else Enrage_Timer -= diff; + } else Enrage_Timer -= diff; //Checking if Jeklik is dead. If not we cast her Aspect - if (CheckJeklik_Timer < diff) + if (CheckJeklik_Timer <= diff) { if (m_pInstance) { if (m_pInstance->GetData(TYPE_JEKLIK) != DONE) { - if (AspectOfJeklik_Timer < diff) + if (AspectOfJeklik_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_ASPECT_OF_JEKLIK); AspectOfJeklik_Timer = 10000 + rand()%4000; - }else AspectOfJeklik_Timer -= diff; + } else AspectOfJeklik_Timer -= diff; } } CheckJeklik_Timer = 1000; - }else CheckJeklik_Timer -= diff; + } else CheckJeklik_Timer -= diff; //Checking if Venoxis is dead. If not we cast his Aspect - if (CheckVenoxis_Timer < diff) + if (CheckVenoxis_Timer <= diff) { if (m_pInstance) { if (m_pInstance->GetData(TYPE_VENOXIS) != DONE) { - if (AspectOfVenoxis_Timer < diff) + if (AspectOfVenoxis_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_ASPECT_OF_VENOXIS); AspectOfVenoxis_Timer = 8000; - }else AspectOfVenoxis_Timer -= diff; + } else AspectOfVenoxis_Timer -= diff; } } CheckVenoxis_Timer = 1000; - }else CheckVenoxis_Timer -= diff; + } else CheckVenoxis_Timer -= diff; //Checking if Marli is dead. If not we cast her Aspect - if (CheckMarli_Timer < diff) + if (CheckMarli_Timer <= diff) { if (m_pInstance) { if (m_pInstance->GetData(TYPE_MARLI) != DONE) { - if (AspectOfMarli_Timer < diff) + if (AspectOfMarli_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_ASPECT_OF_MARLI); AspectOfMarli_Timer = 10000; - }else AspectOfMarli_Timer -= diff; + } else AspectOfMarli_Timer -= diff; } } CheckMarli_Timer = 1000; - }else CheckMarli_Timer -= diff; + } else CheckMarli_Timer -= diff; //Checking if Thekal is dead. If not we cast his Aspect - if (CheckThekal_Timer < diff) + if (CheckThekal_Timer <= diff) { if (m_pInstance) { if (m_pInstance->GetData(TYPE_THEKAL) != DONE) { - if (AspectOfThekal_Timer < diff) + if (AspectOfThekal_Timer <= diff) { DoCast(m_creature,SPELL_ASPECT_OF_THEKAL); AspectOfThekal_Timer = 15000; - }else AspectOfThekal_Timer -= diff; + } else AspectOfThekal_Timer -= diff; } } CheckThekal_Timer = 1000; - }else CheckThekal_Timer -= diff; + } else CheckThekal_Timer -= diff; //Checking if Arlokk is dead. If yes we cast her Aspect - if (CheckArlokk_Timer < diff) + if (CheckArlokk_Timer <= diff) { if (m_pInstance) { if (m_pInstance->GetData(TYPE_ARLOKK) != DONE) { - if (AspectOfArlokk_Timer < diff) + if (AspectOfArlokk_Timer <= diff) { DoCast(m_creature,SPELL_ASPECT_OF_ARLOKK); DoResetThreat(); AspectOfArlokk_Timer = 10000 + rand()%5000; - }else AspectOfArlokk_Timer -= diff; + } else AspectOfArlokk_Timer -= diff; } } CheckArlokk_Timer = 1000; - }else CheckArlokk_Timer -= diff; + } else CheckArlokk_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_hazzarah.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_hazzarah.cpp index f6c3773e3cd..4aa5da488e4 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_hazzarah.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_hazzarah.cpp @@ -53,38 +53,38 @@ struct TRINITY_DLL_DECL boss_hazzarahAI : public ScriptedAI return; //ManaBurn_Timer - if (ManaBurn_Timer < diff) + if (ManaBurn_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_MANABURN); ManaBurn_Timer = 8000 + rand()%8000; - }else ManaBurn_Timer -= diff; + } else ManaBurn_Timer -= diff; //Sleep_Timer - if (Sleep_Timer < diff) + if (Sleep_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_SLEEP); Sleep_Timer = 12000 + rand()%8000; - }else Sleep_Timer -= diff; + } else Sleep_Timer -= diff; //Illusions_Timer - if (Illusions_Timer < diff) + if (Illusions_Timer <= diff) { //We will summon 3 illusions that will spawn on a random gamer and attack this gamer //We will just use one model for the beginning - Unit* target = NULL; + Unit *pTarget = NULL; for (uint8 i = 0; i < 3; ++i) { - target = SelectUnit(SELECT_TARGET_RANDOM,0); - if (!target) + pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); + if (!pTarget) return; - Illusion = m_creature->SummonCreature(15163,target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(),0,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,30000); + Illusion = m_creature->SummonCreature(15163,pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(),0,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,30000); if (Illusion) - (Illusion->AI())->AttackStart(target); + Illusion->AI()->AttackStart(pTarget); } Illusions_Timer = 15000 + rand()%10000; - }else Illusions_Timer -= diff; + } else Illusions_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_jeklik.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_jeklik.cpp index 0ac6e2f54c1..2e1060f6227 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_jeklik.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_jeklik.cpp @@ -100,99 +100,99 @@ struct TRINITY_DLL_DECL boss_jeklikAI : public ScriptedAI { if ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth() > 50)) { - if (Charge_Timer < diff) + if (Charge_Timer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) { - DoCast(target,SPELL_CHARGE); - AttackStart(target); + DoCast(pTarget,SPELL_CHARGE); + AttackStart(pTarget); } Charge_Timer = 15000 + rand()%15000; - }else Charge_Timer -= diff; + } else Charge_Timer -= diff; - if (SonicBurst_Timer < diff) + if (SonicBurst_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_SONICBURST); SonicBurst_Timer = 8000 + rand()%5000; - }else SonicBurst_Timer -= diff; + } else SonicBurst_Timer -= diff; - if (Screech_Timer < diff) + if (Screech_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_SCREECH); Screech_Timer = 18000 + rand()%8000; - }else Screech_Timer -= diff; + } else Screech_Timer -= diff; - if (SpawnBats_Timer < diff) + if (SpawnBats_Timer <= diff) { - Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0); + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); Creature* Bat = NULL; Bat = m_creature->SummonCreature(11368,-12291.6220,-1380.2640,144.8304,5.483, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); - if (target && Bat) Bat ->AI()->AttackStart(target); + if (pTarget && Bat) Bat ->AI()->AttackStart(pTarget); Bat = m_creature->SummonCreature(11368,-12289.6220,-1380.2640,144.8304,5.483, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); - if (target && Bat) Bat ->AI()->AttackStart(target); + if (pTarget && Bat) Bat ->AI()->AttackStart(pTarget); Bat = m_creature->SummonCreature(11368,-12293.6220,-1380.2640,144.8304,5.483, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); - if (target && Bat) Bat ->AI()->AttackStart(target); + if (pTarget && Bat) Bat ->AI()->AttackStart(pTarget); Bat = m_creature->SummonCreature(11368,-12291.6220,-1380.2640,144.8304,5.483, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); - if (target && Bat) Bat ->AI()->AttackStart(target); + if (pTarget && Bat) Bat ->AI()->AttackStart(pTarget); Bat = m_creature->SummonCreature(11368,-12289.6220,-1380.2640,144.8304,5.483, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); - if (target && Bat) Bat ->AI()->AttackStart(target); + if (pTarget && Bat) Bat ->AI()->AttackStart(pTarget); Bat = m_creature->SummonCreature(11368,-12293.6220,-1380.2640,144.8304,5.483, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); - if (target && Bat) Bat ->AI()->AttackStart(target); + if (pTarget && Bat) Bat ->AI()->AttackStart(pTarget); SpawnBats_Timer = 60000; - }else SpawnBats_Timer -= diff; + } else SpawnBats_Timer -= diff; } else { if (PhaseTwo) { - if (PhaseTwo && ShadowWordPain_Timer < diff) + if (PhaseTwo && ShadowWordPain_Timer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) { - DoCast(target, SPELL_SHADOW_WORD_PAIN); + DoCast(pTarget, SPELL_SHADOW_WORD_PAIN); ShadowWordPain_Timer = 12000 + rand()%6000; } }ShadowWordPain_Timer -=diff; - if (MindFlay_Timer < diff) + if (MindFlay_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_MIND_FLAY); MindFlay_Timer = 16000; }MindFlay_Timer -=diff; - if (ChainMindFlay_Timer < diff) + if (ChainMindFlay_Timer <= diff) { m_creature->InterruptNonMeleeSpells(false); DoCast(m_creature->getVictim(), SPELL_CHAIN_MIND_FLAY); ChainMindFlay_Timer = 15000 + rand()%15000; }ChainMindFlay_Timer -=diff; - if (GreaterHeal_Timer < diff) + if (GreaterHeal_Timer <= diff) { m_creature->InterruptNonMeleeSpells(false); DoCast(m_creature,SPELL_GREATERHEAL); GreaterHeal_Timer = 25000 + rand()%10000; }GreaterHeal_Timer -=diff; - if (SpawnFlyingBats_Timer < diff) + if (SpawnFlyingBats_Timer <= diff) { - Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (!target) + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + if (!pTarget) return; - Creature* FlyingBat = m_creature->SummonCreature(14965, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ()+15, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Creature* FlyingBat = m_creature->SummonCreature(14965, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ()+15, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (FlyingBat) - FlyingBat->AI()->AttackStart(target); + FlyingBat->AI()->AttackStart(pTarget); SpawnFlyingBats_Timer = 10000 + rand()%5000; - }else SpawnFlyingBats_Timer -=diff; + } else SpawnFlyingBats_Timer -=diff; } else { @@ -236,17 +236,17 @@ struct TRINITY_DLL_DECL mob_batriderAI : public ScriptedAI return; //Bomb_Timer - if (Bomb_Timer < diff) + if (Bomb_Timer <= diff) { - if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0)) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) { - DoCast(target, SPELL_BOMB); + DoCast(pTarget, SPELL_BOMB); Bomb_Timer = 5000; } - }else Bomb_Timer -= diff; + } else Bomb_Timer -= diff; //Check_Timer - if (Check_Timer < diff) + if (Check_Timer <= diff) { if (m_pInstance) { @@ -259,7 +259,7 @@ struct TRINITY_DLL_DECL mob_batriderAI : public ScriptedAI } Check_Timer = 1000; - }else Check_Timer -= diff; + } else Check_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_jindo.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_jindo.cpp index b09d431f947..5b3dd7e9457 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_jindo.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_jindo.cpp @@ -69,22 +69,22 @@ struct TRINITY_DLL_DECL boss_jindoAI : public ScriptedAI return; //BrainWashTotem_Timer - if (BrainWashTotem_Timer < diff) + if (BrainWashTotem_Timer <= diff) { DoCast(m_creature, SPELL_BRAINWASHTOTEM); BrainWashTotem_Timer = 18000 + rand()%8000; - }else BrainWashTotem_Timer -= diff; + } else BrainWashTotem_Timer -= diff; //HealingWard_Timer - if (HealingWard_Timer < diff) + if (HealingWard_Timer <= diff) { //DoCast(m_creature, SPELL_POWERFULLHEALINGWARD); m_creature->SummonCreature(14987, m_creature->GetPositionX()+3, m_creature->GetPositionY()-2, m_creature->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,30000); HealingWard_Timer = 14000 + rand()%6000; - }else HealingWard_Timer -= diff; + } else HealingWard_Timer -= diff; //Hex_Timer - if (Hex_Timer < diff) + if (Hex_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_HEX); @@ -92,67 +92,67 @@ struct TRINITY_DLL_DECL boss_jindoAI : public ScriptedAI DoModifyThreatPercent(m_creature->getVictim(),-80); Hex_Timer = 12000 + rand()%8000; - }else Hex_Timer -= diff; + } else Hex_Timer -= diff; - //Casting the delusion curse with a shade. So shade will attack the same target with the curse. - if (Delusions_Timer < diff) + //Casting the delusion curse with a shade. So shade will attack the same pTarget with the curse. + if (Delusions_Timer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) { - DoCast(target, SPELL_DELUSIONSOFJINDO); + DoCast(pTarget, SPELL_DELUSIONSOFJINDO); - Creature *Shade = m_creature->SummonCreature(14986, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Creature *Shade = m_creature->SummonCreature(14986, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Shade) - Shade->AI()->AttackStart(target); + Shade->AI()->AttackStart(pTarget); } Delusions_Timer = 4000 + rand()%8000; - }else Delusions_Timer -= diff; + } else Delusions_Timer -= diff; //Teleporting a random gamer and spawning 9 skeletons that will attack this gamer - if (Teleport_Timer < diff) + if (Teleport_Timer <= diff) { - Unit* target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM,0); - if (target && target->GetTypeId() == TYPEID_PLAYER) + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); + if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) { - DoTeleportPlayer(target, -11583.7783,-1249.4278,77.5471,4.745); + DoTeleportPlayer(pTarget, -11583.7783,-1249.4278,77.5471,4.745); if (DoGetThreat(m_creature->getVictim())) - DoModifyThreatPercent(target,-100); + DoModifyThreatPercent(pTarget,-100); Creature *Skeletons; - Skeletons = m_creature->SummonCreature(14826, target->GetPositionX()+2, target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Skeletons = m_creature->SummonCreature(14826, pTarget->GetPositionX()+2, pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Skeletons) - Skeletons->AI()->AttackStart(target); - Skeletons = m_creature->SummonCreature(14826, target->GetPositionX()-2, target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Skeletons->AI()->AttackStart(pTarget); + Skeletons = m_creature->SummonCreature(14826, pTarget->GetPositionX()-2, pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Skeletons) - Skeletons->AI()->AttackStart(target); - Skeletons = m_creature->SummonCreature(14826, target->GetPositionX()+4, target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Skeletons->AI()->AttackStart(pTarget); + Skeletons = m_creature->SummonCreature(14826, pTarget->GetPositionX()+4, pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Skeletons) - Skeletons->AI()->AttackStart(target); - Skeletons = m_creature->SummonCreature(14826, target->GetPositionX()-4, target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Skeletons->AI()->AttackStart(pTarget); + Skeletons = m_creature->SummonCreature(14826, pTarget->GetPositionX()-4, pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Skeletons) - Skeletons->AI()->AttackStart(target); - Skeletons = m_creature->SummonCreature(14826, target->GetPositionX(), target->GetPositionY()+2, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Skeletons->AI()->AttackStart(pTarget); + Skeletons = m_creature->SummonCreature(14826, pTarget->GetPositionX(), pTarget->GetPositionY()+2, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Skeletons) - Skeletons->AI()->AttackStart(target); - Skeletons = m_creature->SummonCreature(14826, target->GetPositionX(), target->GetPositionY()-2, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Skeletons->AI()->AttackStart(pTarget); + Skeletons = m_creature->SummonCreature(14826, pTarget->GetPositionX(), pTarget->GetPositionY()-2, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Skeletons) - Skeletons->AI()->AttackStart(target); - Skeletons = m_creature->SummonCreature(14826, target->GetPositionX(), target->GetPositionY()+4, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Skeletons->AI()->AttackStart(pTarget); + Skeletons = m_creature->SummonCreature(14826, pTarget->GetPositionX(), pTarget->GetPositionY()+4, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Skeletons) - Skeletons->AI()->AttackStart(target); - Skeletons = m_creature->SummonCreature(14826, target->GetPositionX(), target->GetPositionY()-4, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Skeletons->AI()->AttackStart(pTarget); + Skeletons = m_creature->SummonCreature(14826, pTarget->GetPositionX(), pTarget->GetPositionY()-4, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Skeletons) - Skeletons->AI()->AttackStart(target); - Skeletons = m_creature->SummonCreature(14826, target->GetPositionX()+3, target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Skeletons->AI()->AttackStart(pTarget); + Skeletons = m_creature->SummonCreature(14826, pTarget->GetPositionX()+3, pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Skeletons) - Skeletons->AI()->AttackStart(target); + Skeletons->AI()->AttackStart(pTarget); } Teleport_Timer = 15000 + rand()%8000; - }else Teleport_Timer -= diff; + } else Teleport_Timer -= diff; DoMeleeAttackIfReady(); } @@ -182,7 +182,7 @@ struct TRINITY_DLL_DECL mob_healing_wardAI : public ScriptedAI void UpdateAI (const uint32 diff) { //Heal_Timer - if (Heal_Timer < diff) + if (Heal_Timer <= diff) { if (pInstance) { @@ -191,7 +191,7 @@ struct TRINITY_DLL_DECL mob_healing_wardAI : public ScriptedAI DoCast(pJindo, SPELL_HEAL); } Heal_Timer = 3000; - }else Heal_Timer -= diff; + } else Heal_Timer -= diff; DoMeleeAttackIfReady(); } @@ -218,11 +218,11 @@ struct TRINITY_DLL_DECL mob_shade_of_jindoAI : public ScriptedAI { //ShadowShock_Timer - if (ShadowShock_Timer < diff) + if (ShadowShock_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_SHADOWSHOCK); ShadowShock_Timer = 2000; - }else ShadowShock_Timer -= diff; + } else ShadowShock_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp index 42f0cca638e..db89c446918 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp @@ -145,9 +145,9 @@ struct TRINITY_DLL_DECL boss_mandokirAI : public ScriptedAI CombatStart = true; } - if (Watch_Timer < diff) //Every 20 Sec Mandokir will check this + if (Watch_Timer <= diff) //Every 20 Sec Mandokir will check this { - if (WatchTarget) //If someone is watched and If the Position of the watched target is different from the one stored, or are attacking, mandokir will charge him + if (WatchTarget) //If someone is watched and If the Position of the watched pTarget is different from the one stored, or are attacking, mandokir will charge him { Unit* pUnit = Unit::GetUnit(*m_creature, WatchTarget); @@ -171,7 +171,7 @@ struct TRINITY_DLL_DECL boss_mandokirAI : public ScriptedAI } someWatched = false; Watch_Timer = 20000; - }else Watch_Timer -= diff; + } else Watch_Timer -= diff; if ((Watch_Timer < 8000) && !someWatched) //8 sec(cast time + expire time) before the check for the watch effect mandokir will cast watch debuff on a random target { @@ -185,7 +185,7 @@ struct TRINITY_DLL_DECL boss_mandokirAI : public ScriptedAI } } - if ((Watch_Timer < 1000) && endWatch) //1 sec before the debuf expire, store the target position + if ((Watch_Timer < 1000) && endWatch) //1 sec before the debuf expire, store the pTarget position { Unit* pUnit = Unit::GetUnit(*m_creature, WatchTarget); if (pUnit) @@ -200,21 +200,21 @@ struct TRINITY_DLL_DECL boss_mandokirAI : public ScriptedAI if (!someWatched) { //Cleave - if (Cleave_Timer < diff) + if (Cleave_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_CLEAVE); Cleave_Timer = 7000; - }else Cleave_Timer -= diff; + } else Cleave_Timer -= diff; //Whirlwind - if (Whirlwind_Timer < diff) + if (Whirlwind_Timer <= diff) { DoCast(m_creature,SPELL_WHIRLWIND); Whirlwind_Timer = 18000; - }else Whirlwind_Timer -= diff; + } else Whirlwind_Timer -= diff; //If more then 3 targets in melee range mandokir will cast fear - if (Fear_Timer < diff) + if (Fear_Timer <= diff) { TargetInRange = 0; @@ -230,20 +230,20 @@ struct TRINITY_DLL_DECL boss_mandokirAI : public ScriptedAI DoCast(m_creature->getVictim(),SPELL_FEAR); Fear_Timer = 4000; - }else Fear_Timer -=diff; + } else Fear_Timer -=diff; - //Mortal Strike if target below 50% hp + //Mortal Strike if pTarget below 50% hp if (m_creature->getVictim() && m_creature->getVictim()->GetHealth() < m_creature->getVictim()->GetMaxHealth()*0.5) { - if (MortalStrike_Timer < diff) + if (MortalStrike_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_MORTAL_STRIKE); MortalStrike_Timer = 15000; - }else MortalStrike_Timer -= diff; + } else MortalStrike_Timer -= diff; } } //Checking if Ohgan is dead. If yes Mandokir will enrage. - if (Check_Timer < diff) + if (Check_Timer <= diff) { if (m_pInstance) { @@ -258,7 +258,7 @@ struct TRINITY_DLL_DECL boss_mandokirAI : public ScriptedAI } Check_Timer = 1000; - }else Check_Timer -= diff; + } else Check_Timer -= diff; DoMeleeAttackIfReady(); } @@ -296,11 +296,11 @@ struct TRINITY_DLL_DECL mob_ohganAI : public ScriptedAI return; //SunderArmor_Timer - if (SunderArmor_Timer < diff) + if (SunderArmor_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_SUNDERARMOR); SunderArmor_Timer = 10000 + rand()%5000; - }else SunderArmor_Timer -= diff; + } else SunderArmor_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_marli.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_marli.cpp index 7c9714ff461..94b117d8b5e 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_marli.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_marli.cpp @@ -92,55 +92,55 @@ struct TRINITY_DLL_DECL boss_marliAI : public ScriptedAI if (m_creature->getVictim() && m_creature->isAlive()) { - if (PoisonVolley_Timer < diff) + if (PoisonVolley_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_POISONVOLLEY); PoisonVolley_Timer = 10000 + rand()%10000; - }else PoisonVolley_Timer -= diff; + } else PoisonVolley_Timer -= diff; - if (!PhaseTwo && Aspect_Timer < diff) + if (!PhaseTwo && Aspect_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_ASPECT_OF_MARLI); Aspect_Timer = 13000 + rand()%5000; - }else Aspect_Timer -= diff; + } else Aspect_Timer -= diff; - if (!Spawned && SpawnStartSpiders_Timer < diff) + if (!Spawned && SpawnStartSpiders_Timer <= diff) { DoScriptText(SAY_SPIDER_SPAWN, m_creature); - Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0); - if (!target) + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); + if (!pTarget) return; - Spider = m_creature->SummonCreature(15041,target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Spider = m_creature->SummonCreature(15041,pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Spider) - Spider->AI()->AttackStart(target); - Spider = m_creature->SummonCreature(15041,target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Spider->AI()->AttackStart(pTarget); + Spider = m_creature->SummonCreature(15041,pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Spider) - Spider->AI()->AttackStart(target); - Spider = m_creature->SummonCreature(15041,target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Spider->AI()->AttackStart(pTarget); + Spider = m_creature->SummonCreature(15041,pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Spider) - Spider->AI()->AttackStart(target); - Spider = m_creature->SummonCreature(15041,target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Spider->AI()->AttackStart(pTarget); + Spider = m_creature->SummonCreature(15041,pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Spider) - Spider->AI()->AttackStart(target); + Spider->AI()->AttackStart(pTarget); Spawned = true; - }else SpawnStartSpiders_Timer -= diff; + } else SpawnStartSpiders_Timer -= diff; - if (SpawnSpider_Timer < diff) + if (SpawnSpider_Timer <= diff) { - Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0); - if (!target) + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); + if (!pTarget) return; - Spider = m_creature->SummonCreature(15041,target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Spider = m_creature->SummonCreature(15041,pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Spider) - Spider->AI()->AttackStart(target); + Spider->AI()->AttackStart(pTarget); SpawnSpider_Timer = 12000 + rand()%5000; - }else SpawnSpider_Timer -= diff; + } else SpawnSpider_Timer -= diff; - if (!PhaseTwo && Transform_Timer < diff) + if (!PhaseTwo && Transform_Timer <= diff) { DoScriptText(SAY_TRANSFORM, m_creature); DoCast(m_creature,SPELL_SPIDER_FORM); @@ -154,35 +154,34 @@ struct TRINITY_DLL_DECL boss_marliAI : public ScriptedAI DoModifyThreatPercent(m_creature->getVictim(),-100); PhaseTwo = true; - Transform_Timer = 35000 + rand()%25000; - }else Transform_Timer -= diff; + Transform_Timer = urand(35000,60000); + } else Transform_Timer -= diff; if (PhaseTwo) { - if (Charge_Timer < diff) + if (Charge_Timer <= diff) { - Unit* target = NULL; - int i = 0 ; - while (i < 3) // max 3 tries to get a random target with power_mana + Unit *pTarget = NULL; + int i = 0; + while (i < 3) // max 3 tries to get a random pTarget with power_mana { - ++i; //not aggro leader - target = SelectUnit(SELECT_TARGET_RANDOM,1); - if (target) - if (target->getPowerType() == POWER_MANA) - i=3; + ++i; + if (pTarget = SelectTarget(SELECT_TARGET_RANDOM,1, 100, true)) // not aggro leader + if (pTarget->getPowerType() == POWER_MANA) + i = 3; } - if (target) + if (pTarget) { - DoCast(target, SPELL_CHARGE); - //m_creature->GetMap()->CreatureRelocation(m_creature, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0); - //m_creature->SendMonsterMove(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, true,1); - AttackStart(target); + DoCast(pTarget, SPELL_CHARGE); + //m_creature->GetMap()->CreatureRelocation(m_creature, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0); + //m_creature->SendMonsterMove(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, true,1); + AttackStart(pTarget); } Charge_Timer = 8000; - }else Charge_Timer -= diff; + } else Charge_Timer -= diff; - if (TransformBack_Timer < diff) + if (TransformBack_Timer <= diff) { m_creature->SetDisplayId(15220); const CreatureInfo *cinfo = m_creature->GetCreatureInfo(); @@ -191,8 +190,8 @@ struct TRINITY_DLL_DECL boss_marliAI : public ScriptedAI m_creature->UpdateDamagePhysical(BASE_ATTACK); PhaseTwo = false; - TransformBack_Timer = 25000 + rand()%15000; - }else TransformBack_Timer -= diff; + TransformBack_Timer = urand(25000,40000); + } else TransformBack_Timer -= diff; } @@ -224,11 +223,11 @@ struct TRINITY_DLL_DECL mob_spawn_of_marliAI : public ScriptedAI return; //LevelUp_Timer - if (LevelUp_Timer < diff) + if (LevelUp_Timer <= diff) { DoCast(m_creature,SPELL_LEVELUP); LevelUp_Timer = 3000; - }else LevelUp_Timer -= diff; + } else LevelUp_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_renataki.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_renataki.cpp index 862f6181b8c..5eed4045b4f 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_renataki.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_renataki.cpp @@ -64,7 +64,7 @@ struct TRINITY_DLL_DECL boss_renatakiAI : public ScriptedAI return; //Invisible_Timer - if (Invisible_Timer < diff) + if (Invisible_Timer <= diff) { m_creature->InterruptSpell(CURRENT_GENERIC_SPELL); @@ -75,28 +75,28 @@ struct TRINITY_DLL_DECL boss_renatakiAI : public ScriptedAI Invisible = true; Invisible_Timer = 15000 + rand()%15000; - }else Invisible_Timer -= diff; + } else Invisible_Timer -= diff; if (Invisible) { - if (Ambush_Timer < diff) + if (Ambush_Timer <= diff) { - Unit* target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM,0); - if (target) + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); + if (pTarget) { - DoTeleportTo(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ()); - DoCast(target,SPELL_AMBUSH); + DoTeleportTo(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ()); + DoCast(pTarget,SPELL_AMBUSH); } Ambushed = true; Ambush_Timer = 3000; - }else Ambush_Timer -= diff; + } else Ambush_Timer -= diff; } if (Ambushed) { - if (Visible_Timer < diff) + if (Visible_Timer <= diff) { m_creature->InterruptSpell(CURRENT_GENERIC_SPELL); @@ -107,31 +107,31 @@ struct TRINITY_DLL_DECL boss_renatakiAI : public ScriptedAI Invisible = false; Visible_Timer = 4000; - }else Visible_Timer -= diff; + } else Visible_Timer -= diff; } //Resetting some aggro so he attacks other gamers if (!Invisible) - if (Aggro_Timer < diff) + if (Aggro_Timer <= diff) { - Unit* target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM,1); + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM,1); if (DoGetThreat(m_creature->getVictim())) DoModifyThreatPercent(m_creature->getVictim(),-50); - if (target) - AttackStart(target); + if (pTarget) + AttackStart(pTarget); Aggro_Timer = 7000 + rand()%13000; - }else Aggro_Timer -= diff; + } else Aggro_Timer -= diff; if (!Invisible) - if (ThousandBlades_Timer < diff) + if (ThousandBlades_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_THOUSANDBLADES); ThousandBlades_Timer = 7000 + rand()%5000; - }else ThousandBlades_Timer -= diff; + } else ThousandBlades_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_thekal.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_thekal.cpp index e182ee094d1..8e29b6c4483 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_thekal.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_thekal.cpp @@ -113,7 +113,7 @@ struct TRINITY_DLL_DECL boss_thekalAI : public ScriptedAI return; //Check_Timer for the death of LorKhan and Zath. - if (!WasDead && Check_Timer < diff) + if (!WasDead && Check_Timer <= diff) { if (m_pInstance) { @@ -148,19 +148,19 @@ struct TRINITY_DLL_DECL boss_thekalAI : public ScriptedAI } Check_Timer = 5000; - }else Check_Timer -= diff; + } else Check_Timer -= diff; - if (!PhaseTwo && MortalCleave_Timer < diff) + if (!PhaseTwo && MortalCleave_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_MORTALCLEAVE); MortalCleave_Timer = 15000 + rand()%5000; - }else MortalCleave_Timer -= diff; + } else MortalCleave_Timer -= diff; - if (!PhaseTwo && Silence_Timer < diff) + if (!PhaseTwo && Silence_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_SILENCE); Silence_Timer = 20000 + rand()%5000; - }else Silence_Timer -= diff; + } else Silence_Timer -= diff; if (!PhaseTwo && !WasDead && m_creature->GetHealth() <= m_creature->GetMaxHealth() * 0.05) { @@ -177,7 +177,7 @@ struct TRINITY_DLL_DECL boss_thekalAI : public ScriptedAI //Thekal will transform to Tiger if he died and was not resurrected after 10 seconds. if (!PhaseTwo && WasDead) { - if (Resurrect_Timer < diff) + if (Resurrect_Timer <= diff) { DoCast(m_creature,SPELL_TIGER_FORM); m_creature->SetFloatValue(OBJECT_FIELD_SCALE_X, 2.00f); @@ -190,7 +190,7 @@ struct TRINITY_DLL_DECL boss_thekalAI : public ScriptedAI m_creature->UpdateDamagePhysical(BASE_ATTACK); DoResetThreat(); PhaseTwo = true; - }else Resurrect_Timer -= diff; + } else Resurrect_Timer -= diff; } if ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth() == 100) && WasDead) @@ -200,35 +200,35 @@ struct TRINITY_DLL_DECL boss_thekalAI : public ScriptedAI if (PhaseTwo) { - if (Charge_Timer < diff) + if (Charge_Timer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) { - DoCast(target,SPELL_CHARGE); + DoCast(pTarget,SPELL_CHARGE); DoResetThreat(); - AttackStart(target); + AttackStart(pTarget); } Charge_Timer = 15000 + rand()%7000; - }else Charge_Timer -= diff; + } else Charge_Timer -= diff; - if (Frenzy_Timer < diff) + if (Frenzy_Timer <= diff) { DoCast(m_creature,SPELL_FRENZY); Frenzy_Timer = 30000; - }else Frenzy_Timer -= diff; + } else Frenzy_Timer -= diff; - if (ForcePunch_Timer < diff) + if (ForcePunch_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_SILENCE); ForcePunch_Timer = 16000 + rand()%5000; - }else ForcePunch_Timer -= diff; + } else ForcePunch_Timer -= diff; - if (SummonTigers_Timer < diff) + if (SummonTigers_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_SUMMONTIGERS); SummonTigers_Timer = 10000 + rand()%4000; - }else SummonTigers_Timer -= diff; + } else SummonTigers_Timer -= diff; if ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 11) && !Enraged) { @@ -287,21 +287,21 @@ struct TRINITY_DLL_DECL mob_zealot_lorkhanAI : public ScriptedAI return; //Shield_Timer - if (Shield_Timer < diff) + if (Shield_Timer <= diff) { DoCast(m_creature,SPELL_SHIELD); Shield_Timer = 61000; - }else Shield_Timer -= diff; + } else Shield_Timer -= diff; //BloodLust_Timer - if (BloodLust_Timer < diff) + if (BloodLust_Timer <= diff) { DoCast(m_creature,SPELL_BLOODLUST); BloodLust_Timer = 20000+rand()%8000; - }else BloodLust_Timer -= diff; + } else BloodLust_Timer -= diff; //Casting Greaterheal to Thekal or Zath if they are in meele range. - if (GreaterHeal_Timer < diff) + if (GreaterHeal_Timer <= diff) { if (m_pInstance) { @@ -311,7 +311,7 @@ struct TRINITY_DLL_DECL mob_zealot_lorkhanAI : public ScriptedAI if (!pThekal || !pZath) return; - switch(rand()%2) + switch (urand(0,1)) { case 0: if (m_creature->IsWithinMeleeRange(pThekal)) @@ -325,17 +325,17 @@ struct TRINITY_DLL_DECL mob_zealot_lorkhanAI : public ScriptedAI } GreaterHeal_Timer = 15000+rand()%5000; - }else GreaterHeal_Timer -= diff; + } else GreaterHeal_Timer -= diff; //Disarm_Timer - if (Disarm_Timer < diff) + if (Disarm_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_DISARM); Disarm_Timer = 15000+rand()%10000; - }else Disarm_Timer -= diff; + } else Disarm_Timer -= diff; //Check_Timer for the death of LorKhan and Zath. - if (!FakeDeath && Check_Timer < diff) + if (!FakeDeath && Check_Timer <= diff) { if (m_pInstance) { @@ -365,7 +365,7 @@ struct TRINITY_DLL_DECL mob_zealot_lorkhanAI : public ScriptedAI } Check_Timer = 5000; - }else Check_Timer -= diff; + } else Check_Timer -= diff; if (m_creature->GetHealth() <= m_creature->GetMaxHealth() * 0.05) { @@ -431,21 +431,21 @@ struct TRINITY_DLL_DECL mob_zealot_zathAI : public ScriptedAI return; //SweepingStrikes_Timer - if (SweepingStrikes_Timer < diff) + if (SweepingStrikes_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_SWEEPINGSTRIKES); SweepingStrikes_Timer = 22000+rand()%4000; - }else SweepingStrikes_Timer -= diff; + } else SweepingStrikes_Timer -= diff; //SinisterStrike_Timer - if (SinisterStrike_Timer < diff) + if (SinisterStrike_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_SINISTERSTRIKE); SinisterStrike_Timer = 8000+rand()%8000; - }else SinisterStrike_Timer -= diff; + } else SinisterStrike_Timer -= diff; //Gouge_Timer - if (Gouge_Timer < diff) + if (Gouge_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_GOUGE); @@ -453,24 +453,24 @@ struct TRINITY_DLL_DECL mob_zealot_zathAI : public ScriptedAI DoModifyThreatPercent(m_creature->getVictim(),-100); Gouge_Timer = 17000+rand()%10000; - }else Gouge_Timer -= diff; + } else Gouge_Timer -= diff; //Kick_Timer - if (Kick_Timer < diff) + if (Kick_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_KICK); Kick_Timer = 15000+rand()%10000; - }else Kick_Timer -= diff; + } else Kick_Timer -= diff; //Blind_Timer - if (Blind_Timer < diff) + if (Blind_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_BLIND); Blind_Timer = 10000+rand()%10000; - }else Blind_Timer -= diff; + } else Blind_Timer -= diff; //Check_Timer for the death of LorKhan and Zath. - if (!FakeDeath && Check_Timer < diff) + if (!FakeDeath && Check_Timer <= diff) { if (m_pInstance) { @@ -500,7 +500,7 @@ struct TRINITY_DLL_DECL mob_zealot_zathAI : public ScriptedAI } Check_Timer = 5000; - }else Check_Timer -= diff; + } else Check_Timer -= diff; if (m_creature->GetHealth() <= m_creature->GetMaxHealth() * 0.05) { diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_venoxis.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_venoxis.cpp index 53248c28357..fea7426f3c4 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_venoxis.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_venoxis.cpp @@ -91,31 +91,31 @@ struct TRINITY_DLL_DECL boss_venoxisAI : public ScriptedAI if ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth() > 50)) { - if (Dispell_Timer < diff) + if (Dispell_Timer <= diff) { DoCast(m_creature, SPELL_DISPELL); Dispell_Timer = 15000 + rand()%15000; - }else Dispell_Timer -= diff; + } else Dispell_Timer -= diff; - if (Renew_Timer < diff) + if (Renew_Timer <= diff) { DoCast(m_creature, SPELL_RENEW); Renew_Timer = 20000 + rand()%10000; - }else Renew_Timer -= diff; + } else Renew_Timer -= diff; - if (HolyWrath_Timer < diff) + if (HolyWrath_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_HOLY_WRATH); HolyWrath_Timer = 15000 + rand()%10000; - }else HolyWrath_Timer -= diff; + } else HolyWrath_Timer -= diff; - if (HolyNova_Timer < diff) + if (HolyNova_Timer <= diff) { TargetInRange = 0; for (uint8 i=0; i<10; ++i) { - if (Unit* target = SelectUnit(SELECT_TARGET_TOPAGGRO,i)) - if (m_creature->IsWithinMeleeRange(target)) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_TOPAGGRO,i)) + if (m_creature->IsWithinMeleeRange(pTarget)) TargetInRange++; } @@ -129,15 +129,15 @@ struct TRINITY_DLL_DECL boss_venoxisAI : public ScriptedAI HolyNova_Timer = 2000; } - }else HolyNova_Timer -= diff; + } else HolyNova_Timer -= diff; if (HolyFire_Timer < diff && TargetInRange < 3) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(target, SPELL_HOLY_FIRE); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget, SPELL_HOLY_FIRE); HolyFire_Timer = 8000; - }else HolyFire_Timer -= diff; + } else HolyFire_Timer -= diff; } else { @@ -155,19 +155,19 @@ struct TRINITY_DLL_DECL boss_venoxisAI : public ScriptedAI PhaseTwo = true; } - if (PhaseTwo && PoisonCloud_Timer < diff) + if (PhaseTwo && PoisonCloud_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_POISON_CLOUD); PoisonCloud_Timer = 15000; }PoisonCloud_Timer -=diff; - if (PhaseTwo && VenomSpit_Timer < diff) + if (PhaseTwo && VenomSpit_Timer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(target, SPELL_VENOMSPIT); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget, SPELL_VENOMSPIT); VenomSpit_Timer = 15000 + rand()%5000; - }else VenomSpit_Timer -= diff; + } else VenomSpit_Timer -= diff; if (PhaseTwo && (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 11)) { diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_wushoolay.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_wushoolay.cpp index 8ef4a7a69ff..3fd93edbec6 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_wushoolay.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_wushoolay.cpp @@ -50,21 +50,21 @@ struct TRINITY_DLL_DECL boss_wushoolayAI : public ScriptedAI return; //LightningCloud_Timer - if (LightningCloud_Timer < diff) + if (LightningCloud_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_LIGHTNINGCLOUD); LightningCloud_Timer = 15000 + rand()%5000; - }else LightningCloud_Timer -= diff; + } else LightningCloud_Timer -= diff; //LightningWave_Timer - if (LightningWave_Timer < diff) + if (LightningWave_Timer <= diff) { - Unit* target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM,0); - if (target) DoCast(target,SPELL_LIGHTNINGWAVE); + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); + if (pTarget) DoCast(pTarget,SPELL_LIGHTNINGWAVE); LightningWave_Timer = 12000 + rand()%4000; - }else LightningWave_Timer -= diff; + } else LightningWave_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/examples/example_creature.cpp b/src/bindings/scripts/scripts/examples/example_creature.cpp index c932f3387f9..07975cb466a 100644 --- a/src/bindings/scripts/scripts/examples/example_creature.cpp +++ b/src/bindings/scripts/scripts/examples/example_creature.cpp @@ -129,7 +129,7 @@ struct TRINITY_DLL_DECL example_creatureAI : public ScriptedAI if (!m_creature->getVictim()) { //Random Say timer - if (m_uiSay_Timer < uiDiff) + if (m_uiSay_Timer <= uiDiff) { //Random switch between 5 outcomes DoScriptText(RAND(SAY_RANDOM_0,SAY_RANDOM_1,SAY_RANDOM_2,SAY_RANDOM_3,SAY_RANDOM_4), m_creature); @@ -140,7 +140,7 @@ struct TRINITY_DLL_DECL example_creatureAI : public ScriptedAI m_uiSay_Timer -= uiDiff; //Rebuff timer - if (m_uiRebuff_Timer < uiDiff) + if (m_uiRebuff_Timer <= uiDiff) { DoCast(m_creature, SPELL_BUFF); m_uiRebuff_Timer = 900000; //Rebuff agian in 15 minutes @@ -154,7 +154,7 @@ struct TRINITY_DLL_DECL example_creatureAI : public ScriptedAI return; //Spell 1 timer - if (m_uiSpell_1_Timer < uiDiff) + if (m_uiSpell_1_Timer <= uiDiff) { //Cast spell one on our current target. if (rand()%50 > 10) @@ -168,7 +168,7 @@ struct TRINITY_DLL_DECL example_creatureAI : public ScriptedAI m_uiSpell_1_Timer -= uiDiff; //Spell 2 timer - if (m_uiSpell_2_Timer < uiDiff) + if (m_uiSpell_2_Timer <= uiDiff) { //Cast spell one on our current target. DoCast(m_creature->getVictim(), SPELL_TWO); @@ -181,7 +181,7 @@ struct TRINITY_DLL_DECL example_creatureAI : public ScriptedAI if (m_uiPhase > 1) { //Spell 3 timer - if (m_uiSpell_3_Timer < uiDiff) + if (m_uiSpell_3_Timer <= uiDiff) { //Cast spell one on our current target. DoCast(m_creature->getVictim(), SPELL_THREE); @@ -191,7 +191,7 @@ struct TRINITY_DLL_DECL example_creatureAI : public ScriptedAI else m_uiSpell_3_Timer -= uiDiff; - if (m_uiBeserk_Timer < uiDiff) + if (m_uiBeserk_Timer <= uiDiff) { //Say our line then cast uber death spell DoScriptText(SAY_BESERK, m_creature, m_creature->getVictim()); @@ -205,7 +205,7 @@ struct TRINITY_DLL_DECL example_creatureAI : public ScriptedAI } else if (m_uiPhase == 1) //Phase timer { - if (m_uiPhase_Timer < uiDiff) + if (m_uiPhase_Timer <= uiDiff) { //Go to next phase ++m_uiPhase; diff --git a/src/bindings/scripts/scripts/examples/example_escort.cpp b/src/bindings/scripts/scripts/examples/example_escort.cpp index 027268a9325..89a5867c643 100644 --- a/src/bindings/scripts/scripts/examples/example_escort.cpp +++ b/src/bindings/scripts/scripts/examples/example_escort.cpp @@ -78,7 +78,7 @@ struct TRINITY_DLL_DECL example_escortAI : public npc_escortAI case 4: if (Player* pPlayer = GetPlayerForEscort()) { - //pTmpPlayer is the target of the text + //pTmpPlayer is the pTarget of the text DoScriptText(SAY_WP_3, m_creature, pPlayer); //pTmpPlayer is the source of the text DoScriptText(SAY_WP_4, pPlayer); @@ -131,7 +131,7 @@ struct TRINITY_DLL_DECL example_escortAI : public npc_escortAI //Combat check if (m_creature->getVictim()) { - if (m_uiDeathCoilTimer < uiDiff) + if (m_uiDeathCoilTimer <= uiDiff) { DoScriptText(SAY_SPELL, m_creature); m_creature->CastSpell(m_creature->getVictim(), SPELL_DEATH_COIL, false); @@ -145,7 +145,7 @@ struct TRINITY_DLL_DECL example_escortAI : public npc_escortAI //Out of combat but being escorted if (HasEscortState(STATE_ESCORT_ESCORTING)) { - if (m_uiChatTimer < uiDiff) + if (m_uiChatTimer <= uiDiff) { if (m_creature->HasAura(SPELL_ELIXIR_OF_FORTITUDE, 0)) { diff --git a/src/bindings/scripts/scripts/kalimdor/ashenvale.cpp b/src/bindings/scripts/scripts/kalimdor/ashenvale.cpp index 7bb193b98be..917039bfb85 100644 --- a/src/bindings/scripts/scripts/kalimdor/ashenvale.cpp +++ b/src/bindings/scripts/scripts/kalimdor/ashenvale.cpp @@ -113,17 +113,17 @@ struct TRINITY_DLL_DECL npc_torekAI : public npc_escortAI if (!UpdateVictim()) return; - if (Rend_Timer < diff) + if (Rend_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_REND); Rend_Timer = 20000; - }else Rend_Timer -= diff; + } else Rend_Timer -= diff; - if (Thunderclap_Timer < diff) + if (Thunderclap_Timer <= diff) { DoCast(m_creature,SPELL_THUNDERCLAP); Thunderclap_Timer = 30000; - }else Thunderclap_Timer -= diff; + } else Thunderclap_Timer -= diff; } }; diff --git a/src/bindings/scripts/scripts/kalimdor/azshara.cpp b/src/bindings/scripts/scripts/kalimdor/azshara.cpp index d0d7fad255c..a27b7b00f74 100644 --- a/src/bindings/scripts/scripts/kalimdor/azshara.cpp +++ b/src/bindings/scripts/scripts/kalimdor/azshara.cpp @@ -280,7 +280,7 @@ struct TRINITY_DLL_DECL mob_rizzle_sprysprocketAI : public ScriptedAI void UpdateAI(const uint32 diff) { if (Must_Die) - if (Must_Die_Timer < diff) + if (Must_Die_Timer <= diff) { m_creature->ForcedDespawn(); return; @@ -291,13 +291,13 @@ struct TRINITY_DLL_DECL mob_rizzle_sprysprocketAI : public ScriptedAI if (!PlayerGUID) return; - if (spellEscape_Timer < diff) + if (spellEscape_Timer <= diff) { DoCast(m_creature, SPELL_RIZZLE_ESCAPE, false); spellEscape_Timer = 10000; } else spellEscape_Timer -= diff; - if (Teleport_Timer < diff) + if (Teleport_Timer <= diff) { //temp solution - unit can't be teleported by core using spelleffect 5, only players Map* pMap = m_creature->GetMap(); @@ -326,7 +326,7 @@ struct TRINITY_DLL_DECL mob_rizzle_sprysprocketAI : public ScriptedAI ContinueWP = false; } - if (Grenade_Timer < diff) + if (Grenade_Timer <= diff) { Player* pPlayer = Unit::GetPlayer(PlayerGUID); if (pPlayer) @@ -337,7 +337,7 @@ struct TRINITY_DLL_DECL mob_rizzle_sprysprocketAI : public ScriptedAI Grenade_Timer = 30000; } else Grenade_Timer -= diff; - if (Check_Timer < diff) + if (Check_Timer <= diff) { Player* pPlayer = Unit::GetPlayer(PlayerGUID); if (!pPlayer) @@ -450,7 +450,7 @@ struct TRINITY_DLL_DECL mob_depth_chargeAI : public ScriptedAI void UpdateAI(const uint32 diff) { if (we_must_die) - if (must_die_timer < diff) + if (must_die_timer <= diff) { m_creature->ForcedDespawn(); } else must_die_timer -= diff; diff --git a/src/bindings/scripts/scripts/kalimdor/azuremyst_isle.cpp b/src/bindings/scripts/scripts/kalimdor/azuremyst_isle.cpp index 74d0c5528f8..be3c7fac5d8 100644 --- a/src/bindings/scripts/scripts/kalimdor/azuremyst_isle.cpp +++ b/src/bindings/scripts/scripts/kalimdor/azuremyst_isle.cpp @@ -133,7 +133,7 @@ struct TRINITY_DLL_DECL npc_draenei_survivorAI : public ScriptedAI RunAwayTimer = 10000; SayThanksTimer = 0; - }else SayThanksTimer -= diff; + } else SayThanksTimer -= diff; return; } @@ -148,11 +148,11 @@ struct TRINITY_DLL_DECL npc_draenei_survivorAI : public ScriptedAI return; } - if (SayHelpTimer < diff) + if (SayHelpTimer <= diff) { CanSayHelp = true; SayHelpTimer = 20000; - }else SayHelpTimer -= diff; + } else SayHelpTimer -= diff; } }; CreatureAI* GetAI_npc_draenei_survivor(Creature* pCreature) @@ -218,12 +218,12 @@ struct TRINITY_DLL_DECL npc_engineer_spark_overgrindAI : public ScriptedAI { if (!m_creature->isInCombat() && !IsTreeEvent) { - if (Emote_Timer < diff) + if (Emote_Timer <= diff) { DoScriptText(SAY_TEXT, m_creature); DoScriptText(SAY_EMOTE, m_creature); Emote_Timer = 120000 + rand()%30000; - }else Emote_Timer -= diff; + } else Emote_Timer -= diff; } else if (IsTreeEvent) return; @@ -231,7 +231,7 @@ struct TRINITY_DLL_DECL npc_engineer_spark_overgrindAI : public ScriptedAI if (!UpdateVictim()) return; - if (Dynamite_Timer < diff) + if (Dynamite_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_DYNAMITE); Dynamite_Timer = 8000; @@ -517,13 +517,13 @@ struct TRINITY_DLL_DECL npc_geezleAI : public ScriptedAI void UpdateAI(const uint32 diff) { - if (SayTimer < diff) + if (SayTimer <= diff) { if (EventStarted) { SayTimer = NextStep(Step++); } - }else SayTimer -= diff; + } else SayTimer -= diff; } }; @@ -564,7 +564,7 @@ struct TRINITY_DLL_DECL npc_nestlewood_owlkinAI : public ScriptedAI //once we are able to, despawn us m_creature->ForcedDespawn(); return; - }else DespawnTimer -= diff; + } else DespawnTimer -= diff; } if (!UpdateVictim()) diff --git a/src/bindings/scripts/scripts/kalimdor/boss_azuregos.cpp b/src/bindings/scripts/scripts/kalimdor/boss_azuregos.cpp index 56efc4f71cf..51912675d5a 100644 --- a/src/bindings/scripts/scripts/kalimdor/boss_azuregos.cpp +++ b/src/bindings/scripts/scripts/kalimdor/boss_azuregos.cpp @@ -68,7 +68,7 @@ struct TRINITY_DLL_DECL boss_azuregosAI : public ScriptedAI if (!UpdateVictim()) return; - if (Teleport_Timer < diff) + if (Teleport_Timer <= diff) { DoScriptText(SAY_TELEPORT, m_creature); std::list<HostilReference*>& m_threatlist = m_creature->getThreatManager().getThreatList(); @@ -84,50 +84,50 @@ struct TRINITY_DLL_DECL boss_azuregosAI : public ScriptedAI DoResetThreat(); Teleport_Timer = 30000; - }else Teleport_Timer -= diff; + } else Teleport_Timer -= diff; // //MarkOfFrost_Timer - // if (MarkOfFrost_Timer < diff) + // if (MarkOfFrost_Timer <= diff) // { // DoCast(m_creature->getVictim(),SPELL_MARKOFFROST); // MarkOfFrost_Timer = 25000; - // }else MarkOfFrost_Timer -= diff; + // } else MarkOfFrost_Timer -= diff; //Chill_Timer - if (Chill_Timer < diff) + if (Chill_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_CHILL); Chill_Timer = 13000 + rand()%12000; - }else Chill_Timer -= diff; + } else Chill_Timer -= diff; //Breath_Timer - if (Breath_Timer < diff) + if (Breath_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_FROSTBREATH); Breath_Timer = 10000 + rand()%5000; - }else Breath_Timer -= diff; + } else Breath_Timer -= diff; //ManaStorm_Timer - if (ManaStorm_Timer < diff) + if (ManaStorm_Timer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(target,SPELL_MANASTORM); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget,SPELL_MANASTORM); ManaStorm_Timer = 7500 + rand()%5000; - }else ManaStorm_Timer -= diff; + } else ManaStorm_Timer -= diff; //Reflect_Timer - if (Reflect_Timer < diff) + if (Reflect_Timer <= diff) { DoCast(m_creature,SPELL_REFLECT); Reflect_Timer = 20000 + rand()%15000; - }else Reflect_Timer -= diff; + } else Reflect_Timer -= diff; //Cleave_Timer - if (Cleave_Timer < diff) + if (Cleave_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_CLEAVE); Cleave_Timer = 7000; - }else Cleave_Timer -= diff; + } else Cleave_Timer -= diff; //Enrage_Timer if (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 26 && !Enraged) diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp index 96ba265566c..f841df6e9f9 100644 --- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp +++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp @@ -14,7 +14,7 @@ update creature_template set scriptname = 'boss_meathook' where entry = ''; enum Spells { - SPELL_CONSTRICTING_CHAINS = 52696, //Encases the targets in chains, dealing 1800 Physical damage every 1 sec. and stunning the target for 5 sec. + SPELL_CONSTRICTING_CHAINS = 52696, //Encases the targets in chains, dealing 1800 Physical damage every 1 sec. and stunning the pTarget for 5 sec. H_SPELL_CONSTRICTING_CHAINS = 58823, SPELL_DISEASE_EXPULSION = 52666, //Meathook belches out a cloud of disease, dealing 1710 to 1890 Nature damage and interrupting the spell casting of nearby enemy targets for 4 sec. H_SPELL_DISEASE_EXPULSION = 58824, @@ -72,23 +72,23 @@ struct TRINITY_DLL_DECL boss_meathookAI : public ScriptedAI if (!UpdateVictim()) return; - if (uiDiseaseTimer < diff) + if (uiDiseaseTimer <= diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_DISEASE_EXPULSION,H_SPELL_DISEASE_EXPULSION)); uiDiseaseTimer = urand(1500,4000); - }else uiDiseaseTimer -= diff; + } else uiDiseaseTimer -= diff; - if (uiFrenzyTimer < diff) + if (uiFrenzyTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_FRENZY); uiFrenzyTimer = urand(20000,30000); - }else uiFrenzyTimer -= diff; + } else uiFrenzyTimer -= diff; - if (uiChainTimer < diff) + if (uiChainTimer <= diff) { DoCast(SelectUnit(SELECT_TARGET_RANDOM, 1), HEROIC(SPELL_CONSTRICTING_CHAINS,H_SPELL_CONSTRICTING_CHAINS)); //anyone but the tank uiChainTimer = urand(2000,3000); - }else uiChainTimer -= diff; + } else uiChainTimer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_salramm.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_salramm.cpp index 48edf6d08f1..b8896652aed 100644 --- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_salramm.cpp +++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_salramm.cpp @@ -85,37 +85,37 @@ struct TRINITY_DLL_DECL boss_salrammAI : public ScriptedAI return; //Curse of twisted flesh timer - if (Curse_flesh_Timer < diff) + if (Curse_flesh_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_CURSE_OF_TWISTED_FLESH); Curse_flesh_Timer = 37000; - }else Curse_flesh_Timer -= diff; + } else Curse_flesh_Timer -= diff; //Shadow bolt timer - if (Shadow_bolt_Timer < diff) + if (Shadow_bolt_Timer <= diff) { - if (Unit* random_target = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(random_target, HEROIC(SPELL_SHADOW_BOLT, H_SPELL_SHADOW_BOLT)); + if (Unit* random_pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(random_pTarget, HEROIC(SPELL_SHADOW_BOLT, H_SPELL_SHADOW_BOLT)); Shadow_bolt_Timer = urand(8000,12000); - }else Shadow_bolt_Timer -= diff; + } else Shadow_bolt_Timer -= diff; //Steal Flesh timer - if (Steal_flesh_Timer < diff) + if (Steal_flesh_Timer <= diff) { DoScriptText(RAND(SAY_STEAL_FLESH_1,SAY_STEAL_FLESH_2,SAY_STEAL_FLESH_3), m_creature); - if (Unit* random_target = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(random_target,SPELL_STEAL_FLESH); + if (Unit* random_pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(random_pTarget,SPELL_STEAL_FLESH); Steal_flesh_Timer = 10000; - }else Steal_flesh_Timer -= diff; + } else Steal_flesh_Timer -= diff; //Summon ghouls timer - if (Summon_ghouls_Timer < diff) + if (Summon_ghouls_Timer <= diff) { DoScriptText(RAND(SAY_SUMMON_GHOULS_1,SAY_SUMMON_GHOULS_2), m_creature); - if (Unit* random_target = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(random_target,SPELL_SUMMON_GHOULS); + if (Unit* random_pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(random_pTarget,SPELL_SUMMON_GHOULS); Summon_ghouls_Timer = 10000; - }else Summon_ghouls_Timer -= diff; + } else Summon_ghouls_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp index 5819a1afe8b..effa2003b6c 100644 --- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp +++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp @@ -146,7 +146,7 @@ struct TRINITY_DLL_DECL instance_culling_of_stratholme : public ScriptedInstance if (m_auiEncounter[i] == IN_PROGRESS) m_auiEncounter[i] = NOT_STARTED; - }else OUT_LOAD_INST_DATA_FAIL; + } else OUT_LOAD_INST_DATA_FAIL; OUT_LOAD_INST_DATA_COMPLETE; } diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_aeonus.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_aeonus.cpp index 53316067148..d8afba8ce5a 100644 --- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_aeonus.cpp +++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_aeonus.cpp @@ -106,26 +106,26 @@ struct TRINITY_DLL_DECL boss_aeonusAI : public ScriptedAI return; //Sand Breath - if (SandBreath_Timer < diff) + if (SandBreath_Timer <= diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_SAND_BREATH, H_SPELL_SAND_BREATH)); SandBreath_Timer = 15000+rand()%10000; - }else SandBreath_Timer -= diff; + } else SandBreath_Timer -= diff; //Time Stop - if (TimeStop_Timer < diff) + if (TimeStop_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_TIME_STOP); TimeStop_Timer = 20000+rand()%15000; - }else TimeStop_Timer -= diff; + } else TimeStop_Timer -= diff; //Frenzy - if (Frenzy_Timer < diff) + if (Frenzy_Timer <= diff) { DoScriptText(EMOTE_FRENZY, m_creature); DoCast(m_creature, SPELL_ENRAGE); Frenzy_Timer = 20000+rand()%15000; - }else Frenzy_Timer -= diff; + } else Frenzy_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp index 05173387b64..617c07bec6f 100644 --- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp +++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp @@ -105,35 +105,35 @@ struct TRINITY_DLL_DECL boss_chrono_lord_dejaAI : public ScriptedAI return; //Arcane Blast - if (ArcaneBlast_Timer < diff) + if (ArcaneBlast_Timer <= diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_ARCANE_BLAST, H_SPELL_ARCANE_BLAST)); ArcaneBlast_Timer = 15000+rand()%10000; - }else ArcaneBlast_Timer -= diff; + } else ArcaneBlast_Timer -= diff; //Arcane Discharge - if (ArcaneDischarge_Timer < diff) + if (ArcaneDischarge_Timer <= diff) { - Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0); - DoCast(target,HEROIC(SPELL_ARCANE_DISCHARGE, H_SPELL_ARCANE_DISCHARGE)); + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + DoCast(pTarget,HEROIC(SPELL_ARCANE_DISCHARGE, H_SPELL_ARCANE_DISCHARGE)); ArcaneDischarge_Timer = 20000+rand()%10000; - }else ArcaneDischarge_Timer -= diff; + } else ArcaneDischarge_Timer -= diff; //Time Lapse - if (TimeLapse_Timer < diff) + if (TimeLapse_Timer <= diff) { DoScriptText(SAY_BANISH, m_creature); DoCast(m_creature, SPELL_TIME_LAPSE); TimeLapse_Timer = 15000+rand()%10000; - }else TimeLapse_Timer -= diff; + } else TimeLapse_Timer -= diff; if (HeroicMode) { - if (Attraction_Timer < diff) + if (Attraction_Timer <= diff) { DoCast(m_creature,SPELL_ATTRACTION); Attraction_Timer = 25000+rand()%10000; - }else Attraction_Timer -= diff; + } else Attraction_Timer -= diff; } DoMeleeAttackIfReady(); diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp index 8035d13d023..ce1b6cbdaea 100644 --- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp +++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp @@ -105,33 +105,33 @@ struct TRINITY_DLL_DECL boss_temporusAI : public ScriptedAI return; //Attack Haste - if (Haste_Timer < diff) + if (Haste_Timer <= diff) { DoCast(m_creature, SPELL_HASTE); Haste_Timer = 20000+rand()%5000; - }else Haste_Timer -= diff; + } else Haste_Timer -= diff; //MortalWound_Timer - if (MortalWound_Timer < diff) + if (MortalWound_Timer <= diff) { DoCast(m_creature, SPELL_MORTAL_WOUND); MortalWound_Timer = 10000+rand()%10000; - }else MortalWound_Timer -= diff; + } else MortalWound_Timer -= diff; //Wing ruffet - if (WingBuffet_Timer < diff) + if (WingBuffet_Timer <= diff) { DoCast(m_creature,HEROIC(SPELL_WING_BUFFET, H_SPELL_WING_BUFFET)); WingBuffet_Timer = 20000+rand()%10000; - }else WingBuffet_Timer -= diff; + } else WingBuffet_Timer -= diff; if (HeroicMode) { - if (SpellReflection_Timer < diff) + if (SpellReflection_Timer <= diff) { DoCast(m_creature,SPELL_REFLECT); SpellReflection_Timer = 25000+rand()%10000; - }else SpellReflection_Timer -= diff; + } else SpellReflection_Timer -= diff; } DoMeleeAttackIfReady(); diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.cpp index 1bee3ffd8d0..dbdca5eb635 100644 --- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.cpp +++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.cpp @@ -166,7 +166,7 @@ struct TRINITY_DLL_DECL npc_medivh_bmAI : public ScriptedAI SpellCorrupt_Timer = 3000; else SpellCorrupt_Timer = 0; - }else SpellCorrupt_Timer -= diff; + } else SpellCorrupt_Timer -= diff; } if (Check_Timer) @@ -213,7 +213,7 @@ struct TRINITY_DLL_DECL npc_medivh_bmAI : public ScriptedAI //TODO: start the post-event here pInstance->SetData(TYPE_MEDIVH,DONE); } - }else Check_Timer -= diff; + } else Check_Timer -= diff; } //if (!UpdateVictim()) @@ -313,7 +313,7 @@ struct TRINITY_DLL_DECL npc_time_riftAI : public ScriptedAI { for (uint8 i = 0; i < 3; ++i) DoSummonAtRift(entry); - }else DoSummonAtRift(entry); + } else DoSummonAtRift(entry); } void UpdateAI(const uint32 diff) @@ -321,11 +321,11 @@ struct TRINITY_DLL_DECL npc_time_riftAI : public ScriptedAI if (!pInstance) return; - if (TimeRiftWave_Timer < diff) + if (TimeRiftWave_Timer <= diff) { DoSelectSummon(); TimeRiftWave_Timer = 15000; - }else TimeRiftWave_Timer -= diff; + } else TimeRiftWave_Timer -= diff; if (m_creature->IsNonMeleeSpellCasted(false)) return; diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/instance_dark_portal.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/instance_dark_portal.cpp index 7f06116efe4..90e4a93df5b 100644 --- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/instance_dark_portal.cpp +++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/instance_dark_portal.cpp @@ -326,7 +326,7 @@ struct TRINITY_DLL_DECL instance_dark_portal : public ScriptedInstance DoSpawnPortal(); NextPortal_Timer = RiftWaves[GetRiftWaveId()].NextPortalTime; - }else NextPortal_Timer -= diff; + } else NextPortal_Timer -= diff; } } }; diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_anetheron.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_anetheron.cpp index 2126ae80efa..34c014d4590 100644 --- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_anetheron.cpp +++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_anetheron.cpp @@ -102,9 +102,9 @@ struct TRINITY_DLL_DECL boss_anetheronAI : public hyjal_trashAI pos = i; if (i == 7 && pInstance) { - Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_JAINAPROUDMOORE)); - if (target && target->isAlive()) - m_creature->AddThreat(target,0.0); + Unit *pTarget = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_JAINAPROUDMOORE)); + if (pTarget && pTarget->isAlive()) + m_creature->AddThreat(pTarget,0.0); } } @@ -146,13 +146,13 @@ struct TRINITY_DLL_DECL boss_anetheronAI : public hyjal_trashAI if (!UpdateVictim()) return; - if (SwarmTimer < diff) + if (SwarmTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM,0,100,true)) - DoCast(target,SPELL_CARRION_SWARM); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,100,true)) + DoCast(pTarget,SPELL_CARRION_SWARM); - SwarmTimer = 45000+rand()%15000; - switch(rand()%2) + SwarmTimer = urand(45000,60000); + switch (urand(0,1)) { case 0: DoPlaySoundToSet(m_creature, SOUND_SWARM1); @@ -163,17 +163,17 @@ struct TRINITY_DLL_DECL boss_anetheronAI : public hyjal_trashAI m_creature->MonsterYell(SAY_SWARM2, LANG_UNIVERSAL, 0); break; } - }else SwarmTimer -= diff; + } else SwarmTimer -= diff; - if (SleepTimer < diff) + if (SleepTimer <= diff) { - for (uint8 i=0; i<3; ++i) + for (uint8 i = 0; i < 3; ++i) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM,0,100,true)) - target->CastSpell(target,SPELL_SLEEP,true); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,100,true)) + pTarget->CastSpell(pTarget,SPELL_SLEEP,true); } SleepTimer = 60000; - switch(rand()%2) + switch (urand(0,1)) { case 0: DoPlaySoundToSet(m_creature, SOUND_SLEEP1); @@ -184,17 +184,17 @@ struct TRINITY_DLL_DECL boss_anetheronAI : public hyjal_trashAI m_creature->MonsterYell(SAY_SLEEP2, LANG_UNIVERSAL, 0); break; } - }else SleepTimer -= diff; - if (AuraTimer < diff) + } else SleepTimer -= diff; + if (AuraTimer <= diff) { DoCast(m_creature, SPELL_VAMPIRIC_AURA,true); - AuraTimer = 10000+rand()%10000; - }else AuraTimer -= diff; - if (InfernoTimer < diff) + AuraTimer = urand(10000,20000); + } else AuraTimer -= diff; + if (InfernoTimer <= diff) { DoCast(SelectTarget(SELECT_TARGET_RANDOM,0,100,true), SPELL_INFERNO); InfernoTimer = 45000; - switch(rand()%2) + switch (urand(0,1)) { case 0: DoPlaySoundToSet(m_creature, SOUND_INFERNO1); @@ -205,7 +205,7 @@ struct TRINITY_DLL_DECL boss_anetheronAI : public hyjal_trashAI m_creature->MonsterYell(SAY_INFERNO2, LANG_UNIVERSAL, 0); break; } - }else InfernoTimer -= diff; + } else InfernoTimer -= diff; DoMeleeAttackIfReady(); } @@ -216,7 +216,7 @@ CreatureAI* GetAI_boss_anetheron(Creature* pCreature) return new boss_anetheronAI (pCreature); } -#define SPELL_IMMOLATION 31303 +#define SPELL_IMMOLATION 31303 #define SPELL_INFERNO_EFFECT 31302 struct TRINITY_DLL_DECL mob_towering_infernalAI : public ScriptedAI @@ -242,17 +242,14 @@ struct TRINITY_DLL_DECL mob_towering_infernalAI : public ScriptedAI void EnterCombat(Unit *who) { - } void KilledUnit(Unit *victim) { - } void JustDied(Unit *victim) { - } void MoveInLineOfSight(Unit *who) @@ -263,7 +260,7 @@ struct TRINITY_DLL_DECL mob_towering_infernalAI : public ScriptedAI void UpdateAI(const uint32 diff) { - if (CheckTimer < diff) + if (CheckTimer <= diff) { if (AnetheronGUID) { @@ -276,17 +273,17 @@ struct TRINITY_DLL_DECL mob_towering_infernalAI : public ScriptedAI } } CheckTimer = 5000; - }else CheckTimer -= diff; + } else CheckTimer -= diff; //Return since we have no target if (!UpdateVictim()) return; - if (ImmolationTimer < diff) + if (ImmolationTimer <= diff) { DoCast(m_creature, SPELL_IMMOLATION); ImmolationTimer = 5000; - }else ImmolationTimer -= diff; + } else ImmolationTimer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp index ad781da0c9f..87b6b9e3b96 100644 --- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp +++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp @@ -100,7 +100,7 @@ struct mob_ancient_wispAI : public ScriptedAI void UpdateAI(const uint32 diff) { - if (CheckTimer < diff) + if (CheckTimer <= diff) { if (Unit* Archimonde = Unit::GetUnit((*m_creature), ArchimondeGUID)) { @@ -110,7 +110,7 @@ struct mob_ancient_wispAI : public ScriptedAI DoCast(Archimonde, SPELL_ANCIENT_SPARK); } CheckTimer = 1000; - }else CheckTimer -= diff; + } else CheckTimer -= diff; } }; @@ -128,7 +128,7 @@ struct TRINITY_DLL_DECL mob_doomfireAI : public ScriptedAI }; /* This is the script for the Doomfire Spirit Mob. This mob simply follow players or - travels in random directions if target cannot be found. */ + travels in random directions if pTarget cannot be found. */ struct TRINITY_DLL_DECL mob_doomfire_targettingAI : public ScriptedAI { mob_doomfire_targettingAI(Creature* c) : ScriptedAI(c) {} @@ -156,7 +156,7 @@ struct TRINITY_DLL_DECL mob_doomfire_targettingAI : public ScriptedAI void UpdateAI(const uint32 diff) { - if (ChangeTargetTimer < diff) + if (ChangeTargetTimer <= diff) { if (Unit *temp = Unit::GetUnit(*m_creature,TargetGUID)) { @@ -171,17 +171,17 @@ struct TRINITY_DLL_DECL mob_doomfire_targettingAI : public ScriptedAI } ChangeTargetTimer = 5000; - }else ChangeTargetTimer -= diff; + } else ChangeTargetTimer -= diff; } }; /* Finally, Archimonde's script. His script isn't extremely complex, most are simply spells on timers. The only complicated aspect of the battle is Finger of Death and Doomfire, with Doomfire being the hardest bit to code. Finger of Death is simply a distance check - if no one is in melee range, then - select a random target and cast the spell on them. However, if someone IS in melee range, and this + select a random pTarget and cast the spell on them. However, if someone IS in melee range, and this is NOT the main tank (creature's victim), then we aggro that player and they become the new victim. For Doomfire, we summon a mob (Doomfire Spirit) for the Doomfire mob to follow. It's spirit will - randomly select it's target to follow and then we create the random movement making it unpredictable. */ + randomly select it's pTarget to follow and then we create the random movement making it unpredictable. */ struct TRINITY_DLL_DECL boss_archimondeAI : public hyjal_trashAI { @@ -226,9 +226,9 @@ struct TRINITY_DLL_DECL boss_archimondeAI : public hyjal_trashAI DrainNordrassilTimer = 0; FearTimer = 42000; AirBurstTimer = 30000; - GripOfTheLegionTimer = 5000 + rand()%20000; + GripOfTheLegionTimer = urand(5000,25000); DoomfireTimer = 20000; - SoulChargeTimer = 2000 + rand()%27000; + SoulChargeTimer = urand(2000,30000); SoulChargeCount = 0; MeleeRangeCheckTimer = 15000; HandOfDeathTimer = 2000; @@ -282,7 +282,7 @@ struct TRINITY_DLL_DECL boss_archimondeAI : public hyjal_trashAI break; } - SoulChargeTimer = 2000 + rand()%28000; + SoulChargeTimer = urand(2000,30000); ++SoulChargeCount; } @@ -319,13 +319,13 @@ struct TRINITY_DLL_DECL boss_archimondeAI : public hyjal_trashAI return false; targets.sort(ObjectDistanceOrder(m_creature)); - Unit* target = targets.front(); - if (target) + Unit *pTarget = targets.front(); + if (pTarget) { - if (!m_creature->IsWithinDistInMap(target, m_creature->GetAttackDistance(target))) + if (!m_creature->IsWithinDistInMap(pTarget, m_creature->GetAttackDistance(pTarget))) return true; // Cast Finger of Death - else // This target is closest, he is our new tank - m_creature->AddThreat(target, m_creature->getThreatManager().getThreat(m_creature->getVictim())); + else // This pTarget is closest, he is our new tank + m_creature->AddThreat(pTarget, m_creature->getThreatManager().getThreat(m_creature->getVictim())); } return false; @@ -361,14 +361,14 @@ struct TRINITY_DLL_DECL boss_archimondeAI : public hyjal_trashAI } //this is code doing close to what the summoning spell would do (spell 31903) - void SummonDoomfire(Unit* target) + void SummonDoomfire(Unit *pTarget) { m_creature->SummonCreature(CREATURE_DOOMFIRE_SPIRIT, - target->GetPositionX()+15.0,target->GetPositionY()+15.0,target->GetPositionZ(),0, + pTarget->GetPositionX()+15.0,pTarget->GetPositionY()+15.0,pTarget->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN, 27000); m_creature->SummonCreature(CREATURE_DOOMFIRE, - target->GetPositionX()-15.0,target->GetPositionY()-15.0,target->GetPositionZ(),0, + pTarget->GetPositionX()-15.0,pTarget->GetPositionY()-15.0,pTarget->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN, 27000); } @@ -405,7 +405,7 @@ struct TRINITY_DLL_DECL boss_archimondeAI : public hyjal_trashAI } if (HasCast) - SoulChargeTimer = 2000 + rand()%28000; + SoulChargeTimer = urand(2000,30000); } void UpdateAI(const uint32 diff) @@ -427,7 +427,7 @@ struct TRINITY_DLL_DECL boss_archimondeAI : public hyjal_trashAI } } - if (DrainNordrassilTimer < diff) + if (DrainNordrassilTimer <= diff) { if (!IsChanneling) { @@ -450,7 +450,7 @@ struct TRINITY_DLL_DECL boss_archimondeAI : public hyjal_trashAI Nordrassil->CastSpell(m_creature, SPELL_DRAIN_WORLD_TREE_2, true); DrainNordrassilTimer = 1000; } - }else DrainNordrassilTimer -= diff; + } else DrainNordrassilTimer -= diff; } if (!UpdateVictim()) @@ -461,7 +461,7 @@ struct TRINITY_DLL_DECL boss_archimondeAI : public hyjal_trashAI if (!Enraged) { - if (EnrageTimer < diff) + if (EnrageTimer <= diff) { if ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) > 10) { @@ -470,9 +470,9 @@ struct TRINITY_DLL_DECL boss_archimondeAI : public hyjal_trashAI Enraged = true; DoScriptText(SAY_ENRAGE, m_creature); } - }else EnrageTimer -= diff; + } else EnrageTimer -= diff; - if (CheckDistanceTimer < diff) + if (CheckDistanceTimer <= diff) { // To simplify the check, we simply summon a Creature in the location and then check how far we are from the creature Creature* Check = m_creature->SummonCreature(CREATURE_CHANNEL_TARGET, NORDRASSIL_X, NORDRASSIL_Y, NORDRASSIL_Z, 0, TEMPSUMMON_TIMED_DESPAWN, 2000); @@ -489,7 +489,7 @@ struct TRINITY_DLL_DECL boss_archimondeAI : public hyjal_trashAI } } CheckDistanceTimer = 5000; - }else CheckDistanceTimer -= diff; + } else CheckDistanceTimer -= diff; } if (BelowTenPercent) @@ -505,12 +505,12 @@ struct TRINITY_DLL_DECL boss_archimondeAI : public hyjal_trashAI Enraged = true; } - if (SummonWispTimer < diff) + if (SummonWispTimer <= diff) { DoSpawnCreature(CREATURE_ANCIENT_WISP, rand()%40, rand()%40, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); SummonWispTimer = 1500; ++WispCount; - }else SummonWispTimer -= diff; + } else SummonWispTimer -= diff; if (WispCount >= 30) m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); @@ -518,47 +518,47 @@ struct TRINITY_DLL_DECL boss_archimondeAI : public hyjal_trashAI if (Enraged) { - if (HandOfDeathTimer < diff) + if (HandOfDeathTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_HAND_OF_DEATH); HandOfDeathTimer = 2000; - }else HandOfDeathTimer -= diff; + } else HandOfDeathTimer -= diff; return; // Don't do anything after this point. } if (SoulChargeCount) { - if (SoulChargeTimer < diff) + if (SoulChargeTimer <= diff) UnleashSoulCharge(); else SoulChargeTimer -= diff; } - if (GripOfTheLegionTimer < diff) + if (GripOfTheLegionTimer <= diff) { DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_GRIP_OF_THE_LEGION); - GripOfTheLegionTimer = 5000 + rand()%20000; - }else GripOfTheLegionTimer -= diff; + GripOfTheLegionTimer = urand(5000,25000); + } else GripOfTheLegionTimer -= diff; - if (AirBurstTimer < diff) + if (AirBurstTimer <= diff) { - if (rand()%2 == 0) + if (urand(0,1)) DoScriptText(SAY_AIR_BURST1, m_creature); else DoScriptText(SAY_AIR_BURST2, m_creature); DoCast(SelectUnit(SELECT_TARGET_RANDOM, 1), SPELL_AIR_BURST);//not on tank - AirBurstTimer = 25000 + rand()%15000; - }else AirBurstTimer -= diff; + AirBurstTimer = urand(25000,40000); + } else AirBurstTimer -= diff; - if (FearTimer < diff) + if (FearTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_FEAR); FearTimer = 42000; - }else FearTimer -= diff; + } else FearTimer -= diff; - if (DoomfireTimer < diff) + if (DoomfireTimer <= diff) { - if (rand()%2 == 0) + if (urand(0,1)) DoScriptText(SAY_DOOMFIRE1, m_creature); else DoScriptText(SAY_DOOMFIRE2, m_creature); @@ -572,9 +572,9 @@ struct TRINITY_DLL_DECL boss_archimondeAI : public hyjal_trashAI //supposedly three doomfire can be up at the same time DoomfireTimer = 20000; - }else DoomfireTimer -= diff; + } else DoomfireTimer -= diff; - if (MeleeRangeCheckTimer < diff) + if (MeleeRangeCheckTimer <= diff) { if (CanUseFingerOfDeath()) { @@ -583,7 +583,7 @@ struct TRINITY_DLL_DECL boss_archimondeAI : public hyjal_trashAI } MeleeRangeCheckTimer = 5000; - }else MeleeRangeCheckTimer -= diff; + } else MeleeRangeCheckTimer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_azgalor.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_azgalor.cpp index 36c6c6c0b4b..1e32b54e372 100644 --- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_azgalor.cpp +++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_azgalor.cpp @@ -95,9 +95,9 @@ struct TRINITY_DLL_DECL boss_azgalorAI : public hyjal_trashAI pos = i; if (i == 7 && pInstance) { - Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_THRALL)); - if (target && target->isAlive()) - m_creature->AddThreat(target,0.0); + Unit *pTarget = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_THRALL)); + if (pTarget && pTarget->isAlive()) + m_creature->AddThreat(pTarget,0.0); } } @@ -138,29 +138,29 @@ struct TRINITY_DLL_DECL boss_azgalorAI : public hyjal_trashAI if (!UpdateVictim()) return; - if (RainTimer < diff) + if (RainTimer <= diff) { DoCast(SelectTarget(SELECT_TARGET_RANDOM,0,30,true), SPELL_RAIN_OF_FIRE); RainTimer = 20000+rand()%15000; - }else RainTimer -= diff; + } else RainTimer -= diff; - if (DoomTimer < diff) + if (DoomTimer <= diff) { DoCast(SelectTarget(SELECT_TARGET_RANDOM,1,100,true), SPELL_DOOM);//never on tank DoomTimer = 45000+rand()%5000; - }else DoomTimer -= diff; + } else DoomTimer -= diff; - if (HowlTimer < diff) + if (HowlTimer <= diff) { DoCast(m_creature, SPELL_HOWL_OF_AZGALOR); HowlTimer = 30000; - }else HowlTimer -= diff; + } else HowlTimer -= diff; - if (CleaveTimer < diff) + if (CleaveTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_CLEAVE); CleaveTimer = 10000+rand()%5000; - }else CleaveTimer -= diff; + } else CleaveTimer -= diff; if (EnrageTimer < diff && !enraged) { @@ -168,7 +168,7 @@ struct TRINITY_DLL_DECL boss_azgalorAI : public hyjal_trashAI DoCast(m_creature, SPELL_BERSERK, true); enraged = true; EnrageTimer = 600000; - }else EnrageTimer -= diff; + } else EnrageTimer -= diff; DoMeleeAttackIfReady(); } @@ -233,7 +233,7 @@ struct TRINITY_DLL_DECL mob_lesser_doomguardAI : public hyjal_trashAI void UpdateAI(const uint32 diff) { - if (CheckTimer < diff) + if (CheckTimer <= diff) { if (AzgalorGUID) { @@ -246,23 +246,23 @@ struct TRINITY_DLL_DECL mob_lesser_doomguardAI : public hyjal_trashAI } } CheckTimer = 5000; - }else CheckTimer -= diff; + } else CheckTimer -= diff; //Return since we have no target if (!UpdateVictim()) return; - if (WarstompTimer < diff) + if (WarstompTimer <= diff) { DoCast(m_creature, SPELL_WARSTOMP); WarstompTimer = 10000+rand()%5000; - }else WarstompTimer -= diff; + } else WarstompTimer -= diff; - if (CrippleTimer < diff) + if (CrippleTimer <= diff) { DoCast(SelectTarget(SELECT_TARGET_RANDOM,0,100,true), SPELL_CRIPPLE); CrippleTimer = 25000+rand()%5000; - }else CrippleTimer -= diff; + } else CrippleTimer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp index f56d4707d4c..acfcb210b60 100644 --- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp +++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp @@ -90,9 +90,9 @@ struct TRINITY_DLL_DECL boss_kazrogalAI : public hyjal_trashAI pos = i; if (i == 7 && pInstance) { - Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_THRALL)); - if (target && target->isAlive()) - m_creature->AddThreat(target,0.0); + Unit *pTarget = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_THRALL)); + if (pTarget && pTarget->isAlive()) + m_creature->AddThreat(pTarget,0.0); } } @@ -133,21 +133,21 @@ struct TRINITY_DLL_DECL boss_kazrogalAI : public hyjal_trashAI if (!UpdateVictim()) return; - if (CleaveTimer < diff) + if (CleaveTimer <= diff) { DoCast(m_creature, SPELL_CLEAVE); CleaveTimer = 6000+rand()%15000; - }else CleaveTimer -= diff; + } else CleaveTimer -= diff; - if (WarStompTimer < diff) + if (WarStompTimer <= diff) { DoCast(m_creature, SPELL_WARSTOMP); WarStompTimer = 60000; - }else WarStompTimer -= diff; + } else WarStompTimer -= diff; if (m_creature->HasAura(SPELL_MARK)) m_creature->RemoveAurasDueToSpell(SPELL_MARK); - if (MarkTimer < diff) + if (MarkTimer <= diff) { //cast dummy, useful for bos addons m_creature->CastCustomSpell(m_creature, SPELL_MARK, NULL, NULL, NULL, false, NULL, NULL, m_creature->GetGUID()); @@ -155,10 +155,10 @@ struct TRINITY_DLL_DECL boss_kazrogalAI : public hyjal_trashAI std::list<HostilReference *> t_list = m_creature->getThreatManager().getThreatList(); for (std::list<HostilReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { - Unit *target = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); - if (target && target->GetTypeId() == TYPEID_PLAYER && target->getPowerType() == POWER_MANA) + Unit *pTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); + if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER && pTarget->getPowerType() == POWER_MANA) { - target->CastSpell(target, SPELL_MARK,true);//only cast on mana users + pTarget->CastSpell(pTarget, SPELL_MARK,true);//only cast on mana users } } MarkTimerBase -= 5000; @@ -176,7 +176,7 @@ struct TRINITY_DLL_DECL boss_kazrogalAI : public hyjal_trashAI m_creature->MonsterYell(SAY_MARK2, LANG_UNIVERSAL, NULL); break; } - }else MarkTimer -= diff; + } else MarkTimer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_rage_winterchill.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_rage_winterchill.cpp index 61df1738cf0..65cf518454b 100644 --- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_rage_winterchill.cpp +++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_rage_winterchill.cpp @@ -68,7 +68,7 @@ struct TRINITY_DLL_DECL boss_rage_winterchillAI : public hyjal_trashAI void KilledUnit(Unit *victim) { - switch(rand()%2) + switch (urand(0,1)) { case 0: DoPlaySoundToSet(m_creature, SOUND_ONSLAY1); @@ -86,9 +86,9 @@ struct TRINITY_DLL_DECL boss_rage_winterchillAI : public hyjal_trashAI pos = i; if (i == 7 && pInstance) { - Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_JAINAPROUDMOORE)); - if (target && target->isAlive()) - m_creature->AddThreat(target,0.0); + Unit *pTarget = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_JAINAPROUDMOORE)); + if (pTarget && pTarget->isAlive()) + m_creature->AddThreat(pTarget,0.0f); } } @@ -130,16 +130,16 @@ struct TRINITY_DLL_DECL boss_rage_winterchillAI : public hyjal_trashAI if (!UpdateVictim()) return; - if (FrostArmorTimer < diff) + if (FrostArmorTimer <= diff) { DoCast(m_creature, SPELL_FROST_ARMOR); FrostArmorTimer = 40000+rand()%20000; - }else FrostArmorTimer -= diff; - if (DecayTimer < diff) + } else FrostArmorTimer -= diff; + if (DecayTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_DEATH_AND_DECAY); DecayTimer = 60000+rand()%20000; - switch(rand()%2) + switch (urand(0,1)) { case 0: DoPlaySoundToSet(m_creature, SOUND_DECAY1); @@ -150,12 +150,12 @@ struct TRINITY_DLL_DECL boss_rage_winterchillAI : public hyjal_trashAI m_creature->MonsterYell(SAY_DECAY2, LANG_UNIVERSAL, NULL); break; } - }else DecayTimer -= diff; - if (NovaTimer < diff) + } else DecayTimer -= diff; + if (NovaTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_FROST_NOVA); NovaTimer = 30000+rand()%15000; - switch(rand()%2) + switch (urand(0,1)) { case 0: DoPlaySoundToSet(m_creature, SOUND_NOVA1); @@ -166,12 +166,12 @@ struct TRINITY_DLL_DECL boss_rage_winterchillAI : public hyjal_trashAI m_creature->MonsterYell(SAY_NOVA2, LANG_UNIVERSAL, NULL); break; } - }else NovaTimer -= diff; - if (IceboltTimer < diff) + } else NovaTimer -= diff; + if (IceboltTimer <= diff) { DoCast(SelectTarget(SELECT_TARGET_RANDOM,0,40,true), SPELL_ICEBOLT); IceboltTimer = 11000+rand()%20000; - }else IceboltTimer -= diff; + } else IceboltTimer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.cpp index 94bce54f506..402c3c8e0a9 100644 --- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.cpp +++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.cpp @@ -400,7 +400,7 @@ void hyjalAI::Reset() pInstance->DoUpdateWorldState(WORLD_STATE_ENEMYCOUNT, 0); pInstance->SetData(DATA_RESET_TRASH_COUNT, 0); } - }else error_log(ERROR_INST_DATA); + } else error_log(ERROR_INST_DATA); //Visibility DoHide = true; @@ -720,7 +720,7 @@ void hyjalAI::DeSpawnVeins() if (GameObject* gem = pInstance->instance->GetGameObject(pInstance->GetData64(ai->VeinGUID[i]))) gem->Delete(); } - }else if (Faction) + } else if (Faction) { Creature* pUnit=Unit::GetCreature((*m_creature),pInstance->GetData64(DATA_THRALL)); if (!pUnit)return; @@ -742,7 +742,7 @@ void hyjalAI::UpdateAI(const uint32 diff) { m_creature->CastSpell(m_creature,SPELL_MASS_TELEPORT,false); DoMassTeleport = false; - }else MassTeleportTimer -= diff; + } else MassTeleportTimer -= diff; return; } if (DoHide) @@ -779,14 +779,14 @@ void hyjalAI::UpdateAI(const uint32 diff) } if (DoRespawn) { - if (RespawnTimer < diff) + if (RespawnTimer <= diff) { DoRespawn = false; RespawnNearPos(m_creature->GetPositionX(), m_creature->GetPositionY()); if (Faction == 0) { RespawnNearPos(5037.76, -1889.71); - }else if (Faction == 1) + } else if (Faction == 1) { RespawnNearPos(5563, -2763.19); RespawnNearPos(5542.2, -2629.36); @@ -802,7 +802,7 @@ void hyjalAI::UpdateAI(const uint32 diff) DoOverrun(Faction, diff); if (bRetreat) { - if (RetreatTimer < diff) + if (RetreatTimer <= diff) { IsDummy = true; bRetreat = false; @@ -819,7 +819,7 @@ void hyjalAI::UpdateAI(const uint32 diff) break; } m_creature->SetVisibility(VISIBILITY_OFF); - }else RetreatTimer -= diff; + } else RetreatTimer -= diff; } if (!EventBegun) @@ -834,17 +834,17 @@ void hyjalAI::UpdateAI(const uint32 diff) NextWaveTimer = 5000; } - if (NextWaveTimer < diff) + if (NextWaveTimer <= diff) { if (Faction == 0) SummonNextWave(AllianceWaves, WaveCount, AllianceBase); else if (Faction == 1) SummonNextWave(HordeWaves, WaveCount, HordeBase); ++WaveCount; - }else NextWaveTimer -= diff; + } else NextWaveTimer -= diff; } - if (CheckTimer < diff) + if (CheckTimer <= diff) { for (uint8 i = 0; i < 2; ++i) { @@ -873,7 +873,7 @@ void hyjalAI::UpdateAI(const uint32 diff) } } CheckTimer = 5000; - }else CheckTimer -= diff; + } else CheckTimer -= diff; if (!UpdateVictim()) return; @@ -882,26 +882,26 @@ void hyjalAI::UpdateAI(const uint32 diff) { if (Spell[i].SpellId) { - if (SpellTimer[i] < diff) + if (SpellTimer[i] <= diff) { if (m_creature->IsNonMeleeSpellCasted(false)) m_creature->InterruptNonMeleeSpells(false); - Unit* target = NULL; + Unit *pTarget = NULL; switch(Spell[i].TargetType) { - case TARGETTYPE_SELF: target = m_creature; break; - case TARGETTYPE_RANDOM: target = SelectUnit(SELECT_TARGET_RANDOM, 0); break; - case TARGETTYPE_VICTIM: target = m_creature->getVictim(); break; + case TARGETTYPE_SELF: pTarget = m_creature; break; + case TARGETTYPE_RANDOM: pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); break; + case TARGETTYPE_VICTIM: pTarget = m_creature->getVictim(); break; } - if (target && target->isAlive()) + if (pTarget && pTarget->isAlive()) { - DoCast(target, Spell[i].SpellId); + DoCast(pTarget, Spell[i].SpellId); SpellTimer[i] = Spell[i].Cooldown; } - }else SpellTimer[i] -= diff; + } else SpellTimer[i] -= diff; } } @@ -1032,7 +1032,7 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff) npc_escortAI::UpdateAI(diff); if (WaitForTeleport) { - if (TeleportTimer < diff) + if (TeleportTimer <= diff) { CellPair pair(Trinity::ComputeCellPair(m_creature->GetPositionX(), m_creature->GetPositionY())); Cell cell(pair); diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp index 3fb245a46a7..bf36d0dd27f 100644 --- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp +++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp @@ -413,16 +413,16 @@ struct mob_giant_infernalAI : public hyjal_trashAI { if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall { - Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_THRALL)); - if (target && target->isAlive()) - m_creature->AddThreat(target,0.0); + Unit *pTarget = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_THRALL)); + if (pTarget && pTarget->isAlive()) + m_creature->AddThreat(pTarget,0.0); } } } void UpdateAI(const uint32 diff) { - if (Delay<diff) + if (Delay<= diff) { Delay=0; }else{ @@ -443,8 +443,8 @@ struct mob_giant_infernalAI : public hyjal_trashAI } m_creature->GetMotionMaster()->Clear(); meteor = true; - }else if (!CanMove){ - if (spawnTimer<diff) + } else if (!CanMove){ + if (spawnTimer<= diff) { m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -454,14 +454,14 @@ struct mob_giant_infernalAI : public hyjal_trashAI { if (pInstance->GetData(DATA_ALLIANCE_RETREAT) && !pInstance->GetData(DATA_HORDE_RETREAT)) { - Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_THRALL)); - if (target && target->isAlive()) - m_creature->AddThreat(target,0.0); - }else if (pInstance->GetData(DATA_ALLIANCE_RETREAT) && pInstance->GetData(DATA_HORDE_RETREAT)){ + Unit *pTarget = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_THRALL)); + if (pTarget && pTarget->isAlive()) + m_creature->AddThreat(pTarget,0.0); + } else if (pInstance->GetData(DATA_ALLIANCE_RETREAT) && pInstance->GetData(DATA_HORDE_RETREAT)){ //do overrun } } - }else spawnTimer -= diff; + } else spawnTimer -= diff; } if (!CanMove)return; hyjal_trashAI::UpdateAI(diff); @@ -488,11 +488,11 @@ struct mob_giant_infernalAI : public hyjal_trashAI DoCast(m_creature,SPELL_IMMOLATION); imol=true; } - if (FlameBuffetTimer<diff) + if (FlameBuffetTimer<= diff) { DoCast(m_creature->getVictim(),SPELL_FLAME_BUFFET,true); FlameBuffetTimer = 7000; - }else FlameBuffetTimer -= diff; + } else FlameBuffetTimer -= diff; DoMeleeAttackIfReady(); } }; @@ -530,13 +530,13 @@ struct mob_abominationAI : public hyjal_trashAI { if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall { - Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_THRALL)); - if (target && target->isAlive()) - m_creature->AddThreat(target,0.0); + Unit *pTarget = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_THRALL)); + if (pTarget && pTarget->isAlive()) + m_creature->AddThreat(pTarget,0.0); }else{ - Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_JAINAPROUDMOORE)); - if (target && target->isAlive()) - m_creature->AddThreat(target,0.0); + Unit *pTarget = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_JAINAPROUDMOORE)); + if (pTarget && pTarget->isAlive()) + m_creature->AddThreat(pTarget,0.0); } } if (i == LastOverronPos && IsOverrun) @@ -583,11 +583,11 @@ struct mob_abominationAI : public hyjal_trashAI DoCast(m_creature,SPELL_DISEASE_CLOUD); if (!UpdateVictim()) return; - if (KnockDownTimer<diff) + if (KnockDownTimer<= diff) { DoCast(m_creature->getVictim(),SPELL_KNOCKDOWN); KnockDownTimer = 15000+rand()%10000; - }else KnockDownTimer -= diff; + } else KnockDownTimer -= diff; DoMeleeAttackIfReady(); } }; @@ -628,13 +628,13 @@ struct mob_ghoulAI : public hyjal_trashAI { if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall { - Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_THRALL)); - if (target && target->isAlive()) - m_creature->AddThreat(target,0.0); + Unit *pTarget = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_THRALL)); + if (pTarget && pTarget->isAlive()) + m_creature->AddThreat(pTarget,0.0); }else{ - Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_JAINAPROUDMOORE)); - if (target && target->isAlive()) - m_creature->AddThreat(target,0.0); + Unit *pTarget = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_JAINAPROUDMOORE)); + if (pTarget && pTarget->isAlive()) + m_creature->AddThreat(pTarget,0.0); } } if (i == LastOverronPos && IsOverrun) @@ -679,11 +679,11 @@ struct mob_ghoulAI : public hyjal_trashAI } } } - if (FrenzyTimer<diff) + if (FrenzyTimer<= diff) { DoCast(m_creature,SPELL_FRENZY); FrenzyTimer = 15000+rand()%15000; - }else FrenzyTimer -= diff; + } else FrenzyTimer -= diff; if (!UpdateVictim()) return; @@ -722,9 +722,9 @@ struct mob_necromancerAI : public hyjal_trashAI void JustSummoned(Creature* summon) { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM,0,30,true); - if (target && summon) - summon->Attack(target,false); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,30,true); + if (pTarget && summon) + summon->Attack(pTarget,false); summons.Summon(summon); } void SummonedCreatureDespawn(Creature *summon) {summons.Despawn(summon);} @@ -735,13 +735,13 @@ struct mob_necromancerAI : public hyjal_trashAI { if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall { - Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_THRALL)); - if (target && target->isAlive()) - m_creature->AddThreat(target,0.0); + Unit *pTarget = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_THRALL)); + if (pTarget && pTarget->isAlive()) + m_creature->AddThreat(pTarget,0.0); }else{ - Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_JAINAPROUDMOORE)); - if (target && target->isAlive()) - m_creature->AddThreat(target,0.0); + Unit *pTarget = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_JAINAPROUDMOORE)); + if (pTarget && pTarget->isAlive()) + m_creature->AddThreat(pTarget,0.0); } } } @@ -799,11 +799,11 @@ struct mob_necromancerAI : public hyjal_trashAI } if (!UpdateVictim()) return; - if (ShadowBoltTimer<diff) + if (ShadowBoltTimer<= diff) { DoCast(m_creature->getVictim(),SPELL_SHADOW_BOLT); ShadowBoltTimer = 20000+rand()%10000; - }else ShadowBoltTimer -= diff; + } else ShadowBoltTimer -= diff; DoMeleeAttackIfReady(); } @@ -847,13 +847,13 @@ struct mob_bansheeAI : public hyjal_trashAI { if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall { - Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_THRALL)); - if (target && target->isAlive()) - m_creature->AddThreat(target,0.0); + Unit *pTarget = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_THRALL)); + if (pTarget && pTarget->isAlive()) + m_creature->AddThreat(pTarget,0.0); }else{ - Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_JAINAPROUDMOORE)); - if (target && target->isAlive()) - m_creature->AddThreat(target,0.0); + Unit *pTarget = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_JAINAPROUDMOORE)); + if (pTarget && pTarget->isAlive()) + m_creature->AddThreat(pTarget,0.0); } } } @@ -890,21 +890,21 @@ struct mob_bansheeAI : public hyjal_trashAI } if (!UpdateVictim()) return; - if (CourseTimer<diff) + if (CourseTimer<= diff) { DoCast(m_creature->getVictim(),SPELL_BANSHEE_CURSE); CourseTimer = 20000+rand()%5000; - }else CourseTimer -= diff; - if (WailTimer<diff) + } else CourseTimer -= diff; + if (WailTimer<= diff) { DoCast(m_creature->getVictim(),SPELL_BANSHEE_WAIL); WailTimer = 15000+rand()%5000; - }else WailTimer -= diff; - if (ShellTimer<diff) + } else WailTimer -= diff; + if (ShellTimer<= diff) { DoCast(m_creature,SPELL_ANTI_MAGIC_SHELL); ShellTimer = 50000+rand()%10000; - }else ShellTimer -= diff; + } else ShellTimer -= diff; DoMeleeAttackIfReady(); } }; @@ -941,13 +941,13 @@ struct mob_crypt_fiendAI : public hyjal_trashAI { if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall { - Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_THRALL)); - if (target && target->isAlive()) - m_creature->AddThreat(target,0.0); + Unit *pTarget = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_THRALL)); + if (pTarget && pTarget->isAlive()) + m_creature->AddThreat(pTarget,0.0); }else{ - Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_JAINAPROUDMOORE)); - if (target && target->isAlive()) - m_creature->AddThreat(target,0.0); + Unit *pTarget = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_JAINAPROUDMOORE)); + if (pTarget && pTarget->isAlive()) + m_creature->AddThreat(pTarget,0.0); } } } @@ -985,11 +985,11 @@ struct mob_crypt_fiendAI : public hyjal_trashAI } if (!UpdateVictim()) return; - if (WebTimer<diff) + if (WebTimer<= diff) { DoCast(m_creature->getVictim(),SPELL_WEB); WebTimer = 20000+rand()%5000; - }else WebTimer -= diff; + } else WebTimer -= diff; DoMeleeAttackIfReady(); } }; @@ -1026,13 +1026,13 @@ struct mob_fel_stalkerAI : public hyjal_trashAI { if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall { - Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_THRALL)); - if (target && target->isAlive()) - m_creature->AddThreat(target,0.0); + Unit *pTarget = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_THRALL)); + if (pTarget && pTarget->isAlive()) + m_creature->AddThreat(pTarget,0.0); }else{ - Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_JAINAPROUDMOORE)); - if (target && target->isAlive()) - m_creature->AddThreat(target,0.0); + Unit *pTarget = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_JAINAPROUDMOORE)); + if (pTarget && pTarget->isAlive()) + m_creature->AddThreat(pTarget,0.0); } } } @@ -1070,11 +1070,11 @@ struct mob_fel_stalkerAI : public hyjal_trashAI } if (!UpdateVictim()) return; - if (ManaBurnTimer<diff) + if (ManaBurnTimer<= diff) { DoCast(m_creature->getVictim(),SPELL_MANA_BURN); ManaBurnTimer = 9000+rand()%5000; - }else ManaBurnTimer -= diff; + } else ManaBurnTimer -= diff; DoMeleeAttackIfReady(); } }; @@ -1113,11 +1113,11 @@ struct mob_frost_wyrmAI : public hyjal_trashAI pos = i; if (i == 2 && pInstance && !IsOverrun) { - Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_THRALL)); - if (target && target->isAlive()) + Unit *pTarget = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_THRALL)); + if (pTarget && pTarget->isAlive()) { - m_creature->AddThreat(target,0.0); - DoCast(target,SPELL_FROST_BREATH,true); + m_creature->AddThreat(pTarget,0.0); + DoCast(pTarget,SPELL_FROST_BREATH,true); } } } @@ -1169,14 +1169,14 @@ struct mob_frost_wyrmAI : public hyjal_trashAI if (!UpdateVictim()) return; if (!m_creature->IsWithinDist(m_creature->getVictim(), 25)){ - if (MoveTimer<diff) + if (MoveTimer<= diff) { m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim()); MoveTimer = 2000; - }else MoveTimer-=diff; + } else MoveTimer-=diff; } - if (FrostBreathTimer<diff) + if (FrostBreathTimer<= diff) { if (!m_creature->IsWithinDist(m_creature->getVictim(), 25)) { @@ -1185,7 +1185,7 @@ struct mob_frost_wyrmAI : public hyjal_trashAI m_creature->GetMotionMaster()->Clear(); FrostBreathTimer = 4000; } - }else FrostBreathTimer -= diff; + } else FrostBreathTimer -= diff; } }; @@ -1228,11 +1228,11 @@ struct mob_gargoyleAI : public hyjal_trashAI pos = i; if (i == 2 && pInstance && !IsOverrun) { - Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_THRALL)); - if (target && target->isAlive()) + Unit *pTarget = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_THRALL)); + if (pTarget && pTarget->isAlive()) { - m_creature->AddThreat(target,0.0); - DoCast(target,SPELL_GARGOYLE_STRIKE,true); + m_creature->AddThreat(pTarget,0.0); + DoCast(pTarget,SPELL_GARGOYLE_STRIKE,true); } } } @@ -1281,11 +1281,11 @@ struct mob_gargoyleAI : public hyjal_trashAI { if (faction == 0)//alliance { - if (StrikeTimer<diff) + if (StrikeTimer<= diff) { m_creature->CastSpell(DummyTarget[0],DummyTarget[1],DummyTarget[2],SPELL_GARGOYLE_STRIKE,false); StrikeTimer = 2000+rand()%1000; - }else StrikeTimer -= diff; + } else StrikeTimer -= diff; } } if (!UpdateVictim()) @@ -1295,11 +1295,11 @@ struct mob_gargoyleAI : public hyjal_trashAI forcemove = false; if (forcemove) { - Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (target) - m_creature->Attack(target,false); + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + if (pTarget) + m_creature->Attack(pTarget,false); } - if (MoveTimer<diff) + if (MoveTimer<= diff) { float x,y,z; m_creature->getVictim()->GetPosition(x,y,z); @@ -1307,9 +1307,9 @@ struct mob_gargoyleAI : public hyjal_trashAI Zpos-=1.0; if (Zpos<=0)Zpos=0; MoveTimer = 2000; - }else MoveTimer-=diff; + } else MoveTimer-=diff; } - if (StrikeTimer<diff) + if (StrikeTimer<= diff) { if (m_creature->IsWithinDist(m_creature->getVictim(), 20)) { @@ -1317,8 +1317,8 @@ struct mob_gargoyleAI : public hyjal_trashAI m_creature->StopMoving(); m_creature->GetMotionMaster()->Clear(); StrikeTimer = 2000+rand()%1000; - }else StrikeTimer=0; - }else StrikeTimer -= diff; + } else StrikeTimer=0; + } else StrikeTimer -= diff; } }; @@ -1371,7 +1371,7 @@ struct TRINITY_DLL_DECL alliance_riflemanAI : public Scripted_NoMovementAI //Check if we have a target if (!UpdateVictim()) return; - if (ExplodeTimer < diff) + if (ExplodeTimer <= diff) { if (!m_creature->IsWithinDistInMap(m_creature->getVictim(), 30)) { @@ -1381,7 +1381,7 @@ struct TRINITY_DLL_DECL alliance_riflemanAI : public Scripted_NoMovementAI int dmg = 500+rand()%700; m_creature->CastCustomSpell(m_creature->getVictim(), SPELL_EXPLODING_SHOT, &dmg, 0, 0, false); ExplodeTimer = 5000+rand()%5000; - }else ExplodeTimer -= diff; + } else ExplodeTimer -= diff; DoMeleeAttackIfReady(); } }; diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp index f3dbe759646..4cab612108a 100644 --- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp +++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp @@ -91,46 +91,46 @@ struct TRINITY_DLL_DECL boss_captain_skarlocAI : public ScriptedAI return; //Holy_Light - if (Holy_Light_Timer < diff) + if (Holy_Light_Timer <= diff) { DoCast(m_creature, SPELL_HOLY_LIGHT); Holy_Light_Timer = 30000; - }else Holy_Light_Timer -= diff; + } else Holy_Light_Timer -= diff; //Cleanse - if (Cleanse_Timer < diff) + if (Cleanse_Timer <= diff) { DoCast(m_creature, SPELL_CLEANSE); Cleanse_Timer = 10000; } else Cleanse_Timer -= diff; //Hammer of Justice - if (HammerOfJustice_Timer < diff) + if (HammerOfJustice_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_HAMMER_OF_JUSTICE); HammerOfJustice_Timer = 60000; - }else HammerOfJustice_Timer -= diff; + } else HammerOfJustice_Timer -= diff; //Holy Shield - if (HolyShield_Timer < diff) + if (HolyShield_Timer <= diff) { DoCast(m_creature, SPELL_HOLY_SHIELD); HolyShield_Timer = 240000; - }else HolyShield_Timer -= diff; + } else HolyShield_Timer -= diff; //Devotion_Aura - if (DevotionAura_Timer < diff) + if (DevotionAura_Timer <= diff) { DoCast(m_creature, SPELL_DEVOTION_AURA); DevotionAura_Timer = 45000 + rand()%10000; - }else DevotionAura_Timer -= diff; + } else DevotionAura_Timer -= diff; //Consecration - if (Consecration_Timer < diff) + if (Consecration_Timer <= diff) { //DoCast(m_creature->getVictim(), SPELL_CONSECRATION); Consecration_Timer = 5000 + rand()%5000; - }else Consecration_Timer -= diff; + } else Consecration_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp index 74f905d62db..0be16f06706 100644 --- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp +++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp @@ -87,7 +87,7 @@ struct TRINITY_DLL_DECL boss_epoch_hunterAI : public ScriptedAI return; //Sand Breath - if (SandBreath_Timer < diff) + if (SandBreath_Timer <= diff) { if (m_creature->IsNonMeleeSpellCasted(false)) m_creature->InterruptNonMeleeSpells(false); @@ -97,26 +97,26 @@ struct TRINITY_DLL_DECL boss_epoch_hunterAI : public ScriptedAI DoScriptText(RAND(SAY_BREATH1,SAY_BREATH2), m_creature); SandBreath_Timer = 10000 + rand()%10000; - }else SandBreath_Timer -= diff; + } else SandBreath_Timer -= diff; - if (ImpendingDeath_Timer < diff) + if (ImpendingDeath_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_IMPENDING_DEATH); ImpendingDeath_Timer = 25000+rand()%5000; - }else ImpendingDeath_Timer -= diff; + } else ImpendingDeath_Timer -= diff; - if (WingBuffet_Timer < diff) + if (WingBuffet_Timer <= diff) { - if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(target,SPELL_WING_BUFFET); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget,SPELL_WING_BUFFET); WingBuffet_Timer = 25000+rand()%10000; - }else WingBuffet_Timer -= diff; + } else WingBuffet_Timer -= diff; - if (Mda_Timer < diff) + if (Mda_Timer <= diff) { DoCast(m_creature,SPELL_MAGIC_DISRUPTION_AURA); Mda_Timer = 15000; - }else Mda_Timer -= diff; + } else Mda_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp index 8f3cd4420da..9b100cd35ad 100644 --- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp +++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp @@ -142,27 +142,27 @@ struct TRINITY_DLL_DECL boss_lieutenant_drakeAI : public ScriptedAI return; //Whirlwind - if (Whirlwind_Timer < diff) + if (Whirlwind_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_WHIRLWIND); Whirlwind_Timer = 20000+rand()%5000; - }else Whirlwind_Timer -= diff; + } else Whirlwind_Timer -= diff; //Fear - if (Fear_Timer < diff) + if (Fear_Timer <= diff) { DoScriptText(SAY_SHOUT, m_creature); DoCast(m_creature->getVictim(), SPELL_FRIGHTENING_SHOUT); Fear_Timer = 25000+rand()%10000; - }else Fear_Timer -= diff; + } else Fear_Timer -= diff; //Mortal Strike - if (MortalStrike_Timer < diff) + if (MortalStrike_Timer <= diff) { DoScriptText(SAY_MORTAL, m_creature); DoCast(m_creature->getVictim(), SPELL_MORTAL_STRIKE); MortalStrike_Timer = 20000+rand()%10000; - }else MortalStrike_Timer -= diff; + } else MortalStrike_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/kalimdor/darkshore.cpp b/src/bindings/scripts/scripts/kalimdor/darkshore.cpp index 1354c2bc861..992cd2d4dc3 100644 --- a/src/bindings/scripts/scripts/kalimdor/darkshore.cpp +++ b/src/bindings/scripts/scripts/kalimdor/darkshore.cpp @@ -132,7 +132,7 @@ struct TRINITY_DLL_DECL npc_kerlonianAI : public FollowerAI if (!HasFollowState(STATE_FOLLOW_PAUSED)) { - if (m_uiFallAsleepTimer < uiDiff) + if (m_uiFallAsleepTimer <= uiDiff) { SetSleeping(); m_uiFallAsleepTimer = urand(25000, 90000); diff --git a/src/bindings/scripts/scripts/kalimdor/dustwallow_marsh.cpp b/src/bindings/scripts/scripts/kalimdor/dustwallow_marsh.cpp index 8f33a569c3e..0490b4a4386 100644 --- a/src/bindings/scripts/scripts/kalimdor/dustwallow_marsh.cpp +++ b/src/bindings/scripts/scripts/kalimdor/dustwallow_marsh.cpp @@ -74,7 +74,7 @@ struct TRINITY_DLL_DECL mobs_risen_husk_spiritAI : public ScriptedAI if (!UpdateVictim()) return; - if (m_uiConsumeFlesh_Timer < uiDiff) + if (m_uiConsumeFlesh_Timer <= uiDiff) { if (m_creature->GetEntry() == NPC_RISEN_HUSK) DoCast(m_creature->getVictim(), SPELL_CONSUME_FLESH); @@ -84,7 +84,7 @@ struct TRINITY_DLL_DECL mobs_risen_husk_spiritAI : public ScriptedAI else m_uiConsumeFlesh_Timer -= uiDiff; - if (m_uiIntangiblePresence_Timer < uiDiff) + if (m_uiIntangiblePresence_Timer <= uiDiff) { if (m_creature->GetEntry() == NPC_RISEN_SPIRIT) DoCast(m_creature->getVictim(), SPELL_INTANGIBLE_PRESENCE); diff --git a/src/bindings/scripts/scripts/kalimdor/felwood.cpp b/src/bindings/scripts/scripts/kalimdor/felwood.cpp index 4a676ec5366..4c81b7315e4 100644 --- a/src/bindings/scripts/scripts/kalimdor/felwood.cpp +++ b/src/bindings/scripts/scripts/kalimdor/felwood.cpp @@ -46,7 +46,7 @@ bool GossipHello_npcs_riverbreeze_and_silversky(Player* pPlayer, Creature* pCrea { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BEACON, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->SEND_GOSSIP_MENU(2848, pCreature->GetGUID()); - }else if (pPlayer->GetTeam()==HORDE) + } else if (pPlayer->GetTeam()==HORDE) pPlayer->SEND_GOSSIP_MENU(2845, pCreature->GetGUID()); else pPlayer->SEND_GOSSIP_MENU(2844, pCreature->GetGUID()); @@ -58,7 +58,7 @@ bool GossipHello_npcs_riverbreeze_and_silversky(Player* pPlayer, Creature* pCrea { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BEACON, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->SEND_GOSSIP_MENU(2849, pCreature->GetGUID()); - }else if (pPlayer->GetTeam() == ALLIANCE) + } else if (pPlayer->GetTeam() == ALLIANCE) pPlayer->SEND_GOSSIP_MENU(2843, pCreature->GetGUID()); else pPlayer->SEND_GOSSIP_MENU(2842, pCreature->GetGUID()); diff --git a/src/bindings/scripts/scripts/kalimdor/maraudon/boss_celebras_the_cursed.cpp b/src/bindings/scripts/scripts/kalimdor/maraudon/boss_celebras_the_cursed.cpp index de33f5253df..3aeff41e335 100644 --- a/src/bindings/scripts/scripts/kalimdor/maraudon/boss_celebras_the_cursed.cpp +++ b/src/bindings/scripts/scripts/kalimdor/maraudon/boss_celebras_the_cursed.cpp @@ -55,29 +55,29 @@ struct TRINITY_DLL_DECL celebras_the_cursedAI : public ScriptedAI return; //Wrath - if (Wrath_Timer < diff) + if (Wrath_Timer <= diff) { - Unit* target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM,0); - if (target) - DoCast(target,SPELL_WRATH); + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); + if (pTarget) + DoCast(pTarget,SPELL_WRATH); Wrath_Timer = 8000; - }else Wrath_Timer -= diff; + } else Wrath_Timer -= diff; //EntanglingRoots - if (EntanglingRoots_Timer < diff) + if (EntanglingRoots_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_ENTANGLINGROOTS); EntanglingRoots_Timer = 20000; - }else EntanglingRoots_Timer -= diff; + } else EntanglingRoots_Timer -= diff; //CorruptForces - if (CorruptForces_Timer < diff) + if (CorruptForces_Timer <= diff) { m_creature->InterruptNonMeleeSpells(false); DoCast(m_creature,SPELL_CORRUPT_FORCES); CorruptForces_Timer = 20000; - }else CorruptForces_Timer -= diff; + } else CorruptForces_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/kalimdor/maraudon/boss_landslide.cpp b/src/bindings/scripts/scripts/kalimdor/maraudon/boss_landslide.cpp index 736636b69ee..6c27f7a253d 100644 --- a/src/bindings/scripts/scripts/kalimdor/maraudon/boss_landslide.cpp +++ b/src/bindings/scripts/scripts/kalimdor/maraudon/boss_landslide.cpp @@ -52,23 +52,23 @@ struct TRINITY_DLL_DECL boss_landslideAI : public ScriptedAI return; //KnockAway_Timer - if (KnockAway_Timer < diff) + if (KnockAway_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_KNOCKAWAY); KnockAway_Timer = 15000; - }else KnockAway_Timer -= diff; + } else KnockAway_Timer -= diff; //Trample_Timer - if (Trample_Timer < diff) + if (Trample_Timer <= diff) { DoCast(m_creature,SPELL_TRAMPLE); Trample_Timer = 8000; - }else Trample_Timer -= diff; + } else Trample_Timer -= diff; //Landslide if (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 50) { - if (Landslide_Timer < diff) + if (Landslide_Timer <= diff) { m_creature->InterruptNonMeleeSpells(false); DoCast(m_creature,SPELL_LANDSLIDE); diff --git a/src/bindings/scripts/scripts/kalimdor/maraudon/boss_noxxion.cpp b/src/bindings/scripts/scripts/kalimdor/maraudon/boss_noxxion.cpp index add73e2c60f..d573b118d3e 100644 --- a/src/bindings/scripts/scripts/kalimdor/maraudon/boss_noxxion.cpp +++ b/src/bindings/scripts/scripts/kalimdor/maraudon/boss_noxxion.cpp @@ -35,10 +35,6 @@ struct TRINITY_DLL_DECL boss_noxxionAI : public ScriptedAI uint32 Adds_Timer; uint32 Invisible_Timer; bool Invisible; - int Rand; - int RandX; - int RandY; - Creature* Summoned; void Reset() { @@ -53,30 +49,15 @@ struct TRINITY_DLL_DECL boss_noxxionAI : public ScriptedAI { } - void SummonAdds(Unit* victim) + void SummonAdds(Unit* pVictim) { - Rand = rand()%8; - switch (rand()%2) - { - case 0: RandX = 0 - Rand; break; - case 1: RandX = 0 + Rand; break; - } - Rand = 0; - Rand = rand()%8; - switch (rand()%2) - { - case 0: RandY = 0 - Rand; break; - case 1: RandY = 0 + Rand; break; - } - Rand = 0; - Summoned = DoSpawnCreature(13456, RandX, RandY, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 90000); - if (Summoned) - (Summoned->AI())->AttackStart(victim); + if (Creature *Add = DoSpawnCreature(13456, RAND(irand(0,-7),irand(0,7)), RAND(irand(0,-7),irand(0,7)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 90000)) + Add->AI()->AttackStart(pVictim); } void UpdateAI(const uint32 diff) { - if (Invisible && Invisible_Timer < diff) + if (Invisible && Invisible_Timer <= diff) { //Become visible again m_creature->setFaction(14); @@ -97,21 +78,21 @@ struct TRINITY_DLL_DECL boss_noxxionAI : public ScriptedAI return; //ToxicVolley_Timer - if (ToxicVolley_Timer < diff) + if (ToxicVolley_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_TOXICVOLLEY); ToxicVolley_Timer = 9000; - }else ToxicVolley_Timer -= diff; + } else ToxicVolley_Timer -= diff; //Uppercut_Timer - if (Uppercut_Timer < diff) + if (Uppercut_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_UPPERCUT); Uppercut_Timer = 12000; - }else Uppercut_Timer -= diff; + } else Uppercut_Timer -= diff; //Adds_Timer - if (!Invisible && Adds_Timer < diff) + if (!Invisible && Adds_Timer <= diff) { //Inturrupt any spell casting //m_creature->m_canMove = true; @@ -129,7 +110,7 @@ struct TRINITY_DLL_DECL boss_noxxionAI : public ScriptedAI Invisible_Timer = 15000; Adds_Timer = 40000; - }else Adds_Timer -= diff; + } else Adds_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/kalimdor/maraudon/boss_princess_theradras.cpp b/src/bindings/scripts/scripts/kalimdor/maraudon/boss_princess_theradras.cpp index 53544d9dcdb..d7b575744a5 100644 --- a/src/bindings/scripts/scripts/kalimdor/maraudon/boss_princess_theradras.cpp +++ b/src/bindings/scripts/scripts/kalimdor/maraudon/boss_princess_theradras.cpp @@ -60,35 +60,35 @@ struct TRINITY_DLL_DECL boss_ptheradrasAI : public ScriptedAI return; //Dustfield_Timer - if (Dustfield_Timer < diff) + if (Dustfield_Timer <= diff) { DoCast(m_creature,SPELL_DUSTFIELD); Dustfield_Timer = 14000; - }else Dustfield_Timer -= diff; + } else Dustfield_Timer -= diff; //Boulder_Timer - if (Boulder_Timer < diff) + if (Boulder_Timer <= diff) { - Unit* target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM,0); - if (target) - DoCast(target,SPELL_BOULDER); + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); + if (pTarget) + DoCast(pTarget,SPELL_BOULDER); Boulder_Timer = 10000; - }else Boulder_Timer -= diff; + } else Boulder_Timer -= diff; //RepulsiveGaze_Timer - if (RepulsiveGaze_Timer < diff) + if (RepulsiveGaze_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_REPULSIVEGAZE); RepulsiveGaze_Timer = 20000; - }else RepulsiveGaze_Timer -= diff; + } else RepulsiveGaze_Timer -= diff; //Thrash_Timer - if (Thrash_Timer < diff) + if (Thrash_Timer <= diff) { DoCast(m_creature,SPELL_THRASH); Thrash_Timer = 18000; - }else Thrash_Timer -= diff; + } else Thrash_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/kalimdor/moonglade.cpp b/src/bindings/scripts/scripts/kalimdor/moonglade.cpp index fcbf822e4a0..ba9af55ad15 100644 --- a/src/bindings/scripts/scripts/kalimdor/moonglade.cpp +++ b/src/bindings/scripts/scripts/kalimdor/moonglade.cpp @@ -347,16 +347,16 @@ public: if (!m_creature->isInCombat() && !Event_onWait) { - if (checkPlayer_Timer < diff) + if (checkPlayer_Timer <= diff) { Player* pPlayer = Unit::GetPlayer(PlayerGUID); if (pPlayer && pPlayer->isInCombat() && pPlayer->getAttackerForHelper()) AttackStart(pPlayer->getAttackerForHelper()); checkPlayer_Timer = 1000; - }else checkPlayer_Timer -= diff; + } else checkPlayer_Timer -= diff; } - if (Event_onWait && Event_Timer < diff) + if (Event_onWait && Event_Timer <= diff) { Player* pPlayer = Unit::GetPlayer(PlayerGUID); diff --git a/src/bindings/scripts/scripts/kalimdor/mulgore.cpp b/src/bindings/scripts/scripts/kalimdor/mulgore.cpp index 0fcd62cd8df..3da9ff6bc22 100644 --- a/src/bindings/scripts/scripts/kalimdor/mulgore.cpp +++ b/src/bindings/scripts/scripts/kalimdor/mulgore.cpp @@ -132,7 +132,7 @@ struct TRINITY_DLL_DECL npc_kyle_frenziedAI : public ScriptedAI if (m_bIsMovingToLunch) return; - if (uiEventTimer < diff) + if (uiEventTimer <= diff) { uiEventTimer = 5000; ++uiEventPhase; diff --git a/src/bindings/scripts/scripts/kalimdor/onyxias_lair/boss_onyxia.cpp b/src/bindings/scripts/scripts/kalimdor/onyxias_lair/boss_onyxia.cpp index 559d013e1f3..1ce22f7d2d7 100644 --- a/src/bindings/scripts/scripts/kalimdor/onyxias_lair/boss_onyxia.cpp +++ b/src/bindings/scripts/scripts/kalimdor/onyxias_lair/boss_onyxia.cpp @@ -143,57 +143,57 @@ struct TRINITY_DLL_DECL boss_onyxiaAI : public ScriptedAI if (Phase == 1 || Phase == 3) { - if (FlameBreathTimer < diff) + if (FlameBreathTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_FLAMEBREATH); FlameBreathTimer = 15000; - }else FlameBreathTimer -= diff; + } else FlameBreathTimer -= diff; - if (TailSweepTimer < diff) + if (TailSweepTimer <= diff) { - Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 1); - if (target && !m_creature->HasInArc(M_PI, target)) - DoCast(target, SPELL_TAILSWEEP); + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 1); + if (pTarget && !m_creature->HasInArc(M_PI, pTarget)) + DoCast(pTarget, SPELL_TAILSWEEP); TailSweepTimer = 10000; - }else TailSweepTimer -= diff; + } else TailSweepTimer -= diff; - if (CleaveTimer < diff) + if (CleaveTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_CLEAVE); CleaveTimer = 10000; - }else CleaveTimer -= diff; + } else CleaveTimer -= diff; - if (WingBuffetTimer < diff) + if (WingBuffetTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_WINGBUFFET); WingBuffetTimer = 7000 + ((rand()%8)*1000); - }else WingBuffetTimer -= diff; + } else WingBuffetTimer -= diff; - if (KnockAwayTimer < diff) + if (KnockAwayTimer <= diff) { if (rand() <= 30) { DoCast(m_creature->getVictim(), SPELL_KNOCK_AWAY); } KnockAwayTimer = 15000; - }else KnockAwayTimer -= diff; + } else KnockAwayTimer -= diff; if (Phase == 3) { - if (BellowingRoarTimer < diff) + if (BellowingRoarTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_BELLOWINGROAR); BellowingRoarTimer = 30000; - }else BellowingRoarTimer -= diff; + } else BellowingRoarTimer -= diff; - if (SummonWhelpsTimer < diff) + if (SummonWhelpsTimer <= diff) { SummonWhelps(Phase); SummonWhelpsTimer = 45000; - }else SummonWhelpsTimer -= diff; + } else SummonWhelpsTimer -= diff; } DoMeleeAttackIfReady(); @@ -214,7 +214,7 @@ struct TRINITY_DLL_DECL boss_onyxiaAI : public ScriptedAI } } - if (EngulfingFlamesTimer < diff) + if (EngulfingFlamesTimer <= diff) { DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_ENGULFINGFLAMES); m_creature->HandleEmoteCommand(ANIM_FLY); @@ -223,7 +223,7 @@ struct TRINITY_DLL_DECL boss_onyxiaAI : public ScriptedAI } else EngulfingFlamesTimer -= diff; - if (FireballTimer < diff) + if (FireballTimer <= diff) { DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_FIREBALL); @@ -231,7 +231,7 @@ struct TRINITY_DLL_DECL boss_onyxiaAI : public ScriptedAI } else FireballTimer -= diff; - if (MovementTimer < diff) + if (MovementTimer <= diff) { if (rand()%100 < 30) { @@ -241,9 +241,9 @@ struct TRINITY_DLL_DECL boss_onyxiaAI : public ScriptedAI else ChangePosition(); MovementTimer = 25000; - }else MovementTimer -= diff; + } else MovementTimer -= diff; - if (SummonWhelpsTimer < diff) + if (SummonWhelpsTimer <= diff) { SummonWhelps(Phase); diff --git a/src/bindings/scripts/scripts/kalimdor/orgrimmar.cpp b/src/bindings/scripts/scripts/kalimdor/orgrimmar.cpp index 30129b7e037..f68e5ad6e5f 100644 --- a/src/bindings/scripts/scripts/kalimdor/orgrimmar.cpp +++ b/src/bindings/scripts/scripts/kalimdor/orgrimmar.cpp @@ -99,7 +99,7 @@ struct TRINITY_DLL_DECL npc_shenthulAI : public ScriptedAI { if (CanEmote) { - if (Reset_Timer < diff) + if (Reset_Timer <= diff) { if (Player* pPlayer = Unit::GetPlayer(PlayerGUID)) { @@ -112,7 +112,7 @@ struct TRINITY_DLL_DECL npc_shenthulAI : public ScriptedAI if (CanTalk && !CanEmote) { - if (Salute_Timer < diff) + if (Salute_Timer <= diff) { m_creature->HandleEmoteCommand(EMOTE_ONESHOT_SALUTE); CanEmote = true; @@ -192,17 +192,17 @@ struct TRINITY_DLL_DECL npc_thrall_warchiefAI : public ScriptedAI if (!UpdateVictim()) return; - if (ChainLightning_Timer < diff) + if (ChainLightning_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_CHAIN_LIGHTNING); ChainLightning_Timer = 9000; - }else ChainLightning_Timer -= diff; + } else ChainLightning_Timer -= diff; - if (Shock_Timer < diff) + if (Shock_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_SHOCK); Shock_Timer = 15000; - }else Shock_Timer -= diff; + } else Shock_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/kalimdor/razorfen_downs/boss_amnennar_the_coldbringer.cpp b/src/bindings/scripts/scripts/kalimdor/razorfen_downs/boss_amnennar_the_coldbringer.cpp index 10f211666a1..1e438bd38eb 100644 --- a/src/bindings/scripts/scripts/kalimdor/razorfen_downs/boss_amnennar_the_coldbringer.cpp +++ b/src/bindings/scripts/scripts/kalimdor/razorfen_downs/boss_amnennar_the_coldbringer.cpp @@ -71,20 +71,20 @@ struct TRINITY_DLL_DECL boss_amnennar_the_coldbringerAI : public ScriptedAI return; //AmnenarsWrath_Timer - if (AmnenarsWrath_Timer < diff) + if (AmnenarsWrath_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_AMNENNARSWRATH); AmnenarsWrath_Timer = 12000; } else AmnenarsWrath_Timer -= diff; //FrostBolt_Timer - if (FrostBolt_Timer < diff) + if (FrostBolt_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_FROSTBOLT); FrostBolt_Timer = 8000; } else FrostBolt_Timer -= diff; - if (FrostNova_Timer < diff) + if (FrostNova_Timer <= diff) { DoCast(m_creature,SPELL_FROST_NOVA); FrostNova_Timer = 15000; diff --git a/src/bindings/scripts/scripts/kalimdor/razorfen_kraul/instance_razorfen_kraul.cpp b/src/bindings/scripts/scripts/kalimdor/razorfen_kraul/instance_razorfen_kraul.cpp index 0764db846a0..5ceb6145881 100644 --- a/src/bindings/scripts/scripts/kalimdor/razorfen_kraul/instance_razorfen_kraul.cpp +++ b/src/bindings/scripts/scripts/kalimdor/razorfen_kraul/instance_razorfen_kraul.cpp @@ -67,7 +67,7 @@ struct TRINITY_DLL_DECL instance_razorfen_kraul : public ScriptedInstance void Update(uint32 diff) { - if (WardCheck_Timer < diff) + if (WardCheck_Timer <= diff) { HandleGameObject(DoorWardGUID, WardKeeperAlive); WardKeeperAlive = 0; diff --git a/src/bindings/scripts/scripts/kalimdor/razorfen_kraul/razorfen_kraul.cpp b/src/bindings/scripts/scripts/kalimdor/razorfen_kraul/razorfen_kraul.cpp index fb1df6612d0..60625b0dfbc 100644 --- a/src/bindings/scripts/scripts/kalimdor/razorfen_kraul/razorfen_kraul.cpp +++ b/src/bindings/scripts/scripts/kalimdor/razorfen_kraul/razorfen_kraul.cpp @@ -154,13 +154,13 @@ struct TRINITY_DLL_DECL npc_deaths_head_ward_keeperAI : public ScriptedAI if (pInstance) pInstance->SetData(TYPE_WARD_KEEPERS, NOT_STARTED); - if (QuillboarChanneling_Timer < diff) + if (QuillboarChanneling_Timer <= diff) { if (m_creature->IsNonMeleeSpellCasted(false)) m_creature->InterruptNonMeleeSpells(true); DoCast(m_creature, SPELL_QUILLBOAR_CHANNELING); QuillboarChanneling_Timer = 1100; - }else QuillboarChanneling_Timer -= diff; + } else QuillboarChanneling_Timer -= diff; } }; diff --git a/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_ayamiss.cpp b/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_ayamiss.cpp index cced5690faf..eb87f7fa76d 100644 --- a/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_ayamiss.cpp +++ b/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_ayamiss.cpp @@ -90,25 +90,25 @@ struct TRINITY_DLL_DECL boss_ayamissAI : public ScriptedAI } //STINGERSPRAY_Timer (only in phase2) - if (phase==2 && STINGERSPRAY_Timer < diff) + if (phase==2 && STINGERSPRAY_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_STINGERSPRAY); STINGERSPRAY_Timer = 30000; - }else STINGERSPRAY_Timer -= diff; + } else STINGERSPRAY_Timer -= diff; //POISONSTINGER_Timer (only in phase1) - if (phase==1 && POISONSTINGER_Timer < diff) + if (phase==1 && POISONSTINGER_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_POISONSTINGER); POISONSTINGER_Timer = 30000; - }else POISONSTINGER_Timer -= diff; + } else POISONSTINGER_Timer -= diff; //SUMMONSWARMER_Timer (only in phase1) - if (SUMMONSWARMER_Timer < diff) + if (SUMMONSWARMER_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_SUMMONSWARMER); SUMMONSWARMER_Timer = 60000; - }else SUMMONSWARMER_Timer -= diff; + } else SUMMONSWARMER_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_kurinnaxx.cpp b/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_kurinnaxx.cpp index b2e2998376a..bed7a5ed20c 100644 --- a/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_kurinnaxx.cpp +++ b/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_kurinnaxx.cpp @@ -88,14 +88,14 @@ struct TRINITY_DLL_DECL boss_kurinnaxxAI : public ScriptedAI } //Mortal Wound spell - if (uiMortalWoundTimer < diff) + if (uiMortalWoundTimer <= diff) { DoCast(m_creature->getVictim(),SPELL_MORTALWOUND); uiMortalWoundTimer = urand(2000,7000);; } else uiMortalWoundTimer -= diff; //Santrap spell - if (uiSandtrapTimer < diff) + if (uiSandtrapTimer <= diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget,SPELL_SANDTRAP); @@ -103,21 +103,21 @@ struct TRINITY_DLL_DECL boss_kurinnaxxAI : public ScriptedAI } else uiSandtrapTimer -= diff; //Wide Slash spell - if (uiWideSlashTimer < diff) + if (uiWideSlashTimer <= diff) { DoCast(m_creature->getVictim(),SPELL_WIDE_SLASH); uiWideSlashTimer = urand(10000,15000); } else uiWideSlashTimer -= diff; //Trash spell - if (uiTrashTimer < diff) + if (uiTrashTimer <= diff) { DoCast(m_creature, SPELL_TRASH); uiTrashTimer = urand(20000,25000); } else uiTrashTimer -= diff; //Summon Player spell - if (uiSummonPlayerTimer < diff) + if (uiSummonPlayerTimer <= diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget,SPELL_SUMMON_PLAYER); diff --git a/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_moam.cpp b/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_moam.cpp index e60b9ca3c58..b2ae29100f4 100644 --- a/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_moam.cpp +++ b/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_moam.cpp @@ -118,14 +118,14 @@ struct TRINITY_DLL_DECL boss_moamAI : public ScriptedAI } //Trample Spell - if (uiTrampleTimer < diff) + if (uiTrampleTimer <= diff) { DoCast(m_creature->getVictim(),SPELL_TRAMPLE); uiTrampleTimer = urand(3000,7000); } else uiTrampleTimer -= diff; //Drain Mana - if (uiDrainManaTimer < diff) + if (uiDrainManaTimer <= diff) { DrainMana(); uiDrainManaTimer = urand(3000,7000); @@ -134,7 +134,7 @@ struct TRINITY_DLL_DECL boss_moamAI : public ScriptedAI DoMeleeAttackIfReady(); //After 90secs change phase - if (uiPhaseTimer < diff) + if (uiPhaseTimer <= diff) { Phase = STONE; DoCast(m_creature,SPELL_SUMMONMANA); diff --git a/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp b/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp index ecd1d62d4de..c5766374c18 100644 --- a/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp +++ b/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp @@ -194,7 +194,7 @@ struct TRINITY_DLL_DECL instance_ruins_of_ahn_qiraj : public ScriptedInstance if (m_auiEncounter[i] == IN_PROGRESS) m_auiEncounter[i] = NOT_STARTED; - }else OUT_LOAD_INST_DATA_FAIL; + } else OUT_LOAD_INST_DATA_FAIL; } }; diff --git a/src/bindings/scripts/scripts/kalimdor/silithus.cpp b/src/bindings/scripts/scripts/kalimdor/silithus.cpp index 2f62a8c5ca6..8313d3b12b7 100644 --- a/src/bindings/scripts/scripts/kalimdor/silithus.cpp +++ b/src/bindings/scripts/scripts/kalimdor/silithus.cpp @@ -798,7 +798,7 @@ struct TRINITY_DLL_DECL mob_qiraj_war_spawnAI : public ScriptedAI void UpdateAI(const uint32 diff) { - Unit* target; + Unit *pTarget; Player* plr = m_creature->GetPlayer(PlayerGUID); if(!Timers) @@ -815,18 +815,18 @@ struct TRINITY_DLL_DECL mob_qiraj_war_spawnAI : public ScriptedAI } if(m_creature->GetEntry() == 15424 || m_creature->GetEntry() == 15422|| m_creature->GetEntry() == 15414) { - if(SpellTimer1 < diff) + if(SpellTimer1 <= diff) { DoCast(m_creature, SpawnCast[1].SpellId); DoCast(m_creature, 24319); SpellTimer1 = SpawnCast[1].Timer2; } else SpellTimer1 -= diff; - if(SpellTimer2 < diff) + if(SpellTimer2 <= diff) { DoCast(m_creature, SpawnCast[2].SpellId); SpellTimer2 = SpawnCast[2].Timer2; } else SpellTimer2 -= diff; - if(SpellTimer3 < diff) + if(SpellTimer3 <= diff) { DoCast(m_creature, SpawnCast[3].SpellId); SpellTimer3 = SpawnCast[3].Timer2; @@ -834,7 +834,7 @@ struct TRINITY_DLL_DECL mob_qiraj_war_spawnAI : public ScriptedAI } if (m_creature->GetEntry() == 15423 || m_creature->GetEntry() == 15424 || m_creature->GetEntry() == 15422 || m_creature->GetEntry() == 15414) { - if(SpellTimer4 < diff) + if(SpellTimer4 <= diff) { m_creature->RemoveAllAttackers(); m_creature->AttackStop(); @@ -845,22 +845,21 @@ struct TRINITY_DLL_DECL mob_qiraj_war_spawnAI : public ScriptedAI if (!hasTarget) { if (m_creature->GetEntry() == 15424 || m_creature->GetEntry() == 15422 || m_creature->GetEntry() == 15414) - target = m_creature->FindNearestCreature(15423,20,true); + pTarget = m_creature->FindNearestCreature(15423,20,true); if (m_creature->GetEntry() == 15423) { - uint8 tar; - tar = rand()%3; + uint8 tar = urand(0,2); if (tar == 0) - target = m_creature->FindNearestCreature(15422,20,true); + pTarget = m_creature->FindNearestCreature(15422,20,true); else if (tar == 1) - target = m_creature->FindNearestCreature(15424,20,true); + pTarget = m_creature->FindNearestCreature(15424,20,true); else if (tar == 2) - target = m_creature->FindNearestCreature(15414,20,true); + pTarget = m_creature->FindNearestCreature(15414,20,true); } hasTarget = true; - if(target) - m_creature->AI()->AttackStart(target); + if(pTarget) + m_creature->AI()->AttackStart(pTarget); } if (!(trigger = m_creature->FindNearestCreature(15379,100))) DoCast(m_creature, 33652); @@ -941,8 +940,8 @@ struct TRINITY_DLL_DECL npc_anachronos_quest_triggerAI : public ScriptedAI if(WaveCount < 5) //1-4 Wave { - ((mob_qiraj_war_spawnAI*)Spawn->AI())->MobGUID = m_creature->GetGUID(); - ((mob_qiraj_war_spawnAI*)Spawn->AI())->PlayerGUID = PlayerGUID; + CAST_AI(mob_qiraj_war_spawnAI, Spawn->AI())->MobGUID = m_creature->GetGUID(); + CAST_AI(mob_qiraj_war_spawnAI, Spawn->AI())->PlayerGUID = PlayerGUID; } } } @@ -1003,13 +1002,13 @@ struct TRINITY_DLL_DECL npc_anachronos_quest_triggerAI : public ScriptedAI if(WaveCount < 4) { - if(!Announced && AnnounceTimer < diff) + if(!Announced && AnnounceTimer <= diff) { DoScriptText(WavesInfo[WaveCount].WaveTextId, m_creature); Announced = true; } else AnnounceTimer -= diff; - if(WaveTimer < diff) + if(WaveTimer <= diff) SummonNextWave(); else WaveTimer -= diff; } @@ -1022,7 +1021,7 @@ void mob_qiraj_war_spawnAI::JustDied(Unit* slayer) { m_creature->RemoveCorpse(); if(Creature* Mob = (Unit::GetCreature(*m_creature, MobGUID))) - ((npc_anachronos_quest_triggerAI*)Mob->AI())->LiveCounter(); + CAST_AI(npc_anachronos_quest_triggerAI, Mob->AI())->LiveCounter(); }; /*##### @@ -1069,11 +1068,11 @@ bool GOQuestAccept_GO_crystalline_tear(Player* plr, GameObject* go, Quest const* if(Anachronos) { - ((npc_anachronos_the_ancientAI*)Anachronos->AI())->PlayerGUID = plr->GetGUID(); - ((npc_anachronos_quest_triggerAI*)CAST_CRE(Anachronos_Quest_Trigger)->AI())->Failed=false; - ((npc_anachronos_quest_triggerAI*)CAST_CRE(Anachronos_Quest_Trigger)->AI())->PlayerGUID = plr->GetGUID(); - ((npc_anachronos_quest_triggerAI*)CAST_CRE(Anachronos_Quest_Trigger)->AI())->EventStarted=true; - ((npc_anachronos_quest_triggerAI*)CAST_CRE(Anachronos_Quest_Trigger)->AI())->Announced=true; + CAST_AI(npc_anachronos_the_ancientAI, Anachronos->AI())->PlayerGUID = plr->GetGUID(); + CAST_AI(npc_anachronos_quest_triggerAI, CAST_CRE(Anachronos_Quest_Trigger)->AI())->Failed=false; + CAST_AI(npc_anachronos_quest_triggerAI, CAST_CRE(Anachronos_Quest_Trigger)->AI())->PlayerGUID = plr->GetGUID(); + CAST_AI(npc_anachronos_quest_triggerAI, CAST_CRE(Anachronos_Quest_Trigger)->AI())->EventStarted=true; + CAST_AI(npc_anachronos_quest_triggerAI, CAST_CRE(Anachronos_Quest_Trigger)->AI())->Announced=true; } } } diff --git a/src/bindings/scripts/scripts/kalimdor/tanaris.cpp b/src/bindings/scripts/scripts/kalimdor/tanaris.cpp index 2b21db67794..19f8b3c003d 100644 --- a/src/bindings/scripts/scripts/kalimdor/tanaris.cpp +++ b/src/bindings/scripts/scripts/kalimdor/tanaris.cpp @@ -89,11 +89,11 @@ struct TRINITY_DLL_DECL mob_aquementasAI : public ScriptedAI { if (isFriendly) { - if (SwitchFaction_Timer < diff) + if (SwitchFaction_Timer <= diff) { m_creature->setFaction(91); isFriendly = false; - }else SwitchFaction_Timer -= diff; + } else SwitchFaction_Timer -= diff; } if (!UpdateVictim()) @@ -101,25 +101,25 @@ struct TRINITY_DLL_DECL mob_aquementasAI : public ScriptedAI if (!isFriendly) { - if (SendItem_Timer < diff) + if (SendItem_Timer <= diff) { if (m_creature->getVictim()->GetTypeId() == TYPEID_PLAYER) SendItem(m_creature->getVictim()); SendItem_Timer = 5000; - }else SendItem_Timer -= diff; + } else SendItem_Timer -= diff; } - if (FrostShock_Timer < diff) + if (FrostShock_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_FROST_SHOCK); FrostShock_Timer = 15000; - }else FrostShock_Timer -= diff; + } else FrostShock_Timer -= diff; - if (AquaJet_Timer < diff) + if (AquaJet_Timer <= diff) { DoCast(m_creature,SPELL_AQUA_JET); AquaJet_Timer = 15000; - }else AquaJet_Timer -= diff; + } else AquaJet_Timer -= diff; DoMeleeAttackIfReady(); } @@ -510,7 +510,7 @@ struct TRINITY_DLL_DECL npc_toogaAI : public FollowerAI //we are doing the post-event, or... if (HasFollowState(STATE_FOLLOW_POSTEVENT)) { - if (m_uiPostEventTimer < uiDiff) + if (m_uiPostEventTimer <= uiDiff) { m_uiPostEventTimer = 5000; @@ -552,7 +552,7 @@ struct TRINITY_DLL_DECL npc_toogaAI : public FollowerAI //...we are doing regular speech check else if (HasFollowState(STATE_FOLLOW_INPROGRESS)) { - if (m_uiCheckSpeechTimer < uiDiff) + if (m_uiCheckSpeechTimer <= uiDiff) { m_uiCheckSpeechTimer = 5000; diff --git a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_bug_trio.cpp b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_bug_trio.cpp index 9fb0bdc00be..8d56159eb79 100644 --- a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_bug_trio.cpp +++ b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_bug_trio.cpp @@ -83,18 +83,18 @@ struct TRINITY_DLL_DECL boss_kriAI : public ScriptedAI return; //Cleave_Timer - if (Cleave_Timer < diff) + if (Cleave_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_CLEAVE); Cleave_Timer = 5000 + rand()%7000; - }else Cleave_Timer -= diff; + } else Cleave_Timer -= diff; //ToxicVolley_Timer - if (ToxicVolley_Timer < diff) + if (ToxicVolley_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_TOXIC_VOLLEY); ToxicVolley_Timer = 10000 + rand()%5000; - }else ToxicVolley_Timer -= diff; + } else ToxicVolley_Timer -= diff; if (m_creature->GetHealth() <= m_creature->GetMaxHealth() * 0.05 && !Death) { @@ -105,7 +105,7 @@ struct TRINITY_DLL_DECL boss_kriAI : public ScriptedAI if (!VemDead) { //Checking if Vem is dead. If yes we will enrage. - if (Check_Timer < diff) + if (Check_Timer <= diff) { if (pInstance && pInstance->GetData(DATA_VEMISDEAD)) { @@ -113,7 +113,7 @@ struct TRINITY_DLL_DECL boss_kriAI : public ScriptedAI VemDead = true; } Check_Timer = 2000; - }else Check_Timer -=diff; + } else Check_Timer -=diff; } DoMeleeAttackIfReady(); @@ -167,35 +167,35 @@ struct TRINITY_DLL_DECL boss_vemAI : public ScriptedAI return; //Charge_Timer - if (Charge_Timer < diff) + if (Charge_Timer <= diff) { - Unit* target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM,0); - if (target) + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); + if (pTarget) { - DoCast(target, SPELL_CHARGE); - //m_creature->SendMonsterMove(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, true,1); - AttackStart(target); + DoCast(pTarget, SPELL_CHARGE); + //m_creature->SendMonsterMove(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, true,1); + AttackStart(pTarget); } Charge_Timer = 8000 + rand()%8000; - }else Charge_Timer -= diff; + } else Charge_Timer -= diff; //KnockBack_Timer - if (KnockBack_Timer < diff) + if (KnockBack_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_KNOCKBACK); if (DoGetThreat(m_creature->getVictim())) DoModifyThreatPercent(m_creature->getVictim(),-80); KnockBack_Timer = 15000 + rand()%10000; - }else KnockBack_Timer -= diff; + } else KnockBack_Timer -= diff; //Enrage_Timer - if (!Enraged && Enrage_Timer < diff) + if (!Enraged && Enrage_Timer <= diff) { DoCast(m_creature,SPELL_ENRAGE); Enraged = true; - }else Charge_Timer -= diff; + } else Charge_Timer -= diff; DoMeleeAttackIfReady(); } @@ -237,10 +237,10 @@ struct TRINITY_DLL_DECL boss_yaujAI : public ScriptedAI for (uint8 i = 0; i < 10; ++i) { - Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0); + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); Creature* Summoned = m_creature->SummonCreature(15621,m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(),0,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,90000); - if (Summoned && target) - (Summoned->AI())->AttackStart(target); + if (Summoned && pTarget) + Summoned->AI()->AttackStart(pTarget); } } @@ -255,15 +255,15 @@ struct TRINITY_DLL_DECL boss_yaujAI : public ScriptedAI return; //Fear_Timer - if (Fear_Timer < diff) + if (Fear_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_FEAR); DoResetThreat(); Fear_Timer = 20000; - }else Fear_Timer -= diff; + } else Fear_Timer -= diff; //Casting Heal to other twins or herself. - if (Heal_Timer < diff) + if (Heal_Timer <= diff) { if (pInstance) { @@ -287,10 +287,10 @@ struct TRINITY_DLL_DECL boss_yaujAI : public ScriptedAI } Heal_Timer = 15000+rand()%15000; - }else Heal_Timer -= diff; + } else Heal_Timer -= diff; //Checking if Vem is dead. If yes we will enrage. - if (Check_Timer < diff) + if (Check_Timer <= diff) { if (!VemDead) { @@ -304,7 +304,7 @@ struct TRINITY_DLL_DECL boss_yaujAI : public ScriptedAI } } Check_Timer = 2000; - }else Check_Timer -= diff; + } else Check_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp index ed8c109e78e..13faa608088 100644 --- a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp +++ b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp @@ -193,8 +193,8 @@ struct TRINITY_DLL_DECL eye_of_cthunAI : public Scripted_NoMovementAI void SpawnEyeTentacle(float x, float y) { if (Creature* Spawned = me->SummonCreature(MOB_EYE_TENTACLE,m_creature->GetPositionX()+x,m_creature->GetPositionY()+y,m_creature->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,500)) - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0)) - Spawned->AI()->AttackStart(target); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + Spawned->AI()->AttackStart(pTarget); } void UpdateAI(const uint32 diff) @@ -212,18 +212,18 @@ struct TRINITY_DLL_DECL eye_of_cthunAI : public Scripted_NoMovementAI case 0: { //BeamTimer - if (BeamTimer < diff) + if (BeamTimer <= diff) { //SPELL_GREEN_BEAM - Unit* target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM,0); - if (target) + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); + if (pTarget) { m_creature->InterruptNonMeleeSpells(false); - DoCast(target,SPELL_GREEN_BEAM); + DoCast(pTarget,SPELL_GREEN_BEAM); //Correctly update our target - m_creature->SetUInt64Value(UNIT_FIELD_TARGET, target->GetGUID()); + m_creature->SetUInt64Value(UNIT_FIELD_TARGET, pTarget->GetGUID()); } //Beam every 3 seconds @@ -231,19 +231,19 @@ struct TRINITY_DLL_DECL eye_of_cthunAI : public Scripted_NoMovementAI } else BeamTimer -= diff; //ClawTentacleTimer - if (ClawTentacleTimer < diff) + if (ClawTentacleTimer <= diff) { - Unit* target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM,0); - if (target) + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); + if (pTarget) { Creature* Spawned = NULL; //Spawn claw tentacle on the random target - Spawned = me->SummonCreature(MOB_CLAW_TENTACLE,target->GetPositionX(),target->GetPositionY(),target->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,500); + Spawned = me->SummonCreature(MOB_CLAW_TENTACLE,pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,500); if (Spawned) - Spawned->AI()->AttackStart(target); + Spawned->AI()->AttackStart(pTarget); } //One claw tentacle every 12.5 seconds @@ -251,7 +251,7 @@ struct TRINITY_DLL_DECL eye_of_cthunAI : public Scripted_NoMovementAI } else ClawTentacleTimer -= diff; //EyeTentacleTimer - if (EyeTentacleTimer < diff) + if (EyeTentacleTimer <= diff) { //Spawn the 8 Eye Tentacles in the corret spots SpawnEyeTentacle(0, 20); //south @@ -270,24 +270,24 @@ struct TRINITY_DLL_DECL eye_of_cthunAI : public Scripted_NoMovementAI } else EyeTentacleTimer -= diff; //PhaseTimer - if (PhaseTimer < diff) + if (PhaseTimer <= diff) { //Switch to Dark Beam pInst->SetData(DATA_CTHUN_PHASE, 1); m_creature->InterruptNonMeleeSpells(false); - //Select random target for dark beam to start on - Unit* target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM,0); + //Select random pTarget for dark beam to start on + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); - if (target) + if (pTarget) { //Correctly update our target - m_creature->SetUInt64Value(UNIT_FIELD_TARGET, target->GetGUID()); + m_creature->SetUInt64Value(UNIT_FIELD_TARGET, pTarget->GetGUID()); //Face our target - DarkGlareAngle = m_creature->GetAngle(target); + DarkGlareAngle = m_creature->GetAngle(pTarget); DarkGlareTickTimer = 1000; DarkGlareTick = 0; ClockWise = rand()%2; @@ -300,7 +300,7 @@ struct TRINITY_DLL_DECL eye_of_cthunAI : public Scripted_NoMovementAI //Darkbeam for 35 seconds PhaseTimer = 35000; - }else PhaseTimer -= diff; + } else PhaseTimer -= diff; } break; @@ -308,7 +308,7 @@ struct TRINITY_DLL_DECL eye_of_cthunAI : public Scripted_NoMovementAI { //EyeTentacleTimer if (DarkGlareTick < 35) - if (DarkGlareTickTimer < diff) + if (DarkGlareTickTimer <= diff) { //Remove any target m_creature->SetUInt64Value(UNIT_FIELD_TARGET, 0); @@ -332,7 +332,7 @@ struct TRINITY_DLL_DECL eye_of_cthunAI : public Scripted_NoMovementAI } else DarkGlareTickTimer -= diff; //PhaseTimer - if (PhaseTimer < diff) + if (PhaseTimer <= diff) { //Switch to Eye Beam pInst->SetData(DATA_CTHUN_PHASE, 0); @@ -506,12 +506,12 @@ struct TRINITY_DLL_DECL cthunAI : public ScriptedAI Spawned = me->SummonCreature(MOB_EYE_TENTACLE,m_creature->GetPositionX()+x,m_creature->GetPositionY()+y,m_creature->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,500); if (Spawned) { - Unit* target; + Unit *pTarget; - target = SelectRandomNotStomach(); + pTarget = SelectRandomNotStomach(); - if (target) - Spawned->AI()->AttackStart(target); + if (pTarget) + Spawned->AI()->AttackStart(pTarget); } } @@ -555,9 +555,9 @@ struct TRINITY_DLL_DECL cthunAI : public ScriptedAI //Check if we have a target if (!UpdateVictim()) { - //No target so we'll use this section to do our random wispers instance wide + //No pTarget so we'll use this section to do our random wispers instance wide //WisperTimer - if (WisperTimer < diff) + if (WisperTimer <= diff) { Map* pMap = m_creature->GetMap(); if (!pMap->IsDungeon()) return; @@ -593,7 +593,7 @@ struct TRINITY_DLL_DECL cthunAI : public ScriptedAI case 2: { //PhaseTimer - if (PhaseTimer < diff) + if (PhaseTimer <= diff) { //Switch pInst->SetData(DATA_CTHUN_PHASE, 3); @@ -691,7 +691,7 @@ struct TRINITY_DLL_DECL cthunAI : public ScriptedAI } //Stomach acid - if (StomachAcidTimer < diff) + if (StomachAcidTimer <= diff) { //Apply aura to all players in stomach UNORDERED_MAP<uint64, bool>::iterator i = Stomach_Map.begin(); @@ -726,21 +726,21 @@ struct TRINITY_DLL_DECL cthunAI : public ScriptedAI } StomachAcidTimer = 4000; - }else StomachAcidTimer -= diff; + } else StomachAcidTimer -= diff; //Stomach Enter Timer - if (StomachEnterTimer < diff) + if (StomachEnterTimer <= diff) { - Unit* target = NULL; - target = SelectRandomNotStomach(); + Unit *pTarget = NULL; + pTarget = SelectRandomNotStomach(); - if (target) + if (pTarget) { - //Set target in stomach - Stomach_Map[target->GetGUID()] = true; - target->InterruptNonMeleeSpells(false); - target->CastSpell(target, SPELL_MOUTH_TENTACLE, true, NULL, NULL, m_creature->GetGUID()); - StomachEnterTarget = target->GetGUID(); + //Set pTarget in stomach + Stomach_Map[pTarget->GetGUID()] = true; + pTarget->InterruptNonMeleeSpells(false); + pTarget->CastSpell(pTarget, SPELL_MOUTH_TENTACLE, true, NULL, NULL, m_creature->GetGUID()); + StomachEnterTarget = pTarget->GetGUID(); StomachEnterVisTimer = 3800; } @@ -763,48 +763,48 @@ struct TRINITY_DLL_DECL cthunAI : public ScriptedAI } else StomachEnterVisTimer -= diff; //GientClawTentacleTimer - if (GiantClawTentacleTimer < diff) + if (GiantClawTentacleTimer <= diff) { - Unit* target = NULL; - target = SelectRandomNotStomach(); - if (target) + Unit *pTarget = NULL; + pTarget = SelectRandomNotStomach(); + if (pTarget) { Creature* Spawned = NULL; //Spawn claw tentacle on the random target - Spawned = me->SummonCreature(MOB_GIANT_CLAW_TENTACLE,target->GetPositionX(),target->GetPositionY(),target->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,500); + Spawned = me->SummonCreature(MOB_GIANT_CLAW_TENTACLE,pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,500); if (Spawned) - Spawned->AI()->AttackStart(target); + Spawned->AI()->AttackStart(pTarget); } //One giant claw tentacle every minute GiantClawTentacleTimer = 60000; - }else GiantClawTentacleTimer -= diff; + } else GiantClawTentacleTimer -= diff; //GiantEyeTentacleTimer - if (GiantEyeTentacleTimer < diff) + if (GiantEyeTentacleTimer <= diff) { - Unit* target = NULL; - target = SelectRandomNotStomach(); - if (target) + Unit *pTarget = NULL; + pTarget = SelectRandomNotStomach(); + if (pTarget) { Creature* Spawned = NULL; //Spawn claw tentacle on the random target - Spawned = me->SummonCreature(MOB_GIANT_EYE_TENTACLE,target->GetPositionX(),target->GetPositionY(),target->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,500); + Spawned = me->SummonCreature(MOB_GIANT_EYE_TENTACLE,pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,500); if (Spawned) - Spawned->AI()->AttackStart(target); + Spawned->AI()->AttackStart(pTarget); } //One giant eye tentacle every minute GiantEyeTentacleTimer = 60000; - }else GiantEyeTentacleTimer -= diff; + } else GiantEyeTentacleTimer -= diff; //EyeTentacleTimer - if (EyeTentacleTimer < diff) + if (EyeTentacleTimer <= diff) { //Spawn the 8 Eye Tentacles in the corret spots SpawnEyeTentacle(0, 25); //south @@ -819,7 +819,7 @@ struct TRINITY_DLL_DECL cthunAI : public ScriptedAI //These spawn at every 30 seconds EyeTentacleTimer = 30000; - }else EyeTentacleTimer -= diff; + } else EyeTentacleTimer -= diff; }break; @@ -827,7 +827,7 @@ struct TRINITY_DLL_DECL cthunAI : public ScriptedAI case 4: { //PhaseTimer - if (PhaseTimer < diff) + if (PhaseTimer <= diff) { //Switch pInst->SetData(DATA_CTHUN_PHASE, 3); @@ -950,18 +950,18 @@ struct TRINITY_DLL_DECL eye_tentacleAI : public ScriptedAI return; //KillSelfTimer - if (KillSelfTimer < diff) + if (KillSelfTimer <= diff) { m_creature->Kill(m_creature); return; } else KillSelfTimer -= diff; //MindflayTimer - if (MindflayTimer < diff) + if (MindflayTimer <= diff) { - Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0); - if (target && !target->HasAura(SPELL_DIGESTIVE_ACID)) - DoCast(target,SPELL_MIND_FLAY); + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); + if (pTarget && !pTarget->HasAura(SPELL_DIGESTIVE_ACID)) + DoCast(pTarget,SPELL_MIND_FLAY); //Mindflay every 10 seconds MindflayTimer = 10000; @@ -1011,7 +1011,7 @@ struct TRINITY_DLL_DECL claw_tentacleAI : public ScriptedAI //EvadeTimer if (!m_creature->IsWithinMeleeRange(m_creature->getVictim())) - if (EvadeTimer < diff) + if (EvadeTimer <= diff) { if (Unit* p = Unit::GetUnit(*m_creature, Portal)) p->Kill(p); @@ -1019,37 +1019,37 @@ struct TRINITY_DLL_DECL claw_tentacleAI : public ScriptedAI //Dissapear and reappear at new position m_creature->SetVisibility(VISIBILITY_OFF); - Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0); - if (!target) + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); + if (!pTarget) { m_creature->Kill(m_creature); return; } - if (!target->HasAura(SPELL_DIGESTIVE_ACID)) + if (!pTarget->HasAura(SPELL_DIGESTIVE_ACID)) { - m_creature->GetMap()->CreatureRelocation(m_creature, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0); + m_creature->GetMap()->CreatureRelocation(m_creature, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0); if (Unit* pPortal = m_creature->SummonCreature(MOB_SMALL_PORTAL, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0)) Portal = pPortal->GetGUID(); GroundRuptureTimer = 500; HamstringTimer = 2000; EvadeTimer = 5000; - AttackStart(target); + AttackStart(pTarget); } m_creature->SetVisibility(VISIBILITY_ON); } else EvadeTimer -= diff; //GroundRuptureTimer - if (GroundRuptureTimer < diff) + if (GroundRuptureTimer <= diff) { DoCast(m_creature->getVictim(),SPELL_GROUND_RUPTURE); GroundRuptureTimer = 30000; } else GroundRuptureTimer -= diff; //HamstringTimer - if (HamstringTimer < diff) + if (HamstringTimer <= diff) { DoCast(m_creature->getVictim(),SPELL_HAMSTRING); HamstringTimer = 5000; @@ -1103,7 +1103,7 @@ struct TRINITY_DLL_DECL giant_claw_tentacleAI : public ScriptedAI //EvadeTimer if (!m_creature->IsWithinMeleeRange(m_creature->getVictim())) - if (EvadeTimer < diff) + if (EvadeTimer <= diff) { if (Unit* p = Unit::GetUnit(*m_creature, Portal)) p->Kill(p); @@ -1111,16 +1111,16 @@ struct TRINITY_DLL_DECL giant_claw_tentacleAI : public ScriptedAI //Dissapear and reappear at new position m_creature->SetVisibility(VISIBILITY_OFF); - Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (!target) + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + if (!pTarget) { m_creature->Kill(m_creature); return; } - if (!target->HasAura(SPELL_DIGESTIVE_ACID)) + if (!pTarget->HasAura(SPELL_DIGESTIVE_ACID)) { - m_creature->GetMap()->CreatureRelocation(m_creature, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0); + m_creature->GetMap()->CreatureRelocation(m_creature, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0); if (Unit* pPortal = m_creature->SummonCreature(MOB_GIANT_PORTAL, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0)) Portal = pPortal->GetGUID(); @@ -1128,7 +1128,7 @@ struct TRINITY_DLL_DECL giant_claw_tentacleAI : public ScriptedAI HamstringTimer = 2000; ThrashTimer = 5000; EvadeTimer = 5000; - AttackStart(target); + AttackStart(pTarget); } m_creature->SetVisibility(VISIBILITY_ON); @@ -1136,21 +1136,21 @@ struct TRINITY_DLL_DECL giant_claw_tentacleAI : public ScriptedAI } else EvadeTimer -= diff; //GroundRuptureTimer - if (GroundRuptureTimer < diff) + if (GroundRuptureTimer <= diff) { DoCast(m_creature->getVictim(),SPELL_GROUND_RUPTURE); GroundRuptureTimer = 30000; } else GroundRuptureTimer -= diff; //ThrashTimer - if (ThrashTimer < diff) + if (ThrashTimer <= diff) { DoCast(m_creature->getVictim(),SPELL_THRASH); ThrashTimer = 10000; } else ThrashTimer -= diff; //HamstringTimer - if (HamstringTimer < diff) + if (HamstringTimer <= diff) { DoCast(m_creature->getVictim(),SPELL_HAMSTRING); HamstringTimer = 10000; @@ -1197,15 +1197,15 @@ struct TRINITY_DLL_DECL giant_eye_tentacleAI : public ScriptedAI return; //BeamTimer - if (BeamTimer < diff) + if (BeamTimer <= diff) { - Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0); - if (target && !target->HasAura(SPELL_DIGESTIVE_ACID)) - DoCast(target,SPELL_GREEN_BEAM); + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); + if (pTarget && !pTarget->HasAura(SPELL_DIGESTIVE_ACID)) + DoCast(pTarget,SPELL_GREEN_BEAM); //Beam every 2 seconds BeamTimer = 2100; - }else BeamTimer -= diff; + } else BeamTimer -= diff; } }; @@ -1217,7 +1217,7 @@ void flesh_tentacleAI::UpdateAI(const uint32 diff) return; if (Parent) - if (CheckTimer < diff) + if (CheckTimer <= diff) { Unit* pUnit = Unit::GetUnit(*m_creature, Parent); @@ -1229,7 +1229,7 @@ void flesh_tentacleAI::UpdateAI(const uint32 diff) } CheckTimer = 1000; - }else CheckTimer -= diff; + } else CheckTimer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_fankriss.cpp b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_fankriss.cpp index 2dce14cb9ec..d02a03b772e 100644 --- a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_fankriss.cpp +++ b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_fankriss.cpp @@ -77,7 +77,7 @@ struct TRINITY_DLL_DECL boss_fankrissAI : public ScriptedAI Rand = 0; Spawn = DoSpawnCreature(15630, RandX, RandY, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); if (Spawn) - (Spawn->AI())->AttackStart(victim); + Spawn->AI()->AttackStart(victim); } void EnterCombat(Unit *who) @@ -91,14 +91,14 @@ struct TRINITY_DLL_DECL boss_fankrissAI : public ScriptedAI return; //MortalWound_Timer - if (MortalWound_Timer < diff) + if (MortalWound_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_MORTAL_WOUND); MortalWound_Timer = 10000 + rand()%10000; - }else MortalWound_Timer -= diff; + } else MortalWound_Timer -= diff; //Summon 1-3 Spawns of Fankriss at random time. - if (SpawnSpawns_Timer < diff) + if (SpawnSpawns_Timer <= diff) { switch(rand()%3) { @@ -116,74 +116,74 @@ struct TRINITY_DLL_DECL boss_fankrissAI : public ScriptedAI break; } SpawnSpawns_Timer = 30000 + rand()%30000; - }else SpawnSpawns_Timer -= diff; + } else SpawnSpawns_Timer -= diff; // Teleporting Random Target to one of the three tunnels and spawn 4 hatchlings near the gamer. //We will only telport if fankriss has more than 3% of hp so teleported gamers can always loot. if (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() > 3) { - if (SpawnHatchlings_Timer< diff) + if (SpawnHatchlings_Timer<= diff) { - Unit* target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM,0); - if (target && target->GetTypeId() == TYPEID_PLAYER) + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); + if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) { - DoCast(target, SPELL_ROOT); + DoCast(pTarget, SPELL_ROOT); - if (DoGetThreat(target)) - DoModifyThreatPercent(target, -100); + if (DoGetThreat(pTarget)) + DoModifyThreatPercent(pTarget, -100); - switch(rand()%3) + switch(urand(0,2)) { case 0: - DoTeleportPlayer(target, -8106.0142,1289.2900,-74.419533,5.112); - Hatchling = m_creature->SummonCreature(15962, target->GetPositionX()-3, target->GetPositionY()-3, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + DoTeleportPlayer(pTarget, -8106.0142,1289.2900,-74.419533,5.112); + Hatchling = m_creature->SummonCreature(15962, pTarget->GetPositionX()-3, pTarget->GetPositionY()-3, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Hatchling) - (Hatchling->AI())->AttackStart(target); - Hatchling = m_creature->SummonCreature(15962, target->GetPositionX()-3, target->GetPositionY()+3, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Hatchling->AI()->AttackStart(pTarget); + Hatchling = m_creature->SummonCreature(15962, pTarget->GetPositionX()-3, pTarget->GetPositionY()+3, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Hatchling) - (Hatchling->AI())->AttackStart(target); - Hatchling = m_creature->SummonCreature(15962, target->GetPositionX()-5, target->GetPositionY()-5, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Hatchling->AI()->AttackStart(pTarget); + Hatchling = m_creature->SummonCreature(15962, pTarget->GetPositionX()-5, pTarget->GetPositionY()-5, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Hatchling) - (Hatchling->AI())->AttackStart(target); - Hatchling = m_creature->SummonCreature(15962, target->GetPositionX()-5, target->GetPositionY()+5, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Hatchling->AI()->AttackStart(pTarget); + Hatchling = m_creature->SummonCreature(15962, pTarget->GetPositionX()-5, pTarget->GetPositionY()+5, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Hatchling) - (Hatchling->AI())->AttackStart(target); + Hatchling->AI()->AttackStart(pTarget); break; case 1: - DoTeleportPlayer(target, -7990.135354,1155.1907,-78.849319,2.608); - Hatchling = m_creature->SummonCreature(15962, target->GetPositionX()-3, target->GetPositionY()-3, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + DoTeleportPlayer(pTarget, -7990.135354,1155.1907,-78.849319,2.608); + Hatchling = m_creature->SummonCreature(15962, pTarget->GetPositionX()-3, pTarget->GetPositionY()-3, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Hatchling) - (Hatchling->AI())->AttackStart(target); - Hatchling = m_creature->SummonCreature(15962, target->GetPositionX()-3, target->GetPositionY()+3, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Hatchling->AI()->AttackStart(pTarget); + Hatchling = m_creature->SummonCreature(15962, pTarget->GetPositionX()-3, pTarget->GetPositionY()+3, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Hatchling) - (Hatchling->AI())->AttackStart(target); - Hatchling = m_creature->SummonCreature(15962, target->GetPositionX()-5, target->GetPositionY()-5, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Hatchling->AI()->AttackStart(pTarget); + Hatchling = m_creature->SummonCreature(15962, pTarget->GetPositionX()-5, pTarget->GetPositionY()-5, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Hatchling) - (Hatchling->AI())->AttackStart(target); - Hatchling = m_creature->SummonCreature(15962, target->GetPositionX()-5, target->GetPositionY()+5, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Hatchling->AI()->AttackStart(pTarget); + Hatchling = m_creature->SummonCreature(15962, pTarget->GetPositionX()-5, pTarget->GetPositionY()+5, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Hatchling) - (Hatchling->AI())->AttackStart(target); + Hatchling->AI()->AttackStart(pTarget); break; case 2: - DoTeleportPlayer(target,-8159.7753,1127.9064,-76.868660,0.675); - Hatchling = m_creature->SummonCreature(15962, target->GetPositionX()-3, target->GetPositionY()-3, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + DoTeleportPlayer(pTarget,-8159.7753,1127.9064,-76.868660,0.675); + Hatchling = m_creature->SummonCreature(15962, pTarget->GetPositionX()-3, pTarget->GetPositionY()-3, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Hatchling) - (Hatchling->AI())->AttackStart(target); - Hatchling = m_creature->SummonCreature(15962, target->GetPositionX()-3, target->GetPositionY()+3, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Hatchling->AI()->AttackStart(pTarget); + Hatchling = m_creature->SummonCreature(15962, pTarget->GetPositionX()-3, pTarget->GetPositionY()+3, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Hatchling) - (Hatchling->AI())->AttackStart(target); - Hatchling = m_creature->SummonCreature(15962, target->GetPositionX()-5, target->GetPositionY()-5, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Hatchling->AI()->AttackStart(pTarget); + Hatchling = m_creature->SummonCreature(15962, pTarget->GetPositionX()-5, pTarget->GetPositionY()-5, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Hatchling) - (Hatchling->AI())->AttackStart(target); - Hatchling = m_creature->SummonCreature(15962, target->GetPositionX()-5, target->GetPositionY()+5, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Hatchling->AI()->AttackStart(pTarget); + Hatchling = m_creature->SummonCreature(15962, pTarget->GetPositionX()-5, pTarget->GetPositionY()+5, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Hatchling) - (Hatchling->AI())->AttackStart(target); + Hatchling->AI()->AttackStart(pTarget); break; } } SpawnHatchlings_Timer = 45000 + rand()%15000; - }else SpawnHatchlings_Timer -= diff; + } else SpawnHatchlings_Timer -= diff; } DoMeleeAttackIfReady(); diff --git a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_huhuran.cpp b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_huhuran.cpp index 9df6912a3df..cc312c87584 100644 --- a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_huhuran.cpp +++ b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_huhuran.cpp @@ -71,54 +71,54 @@ struct TRINITY_DLL_DECL boss_huhuranAI : public ScriptedAI return; //Frenzy_Timer - if (!Frenzy && Frenzy_Timer < diff) + if (!Frenzy && Frenzy_Timer <= diff) { DoCast(m_creature, SPELL_FRENZY); DoScriptText(EMOTE_GENERIC_FRENZY_KILL, m_creature); Frenzy = true; PoisonBolt_Timer = 3000; Frenzy_Timer = 25000 + rand()%10000; - }else Frenzy_Timer -= diff; + } else Frenzy_Timer -= diff; // Wyvern Timer - if (Wyvern_Timer < diff) + if (Wyvern_Timer <= diff) { - if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(target,SPELL_WYVERNSTING); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget,SPELL_WYVERNSTING); Wyvern_Timer = 15000 + rand()%17000; - }else Wyvern_Timer -= diff; + } else Wyvern_Timer -= diff; //Spit Timer - if (Spit_Timer < diff) + if (Spit_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_ACIDSPIT); Spit_Timer = 5000 + rand()%5000; - }else Spit_Timer -= diff; + } else Spit_Timer -= diff; //NoxiousPoison_Timer - if (NoxiousPoison_Timer < diff) + if (NoxiousPoison_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_NOXIOUSPOISON); NoxiousPoison_Timer = 12000 + rand()%12000; - }else NoxiousPoison_Timer -= diff; + } else NoxiousPoison_Timer -= diff; //PoisonBolt only if frenzy or berserk if (Frenzy || Berserk) { - if (PoisonBolt_Timer < diff) + if (PoisonBolt_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_POISONBOLT); PoisonBolt_Timer = 3000; - }else PoisonBolt_Timer -= diff; + } else PoisonBolt_Timer -= diff; } //FrenzyBack_Timer - if (Frenzy && FrenzyBack_Timer < diff) + if (Frenzy && FrenzyBack_Timer <= diff) { m_creature->InterruptNonMeleeSpells(false); Frenzy = false; FrenzyBack_Timer = 15000; - }else FrenzyBack_Timer -= diff; + } else FrenzyBack_Timer -= diff; if (!Berserk && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 31) { diff --git a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_ouro.cpp b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_ouro.cpp index fa3b7f76d11..8fe1d8c54bc 100644 --- a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_ouro.cpp +++ b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_ouro.cpp @@ -70,21 +70,21 @@ struct TRINITY_DLL_DECL boss_ouroAI : public ScriptedAI return; //Sweep_Timer - if (!Submerged && Sweep_Timer < diff) + if (!Submerged && Sweep_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_SWEEP); Sweep_Timer = 15000 + rand()%15000; - }else Sweep_Timer -= diff; + } else Sweep_Timer -= diff; //SandBlast_Timer - if (!Submerged && SandBlast_Timer < diff) + if (!Submerged && SandBlast_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_SANDBLAST); SandBlast_Timer = 20000 + rand()%15000; - }else SandBlast_Timer -= diff; + } else SandBlast_Timer -= diff; //Submerge_Timer - if (!Submerged && Submerge_Timer < diff) + if (!Submerged && Submerge_Timer <= diff) { //Cast m_creature->HandleEmoteCommand(EMOTE_ONESHOT_SUBMERGE); @@ -94,22 +94,22 @@ struct TRINITY_DLL_DECL boss_ouroAI : public ScriptedAI Submerged = true; Back_Timer = 30000 + rand()%15000; - }else Submerge_Timer -= diff; + } else Submerge_Timer -= diff; //ChangeTarget_Timer - if (Submerged && ChangeTarget_Timer < diff) + if (Submerged && ChangeTarget_Timer <= diff) { - Unit* target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM,0); + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); - if (target) - DoTeleportTo(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ()); + if (pTarget) + DoTeleportTo(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ()); ChangeTarget_Timer = 10000 + rand()%10000; - }else ChangeTarget_Timer -= diff; + } else ChangeTarget_Timer -= diff; //Back_Timer - if (Submerged && Back_Timer < diff) + if (Submerged && Back_Timer <= diff) { m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); m_creature->setFaction(14); @@ -118,7 +118,7 @@ struct TRINITY_DLL_DECL boss_ouroAI : public ScriptedAI Submerged = false; Submerge_Timer = 60000 + rand()%60000; - }else Back_Timer -= diff; + } else Back_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_sartura.cpp b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_sartura.cpp index 57c9b302d0d..fc81b7e5dbd 100644 --- a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_sartura.cpp +++ b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_sartura.cpp @@ -90,52 +90,52 @@ struct TRINITY_DLL_DECL boss_sarturaAI : public ScriptedAI if (WhirlWind) { - if (WhirlWindRandom_Timer < diff) + if (WhirlWindRandom_Timer <= diff) { //Attack random Gamers - Unit* target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM,1); - if (target) - m_creature->AddThreat(target, 1.0f); - m_creature->TauntApply(target); - AttackStart(target); + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM,1); + if (pTarget) + m_creature->AddThreat(pTarget, 1.0f); + m_creature->TauntApply(pTarget); + AttackStart(pTarget); WhirlWindRandom_Timer = 3000 + rand()%4000; - }else WhirlWindRandom_Timer -= diff; + } else WhirlWindRandom_Timer -= diff; - if (WhirlWindEnd_Timer < diff) + if (WhirlWindEnd_Timer <= diff) { WhirlWind = false; WhirlWind_Timer = 25000 + rand()%15000; - }else WhirlWindEnd_Timer -= diff; + } else WhirlWindEnd_Timer -= diff; } if (!WhirlWind) { - if (WhirlWind_Timer < diff) + if (WhirlWind_Timer <= diff) { DoCast(m_creature, SPELL_WHIRLWIND); WhirlWind = true; WhirlWindEnd_Timer = 15000; - }else WhirlWind_Timer -= diff; + } else WhirlWind_Timer -= diff; - if (AggroReset_Timer < diff) + if (AggroReset_Timer <= diff) { //Attack random Gamers - Unit* target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM,1); - if (target) - m_creature->AddThreat(target, 1.0f); - m_creature->TauntApply(target); - AttackStart(target); + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM,1); + if (pTarget) + m_creature->AddThreat(pTarget, 1.0f); + m_creature->TauntApply(pTarget); + AttackStart(pTarget); AggroReset = true; AggroReset_Timer = 2000 + rand()%3000; - }else AggroReset_Timer -= diff; + } else AggroReset_Timer -= diff; if (AggroReset) { - if (AggroResetEnd_Timer <diff) + if (AggroResetEnd_Timer <= diff) { AggroReset = false; AggroResetEnd_Timer = 5000; @@ -156,7 +156,7 @@ struct TRINITY_DLL_DECL boss_sarturaAI : public ScriptedAI //After 10 minutes hard enrage if (!EnragedHard) { - if (EnrageHard_Timer < diff) + if (EnrageHard_Timer <= diff) { DoCast(m_creature, SPELL_ENRAGEHARD); EnragedHard = true; @@ -205,61 +205,61 @@ struct TRINITY_DLL_DECL mob_sartura_royal_guardAI : public ScriptedAI if (!UpdateVictim()) return; - if (!WhirlWind && WhirlWind_Timer < diff) + if (!WhirlWind && WhirlWind_Timer <= diff) { DoCast(m_creature, SPELL_WHIRLWINDADD); WhirlWind = true; WhirlWind_Timer = 25000 + rand()%15000; WhirlWindEnd_Timer = 15000; - }else WhirlWind_Timer -= diff; + } else WhirlWind_Timer -= diff; if (WhirlWind) { - if (WhirlWindRandom_Timer < diff) + if (WhirlWindRandom_Timer <= diff) { //Attack random Gamers - Unit* target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM,1); - if (target) - m_creature->AddThreat(target, 1.0f); - m_creature->TauntApply(target); - AttackStart(target); + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM,1); + if (pTarget) + m_creature->AddThreat(pTarget, 1.0f); + m_creature->TauntApply(pTarget); + AttackStart(pTarget); WhirlWindRandom_Timer = 3000 + rand()%4000; - }else WhirlWindRandom_Timer -= diff; + } else WhirlWindRandom_Timer -= diff; - if (WhirlWindEnd_Timer < diff) + if (WhirlWindEnd_Timer <= diff) { WhirlWind = false; - }else WhirlWindEnd_Timer -= diff; + } else WhirlWindEnd_Timer -= diff; } if (!WhirlWind) { - if (AggroReset_Timer < diff) + if (AggroReset_Timer <= diff) { //Attack random Gamers - Unit* target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM,1); - if (target) - m_creature->AddThreat(target, 1.0f); - m_creature->TauntApply(target); - AttackStart(target); + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM,1); + if (pTarget) + m_creature->AddThreat(pTarget, 1.0f); + m_creature->TauntApply(pTarget); + AttackStart(pTarget); AggroReset = true; AggroReset_Timer = 2000 + rand()%3000; - }else AggroReset_Timer -= diff; + } else AggroReset_Timer -= diff; - if (KnockBack_Timer < diff) + if (KnockBack_Timer <= diff) { DoCast(m_creature, SPELL_WHIRLWINDADD); KnockBack_Timer = 10000 + rand()%10000; - }else KnockBack_Timer -= diff; + } else KnockBack_Timer -= diff; } if (AggroReset) { - if (AggroResetEnd_Timer <diff) + if (AggroResetEnd_Timer <= diff) { AggroReset = false; AggroResetEnd_Timer = 5000; diff --git a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_skeram.cpp b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_skeram.cpp index 6e06928ef5b..c330d473f41 100644 --- a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_skeram.cpp +++ b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_skeram.cpp @@ -115,11 +115,11 @@ struct TRINITY_DLL_DECL boss_skeramAI : public ScriptedAI return; //ArcaneExplosion_Timer - if (ArcaneExplosion_Timer < diff) + if (ArcaneExplosion_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_ARCANE_EXPLOSION); ArcaneExplosion_Timer = 8000 + rand()%10000; - }else ArcaneExplosion_Timer -= diff; + } else ArcaneExplosion_Timer -= diff; //If we are within range melee the target if (m_creature->IsWithinMeleeRange(m_creature->getVictim())) @@ -133,15 +133,15 @@ struct TRINITY_DLL_DECL boss_skeramAI : public ScriptedAI }else { //EarthShock_Timer - if (EarthShock_Timer < diff) + if (EarthShock_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_EARTH_SHOCK); EarthShock_Timer = 1000; - }else EarthShock_Timer -= diff; + } else EarthShock_Timer -= diff; } //Blink_Timer - if (Blink_Timer < diff) + if (Blink_Timer <= diff) { //DoCast(m_creature, SPELL_BLINK); switch(rand()%3) @@ -162,7 +162,7 @@ struct TRINITY_DLL_DECL boss_skeramAI : public ScriptedAI DoStopAttack(); Blink_Timer= 20000 + rand()%20000; - }else Blink_Timer -= diff; + } else Blink_Timer -= diff; int procent = (int) (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() +0.5); @@ -182,7 +182,7 @@ struct TRINITY_DLL_DECL boss_skeramAI : public ScriptedAI //Invisible_Timer if (Invisible) { - if (Invisible_Timer < diff) + if (Invisible_Timer <= diff) { //Making Skeram visible after telporting m_creature->SetVisibility(VISIBILITY_ON); @@ -190,7 +190,7 @@ struct TRINITY_DLL_DECL boss_skeramAI : public ScriptedAI Invisible_Timer = 2500; Invisible = false; - }else Invisible_Timer -= diff; + } else Invisible_Timer -= diff; } DoMeleeAttackIfReady(); @@ -225,20 +225,17 @@ struct TRINITY_DLL_DECL boss_skeramAI : public ScriptedAI break; } - for (int tryi = 0; tryi < 41; tryi ++) + for (uint16 i = 0; i < 41; ++i) { - Unit *targetpl = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (targetpl->GetTypeId() == TYPEID_PLAYER) + if (Player *pTarget = CAST_PLR(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))) { - Group *grp = CAST_PLR(targetpl)->GetGroup(); - if (grp) - { - for (int ici = 0; ici < TARGETICONCOUNT; ++ici) + if (Group *pGrp = pTarget->GetGroup()) + for (uint8 ico = 0; ico < TARGETICONCOUNT; ++ico) { - //if (grp ->m_targetIcons[ici] == m_creature->GetGUID()) -- private member:( - grp->SetTargetIcon(ici, 0); + //if (grp->m_targetIcons[ico] == m_creature->GetGUID()) -- private member :( + pGrp->SetTargetIcon(ico, 0); } - } + break; } } @@ -261,15 +258,15 @@ struct TRINITY_DLL_DECL boss_skeramAI : public ScriptedAI case 25: Images25 = true; break; } - Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0); + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); Image1 = m_creature->SummonCreature(15263, i1->x, i1->y, i1->z, i1->r, TEMPSUMMON_CORPSE_DESPAWN, 30000); if (Image1) { Image1->SetMaxHealth(m_creature->GetMaxHealth() / 5); Image1->SetHealth(m_creature->GetHealth() / 5); - if (target) - Image1->AI()->AttackStart(target); + if (pTarget) + Image1->AI()->AttackStart(pTarget); CAST_AI(boss_skeramAI, Image1->AI())->IsImage = true; } @@ -278,8 +275,8 @@ struct TRINITY_DLL_DECL boss_skeramAI : public ScriptedAI { Image2->SetMaxHealth(m_creature->GetMaxHealth() / 5); Image2->SetHealth(m_creature->GetHealth() / 5); - if (target) - Image2->AI()->AttackStart(target); + if (pTarget) + Image2->AI()->AttackStart(pTarget); CAST_AI(boss_skeramAI, Image2->AI())->IsImage = true; } Invisible = true; diff --git a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp index 0e751a7e176..6da332cc6f0 100644 --- a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp +++ b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp @@ -77,7 +77,7 @@ struct TRINITY_DLL_DECL boss_twinemperorsAI : public ScriptedAI virtual bool IAmVeklor() = 0; virtual void Reset() = 0; - virtual void CastSpellOnBug(Creature *target) = 0; + virtual void CastSpellOnBug(Creature *pTarget) = 0; void TwinReset() { @@ -191,7 +191,7 @@ struct TRINITY_DLL_DECL boss_twinemperorsAI : public ScriptedAI if (IAmVeklor()) // this spell heals caster and the other brother so let VN cast it return; - if (Heal_Timer < diff) + if (Heal_Timer <= diff) { Unit *pOtherBoss = GetOtherBoss(); if (pOtherBoss && pOtherBoss->IsWithinDist(m_creature,60)) @@ -256,7 +256,7 @@ struct TRINITY_DLL_DECL boss_twinemperorsAI : public ScriptedAI tspellcasted = true; - if (AfterTeleportTimer < diff) + if (AfterTeleportTimer <= diff) { AfterTeleport = false; m_creature->clearUnitState(UNIT_STAT_STUNNED); @@ -343,10 +343,10 @@ struct TRINITY_DLL_DECL boss_twinemperorsAI : public ScriptedAI void HandleBugs(uint32 diff) { - if (BugsTimer < diff || Abuse_Bug_Timer < diff) + if (BugsTimer < diff || Abuse_Bug_Timer <= diff) { Creature *c = RespawnNearbyBugsAndGetOne(); - if (Abuse_Bug_Timer < diff) + if (Abuse_Bug_Timer <= diff) { if (c) { @@ -373,7 +373,7 @@ struct TRINITY_DLL_DECL boss_twinemperorsAI : public ScriptedAI void CheckEnrage(uint32 diff) { - if (EnrageTimer < diff) + if (EnrageTimer <= diff) { if (!m_creature->IsNonMeleeSpellCasted(true)) { @@ -409,10 +409,10 @@ struct TRINITY_DLL_DECL boss_veknilashAI : public boss_twinemperorsAI m_creature->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_MAGIC, true); } - void CastSpellOnBug(Creature *target) + void CastSpellOnBug(Creature *pTarget) { - target->setFaction(14); - (target->AI())->AttackStart(m_creature->getThreatManager().getHostilTarget()); + pTarget->setFaction(14); + pTarget->AI()->AttackStart(m_creature->getThreatManager().getHostilTarget()); SpellEntry *spell = GET_SPELL(SPELL_MUTATE_BUG); uint8 eff_mask=0; for (int i=0; i<3; ++i) @@ -421,8 +421,8 @@ struct TRINITY_DLL_DECL boss_veknilashAI : public boss_twinemperorsAI continue; eff_mask|=1<<i; } - target->AddAura(new Aura(spell, eff_mask, target, target, target)); - target->SetHealth(target->GetMaxHealth()); + pTarget->AddAura(new Aura(spell, eff_mask, pTarget, pTarget, pTarget)); + pTarget->SetHealth(pTarget->GetMaxHealth()); } void UpdateAI(const uint32 diff) @@ -435,19 +435,19 @@ struct TRINITY_DLL_DECL boss_veknilashAI : public boss_twinemperorsAI return; //UnbalancingStrike_Timer - if (UnbalancingStrike_Timer < diff) + if (UnbalancingStrike_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_UNBALANCING_STRIKE); UnbalancingStrike_Timer = 8000+rand()%12000; - }else UnbalancingStrike_Timer -= diff; + } else UnbalancingStrike_Timer -= diff; - if (UpperCut_Timer < diff) + if (UpperCut_Timer <= diff) { Unit* randomMelee = SelectTarget(SELECT_TARGET_RANDOM, 0, NOMINAL_MELEE_RANGE, true); if (randomMelee) DoCast(randomMelee,SPELL_UPPERCUT); UpperCut_Timer = 15000+rand()%15000; - }else UpperCut_Timer -= diff; + } else UpperCut_Timer -= diff; HandleBugs(diff); @@ -455,10 +455,10 @@ struct TRINITY_DLL_DECL boss_veknilashAI : public boss_twinemperorsAI TryHealBrother(diff); //Teleporting to brother - if (Teleport_Timer < diff) + if (Teleport_Timer <= diff) { TeleportToMyBrother(); - }else Teleport_Timer -= diff; + } else Teleport_Timer -= diff; CheckEnrage(diff); @@ -495,9 +495,9 @@ struct TRINITY_DLL_DECL boss_veklorAI : public boss_twinemperorsAI m_creature->SetBaseWeaponDamage(BASE_ATTACK, MAXDAMAGE, 0); } - void CastSpellOnBug(Creature *target) + void CastSpellOnBug(Creature *pTarget) { - target->setFaction(14); + pTarget->setFaction(14); SpellEntry *spell = GET_SPELL(SPELL_EXPLODEBUG); uint8 eff_mask=0; for (int i=0; i<3; ++i) @@ -506,8 +506,8 @@ struct TRINITY_DLL_DECL boss_veklorAI : public boss_twinemperorsAI continue; eff_mask|=1<<i; } - target->AddAura(new Aura(spell, eff_mask, target, target, target)); - target->SetHealth(target->GetMaxHealth()); + pTarget->AddAura(new Aura(spell, eff_mask, pTarget, pTarget, pTarget)); + pTarget->SetHealth(pTarget->GetMaxHealth()); } void UpdateAI(const uint32 diff) @@ -525,26 +525,26 @@ struct TRINITY_DLL_DECL boss_veklorAI : public boss_twinemperorsAI return; //ShadowBolt_Timer - if (ShadowBolt_Timer < diff) + if (ShadowBolt_Timer <= diff) { if (!m_creature->IsWithinDist(m_creature->getVictim(), 45.0f)) m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim(), VEKLOR_DIST, 0); else DoCast(m_creature->getVictim(),SPELL_SHADOWBOLT); ShadowBolt_Timer = 2000; - }else ShadowBolt_Timer -= diff; + } else ShadowBolt_Timer -= diff; //Blizzard_Timer - if (Blizzard_Timer < diff) + if (Blizzard_Timer <= diff) { - Unit* target = NULL; - target = SelectTarget(SELECT_TARGET_RANDOM, 0, 45, true); - if (target) - DoCast(target,SPELL_BLIZZARD); + Unit *pTarget = NULL; + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 45, true); + if (pTarget) + DoCast(pTarget,SPELL_BLIZZARD); Blizzard_Timer = 15000+rand()%15000; - }else Blizzard_Timer -= diff; + } else Blizzard_Timer -= diff; - if (ArcaneBurst_Timer < diff) + if (ArcaneBurst_Timer <= diff) { Unit *mvic; if ((mvic=SelectTarget(SELECT_TARGET_NEAREST, 0, NOMINAL_MELEE_RANGE, true))!=NULL) @@ -552,7 +552,7 @@ struct TRINITY_DLL_DECL boss_veklorAI : public boss_twinemperorsAI DoCast(mvic,SPELL_ARCANEBURST); ArcaneBurst_Timer = 5000; } - }else ArcaneBurst_Timer -= diff; + } else ArcaneBurst_Timer -= diff; HandleBugs(diff); @@ -560,10 +560,10 @@ struct TRINITY_DLL_DECL boss_veklorAI : public boss_twinemperorsAI TryHealBrother(diff); //Teleporting to brother - if (Teleport_Timer < diff) + if (Teleport_Timer <= diff) { TeleportToMyBrother(); - }else Teleport_Timer -= diff; + } else Teleport_Timer -= diff; CheckEnrage(diff); diff --git a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp index 922c4b1454a..d548ff7155e 100644 --- a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp +++ b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp @@ -17,7 +17,7 @@ /* ScriptData SDName: mob_anubisath_sentinel SD%Complete: 95 -SDComment: Shadow storm is not properly implemented in core it should only target ppl outside of melee range. +SDComment: Shadow storm is not properly implemented in core it should only pTarget ppl outside of melee range. SDCategory: Temple of Ahn'Qiraj EndScriptData */ diff --git a/src/bindings/scripts/scripts/kalimdor/the_barrens.cpp b/src/bindings/scripts/scripts/kalimdor/the_barrens.cpp index bf658ca97b2..5278d3f99d8 100644 --- a/src/bindings/scripts/scripts/kalimdor/the_barrens.cpp +++ b/src/bindings/scripts/scripts/kalimdor/the_barrens.cpp @@ -247,7 +247,7 @@ struct TRINITY_DLL_DECL npc_taskmaster_fizzuleAI : public ScriptedAI { if (IsFriend) { - if (Reset_Timer < diff) + if (Reset_Timer <= diff) { EnterEvadeMode(); return; @@ -425,7 +425,7 @@ struct TRINITY_DLL_DECL npc_twiggy_flatheadAI : public ScriptedAI } else if (EventInProgress) { - if (Challenger_checker < diff) + if (Challenger_checker <= diff) { for (uint8 i = 0; i < 6; ++i) { @@ -442,7 +442,7 @@ struct TRINITY_DLL_DECL npc_twiggy_flatheadAI : public ScriptedAI Challenger_checker = 1000; } else Challenger_checker -= diff; - if (Wave_Timer < diff) + if (Wave_Timer <= diff) { if (AffrayChallenger[Wave] && Wave < 6 && !EventBigWill) { @@ -454,7 +454,7 @@ struct TRINITY_DLL_DECL npc_twiggy_flatheadAI : public ScriptedAI pCreature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); pCreature->HandleEmoteCommand(EMOTE_ONESHOT_ROAR); pCreature->setFaction(14); - (pCreature->AI())->AttackStart(pWarrior); + pCreature->AI()->AttackStart(pWarrior); ++Wave; Wave_Timer = 20000; } @@ -604,7 +604,7 @@ struct TRINITY_DLL_DECL npc_wizzlecrank_shredderAI : public npc_escortAI { if (m_bIsPostEvent) { - if (m_uiPostEventTimer < uiDiff) + if (m_uiPostEventTimer <= uiDiff) { switch(m_uiPostEventCount) { diff --git a/src/bindings/scripts/scripts/kalimdor/thousand_needles.cpp b/src/bindings/scripts/scripts/kalimdor/thousand_needles.cpp index d8a7f3a91db..99217ba179a 100644 --- a/src/bindings/scripts/scripts/kalimdor/thousand_needles.cpp +++ b/src/bindings/scripts/scripts/kalimdor/thousand_needles.cpp @@ -319,7 +319,7 @@ struct TRINITY_DLL_DECL npc_pluckyAI : public ScriptedAI { if (m_creature->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP)) { - if (m_uiResetTimer < uiDiff) + if (m_uiResetTimer <= uiDiff) { if (!m_creature->getVictim()) EnterEvadeMode(); diff --git a/src/bindings/scripts/scripts/kalimdor/thunder_bluff.cpp b/src/bindings/scripts/scripts/kalimdor/thunder_bluff.cpp index f94a31a0dc9..ae2a7e8e123 100644 --- a/src/bindings/scripts/scripts/kalimdor/thunder_bluff.cpp +++ b/src/bindings/scripts/scripts/kalimdor/thunder_bluff.cpp @@ -61,37 +61,37 @@ struct TRINITY_DLL_DECL npc_cairne_bloodhoofAI : public ScriptedAI if (!UpdateVictim()) return; - if (BerserkerCharge_Timer < diff) + if (BerserkerCharge_Timer <= diff) { - Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0); - if (target) - DoCast(target,SPELL_BERSERKER_CHARGE); + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); + if (pTarget) + DoCast(pTarget,SPELL_BERSERKER_CHARGE); BerserkerCharge_Timer = 25000; - }else BerserkerCharge_Timer -= diff; + } else BerserkerCharge_Timer -= diff; - if (Uppercut_Timer < diff) + if (Uppercut_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_UPPERCUT); Uppercut_Timer = 20000; - }else Uppercut_Timer -= diff; + } else Uppercut_Timer -= diff; - if (Thunderclap_Timer < diff) + if (Thunderclap_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_THUNDERCLAP); Thunderclap_Timer = 15000; - }else Thunderclap_Timer -= diff; + } else Thunderclap_Timer -= diff; - if (MortalStrike_Timer < diff) + if (MortalStrike_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_MORTAL_STRIKE); MortalStrike_Timer = 15000; - }else MortalStrike_Timer -= diff; + } else MortalStrike_Timer -= diff; - if (Cleave_Timer < diff) + if (Cleave_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_CLEAVE); Cleave_Timer = 7000; - }else Cleave_Timer -= diff; + } else Cleave_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/kalimdor/ungoro_crater.cpp b/src/bindings/scripts/scripts/kalimdor/ungoro_crater.cpp index ac717892794..7f1adaa0443 100644 --- a/src/bindings/scripts/scripts/kalimdor/ungoro_crater.cpp +++ b/src/bindings/scripts/scripts/kalimdor/ungoro_crater.cpp @@ -106,11 +106,11 @@ struct TRINITY_DLL_DECL npc_ameAI : public npc_escortAI if (!UpdateVictim()) return; - if (DEMORALIZINGSHOUT_Timer < diff) + if (DEMORALIZINGSHOUT_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_DEMORALIZINGSHOUT); DEMORALIZINGSHOUT_Timer = 70000; - }else DEMORALIZINGSHOUT_Timer -= diff; + } else DEMORALIZINGSHOUT_Timer -= diff; } }; @@ -242,7 +242,7 @@ struct TRINITY_DLL_DECL npc_ringoAI : public FollowerAI { if (HasFollowState(STATE_FOLLOW_POSTEVENT)) { - if (m_uiEndEventTimer < uiDiff) + if (m_uiEndEventTimer <= uiDiff) { if (!pSpraggle || !pSpraggle->isAlive()) { @@ -300,7 +300,7 @@ struct TRINITY_DLL_DECL npc_ringoAI : public FollowerAI { if (!HasFollowState(STATE_FOLLOW_PAUSED)) { - if (m_uiFaintTimer < uiDiff) + if (m_uiFaintTimer <= uiDiff) { SetFaint(); m_uiFaintTimer = urand(60000, 120000); diff --git a/src/bindings/scripts/scripts/kalimdor/wailing_caverns/wailing_caverns.cpp b/src/bindings/scripts/scripts/kalimdor/wailing_caverns/wailing_caverns.cpp index f6161ee65b6..b47e040e074 100644 --- a/src/bindings/scripts/scripts/kalimdor/wailing_caverns/wailing_caverns.cpp +++ b/src/bindings/scripts/scripts/kalimdor/wailing_caverns/wailing_caverns.cpp @@ -326,7 +326,7 @@ struct TRINITY_DLL_DECL npc_disciple_of_naralexAI : public npc_escortAI break; } } - }else eventTimer -= diff; + } else eventTimer -= diff; } }; diff --git a/src/bindings/scripts/scripts/kalimdor/zulfarrak/zulfarrak.cpp b/src/bindings/scripts/scripts/kalimdor/zulfarrak/zulfarrak.cpp index d0111410bbd..1de76c43816 100644 --- a/src/bindings/scripts/scripts/kalimdor/zulfarrak/zulfarrak.cpp +++ b/src/bindings/scripts/scripts/kalimdor/zulfarrak/zulfarrak.cpp @@ -80,17 +80,17 @@ struct TRINITY_DLL_DECL npc_sergeant_blyAI : public ScriptedAI if (!UpdateVictim()) return; - if (ShieldBash_Timer < diff) + if (ShieldBash_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_SHIELD_BASH); ShieldBash_Timer = 15000; - }else ShieldBash_Timer -= diff; + } else ShieldBash_Timer -= diff; - if (Revenge_Timer < diff) + if (Revenge_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_REVENGE); Revenge_Timer = 10000; - }else Revenge_Timer -= diff; + } else Revenge_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_amanitar.cpp b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_amanitar.cpp index 099eeecaa9a..bbdc55321b8 100644 --- a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_amanitar.cpp +++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_amanitar.cpp @@ -127,29 +127,29 @@ struct MANGOS_DLL_DECL boss_amanitarAI : public ScriptedAI //Return since we have no target if (!UpdateVictim()) return; - if (spawntimer < diff) + if (spawntimer <= diff) { SpawnAdds(); spawntimer = urand(35000,40000); } else spawntimer -= diff; - if (roottimer < diff) + if (roottimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - m_creature->CastSpell(target, SPELL_ENTANGLING_ROOTS, false); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + m_creature->CastSpell(pTarget, SPELL_ENTANGLING_ROOTS, false); roottimer = urand(15000,30000); } - if (bashtimer < diff) + if (bashtimer <= diff) { m_creature->CastSpell(m_creature->getVictim(), SPELL_BASH, false); bashtimer = urand(15000,30000); } else bashtimer -= diff; - if (bolttimer < diff) + if (bolttimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - m_creature->CastSpell(target, SPELL_VENOM_BOLT_VOLLEY, false); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + m_creature->CastSpell(pTarget, SPELL_VENOM_BOLT_VOLLEY, false); bolttimer = urand(15000,30000); } else bolttimer -= diff; @@ -196,14 +196,14 @@ struct MANGOS_DLL_DECL mob_amanitar_mushroomsAI : public Scripted_NoMovementAI { if (m_creature->GetEntry() == NPC_POISONOUS_MUSHROOM) { - if (auratimer < diff) + if (auratimer <= diff) { m_creature->CastSpell(m_creature, POISONOUS_MUSHROOM_SPELL_VISUAL_AREA, true); m_creature->CastSpell(m_creature, POISONOUS_MUSHROOM_SPELL_POISON_CLOUD, false); auratimer = 7000; } else auratimer -= diff; } - if (deathtimer < diff) + if (deathtimer <= diff) { m_creature->DisappearAndDie(); } else deathtimer -= diff; diff --git a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp index def99430913..cbc44e2e3ad 100644 --- a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp +++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp @@ -130,14 +130,14 @@ struct TRINITY_DLL_DECL boss_elder_nadoxAI : public ScriptedAI if (!UpdateVictim()) return; - if (plague_Timer < diff) + if (plague_Timer <= diff) { DoCast(m_creature->getVictim(),HEROIC(SPELL_BROOD_PLAGUE, H_SPELL_BROOD_PLAGUE)); plague_Timer = 15000; } else plague_Timer -= diff; if (HeroicMode) - if (rage_Timer < diff) + if (rage_Timer <= diff) { Unit* Swarmer = m_creature->FindNearestCreature(MOB_AHNKAHAR_SWARMER, 35); @@ -148,7 +148,7 @@ struct TRINITY_DLL_DECL boss_elder_nadoxAI : public ScriptedAI } } else rage_Timer -= diff; - if (swarmer_spawn_Timer < diff) + if (swarmer_spawn_Timer <= diff) { DoCast(m_creature,SPELL_SUMMON_SWARMERS,true); DoCast(m_creature,SPELL_SUMMON_SWARMERS); @@ -158,14 +158,14 @@ struct TRINITY_DLL_DECL boss_elder_nadoxAI : public ScriptedAI swarmer_spawn_Timer = 10000; } else swarmer_spawn_Timer -= diff; - if (guard_spawn_Timer < diff) + if (guard_spawn_Timer <= diff) { m_creature->MonsterTextEmote(EMOTE_HATCHES,m_creature->GetGUID(),true); DoCast(m_creature,SPELL_SUMMON_SWARM_GUARD); guard_spawn_Timer = 25000; } else guard_spawn_Timer -= diff; - if (enrage_Timer < diff) + if (enrage_Timer <= diff) { if (m_creature->HasAura(SPELL_ENRAGE,0)) return; @@ -232,7 +232,7 @@ struct TRINITY_DLL_DECL mob_ahnkahar_nerubianAI : public ScriptedAI if (!UpdateVictim()) return; - if (sprint_Timer < diff) + if (sprint_Timer <= diff) { DoCast(m_creature,SPELL_SPRINT); sprint_Timer = 25000; 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 ff4d557f731..f236c472c68 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 @@ -95,22 +95,22 @@ struct TRINITY_DLL_DECL boss_volazjAI : public ScriptedAI if (!UpdateVictim()) return; - if (uiMindFlayTimer < diff) + if (uiMindFlayTimer <= diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_MIND_FLAY, H_SPELL_MIND_FLAY)); uiMindFlayTimer = 20000; } else uiMindFlayTimer -= diff; - if (uiShadowBoltVolleyTimer < 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 (uiShiverTimer <= diff) { - if (Unit * target = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(target, HEROIC(SPELL_SHIVER, H_SPELL_SHIVER)); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, HEROIC(SPELL_SHIVER, H_SPELL_SHIVER)); uiShiverTimer = 15000; } else uiShiverTimer -= diff; diff --git a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp index ec086b878e8..6a97f2417aa 100644 --- a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp @@ -301,13 +301,13 @@ struct MANGOS_DLL_DECL boss_jedoga_shadowseekerAI : public ScriptedAI if (!UpdateVictim()) return; - if (uiCycloneTimer < diff) + if (uiCycloneTimer <= diff) { m_creature->CastSpell(m_creature, HEROIC(SPELL_CYCLONE_STRIKE, SPELL_CYCLONE_STRIKE_H), false); uiCycloneTimer = urand(15000,30000); } else uiCycloneTimer -= diff; - if (uiBoltTimer < diff) + if (uiBoltTimer <= diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) m_creature->CastSpell(pTarget, HEROIC(SPELL_LIGHTNING_BOLT, SPELL_LIGHTNING_BOLT_H), false); @@ -315,7 +315,7 @@ struct MANGOS_DLL_DECL boss_jedoga_shadowseekerAI : public ScriptedAI uiBoltTimer = urand(15000,30000); } else uiBoltTimer -= diff; - if (uiThunderTimer < diff) + if (uiThunderTimer <= diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) m_creature->CastSpell(pTarget, HEROIC(SPELL_THUNDERSHOCK, SPELL_THUNDERSHOCK_H), false); @@ -323,7 +323,7 @@ struct MANGOS_DLL_DECL boss_jedoga_shadowseekerAI : public ScriptedAI uiThunderTimer = urand(15000,30000); } else uiThunderTimer -= diff; - if (uiOpFerTimer < diff) + if (uiOpFerTimer <= diff) MoveUp(); else uiOpFerTimer -= diff; @@ -428,7 +428,7 @@ struct MANGOS_DLL_DECL mob_jedoga_initiandAI : public ScriptedAI void UpdateAI(const uint32 diff) { - if (pInstance && checktimer < diff) + if (pInstance && checktimer <= diff) { if (m_creature->GetGUID() == pInstance->GetData64(DATA_ADD_JEDOGA_OPFER) && !walking) { 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 f4da49952ee..a37022ce27f 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 @@ -132,7 +132,7 @@ struct TRINITY_DLL_DECL boss_taldaramAI : public ScriptedAI { if (!UpdateVictim()) return; - if (uiPhaseTimer < diff) + if (uiPhaseTimer <= diff) { switch (Phase) { @@ -196,13 +196,13 @@ struct TRINITY_DLL_DECL boss_taldaramAI : public ScriptedAI pEmbraceTarget = NULL; break; case NORMAL: - if (uiBloodthirstTimer < diff) + if (uiBloodthirstTimer <= diff) { DoCast(m_creature->getVictim(),SPELL_BLOODTHIRST); uiBloodthirstTimer = 10000; } else uiBloodthirstTimer -= diff; - if (uiFlamesphereTimer < diff) + if (uiFlamesphereTimer <= diff) { DoCast(m_creature, SPELL_CONJURE_FLAME_SPHERE); Phase = CASTING_FLAME_SPHERES; @@ -210,19 +210,19 @@ struct TRINITY_DLL_DECL boss_taldaramAI : public ScriptedAI uiFlamesphereTimer = 15000; } else uiFlamesphereTimer -= diff; - if (uiVanishTimer < diff ) + if (uiVanishTimer <= diff) { //Count alive players - Unit *target = NULL; + Unit *pTarget = NULL; std::list<HostilReference *> t_list = m_creature->getThreatManager().getThreatList(); std::vector<Unit *> target_list; for (std::list<HostilReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { - target = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); + pTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); // exclude pets & totems - if (target && target->GetTypeId() == TYPEID_PLAYER && target->isAlive()) - target_list.push_back(target); - target = NULL; + if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER && pTarget->isAlive()) + target_list.push_back(pTarget); + pTarget = NULL; } //He only vanishes if there are 3 or more alive players if (target_list.size() > 2) @@ -355,7 +355,7 @@ struct TRINITY_DLL_DECL mob_taldaram_flamesphereAI : public ScriptedAI void UpdateAI(const uint32 diff) { - if (uiDespawnTimer < diff) + if (uiDespawnTimer <= diff) m_creature->DisappearAndDie(); else uiDespawnTimer -= diff; 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 5137add5e22..fa0b0e550b1 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 @@ -300,7 +300,7 @@ struct TRINITY_DLL_DECL instance_ahnkahet : public ScriptedInstance spheres[0] = data5; spheres[1] = data6; - }else OUT_LOAD_INST_DATA_FAIL; + } else OUT_LOAD_INST_DATA_FAIL; OUT_LOAD_INST_DATA_COMPLETE; } diff --git a/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/boss_anubarak.cpp b/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/boss_anubarak.cpp index 3e1997320e7..da31a76afe6 100644 --- a/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/boss_anubarak.cpp +++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/boss_anubarak.cpp @@ -142,14 +142,14 @@ struct TRINITY_DLL_DECL boss_anub_arakAI : public ScriptedAI if (Phase == 1) { - if (SPELL_IMPALE_Timer < diff) + if (SPELL_IMPALE_Timer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) - m_creature->CastSpell(target, HEROIC(SPELL_IMPALE,H_SPELL_IMPALE), true); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + m_creature->CastSpell(pTarget, HEROIC(SPELL_IMPALE,H_SPELL_IMPALE), true); SPELL_IMPALE_Timer = 9000; - }else SPELL_IMPALE_Timer -= diff; + } else SPELL_IMPALE_Timer -= diff; if(!Summoned_Guardian) { @@ -168,7 +168,7 @@ struct TRINITY_DLL_DECL boss_anub_arakAI : public ScriptedAI if(!Summoned_Venomancer) { - if(VENOMANCER_Timer < diff) + if (VENOMANCER_Timer <= diff) { if(Phase_Time > 1) { @@ -186,12 +186,12 @@ struct TRINITY_DLL_DECL boss_anub_arakAI : public ScriptedAI Summoned_Venomancer = true; } - }else VENOMANCER_Timer -= diff; + } else VENOMANCER_Timer -= diff; } if(!Summoned_Datter) { - if(DATTER_Timer < diff) + if (DATTER_Timer <= diff) { if(Phase_Time > 2) { @@ -207,10 +207,10 @@ struct TRINITY_DLL_DECL boss_anub_arakAI : public ScriptedAI } Summoned_Datter = true; } - }else DATTER_Timer -= diff; + } else DATTER_Timer -= diff; } - if (UNDERGROUND_Timer < diff) + if (UNDERGROUND_Timer <= diff) { m_creature->RemoveAura(SPELL_SUBMERGE); @@ -218,32 +218,32 @@ struct TRINITY_DLL_DECL boss_anub_arakAI : public ScriptedAI m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); Phase = 0; - }else UNDERGROUND_Timer -= diff; + } else UNDERGROUND_Timer -= diff; } if (Phase == 0) { - if (SPELL_LEECHING_SWARM_Timer < diff) + if (SPELL_LEECHING_SWARM_Timer <= diff) { m_creature->CastSpell(m_creature,SPELL_LEECHING_SWARM,true); SPELL_LEECHING_SWARM_Timer = 19000; - }else SPELL_LEECHING_SWARM_Timer -= diff; + } else SPELL_LEECHING_SWARM_Timer -= diff; - if (SPELL_CARRION_BEETLES_Timer < diff) + if (SPELL_CARRION_BEETLES_Timer <= diff) { Channeling = true; m_creature->CastSpell(m_creature->getVictim(),SPELL_CARRION_BEETLES,false); SPELL_CARRION_BEETLES_Timer = 25000; - }else SPELL_CARRION_BEETLES_Timer -= diff; + } else SPELL_CARRION_BEETLES_Timer -= diff; - if (SPELL_POUND_Timer < diff) + if (SPELL_POUND_Timer <= diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_POUND,H_SPELL_POUND)); SPELL_POUND_Timer = 16500; - }else SPELL_POUND_Timer -= diff; + } else SPELL_POUND_Timer -= diff; } diff --git a/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/boss_hadronox.cpp b/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/boss_hadronox.cpp index b8757536172..bdf4e16c04f 100644 --- a/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/boss_hadronox.cpp +++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/boss_hadronox.cpp @@ -91,7 +91,7 @@ struct MANGOS_DLL_DECL boss_hadronoxAI : public ScriptedAI FirstTime = false; } - //when Hadronox kills any enemy (that includes a party member) she will regain 10% of her HP if the target had Leech Poison on + //when Hadronox kills any enemy (that includes a party member) she will regain 10% of her HP if the pTarget had Leech Poison on void KilledUnit(Unit* Victim) { // not sure if this aura check is correct, I think it is though @@ -127,7 +127,7 @@ struct MANGOS_DLL_DECL boss_hadronoxAI : public ScriptedAI float x=0.0f, y=0.0f, z=0.0f; m_creature->GetRespawnCoord(x,y,z); - if (CheckDistanceTimer < uiDiff) + if (CheckDistanceTimer <= uiDiff) CheckDistanceTimer = 5000; else { @@ -156,13 +156,13 @@ struct MANGOS_DLL_DECL boss_hadronoxAI : public ScriptedAI else if (!IsCombatMovement()) SetCombatMovement(true); - if (piercetimer < diff) + if (piercetimer <= diff) { DoCast(m_creature->getVictim(), SPELL_PIERCE_ARMOR); piercetimer = 8000; } else piercetimer -= diff; - if (acidtimer < diff) + if (acidtimer <= diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, HEROIC(SPELL_ACID_CLOUD, SPELL_ACID_CLOUD_H)); @@ -170,7 +170,7 @@ struct MANGOS_DLL_DECL boss_hadronoxAI : public ScriptedAI acidtimer = urand(20000,30000); } else acidtimer -= diff; - if (leechtimer < diff) + if (leechtimer <= diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, HEROIC(SPELL_LEECH_POISON, SPELL_LEECH_POISON_H)); @@ -178,7 +178,7 @@ struct MANGOS_DLL_DECL boss_hadronoxAI : public ScriptedAI leechtimer = urand(11000,14000); } else leechtimer -= diff; - if (grabtimer < diff) + if (grabtimer <= diff) { if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) // Draws all players (and attacking Mobs) to itself. DoCast(pTarget, HEROIC(SPELL_WEB_GRAB, SPELL_WEB_GRAB_H)); @@ -186,7 +186,7 @@ struct MANGOS_DLL_DECL boss_hadronoxAI : public ScriptedAI grabtimer = urand(15000,30000); } else grabtimer -= diff; - if (doorstimer < diff) + if (doorstimer <= diff) {/* Debuff bleibt auf den Spielern bis zum Tod... DoCast(m_creature, RAND(SPELL_WEB_FRONT_DOORS, SPELL_WEB_SIDE_DOORS)); */ diff --git a/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp b/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp index b22535a03cf..8880daf41e6 100644 --- a/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp +++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp @@ -154,26 +154,26 @@ struct TRINITY_DLL_DECL boss_krik_thirAI : public ScriptedAI if (!UpdateVictim()) return; - if(SummonTimer < diff) + if (SummonTimer <= diff) { Summon(); SummonTimer = 15000; } else SummonTimer -= diff; - if (MindFlayTimer < diff) + if (MindFlayTimer <= diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_MIND_FLAY, H_SPELL_MIND_FLAY)); MindFlayTimer = 15000; } else MindFlayTimer -= diff; - if (CurseFatigueTimer < diff) + if (CurseFatigueTimer <= diff) { //WowWiki say "Curse of Fatigue-Kirk'thir will cast Curse of Fatigue on 2-3 targets periodically. " - Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0); - Unit* target_1 = SelectUnit(SELECT_TARGET_RANDOM, 1); + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + Unit *pTarget_1 = SelectUnit(SELECT_TARGET_RANDOM, 1); - DoCast(target, HEROIC(SPELL_CURSE_OF_FATIGUE, H_SPELL_CURSE_OF_FATIGUE)); - DoCast(target_1, HEROIC(SPELL_CURSE_OF_FATIGUE, H_SPELL_CURSE_OF_FATIGUE)); + DoCast(pTarget, HEROIC(SPELL_CURSE_OF_FATIGUE, H_SPELL_CURSE_OF_FATIGUE)); + DoCast(pTarget_1, HEROIC(SPELL_CURSE_OF_FATIGUE, H_SPELL_CURSE_OF_FATIGUE)); CurseFatigueTimer = 10000; } else CurseFatigueTimer -= diff; @@ -249,7 +249,7 @@ struct TRINITY_DLL_DECL npc_anub_ar_skirmisherAI : public ScriptedAI if (!UpdateVictim()) return; - if(ChargeTimer < diff) + if (ChargeTimer <= diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { @@ -261,7 +261,7 @@ struct TRINITY_DLL_DECL npc_anub_ar_skirmisherAI : public ScriptedAI ChargeTimer = 15000; } else ChargeTimer -= diff; - if(BackstabTimer < diff) + if (BackstabTimer <= diff) { DoCast(m_creature->getVictim(),SPELL_BACKSTAB); BackstabTimer = 12000; @@ -290,14 +290,14 @@ struct TRINITY_DLL_DECL npc_anub_ar_shadowcasterAI : public ScriptedAI if (!UpdateVictim()) return; - if(ShadowBoltTimer < diff) + if (ShadowBoltTimer <= diff) { - if (Unit *target = SelectTarget(SELECT_TARGET_RANDOM,0,100,true)) - DoCast(target, HEROIC(SPELL_SHADOW_BOLT, H_SPELL_SHADOW_BOLT), true); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,100,true)) + DoCast(pTarget, HEROIC(SPELL_SHADOW_BOLT, H_SPELL_SHADOW_BOLT), true); ShadowBoltTimer = 15000; } else ShadowBoltTimer -= diff; - if(ShadowNovaTimer < diff) + if (ShadowNovaTimer <= diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_SHADOW_NOVA, H_SPELL_SHADOW_NOVA), true); ShadowNovaTimer = 17000; @@ -325,13 +325,13 @@ struct TRINITY_DLL_DECL npc_anub_ar_warriorAI : public ScriptedAI if (!UpdateVictim()) return; - if(StrikeTimer < diff) + if (StrikeTimer <= diff) { m_creature->CastSpell(m_creature->getVictim(), SPELL_STRIKE, true); StrikeTimer = 15000; } else StrikeTimer -= diff; - if(CleaveTimer < diff) + if (CleaveTimer <= diff) { m_creature->CastSpell(m_creature->getVictim(), SPELL_CLEAVE, true); CleaveTimer = 17000; @@ -366,14 +366,14 @@ struct TRINITY_DLL_DECL npc_watcher_gashraAI : public ScriptedAI if (!UpdateVictim()) return; - if(WebWrapTimer < diff) + if (WebWrapTimer <= diff) { - if (Unit *target = SelectTarget(SELECT_TARGET_RANDOM,0,100,true)) - m_creature->CastSpell(target, SPELL_WEB_WRAP,true); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,100,true)) + m_creature->CastSpell(pTarget, SPELL_WEB_WRAP,true); WebWrapTimer = 17000; } else WebWrapTimer -= diff; - if(InfectedBiteTimer < diff) + if (InfectedBiteTimer <= diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_INFECTED_BITE, H_SPELL_INFECTED_BITE), true); InfectedBiteTimer = 15000; @@ -403,20 +403,20 @@ struct TRINITY_DLL_DECL npc_watcher_narjilAI : public ScriptedAI if (!UpdateVictim()) return; - if(WebWrapTimer < diff) + if (WebWrapTimer <= diff) { - if (Unit *target = SelectTarget(SELECT_TARGET_RANDOM,0,100,true)) - DoCast(target, SPELL_WEB_WRAP,true); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,100,true)) + DoCast(pTarget, SPELL_WEB_WRAP,true); WebWrapTimer = 15000; } else WebWrapTimer -= diff; - if(InfectedBiteTimer < diff) + if (InfectedBiteTimer <= diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_INFECTED_BITE, H_SPELL_INFECTED_BITE), true); InfectedBiteTimer = 11000; } else InfectedBiteTimer -= diff; - if(BlindingWebsTimer < diff) + if (BlindingWebsTimer <= diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_BLINDING_WEBS, H_SPELL_BLINDING_WEBS), true); BlindingWebsTimer = 17000; @@ -446,21 +446,21 @@ struct TRINITY_DLL_DECL npc_watcher_silthikAI : public ScriptedAI if (!UpdateVictim()) return; - if(WebWrapTimer < diff) + if (WebWrapTimer <= diff) { - if (Unit *target = SelectTarget(SELECT_TARGET_RANDOM,0,100,true)) - DoCast(target, SPELL_WEB_WRAP,true); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,100,true)) + DoCast(pTarget, SPELL_WEB_WRAP,true); WebWrapTimer = 15000; } else WebWrapTimer -= diff; - if(InfectedBiteTimer < diff) + if (InfectedBiteTimer <= diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_INFECTED_BITE, H_SPELL_INFECTED_BITE), true); InfectedBiteTimer = 15000; } else InfectedBiteTimer -= diff; - if(PosionSprayTimer < diff) + if (PosionSprayTimer <= diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_POSION_SPRAY, H_SPELL_POSION_SPRAY), true); PosionSprayTimer = 17000; 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 c03f78bc382..f8f2508732b 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 @@ -185,7 +185,7 @@ struct TRINITY_DLL_DECL instance_azjol_nerub : public ScriptedInstance if (m_auiEncounter[i] == IN_PROGRESS) m_auiEncounter[i] = NOT_STARTED; - }else OUT_LOAD_INST_DATA_FAIL; + } else OUT_LOAD_INST_DATA_FAIL; OUT_LOAD_INST_DATA_COMPLETE; } diff --git a/src/bindings/scripts/scripts/northrend/borean_tundra.cpp b/src/bindings/scripts/scripts/northrend/borean_tundra.cpp index 85fc89940db..13c483406bd 100644 --- a/src/bindings/scripts/scripts/northrend/borean_tundra.cpp +++ b/src/bindings/scripts/scripts/northrend/borean_tundra.cpp @@ -227,7 +227,7 @@ struct TRINITY_DLL_DECL npc_sinkhole_kill_creditAI : public ScriptedAI if (!Phase) return; - if (Phase_Timer < diff) + if (Phase_Timer <= diff) { switch (Phase) { 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 609564747a7..b89b30783db 100644 --- a/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_novos.cpp +++ b/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_novos.cpp @@ -126,7 +126,7 @@ struct TRINITY_DLL_DECL boss_novosAI : public Scripted_NoMovementAI switch (Phase) { case PHASE_1: - if (uiTimer < diff) + if (uiTimer <= diff) { Creature *pSummon = m_creature->SummonCreature(RAND(CREATURE_FETID_TROLL_CORPSE,CREATURE_HULKING_CORPSE,CREATURE_RISEN_SHADOWCASTER), AddSpawnPoint.x, AddSpawnPoint.y , AddSpawnPoint.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20000); pSummon->GetMotionMaster()->MovePoint(0, AddDestinyPoint.x, AddDestinyPoint.y, AddDestinyPoint.z); @@ -134,7 +134,7 @@ struct TRINITY_DLL_DECL boss_novosAI : public Scripted_NoMovementAI //DoCast(m_creature,SPELL_SUMMON_MINIONS); uiTimer = 3000; } else uiTimer -= diff; - if (uiCrystalHandlerTimer < diff) + if (uiCrystalHandlerTimer <= diff) { //TODO: say Creature *pCrystalHandler = m_creature->SummonCreature(CREATURE_CRYSTAL_HANDLER, AddSpawnPoint.x, AddSpawnPoint.y , AddSpawnPoint.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20000); @@ -143,7 +143,7 @@ struct TRINITY_DLL_DECL boss_novosAI : public Scripted_NoMovementAI } else uiCrystalHandlerTimer -= diff; break; case PHASE_2: - if (uiTimer < diff) + if (uiTimer <= diff) { Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); while (pTarget && pTarget->GetTypeId() != TYPEID_PLAYER) 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 6c24d1ab55e..a90e8325827 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 @@ -180,7 +180,7 @@ struct TRINITY_DLL_DECL instance_drak_tharon : public ScriptedInstance for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) if (m_auiEncounter[i] == IN_PROGRESS) m_auiEncounter[i] = NOT_STARTED; - }else OUT_LOAD_INST_DATA_FAIL; + } else OUT_LOAD_INST_DATA_FAIL; OUT_LOAD_INST_DATA_COMPLETE; } diff --git a/src/bindings/scripts/scripts/northrend/gundrak/boss_drakkari_colossus.cpp b/src/bindings/scripts/scripts/northrend/gundrak/boss_drakkari_colossus.cpp index d45ac9a8623..0bb764570fa 100644 --- a/src/bindings/scripts/scripts/northrend/gundrak/boss_drakkari_colossus.cpp +++ b/src/bindings/scripts/scripts/northrend/gundrak/boss_drakkari_colossus.cpp @@ -117,7 +117,7 @@ struct TRINITY_DLL_DECL boss_drakkari_colossusAI : public ScriptedAI Summoned = false; } - if (MightyBlowTimer < diff) + if (MightyBlowTimer <= diff) { if (!m_creature->hasUnitState(UNIT_STAT_STUNNED)) { @@ -197,12 +197,12 @@ struct TRINITY_DLL_DECL boss_drakkari_elementalAI : public ScriptedAI Colossus->clearUnitState(UNIT_STAT_STUNNED); } - if (SurgeTimer < diff) + if (SurgeTimer <= diff) { if(m_creature->GetVisibility() == VISIBILITY_ON) { - Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0); - m_creature->CastSpell(target,SPELL_SURGE,false); + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + m_creature->CastSpell(pTarget,SPELL_SURGE,false); } SurgeTimer = 7000; @@ -274,13 +274,13 @@ struct TRINITY_DLL_DECL npc_living_mojoAI : public ScriptedAI if (!UpdateVictim()) return; - if (MojoWaveTimer < diff) + if (MojoWaveTimer <= diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_MOJO_WAVE, H_SPELL_MOJO_WAVE)); MojoWaveTimer = 15000; } else MojoWaveTimer -= diff; - if (MojoPuddleTimer < diff) + if (MojoPuddleTimer <= diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_MOJO_PUDDLE, H_SPELL_MOJO_PUDDLE)); MojoPuddleTimer = 18000; diff --git a/src/bindings/scripts/scripts/northrend/gundrak/boss_eck.cpp b/src/bindings/scripts/scripts/northrend/gundrak/boss_eck.cpp index 4334c51d25d..f080b4bc10c 100644 --- a/src/bindings/scripts/scripts/northrend/gundrak/boss_eck.cpp +++ b/src/bindings/scripts/scripts/northrend/gundrak/boss_eck.cpp @@ -61,19 +61,19 @@ struct TRINITY_DLL_DECL boss_eckAI : public ScriptedAI if (!UpdateVictim()) return; - if (uiBiteTimer < diff) + if (uiBiteTimer <= diff) { DoCast(m_creature->getVictim(),SPELL_ECK_BITE); uiBiteTimer = 8000 + rand()%4000; } else uiBiteTimer -= diff; - if (uiSpitTimer < diff) + if (uiSpitTimer <= diff) { DoCast(m_creature->getVictim(),SPELL_ECK_SPIT); uiSpitTimer = 6000 + rand()%8000; } else uiSpitTimer -= diff; - if (uiSpringTimer < diff) + if (uiSpringTimer <= diff) { Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM,1); if(pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) @@ -86,7 +86,7 @@ struct TRINITY_DLL_DECL boss_eckAI : public ScriptedAI //Berserk on timer or 20% of health if (!bBerserk) { - if (uiBerserkTimer < diff) + if (uiBerserkTimer <= diff) { DoCast(m_creature,SPELL_ECK_BERSERK); bBerserk = true; 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 1dc6f8606a4..3e5278744c5 100644 --- a/src/bindings/scripts/scripts/northrend/gundrak/boss_gal_darah.cpp +++ b/src/bindings/scripts/scripts/northrend/gundrak/boss_gal_darah.cpp @@ -110,14 +110,14 @@ struct TRINITY_DLL_DECL boss_gal_darahAI : public ScriptedAI } else { - if (uiStampedeTimer < diff) + if (uiStampedeTimer <= diff) { DoCast(m_creature,SPELL_STAMPEDE); DoScriptText(RAND(SAY_SUMMON_RHINO_1,SAY_SUMMON_RHINO_2,SAY_SUMMON_RHINO_3),m_creature); uiStampedeTimer = 15000; } else uiStampedeTimer -= diff; - if (uiWhirlingSlashTimer < diff) + if (uiWhirlingSlashTimer <= diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_WHIRLING_SLASH, H_SPELL_WHIRLING_SLASH)); uiWhirlingSlashTimer = 20000; @@ -135,25 +135,25 @@ struct TRINITY_DLL_DECL boss_gal_darahAI : public ScriptedAI } else { - if (uiPunctureTimer < diff) + if (uiPunctureTimer <= diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_PUNCTURE, H_SPELL_PUNCTURE)); uiPunctureTimer = 8000; } else uiPunctureTimer -= diff; - if (uiEnrageTimer < diff) + if (uiEnrageTimer <= diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_ENRAGE, H_SPELL_ENRAGE)); uiEnrageTimer = 20000; } else uiEnrageTimer -= diff; - if(uiStompTimer < diff) + if (uiStompTimer <= diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_STOMP, H_SPELL_STOMP)); uiStompTimer = 20000; } else uiStompTimer -= diff; - if (uiImpalingChargeTimer < diff) + if (uiImpalingChargeTimer <= diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget,HEROIC(SPELL_IMPALING_CHARGE, H_SPELL_IMPALING_CHARGE)); diff --git a/src/bindings/scripts/scripts/northrend/gundrak/boss_moorabi.cpp b/src/bindings/scripts/scripts/northrend/gundrak/boss_moorabi.cpp index 59039c8733f..cc79dfd7f57 100644 --- a/src/bindings/scripts/scripts/northrend/gundrak/boss_moorabi.cpp +++ b/src/bindings/scripts/scripts/northrend/gundrak/boss_moorabi.cpp @@ -84,20 +84,20 @@ struct TRINITY_DLL_DECL boss_moorabiAI : public ScriptedAI { m_creature->RemoveAura(SPELL_MOJO_FRENZY); - if (SPELL_GROUND_TREMOR_TIMER < diff) + if (SPELL_GROUND_TREMOR_TIMER <= diff) { DoScriptText(SAY_QUAKE, m_creature); m_creature->CastSpell(m_creature->getVictim(),SPELL_QUAKE,true); SPELL_GROUND_TREMOR_TIMER = 10000; } else SPELL_GROUND_TREMOR_TIMER -= diff; - if (SPELL_NUMBING_SHOUT_TIMER < diff) + if (SPELL_NUMBING_SHOUT_TIMER <= diff) { m_creature->CastSpell(m_creature->getVictim(),SPELL_NUMBING_ROAR,true); SPELL_NUMBING_SHOUT_TIMER = 10000; } else SPELL_NUMBING_SHOUT_TIMER -=diff; - if (SPELL_DETERMINED_STAB_TIMER < diff) + if (SPELL_DETERMINED_STAB_TIMER <= diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_DETERMINED_GORE, SPELL_DETERMINED_GORE_1)); SPELL_DETERMINED_STAB_TIMER = 8000; @@ -106,7 +106,7 @@ struct TRINITY_DLL_DECL boss_moorabiAI : public ScriptedAI else { //CAST TRANSFORMATION - if (SPELL_TRANSFORMATION_TIMER < diff) + if (SPELL_TRANSFORMATION_TIMER <= diff) { DoScriptText(EMOTE_TRANSFORM, m_creature); DoScriptText(SAY_TRANSFORM, m_creature); @@ -115,7 +115,7 @@ struct TRINITY_DLL_DECL boss_moorabiAI : public ScriptedAI } else SPELL_TRANSFORMATION_TIMER -= diff; //CAST GROUND TERMOR || QUAKE - if (SPELL_GROUND_TREMOR_TIMER < diff) + if (SPELL_GROUND_TREMOR_TIMER <= diff) { DoScriptText(SAY_QUAKE, m_creature); m_creature->CastSpell(m_creature->getVictim(),SPELL_GROUND_TREMOR,true); @@ -123,13 +123,13 @@ struct TRINITY_DLL_DECL boss_moorabiAI : public ScriptedAI } else SPELL_GROUND_TREMOR_TIMER -= diff; //CAST NUMBING SHOUT || DETERMINED_STAB - if (SPELL_NUMBING_SHOUT_TIMER < diff) + if (SPELL_NUMBING_SHOUT_TIMER <= diff) { m_creature->CastSpell(m_creature->getVictim(),SPELL_NUMBING_SHOUT,true); SPELL_NUMBING_SHOUT_TIMER = 10000; } else SPELL_NUMBING_SHOUT_TIMER -= diff; - if (SPELL_DETERMINED_STAB_TIMER < diff) + if (SPELL_DETERMINED_STAB_TIMER <= diff) { m_creature->CastSpell(m_creature->getVictim(),SPELL_DETERMINED_STAB,true); SPELL_DETERMINED_STAB_TIMER = 8000; 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 c35bee39b44..7c71fb4f9ae 100644 --- a/src/bindings/scripts/scripts/northrend/gundrak/boss_slad_ran.cpp +++ b/src/bindings/scripts/scripts/northrend/gundrak/boss_slad_ran.cpp @@ -107,19 +107,19 @@ struct TRINITY_DLL_DECL boss_slad_ranAI : public ScriptedAI if (!UpdateVictim()) return; - if (uiPoisonNovaTimer < diff) + if (uiPoisonNovaTimer <= diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_POISON_NOVA, H_SPELL_POISON_NOVA)); uiPoisonNovaTimer = 15000; } else uiPoisonNovaTimer -= diff; - if (uiPowerfullBiteTimer < diff) + if (uiPowerfullBiteTimer <= diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_POWERFULL_BITE, H_SPELL_POWERFULL_BITE)); uiPowerfullBiteTimer = 10000; } else uiPowerfullBiteTimer -= diff; - if (uiVenomBoltTimer < diff) + if (uiVenomBoltTimer <= diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_VENOM_BOLT, H_SPELL_VENOM_BOLT)); uiVenomBoltTimer = 10000; @@ -127,7 +127,7 @@ struct TRINITY_DLL_DECL boss_slad_ranAI : public ScriptedAI if (uiPhase) { - if(uiSpawnTimer < diff) + if (uiSpawnTimer <= diff) { if (uiPhase == 1) for (uint8 i = 0; i < (HeroicMode ? 5 : 3); ++i) @@ -188,7 +188,7 @@ struct TRINITY_DLL_DECL mob_slad_ran_constrictorAI : public ScriptedAI { if (!UpdateVictim()) return; - if (uiGripOfSladRanTimer < diff) + if (uiGripOfSladRanTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_GRIP_OF_SLAD_RAN); uiGripOfSladRanTimer = 5000; @@ -216,7 +216,7 @@ struct TRINITY_DLL_DECL mob_slad_ran_viperAI : public ScriptedAI if (!UpdateVictim()) return; - if (uiVenomousBiteTimer < diff) + if (uiVenomousBiteTimer <= diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_VENOMOUS_BITE, H_SPELL_VENOMOUS_BITE)); uiVenomousBiteTimer = 10000; diff --git a/src/bindings/scripts/scripts/northrend/gundrak/instance_gundrak.cpp b/src/bindings/scripts/scripts/northrend/gundrak/instance_gundrak.cpp index bc463215021..07cafd2dc55 100644 --- a/src/bindings/scripts/scripts/northrend/gundrak/instance_gundrak.cpp +++ b/src/bindings/scripts/scripts/northrend/gundrak/instance_gundrak.cpp @@ -263,7 +263,7 @@ struct TRINITY_DLL_DECL instance_gundrak : public ScriptedInstance for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) if (m_auiEncounter[i] == IN_PROGRESS) m_auiEncounter[i] = NOT_STARTED; - }else OUT_LOAD_INST_DATA_FAIL; + } else OUT_LOAD_INST_DATA_FAIL; OUT_LOAD_INST_DATA_COMPLETE; } diff --git a/src/bindings/scripts/scripts/northrend/howling_fjord.cpp b/src/bindings/scripts/scripts/northrend/howling_fjord.cpp index 27ba213e798..417f53d3356 100644 --- a/src/bindings/scripts/scripts/northrend/howling_fjord.cpp +++ b/src/bindings/scripts/scripts/northrend/howling_fjord.cpp @@ -82,7 +82,7 @@ struct TRINITY_DLL_DECL npc_Apothecary_HanesAI : public npc_escortAI { if(HealthBelowPct(75)) { - if(PotTimer < diff) + if (PotTimer <= diff) { DoCast(me,17534,true); PotTimer = 10000; diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_anubrekhan.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_anubrekhan.cpp index c3f5d7d957f..5376c5f7d82 100644 --- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_anubrekhan.cpp +++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_anubrekhan.cpp @@ -93,8 +93,8 @@ struct TRINITY_DLL_DECL boss_anubrekhanAI : public BossAI //Cast Impale on a random target //Do NOT cast it when we are afflicted by locust swarm if (!me->HasAura(SPELL_LOCUSTSWARM)) - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(target, SPELL_IMPALE); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_IMPALE); events.ScheduleEvent(EVENT_IMPALE, 15000, 1); events.DelayEvents(1500, 1); return; diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_faerlina.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_faerlina.cpp index e6ade2d868d..f1f332e9bc6 100644 --- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_faerlina.cpp +++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_faerlina.cpp @@ -111,8 +111,8 @@ struct TRINITY_DLL_DECL boss_faerlinaAI : public BossAI events.ScheduleEvent(EVENT_POISON, urand(12000,15000)); return; case EVENT_FIRE: - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(target, HEROIC(SPELL_RAIN_OF_FIRE,H_SPELL_RAIN_OF_FIRE)); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, HEROIC(SPELL_RAIN_OF_FIRE,H_SPELL_RAIN_OF_FIRE)); events.ScheduleEvent(EVENT_FIRE, urand(6000,18000)); return; case EVENT_FRENZY: diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_gothik.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_gothik.cpp index a712659b1a0..46f1c0ebb97 100644 --- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_gothik.cpp +++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_gothik.cpp @@ -238,17 +238,17 @@ struct TRINITY_DLL_DECL boss_gothikAI : public BossAI } } - void SpellHitTarget(Unit *target, const SpellEntry *spell) + void SpellHitTarget(Unit *pTarget, const SpellEntry *spell) { if (!me->isInCombat()) return; switch(spell->Id) { - case SPELL_INFORM_DEAD_TRAINEE: DoSummon(MOB_DEAD_TRAINEE, target, 0); break; - case SPELL_INFORM_DEAD_KNIGHT: DoSummon(MOB_DEAD_KNIGHT, target, 0); break; - case SPELL_INFORM_DEAD_RIDER: DoSummon(MOB_DEAD_RIDER, target, 1.0f); - DoSummon(MOB_DEAD_HORSE, target, 1.0f); break; + case SPELL_INFORM_DEAD_TRAINEE: DoSummon(MOB_DEAD_TRAINEE, pTarget, 0); break; + case SPELL_INFORM_DEAD_KNIGHT: DoSummon(MOB_DEAD_KNIGHT, pTarget, 0); break; + case SPELL_INFORM_DEAD_RIDER: DoSummon(MOB_DEAD_RIDER, pTarget, 1.0f); + DoSummon(MOB_DEAD_HORSE, pTarget, 1.0f); break; } } diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_grobbulus.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_grobbulus.cpp index 8d82d4d024e..0b47f90374a 100644 --- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_grobbulus.cpp +++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_grobbulus.cpp @@ -48,11 +48,11 @@ struct TRINITY_DLL_DECL boss_grobbulusAI : public BossAI events.ScheduleEvent(EVENT_BERSERK, 12*60000); } - void SpellHitTarget(Unit *target, const SpellEntry *spell) + void SpellHitTarget(Unit *pTarget, const SpellEntry *spell) { if (spell->Id == SPELL_SLIME_SPRAY) { - if (TempSummon *slime = me->SummonCreature(MOB_FALLOUT_SLIME, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0)) + if (TempSummon *slime = me->SummonCreature(MOB_FALLOUT_SLIME, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0)) DoZoneInCombat(slime); } } @@ -80,9 +80,9 @@ struct TRINITY_DLL_DECL boss_grobbulusAI : public BossAI events.ScheduleEvent(EVENT_SPRAY, 15000+rand()%15000); return; case EVENT_INJECT: - if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 1)) - if (!target->HasAura(SPELL_MUTATING_INJECTION)) - DoCast(target, SPELL_MUTATING_INJECTION); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 1)) + if (!pTarget->HasAura(SPELL_MUTATING_INJECTION)) + DoCast(pTarget, SPELL_MUTATING_INJECTION); events.ScheduleEvent(EVENT_INJECT, 8000 + 12000 * ((float)me->GetHealth() / me->GetMaxHealth())); return; } @@ -109,7 +109,7 @@ struct TRINITY_DLL_DECL npc_grobbulus_poison_cloudAI : public Scripted_NoMovemen void UpdateAI(const uint32 diff) { - if (Cloud_Timer < diff) + if (Cloud_Timer <= diff) { DoCast(m_creature, SPELL_POISON_CLOUD_ADD); Cloud_Timer = 10000; diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_kelthuzad.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_kelthuzad.cpp index b81b08ceda5..c7a9dd4bc23 100644 --- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_kelthuzad.cpp +++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_kelthuzad.cpp @@ -202,7 +202,7 @@ struct TRINITY_DLL_DECL boss_kelthuzadAI : public BossAI } else if (GuardiansOfIcecrown_Count < HEROIC(2,5)) { - if (GuardiansOfIcecrown_Timer < diff) + if (GuardiansOfIcecrown_Timer <= diff) { DoSummon(MOB_ICECROWN, Pos[RAND(2,5,8)]); ++GuardiansOfIcecrown_Count; @@ -227,8 +227,8 @@ struct TRINITY_DLL_DECL boss_kelthuzadAI : public BossAI events.RepeatEvent(urand(10000,20000)); return; case EVENT_CHAIN: - if (Unit *target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true)) - DoCast(target, SPELL_CHAINS_OF_KELTHUZAD); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true)) + DoCast(pTarget, SPELL_CHAINS_OF_KELTHUZAD); DoScriptText(SAY_CHAIN, me); events.RepeatEvent(urand(30000,60000)); return; @@ -256,13 +256,13 @@ struct TRINITY_DLL_DECL boss_kelthuzadAI : public BossAI return; } case EVENT_FISSURE: - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(target, SPELL_SHADOW_FISURE); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget, SPELL_SHADOW_FISURE); events.RepeatEvent(25000); return; case EVENT_BLAST: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true)) - DoCast(target, SPELL_FROST_BLAST); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true)) + DoCast(pTarget, SPELL_FROST_BLAST); if (rand()%2) DoScriptText(SAY_FROST_BLAST, m_creature); events.RepeatEvent(urand(30000,60000)); diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_maexxna.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_maexxna.cpp index 5ac34737b7a..70d8912d1d5 100644 --- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_maexxna.cpp +++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_maexxna.cpp @@ -76,14 +76,14 @@ struct TRINITY_DLL_DECL boss_maexxnaAI : public BossAI case EVENT_WRAP: for (uint32 i = 0; i < HEROIC(1,2); ++i) { - if (Unit *target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0, true, -SPELL_WEB_WRAP)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 0, true, -SPELL_WEB_WRAP)) { - target->RemoveAura(SPELL_WEB_SPRAY); + pTarget->RemoveAura(SPELL_WEB_SPRAY); uint32 pos = rand()%MAX_POS_WRAP; - target->GetMotionMaster()->MoveJump(PosWrap[pos][0], PosWrap[pos][1], PosWrap[pos][2], 20, 20); - if (Creature *wrap = DoSummon(MOB_WEB_WRAP, target, 0, 60000)) + pTarget->GetMotionMaster()->MoveJump(PosWrap[pos][0], PosWrap[pos][1], PosWrap[pos][2], 20, 20); + if (Creature *wrap = DoSummon(MOB_WEB_WRAP, pTarget, 0, 60000)) { - wrap->AI()->SetGUID(target->GetGUID()); + wrap->AI()->SetGUID(pTarget->GetGUID()); wrap->GetMotionMaster()->MoveJump(PosWrap[pos][0], PosWrap[pos][1], PosWrap[pos][2], 20, 20); } } diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_patchwerk.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_patchwerk.cpp index 2b0a8af6680..42130b31c82 100644 --- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_patchwerk.cpp +++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_patchwerk.cpp @@ -103,11 +103,11 @@ struct TRINITY_DLL_DECL boss_patchwerkAI : public BossAI std::list<HostilReference*>::iterator i = me->getThreatManager().getThreatList().begin(); for (; i != me->getThreatManager().getThreatList().end(); ++i) { - Unit* target = (*i)->getTarget(); - if (target->isAlive() && target->GetHealth() > MostHP && me->IsWithinMeleeRange(target)) + Unit *pTarget = (*i)->getTarget(); + if (pTarget->isAlive() && pTarget->GetHealth() > MostHP && me->IsWithinMeleeRange(pTarget)) { - MostHP = target->GetHealth(); - pMostHPTarget = target; + MostHP = pTarget->GetHealth(); + pMostHPTarget = pTarget; } } diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_razuvious.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_razuvious.cpp index a6eae2e892d..040999bda6a 100644 --- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_razuvious.cpp +++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_razuvious.cpp @@ -107,8 +107,8 @@ struct TRINITY_DLL_DECL boss_razuviousAI : public BossAI events.ScheduleEvent(EVENT_SHOUT, 25000); return; case EVENT_KNIFE: - if (Unit *target = SelectTarget(SELECT_TARGET_RANDOM, 0, 45)) - DoCast(target, SPELL_JAGGED_KNIFE); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 45)) + DoCast(pTarget, SPELL_JAGGED_KNIFE); events.ScheduleEvent(EVENT_KNIFE, 25000); return; case EVENT_COMMAND: diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_sapphiron.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_sapphiron.cpp index c6f1c479b8f..0d240d2a49a 100644 --- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_sapphiron.cpp +++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_sapphiron.cpp @@ -122,14 +122,14 @@ struct TRINITY_DLL_DECL boss_sapphironAI : public BossAI CheckPlayersFrostResist(); } - void SpellHitTarget(Unit *target, const SpellEntry *spell) + void SpellHitTarget(Unit *pTarget, const SpellEntry *spell) { if (spell->Id == SPELL_ICEBOLT) { - IceBlockMap::iterator itr = iceblocks.find(target->GetGUID()); + IceBlockMap::iterator itr = iceblocks.find(pTarget->GetGUID()); if (itr != iceblocks.end() && !itr->second) { - if (GameObject *iceblock = me->SummonGameObject(GO_ICEBLOCK, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, 0, 0, 0, 0, 25000)) + if (GameObject *iceblock = me->SummonGameObject(GO_ICEBLOCK, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, 0, 0, 0, 0, 25000)) itr->second = iceblock->GetGUID(); } } @@ -223,11 +223,11 @@ struct TRINITY_DLL_DECL boss_sapphironAI : public BossAI if(CanTheHundredClub) { - if(CheckFrostResistTimer < diff) + if (CheckFrostResistTimer <= diff) { CheckPlayersFrostResist(); CheckFrostResistTimer = (rand() % 5 + 5) * 1000; - }else CheckFrostResistTimer -= diff; + } else CheckFrostResistTimer -= diff; } if (phase == PHASE_GROUND) @@ -350,14 +350,14 @@ struct TRINITY_DLL_DECL boss_sapphironAI : public BossAI std::list<HostilReference*>::iterator i = me->getThreatManager().getThreatList().begin(); for (; i != me->getThreatManager().getThreatList().end(); ++i) { - Unit *target = (*i)->getTarget(); - if (target->GetTypeId() != TYPEID_PLAYER) + Unit *pTarget = (*i)->getTarget(); + if (pTarget->GetTypeId() != TYPEID_PLAYER) continue; - if (target->HasAura(SPELL_ICEBOLT)) + if (pTarget->HasAura(SPELL_ICEBOLT)) { - target->ApplySpellImmune(0, IMMUNITY_ID, SPELL_FROST_EXPLOSION, true); - targets.push_back(target); + pTarget->ApplySpellImmune(0, IMMUNITY_ID, SPELL_FROST_EXPLOSION, true); + targets.push_back(pTarget); continue; } @@ -365,11 +365,11 @@ struct TRINITY_DLL_DECL boss_sapphironAI : public BossAI { if (GameObject* pGo = GameObject::GetGameObject(*me, itr->second)) { - if (pGo->IsInBetween(me, target, 2.0f) - && me->GetExactDist2d(target->GetPositionX(), target->GetPositionY()) - me->GetExactDist2d(pGo->GetPositionX(), pGo->GetPositionY()) < 5.0f) + if (pGo->IsInBetween(me, pTarget, 2.0f) + && me->GetExactDist2d(pTarget->GetPositionX(), pTarget->GetPositionY()) - me->GetExactDist2d(pGo->GetPositionX(), pGo->GetPositionY()) < 5.0f) { - target->ApplySpellImmune(0, IMMUNITY_ID, SPELL_FROST_EXPLOSION, true); - targets.push_back(target); + pTarget->ApplySpellImmune(0, IMMUNITY_ID, SPELL_FROST_EXPLOSION, true); + targets.push_back(pTarget); break; } } diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_thaddius.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_thaddius.cpp index c2d962d469a..3e1e336e359 100644 --- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_thaddius.cpp +++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_thaddius.cpp @@ -174,11 +174,11 @@ struct TRINITY_DLL_DECL mob_stalaggAI : public ScriptedAI void UpdateAI(const uint32 uiDiff) { - if (PowerSurgeTimer < uiDiff) + if (PowerSurgeTimer <= uiDiff) { DoCast(m_creature, HEROIC(SPELL_POWERSURGE,H_SPELL_POWERSURGE)); PowerSurgeTimer = urand(15000,20000); - }else PowerSurgeTimer -= uiDiff; + } else PowerSurgeTimer -= uiDiff; DoMeleeAttackIfReady(); } }; @@ -207,11 +207,11 @@ struct TRINITY_DLL_DECL mob_feugenAI : public ScriptedAI void UpdateAI(const uint32 uiDiff) { - if (StaticFieldTimer < uiDiff) + if (StaticFieldTimer <= uiDiff) { DoCast(m_creature, HEROIC(SPELL_STATICFIELD,H_SPELL_STATICFIELD)); StaticFieldTimer = 5000; - }else StaticFieldTimer -= uiDiff; + } else StaticFieldTimer -= uiDiff; DoMeleeAttackIfReady(); } }; diff --git a/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_anomalus.cpp b/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_anomalus.cpp index a89461f6026..a734ce50a41 100644 --- a/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_anomalus.cpp +++ b/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_anomalus.cpp @@ -152,8 +152,8 @@ struct TRINITY_DLL_DECL boss_anomalusAI : public ScriptedAI if (Rift) { //DoCast(Rift, SPELL_CHARGE_RIFT); - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) - Rift->AI()->AttackStart(target); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + Rift->AI()->AttackStart(pTarget); ChaoticRiftGUID = Rift->GetGUID(); DoScriptText(SAY_RIFT , m_creature); } @@ -170,8 +170,8 @@ struct TRINITY_DLL_DECL boss_anomalusAI : public ScriptedAI if (Rift) { //DoCast(Rift, SPELL_CHARGE_RIFT); - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) - Rift->AI()->AttackStart(target); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + Rift->AI()->AttackStart(pTarget); ChaoticRiftGUID = Rift->GetGUID(); DoScriptText(SAY_RIFT , m_creature); } @@ -188,31 +188,31 @@ struct TRINITY_DLL_DECL boss_anomalusAI : public ScriptedAI if (Rift) { //DoCast(Rift, SPELL_CHARGE_RIFT); - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) - Rift->AI()->AttackStart(target); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + Rift->AI()->AttackStart(pTarget); ChaoticRiftGUID = Rift->GetGUID(); DoScriptText(SAY_RIFT , m_creature); } } - if (SPELL_SPARK_Timer < diff) + if (SPELL_SPARK_Timer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(target, HEROIC(SPELL_SPARK_N, SPELL_SPARK_H)); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, HEROIC(SPELL_SPARK_N, SPELL_SPARK_H)); SPELL_SPARK_Timer = 5000; - }else SPELL_SPARK_Timer -=diff; + } else SPELL_SPARK_Timer -=diff; - if (SPELL_CREATE_RIFT_Timer < diff) + if (SPELL_CREATE_RIFT_Timer <= diff) { DoScriptText(SAY_RIFT , m_creature); int tmp = rand()%(2); Creature* Rift = m_creature->SummonCreature(MOB_CHAOTIC_RIFT, RiftLocation[tmp][0], RiftLocation[tmp][1], RiftLocation[tmp][2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000); if (Rift) - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) - Rift->AI()->AttackStart(target); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + Rift->AI()->AttackStart(pTarget); SPELL_CREATE_RIFT_Timer = 25000; - }else SPELL_CREATE_RIFT_Timer -=diff; + } else SPELL_CREATE_RIFT_Timer -=diff; DoMeleeAttackIfReady(); } @@ -255,29 +255,29 @@ struct TRINITY_DLL_DECL mob_chaotic_riftAI : public Scripted_NoMovementAI if (!UpdateVictim()) return; - if (SPELL_CHAOTIC_ENERGY_BURST_Timer < diff) + if (SPELL_CHAOTIC_ENERGY_BURST_Timer <= diff) { Unit* Anomalus = Unit::GetUnit(*m_creature, pInstance ? pInstance->GetData64(DATA_ANOMALUS) : 0); - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) if (Anomalus && Anomalus->HasAura(SPELL_RIFT_SHIELD)) - DoCast(target, SPELL_CHARGED_CHAOTIC_ENERGY_BURST); + DoCast(pTarget, SPELL_CHARGED_CHAOTIC_ENERGY_BURST); else - DoCast(target, SPELL_CHAOTIC_ENERGY_BURST); + DoCast(pTarget, SPELL_CHAOTIC_ENERGY_BURST); SPELL_CHAOTIC_ENERGY_BURST_Timer = 1000; - }else SPELL_CHAOTIC_ENERGY_BURST_Timer -=diff; + } else SPELL_CHAOTIC_ENERGY_BURST_Timer -=diff; - if (SUMMON_CRAZED_MANA_WRAITH_Timer < diff) + if (SUMMON_CRAZED_MANA_WRAITH_Timer <= diff) { Creature* Wraith = m_creature->SummonCreature(MOB_CRAZED_MANA_WRAITH, m_creature->GetPositionX()+1, m_creature->GetPositionY()+1, m_creature->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000); if (Wraith) - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) - Wraith->AI()->AttackStart(target); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + Wraith->AI()->AttackStart(pTarget); Unit* Anomalus = Unit::GetUnit(*m_creature, pInstance ? pInstance->GetData64(DATA_ANOMALUS) : 0); if (Anomalus && Anomalus->HasAura(SPELL_RIFT_SHIELD)) SUMMON_CRAZED_MANA_WRAITH_Timer = 5000; else SUMMON_CRAZED_MANA_WRAITH_Timer = 10000; - }else SUMMON_CRAZED_MANA_WRAITH_Timer -=diff; + } else SUMMON_CRAZED_MANA_WRAITH_Timer -=diff; } }; diff --git a/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_keristrasza.cpp b/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_keristrasza.cpp index 312a97a8d42..f97ca4d116a 100644 --- a/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_keristrasza.cpp +++ b/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_keristrasza.cpp @@ -176,11 +176,11 @@ struct TRINITY_DLL_DECL boss_keristraszaAI : public ScriptedAI std::list<HostilReference*> ThreatList = m_creature->getThreatManager().getThreatList(); for (std::list<HostilReference*>::const_iterator itr = ThreatList.begin(); itr != ThreatList.end(); itr++) { - Unit *target = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); - if (!target || target->GetTypeId() != TYPEID_PLAYER) + Unit *pTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); + if (!pTarget || pTarget->GetTypeId() != TYPEID_PLAYER) continue; - Aura *AuraIntenseCold = target->GetAura(SPELL_INTENSE_COLD_TRIGGERED); + Aura *AuraIntenseCold = pTarget->GetAura(SPELL_INTENSE_COLD_TRIGGERED); if (AuraIntenseCold && AuraIntenseCold->GetStackAmount() > 2) { MoreThanTwoIntenseCold = true; @@ -197,25 +197,25 @@ struct TRINITY_DLL_DECL boss_keristraszaAI : public ScriptedAI Enrage = true; } - if (CRYSTALFIRE_BREATH_Timer < diff) + if (CRYSTALFIRE_BREATH_Timer <= diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_CRYSTALFIRE_BREATH_N, SPELL_CRYSTALFIRE_BREATH_H)); CRYSTALFIRE_BREATH_Timer = 14000; } else CRYSTALFIRE_BREATH_Timer -=diff; - if (TAIL_SWEEP_Timer < diff) + if (TAIL_SWEEP_Timer <= diff) { DoCast(m_creature, SPELL_TAIL_SWEEP); TAIL_SWEEP_Timer = 5000; } else TAIL_SWEEP_Timer -=diff; - if (CRYSTAL_CHAINS_CRYSTALIZE_Timer < diff) + if (CRYSTAL_CHAINS_CRYSTALIZE_Timer <= diff) { DoScriptText(SAY_CRYSTAL_NOVA, m_creature); if (HeroicMode) DoCast(m_creature, SPELL_CRYSTALIZE); - else if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(target, SPELL_CRYSTAL_CHAINS); + else if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(pTarget, SPELL_CRYSTAL_CHAINS); CRYSTAL_CHAINS_CRYSTALIZE_Timer = HEROIC(30000,11000); } else CRYSTAL_CHAINS_CRYSTALIZE_Timer -= diff; 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 caa9cdfd19c..97c11f39f1f 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 @@ -178,8 +178,8 @@ struct TRINITY_DLL_DECL boss_magus_telestraAI : public ScriptedAI break; } } - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) - Summoned->AI()->AttackStart(target); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + Summoned->AI()->AttackStart(pTarget); return Summoned->GetGUID(); } return 0; @@ -197,11 +197,11 @@ struct TRINITY_DLL_DECL boss_magus_telestraAI : public ScriptedAI { m_creature->StopMoving(); m_creature->AttackStop(); - if (AppearDelay_Timer < diff) + if (AppearDelay_Timer <= diff) { m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); AppearDelay = false; - }else AppearDelay_Timer -= diff; + } else AppearDelay_Timer -= diff; return; } @@ -296,7 +296,7 @@ struct TRINITY_DLL_DECL boss_magus_telestraAI : public ScriptedAI if (Cooldown) { - if (Cooldown < diff) + if (Cooldown <= diff) Cooldown = 0; else { @@ -305,35 +305,35 @@ struct TRINITY_DLL_DECL boss_magus_telestraAI : public ScriptedAI } } - if (SPELL_ICE_NOVA_Timer < diff) + if (SPELL_ICE_NOVA_Timer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) { - DoCast(target, HEROIC(SPELL_ICE_NOVA_N, SPELL_ICE_NOVA_H)); + DoCast(pTarget, HEROIC(SPELL_ICE_NOVA_N, SPELL_ICE_NOVA_H)); Cooldown = 1500; } SPELL_ICE_NOVA_Timer = 15000; - }else SPELL_ICE_NOVA_Timer -=diff; + } else SPELL_ICE_NOVA_Timer -=diff; - if (SPELL_GRAVITY_WELL_Timer < diff) + if (SPELL_GRAVITY_WELL_Timer <= diff) { - if (Unit* target = m_creature->getVictim()) + if (Unit *pTarget = m_creature->getVictim()) { - DoCast(target, SPELL_GRAVITY_WELL); + DoCast(pTarget, SPELL_GRAVITY_WELL); Cooldown = 6000; } SPELL_GRAVITY_WELL_Timer = 15000; - }else SPELL_GRAVITY_WELL_Timer -=diff; + } else SPELL_GRAVITY_WELL_Timer -=diff; - if (SPELL_FIREBOMB_Timer < diff) + if (SPELL_FIREBOMB_Timer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) { - DoCast(target, HEROIC(SPELL_FIREBOMB_N, SPELL_FIREBOMB_H)); + DoCast(pTarget, HEROIC(SPELL_FIREBOMB_N, SPELL_FIREBOMB_H)); Cooldown = 2000; } SPELL_FIREBOMB_Timer = 2000; - }else SPELL_FIREBOMB_Timer -=diff; + } else SPELL_FIREBOMB_Timer -=diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_ormorok.cpp b/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_ormorok.cpp index 215bcc8fdbc..0e26d011d82 100644 --- a/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_ormorok.cpp +++ b/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_ormorok.cpp @@ -120,7 +120,7 @@ struct TRINITY_DLL_DECL boss_ormorokAI : public ScriptedAI return; } if (CrystalSpikes) - if (CRYSTAL_SPIKES_Timer < diff) + if (CRYSTAL_SPIKES_Timer <= diff) { SpikeXY[0][0] = BaseX+(SPIKE_DISTANCE*CrystalSpikes_Count*cos(BaseO)); SpikeXY[0][1] = BaseY+(SPIKE_DISTANCE*CrystalSpikes_Count*sin(BaseO)); @@ -135,7 +135,7 @@ struct TRINITY_DLL_DECL boss_ormorokAI : public ScriptedAI if (++CrystalSpikes_Count >= 13) CrystalSpikes = false; CRYSTAL_SPIKES_Timer = 200; - }else CRYSTAL_SPIKES_Timer -= diff; + } else CRYSTAL_SPIKES_Timer -= diff; if (!Frenzy && (m_creature->GetHealth() < m_creature->GetMaxHealth() * 0.25)) { @@ -143,20 +143,20 @@ struct TRINITY_DLL_DECL boss_ormorokAI : public ScriptedAI Frenzy = true; } - if (SPELL_TRAMPLE_Timer < diff) + if (SPELL_TRAMPLE_Timer <= diff) { DoCast(m_creature, HEROIC(SPELL_TRAMPLE_N, SPELL_TRAMPLE_H)); SPELL_TRAMPLE_Timer = 10000; - }else SPELL_TRAMPLE_Timer -= diff; + } else SPELL_TRAMPLE_Timer -= diff; - if (SPELL_SPELL_REFLECTION_Timer < diff) + if (SPELL_SPELL_REFLECTION_Timer <= diff) { DoScriptText(SAY_REFLECT, m_creature); DoCast(m_creature, SPELL_SPELL_REFLECTION); SPELL_SPELL_REFLECTION_Timer = 30000; - }else SPELL_SPELL_REFLECTION_Timer -= diff; + } else SPELL_SPELL_REFLECTION_Timer -= diff; - if (SPELL_CRYSTAL_SPIKES_Timer < diff) + if (SPELL_CRYSTAL_SPIKES_Timer <= diff) { DoScriptText(SAY_CRYSTAL_SPIKES, m_creature); CrystalSpikes = true; @@ -167,14 +167,14 @@ struct TRINITY_DLL_DECL boss_ormorokAI : public ScriptedAI BaseZ = m_creature->GetPositionZ(); BaseO = m_creature->GetOrientation(); SPELL_CRYSTAL_SPIKES_Timer = 20000; - }else SPELL_CRYSTAL_SPIKES_Timer -=diff; + } else SPELL_CRYSTAL_SPIKES_Timer -=diff; - if (HeroicMode && (SPELL_SUMMON_CRYSTALLINE_TANGLER_Timer < diff)) + if (HeroicMode && (SPELL_SUMMON_CRYSTALLINE_TANGLER_Timer <= diff)) { Creature* Crystalline_Tangler = m_creature->SummonCreature(MOB_CRYSTALLINE_TANGLER, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), m_creature->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000); if (Crystalline_Tangler) { - Unit* target = NULL; + Unit *pTarget = NULL; uint8 Healer = 0; for (uint8 j = 1; j<=4; j++) { @@ -191,23 +191,23 @@ struct TRINITY_DLL_DECL boss_ormorokAI : public ScriptedAI Unit* pTemp = Unit::GetUnit((*m_creature),(*i)->getUnitGuid()); if (pTemp && pTemp->GetTypeId() == TYPEID_PLAYER && pTemp->getClass() == Healer) { - target = pTemp; + pTarget = pTemp; break; } } - if (target) + if (pTarget) break; } - if (!target) - target = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (target) + if (!pTarget) + pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + if (pTarget) { - Crystalline_Tangler->AI()->AttackStart(target); - Crystalline_Tangler->getThreatManager().addThreat(target, 1000000000.0f); + Crystalline_Tangler->AI()->AttackStart(pTarget); + Crystalline_Tangler->getThreatManager().addThreat(pTarget, 1000000000.0f); } } SPELL_SUMMON_CRYSTALLINE_TANGLER_Timer = 17000; - }else SPELL_SUMMON_CRYSTALLINE_TANGLER_Timer -=diff; + } else SPELL_SUMMON_CRYSTALLINE_TANGLER_Timer -=diff; DoMeleeAttackIfReady(); } @@ -237,17 +237,17 @@ struct TRINITY_DLL_DECL mob_crystal_spikeAI : public Scripted_NoMovementAI void UpdateAI(const uint32 diff) { - if (SPELL_CRYSTAL_SPIKE_PREVISUAL_Timer < diff) + if (SPELL_CRYSTAL_SPIKE_PREVISUAL_Timer <= diff) { DoCast(m_creature, SPELL_CRYSTAL_SPIKE_PREVISUAL); SPELL_CRYSTAL_SPIKE_PREVISUAL_Timer = 10000; - }else SPELL_CRYSTAL_SPIKE_PREVISUAL_Timer -=diff; + } else SPELL_CRYSTAL_SPIKE_PREVISUAL_Timer -=diff; - if (SPELL_CRYSTALL_SPIKE_DAMAGE_Timer < diff) + if (SPELL_CRYSTALL_SPIKE_DAMAGE_Timer <= diff) { DoCast(m_creature, HEROIC(SPELL_CRYSTALL_SPIKE_DAMAGE_N, SPELL_CRYSTALL_SPIKE_DAMAGE_H)); SPELL_CRYSTALL_SPIKE_DAMAGE_Timer = 10000; - }else SPELL_CRYSTALL_SPIKE_DAMAGE_Timer -=diff; + } else SPELL_CRYSTALL_SPIKE_DAMAGE_Timer -=diff; } }; @@ -264,14 +264,14 @@ struct TRINITY_DLL_DECL mob_crystalline_tanglerAI : public ScriptedAI void UpdateAI(const uint32 diff) { - if (SPELL_ROOTS_Timer < diff) + if (SPELL_ROOTS_Timer <= diff) { if (m_creature->IsWithinDist(m_creature->getVictim(), 5.0f, false)) { DoCast(m_creature->getVictim(), SPELL_ROOTS); SPELL_ROOTS_Timer = 15000; } - }else SPELL_ROOTS_Timer -=diff; + } else SPELL_ROOTS_Timer -=diff; } }; diff --git a/src/bindings/scripts/scripts/northrend/nexus/oculus/boss_eregos.cpp b/src/bindings/scripts/scripts/northrend/nexus/oculus/boss_eregos.cpp index f2dbe406331..e75756edce6 100644 --- a/src/bindings/scripts/scripts/northrend/nexus/oculus/boss_eregos.cpp +++ b/src/bindings/scripts/scripts/northrend/nexus/oculus/boss_eregos.cpp @@ -53,7 +53,7 @@ enum AmberDrake SPELL_AMBER_SHOCK_LANCE = 49840, //(60 yds) - Instant - Deals 4822 to 5602 Arcane damage and detonates all Shock Charges on an enemy dragon. Damage is increased by 6525 for each detonated. // SPELL_AMBER_STOP_TIME //Instant - 1 min cooldown - Halts the passage of time, freezing all enemy dragons in place for 10 sec. This attack applies 5 Shock Charges to each affected target. //you do not have access to until you kill the Mage-Lord Urom. - SPELL_AMBER_TEMPORAL_RIFT = 49592 //(60 yds) - Channeled - Channels a temporal rift on an enemy dragon for 10 sec. While trapped in the rift, all damage done to the target is increased by 100%. In addition, for every 15,000 damage done to a target affected by Temporal Rift, 1 Shock Charge is generated. + SPELL_AMBER_TEMPORAL_RIFT = 49592 //(60 yds) - Channeled - Channels a temporal rift on an enemy dragon for 10 sec. While trapped in the rift, all damage done to the pTarget is increased by 100%. In addition, for every 15,000 damage done to a pTarget affected by Temporal Rift, 1 Shock Charge is generated. }; /*Emerald Drake, (npc 27692) (item 37815), diff --git a/src/bindings/scripts/scripts/northrend/nexus/oculus/boss_urom.cpp b/src/bindings/scripts/scripts/northrend/nexus/oculus/boss_urom.cpp index ba382c4a6e1..5c36b028e6e 100644 --- a/src/bindings/scripts/scripts/northrend/nexus/oculus/boss_urom.cpp +++ b/src/bindings/scripts/scripts/northrend/nexus/oculus/boss_urom.cpp @@ -17,12 +17,12 @@ enum Spells SPELL_ARCANE_SHIELD = 53813, //Dummy --> Channeled, shields the caster from damage. SPELL_EMPOWERED_ARCANE_EXPLOSION = 51110, SPELL_EMPOWERED_ARCANE_EXPLOSION_2 = 59377, - SPELL_FROSTBOMB = 51103, //Urom throws a bomb, hitting its target with the highest aggro which inflict directly 650 frost damage and drops a frost zone on the ground. This zone deals 650 frost damage per second and reduce the movement speed by 35%. Lasts 1 minute. + SPELL_FROSTBOMB = 51103, //Urom throws a bomb, hitting its pTarget with the highest aggro which inflict directly 650 frost damage and drops a frost zone on the ground. This zone deals 650 frost damage per second and reduce the movement speed by 35%. Lasts 1 minute. SPELL_SUMMON_MENAGERIE = 50476, //Summons an assortment of creatures and teleports the caster to safety. SPELL_SUMMON_MENAGERIE_2 = 50495, SPELL_SUMMON_MENAGERIE_3 = 50496, SPELL_TELEPORT = 51112, //Teleports to the center of Oculus - SPELL_TIME_BOMB = 51121, //Deals arcane damage to a random player, and after 6 seconds, deals zone damage to nearby equal to the health missing of the target afflicted by the debuff. + SPELL_TIME_BOMB = 51121, //Deals arcane damage to a random player, and after 6 seconds, deals zone damage to nearby equal to the health missing of the pTarget afflicted by the debuff. SPELL_TIME_BOMB_2 = 59376 }; //not in db diff --git a/src/bindings/scripts/scripts/northrend/obsidian_sanctum/boss_sartharion.cpp b/src/bindings/scripts/scripts/northrend/obsidian_sanctum/boss_sartharion.cpp index 1ec27f1cbd7..844739ab771 100644 --- a/src/bindings/scripts/scripts/northrend/obsidian_sanctum/boss_sartharion.cpp +++ b/src/bindings/scripts/scripts/northrend/obsidian_sanctum/boss_sartharion.cpp @@ -353,7 +353,7 @@ struct TRINITY_DLL_DECL boss_sartharionAI : public ScriptedAI Unit* pShad = Unit::GetUnit(*m_creature, pInstance ? pInstance->GetData64(DATA_SHADRON) : 0); Unit* pVesp = Unit::GetUnit(*m_creature, pInstance ? pInstance->GetData64(DATA_VESPERON) : 0); - //spell will target dragons, if they are still alive at 35% + //spell will pTarget dragons, if they are still alive at 35% if (!m_bIsBerserk && (m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) <= 35 && ((pTene && pTene->isAlive()) || (pShad && pShad->isAlive()) || (pVesp && pVesp->isAlive()))) { @@ -372,7 +372,7 @@ struct TRINITY_DLL_DECL boss_sartharionAI : public ScriptedAI // hard enrage if (!m_bIsHardEnraged) { - if (m_uiEnrageTimer < uiDiff) + if (m_uiEnrageTimer <= uiDiff) { DoCast(m_creature, SPELL_PYROBUFFET, true); m_bIsHardEnraged = true; @@ -382,7 +382,7 @@ struct TRINITY_DLL_DECL boss_sartharionAI : public ScriptedAI } // flame tsunami - if (m_uiFlameTsunamiTimer < uiDiff) + if (m_uiFlameTsunamiTimer <= uiDiff) { SendFlameTsunami(); m_uiFlameTsunamiTimer = 30000; @@ -391,7 +391,7 @@ struct TRINITY_DLL_DECL boss_sartharionAI : public ScriptedAI m_uiFlameTsunamiTimer -= uiDiff; // flame breath - if (m_uiFlameBreathTimer < uiDiff) + if (m_uiFlameBreathTimer <= uiDiff) { DoScriptText(SAY_SARTHARION_BREATH, m_creature); DoCast(m_creature->getVictim(), HEROIC(SPELL_FLAME_BREATH, SPELL_FLAME_BREATH_H)); @@ -401,7 +401,7 @@ struct TRINITY_DLL_DECL boss_sartharionAI : public ScriptedAI m_uiFlameBreathTimer -= uiDiff; // Tail Sweep - if (m_uiTailSweepTimer < uiDiff) + if (m_uiTailSweepTimer <= uiDiff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_TAIL_LASH, SPELL_TAIL_LASH_H)); m_uiTailSweepTimer = urand(15000,20000); @@ -410,7 +410,7 @@ struct TRINITY_DLL_DECL boss_sartharionAI : public ScriptedAI m_uiTailSweepTimer -= uiDiff; // Cleave - if (m_uiCleaveTimer < uiDiff) + if (m_uiCleaveTimer <= uiDiff) { DoCast(m_creature->getVictim(), SPELL_CLEAVE); m_uiCleaveTimer = urand(7000,10000); @@ -419,7 +419,7 @@ struct TRINITY_DLL_DECL boss_sartharionAI : public ScriptedAI m_uiCleaveTimer -= uiDiff; // Lavas Strike - if (m_uiLavaStrikeTimer < uiDiff) + if (m_uiLavaStrikeTimer <= uiDiff) { if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) { @@ -434,7 +434,7 @@ struct TRINITY_DLL_DECL boss_sartharionAI : public ScriptedAI m_uiLavaStrikeTimer -= uiDiff; // call tenebron - if (!m_bHasCalledTenebron && m_uiTenebronTimer < uiDiff) + if (!m_bHasCalledTenebron && m_uiTenebronTimer <= uiDiff) { CallDragon(DATA_TENEBRON); m_bHasCalledTenebron = true; @@ -443,7 +443,7 @@ struct TRINITY_DLL_DECL boss_sartharionAI : public ScriptedAI m_uiTenebronTimer -= uiDiff; // call shadron - if (!m_bHasCalledShadron && m_uiShadronTimer < uiDiff) + if (!m_bHasCalledShadron && m_uiShadronTimer <= uiDiff) { CallDragon(DATA_SHADRON); m_bHasCalledShadron = true; @@ -452,7 +452,7 @@ struct TRINITY_DLL_DECL boss_sartharionAI : public ScriptedAI m_uiShadronTimer -= uiDiff; // call vesperon - if (!m_bHasCalledVesperon && m_uiVesperonTimer < uiDiff) + if (!m_bHasCalledVesperon && m_uiVesperonTimer <= uiDiff) { CallDragon(DATA_VESPERON); m_bHasCalledVesperon = true; @@ -664,7 +664,7 @@ struct TRINITY_DLL_DECL dummy_dragonAI : public ScriptedAI { if (m_bCanMoveFree && m_uiMoveNextTimer) { - if (m_uiMoveNextTimer < uiDiff) + if (m_uiMoveNextTimer <= uiDiff) { if(m_uiWaypointId < MAX_WAYPOINT) m_creature->GetMotionMaster()->MovePoint(m_uiWaypointId, @@ -712,7 +712,7 @@ struct TRINITY_DLL_DECL mob_tenebronAI : public dummy_dragonAI void UpdateAI(const uint32 uiDiff) { - //if no target, update dummy and return + //if no pTarget, update dummy and return if (!UpdateVictim()) { dummy_dragonAI::UpdateAI(uiDiff); @@ -720,7 +720,7 @@ struct TRINITY_DLL_DECL mob_tenebronAI : public dummy_dragonAI } // shadow fissure - if (m_uiShadowFissureTimer < uiDiff) + if (m_uiShadowFissureTimer <= uiDiff) { if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, HEROIC(SPELL_SHADOW_FISSURE, SPELL_SHADOW_FISSURE)); @@ -731,7 +731,7 @@ struct TRINITY_DLL_DECL mob_tenebronAI : public dummy_dragonAI m_uiShadowFissureTimer -= uiDiff; // shadow breath - if (m_uiShadowBreathTimer < uiDiff) + if (m_uiShadowBreathTimer <= uiDiff) { DoScriptText(SAY_TENEBRON_BREATH, m_creature); DoCast(m_creature->getVictim(), HEROIC(SPELL_SHADOW_BREATH, SPELL_SHADOW_BREATH_H)); @@ -788,7 +788,7 @@ struct TRINITY_DLL_DECL mob_shadronAI : public dummy_dragonAI void UpdateAI(const uint32 uiDiff) { - //if no target, update dummy and return + //if no pTarget, update dummy and return if (!UpdateVictim()) { dummy_dragonAI::UpdateAI(uiDiff); @@ -796,7 +796,7 @@ struct TRINITY_DLL_DECL mob_shadronAI : public dummy_dragonAI } // shadow fissure - if (m_uiShadowFissureTimer < uiDiff) + if (m_uiShadowFissureTimer <= uiDiff) { if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, HEROIC(SPELL_SHADOW_FISSURE, SPELL_SHADOW_FISSURE_H)); @@ -807,7 +807,7 @@ struct TRINITY_DLL_DECL mob_shadronAI : public dummy_dragonAI m_uiShadowFissureTimer -= uiDiff; // shadow breath - if (m_uiShadowBreathTimer < uiDiff) + if (m_uiShadowBreathTimer <= uiDiff) { DoScriptText(SAY_SHADRON_BREATH, m_creature); DoCast(m_creature->getVictim(), HEROIC(SPELL_SHADOW_BREATH, SPELL_SHADOW_BREATH_H)); @@ -858,7 +858,7 @@ struct TRINITY_DLL_DECL mob_vesperonAI : public dummy_dragonAI void UpdateAI(const uint32 uiDiff) { - //if no target, update dummy and return + //if no pTarget, update dummy and return if (!UpdateVictim()) { dummy_dragonAI::UpdateAI(uiDiff); @@ -866,7 +866,7 @@ struct TRINITY_DLL_DECL mob_vesperonAI : public dummy_dragonAI } // shadow fissure - if (m_uiShadowFissureTimer < uiDiff) + if (m_uiShadowFissureTimer <= uiDiff) { if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, HEROIC(SPELL_SHADOW_FISSURE, SPELL_SHADOW_FISSURE_H)); @@ -877,7 +877,7 @@ struct TRINITY_DLL_DECL mob_vesperonAI : public dummy_dragonAI m_uiShadowFissureTimer -= uiDiff; // shadow breath - if (m_uiShadowBreathTimer < uiDiff) + if (m_uiShadowBreathTimer <= uiDiff) { DoScriptText(SAY_VESPERON_BREATH, m_creature); DoCast(m_creature->getVictim(), HEROIC(SPELL_SHADOW_BREATH, SPELL_SHADOW_BREATH_H)); @@ -1049,7 +1049,7 @@ struct TRINITY_DLL_DECL mob_twilight_whelpAI : public ScriptedAI return; // twilight torment - if (m_uiFadeArmorTimer < uiDiff) + if (m_uiFadeArmorTimer <= uiDiff) { DoCast(m_creature->getVictim(), SPELL_FADE_ARMOR); m_uiFadeArmorTimer = urand(5000,10000); diff --git a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_bjarngrim.cpp b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_bjarngrim.cpp index b35a5eeafe5..cdbbdee0047 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_bjarngrim.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_bjarngrim.cpp @@ -205,7 +205,7 @@ struct TRINITY_DLL_DECL boss_bjarngrimAI : public ScriptedAI return; // Change stance - if (m_uiChangeStance_Timer < uiDiff) + if (m_uiChangeStance_Timer <= uiDiff) { //wait for current spell to finish before change stance if (m_creature->IsNonMeleeSpellCasted(false)) @@ -252,7 +252,7 @@ struct TRINITY_DLL_DECL boss_bjarngrimAI : public ScriptedAI { case STANCE_DEFENSIVE: { - if (m_uiReflection_Timer < uiDiff) + if (m_uiReflection_Timer <= uiDiff) { DoCast(m_creature, SPELL_SPELL_REFLECTION); m_uiReflection_Timer = 8000 + rand()%1000; @@ -260,7 +260,7 @@ struct TRINITY_DLL_DECL boss_bjarngrimAI : public ScriptedAI else m_uiReflection_Timer -= uiDiff; - if (m_uiKnockAway_Timer < uiDiff) + if (m_uiKnockAway_Timer <= uiDiff) { DoCast(m_creature, SPELL_KNOCK_AWAY); m_uiKnockAway_Timer = 20000 + rand()%1000; @@ -268,7 +268,7 @@ struct TRINITY_DLL_DECL boss_bjarngrimAI : public ScriptedAI else m_uiKnockAway_Timer -= uiDiff; - if (m_uiPummel_Timer < uiDiff) + if (m_uiPummel_Timer <= uiDiff) { DoCast(m_creature->getVictim(), SPELL_PUMMEL); m_uiPummel_Timer = 10000 + rand()%1000; @@ -276,7 +276,7 @@ struct TRINITY_DLL_DECL boss_bjarngrimAI : public ScriptedAI else m_uiPummel_Timer -= uiDiff; - if (m_uiIronform_Timer < uiDiff) + if (m_uiIronform_Timer <= uiDiff) { DoCast(m_creature, SPELL_IRONFORM); m_uiIronform_Timer = 25000 + rand()%1000; @@ -288,16 +288,16 @@ struct TRINITY_DLL_DECL boss_bjarngrimAI : public ScriptedAI } case STANCE_BERSERKER: { - if (m_uiIntercept_Timer < uiDiff) + if (m_uiIntercept_Timer <= uiDiff) { - //not much point is this, better random target and more often? + //not much point is this, better random pTarget and more often? DoCast(m_creature->getVictim(), SPELL_INTERCEPT); m_uiIntercept_Timer = 45000 + rand()%1000; } else m_uiIntercept_Timer -= uiDiff; - if (m_uiWhirlwind_Timer < uiDiff) + if (m_uiWhirlwind_Timer <= uiDiff) { DoCast(m_creature, SPELL_WHIRLWIND); m_uiWhirlwind_Timer = 10000 + rand()%1000; @@ -305,7 +305,7 @@ struct TRINITY_DLL_DECL boss_bjarngrimAI : public ScriptedAI else m_uiWhirlwind_Timer -= uiDiff; - if (m_uiCleave_Timer < uiDiff) + if (m_uiCleave_Timer <= uiDiff) { DoCast(m_creature->getVictim(), SPELL_CLEAVE); m_uiCleave_Timer = 8000 + rand()%1000; @@ -317,7 +317,7 @@ struct TRINITY_DLL_DECL boss_bjarngrimAI : public ScriptedAI } case STANCE_BATTLE: { - if (m_uiMortalStrike_Timer < uiDiff) + if (m_uiMortalStrike_Timer <= uiDiff) { DoCast(m_creature->getVictim(), SPELL_MORTAL_STRIKE); m_uiMortalStrike_Timer = 20000 + rand()%1000; @@ -325,7 +325,7 @@ struct TRINITY_DLL_DECL boss_bjarngrimAI : public ScriptedAI else m_uiMortalStrike_Timer -= uiDiff; - if (m_uiSlam_Timer < uiDiff) + if (m_uiSlam_Timer <= uiDiff) { DoCast(m_creature->getVictim(), SPELL_SLAM); m_uiSlam_Timer = 15000 + rand()%1000; @@ -383,7 +383,7 @@ struct TRINITY_DLL_DECL mob_stormforged_lieutenantAI : public ScriptedAI if (!UpdateVictim()) return; - if (m_uiArcWeld_Timer < uiDiff) + if (m_uiArcWeld_Timer <= uiDiff) { DoCast(m_creature->getVictim(), SPELL_ARC_WELD); m_uiArcWeld_Timer = 20000 + rand()%1000; @@ -391,7 +391,7 @@ struct TRINITY_DLL_DECL mob_stormforged_lieutenantAI : public ScriptedAI else m_uiArcWeld_Timer -= uiDiff; - if (m_uiRenewSteel_Timer < uiDiff) + if (m_uiRenewSteel_Timer <= uiDiff) { if (m_pInstance) { diff --git a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp index 62d2bc1d3dd..3b37fb87f6b 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp @@ -217,7 +217,7 @@ struct TRINITY_DLL_DECL boss_ionarAI : public ScriptedAI return; }*/ - if (m_uiSplit_Timer < uiDiff) + if (m_uiSplit_Timer <= uiDiff) { m_uiSplit_Timer = 2500; @@ -256,7 +256,7 @@ struct TRINITY_DLL_DECL boss_ionarAI : public ScriptedAI if (!UpdateVictim()) return; - if (m_uiStaticOverload_Timer < uiDiff) + if (m_uiStaticOverload_Timer <= uiDiff) { if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, HEROIC(SPELL_STATIC_OVERLOAD_N,SPELL_STATIC_OVERLOAD_H)); @@ -266,7 +266,7 @@ struct TRINITY_DLL_DECL boss_ionarAI : public ScriptedAI else m_uiStaticOverload_Timer -= uiDiff; - if (m_uiBallLightning_Timer < uiDiff) + if (m_uiBallLightning_Timer <= uiDiff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_BALL_LIGHTNING_N,SPELL_BALL_LIGHTNING_H)); m_uiBallLightning_Timer = 10000 + rand()%1000; diff --git a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_loken.cpp b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_loken.cpp index 0520b56f670..ebf6dcd9b43 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_loken.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_loken.cpp @@ -144,7 +144,7 @@ struct TRINITY_DLL_DECL boss_lokenAI : public ScriptedAI if (m_bIsAura) { // workaround for PULSING_SHOCKWAVE - if (m_uiPulsingShockwave_Timer < uiDiff) + if (m_uiPulsingShockwave_Timer <= uiDiff) { Map* pMap = m_creature->GetMap(); if (pMap->IsDungeon()) @@ -169,11 +169,11 @@ struct TRINITY_DLL_DECL boss_lokenAI : public ScriptedAI } } m_uiPulsingShockwave_Timer = 2000; - }else m_uiPulsingShockwave_Timer -= uiDiff; + } else m_uiPulsingShockwave_Timer -= uiDiff; } else { - if (m_uiResumePulsingShockwave_Timer < uiDiff) + if (m_uiResumePulsingShockwave_Timer <= uiDiff) { //breaks at movement, can we assume when it's time, this spell is casted and also must stop movement? m_creature->CastSpell(m_creature, SPELL_PULSING_SHOCKWAVE_AURA, true); @@ -186,7 +186,7 @@ struct TRINITY_DLL_DECL boss_lokenAI : public ScriptedAI m_uiResumePulsingShockwave_Timer -= uiDiff; } - if (m_uiArcLightning_Timer < uiDiff) + if (m_uiArcLightning_Timer <= uiDiff) { if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_ARC_LIGHTNING); @@ -196,7 +196,7 @@ struct TRINITY_DLL_DECL boss_lokenAI : public ScriptedAI else m_uiArcLightning_Timer -= uiDiff; - if (m_uiLightningNova_Timer < uiDiff) + if (m_uiLightningNova_Timer <= uiDiff) { DoScriptText(RAND(SAY_NOVA_1,SAY_NOVA_2,SAY_NOVA_3), m_creature); DoScriptText(EMOTE_NOVA, m_creature); diff --git a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp index 8c506ef7dac..c8e5819271f 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp @@ -230,7 +230,7 @@ struct TRINITY_DLL_DECL boss_volkhanAI : public ScriptedAI if (m_bIsStriking) { - if (m_uiPause_Timer < uiDiff) + if (m_uiPause_Timer <= uiDiff) { if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() != TARGETED_MOTION_TYPE) { @@ -251,7 +251,7 @@ struct TRINITY_DLL_DECL boss_volkhanAI : public ScriptedAI // When to start shatter? After 60, 40 or 20% hp? if (!m_bHasTemper && m_uiHealthAmountModifier >= 3) { - if (m_uiShatteringStomp_Timer < uiDiff) + if (m_uiShatteringStomp_Timer <= uiDiff) { //should he stomp even if he has no brittle golem to shatter? @@ -271,7 +271,7 @@ struct TRINITY_DLL_DECL boss_volkhanAI : public ScriptedAI // Shatter Golems 3 seconds after Shattering Stomp if (m_bCanShatterGolem) { - if (m_uiShatter_Timer < uiDiff) + if (m_uiShatter_Timer <= uiDiff) { ShatterGolem(); m_uiShatter_Timer = 3000; @@ -431,11 +431,11 @@ struct TRINITY_DLL_DECL mob_molten_golemAI : public ScriptedAI void UpdateAI(const uint32 uiDiff) { - //Return since we have no target or if we are frozen + //Return since we have no pTarget or if we are frozen if (!UpdateVictim() || m_bIsFrozen) return; - if (m_uiBlast_Timer < uiDiff) + if (m_uiBlast_Timer <= uiDiff) { DoCast(m_creature, SPELL_BLAST_WAVE); m_uiBlast_Timer = 20000; @@ -443,7 +443,7 @@ struct TRINITY_DLL_DECL mob_molten_golemAI : public ScriptedAI else m_uiBlast_Timer -= uiDiff; - if (m_uiImmolation_Timer < uiDiff) + if (m_uiImmolation_Timer <= uiDiff) { DoCast(m_creature->getVictim(), m_bIsHeroic ? SPELL_IMMOLATION_STRIKE_H : SPELL_IMMOLATION_STRIKE_N); m_uiImmolation_Timer = 5000; 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 dd80a95e979..4e914fa0f13 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 @@ -76,27 +76,27 @@ struct TRINITY_DLL_DECL boss_krystallusAI : public ScriptedAI if (!UpdateVictim()) return; - if (uiBoulderTossTimer < diff) + 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 (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) + if (uiStompTimer <= diff) { DoCast(m_creature, HEROIC(SPELL_STOMP, H_SPELL_STOMP)); uiStompTimer = 20000 + rand()%9000; } else uiStompTimer -= diff; - if (uiGroundSlamTimer < diff) + if (uiGroundSlamTimer <= diff) { DoCast(m_creature, SPELL_GROUND_SLAM); bIsSlam = true; @@ -106,7 +106,7 @@ struct TRINITY_DLL_DECL boss_krystallusAI : public ScriptedAI if (bIsSlam) { - if(uiShatterTimer < diff) + if (uiShatterTimer <= diff) { DoCast(m_creature, HEROIC(SPELL_SHATTER, H_SPELL_SHATTER)); bIsSlam = false; 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 9315d56dffa..0104e61b9db 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 @@ -89,42 +89,42 @@ struct TRINITY_DLL_DECL boss_maiden_of_griefAI : public ScriptedAI if(IsHeroic) { - if (PartingSorrowTimer < diff) + if (PartingSorrowTimer <= diff) { - Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0); + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); - if(target) - DoCast(target,SPELL_PARTING_SORROW); + if(pTarget) + DoCast(pTarget,SPELL_PARTING_SORROW); PartingSorrowTimer = 30000 + rand()%10000; - }else PartingSorrowTimer -= diff; + } else PartingSorrowTimer -= diff; } - if (StormOfGriefTimer < diff) + if (StormOfGriefTimer <= diff) { DoCast(m_creature->getVictim(),IsHeroic ? SPELL_STORM_OF_GRIEF_H : SPELL_STORM_OF_GRIEF_N, true); StormOfGriefTimer = 15000 + rand()%5000; - }else StormOfGriefTimer -= diff; + } else StormOfGriefTimer -= diff; - if (ShockOfSorrowTimer < diff) + if (ShockOfSorrowTimer <= diff) { DoResetThreat(); DoScriptText(SAY_STUN, m_creature); DoCast(m_creature,IsHeroic ? SPELL_SHOCK_OF_SORROW_H : SPELL_SHOCK_OF_SORROW_N); ShockOfSorrowTimer = 20000 + rand()%10000; - }else ShockOfSorrowTimer -= diff; + } else ShockOfSorrowTimer -= diff; - if (PillarOfWoeTimer < diff) + if (PillarOfWoeTimer <= diff) { - Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 1); + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 1); - if(target) - DoCast(target,IsHeroic ? SPELL_PILLAR_OF_WOE_H : SPELL_PILLAR_OF_WOE_N); + if(pTarget) + DoCast(pTarget,IsHeroic ? SPELL_PILLAR_OF_WOE_H : SPELL_PILLAR_OF_WOE_N); else DoCast(m_creature->getVictim(),IsHeroic ? SPELL_PILLAR_OF_WOE_H : SPELL_PILLAR_OF_WOE_N); PillarOfWoeTimer = 5000 + rand()%20000; - }else PillarOfWoeTimer -= diff; + } else PillarOfWoeTimer -= diff; DoMeleeAttackIfReady(); } 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 b9f646cbce3..afcf5f85580 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 @@ -118,26 +118,26 @@ struct TRINITY_DLL_DECL boss_sjonnirAI : public ScriptedAI if (!UpdateVictim()) return; - if (uiChainLightningTimer < diff) + 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) + if (uiLightningShieldTimer <= diff) { DoCast(m_creature, HEROIC(SPELL_LIGHTING_SHIELD, H_SPELL_LIGHTING_SHIELD)); uiLightningShieldTimer -= diff; } - if (uiStaticChargeTimer < 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 (uiLightningRingTimer <= diff) { if (m_creature->IsNonMeleeSpellCasted(false)) m_creature->InterruptNonMeleeSpells(false); @@ -145,7 +145,7 @@ struct TRINITY_DLL_DECL boss_sjonnirAI : public ScriptedAI uiLightningRingTimer = 30000 + rand()%5000; } else uiLightningRingTimer -= diff; - if (uiSummonTimer < diff) + if (uiSummonTimer <= diff) { uint32 uiSummonPipe = rand()%2; m_creature->SummonCreature(uiEncounterTimer > DATA_TIME_BEFORE_OOZE ? CREATURE_MALFORMED_OOZE : @@ -157,7 +157,7 @@ struct TRINITY_DLL_DECL boss_sjonnirAI : public ScriptedAI if (!bIsFrenzy) { - if (uiFrenzyTimer < diff) + if (uiFrenzyTimer <= diff) { DoCast(m_creature, SPELL_FRENZY); bIsFrenzy = true; @@ -234,7 +234,7 @@ struct TRINITY_DLL_DECL mob_malformed_oozeAI : public ScriptedAI { if (bIsMerging) { - if (uiMergeTimer < diff) + if (uiMergeTimer <= diff) { if (Creature* pTemp = m_creature->FindNearestCreature(CREATURE_MALFORMED_OOZE, 1.0f, true)) { diff --git a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp index ded58f8d5c0..42fb7f9c055 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp @@ -179,7 +179,7 @@ struct TRINITY_DLL_DECL mob_tribuna_controllerAI : public ScriptedAI { if(bKaddrakActivated) { - if (uiKaddrakEncounterTimer < diff) + if (uiKaddrakEncounterTimer <= diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) if (!lKaddrakGUIDList.empty()) @@ -191,7 +191,7 @@ struct TRINITY_DLL_DECL mob_tribuna_controllerAI : public ScriptedAI } if (bMarnakActivated) { - if (uiMarnakEncounterTimer < diff) + if (uiMarnakEncounterTimer <= diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { @@ -207,7 +207,7 @@ struct TRINITY_DLL_DECL mob_tribuna_controllerAI : public ScriptedAI } if (bAbedneumActivated) { - if (uiAbedneumEncounterTimer < diff) + if (uiAbedneumEncounterTimer <= diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { @@ -281,7 +281,7 @@ struct TRINITY_DLL_DECL npc_brann_hosAI : public npc_escortAI { if (!pCreature->isAlive()) pCreature->Respawn(); - ((mob_tribuna_controllerAI*)pCreature->AI())->UpdateFacesList(); + CAST_AI(mob_tribuna_controllerAI, pCreature->AI())->UpdateFacesList(); uiControllerGUID = pCreature->GetGUID(); } break; @@ -350,7 +350,7 @@ struct TRINITY_DLL_DECL npc_brann_hosAI : public npc_escortAI void UpdateEscortAI(const uint32 uiDiff) { - if (uiPhaseTimer < uiDiff) + if (uiPhaseTimer <= uiDiff) { switch(uiStep) { @@ -390,7 +390,7 @@ struct TRINITY_DLL_DECL npc_brann_hosAI : public npc_escortAI if (pInstance) pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_KADDRAK),true); if (Creature* pTemp = Unit::GetCreature(*m_creature, uiControllerGUID)) - ((mob_tribuna_controllerAI*)pTemp->AI())->bKaddrakActivated = true; + CAST_AI(mob_tribuna_controllerAI, pTemp->AI())->bKaddrakActivated = true; JumpToNextStep(5000); break; case 9: @@ -413,7 +413,7 @@ struct TRINITY_DLL_DECL npc_brann_hosAI : public npc_escortAI if (pInstance) pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_MARNAK),true); if (Creature* pTemp = Unit::GetCreature(*m_creature, uiControllerGUID)) - ((mob_tribuna_controllerAI*)pTemp->AI())->bMarnakActivated = true; + CAST_AI(mob_tribuna_controllerAI, pTemp->AI())->bMarnakActivated = true; JumpToNextStep(10000); break; case 13: @@ -445,7 +445,7 @@ struct TRINITY_DLL_DECL npc_brann_hosAI : public npc_escortAI if (pInstance) pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_ABEDNEUM),true); if (Creature* pTemp = Unit::GetCreature(*m_creature, uiControllerGUID)) - ((mob_tribuna_controllerAI*)pTemp->AI())->bAbedneumActivated = true; + CAST_AI(mob_tribuna_controllerAI, pTemp->AI())->bAbedneumActivated = true; JumpToNextStep(5000); break; case 19: @@ -652,7 +652,7 @@ bool GossipSelect_npc_brann_hos(Player* pPlayer, Creature* pCreature, uint32 uiS if (uiAction == GOSSIP_ACTION_INFO_DEF+1 || uiAction == GOSSIP_ACTION_INFO_DEF+2) { pPlayer->CLOSE_GOSSIP_MENU(); - ((npc_brann_hosAI*)pCreature->AI())->StartWP(); + CAST_AI(npc_brann_hosAI, pCreature->AI())->StartWP(); } return true; diff --git a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_assembly_of_iron.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_assembly_of_iron.cpp index 9a11315726b..35481640c55 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_assembly_of_iron.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_assembly_of_iron.cpp @@ -19,7 +19,7 @@ /* ScriptData SDName: Assembly of Iron encounter SD%Complete: 60% -SDComment: Runes need DB support, chain lightning won't cast, supercharge won't cast (target error?) - it worked before during debugging. +SDComment: Runes need DB support, chain lightning won't cast, supercharge won't cast (pTarget error?) - it worked before during debugging. SDCategory: Ulduar - Ulduar EndScriptData */ @@ -205,8 +205,8 @@ struct TRINITY_DLL_DECL boss_steelbreakerAI : public ScriptedAI break; case EVENT_STATIC_DISRUPTION: { - Unit *target = SelectTarget(SELECT_TARGET_RANDOM); - DoCast(target, HEROIC(SPELL_STATIC_DISRUPTION_H, SPELL_STATIC_DISRUPTION)); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM); + DoCast(pTarget, HEROIC(SPELL_STATIC_DISRUPTION_H, SPELL_STATIC_DISRUPTION)); events.ScheduleEvent(EVENT_STATIC_DISRUPTION, 20000 + (rand()%20)*1000); } break; @@ -305,7 +305,7 @@ struct TRINITY_DLL_DECL boss_runemaster_molgeimAI : public ScriptedAI case EVENT_ENRAGE: DoCast(SPELL_BERSERK); break; - case EVENT_RUNE_OF_POWER: // Improve target selection; random alive friendly + case EVENT_RUNE_OF_POWER: // Improve pTarget selection; random alive friendly { Unit *Target = DoSelectLowestHpFriendly(60); if(!Target || (Target && !Target->isAlive())) @@ -320,15 +320,15 @@ struct TRINITY_DLL_DECL boss_runemaster_molgeimAI : public ScriptedAI break; case EVENT_RUNE_OF_DEATH: { - Unit *target = SelectTarget(SELECT_TARGET_RANDOM); - DoCast(target, SPELL_RUNE_OF_DEATH); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM); + DoCast(pTarget, SPELL_RUNE_OF_DEATH); events.ScheduleEvent(EVENT_RUNE_OF_DEATH, 30000+ (rand()%10)*1000); } break; case EVENT_RUNE_OF_SUMMONING: { - Unit *target = SelectTarget(SELECT_TARGET_RANDOM); - DoCast(target, SPELL_RUNE_OF_SUMMONING); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM); + DoCast(pTarget, SPELL_RUNE_OF_SUMMONING); events.ScheduleEvent(EVENT_RUNE_OF_SUMMONING, 20000+(rand()%10)*1000); } break; diff --git a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_auriaya.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_auriaya.cpp index 558d6fbbd31..9338097f5a1 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_auriaya.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_auriaya.cpp @@ -69,14 +69,14 @@ struct TRINITY_DLL_DECL boss_auriaya_AI : public BossAI if (!UpdateVictim()) return; - if (TERRIFYING_SCREECH_Timer < diff) + if (TERRIFYING_SCREECH_Timer <= diff) { DoCast(m_creature,SPELL_TERRIFYING_SCREECH); DoScriptText(SAY_SLAY_1, m_creature); TERRIFYING_SCREECH_Timer = 360000; } else TERRIFYING_SCREECH_Timer -= diff; - if (SONIC_BOOM_Timer < diff) + if (SONIC_BOOM_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_SONIC_BOOM); SONIC_BOOM_Timer = 20000; 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 d19d917011c..dc0ef2a5362 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 @@ -103,10 +103,10 @@ struct TRINITY_DLL_DECL boss_flame_leviathanAI : public BossAI } // TODO: effect 0 and effect 1 may be on different target - void SpellHitTarget(Unit *target, const SpellEntry *spell) + void SpellHitTarget(Unit *pTarget, const SpellEntry *spell) { if (spell->Id == SPELL_PURSUED) - AttackStart(target); + AttackStart(pTarget); } void JustDied(Unit *victim) @@ -154,7 +154,7 @@ struct TRINITY_DLL_DECL boss_flame_leviathanAI : public BossAI UpdateVictim(); // begin to kill other things return; case EVENT_MISSILE: - //TODO: without unittarget no visual effect + //TODO: without unitpTarget no visual effect //DoCastAOE(SPELL_MISSILE_BARRAGE); DoCast(me->getVictim(), SPELL_MISSILE_BARRAGE); events.RepeatEvent(1500); diff --git a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_ignis.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_ignis.cpp index 4dc5f255dca..2835b2a42bb 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_ignis.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_ignis.cpp @@ -71,20 +71,20 @@ struct TRINITY_DLL_DECL boss_ignis_AI : public BossAI m_creature->GetMotionMaster()->MoveTargetedHome(); } - if (FLAME_JETS_Timer < diff) + if (FLAME_JETS_Timer <= diff) { DoCast(m_creature,SPELL_FLAME_JETS); DoScriptText(SAY_SLAY, m_creature); FLAME_JETS_Timer = 25000; } else FLAME_JETS_Timer -= diff; - if (SCORCH_Timer < diff) + if (SCORCH_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_SCORCH); SCORCH_Timer = 20000; } else SCORCH_Timer -= diff; - if (SLAG_POT_Timer < diff) + if (SLAG_POT_Timer <= diff) { DoCast(m_creature,SPELL_SLAG_POT); DoScriptText(SAY_SLAY, m_creature); diff --git a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_razorscale.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_razorscale.cpp index a89c1db76c4..2dd753e6b85 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_razorscale.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_razorscale.cpp @@ -156,34 +156,34 @@ struct TRINITY_DLL_DECL boss_razorscaleAI : public BossAI if (Phase == 1 || Phase == 3) { - if (FlameBreathTimer < diff) + if (FlameBreathTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_FLAMEBREATH); FlameBreathTimer = 15000; } else FlameBreathTimer -= diff; - if (DEVOURINGFLAMETimer < diff) + if (DEVOURINGFLAMETimer <= diff) { - if (Unit *target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - if (!m_creature->HasInArc(M_PI, target)) - DoCast(target, SPELL_DEVOURINGFLAME); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (!m_creature->HasInArc(M_PI, pTarget)) + DoCast(pTarget, SPELL_DEVOURINGFLAME); DEVOURINGFLAMETimer = 10000; } else DEVOURINGFLAMETimer -= diff; - if (FUSEARMORTimer < diff) + if (FUSEARMORTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_FUSEARMOR); FUSEARMORTimer = 10000; } else FUSEARMORTimer -= diff; - if (WingBuffetTimer < diff) + if (WingBuffetTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_WINGBUFFET); WingBuffetTimer = urand(7000,14000); } else WingBuffetTimer -= diff; - if (KnockAwayTimer < diff) + if (KnockAwayTimer <= diff) { if (urand(0,99) < 30) DoCast(m_creature->getVictim(), SPELL_KNOCK_AWAY); @@ -192,7 +192,7 @@ struct TRINITY_DLL_DECL boss_razorscaleAI : public BossAI if (Phase == 3) { - if (BellowingRoarTimer < diff) + if (BellowingRoarTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_BELLOWINGROAR); BellowingRoarTimer = 30000; @@ -209,14 +209,14 @@ struct TRINITY_DLL_DECL boss_razorscaleAI : public BossAI InitialSpawn = false; - if (FireballTimer < diff) + if (FireballTimer <= diff) { DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_FIREBALL); FireballTimer = 18000; } else FireballTimer -= diff; - if (MovementTimer < diff) + if (MovementTimer <= diff) { if (urand(0,99) < 30) { @@ -228,7 +228,7 @@ struct TRINITY_DLL_DECL boss_razorscaleAI : public BossAI MovementTimer = 25000; } else MovementTimer -= diff; - if (SummonAddsTimer < diff) + if (SummonAddsTimer <= diff) SummonAdds(); else SummonAddsTimer -= diff; } diff --git a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_xt002.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_xt002.cpp index 09bceb1b320..33a8d5edebb 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_xt002.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_xt002.cpp @@ -75,14 +75,14 @@ struct TRINITY_DLL_DECL boss_xt002_AI : public BossAI m_creature->GetMotionMaster()->MoveTargetedHome(); } - if (SEARING_LIGHT_Timer < diff) + if (SEARING_LIGHT_Timer <= diff) { DoCast(m_creature,SPELL_SEARING_LIGHT); DoScriptText(SAY_SLAY, m_creature); SEARING_LIGHT_Timer = 50000; } else SEARING_LIGHT_Timer -= diff; - if (SONIC_BOOM_Timer < diff) + if (SONIC_BOOM_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_SONIC_BOOM); SONIC_BOOM_Timer = 20000; diff --git a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp index 36c041f0116..5cd57ccfcb9 100644 --- a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp +++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp @@ -187,19 +187,19 @@ struct TRINITY_DLL_DECL boss_ingvar_the_plundererAI : public ScriptedAI DoCast(m_creature,SPELL_SUMMON_BANSHEE); // Summons direktly on caster position //DoCast(m_creature,SPELL_SCOURG_RESURRECTION_EFFEKTSPAWN); // Dont needet ? SpawnResTimer = 0; - }else SpawnResTimer -= diff; + } else SpawnResTimer -= diff; return; } // This is used for a spell queue ... the spells should not castet if one spell is already casting if (wait_Timer) - if (wait_Timer < diff) + if (wait_Timer <= diff) { wait_Timer = 0; - }else wait_Timer -= diff; + } else wait_Timer -= diff; - if (Cleave_Timer < diff) + if (Cleave_Timer <= diff) { if (!wait_Timer) { @@ -211,9 +211,9 @@ struct TRINITY_DLL_DECL boss_ingvar_the_plundererAI : public ScriptedAI wait_Timer = 1000; } - }else Cleave_Timer -= diff; + } else Cleave_Timer -= diff; - if (Smash_Timer < diff) + if (Smash_Timer <= diff) { if (!wait_Timer) { @@ -225,35 +225,35 @@ struct TRINITY_DLL_DECL boss_ingvar_the_plundererAI : public ScriptedAI wait_Timer = 5000; } - }else Smash_Timer -= diff; + } else Smash_Timer -= diff; if (!undead) { - if (Enrage_Timer < diff) + if (Enrage_Timer <= diff) { DoCast(m_creature,HEROIC(SPELL_ENRAGE, H_SPELL_ENRAGE)); Enrage_Timer = 10000; - }else Enrage_Timer -= diff; - }else // In Undead form used to summon weapon + } else Enrage_Timer -= diff; + } else // In Undead form used to summon weapon { - if (Enrage_Timer < diff) + if (Enrage_Timer <= diff) { if (!wait_Timer) { - // Spawn target for Axe - Unit* target = SelectUnit(SELECT_TARGET_TOPAGGRO, 1); - if (target) + // Spawn pTarget for Axe + Unit *pTarget = SelectUnit(SELECT_TARGET_TOPAGGRO, 1); + if (pTarget) { - Creature* temp = m_creature->SummonCreature(ENTRY_THROW_TARGET,target->GetPositionX(),target->GetPositionY(),target->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN,2000); + Creature* temp = m_creature->SummonCreature(ENTRY_THROW_TARGET,pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN,2000); DoCast(m_creature,SPELL_SHADOW_AXE_SUMMON); } Enrage_Timer = 30000; } - }else Enrage_Timer -= diff; + } else Enrage_Timer -= diff; } - if (Roar_Timer < diff) + if (Roar_Timer <= diff) { if (!wait_Timer) { @@ -265,7 +265,7 @@ struct TRINITY_DLL_DECL boss_ingvar_the_plundererAI : public ScriptedAI wait_Timer = 5000; } - }else Roar_Timer -= diff; + } else Roar_Timer -= diff; DoMeleeAttackIfReady(); } @@ -362,7 +362,7 @@ struct TRINITY_DLL_DECL mob_annhylde_the_callerAI : public ScriptedAI } Resurect_Timer = 3000; Resurect_Phase = 2; - }else if (Resurect_Phase == 2) + } else if (Resurect_Phase == 2) { Creature* ingvar = Unit::GetCreature(*m_creature, pInstance ? pInstance->GetData64(DATA_INGVAR) : 0); if (ingvar) @@ -379,7 +379,7 @@ struct TRINITY_DLL_DECL mob_annhylde_the_callerAI : public ScriptedAI } } - }else Resurect_Timer -= diff; + } else Resurect_Timer -= diff; } }; @@ -406,12 +406,12 @@ struct TRINITY_DLL_DECL mob_ingvar_throw_dummyAI : public ScriptedAI void Reset() { - Unit* target = m_creature->FindNearestCreature(ENTRY_THROW_TARGET,50); - if (target) + Unit *pTarget = m_creature->FindNearestCreature(ENTRY_THROW_TARGET,50); + if (pTarget) { DoCast(m_creature, HEROIC(SPELL_SHADOW_AXE_DAMAGE, H_SPELL_SHADOW_AXE_DAMAGE)); float x,y,z; - target->GetPosition(x,y,z); + pTarget->GetPosition(x,y,z); m_creature->GetMotionMaster()->MovePoint(0,x,y,z); } Despawn_Timer = 7000; @@ -421,12 +421,12 @@ struct TRINITY_DLL_DECL mob_ingvar_throw_dummyAI : public ScriptedAI void EnterCombat(Unit *who) {} void UpdateAI(const uint32 diff) { - if (Despawn_Timer < diff) + if (Despawn_Timer <= diff) { m_creature->DealDamage(m_creature,m_creature->GetHealth()); m_creature->RemoveCorpse(); Despawn_Timer = 0; - }else Despawn_Timer -= diff; + } else Despawn_Timer -= diff; } }; diff --git a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp index f5c4b268766..1023f128ad5 100644 --- a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp +++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp @@ -184,16 +184,16 @@ struct TRINITY_DLL_DECL boss_kelesethAI : public ScriptedAI if (!UpdateVictim()) return; - if (ShadowboltTimer < diff) + if (ShadowboltTimer <= diff) { - Unit* target = SelectUnit(SELECT_TARGET_TOPAGGRO, 0); - if (target && target->isAlive() && target->GetTypeId() == TYPEID_PLAYER) - m_creature->CastSpell(target, Heroic ? SPELL_SHADOWBOLT_HEROIC : SPELL_SHADOWBOLT, true); + Unit *pTarget = SelectUnit(SELECT_TARGET_TOPAGGRO, 0); + if (pTarget && pTarget->isAlive() && pTarget->GetTypeId() == TYPEID_PLAYER) + m_creature->CastSpell(pTarget, Heroic ? SPELL_SHADOWBOLT_HEROIC : SPELL_SHADOWBOLT, true); ShadowboltTimer = 10000; - }else ShadowboltTimer -= diff; + } else ShadowboltTimer -= diff; if (!Skeletons) - if ((SummonSkeletonsTimer < diff)) + if ((SummonSkeletonsTimer <= diff)) { Creature* Skeleton; DoScriptText(SAY_SKELETONS, m_creature); @@ -209,25 +209,25 @@ struct TRINITY_DLL_DECL boss_kelesethAI : public ScriptedAI } } Skeletons = true; - }else SummonSkeletonsTimer -= diff; + } else SummonSkeletonsTimer -= diff; - if (FrostTombTimer < diff) + if (FrostTombTimer <= diff) { - Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 1); - if (target && target->isAlive() && target->GetTypeId() == TYPEID_PLAYER) + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 1); + if (pTarget && pTarget->isAlive() && pTarget->GetTypeId() == TYPEID_PLAYER) { - //DoCast(target, SPELL_FROST_TOMB_SUMMON, true); - Creature* Chains = m_creature->SummonCreature(CREATURE_FROSTTOMB, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 20000); + //DoCast(pTarget, SPELL_FROST_TOMB_SUMMON, true); + Creature* Chains = m_creature->SummonCreature(CREATURE_FROSTTOMB, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 20000); if (Chains) { - CAST_AI(mob_frost_tombAI, Chains->AI())->SetPrisoner(target); - Chains->CastSpell(target, SPELL_FROST_TOMB, true); + CAST_AI(mob_frost_tombAI, Chains->AI())->SetPrisoner(pTarget); + Chains->CastSpell(pTarget, SPELL_FROST_TOMB, true); DoScriptText(SAY_FROST_TOMB, m_creature); } } FrostTombTimer = 15000; - }else FrostTombTimer -= diff; + } else FrostTombTimer -= diff; DoMeleeAttackIfReady(); } @@ -300,22 +300,22 @@ struct TRINITY_DLL_DECL mob_vrykul_skeletonAI : public ScriptedAI { if (isDead) { - if (Respawn_Time < diff) + if (Respawn_Time <= diff) { Resurrect(); Respawn_Time = 12000; - }else Respawn_Time -= diff; + } else Respawn_Time -= diff; } else { if (!UpdateVictim()) return; - if (Decrepify_Timer < diff) + if (Decrepify_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_DECREPIFY); Decrepify_Timer = 30000; - }else Decrepify_Timer -= diff; + } else Decrepify_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp index bb27b5a71f0..e92194f1d81 100644 --- a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp +++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp @@ -160,7 +160,7 @@ struct TRINITY_DLL_DECL boss_skarvald_the_constructorAI : public ScriptedAI if (!ghost) { if (Check_Timer) - if (Check_Timer < diff) + if (Check_Timer <= diff) { Check_Timer = 5000; Unit* dalronn = Unit::GetUnit(*m_creature, pInstance ? pInstance->GetData64(DATA_DALRONN) : 0); @@ -170,29 +170,29 @@ struct TRINITY_DLL_DECL boss_skarvald_the_constructorAI : public ScriptedAI Response_Timer = 2000; Check_Timer = 0; } - }else Check_Timer -= diff; + } else Check_Timer -= diff; if (Response_Timer) if (Dalronn_isDead) - if (Response_Timer < diff) + if (Response_Timer <= diff) { DoScriptText(YELL_SKARVALD_DAL_DIEDFIRST,m_creature); Response_Timer = 0; - }else Response_Timer -= diff; + } else Response_Timer -= diff; } - if (Charge_Timer < diff) + if (Charge_Timer <= diff) { DoCast(SelectUnit(SELECT_TARGET_RANDOM, 1), SPELL_CHARGE); Charge_Timer = 5000+rand()%5000; - }else Charge_Timer -= diff; + } else Charge_Timer -= diff; - if (StoneStrike_Timer < diff) + if (StoneStrike_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_STONE_STRIKE); StoneStrike_Timer = 5000+rand()%5000; - }else StoneStrike_Timer -= diff; + } else StoneStrike_Timer -= diff; DoMeleeAttackIfReady(); } @@ -308,17 +308,17 @@ struct TRINITY_DLL_DECL boss_dalronn_the_controllerAI : public ScriptedAI return; if (AggroYell_Timer) - if (AggroYell_Timer < diff) + if (AggroYell_Timer <= diff) { DoScriptText(YELL_DALRONN_AGGRO,m_creature); AggroYell_Timer = 0; - }else AggroYell_Timer -= diff; + } else AggroYell_Timer -= diff; if (!ghost) { if (Check_Timer) - if (Check_Timer < diff) + if (Check_Timer <= diff) { Check_Timer = 5000; Unit* skarvald = Unit::GetUnit(*m_creature, pInstance ? pInstance->GetData64(DATA_SKARVALD) : 0); @@ -328,42 +328,42 @@ struct TRINITY_DLL_DECL boss_dalronn_the_controllerAI : public ScriptedAI Response_Timer = 2000; Check_Timer = 0; } - }else Check_Timer -= diff; + } else Check_Timer -= diff; if (Response_Timer) if (Skarvald_isDead) - if (Response_Timer < diff) + if (Response_Timer <= diff) { DoScriptText(YELL_DALRONN_SKA_DIEDFIRST,m_creature); Response_Timer = 0; - }else Response_Timer -= diff; + } else Response_Timer -= diff; } - if (ShadowBolt_Timer < diff) + if (ShadowBolt_Timer <= diff) { if (!m_creature->IsNonMeleeSpellCasted(false)) { DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0),HEROIC(SPELL_SHADOW_BOLT, H_SPELL_SHADOW_BOLT)); ShadowBolt_Timer = 1000; } - }else ShadowBolt_Timer -= diff; + } else ShadowBolt_Timer -= diff; - if (Debilitate_Timer < diff) + if (Debilitate_Timer <= diff) { if (!m_creature->IsNonMeleeSpellCasted(false)) { DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0),SPELL_DEBILITATE); Debilitate_Timer = 5000+rand()%5000; } - }else Debilitate_Timer -= diff; + } else Debilitate_Timer -= diff; if (HeroicMode) - if (Summon_Timer < diff) + if (Summon_Timer <= diff) { DoCast(m_creature,H_SPELL_SUMMON_SKELETONS); Summon_Timer = (rand()%10000) + 20000; - }else Summon_Timer -= diff; + } else Summon_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp index 9441f1f4bf0..e84344e48d8 100644 --- a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp +++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp @@ -291,7 +291,7 @@ struct TRINITY_DLL_DECL instance_utgarde_keep : public ScriptedInstance forge_event[1] = data4; forge_event[2] = data5; - }else OUT_LOAD_INST_DATA_FAIL; + } else OUT_LOAD_INST_DATA_FAIL; OUT_LOAD_INST_DATA_COMPLETE; } diff --git a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp index 3bcaebb9658..6d4d42ff3e4 100644 --- a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp +++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp @@ -155,20 +155,20 @@ struct TRINITY_DLL_DECL boss_palehoofAI : public ScriptedAI if (pTemp && pTemp->isAlive()) pTemp->DisappearAndDie(); - if (uiArcingSmashTimer < diff) + if (uiArcingSmashTimer <= diff) { DoCast(m_creature,SPELL_ARCING_SMASH); uiArcingSmashTimer = urand(13000,17000); } else uiArcingSmashTimer -= diff; - if (uiImpaleTimer < diff) + if (uiImpaleTimer <= diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,100,true)) DoCast(pTarget, HEROIC(SPELL_IMPALE,H_SPELL_IMPALE)); uiImpaleTimer = urand(8000,12000); } else uiImpaleTimer -= diff; - if (uiWhiteringRoarTimer < diff) + if (uiWhiteringRoarTimer <= diff) { DoCast(m_creature, HEROIC(SPELL_WITHERING_ROAR,H_SPELL_WITHERING_ROAR)); uiWhiteringRoarTimer = urand(8000,12000); @@ -213,7 +213,7 @@ struct TRINITY_DLL_DECL boss_palehoofAI : public ScriptedAI if(!DoneAdds[i%4]&&next==0){ move=(Phase)(i%4); break; - }else if(!DoneAdds[i%4]&&next>0) + } else if(!DoneAdds[i%4]&&next>0) next--; } AddCount++; @@ -288,19 +288,19 @@ struct TRINITY_DLL_DECL mob_ravenous_furbolgAI : public ScriptedAI if (!UpdateVictim()) return; - if (uiChainLightingTimer < diff) + if (uiChainLightingTimer <= diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_CHAIN_LIGHTING, H_SPELL_CHAIN_LIGHTING)); uiChainLightingTimer = 5000 + rand()%5000; } else uiChainLightingTimer -= diff; - if (uiCrazedTimer < diff) + if (uiCrazedTimer <= diff) { DoCast(m_creature, SPELL_CRAZED); uiCrazedTimer = 8000 + rand()%4000; } else uiCrazedTimer -= diff; - if (uiTerrifyingRoarTimer < diff) + if (uiTerrifyingRoarTimer <= diff) { DoCast(m_creature, SPELL_TERRIFYING_ROAR); uiTerrifyingRoarTimer = 10000 + rand()%10000; @@ -394,19 +394,19 @@ struct TRINITY_DLL_DECL mob_frenzied_worgenAI : public ScriptedAI if (!UpdateVictim()) return; - if (uiMortalWoundTimer < diff) + if (uiMortalWoundTimer <= diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_MORTAL_WOUND, H_SPELL_MORTAL_WOUND)); uiMortalWoundTimer = 3000 + rand()%4000; } else uiMortalWoundTimer -= diff; - if (uiEnrage1Timer < diff) + if (uiEnrage1Timer <= diff) { DoCast(m_creature, SPELL_ENRAGE_1); uiEnrage1Timer = 15000; } else uiEnrage1Timer -= diff; - if (uiEnrage2Timer < diff) + if (uiEnrage2Timer <= diff) { DoCast(m_creature, SPELL_ENRAGE_2); uiEnrage2Timer = 10000; @@ -503,19 +503,19 @@ struct TRINITY_DLL_DECL mob_ferocious_rhinoAI : public ScriptedAI if (!UpdateVictim()) return; - if (uiStompTimer < diff) + if (uiStompTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_STOMP); uiStompTimer = 8000 + rand()%4000; } else uiStompTimer -= diff; - if (uiGoreTimer < diff) + if (uiGoreTimer <= diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_GORE, H_SPELL_GORE)); uiGoreTimer = 13000 + rand()%4000; } else uiGoreTimer -= diff; - if (uiGrievousWoundTimer < diff) + if (uiGrievousWoundTimer <= diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, HEROIC(SPELL_GRIEVOUS_WOUND, H_SPELL_GRIEVOUS_WOUND)); @@ -616,20 +616,20 @@ struct TRINITY_DLL_DECL mob_massive_jormungarAI : public ScriptedAI if (!UpdateVictim()) return; - if (uiAcidSpitTimer < diff) + if (uiAcidSpitTimer <= diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_ACID_SPIT); uiAcidSpitTimer = 2000 + rand()%2000; } else uiAcidSpitTimer -= diff; - if (uiAcidSplatterTimer < diff) + if (uiAcidSplatterTimer <= diff) { DoCast(m_creature, HEROIC(SPELL_POISON_BREATH, H_SPELL_POISON_BREATH)); uiAcidSplatterTimer = 10000 + rand()%4000; } else uiAcidSplatterTimer -= diff; - if (uiPoisonBreathTimer < diff) + if (uiPoisonBreathTimer <= diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, HEROIC(SPELL_POISON_BREATH, H_SPELL_POISON_BREATH)); diff --git a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp index 13500dc9e11..27dea6617be 100644 --- a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp +++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp @@ -21,7 +21,7 @@ update creature_template set scriptname = 'boss_skadi' where entry = ''; #define H_SPELL_CRUSH 59330 #define SPELL_POISONED_SPEAR 50225 #define H_SPELL_POISONED_SPEAR 59331 -#define SPELL_WHIRLWIND 50228 //random target, but not the tank approx. every 20s +#define SPELL_WHIRLWIND 50228 //random pTarget, but not the tank approx. every 20s #define H_SPELL_WHIRLWIND 59332 //Spawned creatures @@ -124,7 +124,7 @@ struct TRINITY_DLL_DECL boss_skadiAI : public ScriptedAI switch(Phase) { case FLYING: - if (uiMovementTimer < diff) + if (uiMovementTimer <= diff) { switch(uiWaypointId) { @@ -147,20 +147,20 @@ struct TRINITY_DLL_DECL boss_skadiAI : public ScriptedAI if (!UpdateVictim()) return; - if (uiCrushTimer < diff) + if (uiCrushTimer <= diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_CRUSH, H_SPELL_CRUSH)); uiCrushTimer = 8000; } else uiCrushTimer -= diff; - if (uiPoisonedSpearTimer < diff) + if (uiPoisonedSpearTimer <= diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,100,true)) DoCast(pTarget, HEROIC(SPELL_POISONED_SPEAR, H_SPELL_POISONED_SPEAR)); uiPoisonedSpearTimer = 10000; } else uiPoisonedSpearTimer -= diff; - if (uiWhirlwindTimer < diff) + if (uiWhirlwindTimer <= diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,100,true)) m_creature->CastSpell(pTarget, HEROIC(SPELL_WHIRLWIND, H_SPELL_WHIRLWIND), false); diff --git a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp index 077fb311a71..420bfa64fab 100644 --- a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp +++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp @@ -131,7 +131,7 @@ struct TRINITY_DLL_DECL boss_svalaAI : public ScriptedAI if (Phase != INTRO) return; - if (uiIntroTimer < diff) + if (uiIntroTimer <= diff) { if(!pArthas) return; @@ -261,13 +261,13 @@ struct TRINITY_DLL_DECL boss_svala_sorrowgraveAI : public ScriptedAI if (!UpdateVictim()) return; - if (uiSinsterStrikeTimer < diff) + if (uiSinsterStrikeTimer <= diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_SINSTER_STRIKE, H_SPELL_SINSTER_STRIKE)); uiSinsterStrikeTimer = urand(5000,9000); } else uiSinsterStrikeTimer -= diff; - if (uiCallFlamesTimer < diff) + if (uiCallFlamesTimer <= diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { @@ -276,7 +276,7 @@ struct TRINITY_DLL_DECL boss_svala_sorrowgraveAI : public ScriptedAI } } else uiCallFlamesTimer -= diff; - if (uiRitualOfSwordTimer < diff) + if (uiRitualOfSwordTimer <= diff) { pSacrificeTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (pSacrificeTarget) @@ -302,7 +302,7 @@ struct TRINITY_DLL_DECL boss_svala_sorrowgraveAI : public ScriptedAI } else //SACRIFICING { - if (uiSacrificeTimer < diff) + if (uiSacrificeTimer <= diff) { bool bSacrificed = false; for (uint8 i = 0; i < 3; ++i) 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 33632a93648..58dbf5ab07b 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 @@ -168,7 +168,7 @@ struct TRINITY_DLL_DECL boss_ymironAI : public ScriptedAI { if (m_bIsWalking) { - if (m_uiPause_Timer < diff) + if (m_uiPause_Timer <= diff) { DoScriptText(ActiveBot[m_uiActiveOrder[m_uiActivedNumber]].say, m_creature); DoCast(m_creature, SPELL_CHANNEL_YMIRON_TO_SPIRIT); // should be on spirit @@ -196,7 +196,7 @@ struct TRINITY_DLL_DECL boss_ymironAI : public ScriptedAI } else if (m_bIsPause) { - if (m_uiPause_Timer < diff) + if (m_uiPause_Timer <= diff) { m_uiAbility_BJORN_Timer = 5000; m_uiAbility_HALDOR_Timer = 5000; @@ -216,32 +216,32 @@ struct TRINITY_DLL_DECL boss_ymironAI : public ScriptedAI if (!m_bIsPause) { // Normal spells ------------------------------------------------------------------------ - if (m_uiBane_Timer < diff) + if (m_uiBane_Timer <= diff) { DoCast(m_creature, HEROIC(SPELL_BANE, H_SPELL_BANE)); m_uiBane_Timer = urand(20000,25000); } else m_uiBane_Timer -= diff; - if (m_uiFetidRot_Timer < diff) + if (m_uiFetidRot_Timer <= diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_FETID_ROT, H_SPELL_FETID_ROT)); m_uiFetidRot_Timer = urand(10000,15000); } else m_uiFetidRot_Timer -= diff; - if (m_uiDarkSlash_Timer < diff) + if (m_uiDarkSlash_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_DARK_SLASH); m_uiDarkSlash_Timer = urand(30000,35000); } else m_uiDarkSlash_Timer -= diff; - if (m_uiAncestors_Vengeance_Timer < diff) + if (m_uiAncestors_Vengeance_Timer <= diff) { DoCast(m_creature, SPELL_ANCESTORS_VENGEANCE); m_uiAncestors_Vengeance_Timer = HEROIC(urand(60000,65000),urand(45000,50000)); } else m_uiAncestors_Vengeance_Timer -= diff; // Abilities ------------------------------------------------------------------------------ - if (m_bIsActiveWithBJORN && m_uiAbility_BJORN_Timer < diff) + if (m_bIsActiveWithBJORN && m_uiAbility_BJORN_Timer <= diff) { //DoCast(m_creature, SPELL_SUMMON_SPIRIT_FOUNT); // works fine, but using summon has better control if (Creature* pTemp = m_creature->SummonCreature(CREATURE_SPIRIT_FOUNT, 385+rand()%10, -330+rand()%10, 104.756, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 180000)) @@ -257,19 +257,19 @@ struct TRINITY_DLL_DECL boss_ymironAI : public ScriptedAI m_bIsActiveWithBJORN = false; // only one orb } else m_uiAbility_BJORN_Timer -= diff; - if (m_bIsActiveWithHALDOR && m_uiAbility_HALDOR_Timer < diff) + if (m_bIsActiveWithHALDOR && m_uiAbility_HALDOR_Timer <= diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_SPIRIT_STRIKE, H_SPELL_SPIRIT_STRIKE)); m_uiAbility_HALDOR_Timer = 5000; // overtime } else m_uiAbility_HALDOR_Timer -= diff; - if (m_bIsActiveWithRANULF && m_uiAbility_RANULF_Timer < diff) + if (m_bIsActiveWithRANULF && m_uiAbility_RANULF_Timer <= diff) { DoCast(m_creature, HEROIC(SPELL_SPIRIT_BURST, H_SPELL_SPIRIT_BURST)); m_uiAbility_RANULF_Timer = 10000; // overtime } else m_uiAbility_RANULF_Timer -= diff; - if (m_bIsActiveWithTORGYN && m_uiAbility_TORGYN_Timer < diff) + if (m_bIsActiveWithTORGYN && m_uiAbility_TORGYN_Timer <= diff) { float x,y,z; x = m_creature->GetPositionX()-5; diff --git a/src/bindings/scripts/scripts/northrend/vault_of_archavon/boss_archavon.cpp b/src/bindings/scripts/scripts/northrend/vault_of_archavon/boss_archavon.cpp index aa6ad3d6c8f..b389a6d426e 100644 --- a/src/bindings/scripts/scripts/northrend/vault_of_archavon/boss_archavon.cpp +++ b/src/bindings/scripts/scripts/northrend/vault_of_archavon/boss_archavon.cpp @@ -90,13 +90,13 @@ struct TRINITY_DLL_DECL boss_archavonAI : public ScriptedAI switch(eventId) { case EVENT_ROCK_SHARDS: - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(target, SPELL_ROCK_SHARDS); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_ROCK_SHARDS); events.ScheduleEvent(EVENT_ROCK_SHARDS, 15000); return; case EVENT_CHOKING_CLOUD: - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(target, SPELL_CRUSHING_LEAP, true); //10y~80y, ignore range + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_CRUSHING_LEAP, true); //10y~80y, ignore range events.ScheduleEvent(EVENT_CHOKING_CLOUD, 30000); return; case EVENT_STOMP: @@ -154,8 +154,8 @@ struct TRINITY_DLL_DECL mob_warderAI : public ScriptedAI //npc 32353 { case EVENT_ROCK_SHOWER: { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(target, SPELL_ROCK_SHOWER); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_ROCK_SHOWER); events.ScheduleEvent(EVENT_ROCK_SHARDS, 6000); return; } diff --git a/src/bindings/scripts/scripts/northrend/vault_of_archavon/boss_emalon.cpp b/src/bindings/scripts/scripts/northrend/vault_of_archavon/boss_emalon.cpp index f38ccefb370..665d8d7751d 100644 --- a/src/bindings/scripts/scripts/northrend/vault_of_archavon/boss_emalon.cpp +++ b/src/bindings/scripts/scripts/northrend/vault_of_archavon/boss_emalon.cpp @@ -134,8 +134,8 @@ struct TRINITY_DLL_DECL boss_emalonAI : public ScriptedAI switch(eventId) { case EVENT_CHAIN_LIGHTNING: - if(Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(target, SPELL_CHAIN_LIGHTNING); + if(Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_CHAIN_LIGHTNING); events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, 25000); return; case EVENT_LIGHTNING_NOVA: @@ -229,11 +229,11 @@ struct TRINITY_DLL_DECL mob_tempest_minionAI : public ScriptedAI { if(OverchargedAura->GetStackAmount() < 10) { - if(OverchargedTimer < diff) + if (OverchargedTimer <= diff) { DoCast(me, SPELL_OVERCHARGED); OverchargedTimer = 2000; - }else OverchargedTimer -=diff; + } else OverchargedTimer -=diff; } else { 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 970d3e9cd5c..0b0f1af0791 100644 --- a/src/bindings/scripts/scripts/northrend/violet_hold/boss_cyanigosa.cpp +++ b/src/bindings/scripts/scripts/northrend/violet_hold/boss_cyanigosa.cpp @@ -75,29 +75,29 @@ struct TRINITY_DLL_DECL boss_cyanigosaAI : public ScriptedAI if (!UpdateVictim()) return; - if (uiArcaneVacumTimer < diff) + if (uiArcaneVacumTimer <= diff) { DoCast(m_creature, SPELL_ARCANE_VACUM); } else uiArcaneVacumTimer -= diff; - if (uiBlizzardTimer < diff) + if (uiBlizzardTimer <= diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0,100,true)) DoCast(pTarget, HEROIC(SPELL_BLIZZARD,H_SPELL_BLIZZARD)); } else uiBlizzardTimer -= diff; - if (uiTailSweepTimer < diff) + if (uiTailSweepTimer <= diff) { DoCast(m_creature, HEROIC(SPELL_TAIL_SWEEP,H_SPELL_TAIL_SWEEP)); } else uiTailSweepTimer -= diff; - if (uiUncontrollableEnergyTimer < diff) + if (uiUncontrollableEnergyTimer <= diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_UNCONTROLLABLE_ENERGY,H_SPELL_UNCONTROLLABLE_ENERGY)); } else uiUncontrollableEnergyTimer -= diff; if (HeroicMode) - if (uiManaDestructionTimer < diff) + if (uiManaDestructionTimer <= diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0,100,true)) DoCast(pTarget, SPELL_MANA_DESTRUCTION); 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 728a9fd8276..e6f7451163d 100644 --- a/src/bindings/scripts/scripts/northrend/violet_hold/boss_erekem.cpp +++ b/src/bindings/scripts/scripts/northrend/violet_hold/boss_erekem.cpp @@ -105,13 +105,13 @@ struct TRINITY_DLL_DECL boss_erekemAI : public ScriptedAI } } - if (uiEarthShieldTimer < diff) + if (uiEarthShieldTimer <= diff) { DoCast(m_creature, HEROIC(SPELL_EARTH_SHIELD, H_SPELL_EARTH_SHIELD)); uiEarthShieldTimer = 20000; } else uiEarthShieldTimer -= diff; - if (uiChainHealTimer < diff) + if (uiChainHealTimer <= diff) { if (Creature *pTarget = GetChainHealTarget()) { @@ -121,19 +121,19 @@ struct TRINITY_DLL_DECL boss_erekemAI : public ScriptedAI } } else uiChainHealTimer -= diff; - if (uiBloodlustTimer < diff) + if (uiBloodlustTimer <= diff) { DoCast(m_creature,SPELL_BLOODLUST); uiBloodlustTimer = urand(35000,45000); } else uiBloodlustTimer -= diff; - if (uiEarthShockTimer < diff) + if (uiEarthShockTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_EARTH_SHOCK); uiEarthShockTimer = urand(8000,13000); } else uiEarthShockTimer -= diff; - if (uiLightningBoltTimer < diff) + if (uiLightningBoltTimer <= diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,100,true)) DoCast(pTarget, SPELL_LIGHTNING_BOLT); @@ -222,19 +222,19 @@ struct TRINITY_DLL_DECL mob_erekem_guardAI : public ScriptedAI DoMeleeAttackIfReady(); - if (uiStrikeTimer < diff) + if (uiStrikeTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_STRIKE); uiStrikeTimer = urand(4000,8000); } else uiStrikeTimer -= diff; - if (uiHowlingScreechTimer < diff) + if (uiHowlingScreechTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_HOWLING_SCREECH); uiHowlingScreechTimer = urand(8000,13000); } else uiHowlingScreechTimer -= diff; - if (uiGushingWoundTimer < diff) + if (uiGushingWoundTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_GUSHING_WOUND); uiGushingWoundTimer = urand(7000,12000); 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 df0bddb6965..1b308835271 100644 --- a/src/bindings/scripts/scripts/northrend/violet_hold/boss_lavanthor.cpp +++ b/src/bindings/scripts/scripts/northrend/violet_hold/boss_lavanthor.cpp @@ -71,19 +71,19 @@ struct TRINITY_DLL_DECL boss_lavanthorAI : public ScriptedAI if (!UpdateVictim()) return; - if (uiFireboltTimer < diff) + if (uiFireboltTimer <= diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_FIREBOLT, H_SPELL_FIREBOLT)); uiFireboltTimer = urand(5000,13000); } else uiFireboltTimer -= diff; - if (uiFlameBreathTimer < 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) + if (uiLavaBurnTimer <= diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_LAVA_BURN, H_SPELL_LAVA_BURN)); uiLavaBurnTimer = urand(15000,23000); @@ -91,7 +91,7 @@ struct TRINITY_DLL_DECL boss_lavanthorAI : public ScriptedAI if (HeroicMode) { - if (uiCauterizingFlamesTimer < diff) + if (uiCauterizingFlamesTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_CAUTERIZING_FLAMES); uiCauterizingFlamesTimer = urand(10000,16000); 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 84d214abcbb..1f3d326332c 100644 --- a/src/bindings/scripts/scripts/northrend/violet_hold/boss_moragg.cpp +++ b/src/bindings/scripts/scripts/northrend/violet_hold/boss_moragg.cpp @@ -64,14 +64,14 @@ struct TRINITY_DLL_DECL boss_moraggAI : public ScriptedAI if (!UpdateVictim()) return; - if (uiOpticLinkTimer < diff) + 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) + if (uiCorrosiveSalivaTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_CORROSIVE_SALIVA); uiCorrosiveSalivaTimer = 10000; 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 1684a9dec17..6e6e1da345f 100644 --- a/src/bindings/scripts/scripts/northrend/violet_hold/boss_zuramat.cpp +++ b/src/bindings/scripts/scripts/northrend/violet_hold/boss_zuramat.cpp @@ -93,7 +93,7 @@ struct TRINITY_DLL_DECL boss_zuramatAI : public ScriptedAI if (!UpdateVictim()) return; - if(SpellSummonVoidTimer < diff) + if (SpellSummonVoidTimer <= diff) { m_creature->CastSpell(m_creature->getVictim(),SPELL_SUMMON_VOID_SENTRY,false); SpellSummonVoidTimer = 20000; @@ -106,7 +106,7 @@ struct TRINITY_DLL_DECL boss_zuramatAI : public ScriptedAI shiftcast = false; } else SpellVoidShiftedTimer -=diff; - if(SpellVoidShiftTimer < diff) + if (SpellVoidShiftTimer <= diff) { Shifted = SelectUnit(SELECT_TARGET_RANDOM, 0); if (Shifted) @@ -118,7 +118,7 @@ struct TRINITY_DLL_DECL boss_zuramatAI : public ScriptedAI SpellVoidShiftedTimer = 5000; } else SpellVoidShiftTimer -=diff; - if(SpellShroudOfDarknessTimer < diff) + if (SpellShroudOfDarknessTimer <= diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_SHROUD_OF_DARKNESS, H_SPELL_SHROUD_OF_DARKNESS)); SpellShroudOfDarknessTimer = 20000; 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 f566f27918e..90ac0d0e0a1 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 @@ -421,7 +421,7 @@ struct TRINITY_DLL_DECL instance_violet_hold : public ScriptedInstance uiFirstBoss = data3; uiSecondBoss = data4; - }else OUT_LOAD_INST_DATA_FAIL; + } else OUT_LOAD_INST_DATA_FAIL; OUT_LOAD_INST_DATA_COMPLETE; } diff --git a/src/bindings/scripts/scripts/northrend/zuldrak.cpp b/src/bindings/scripts/scripts/northrend/zuldrak.cpp index a740a8ea15c..54da04ed8fa 100644 --- a/src/bindings/scripts/scripts/northrend/zuldrak.cpp +++ b/src/bindings/scripts/scripts/northrend/zuldrak.cpp @@ -156,7 +156,7 @@ struct TRINITY_DLL_DECL npc_captured_rageclawAI : public ScriptedAI if (!Despawn) return; - if (DespawnTimer < diff) + if (DespawnTimer <= diff) m_creature->setDeathState(JUST_DIED); else DespawnTimer-=diff; } diff --git a/src/bindings/scripts/scripts/outland/auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp b/src/bindings/scripts/scripts/outland/auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp index 5baa380fa7e..cba3569833c 100644 --- a/src/bindings/scripts/scripts/outland/auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp +++ b/src/bindings/scripts/scripts/outland/auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp @@ -64,7 +64,7 @@ struct TRINITY_DLL_DECL mob_stolen_soulAI : public ScriptedAI if (!UpdateVictim()) return; - if (Class_Timer < diff) + if (Class_Timer <= diff) { switch (myClass) { @@ -197,11 +197,11 @@ struct TRINITY_DLL_DECL boss_exarch_maladaarAI : public ScriptedAI summoned->SetDisplayId(soulmodel); summoned->setFaction(m_creature->getFaction()); - if (Unit *target = Unit::GetUnit(*m_creature,soulholder)) + if (Unit *pTarget = Unit::GetUnit(*m_creature,soulholder)) { CAST_AI(mob_stolen_soulAI, summoned->AI())->SetMyClass(soulclass); - summoned->AI()->AttackStart(target); + summoned->AI()->AttackStart(pTarget); } } } @@ -238,11 +238,11 @@ struct TRINITY_DLL_DECL boss_exarch_maladaarAI : public ScriptedAI StolenSoul_Timer = 15000 + rand()% 15000; } - if (StolenSoul_Timer < diff) + if (StolenSoul_Timer <= diff) { - if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) { - if (target->GetTypeId() == TYPEID_PLAYER) + if (pTarget->GetTypeId() == TYPEID_PLAYER) { if (m_creature->IsNonMeleeSpellCasted(false)) m_creature->InterruptNonMeleeSpells(true); @@ -253,31 +253,31 @@ struct TRINITY_DLL_DECL boss_exarch_maladaarAI : public ScriptedAI else DoScriptText(SAY_SOUL_CLEAVE, m_creature); - soulmodel = target->GetDisplayId(); - soulholder = target->GetGUID(); - soulclass = target->getClass(); + soulmodel = pTarget->GetDisplayId(); + soulholder = pTarget->GetGUID(); + soulclass = pTarget->getClass(); - DoCast(target,SPELL_STOLEN_SOUL); + DoCast(pTarget,SPELL_STOLEN_SOUL); m_creature->SummonCreature(ENTRY_STOLEN_SOUL, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); StolenSoul_Timer = 20000 + rand()% 10000; } else StolenSoul_Timer = 1000; } - }else StolenSoul_Timer -= diff; + } else StolenSoul_Timer -= diff; - if (Ribbon_of_Souls_timer < diff) + if (Ribbon_of_Souls_timer <= diff) { - if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(target,SPELL_RIBBON_OF_SOULS); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget,SPELL_RIBBON_OF_SOULS); Ribbon_of_Souls_timer = 5000 + (rand()%20 * 1000); - }else Ribbon_of_Souls_timer -= diff; + } else Ribbon_of_Souls_timer -= diff; - if (Fear_timer < diff) + if (Fear_timer <= diff) { DoCast(m_creature,SPELL_SOUL_SCREAM); Fear_timer = 15000 + rand()% 15000; - }else Fear_timer -= diff; + } else Fear_timer -= diff; DoMeleeAttackIfReady(); } @@ -311,7 +311,7 @@ struct TRINITY_DLL_DECL mob_avatar_of_martyredAI : public ScriptedAI if (!UpdateVictim()) return; - if (Mortal_Strike_timer < diff) + if (Mortal_Strike_timer <= diff) { DoCast(m_creature->getVictim(), SPELL_AV_MORTAL_STRIKE); Mortal_Strike_timer = 10000 + rand()%20 * 1000; diff --git a/src/bindings/scripts/scripts/outland/auchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp b/src/bindings/scripts/scripts/outland/auchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp index 878741387c8..24c6123ae88 100644 --- a/src/bindings/scripts/scripts/outland/auchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp +++ b/src/bindings/scripts/scripts/outland/auchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp @@ -81,7 +81,7 @@ struct TRINITY_DLL_DECL boss_shirrak_the_dead_watcherAI : public ScriptedAI void UpdateAI(const uint32 diff) { //Inhibitmagic_Timer - if (Inhibitmagic_Timer < diff) + if (Inhibitmagic_Timer <= diff) { float dist; Map* pMap = m_creature->GetMap(); @@ -100,48 +100,48 @@ struct TRINITY_DLL_DECL boss_shirrak_the_dead_watcherAI : public ScriptedAI m_creature->AddAura(SPELL_INHIBITMAGIC, i_pl); } Inhibitmagic_Timer = 3000+(rand()%1000); - }else Inhibitmagic_Timer -= diff; + } else Inhibitmagic_Timer -= diff; //Return since we have no target if (!UpdateVictim()) return; //Attractmagic_Timer - if (Attractmagic_Timer < diff) + if (Attractmagic_Timer <= diff) { DoCast(m_creature,SPELL_ATTRACTMAGIC); Attractmagic_Timer = 30000; Carnivorousbite_Timer = 1500; - }else Attractmagic_Timer -= diff; + } else Attractmagic_Timer -= diff; //Carnivorousbite_Timer - if (Carnivorousbite_Timer < diff) + if (Carnivorousbite_Timer <= diff) { DoCast(m_creature,SPELL_CARNIVOROUSBITE); Carnivorousbite_Timer = 10000; - }else Carnivorousbite_Timer -= diff; + } else Carnivorousbite_Timer -= diff; //FocusFire_Timer - if (FocusFire_Timer < diff) + if (FocusFire_Timer <= diff) { // Summon Focus Fire & Emote - Unit *target = SelectUnit(SELECT_TARGET_RANDOM,1); - if (target && target->GetTypeId() == TYPEID_PLAYER && target->isAlive()) + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,1); + if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER && pTarget->isAlive()) { - focusedTarget = target; - m_creature->SummonCreature(ENTRY_FOCUS_FIRE,target->GetPositionX(),target->GetPositionY(),target->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN,5500); + focusedTarget = pTarget; + m_creature->SummonCreature(ENTRY_FOCUS_FIRE,pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN,5500); // TODO: Find better way to handle emote // Emote std::string *emote = new std::string(EMOTE_FOCUSES_ON); - emote->append(target->GetName()); + emote->append(pTarget->GetName()); emote->append("!"); const char* text = emote->c_str(); m_creature->MonsterTextEmote(text, 0, true); delete emote; } FocusFire_Timer = 15000+(rand()%5000); - }else FocusFire_Timer -= diff; + } else FocusFire_Timer -= diff; DoMeleeAttackIfReady(); } @@ -179,7 +179,7 @@ struct TRINITY_DLL_DECL mob_focus_fireAI : public ScriptedAI return; //FieryBlast_Timer - if (fiery2 && FieryBlast_Timer < diff) + if (fiery2 && FieryBlast_Timer <= diff) { DoCast(m_creature,SPELL_FIERY_BLAST); @@ -187,7 +187,7 @@ struct TRINITY_DLL_DECL mob_focus_fireAI : public ScriptedAI else if (fiery2) fiery2 = false; FieryBlast_Timer = 1000; - }else FieryBlast_Timer -= diff; + } else FieryBlast_Timer -= diff; //DoMeleeAttackIfReady(); } 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 9d19da0916f..67aa3879700 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 @@ -116,8 +116,8 @@ struct TRINITY_DLL_DECL boss_nexusprince_shaffarAI : public ScriptedAI { summoned->CastSpell(summoned,SPELL_ETHEREAL_BEACON_VISUAL,false); - if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0)) - summoned->AI()->AttackStart(target); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + summoned->AI()->AttackStart(pTarget); } summons.Summon(summoned); @@ -144,7 +144,7 @@ struct TRINITY_DLL_DECL boss_nexusprince_shaffarAI : public ScriptedAI if (!UpdateVictim()) return; - if (FrostNova_Timer < diff) + if (FrostNova_Timer <= diff) { if (m_creature->IsNonMeleeSpellCasted(false)) m_creature->InterruptNonMeleeSpells(true); @@ -152,23 +152,23 @@ struct TRINITY_DLL_DECL boss_nexusprince_shaffarAI : public ScriptedAI DoCast(m_creature,SPELL_FROSTNOVA); FrostNova_Timer = 17500 + rand()%7500; CanBlink = true; - }else FrostNova_Timer -= diff; + } else FrostNova_Timer -= diff; - if (Frostbolt_Timer < diff) + if (Frostbolt_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_FROSTBOLT); Frostbolt_Timer = 4500 + rand()%1500; - }else Frostbolt_Timer -= diff; + } else Frostbolt_Timer -= diff; - if (FireBall_Timer < diff) + if (FireBall_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_FIREBALL); FireBall_Timer = 4500 + rand()%1500; - }else FireBall_Timer -= diff; + } else FireBall_Timer -= diff; if (CanBlink) { - if (Blink_Timer < diff) + if (Blink_Timer <= diff) { if (m_creature->IsNonMeleeSpellCasted(false)) m_creature->InterruptNonMeleeSpells(true); @@ -181,10 +181,10 @@ struct TRINITY_DLL_DECL boss_nexusprince_shaffarAI : public ScriptedAI DoCast(m_creature,SPELL_BLINK); Blink_Timer = 1000 + rand()%1500; CanBlink = false; - }else Blink_Timer -= diff; + } else Blink_Timer -= diff; } - if (Beacon_Timer < diff) + if (Beacon_Timer <= diff) { if (m_creature->IsNonMeleeSpellCasted(false)) m_creature->InterruptNonMeleeSpells(true); @@ -195,7 +195,7 @@ struct TRINITY_DLL_DECL boss_nexusprince_shaffarAI : public ScriptedAI DoCast(m_creature,SPELL_ETHEREAL_BEACON, true); Beacon_Timer = 10000; - }else Beacon_Timer -= diff; + } else Beacon_Timer -= diff; DoMeleeAttackIfReady(); } @@ -259,7 +259,7 @@ struct TRINITY_DLL_DECL mob_ethereal_beaconAI : public ScriptedAI if (!UpdateVictim()) return; - if (Check_Timer < diff) + if (Check_Timer <= diff) { Creature *Shaffar = me->FindNearestCreature(NPC_SHAFFAR, 100); if (!Shaffar || Shaffar->isDead() || !Shaffar->isInCombat()) @@ -268,15 +268,15 @@ struct TRINITY_DLL_DECL mob_ethereal_beaconAI : public ScriptedAI return; } Check_Timer = 1000; - }else Check_Timer -= diff; + } else Check_Timer -= diff; - if (ArcaneBolt_Timer < diff) + if (ArcaneBolt_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_ARCANE_BOLT); ArcaneBolt_Timer = 2000 + rand()%2500; - }else ArcaneBolt_Timer -= diff; + } else ArcaneBolt_Timer -= diff; - if (Apprentice_Timer < diff) + if (Apprentice_Timer <= diff) { if (m_creature->IsNonMeleeSpellCasted(false)) m_creature->InterruptNonMeleeSpells(true); @@ -284,7 +284,7 @@ struct TRINITY_DLL_DECL mob_ethereal_beaconAI : public ScriptedAI m_creature->CastSpell(m_creature,SPELL_ETHEREAL_APPRENTICE,true); m_creature->ForcedDespawn(); return; - }else Apprentice_Timer -= diff; + } else Apprentice_Timer -= diff; } }; @@ -318,7 +318,7 @@ struct TRINITY_DLL_DECL mob_ethereal_apprenticeAI : public ScriptedAI if (!UpdateVictim()) return; - if (Cast_Timer < diff) + if (Cast_Timer <= diff) { if (isFireboltTurn) { @@ -329,7 +329,7 @@ struct TRINITY_DLL_DECL mob_ethereal_apprenticeAI : public ScriptedAI isFireboltTurn = true; } Cast_Timer = 3000; - }else Cast_Timer -= diff; + } else Cast_Timer -= diff; } }; diff --git a/src/bindings/scripts/scripts/outland/auchindoun/mana_tombs/boss_pandemonius.cpp b/src/bindings/scripts/scripts/outland/auchindoun/mana_tombs/boss_pandemonius.cpp index 4f91a8a08df..b1decf401a8 100644 --- a/src/bindings/scripts/scripts/outland/auchindoun/mana_tombs/boss_pandemonius.cpp +++ b/src/bindings/scripts/scripts/outland/auchindoun/mana_tombs/boss_pandemonius.cpp @@ -78,11 +78,11 @@ struct TRINITY_DLL_DECL boss_pandemoniusAI : public ScriptedAI if (!UpdateVictim()) return; - if (VoidBlast_Timer < diff) + if (VoidBlast_Timer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) { - DoCast(target,HEROIC(SPELL_VOID_BLAST, H_SPELL_VOID_BLAST)); + DoCast(pTarget,HEROIC(SPELL_VOID_BLAST, H_SPELL_VOID_BLAST)); VoidBlast_Timer = 500; ++VoidBlast_Counter; } @@ -92,11 +92,11 @@ struct TRINITY_DLL_DECL boss_pandemoniusAI : public ScriptedAI VoidBlast_Timer = 15000+rand()%10000; VoidBlast_Counter = 0; } - }else VoidBlast_Timer -= diff; + } else VoidBlast_Timer -= diff; if (!VoidBlast_Counter) { - if (DarkShell_Timer < diff) + if (DarkShell_Timer <= diff) { if (m_creature->IsNonMeleeSpellCasted(false)) m_creature->InterruptNonMeleeSpells(true); @@ -105,7 +105,7 @@ struct TRINITY_DLL_DECL boss_pandemoniusAI : public ScriptedAI DoCast(m_creature,HEROIC(SPELL_DARK_SHELL, H_SPELL_DARK_SHELL)); DarkShell_Timer = 20000; - }else DarkShell_Timer -= diff; + } else DarkShell_Timer -= diff; } DoMeleeAttackIfReady(); diff --git a/src/bindings/scripts/scripts/outland/auchindoun/sethekk_halls/boss_darkweaver_syth.cpp b/src/bindings/scripts/scripts/outland/auchindoun/sethekk_halls/boss_darkweaver_syth.cpp index 1d0092c2dfc..d1ec8b53022 100644 --- a/src/bindings/scripts/scripts/outland/auchindoun/sethekk_halls/boss_darkweaver_syth.cpp +++ b/src/bindings/scripts/scripts/outland/auchindoun/sethekk_halls/boss_darkweaver_syth.cpp @@ -103,8 +103,8 @@ struct TRINITY_DLL_DECL boss_darkweaver_sythAI : public ScriptedAI void JustSummoned(Creature *summoned) { - if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0)) - summoned->AI()->AttackStart(target); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + summoned->AI()->AttackStart(pTarget); } void SythSummoning() @@ -143,42 +143,42 @@ struct TRINITY_DLL_DECL boss_darkweaver_sythAI : public ScriptedAI summon10 = true; } - if (flameshock_timer < diff) + if (flameshock_timer <= diff) { - if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(target,SPELL_FLAME_SHOCK); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget,SPELL_FLAME_SHOCK); flameshock_timer = 10000 + rand()%5000; } else flameshock_timer -= diff; - if (arcaneshock_timer < diff) + if (arcaneshock_timer <= diff) { - if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(target,SPELL_ARCANE_SHOCK); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget,SPELL_ARCANE_SHOCK); arcaneshock_timer = 10000 + rand()%5000; } else arcaneshock_timer -= diff; - if (frostshock_timer < diff) + if (frostshock_timer <= diff) { - if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(target,SPELL_FROST_SHOCK); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget,SPELL_FROST_SHOCK); frostshock_timer = 10000 + rand()%5000; } else frostshock_timer -= diff; - if (shadowshock_timer < diff) + if (shadowshock_timer <= diff) { - if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(target,SPELL_SHADOW_SHOCK); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget,SPELL_SHADOW_SHOCK); shadowshock_timer = 10000 + rand()%5000; } else shadowshock_timer -= diff; - if (chainlightning_timer < diff) + if (chainlightning_timer <= diff) { - if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(target,SPELL_CHAIN_LIGHTNING); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget,SPELL_CHAIN_LIGHTNING); chainlightning_timer = 25000; } else chainlightning_timer -= diff; @@ -220,21 +220,21 @@ struct TRINITY_DLL_DECL mob_syth_fireAI : public ScriptedAI if (!UpdateVictim()) return; - if (flameshock_timer < diff) + if (flameshock_timer <= diff) { - if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(target,SPELL_FLAME_SHOCK); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget,SPELL_FLAME_SHOCK); flameshock_timer = 5000; - }else flameshock_timer -= diff; + } else flameshock_timer -= diff; - if (flamebuffet_timer < diff) + if (flamebuffet_timer <= diff) { - if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(target,SPELL_FLAME_BUFFET); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget,SPELL_FLAME_BUFFET); flamebuffet_timer = 5000; - }else flamebuffet_timer -= diff; + } else flamebuffet_timer -= diff; DoMeleeAttackIfReady(); } @@ -271,21 +271,21 @@ struct TRINITY_DLL_DECL mob_syth_arcaneAI : public ScriptedAI if (!UpdateVictim()) return; - if (arcaneshock_timer < diff) + if (arcaneshock_timer <= diff) { - if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(target,SPELL_ARCANE_SHOCK); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget,SPELL_ARCANE_SHOCK); arcaneshock_timer = 5000; - }else arcaneshock_timer -= diff; + } else arcaneshock_timer -= diff; - if (arcanebuffet_timer < diff) + if (arcanebuffet_timer <= diff) { - if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(target,SPELL_ARCANE_BUFFET); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget,SPELL_ARCANE_BUFFET); arcanebuffet_timer = 5000; - }else arcanebuffet_timer -= diff; + } else arcanebuffet_timer -= diff; DoMeleeAttackIfReady(); } @@ -322,21 +322,21 @@ struct TRINITY_DLL_DECL mob_syth_frostAI : public ScriptedAI if (!UpdateVictim()) return; - if (frostshock_timer < diff) + if (frostshock_timer <= diff) { - if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(target,SPELL_FROST_SHOCK); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget,SPELL_FROST_SHOCK); frostshock_timer = 5000; - }else frostshock_timer -= diff; + } else frostshock_timer -= diff; - if (frostbuffet_timer < diff) + if (frostbuffet_timer <= diff) { - if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(target,SPELL_FROST_BUFFET); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget,SPELL_FROST_BUFFET); frostbuffet_timer = 5000; - }else frostbuffet_timer -= diff; + } else frostbuffet_timer -= diff; DoMeleeAttackIfReady(); } @@ -373,21 +373,21 @@ struct TRINITY_DLL_DECL mob_syth_shadowAI : public ScriptedAI if (!UpdateVictim()) return; - if (shadowshock_timer < diff) + if (shadowshock_timer <= diff) { - if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(target,SPELL_SHADOW_SHOCK); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget,SPELL_SHADOW_SHOCK); shadowshock_timer = 5000; - }else shadowshock_timer -= diff; + } else shadowshock_timer -= diff; - if (shadowbuffet_timer < diff) + if (shadowbuffet_timer <= diff) { - if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(target,SPELL_SHADOW_BUFFET); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget,SPELL_SHADOW_BUFFET); shadowbuffet_timer = 5000; - }else shadowbuffet_timer -= diff; + } else shadowbuffet_timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/outland/auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp b/src/bindings/scripts/scripts/outland/auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp index 972a8eda9a4..febf79a69f9 100644 --- a/src/bindings/scripts/scripts/outland/auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp +++ b/src/bindings/scripts/scripts/outland/auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp @@ -135,21 +135,21 @@ struct TRINITY_DLL_DECL boss_talon_king_ikissAI : public ScriptedAI Blink = false; } - if (ArcaneVolley_Timer < diff) + if (ArcaneVolley_Timer <= diff) { DoCast(m_creature,HEROIC(SPELL_ARCANE_VOLLEY, H_SPELL_ARCANE_VOLLEY)); ArcaneVolley_Timer = 7000+rand()%5000; - }else ArcaneVolley_Timer -= diff; + } else ArcaneVolley_Timer -= diff; - if (Sheep_Timer < diff) + if (Sheep_Timer <= diff) { - //second top aggro target in normal, random target in heroic correct? - Unit *target = NULL; - target = HeroicMode ? SelectUnit(SELECT_TARGET_RANDOM,0) : SelectUnit(SELECT_TARGET_TOPAGGRO,1); - if (target) - DoCast(target,HEROIC(SPELL_POLYMORPH, H_SPELL_POLYMORPH)); + //second top aggro pTarget in normal, random pTarget in heroic correct? + Unit *pTarget = NULL; + pTarget = HeroicMode ? SelectUnit(SELECT_TARGET_RANDOM,0) : SelectUnit(SELECT_TARGET_TOPAGGRO,1); + if (pTarget) + DoCast(pTarget,HEROIC(SPELL_POLYMORPH, H_SPELL_POLYMORPH)); Sheep_Timer = 15000+rand()%2500; - }else Sheep_Timer -= diff; + } else Sheep_Timer -= diff; //may not be correct time to cast if (!ManaShield && ((m_creature->GetHealth()*100) / m_creature->GetMaxHealth() < 20)) @@ -160,36 +160,36 @@ struct TRINITY_DLL_DECL boss_talon_king_ikissAI : public ScriptedAI if (HeroicMode) { - if (Slow_Timer < diff) + if (Slow_Timer <= diff) { DoCast(m_creature,H_SPELL_SLOW); Slow_Timer = 15000+rand()%25000; - }else Slow_Timer -= diff; + } else Slow_Timer -= diff; } - if (Blink_Timer < diff) + if (Blink_Timer <= diff) { DoScriptText(EMOTE_ARCANE_EXP, m_creature); - if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) { if (m_creature->IsNonMeleeSpellCasted(false)) m_creature->InterruptNonMeleeSpells(false); //Spell doesn't work, but we use for visual effect at least - DoCast(target,SPELL_BLINK); + DoCast(pTarget,SPELL_BLINK); - float X = target->GetPositionX(); - float Y = target->GetPositionY(); - float Z = target->GetPositionZ(); + float X = pTarget->GetPositionX(); + float Y = pTarget->GetPositionY(); + float Z = pTarget->GetPositionZ(); DoTeleportTo(X,Y,Z); - DoCast(target,SPELL_BLINK_TELEPORT); + DoCast(pTarget,SPELL_BLINK_TELEPORT); Blink = true; } Blink_Timer = 35000+rand()%5000; - }else Blink_Timer -= diff; + } else Blink_Timer -= diff; if (!Blink) DoMeleeAttackIfReady(); diff --git a/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp b/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp index 916755d13c3..8b4e378ece2 100644 --- a/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp +++ b/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp @@ -138,7 +138,7 @@ struct TRINITY_DLL_DECL boss_ambassador_hellmawAI : public npc_escortAI { if (!Intro && !HasEscortState(STATE_ESCORT_ESCORTING)) { - if (EventCheck_Timer < diff) + if (EventCheck_Timer <= diff) { if (m_pInstance) { @@ -169,25 +169,25 @@ struct TRINITY_DLL_DECL boss_ambassador_hellmawAI : public npc_escortAI return; } - if (CorrosiveAcid_Timer < diff) + if (CorrosiveAcid_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_CORROSIVE_ACID); CorrosiveAcid_Timer = 15000 + rand()%10000; - }else CorrosiveAcid_Timer -= diff; + } else CorrosiveAcid_Timer -= diff; - if (Fear_Timer < diff) + if (Fear_Timer <= diff) { DoCast(m_creature,SPELL_FEAR); Fear_Timer = 20000 + rand()%15000; - }else Fear_Timer -= diff; + } else Fear_Timer -= diff; if (HeroicMode) { - if (!Enraged && Enrage_Timer < diff) + if (!Enraged && Enrage_Timer <= diff) { DoCast(m_creature,SPELL_ENRAGE); Enraged = true; - }else Enrage_Timer -= diff; + } else Enrage_Timer -= diff; } } }; diff --git a/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp b/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp index 94af5f66508..19219e098f5 100644 --- a/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp +++ b/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp @@ -108,47 +108,47 @@ struct TRINITY_DLL_DECL boss_blackheart_the_inciterAI : public ScriptedAI if (InciteChaos) { - if (InciteChaosWait_Timer < diff) + if (InciteChaosWait_Timer <= diff) { InciteChaos = false; InciteChaosWait_Timer = 15000; - }else InciteChaosWait_Timer -= diff; + } else InciteChaosWait_Timer -= diff; return; } - if (InciteChaos_Timer < diff) + if (InciteChaos_Timer <= diff) { DoCast(m_creature, SPELL_INCITE_CHAOS); std::list<HostilReference *> t_list = m_creature->getThreatManager().getThreatList(); for (std::list<HostilReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { - Unit* target = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); - if (target && target->GetTypeId() == TYPEID_PLAYER) - target->CastSpell(target,SPELL_INCITE_CHAOS_B,true); + Unit *pTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); + if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) + pTarget->CastSpell(pTarget,SPELL_INCITE_CHAOS_B,true); } DoResetThreat(); InciteChaos = true; InciteChaos_Timer = 40000; return; - }else InciteChaos_Timer -= diff; + } else InciteChaos_Timer -= diff; //Charge_Timer - if (Charge_Timer < diff) + if (Charge_Timer <= diff) { - if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(target, SPELL_CHARGE); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_CHARGE); Charge_Timer = 15000 + rand()%10000; - }else Charge_Timer -= diff; + } else Charge_Timer -= diff; //Knockback_Timer - if (Knockback_Timer < diff) + if (Knockback_Timer <= diff) { DoCast(m_creature, SPELL_WAR_STOMP); Knockback_Timer = 18000 + rand()%6000; - }else Knockback_Timer -= diff; + } else Knockback_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp b/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp index eac08d62c19..c1673112794 100644 --- a/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp +++ b/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp @@ -88,7 +88,7 @@ struct TRINITY_DLL_DECL mob_voidtravelerAI : public ScriptedAI m_creature->Kill(m_creature); return; } - if (move < diff) + if (move <= diff) { if (sacrificed) { @@ -245,23 +245,23 @@ struct TRINITY_DLL_DECL boss_grandmaster_vorpilAI : public ScriptedAI if (!UpdateVictim()) return; - if (ShadowBoltVolley_Timer < diff) + if (ShadowBoltVolley_Timer <= diff) { DoCast(m_creature,SPELL_SHADOWBOLT_VOLLEY); ShadowBoltVolley_Timer = 15000 + rand()%15000;; } else ShadowBoltVolley_Timer -= diff; - if (HeroicMode && banish_Timer < diff) + if (HeroicMode && banish_Timer <= diff) { - Unit *target = SelectTarget(SELECT_TARGET_RANDOM,0,30,false); - if (target) + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,30,false); + if (pTarget) { - DoCast(target,SPELL_BANISH); + DoCast(pTarget,SPELL_BANISH); banish_Timer = 16000; } } else banish_Timer -= diff; - if (DrawShadows_Timer < diff) + if (DrawShadows_Timer <= diff) { Map* pMap = m_creature->GetMap(); Map::PlayerList const &PlayerList = pMap->GetPlayers(); @@ -279,7 +279,7 @@ struct TRINITY_DLL_DECL boss_grandmaster_vorpilAI : public ScriptedAI DrawShadows_Timer = 30000; } else DrawShadows_Timer -= diff; - if (summonTraveler_Timer < diff) + if (summonTraveler_Timer <= diff) { spawnVoidTraveler(); summonTraveler_Timer = 10000; 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 e6f7e0a0129..48d3e026318 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 @@ -72,14 +72,14 @@ struct TRINITY_DLL_DECL boss_murmurAI : public ScriptedAI std::list<HostilReference *> t_list = m_creature->getThreatManager().getThreatList(); for (std::list<HostilReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { - Unit* target = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); - if (target && target->GetTypeId() == TYPEID_PLAYER) + Unit *pTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); + if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) { //Not do anything without aura, spell can be resisted! - if (target->HasAura(SPELL_SONIC_BOOM_CAST) && m_creature->IsWithinDistInMap(target, 34.0f)) + if (pTarget->HasAura(SPELL_SONIC_BOOM_CAST) && m_creature->IsWithinDistInMap(pTarget, 34.0f)) { //This will be wrong calculation. Also, comments suggest it must deal damage - target->SetHealth(uint32(target->GetMaxHealth() - target->GetMaxHealth() * 0.8)); + pTarget->SetHealth(uint32(pTarget->GetMaxHealth() - pTarget->GetMaxHealth() * 0.8)); } } } @@ -88,15 +88,15 @@ struct TRINITY_DLL_DECL boss_murmurAI : public ScriptedAI void EnterCombat(Unit *who) { } // Sonic Boom instant damage (needs core fix instead of this) - void SpellHitTarget(Unit *target, const SpellEntry *spell) + void SpellHitTarget(Unit *pTarget, const SpellEntry *spell) { - if (target && target->isAlive() && spell && spell->Id == SPELL_SONIC_BOOM_EFFECT) - m_creature->DealDamage(target,(target->GetHealth()*90)/100,NULL,SPELL_DIRECT_DAMAGE,SPELL_SCHOOL_MASK_NATURE,spell); + if (pTarget && pTarget->isAlive() && spell && spell->Id == SPELL_SONIC_BOOM_EFFECT) + m_creature->DealDamage(pTarget,(pTarget->GetHealth()*90)/100,NULL,SPELL_DIRECT_DAMAGE,SPELL_SCHOOL_MASK_NATURE,spell); } void UpdateAI(const uint32 diff) { - //Return since we have no target or casting + //Return since we have no pTarget or casting if (!UpdateVictim() || m_creature->IsNonMeleeSpellCasted(false)) return; @@ -109,80 +109,80 @@ struct TRINITY_DLL_DECL boss_murmurAI : public ScriptedAI SonicBoom = false; Resonance_Timer = 1500; } - if (SonicBoom_Timer < diff) + if (SonicBoom_Timer <= diff) { DoScriptText(EMOTE_SONIC_BOOM, m_creature); DoCast(m_creature, SPELL_SONIC_BOOM_CAST); SonicBoom_Timer = 30000; SonicBoom = true; return; - }else SonicBoom_Timer -= diff; + } else SonicBoom_Timer -= diff; // Murmur's Touch - if (MurmursTouch_Timer < diff) + if (MurmursTouch_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM,0,80,true)) - DoCast(target, SPELL_MURMURS_TOUCH); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,80,true)) + DoCast(pTarget, SPELL_MURMURS_TOUCH); MurmursTouch_Timer = 25000 + rand()%10000; - }else MurmursTouch_Timer -= diff; + } else MurmursTouch_Timer -= diff; // Resonance if (!SonicBoom && !(m_creature->IsWithinMeleeRange(m_creature->getVictim()))) { - if (Resonance_Timer < diff) + if (Resonance_Timer <= diff) { DoCast(m_creature, SPELL_RESONANCE); Resonance_Timer = 5000; - }else Resonance_Timer -= diff; + } else Resonance_Timer -= diff; } // Magnetic Pull - if (MagneticPull_Timer < diff) + if (MagneticPull_Timer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0)) - if (target->GetTypeId() == TYPEID_PLAYER && target->isAlive()) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + if (pTarget->GetTypeId() == TYPEID_PLAYER && pTarget->isAlive()) { - DoCast(target, SPELL_MAGNETIC_PULL); + DoCast(pTarget, SPELL_MAGNETIC_PULL); MagneticPull_Timer = 15000+rand()%15000; return; } MagneticPull_Timer = 500; - }else MagneticPull_Timer -= diff; + } else MagneticPull_Timer -= diff; if (HeroicMode) { // Thundering Storm - if (ThunderingStorm_Timer < diff) + if (ThunderingStorm_Timer <= diff) { std::list<HostilReference*>& m_threatlist = m_creature->getThreatManager().getThreatList(); for (std::list<HostilReference*>::iterator i = m_threatlist.begin(); i != m_threatlist.end(); ++i) - if (Unit* target = Unit::GetUnit((*m_creature),(*i)->getUnitGuid())) - if (target->isAlive() && !m_creature->IsWithinDist(target, 35, false)) - DoCast(target, SPELL_THUNDERING_STORM, true); + if (Unit *pTarget = Unit::GetUnit((*m_creature),(*i)->getUnitGuid())) + if (pTarget->isAlive() && !m_creature->IsWithinDist(pTarget, 35, false)) + DoCast(pTarget, SPELL_THUNDERING_STORM, true); ThunderingStorm_Timer = 15000; - }else ThunderingStorm_Timer -= diff; + } else ThunderingStorm_Timer -= diff; // Sonic Shock - if (SonicShock_Timer < diff) + if (SonicShock_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM,0,20,false)) - if (target->isAlive()) - DoCast(target, SPELL_SONIC_SHOCK); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,20,false)) + if (pTarget->isAlive()) + DoCast(pTarget, SPELL_SONIC_SHOCK); SonicShock_Timer = 10000+rand()%10000; - }else SonicShock_Timer -= diff; + } else SonicShock_Timer -= diff; } - // Select nearest most aggro target if top aggro too far + // Select nearest most aggro pTarget if top aggro too far if (!m_creature->isAttackReady()) return; if (!m_creature->IsWithinMeleeRange(m_creature->getVictim())) { std::list<HostilReference*>& m_threatlist = m_creature->getThreatManager().getThreatList(); for (std::list<HostilReference*>::iterator i = m_threatlist.begin(); i != m_threatlist.end(); ++i) - if (Unit* target = Unit::GetUnit((*m_creature),(*i)->getUnitGuid())) - if (target->isAlive() && m_creature->IsWithinMeleeRange(target)) + if (Unit *pTarget = Unit::GetUnit((*m_creature),(*i)->getUnitGuid())) + if (pTarget->isAlive() && m_creature->IsWithinMeleeRange(pTarget)) { - m_creature->TauntApply(target); + m_creature->TauntApply(pTarget); break; } } diff --git a/src/bindings/scripts/scripts/outland/black_temple/boss_bloodboil.cpp b/src/bindings/scripts/scripts/outland/black_temple/boss_bloodboil.cpp index 9e89c1601d6..18c7640ad9d 100644 --- a/src/bindings/scripts/scripts/outland/black_temple/boss_bloodboil.cpp +++ b/src/bindings/scripts/scripts/outland/black_temple/boss_bloodboil.cpp @@ -126,7 +126,7 @@ struct TRINITY_DLL_DECL boss_gurtogg_bloodboilAI : public ScriptedAI DoScriptText(SAY_DEATH, m_creature); } - // Note: This seems like a very complicated fix. The fix needs to be handled by the core, as implementation of limited-target AoE spells are still not limited. + // Note: This seems like a very complicated fix. The fix needs to be handled by the core, as implementation of limited-pTarget AoE spells are still not limited. void CastBloodboil() { // Get the Threat List @@ -139,10 +139,10 @@ struct TRINITY_DLL_DECL boss_gurtogg_bloodboilAI : public ScriptedAI std::list<HostilReference *>::iterator itr = m_threatlist.begin(); for (; itr!= m_threatlist.end(); ++itr) //store the threat list in a different container { - Unit *target = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); + Unit *pTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); //only on alive players - if (target && target->isAlive() && target->GetTypeId() == TYPEID_PLAYER) - targets.push_back(target); + if (pTarget && pTarget->isAlive() && pTarget->GetTypeId() == TYPEID_PLAYER) + targets.push_back(pTarget); } //Sort the list of players @@ -156,16 +156,16 @@ struct TRINITY_DLL_DECL boss_gurtogg_bloodboilAI : public ScriptedAI { for (std::list<Unit *>::iterator itr = targets.begin(); itr != targets.end(); ++itr) { - Unit* target = *itr; - if (!target) return; + Unit *pTarget = *itr; + if (!pTarget) return; for (uint32 i = 0; i<3; ++i) { uint8 eff = spellInfo->Effect[i]; if (eff>=TOTAL_SPELL_EFFECTS) continue; - Aura *Aur = new Aura(spellInfo, i, target, target, target); - target->AddAura(Aur); + Aura *Aur = new Aura(spellInfo, i, pTarget, pTarget, pTarget); + pTarget->AddAura(Aur); } } }*/ @@ -189,52 +189,52 @@ struct TRINITY_DLL_DECL boss_gurtogg_bloodboilAI : public ScriptedAI if (!UpdateVictim()) return; - if (ArcingSmashTimer < diff) + if (ArcingSmashTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_ARCING_SMASH); ArcingSmashTimer = 10000; - }else ArcingSmashTimer -= diff; + } else ArcingSmashTimer -= diff; - if (FelAcidTimer < diff) + if (FelAcidTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_FEL_ACID); FelAcidTimer = 25000; - }else FelAcidTimer -= diff; + } else FelAcidTimer -= diff; if (!m_creature->HasAura(SPELL_BERSERK)) { - if (EnrageTimer < diff) + if (EnrageTimer <= diff) { DoCast(m_creature, SPELL_BERSERK); DoScriptText(RAND(SAY_ENRAGE1,SAY_ENRAGE2), m_creature); - }else EnrageTimer -= diff; + } else EnrageTimer -= diff; } if (Phase1) { - if (BewilderingStrikeTimer < diff) + if (BewilderingStrikeTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_BEWILDERING_STRIKE); float mt_threat = DoGetThreat(m_creature->getVictim()); - if (Unit* target = SelectUnit(SELECT_TARGET_TOPAGGRO, 1)) - m_creature->AddThreat(target, mt_threat); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_TOPAGGRO, 1)) + m_creature->AddThreat(pTarget, mt_threat); BewilderingStrikeTimer = 20000; - }else BewilderingStrikeTimer -= diff; + } else BewilderingStrikeTimer -= diff; - if (EjectTimer < diff) + if (EjectTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_EJECT1); DoModifyThreatPercent(m_creature->getVictim(), -40); EjectTimer = 15000; - }else EjectTimer -= diff; + } else EjectTimer -= diff; - if (AcidicWoundTimer < diff) + if (AcidicWoundTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_ACIDIC_WOUND); AcidicWoundTimer = 10000; - }else AcidicWoundTimer -= diff; + } else AcidicWoundTimer -= diff; - if (BloodboilTimer < diff) + if (BloodboilTimer <= diff) { if (BloodboilCount < 5) // Only cast it five times. { @@ -243,48 +243,48 @@ struct TRINITY_DLL_DECL boss_gurtogg_bloodboilAI : public ScriptedAI ++BloodboilCount; BloodboilTimer = 10000*BloodboilCount; } - }else BloodboilTimer -= diff; + } else BloodboilTimer -= diff; } if (!Phase1) { - if (AcidGeyserTimer < diff) + if (AcidGeyserTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_ACID_GEYSER); AcidGeyserTimer = 30000; - }else AcidGeyserTimer -= diff; + } else AcidGeyserTimer -= diff; - if (EjectTimer < diff) + if (EjectTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_EJECT2); EjectTimer = 15000; - }else EjectTimer -= diff; + } else EjectTimer -= diff; } - if (PhaseChangeTimer < diff) + if (PhaseChangeTimer <= diff) { if (Phase1) { - Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (target && target->isAlive()) + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + if (pTarget && pTarget->isAlive()) { Phase1 = false; - TargetThreat = DoGetThreat(target); - TargetGUID = target->GetGUID(); - target->CastSpell(m_creature, SPELL_TAUNT_GURTOGG, true); - if (DoGetThreat(target)) - DoModifyThreatPercent(target, -100); - m_creature->AddThreat(target, 50000000.0f); + TargetThreat = DoGetThreat(pTarget); + TargetGUID = pTarget->GetGUID(); + pTarget->CastSpell(m_creature, SPELL_TAUNT_GURTOGG, true); + if (DoGetThreat(pTarget)) + DoModifyThreatPercent(pTarget, -100); + m_creature->AddThreat(pTarget, 50000000.0f); m_creature->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, true); m_creature->ApplySpellImmune(0, IMMUNITY_EFFECT,SPELL_EFFECT_ATTACK_ME, true); // If VMaps are disabled, this spell can call the whole instance DoCast(m_creature, SPELL_INSIGNIFIGANCE, true); - DoCast(target, SPELL_FEL_RAGE_TARGET, true); - DoCast(target,SPELL_FEL_RAGE_2, true); + DoCast(pTarget, SPELL_FEL_RAGE_TARGET, true); + DoCast(pTarget,SPELL_FEL_RAGE_2, true); /* These spells do not work, comment them out for now. - DoCast(target, SPELL_FEL_RAGE_2, true); - DoCast(target, SPELL_FEL_RAGE_3, true);*/ + DoCast(pTarget, SPELL_FEL_RAGE_2, true); + DoCast(pTarget, SPELL_FEL_RAGE_3, true);*/ //Cast this without triggered so that it appears in combat logs and shows visual. DoCast(m_creature, SPELL_FEL_RAGE_SELF); @@ -294,7 +294,7 @@ struct TRINITY_DLL_DECL boss_gurtogg_bloodboilAI : public ScriptedAI AcidGeyserTimer = 1000; PhaseChangeTimer = 30000; } - }else // Encounter is a loop pretty much. Phase 1 -> Phase 2 -> Phase 1 -> Phase 2 till death or enrage + } else // Encounter is a loop pretty much. Phase 1 -> Phase 2 -> Phase 1 -> Phase 2 till death or enrage { if (TargetGUID) RevertThreatOnTarget(TargetGUID); @@ -310,7 +310,7 @@ struct TRINITY_DLL_DECL boss_gurtogg_bloodboilAI : public ScriptedAI m_creature->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, false); m_creature->ApplySpellImmune(0, IMMUNITY_EFFECT,SPELL_EFFECT_ATTACK_ME, false); } - }else PhaseChangeTimer -= diff; + } else PhaseChangeTimer -= diff; DoMeleeAttackIfReady(); } 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 e3d9f3db5ae..8ca08315173 100644 --- a/src/bindings/scripts/scripts/outland/black_temple/boss_illidan.cpp +++ b/src/bindings/scripts/scripts/outland/black_temple/boss_illidan.cpp @@ -73,7 +73,7 @@ const char* SAY_KILL2 = "This is too easy!"; #define SPELL_PARASITIC_SHADOWFIEND 41917 // DoT of 3k Shadow every 2 seconds. Lasts 10 seconds. (Script effect: Summon 2 parasites once the debuff has ticked off) #define SPELL_PARASITIC_SHADOWFIEND2 41914 // Used by Parasitic #define SPELL_SUMMON_PARASITICS 41915 // Summons 2 Parasitic Shadowfiends on the target. It's supposed to be cast as soon as the Parasitic Shadowfiend debuff is gone, but the spells aren't linked :( -#define SPELL_AGONIZING_FLAMES 40932 // 4k fire damage initial to target and anyone w/i 5 yards. PHASE 3 ONLY +#define SPELL_AGONIZING_FLAMES 40932 // 4k fire damage initial to pTarget and anyone w/i 5 yards. PHASE 3 ONLY #define SPELL_ENRAGE 40683 // Increases damage by 50% and attack speed by 30%. 20 seconds, PHASE 5 ONLY // Flying (Phase 2) #define SPELL_THROW_GLAIVE 39635 // Throws a glaive on the ground @@ -100,7 +100,7 @@ const char* SAY_KILL2 = "This is too easy!"; #define SPELL_SUMMON_SHADOWDEMON 41117 // Summon four shadowfiends #define SPELL_SHADOWFIEND_PASSIVE 41913 // Passive aura for shadowfiends #define SPELL_SHADOW_DEMON_PASSIVE 41079 // Adds the "shadowform" aura to Shadow Demons. -#define SPELL_CONSUME_SOUL 41080 // Once the Shadow Demons reach their target, they use this to kill them +#define SPELL_CONSUME_SOUL 41080 // Once the Shadow Demons reach their pTarget, they use this to kill them #define SPELL_PARALYZE 41083 // Shadow Demons cast this on their target #define SPELL_PURPLE_BEAM 39123 // Purple Beam connecting Shadow Demon to their target //Phase Flight spells @@ -466,7 +466,7 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI { if (victim == m_creature) return; // TODO: Find better way to handle emote - switch(rand()%2) + switch (urand(0,1)) { case 0: m_creature->MonsterYell(SAY_KILL1, LANG_UNIVERSAL, victim->GetGUID()); @@ -782,8 +782,8 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI case EVENT_PARASITIC_SHADOWFIEND: { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 200, true)) - m_creature->CastSpell(target, SPELL_PARASITIC_SHADOWFIEND, true); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 200, true)) + m_creature->CastSpell(pTarget, SPELL_PARASITIC_SHADOWFIEND, true); Timer[EVENT_PARASITIC_SHADOWFIEND] = 35000 + rand()%10000; }break; @@ -904,13 +904,13 @@ struct TRINITY_DLL_DECL flame_of_azzinothAI : public ScriptedAI void ChargeCheck() { - Unit* target = SelectTarget(SELECT_TARGET_FARTHEST, 0, 200, false); - if (target && (!m_creature->IsWithinCombatRange(target, FLAME_CHARGE_DISTANCE))) + Unit *pTarget = SelectTarget(SELECT_TARGET_FARTHEST, 0, 200, false); + if (pTarget && (!m_creature->IsWithinCombatRange(pTarget, FLAME_CHARGE_DISTANCE))) { - m_creature->AddThreat(target, 5000000.0f); - AttackStart(target); - DoCast(target, SPELL_CHARGE); - m_creature->MonsterTextEmote(EMOTE_SETS_GAZE_ON, target->GetGUID()); + m_creature->AddThreat(pTarget, 5000000.0f); + AttackStart(pTarget); + DoCast(pTarget, SPELL_CHARGE); + m_creature->MonsterTextEmote(EMOTE_SETS_GAZE_ON, pTarget->GetGUID()); } } @@ -923,8 +923,8 @@ struct TRINITY_DLL_DECL flame_of_azzinothAI : public ScriptedAI Glaive->InterruptNonMeleeSpells(true); DoCast(m_creature, SPELL_FLAME_ENRAGE, true); DoResetThreat(); - Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (target && target->isAlive()) + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + if (pTarget && pTarget->isAlive()) { m_creature->AddThreat(m_creature->getVictim(), 5000000.0f); AttackStart(m_creature->getVictim()); @@ -945,20 +945,20 @@ struct TRINITY_DLL_DECL flame_of_azzinothAI : public ScriptedAI if (!UpdateVictim()) return; - if (FlameBlastTimer < diff) + if (FlameBlastTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_BLAZE_SUMMON, true); //appear at victim DoCast(m_creature->getVictim(), SPELL_FLAME_BLAST); FlameBlastTimer = 15000; //10000 is official-like? DoZoneInCombat(); //in case someone is revived - }else FlameBlastTimer -= diff; + } else FlameBlastTimer -= diff; - if (CheckTimer < diff) + if (CheckTimer <= diff) { ChargeCheck(); EnrageCheck(); CheckTimer = 1000; - }else CheckTimer -= diff; + } else CheckTimer -= diff; DoMeleeAttackIfReady(); } @@ -1315,13 +1315,13 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI { if(m_creature->GetVisibility() == VISIBILITY_OFF) { - if(Check_Timer < diff) + if (Check_Timer <= diff) { if(pInstance && pInstance->GetData(DATA_ILLIDARICOUNCILEVENT) == DONE) m_creature->SetVisibility(VISIBILITY_ON); Check_Timer = 5000; - }else Check_Timer -= diff; + } else Check_Timer -= diff; } Event = false; if (Timer) @@ -1510,9 +1510,9 @@ struct TRINITY_DLL_DECL boss_maievAI : public ScriptedAI { if (GETCRE(Illidan, IllidanGUID)) { - Unit* target = CAST_AI(boss_illidan_stormrageAI, Illidan->AI())->SelectUnit(SELECT_TARGET_RANDOM, 0); + Unit *pTarget = CAST_AI(boss_illidan_stormrageAI, Illidan->AI())->SelectUnit(SELECT_TARGET_RANDOM, 0); - if (!target || !m_creature->IsWithinDistInMap(target, 80) || Illidan->IsWithinDistInMap(target, 20)) + if (!pTarget || !m_creature->IsWithinDistInMap(pTarget, 80) || Illidan->IsWithinDistInMap(pTarget, 20)) { uint8 pos = rand()%4; BlinkTo(HoverPosition[pos].x, HoverPosition[pos].y, HoverPosition[pos].z); @@ -1520,7 +1520,7 @@ struct TRINITY_DLL_DECL boss_maievAI : public ScriptedAI else { float x, y, z; - target->GetPosition(x, y, z); + pTarget->GetPosition(x, y, z); BlinkTo(x, y, z); } } @@ -1668,7 +1668,7 @@ struct TRINITY_DLL_DECL cage_trap_triggerAI : public ScriptedAI void UpdateAI(const uint32 diff) { if (DespawnTimer) - if (DespawnTimer < diff) + if (DespawnTimer <= diff) m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); else DespawnTimer -= diff; @@ -1710,8 +1710,8 @@ struct TRINITY_DLL_DECL shadow_demonAI : public ScriptedAI void JustDied(Unit *killer) { - if (Unit* target = Unit::GetUnit((*m_creature), TargetGUID)) - target->RemoveAurasDueToSpell(SPELL_PARALYZE); + if (Unit *pTarget = Unit::GetUnit((*m_creature), TargetGUID)) + pTarget->RemoveAurasDueToSpell(SPELL_PARALYZE); } void UpdateAI(const uint32 diff) @@ -1727,7 +1727,7 @@ struct TRINITY_DLL_DECL shadow_demonAI : public ScriptedAI DoCast(m_creature->getVictim(), SPELL_PURPLE_BEAM, true); DoCast(m_creature->getVictim(), SPELL_PARALYZE, true); } - // Kill our target if we're very close. + // Kill our pTarget if we're very close. if (m_creature->IsWithinDistInMap(m_creature->getVictim(), 3)) DoCast(m_creature->getVictim(), SPELL_CONSUME_SOUL); } @@ -1778,8 +1778,8 @@ struct TRINITY_DLL_DECL mob_parasitic_shadowfiendAI : public ScriptedAI { if (!m_creature->getVictim()) { - if (Unit *target = SelectTarget(SELECT_TARGET_RANDOM, 0, 999, true)) - AttackStart(target); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 999, true)) + AttackStart(pTarget); else { m_creature->SetVisibility(VISIBILITY_OFF); @@ -1788,7 +1788,7 @@ struct TRINITY_DLL_DECL mob_parasitic_shadowfiendAI : public ScriptedAI } } - if (CheckTimer < diff) + if (CheckTimer <= diff) { GETUNIT(Illidan, IllidanGUID); if (!Illidan || CAST_CRE(Illidan)->IsInEvadeMode()) @@ -1796,8 +1796,8 @@ struct TRINITY_DLL_DECL mob_parasitic_shadowfiendAI : public ScriptedAI m_creature->SetVisibility(VISIBILITY_OFF); m_creature->setDeathState(JUST_DIED); return; - }else CheckTimer = 5000; - }else CheckTimer -= diff; + } else CheckTimer = 5000; + } else CheckTimer -= diff; DoMeleeAttackIfReady(); } @@ -1874,18 +1874,18 @@ void boss_illidan_stormrageAI::JustSummoned(Creature* summon) summon->setDeathState(JUST_DIED); return; } - Unit *target = SelectTarget(SELECT_TARGET_TOPAGGRO, 0, 999, true); - if (!target || target->HasAura(SPELL_PARASITIC_SHADOWFIEND) - || target->HasAura(SPELL_PARASITIC_SHADOWFIEND2)) - target = SelectTarget(SELECT_TARGET_RANDOM, 0, 999, true); - if (target) - summon->AI()->AttackStart(target); + Unit *pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 0, 999, true); + if (!pTarget || pTarget->HasAura(SPELL_PARASITIC_SHADOWFIEND) + || pTarget->HasAura(SPELL_PARASITIC_SHADOWFIEND2)) + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 999, true); + if (pTarget) + summon->AI()->AttackStart(pTarget); }break; case SHADOW_DEMON: - if (Unit *target = SelectTarget(SELECT_TARGET_RANDOM, 0, 999, true)) // only on players. + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 999, true)) // only on players. { - summon->AddThreat(target, 5000000.0f); - summon->AI()->AttackStart(target); + summon->AddThreat(pTarget, 5000000.0f); + summon->AI()->AttackStart(pTarget); }break; case MAIEV_SHADOWSONG: { diff --git a/src/bindings/scripts/scripts/outland/black_temple/boss_mother_shahraz.cpp b/src/bindings/scripts/scripts/outland/black_temple/boss_mother_shahraz.cpp index decd79c17b4..e0556c3f47e 100644 --- a/src/bindings/scripts/scripts/outland/black_temple/boss_mother_shahraz.cpp +++ b/src/bindings/scripts/scripts/outland/black_temple/boss_mother_shahraz.cpp @@ -176,10 +176,10 @@ struct TRINITY_DLL_DECL boss_shahrazAI : public ScriptedAI } //Randomly cast one beam. - if (BeamTimer < diff) + if (BeamTimer <= diff) { - Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (!target || !target->isAlive()) + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + if (!pTarget || !pTarget->isAlive()) return; BeamTimer = 9000; @@ -187,16 +187,16 @@ struct TRINITY_DLL_DECL boss_shahrazAI : public ScriptedAI switch(CurrentBeam) { case 0: - DoCast(target, SPELL_BEAM_SINISTER); + DoCast(pTarget, SPELL_BEAM_SINISTER); break; case 1: - DoCast(target, SPELL_BEAM_VILE); + DoCast(pTarget, SPELL_BEAM_VILE); break; case 2: - DoCast(target, SPELL_BEAM_WICKED); + DoCast(pTarget, SPELL_BEAM_WICKED); break; case 3: - DoCast(target, SPELL_BEAM_SINFUL); + DoCast(pTarget, SPELL_BEAM_SINFUL); break; } BeamCount++; @@ -205,19 +205,19 @@ struct TRINITY_DLL_DECL boss_shahrazAI : public ScriptedAI while(CurrentBeam == Beam) CurrentBeam = rand()%3; - }else BeamTimer -= diff; + } else BeamTimer -= diff; // Random Prismatic Shield every 15 seconds. - if (PrismaticShieldTimer < diff) + if (PrismaticShieldTimer <= diff) { uint32 random = rand()%6; if (PrismaticAuras[random]) DoCast(m_creature, PrismaticAuras[random]); PrismaticShieldTimer = 15000; - }else PrismaticShieldTimer -= diff; + } else PrismaticShieldTimer -= diff; - // Select 3 random targets (can select same target more than once), teleport to a random location then make them cast explosions until they get away from each other. - if (FatalAttractionTimer < diff) + // Select 3 random targets (can select same pTarget more than once), teleport to a random location then make them cast explosions until they get away from each other. + if (FatalAttractionTimer <= diff) { ExplosionCount = 0; @@ -226,9 +226,9 @@ struct TRINITY_DLL_DECL boss_shahrazAI : public ScriptedAI DoScriptText(RAND(SAY_SPELL2,SAY_SPELL3), m_creature); FatalAttractionExplodeTimer = 2000; FatalAttractionTimer = 40000 + rand()%31 * 1000; - }else FatalAttractionTimer -= diff; + } else FatalAttractionTimer -= diff; - if (FatalAttractionExplodeTimer < diff) + if (FatalAttractionExplodeTimer <= diff) { // Just make them explode three times... they're supposed to keep exploding while they are in range, but it'll take too much code. I'll try to think of an efficient way for it later. if (ExplosionCount < 3) @@ -253,34 +253,34 @@ struct TRINITY_DLL_DECL boss_shahrazAI : public ScriptedAI FatalAttractionExplodeTimer = FatalAttractionTimer + 2000; ExplosionCount = 0; } - }else FatalAttractionExplodeTimer -= diff; + } else FatalAttractionExplodeTimer -= diff; - if (ShriekTimer < diff) + if (ShriekTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_SILENCING_SHRIEK); ShriekTimer = 25000+rand()%10 * 1000; - }else ShriekTimer -= diff; + } else ShriekTimer -= diff; - if (SaberTimer < diff) + if (SaberTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_SABER_LASH); SaberTimer = 25000+rand()%10 * 1000; - }else SaberTimer -= diff; + } else SaberTimer -= diff; //Enrage if (!m_creature->HasAura(SPELL_BERSERK)) - if (EnrageTimer < diff) + if (EnrageTimer <= diff) { DoCast(m_creature, SPELL_BERSERK); DoScriptText(SAY_ENRAGE, m_creature); - }else EnrageTimer -= diff; + } else EnrageTimer -= diff; //Random taunts - if (RandomYellTimer < diff) + if (RandomYellTimer <= diff) { DoScriptText(RAND(SAY_TAUNT1,SAY_TAUNT2,SAY_TAUNT3), m_creature); RandomYellTimer = 60000 + rand()%91 * 1000; - }else RandomYellTimer -= diff; + } else RandomYellTimer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/outland/black_temple/boss_reliquary_of_souls.cpp b/src/bindings/scripts/scripts/outland/black_temple/boss_reliquary_of_souls.cpp index f8d64512640..443b74f0b01 100644 --- a/src/bindings/scripts/scripts/outland/black_temple/boss_reliquary_of_souls.cpp +++ b/src/bindings/scripts/scripts/outland/black_temple/boss_reliquary_of_souls.cpp @@ -175,20 +175,20 @@ struct TRINITY_DLL_DECL boss_reliquary_of_soulsAI : public ScriptedAI float y = Coords[random].y; Creature* Soul = m_creature->SummonCreature(CREATURE_ENSLAVED_SOUL, x, y, m_creature->GetPositionZ(), m_creature->GetOrientation(), TEMPSUMMON_CORPSE_DESPAWN, 0); if (!Soul) return false; - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) { CAST_AI(npc_enslaved_soulAI, Soul->AI())->ReliquaryGUID = m_creature->GetGUID(); - Soul->AI()->AttackStart(target); - }else EnterEvadeMode(); + Soul->AI()->AttackStart(pTarget); + } else EnterEvadeMode(); return true; } - void MergeThreatList(Creature* target) + void MergeThreatList(Creature *pTarget) { - if (!target) + if (!pTarget) return; - std::list<HostilReference*>& m_threatlist = target->getThreatManager().getThreatList(); + std::list<HostilReference*>& m_threatlist = pTarget->getThreatManager().getThreatList(); std::list<HostilReference*>::iterator itr = m_threatlist.begin(); for (; itr != m_threatlist.end(); itr++) { @@ -196,8 +196,8 @@ struct TRINITY_DLL_DECL boss_reliquary_of_soulsAI : public ScriptedAI if (pUnit) { DoModifyThreatPercent(pUnit, -100); - float threat = target->getThreatManager().getThreat(pUnit); - m_creature->AddThreat(pUnit, threat); // This makes it so that the unit has the same amount of threat in Reliquary's threatlist as in the target creature's (One of the Essences). + float threat = pTarget->getThreatManager().getThreat(pUnit); + m_creature->AddThreat(pUnit, threat); // This makes it so that the unit has the same amount of threat in Reliquary's threatlist as in the pTarget creature's (One of the Essences). } } } @@ -230,7 +230,7 @@ struct TRINITY_DLL_DECL boss_reliquary_of_soulsAI : public ScriptedAI } } - if (Timer < diff) + if (Timer <= diff) { switch(Counter) { @@ -253,7 +253,7 @@ struct TRINITY_DLL_DECL boss_reliquary_of_soulsAI : public ScriptedAI Summon->AI()->AttackStart(SelectUnit(SELECT_TARGET_TOPAGGRO, 0)); EssenceGUID = Summon->GetGUID(); DoStartNoMovement(m_creature); - }else EnterEvadeMode(); + } else EnterEvadeMode(); break; case 3: Timer = 1000; @@ -271,7 +271,7 @@ struct TRINITY_DLL_DECL boss_reliquary_of_soulsAI : public ScriptedAI Essence->RemoveAllAuras(); Essence->DeleteThreatList(); Essence->GetMotionMaster()->MoveFollow(m_creature,0.0f,0.0f); - }else return; + } else return; } break; case 4: @@ -327,7 +327,7 @@ struct TRINITY_DLL_DECL boss_reliquary_of_soulsAI : public ScriptedAI break; } Counter++; - }else Timer -= diff; + } else Timer -= diff; } }; @@ -400,11 +400,11 @@ struct TRINITY_DLL_DECL boss_essence_of_sufferingAI : public ScriptedAI return; // No targets added for some reason. No point continuing. targets.sort(ObjectDistanceOrder(m_creature)); // Sort players by distance. targets.resize(1); // Only need closest target. - Unit* target = targets.front(); // Get the first target. - if (target) - target->CastSpell(m_creature, SPELL_FIXATE_TAUNT, true); + Unit *pTarget = targets.front(); // Get the first target. + if (pTarget) + pTarget->CastSpell(m_creature, SPELL_FIXATE_TAUNT, true); DoResetThreat(); - m_creature->AddThreat(target,1000000); + m_creature->AddThreat(pTarget,1000000); } void UpdateAI(const uint32 diff) @@ -412,7 +412,7 @@ struct TRINITY_DLL_DECL boss_essence_of_sufferingAI : public ScriptedAI if (m_creature->isInCombat()) { //Supposed to be cast on nearest target - if (FixateTimer < diff) + if (FixateTimer <= diff) { CastFixate(); FixateTimer = 5000; @@ -420,25 +420,25 @@ struct TRINITY_DLL_DECL boss_essence_of_sufferingAI : public ScriptedAI { DoScriptText(SUFF_SAY_AGGRO, m_creature); } - }else FixateTimer -= diff; + } else FixateTimer -= diff; } //Return since we have no target if (!UpdateVictim()) return; - if (EnrageTimer < diff) + if (EnrageTimer <= diff) { DoCast(m_creature, SPELL_ENRAGE); EnrageTimer = 60000; DoScriptText(SUFF_EMOTE_ENRAGE, m_creature); - }else EnrageTimer -= diff; + } else EnrageTimer -= diff; - if (SoulDrainTimer < diff) + if (SoulDrainTimer <= diff) { DoCast(SelectUnit(SELECT_TARGET_RANDOM,0), SPELL_SOUL_DRAIN); SoulDrainTimer = 60000; - }else SoulDrainTimer -= diff; + } else SoulDrainTimer -= diff; DoMeleeAttackIfReady(); } @@ -505,22 +505,22 @@ struct TRINITY_DLL_DECL boss_essence_of_desireAI : public ScriptedAI if (!UpdateVictim()) return; - if (RuneShieldTimer < diff) + if (RuneShieldTimer <= diff) { m_creature->InterruptNonMeleeSpells(false); m_creature->CastSpell(m_creature, SPELL_RUNE_SHIELD, true); SoulShockTimer += 2000; DeadenTimer += 2000; RuneShieldTimer = 60000; - }else RuneShieldTimer -= diff; + } else RuneShieldTimer -= diff; - if (SoulShockTimer < diff) + if (SoulShockTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_SOUL_SHOCK); SoulShockTimer = 5000; - }else SoulShockTimer -= diff; + } else SoulShockTimer -= diff; - if (DeadenTimer < diff) + if (DeadenTimer <= diff) { m_creature->InterruptNonMeleeSpells(false); DoCast(m_creature->getVictim(), SPELL_DEADEN); @@ -529,7 +529,7 @@ struct TRINITY_DLL_DECL boss_essence_of_desireAI : public ScriptedAI { DoScriptText(DESI_SAY_SPEC, m_creature); } - }else DeadenTimer -= diff; + } else DeadenTimer -= diff; DoMeleeAttackIfReady(); } @@ -592,7 +592,7 @@ struct TRINITY_DLL_DECL boss_essence_of_angerAI : public ScriptedAI CheckedAggro = true; } - if (CheckTankTimer < diff) + if (CheckTankTimer <= diff) { if (m_creature->getVictim()->GetGUID() != AggroTargetGUID) { @@ -601,9 +601,9 @@ struct TRINITY_DLL_DECL boss_essence_of_angerAI : public ScriptedAI AggroTargetGUID = m_creature->getVictim()->GetGUID(); } CheckTankTimer = 2000; - }else CheckTankTimer -= diff; + } else CheckTankTimer -= diff; - if (SoulScreamTimer < diff) + if (SoulScreamTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_SOUL_SCREAM); SoulScreamTimer = 9000 + rand()%2000; @@ -611,14 +611,14 @@ struct TRINITY_DLL_DECL boss_essence_of_angerAI : public ScriptedAI { DoScriptText(ANGER_SAY_SPEC, m_creature); } - }else SoulScreamTimer -= diff; + } else SoulScreamTimer -= diff; - if (SpiteTimer < diff) + if (SpiteTimer <= diff) { DoCast(m_creature, SPELL_SPITE_TARGET); SpiteTimer = 30000; DoScriptText(ANGER_SAY_SPEC, m_creature); - }else SpiteTimer -= diff; + } else SpiteTimer -= diff; DoMeleeAttackIfReady(); } 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 b7a2d7fec19..df4e5617446 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 @@ -142,7 +142,7 @@ struct TRINITY_DLL_DECL mob_ashtongue_sorcererAI : public ScriptedAI if (StartBanishing) return; - if (CheckTimer < diff) + if (CheckTimer <= diff) { Creature* Shade = Unit::GetCreature((*m_creature), ShadeGUID); if (Shade && Shade->isAlive() && m_creature->isAlive()) @@ -158,7 +158,7 @@ struct TRINITY_DLL_DECL mob_ashtongue_sorcererAI : public ScriptedAI } } CheckTimer = 2000; - }else CheckTimer -= diff; + } else CheckTimer -= diff; } }; @@ -276,7 +276,7 @@ struct TRINITY_DLL_DECL boss_shade_of_akamaAI : public ScriptedAI GridSearcherSucceeded = true; } } - }else error_log("SD2 ERROR: No Channelers are stored in the list. This encounter will not work properly"); + } else error_log("SD2 ERROR: No Channelers are stored in the list. This encounter will not work properly"); } } @@ -333,8 +333,8 @@ struct TRINITY_DLL_DECL boss_shade_of_akamaAI : public ScriptedAI { Spawn->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); Spawn->GetMotionMaster()->MovePoint(0, AGGRO_X, AGGRO_Y, AGGRO_Z); - Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 1); - Spawn->AI()->AttackStart(target); + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 1); + Spawn->AI()->AttackStart(pTarget); } } } @@ -386,7 +386,7 @@ struct TRINITY_DLL_DECL boss_shade_of_akamaAI : public ScriptedAI return; } - if (DefenderTimer < diff) + if (DefenderTimer <= diff) { uint32 ran = rand()%2; Creature* Defender = m_creature->SummonCreature(CREATURE_DEFENDER, SpawnLocations[ran].x, SpawnLocations[ran].y, Z_SPAWN, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 25000); @@ -403,19 +403,19 @@ struct TRINITY_DLL_DECL boss_shade_of_akamaAI : public ScriptedAI // They move towards AKama Defender->GetMotionMaster()->MovePoint(0, x, y, z); Defender->AI()->AttackStart(Akama); - }else move = false; - }else move = false; + } else move = false; + } else move = false; if (!move) Defender->GetMotionMaster()->MovePoint(0, AKAMA_X, AKAMA_Y, AKAMA_Z); } DefenderTimer = 15000; - }else DefenderTimer -= diff; + } else DefenderTimer -= diff; - if (SummonTimer < diff) + if (SummonTimer <= diff) { SummonCreature(); SummonTimer = 35000; - }else SummonTimer -= diff; + } else SummonTimer -= diff; if (DeathCount >= 6) { @@ -442,7 +442,7 @@ struct TRINITY_DLL_DECL boss_shade_of_akamaAI : public ScriptedAI } else // No longer banished, let's fight Akama now { - if (ReduceHealthTimer < diff) + if (ReduceHealthTimer <= diff) { if (AkamaGUID) { @@ -454,7 +454,7 @@ struct TRINITY_DLL_DECL boss_shade_of_akamaAI : public ScriptedAI ReduceHealthTimer = 12000; } } - }else ReduceHealthTimer -= diff; + } else ReduceHealthTimer -= diff; if (HasKilledAkama) { @@ -468,7 +468,7 @@ struct TRINITY_DLL_DECL boss_shade_of_akamaAI : public ScriptedAI m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); m_creature->GetMotionMaster()->MoveTargetedHome(); } - if (ResetTimer < diff) + if (ResetTimer <= diff) { EnterEvadeMode();// Reset a little while after killing Akama, evade and respawn Akama return; @@ -651,11 +651,11 @@ struct TRINITY_DLL_DECL npc_akamaAI : public ScriptedAI { if (CAST_AI(boss_shade_of_akamaAI, Shade->AI())->IsBanished) { - if (CastSoulRetrieveTimer < diff) + if (CastSoulRetrieveTimer <= diff) { DoCast(Shade, SPELL_AKAMA_SOUL_CHANNEL); CastSoulRetrieveTimer = 500; - }else CastSoulRetrieveTimer -= diff; + } else CastSoulRetrieveTimer -= diff; } else { @@ -675,7 +675,7 @@ struct TRINITY_DLL_DECL npc_akamaAI : public ScriptedAI if (!ShadeHasDied && StartCombat) { - if (CheckTimer < diff) + if (CheckTimer <= diff) { if (ShadeGUID) { @@ -694,7 +694,7 @@ struct TRINITY_DLL_DECL npc_akamaAI : public ScriptedAI } } CheckTimer = 5000; - }else CheckTimer -= diff; + } else CheckTimer -= diff; } if (SummonBrokenTimer && BrokenSummonIndex < 4) @@ -720,7 +720,7 @@ struct TRINITY_DLL_DECL npc_akamaAI : public ScriptedAI } ++BrokenSummonIndex; SummonBrokenTimer = 1000; - }else SummonBrokenTimer -= diff; + } else SummonBrokenTimer -= diff; } if (SoulRetrieveTimer) @@ -778,24 +778,24 @@ struct TRINITY_DLL_DECL npc_akamaAI : public ScriptedAI SoulRetrieveTimer = 0; break; } - }else SoulRetrieveTimer -= diff; + } else SoulRetrieveTimer -= diff; if (!UpdateVictim()) return; - if (DestructivePoisonTimer < diff) + if (DestructivePoisonTimer <= diff) { Creature* Shade = Unit::GetCreature((*m_creature), ShadeGUID); if (Shade && Shade->isAlive()) DoCast(Shade, SPELL_DESTRUCTIVE_POISON); DestructivePoisonTimer = 15000; - }else DestructivePoisonTimer -= diff; + } else DestructivePoisonTimer -= diff; - if (LightningBoltTimer < diff) + if (LightningBoltTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_LIGHTNING_BOLT); LightningBoltTimer = 10000; - }else LightningBoltTimer -= diff; + } else LightningBoltTimer -= diff; DoMeleeAttackIfReady(); } 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 9b652c20c33..515dcb0c417 100644 --- a/src/bindings/scripts/scripts/outland/black_temple/boss_supremus.cpp +++ b/src/bindings/scripts/scripts/outland/black_temple/boss_supremus.cpp @@ -147,7 +147,7 @@ struct TRINITY_DLL_DECL boss_supremusAI : public ScriptedAI Unit* CalculateHatefulStrikeTarget() { uint32 health = 0; - Unit* target = NULL; + Unit *pTarget = NULL; std::list<HostilReference*>& m_threatlist = m_creature->getThreatManager().getThreatList(); std::list<HostilReference*>::iterator i = m_threatlist.begin(); @@ -159,12 +159,12 @@ struct TRINITY_DLL_DECL boss_supremusAI : public ScriptedAI if (pUnit->GetHealth() > health) { health = pUnit->GetHealth(); - target = pUnit; + pTarget = pUnit; } } } - return target; + return pTarget; } void UpdateAI(const uint32 diff) @@ -187,28 +187,28 @@ struct TRINITY_DLL_DECL boss_supremusAI : public ScriptedAI events.ScheduleEvent(EVENT_FLAME, 20000, GCD_CAST); break; case EVENT_HATEFUL_STRIKE: - if (Unit* target = CalculateHatefulStrikeTarget()) - DoCast(target, SPELL_HATEFUL_STRIKE); + if (Unit *pTarget = CalculateHatefulStrikeTarget()) + DoCast(pTarget, SPELL_HATEFUL_STRIKE); events.DelayEvents(1000, GCD_CAST); events.ScheduleEvent(EVENT_HATEFUL_STRIKE, 5000, GCD_CAST, PHASE_STRIKE); break; case EVENT_SWITCH_TARGET: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true)) { DoResetThreat(); - m_creature->AddThreat(target, 5000000.0f); + m_creature->AddThreat(pTarget, 5000000.0f); DoScriptText(EMOTE_NEW_TARGET, m_creature); } events.ScheduleEvent(EVENT_SWITCH_TARGET, 10000, 0, PHASE_CHASE); break; case EVENT_VOLCANO: { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 999, true); - if (!target) target = m_creature->getVictim(); - if (target) + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 999, true); + if (!pTarget) pTarget = m_creature->getVictim(); + if (pTarget) { - //DoCast(target, SPELL_VOLCANIC_SUMMON);//movement bugged - m_creature->SummonCreature(CREATURE_VOLCANO,target->GetPositionX(),target->GetPositionY(),target->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN,30000); + //DoCast(pTarget, SPELL_VOLCANIC_SUMMON);//movement bugged + m_creature->SummonCreature(CREATURE_VOLCANO,pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN,30000); DoScriptText(EMOTE_GROUND_CRACK, m_creature); events.DelayEvents(1500, GCD_CAST); } diff --git a/src/bindings/scripts/scripts/outland/black_temple/boss_teron_gorefiend.cpp b/src/bindings/scripts/scripts/outland/black_temple/boss_teron_gorefiend.cpp index 0dca28525f9..cd758269ffc 100644 --- a/src/bindings/scripts/scripts/outland/black_temple/boss_teron_gorefiend.cpp +++ b/src/bindings/scripts/scripts/outland/black_temple/boss_teron_gorefiend.cpp @@ -76,7 +76,7 @@ struct TRINITY_DLL_DECL mob_doom_blossomAI : public ScriptedAI void UpdateAI(const uint32 diff) { - if (CheckTeronTimer < diff) + if (CheckTeronTimer <= diff) { if (TeronGUID) { @@ -90,13 +90,13 @@ struct TRINITY_DLL_DECL mob_doom_blossomAI : public ScriptedAI Despawn(); CheckTeronTimer = 5000; - }else CheckTeronTimer -= diff; + } else CheckTeronTimer -= diff; if (ShadowBoltTimer < diff && m_creature->isInCombat()) { DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_SHADOWBOLT); ShadowBoltTimer = 10000; - }else ShadowBoltTimer -= diff; + } else ShadowBoltTimer -= diff; return; } @@ -154,30 +154,30 @@ struct TRINITY_DLL_DECL mob_shadowy_constructAI : public ScriptedAI targets.push_back(pUnit); } targets.sort(ObjectDistanceOrder(m_creature)); - Unit* target = targets.front(); - if (target && m_creature->IsWithinDistInMap(target, m_creature->GetAttackDistance(target))) + Unit *pTarget = targets.front(); + if (pTarget && m_creature->IsWithinDistInMap(pTarget, m_creature->GetAttackDistance(pTarget))) { - DoCast(target, SPELL_ATROPHY); - m_creature->AI()->AttackStart(target); + DoCast(pTarget, SPELL_ATROPHY); + m_creature->AI()->AttackStart(pTarget); } } void UpdateAI(const uint32 diff) { - if (CheckPlayerTimer < diff) + if (CheckPlayerTimer <= diff) { CheckPlayers(); CheckPlayerTimer = 3000; - }else CheckPlayerTimer -= diff; + } else CheckPlayerTimer -= diff; - if (CheckTeronTimer < diff) + if (CheckTeronTimer <= diff) { Creature* Teron = (Unit::GetCreature((*m_creature), TeronGUID)); if (!Teron || !Teron->isAlive() || Teron->IsInEvadeMode()) m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); CheckTeronTimer = 5000; - }else CheckTeronTimer -= diff; + } else CheckTeronTimer -= diff; } }; @@ -266,7 +266,7 @@ struct TRINITY_DLL_DECL boss_teron_gorefiendAI : public ScriptedAI float CalculateRandomLocation(float Loc, uint32 radius) { float coord = Loc; - switch(rand()%2) + switch (urand(0,1)) { case 0: coord += rand()%radius; @@ -329,12 +329,12 @@ struct TRINITY_DLL_DECL boss_teron_gorefiendAI : public ScriptedAI Construct->CastSpell(Construct, SPELL_PASSIVE_SHADOWFORM, true); SetThreatList(Construct); // Use same function as Doom Blossom to set Threat List. CAST_AI(mob_shadowy_constructAI, Construct->AI())->GhostGUID = GhostGUID; - Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 1); - if (!target) // someone's trying to solo. - target = m_creature->getVictim(); + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 1); + if (!pTarget) // someone's trying to solo. + pTarget = m_creature->getVictim(); - if (target) - Construct->GetMotionMaster()->MoveChase(target); + if (pTarget) + Construct->GetMotionMaster()->MoveChase(pTarget); } } } @@ -344,7 +344,7 @@ struct TRINITY_DLL_DECL boss_teron_gorefiendAI : public ScriptedAI { if (Intro && !Done) { - if (AggroTimer < diff) + if (AggroTimer <= diff) { m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -364,13 +364,13 @@ struct TRINITY_DLL_DECL boss_teron_gorefiendAI : public ScriptedAI EnterEvadeMode(); return; } - }else AggroTimer -= diff; + } else AggroTimer -= diff; } if (!UpdateVictim() || !Done) return; - if (SummonShadowsTimer < diff) + if (SummonShadowsTimer <= diff) { //MindControlGhost(); @@ -381,91 +381,91 @@ struct TRINITY_DLL_DECL boss_teron_gorefiendAI : public ScriptedAI Shadow = m_creature->SummonCreature(CREATURE_SHADOWY_CONSTRUCT, X, m_creature->GetPositionY(), m_creature->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 0); if (Shadow) { - Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 1); - if (!target) - target = m_creature->getVictim(); + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 1); + if (!pTarget) + pTarget = m_creature->getVictim(); - if (target) - Shadow->AI()->AttackStart(target); + if (pTarget) + Shadow->AI()->AttackStart(pTarget); } } SummonShadowsTimer = 60000; - }else SummonShadowsTimer -= diff; + } else SummonShadowsTimer -= diff; - if (SummonDoomBlossomTimer < diff) + if (SummonDoomBlossomTimer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) { - float X = CalculateRandomLocation(target->GetPositionX(), 20); - float Y = CalculateRandomLocation(target->GetPositionY(), 20); - float Z = target->GetPositionZ(); + float X = CalculateRandomLocation(pTarget->GetPositionX(), 20); + float Y = CalculateRandomLocation(pTarget->GetPositionY(), 20); + float Z = pTarget->GetPositionZ(); Z = m_creature->GetMap()->GetVmapHeight(X, Y, Z, true); Creature* DoomBlossom = m_creature->SummonCreature(CREATURE_DOOM_BLOSSOM, X, Y, Z, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 20000); if (DoomBlossom) { DoomBlossom->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); DoomBlossom->setFaction(m_creature->getFaction()); - DoomBlossom->AddThreat(target, 1.0f); + DoomBlossom->AddThreat(pTarget, 1.0f); CAST_AI(mob_doom_blossomAI, DoomBlossom->AI())->SetTeronGUID(m_creature->GetGUID()); - target->CombatStart(DoomBlossom); + pTarget->CombatStart(DoomBlossom); SetThreatList(DoomBlossom); SummonDoomBlossomTimer = 35000; } } - }else SummonDoomBlossomTimer -= diff; + } else SummonDoomBlossomTimer -= diff; - if (IncinerateTimer < diff) + if (IncinerateTimer <= diff) { - Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 1); - if (!target) - target = m_creature->getVictim(); + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 1); + if (!pTarget) + pTarget = m_creature->getVictim(); - if (target) + if (pTarget) { DoScriptText(RAND(SAY_SPECIAL1,SAY_SPECIAL2), m_creature); - DoCast(target, SPELL_INCINERATE); + DoCast(pTarget, SPELL_INCINERATE); IncinerateTimer = 20000 + rand()%31 * 1000; } - }else IncinerateTimer -= diff; + } else IncinerateTimer -= diff; - if (CrushingShadowsTimer < diff) + if (CrushingShadowsTimer <= diff) { - Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (target && target->isAlive()) - DoCast(target, SPELL_CRUSHING_SHADOWS); + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + if (pTarget && pTarget->isAlive()) + DoCast(pTarget, SPELL_CRUSHING_SHADOWS); CrushingShadowsTimer = 10000 + rand()%16 * 1000; - }else CrushingShadowsTimer -= diff; + } else CrushingShadowsTimer -= diff; /*** NOTE FOR FUTURE DEV: UNCOMMENT BELOW ONLY IF MIND CONTROL IS FULLY IMPLEMENTED **/ - /*if (ShadowOfDeathTimer < diff) + /*if (ShadowOfDeathTimer <= diff) { - Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 1); + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 1); - if (!target) - target = m_creature->getVictim(); + if (!pTarget) + pTarget = m_creature->getVictim(); - if (target && target->isAlive() && target->GetTypeId() == TYPEID_PLAYER) + if (pTarget && pTarget->isAlive() && pTarget->GetTypeId() == TYPEID_PLAYER) { - DoCast(target, SPELL_SHADOW_OF_DEATH); - GhostGUID = target->GetGUID(); + DoCast(pTarget, SPELL_SHADOW_OF_DEATH); + GhostGUID = pTarget->GetGUID(); ShadowOfDeathTimer = 30000; SummonShadowsTimer = 53000; // Make it VERY close but slightly less so that we can check if the aura is still on the player } - }else ShadowOfDeathTimer -= diff;*/ + } else ShadowOfDeathTimer -= diff;*/ - if (RandomYellTimer < diff) + if (RandomYellTimer <= diff) { DoScriptText(RAND(SAY_SPELL1,SAY_SPELL2), m_creature); RandomYellTimer = 50000 + rand()%51 * 1000; - }else RandomYellTimer -= diff; + } else RandomYellTimer -= diff; if (!m_creature->HasAura(SPELL_BERSERK)) { - if (EnrageTimer < diff) + if (EnrageTimer <= diff) { DoCast(m_creature, SPELL_BERSERK); DoScriptText(SAY_ENRAGE, m_creature); - }else EnrageTimer -= diff; + } else EnrageTimer -= diff; } DoMeleeAttackIfReady(); diff --git a/src/bindings/scripts/scripts/outland/black_temple/boss_warlord_najentus.cpp b/src/bindings/scripts/scripts/outland/black_temple/boss_warlord_najentus.cpp index 0e58ba37d7c..026ec7a4ade 100644 --- a/src/bindings/scripts/scripts/outland/black_temple/boss_warlord_najentus.cpp +++ b/src/bindings/scripts/scripts/outland/black_temple/boss_warlord_najentus.cpp @@ -119,9 +119,9 @@ struct TRINITY_DLL_DECL boss_najentusAI : public ScriptedAI bool RemoveImpalingSpine() { if (!SpineTargetGUID) return false; - Unit* target = Unit::GetUnit(*m_creature, SpineTargetGUID); - if (target && target->HasAura(SPELL_IMPALING_SPINE)) - target->RemoveAurasDueToSpell(SPELL_IMPALING_SPINE); + Unit *pTarget = Unit::GetUnit(*m_creature, SpineTargetGUID); + if (pTarget && pTarget->HasAura(SPELL_IMPALING_SPINE)) + pTarget->RemoveAurasDueToSpell(SPELL_IMPALING_SPINE); SpineTargetGUID=0; return true; } @@ -155,14 +155,14 @@ struct TRINITY_DLL_DECL boss_najentusAI : public ScriptedAI break; case EVENT_SPINE: { - Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 1); - if (!target) target = m_creature->getVictim(); - if (target) + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 1); + if (!pTarget) pTarget = m_creature->getVictim(); + if (pTarget) { - m_creature->CastSpell(target, SPELL_IMPALING_SPINE, true); - SpineTargetGUID = target->GetGUID(); - //must let target summon, otherwise you cannot click the spine - target->SummonGameObject(GOBJECT_SPINE, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), m_creature->GetOrientation(), 0, 0, 0, 0, 30); + m_creature->CastSpell(pTarget, SPELL_IMPALING_SPINE, true); + SpineTargetGUID = pTarget->GetGUID(); + //must let pTarget summon, otherwise you cannot click the spine + pTarget->SummonGameObject(GOBJECT_SPINE, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), m_creature->GetOrientation(), 0, 0, 0, 0, 30); DoScriptText(rand()%2 ? SAY_NEEDLE1 : SAY_NEEDLE2, m_creature); events.DelayEvents(1500, GCD_CAST); events.DelayEvents(15000, GCD_YELL); @@ -173,17 +173,17 @@ struct TRINITY_DLL_DECL boss_najentusAI : public ScriptedAI case EVENT_NEEDLE: { //m_creature->CastSpell(m_creature, SPELL_NEEDLE_SPINE, true); - std::list<Unit*> target; - SelectTargetList(target, 3, SELECT_TARGET_RANDOM, 80, true); - for (std::list<Unit*>::iterator i = target.begin(); i != target.end(); ++i) + std::list<Unit*> pTargets; + SelectTargetList(pTargets, 3, SELECT_TARGET_RANDOM, 80, true); + for (std::list<Unit*>::iterator i = pTargets.begin(); i != pTargets.end(); ++i) m_creature->CastSpell(*i, 39835, true); - events.ScheduleEvent(EVENT_NEEDLE, 15000+rand()%10000, GCD_CAST); + events.ScheduleEvent(EVENT_NEEDLE, urand(15000,25000), GCD_CAST); events.DelayEvents(1500, GCD_CAST); return; } case EVENT_YELL: - DoScriptText(rand()%2 ? SAY_SPECIAL1 : SAY_SPECIAL2, m_creature); - events.ScheduleEvent(EVENT_YELL, 25000 + (rand()%76)*1000, GCD_YELL); + DoScriptText(RAND(SAY_SPECIAL1, SAY_SPECIAL2), m_creature); + events.ScheduleEvent(EVENT_YELL, urand(25000,100000), GCD_YELL); events.DelayEvents(15000, GCD_YELL); break; } diff --git a/src/bindings/scripts/scripts/outland/black_temple/illidari_council.cpp b/src/bindings/scripts/scripts/outland/black_temple/illidari_council.cpp index 6ee2b314296..e78f1dd0c10 100644 --- a/src/bindings/scripts/scripts/outland/black_temple/illidari_council.cpp +++ b/src/bindings/scripts/scripts/outland/black_temple/illidari_council.cpp @@ -143,7 +143,7 @@ struct TRINITY_DLL_DECL mob_blood_elf_council_voice_triggerAI : public ScriptedA Council[1] = pInstance->GetData64(DATA_VERASDARKSHADOW); Council[2] = pInstance->GetData64(DATA_LADYMALANDE); Council[3] = pInstance->GetData64(DATA_HIGHNETHERMANCERZEREVOR); - }else error_log(ERROR_INST_DATA); + } else error_log(ERROR_INST_DATA); } void EnterCombat(Unit* who) {} @@ -171,7 +171,7 @@ struct TRINITY_DLL_DECL mob_blood_elf_council_voice_triggerAI : public ScriptedA ++YellCounter; if (YellCounter > 3) YellCounter = 0; // Reuse for Enrage Yells - }else AggroYellTimer -= diff; + } else AggroYellTimer -= diff; } if (EnrageTimer) @@ -185,7 +185,7 @@ struct TRINITY_DLL_DECL mob_blood_elf_council_voice_triggerAI : public ScriptedA EnrageTimer = CouncilEnrage[YellCounter].timer; } ++YellCounter; - }else EnrageTimer -= diff; + } else EnrageTimer -= diff; } } }; @@ -249,12 +249,12 @@ struct TRINITY_DLL_DECL mob_illidari_councilAI : public ScriptedAI void AttackStart(Unit* who) {} void MoveInLineOfSight(Unit* who) {} - void StartEvent(Unit *target) + void StartEvent(Unit *pTarget) { if (!pInstance) return; - if (target && target->isAlive()) + if (pTarget && pTarget->isAlive()) { Council[0] = pInstance->GetData64(DATA_GATHIOSTHESHATTERER); Council[1] = pInstance->GetData64(DATA_HIGHNETHERMANCERZEREVOR); @@ -275,7 +275,7 @@ struct TRINITY_DLL_DECL mob_illidari_councilAI : public ScriptedAI { Member = Unit::GetUnit((*m_creature), Council[i]); if (Member && Member->isAlive()) - CAST_CRE(Member)->AI()->AttackStart(target); + CAST_CRE(Member)->AI()->AttackStart(pTarget); } } @@ -311,7 +311,7 @@ struct TRINITY_DLL_DECL mob_illidari_councilAI : public ScriptedAI pMember->DealDamage(pMember, pMember->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); ++DeathCount; EndEventTimer = 1500; - }else EndEventTimer -= diff; + } else EndEventTimer -= diff; } if (CheckTimer) @@ -342,7 +342,7 @@ struct TRINITY_DLL_DECL mob_illidari_councilAI : public ScriptedAI Reset(); CheckTimer = 2000; - }else CheckTimer -= diff; + } else CheckTimer -= diff; } } @@ -480,7 +480,7 @@ struct TRINITY_DLL_DECL boss_gathios_the_shattererAI : public boss_illidari_coun void CastAuraOnCouncil() { uint32 spellid = 0; - switch(rand()%2) + switch (urand(0,1)) { case 0: spellid = SPELL_DEVOTION_AURA; break; case 1: spellid = SPELL_CHROMATIC_AURA; break; @@ -498,53 +498,53 @@ struct TRINITY_DLL_DECL boss_gathios_the_shattererAI : public boss_illidari_coun if (!UpdateVictim()) return; - if (BlessingTimer < diff) + if (BlessingTimer <= diff) { if (Unit* pUnit = SelectCouncilMember()) { - switch(rand()%2) + switch (urand(0,1)) { case 0: DoCast(pUnit, SPELL_BLESS_SPELLWARD); break; case 1: DoCast(pUnit, SPELL_BLESS_PROTECTION); break; } } BlessingTimer = 60000; - }else BlessingTimer -= diff; + } else BlessingTimer -= diff; - if (ConsecrationTimer < diff) + if (ConsecrationTimer <= diff) { DoCast(m_creature, SPELL_CONSECRATION); ConsecrationTimer = 40000; - }else ConsecrationTimer -= diff; + } else ConsecrationTimer -= diff; - if (HammerOfJusticeTimer < diff) + if (HammerOfJusticeTimer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) { // is in ~10-40 yd range - if (m_creature->IsInRange(target, 10.0f, 40.0f, false)) + if (m_creature->IsInRange(pTarget, 10.0f, 40.0f, false)) { - DoCast(target, SPELL_HAMMER_OF_JUSTICE); + DoCast(pTarget, SPELL_HAMMER_OF_JUSTICE); HammerOfJusticeTimer = 20000; } } - }else HammerOfJusticeTimer -= diff; + } else HammerOfJusticeTimer -= diff; - if (SealTimer < diff) + if (SealTimer <= diff) { - switch(rand()%2) + switch (urand(0,1)) { case 0: DoCast(m_creature, SPELL_SEAL_OF_COMMAND); break; case 1: DoCast(m_creature, SPELL_SEAL_OF_BLOOD); break; } SealTimer = 40000; - }else SealTimer -= diff; + } else SealTimer -= diff; - if (AuraTimer < diff) + if (AuraTimer <= diff) { CastAuraOnCouncil(); AuraTimer = 90000; - }else AuraTimer -= diff; + } else AuraTimer -= diff; DoMeleeAttackIfReady(); } @@ -588,7 +588,7 @@ struct TRINITY_DLL_DECL boss_high_nethermancer_zerevorAI : public boss_illidari_ if (Cooldown) { - if (Cooldown < diff) Cooldown = 0; + if (Cooldown <= diff) Cooldown = 0; else { Cooldown -= diff; @@ -596,49 +596,49 @@ struct TRINITY_DLL_DECL boss_high_nethermancer_zerevorAI : public boss_illidari_ } } - if (DampenMagicTimer < diff) + if (DampenMagicTimer <= diff) { DoCast(m_creature, SPELL_DAMPEN_MAGIC); Cooldown = 1000; DampenMagicTimer = 67200; // almost 1,12 minutes ArcaneBoltTimer += 1000; // Give the Mage some time to spellsteal Dampen. - }else DampenMagicTimer -= diff; + } else DampenMagicTimer -= diff; - if (ArcaneExplosionTimer < diff) + if (ArcaneExplosionTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_ARCANE_EXPLOSION); Cooldown = 1000; ArcaneExplosionTimer = 14000; - }else ArcaneExplosionTimer -= diff; + } else ArcaneExplosionTimer -= diff; - if (ArcaneBoltTimer < diff) + if (ArcaneBoltTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_ARCANE_BOLT); ArcaneBoltTimer = 3000; Cooldown = 2000; - }else ArcaneBoltTimer -= diff; + } else ArcaneBoltTimer -= diff; - if (BlizzardTimer < diff) + if (BlizzardTimer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) { - DoCast(target, SPELL_BLIZZARD); + DoCast(pTarget, SPELL_BLIZZARD); BlizzardTimer = 45000 + rand()%46 * 1000; FlamestrikeTimer += 10000; Cooldown = 1000; } - }else BlizzardTimer -= diff; + } else BlizzardTimer -= diff; - if (FlamestrikeTimer < diff) + if (FlamestrikeTimer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) { - DoCast(target, SPELL_FLAMESTRIKE); + DoCast(pTarget, SPELL_FLAMESTRIKE); FlamestrikeTimer = 55000 + rand()%46 * 1000; BlizzardTimer += 10000; Cooldown = 2000; } - }else FlamestrikeTimer -= diff; + } else FlamestrikeTimer -= diff; } }; @@ -674,35 +674,35 @@ struct TRINITY_DLL_DECL boss_lady_malandeAI : public boss_illidari_councilAI if (!UpdateVictim()) return; - if (EmpoweredSmiteTimer < diff) + if (EmpoweredSmiteTimer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) { - DoCast(target, SPELL_EMPOWERED_SMITE); + DoCast(pTarget, SPELL_EMPOWERED_SMITE); EmpoweredSmiteTimer = 38000; } - }else EmpoweredSmiteTimer -= diff; + } else EmpoweredSmiteTimer -= diff; - if (CircleOfHealingTimer < diff) + if (CircleOfHealingTimer <= diff) { DoCast(m_creature, SPELL_CIRCLE_OF_HEALING); CircleOfHealingTimer = 60000; - }else CircleOfHealingTimer -= diff; + } else CircleOfHealingTimer -= diff; - if (DivineWrathTimer < diff) + if (DivineWrathTimer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) { - DoCast(target, SPELL_DIVINE_WRATH); + DoCast(pTarget, SPELL_DIVINE_WRATH); DivineWrathTimer = 40000 + rand()%41 * 1000; } - }else DivineWrathTimer -= diff; + } else DivineWrathTimer -= diff; - if (ReflectiveShieldTimer < diff) + if (ReflectiveShieldTimer <= diff) { DoCast(m_creature, SPELL_REFLECTIVE_SHIELD); ReflectiveShieldTimer = 65000; - }else ReflectiveShieldTimer -= diff; + } else ReflectiveShieldTimer -= diff; DoMeleeAttackIfReady(); } @@ -750,21 +750,21 @@ struct TRINITY_DLL_DECL boss_veras_darkshadowAI : public boss_illidari_councilAI if (!HasVanished) { - if (DeadlyPoisonTimer < diff) + if (DeadlyPoisonTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_DEADLY_POISON); DeadlyPoisonTimer = 15000 + rand()%31 * 1000; - }else DeadlyPoisonTimer -= diff; + } else DeadlyPoisonTimer -= diff; - if (AppearEnvenomTimer < diff) // Cast Envenom. This is cast 4 seconds after Vanish is over + if (AppearEnvenomTimer <= diff) // Cast Envenom. This is cast 4 seconds after Vanish is over { DoCast(m_creature->getVictim(), SPELL_ENVENOM); AppearEnvenomTimer = 90000; - }else AppearEnvenomTimer -= diff; + } else AppearEnvenomTimer -= diff; - if (VanishTimer < diff) // Disappear and stop attacking, but follow a random unit + if (VanishTimer <= diff) // Disappear and stop attacking, but follow a random unit { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) { VanishTimer = 30000; AppearEnvenomTimer= 28000; @@ -773,35 +773,35 @@ struct TRINITY_DLL_DECL boss_veras_darkshadowAI : public boss_illidari_councilAI m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); DoResetThreat(); // Chase a unit. Check before DoMeleeAttackIfReady prevents from attacking - m_creature->AddThreat(target, 500000.0f); - m_creature->GetMotionMaster()->MoveChase(target); + m_creature->AddThreat(pTarget, 500000.0f); + m_creature->GetMotionMaster()->MoveChase(pTarget); } - }else VanishTimer -= diff; + } else VanishTimer -= diff; DoMeleeAttackIfReady(); } else { - if (VanishTimer < diff) // Become attackable and poison current target + if (VanishTimer <= diff) // Become attackable and poison current target { - Unit* target = m_creature->getVictim(); - DoCast(target, SPELL_DEADLY_POISON); + Unit *pTarget = m_creature->getVictim(); + DoCast(pTarget, SPELL_DEADLY_POISON); m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); DoResetThreat(); - m_creature->AddThreat(target, 3000.0f); // Make Veras attack his target for a while, he will cast Envenom 4 seconds after. + m_creature->AddThreat(pTarget, 3000.0f); // Make Veras attack his pTarget for a while, he will cast Envenom 4 seconds after. DeadlyPoisonTimer += 6000; VanishTimer = 90000; AppearEnvenomTimer = 4000; HasVanished = false; - }else VanishTimer -= diff; + } else VanishTimer -= diff; - if (AppearEnvenomTimer < diff) // Appear 2 seconds before becoming attackable (Shifting out of vanish) + if (AppearEnvenomTimer <= diff) // Appear 2 seconds before becoming attackable (Shifting out of vanish) { m_creature->GetMotionMaster()->Clear(); m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim()); m_creature->SetVisibility(VISIBILITY_ON); AppearEnvenomTimer = 6000; - }else AppearEnvenomTimer -= diff; + } else AppearEnvenomTimer -= diff; } } }; 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 bee7d849885..628dd49e236 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 @@ -222,7 +222,7 @@ struct TRINITY_DLL_DECL instance_black_temple : public ScriptedInstance if (data == IN_PROGRESS) { HandleGameObject(ShadeOfAkamaDoor, false); - }else HandleGameObject(ShadeOfAkamaDoor, true); + } else HandleGameObject(ShadeOfAkamaDoor, true); m_auiEncounter[2] = data; break; case DATA_TERONGOREFIENDEVENT: if (data == IN_PROGRESS) diff --git a/src/bindings/scripts/scripts/outland/blades_edge_mountains.cpp b/src/bindings/scripts/scripts/outland/blades_edge_mountains.cpp index 4c8d148d565..ed6de66391f 100644 --- a/src/bindings/scripts/scripts/outland/blades_edge_mountains.cpp +++ b/src/bindings/scripts/scripts/outland/blades_edge_mountains.cpp @@ -200,7 +200,7 @@ struct TRINITY_DLL_DECL mobs_nether_drakeAI : public ScriptedAI break; } NihilSpeech_Timer = 5000; - }else NihilSpeech_Timer -=diff; + } else NihilSpeech_Timer -=diff; //anything below here is not interesting for Nihil, so skip it return; @@ -213,21 +213,21 @@ struct TRINITY_DLL_DECL mobs_nether_drakeAI : public ScriptedAI { DoCast(m_creature->getVictim(),SPELL_INTANGIBLE_PRESENCE); IntangiblePresence_Timer = 15000+rand()%15000; - }else IntangiblePresence_Timer -= diff; + } else IntangiblePresence_Timer -= diff; if (ManaBurn_Timer <= diff) { - Unit* target = m_creature->getVictim(); - if (target && target->getPowerType() == POWER_MANA) - DoCast(target,SPELL_MANA_BURN); + Unit *pTarget = m_creature->getVictim(); + if (pTarget && pTarget->getPowerType() == POWER_MANA) + DoCast(pTarget,SPELL_MANA_BURN); ManaBurn_Timer = 8000+rand()%8000; - }else ManaBurn_Timer -= diff; + } else ManaBurn_Timer -= diff; if (ArcaneBlast_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_ARCANE_BLAST); ArcaneBlast_Timer = 2500+rand()%5000; - }else ArcaneBlast_Timer -= diff; + } else ArcaneBlast_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/outland/boss_doomlord_kazzak.cpp b/src/bindings/scripts/scripts/outland/boss_doomlord_kazzak.cpp index 902c3e347b5..ad35d4315f9 100644 --- a/src/bindings/scripts/scripts/outland/boss_doomlord_kazzak.cpp +++ b/src/bindings/scripts/scripts/outland/boss_doomlord_kazzak.cpp @@ -101,35 +101,35 @@ struct TRINITY_DLL_DECL boss_doomlordkazzakAI : public ScriptedAI return; //ShadowVolley_Timer - if (ShadowVolley_Timer < diff) + if (ShadowVolley_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_SHADOWVOLLEY); ShadowVolley_Timer = 4000 + rand()%2000; - }else ShadowVolley_Timer -= diff; + } else ShadowVolley_Timer -= diff; //Cleave_Timer - if (Cleave_Timer < diff) + if (Cleave_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_CLEAVE); Cleave_Timer = 8000 + rand()%4000; - }else Cleave_Timer -= diff; + } else Cleave_Timer -= diff; //ThunderClap_Timer - if (ThunderClap_Timer < diff) + if (ThunderClap_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_THUNDERCLAP); ThunderClap_Timer = 10000 + rand()%4000; - }else ThunderClap_Timer -= diff; + } else ThunderClap_Timer -= diff; //VoidBolt_Timer - if (VoidBolt_Timer < diff) + if (VoidBolt_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_VOIDBOLT); VoidBolt_Timer = 15000 + rand()%3000; - }else VoidBolt_Timer -= diff; + } else VoidBolt_Timer -= diff; //MarkOfKazzak_Timer - if (MarkOfKazzak_Timer < diff) + if (MarkOfKazzak_Timer <= diff) { Unit* victim = SelectUnit(SELECT_TARGET_RANDOM, 0); if (victim->GetPower(POWER_MANA)) @@ -137,21 +137,21 @@ struct TRINITY_DLL_DECL boss_doomlordkazzakAI : public ScriptedAI DoCast(victim, SPELL_MARKOFKAZZAK); MarkOfKazzak_Timer = 20000; } - }else MarkOfKazzak_Timer -= diff; + } else MarkOfKazzak_Timer -= diff; //Enrage_Timer - if (Enrage_Timer < diff) + if (Enrage_Timer <= diff) { DoScriptText(EMOTE_FRENZY, m_creature); DoCast(m_creature,SPELL_ENRAGE); Enrage_Timer = 30000; - }else Enrage_Timer -= diff; + } else Enrage_Timer -= diff; - if (Twisted_Reflection_Timer < diff) + if (Twisted_Reflection_Timer <= diff) { DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_TWISTEDREFLECTION); Twisted_Reflection_Timer = 15000; - }else Twisted_Reflection_Timer -= diff; + } else Twisted_Reflection_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/outland/boss_doomwalker.cpp b/src/bindings/scripts/scripts/outland/boss_doomwalker.cpp index 4eba3e1e38d..6e19e325884 100644 --- a/src/bindings/scripts/scripts/outland/boss_doomwalker.cpp +++ b/src/bindings/scripts/scripts/outland/boss_doomwalker.cpp @@ -103,25 +103,25 @@ struct TRINITY_DLL_DECL boss_doomwalkerAI : public ScriptedAI //Spell Enrage, when hp <= 20% gain enrage if (((m_creature->GetHealth()*100)/ m_creature->GetMaxHealth()) <= 20) { - if (Enrage_Timer < diff) + if (Enrage_Timer <= diff) { DoCast(m_creature,SPELL_ENRAGE); Enrage_Timer = 6000; InEnrage = true; - }else Enrage_Timer -= diff; + } else Enrage_Timer -= diff; } //Spell Overrun - if (Overrun_Timer < diff) + if (Overrun_Timer <= diff) { DoScriptText(RAND(SAY_OVERRUN_1,SAY_OVERRUN_2), m_creature); DoCast(m_creature->getVictim(),SPELL_OVERRUN); Overrun_Timer = 25000 + rand()%15000; - }else Overrun_Timer -= diff; + } else Overrun_Timer -= diff; //Spell Earthquake - if (Quake_Timer < diff) + if (Quake_Timer <= diff) { if (rand()%2) return; @@ -134,29 +134,29 @@ struct TRINITY_DLL_DECL boss_doomwalkerAI : public ScriptedAI DoCast(m_creature,SPELL_EARTHQUAKE); Quake_Timer = 30000 + rand()%25000; - }else Quake_Timer -= diff; + } else Quake_Timer -= diff; //Spell Chain Lightning - if (Chain_Timer < diff) + if (Chain_Timer <= diff) { - Unit* target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM,1); + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM,1); - if (!target) - target = m_creature->getVictim(); + if (!pTarget) + pTarget = m_creature->getVictim(); - if (target) - DoCast(target,SPELL_CHAIN_LIGHTNING); + if (pTarget) + DoCast(pTarget,SPELL_CHAIN_LIGHTNING); Chain_Timer = 7000 + rand()%20000; - }else Chain_Timer -= diff; + } else Chain_Timer -= diff; //Spell Sunder Armor - if (Armor_Timer < diff) + if (Armor_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_SUNDER_ARMOR); Armor_Timer = 10000 + rand()%15000; - }else Armor_Timer -= diff; + } else Armor_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp index 5321b1cb5d2..94281ac2838 100644 --- a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp +++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp @@ -213,11 +213,11 @@ struct TRINITY_DLL_DECL boss_fathomlord_karathressAI : public ScriptedAI //Only if not incombat check if the event is started if (!m_creature->isInCombat() && pInstance && pInstance->GetData(DATA_KARATHRESSEVENT)) { - Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_KARATHRESSEVENT_STARTER)); + Unit *pTarget = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_KARATHRESSEVENT_STARTER)); - if (target) + if (pTarget) { - AttackStart(target); + AttackStart(pTarget); GetAdvisors(); } } @@ -234,33 +234,33 @@ struct TRINITY_DLL_DECL boss_fathomlord_karathressAI : public ScriptedAI } //CataclysmicBolt_Timer - if (CataclysmicBolt_Timer < diff) + if (CataclysmicBolt_Timer <= diff) { //select a random unit other than the main tank - Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 1); + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 1); //if there aren't other units, cast on the tank - if (!target) - target = m_creature->getVictim(); + if (!pTarget) + pTarget = m_creature->getVictim(); - if (target) - DoCast(target, SPELL_CATACLYSMIC_BOLT); + if (pTarget) + DoCast(pTarget, SPELL_CATACLYSMIC_BOLT); CataclysmicBolt_Timer = 10000; - }else CataclysmicBolt_Timer -= diff; + } else CataclysmicBolt_Timer -= diff; //SearNova_Timer - if (SearNova_Timer < diff) + if (SearNova_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_SEAR_NOVA); SearNova_Timer = 20000+rand()%40000; - }else SearNova_Timer -= diff; + } else SearNova_Timer -= diff; //Enrage_Timer - if (Enrage_Timer < diff) + if (Enrage_Timer <= diff) { DoCast(m_creature, SPELL_ENRAGE); Enrage_Timer = 90000; - }else Enrage_Timer -= diff; + } else Enrage_Timer -= diff; //Blessing of Tides Trigger if ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) <= 75 && !BlessingOfTides) @@ -360,11 +360,11 @@ struct TRINITY_DLL_DECL boss_fathomguard_sharkkisAI : public ScriptedAI //Only if not incombat check if the event is started if (!m_creature->isInCombat() && pInstance && pInstance->GetData(DATA_KARATHRESSEVENT)) { - Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_KARATHRESSEVENT_STARTER)); + Unit *pTarget = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_KARATHRESSEVENT_STARTER)); - if (target) + if (pTarget) { - AttackStart(target); + AttackStart(pTarget); } } @@ -380,21 +380,21 @@ struct TRINITY_DLL_DECL boss_fathomguard_sharkkisAI : public ScriptedAI } //LeechingThrow_Timer - if (LeechingThrow_Timer < diff) + if (LeechingThrow_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_LEECHING_THROW); LeechingThrow_Timer = 20000; - }else LeechingThrow_Timer -= diff; + } else LeechingThrow_Timer -= diff; //Multishot_Timer - if (Multishot_Timer < diff) + if (Multishot_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_MULTISHOT); Multishot_Timer = 20000; - }else Multishot_Timer -= diff; + } else Multishot_Timer -= diff; //TheBeastWithin_Timer - if (TheBeastWithin_Timer < diff) + if (TheBeastWithin_Timer <= diff) { DoCast(m_creature, SPELL_THE_BEAST_WITHIN); Creature *Pet = Unit::GetCreature(*m_creature, SummonedPet); @@ -403,7 +403,7 @@ struct TRINITY_DLL_DECL boss_fathomguard_sharkkisAI : public ScriptedAI Pet->CastSpell(Pet, SPELL_PET_ENRAGE, true); } TheBeastWithin_Timer = 30000; - }else TheBeastWithin_Timer -= diff; + } else TheBeastWithin_Timer -= diff; //Pet_Timer if (Pet_Timer < diff && pet == false) @@ -411,7 +411,7 @@ struct TRINITY_DLL_DECL boss_fathomguard_sharkkisAI : public ScriptedAI pet = true; //uint32 spell_id; uint32 pet_id; - switch(rand()%2) + switch (urand(0,1)) { case 0: //spell_id = SPELL_SUMMON_FATHOM_LURKER; @@ -424,13 +424,13 @@ struct TRINITY_DLL_DECL boss_fathomguard_sharkkisAI : public ScriptedAI } //DoCast(m_creature, spell_id, true); Creature *Pet = DoSpawnCreature(pet_id,0,0,0,0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); - Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0); - if (Pet && target) + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); + if (Pet && pTarget) { - Pet->AI()->AttackStart(target); + Pet->AI()->AttackStart(pTarget); SummonedPet = Pet->GetGUID(); } - }else Pet_Timer -= diff; + } else Pet_Timer -= diff; DoMeleeAttackIfReady(); } @@ -490,11 +490,11 @@ struct TRINITY_DLL_DECL boss_fathomguard_tidalvessAI : public ScriptedAI //Only if not incombat check if the event is started if (!m_creature->isInCombat() && pInstance && pInstance->GetData(DATA_KARATHRESSEVENT)) { - Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_KARATHRESSEVENT_STARTER)); + Unit *pTarget = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_KARATHRESSEVENT_STARTER)); - if (target) + if (pTarget) { - AttackStart(target); + AttackStart(pTarget); } } @@ -515,14 +515,14 @@ struct TRINITY_DLL_DECL boss_fathomguard_tidalvessAI : public ScriptedAI } //FrostShock_Timer - if (FrostShock_Timer < diff) + if (FrostShock_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_FROST_SHOCK); FrostShock_Timer = 25000+rand()%5000; - }else FrostShock_Timer -= diff; + } else FrostShock_Timer -= diff; //Spitfire_Timer - if (Spitfire_Timer < diff) + if (Spitfire_Timer <= diff) { DoCast(m_creature, SPELL_SPITFIRE_TOTEM); Unit *SpitfireTotem = Unit::GetUnit(*m_creature, CREATURE_SPITFIRE_TOTEM); @@ -531,21 +531,21 @@ struct TRINITY_DLL_DECL boss_fathomguard_tidalvessAI : public ScriptedAI CAST_CRE(SpitfireTotem)->AI()->AttackStart(m_creature->getVictim()); } Spitfire_Timer = 60000; - }else Spitfire_Timer -= diff; + } else Spitfire_Timer -= diff; //PoisonCleansing_Timer - if (PoisonCleansing_Timer < diff) + if (PoisonCleansing_Timer <= diff) { DoCast(m_creature, SPELL_POISON_CLEANSING_TOTEM); PoisonCleansing_Timer = 30000; - }else PoisonCleansing_Timer -= diff; + } else PoisonCleansing_Timer -= diff; //Earthbind_Timer - if (Earthbind_Timer < diff) + if (Earthbind_Timer <= diff) { DoCast(m_creature, SPELL_EARTHBIND_TOTEM); Earthbind_Timer = 45000; - }else Earthbind_Timer -= diff; + } else Earthbind_Timer -= diff; DoMeleeAttackIfReady(); } @@ -604,11 +604,11 @@ struct TRINITY_DLL_DECL boss_fathomguard_caribdisAI : public ScriptedAI //Only if not incombat check if the event is started if (!m_creature->isInCombat() && pInstance && pInstance->GetData(DATA_KARATHRESSEVENT)) { - Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_KARATHRESSEVENT_STARTER)); + Unit *pTarget = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_KARATHRESSEVENT_STARTER)); - if (target) + if (pTarget) { - AttackStart(target); + AttackStart(pTarget); } } @@ -624,23 +624,23 @@ struct TRINITY_DLL_DECL boss_fathomguard_caribdisAI : public ScriptedAI } //WaterBoltVolley_Timer - if (WaterBoltVolley_Timer < diff) + if (WaterBoltVolley_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_WATER_BOLT_VOLLEY); WaterBoltVolley_Timer = 30000; - }else WaterBoltVolley_Timer -= diff; + } else WaterBoltVolley_Timer -= diff; //TidalSurge_Timer - if (TidalSurge_Timer < diff) + if (TidalSurge_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_TIDAL_SURGE); // Hacky way to do it - won't trigger elseways m_creature->getVictim()->CastSpell(m_creature->getVictim(), SPELL_TIDAL_SURGE_FREEZE, true); TidalSurge_Timer = 15000+rand()%5000; - }else TidalSurge_Timer -= diff; + } else TidalSurge_Timer -= diff; //Cyclone_Timer - if (Cyclone_Timer < diff) + if (Cyclone_Timer <= diff) { //DoCast(m_creature, SPELL_SUMMON_CYCLONE); // Doesn't work Cyclone_Timer = 30000+rand()%10000; @@ -651,16 +651,16 @@ struct TRINITY_DLL_DECL boss_fathomguard_caribdisAI : public ScriptedAI Cyclone->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); Cyclone->setFaction(m_creature->getFaction()); Cyclone->CastSpell(Cyclone, SPELL_CYCLONE_CYCLONE, true); - Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (target) + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + if (pTarget) { - Cyclone->AI()->AttackStart(target); + Cyclone->AI()->AttackStart(pTarget); } } - }else Cyclone_Timer -= diff; + } else Cyclone_Timer -= diff; //Heal_Timer - if (Heal_Timer < diff) + if (Heal_Timer <= diff) { // It can be cast on any of the mobs Unit *pUnit = NULL; @@ -673,7 +673,7 @@ struct TRINITY_DLL_DECL boss_fathomguard_caribdisAI : public ScriptedAI if (pUnit && pUnit->isAlive()) DoCast(pUnit, SPELL_HEAL); Heal_Timer = 60000; - }else Heal_Timer -= diff; + } else Heal_Timer -= diff; DoMeleeAttackIfReady(); } @@ -698,7 +698,7 @@ struct TRINITY_DLL_DECL boss_fathomguard_caribdisAI : public ScriptedAI pUnit = m_creature; break; } - }else pUnit = m_creature; + } else pUnit = m_creature; return pUnit; } diff --git a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp index a9d4e857a7d..a292a726207 100644 --- a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp +++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp @@ -222,7 +222,7 @@ struct TRINITY_DLL_DECL boss_hydross_the_unstableAI : public ScriptedAI if (CorruptedForm) { //MarkOfCorruption_Timer - if (MarkOfCorruption_Timer < diff) + if (MarkOfCorruption_Timer <= diff) { if (MarkOfCorruption_Count <= 5) { @@ -245,20 +245,20 @@ struct TRINITY_DLL_DECL boss_hydross_the_unstableAI : public ScriptedAI } MarkOfCorruption_Timer = 15000; - }else MarkOfCorruption_Timer -= diff; + } else MarkOfCorruption_Timer -= diff; //VileSludge_Timer - if (VileSludge_Timer < diff) + if (VileSludge_Timer <= diff) { - Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (target) - DoCast(target, SPELL_VILE_SLUDGE); + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + if (pTarget) + DoCast(pTarget, SPELL_VILE_SLUDGE); VileSludge_Timer = 15000; - }else VileSludge_Timer -= diff; + } else VileSludge_Timer -= diff; //PosCheck_Timer - if (PosCheck_Timer < diff) + if (PosCheck_Timer <= diff) { if (m_creature->IsWithinDist2d(HYDROSS_X, HYDROSS_Y, SWITCH_RADIUS)) { @@ -283,13 +283,13 @@ struct TRINITY_DLL_DECL boss_hydross_the_unstableAI : public ScriptedAI } PosCheck_Timer = 2500; - }else PosCheck_Timer -=diff; + } else PosCheck_Timer -=diff; } // clean form else { //MarkOfHydross_Timer - if (MarkOfHydross_Timer < diff) + if (MarkOfHydross_Timer <= diff) { if (MarkOfHydross_Count <= 5) { @@ -312,20 +312,20 @@ struct TRINITY_DLL_DECL boss_hydross_the_unstableAI : public ScriptedAI } MarkOfHydross_Timer = 15000; - }else MarkOfHydross_Timer -= diff; + } else MarkOfHydross_Timer -= diff; //WaterTomb_Timer - if (WaterTomb_Timer < diff) + if (WaterTomb_Timer <= diff) { - Unit *target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); - if (target) - DoCast(target, SPELL_WATER_TOMB); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + if (pTarget) + DoCast(pTarget, SPELL_WATER_TOMB); WaterTomb_Timer = 7000; - }else WaterTomb_Timer -= diff; + } else WaterTomb_Timer -= diff; //PosCheck_Timer - if (PosCheck_Timer < diff) + if (PosCheck_Timer <= diff) { if (!m_creature->IsWithinDist2d(HYDROSS_X, HYDROSS_Y, SWITCH_RADIUS)) { @@ -350,15 +350,15 @@ struct TRINITY_DLL_DECL boss_hydross_the_unstableAI : public ScriptedAI } PosCheck_Timer = 2500; - }else PosCheck_Timer -=diff; + } else PosCheck_Timer -=diff; } //EnrageTimer - if (EnrageTimer < diff) + if (EnrageTimer <= diff) { DoCast(m_creature, SPELL_ENRAGE); EnrageTimer = 60000; - }else EnrageTimer -= diff; + } else EnrageTimer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp index a9ef31176fd..d455b23e828 100644 --- a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp +++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp @@ -187,7 +187,7 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI { CanAttack = false; JustCreated = false; - }else CanAttack = true; + } else CanAttack = true; Unit *remo; for (uint8 i = 0; i < 4; ++i) @@ -289,11 +289,11 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI void CastShootOrMultishot() { - switch(rand()%2) + switch (urand(0,1)) { case 0: //Shoot - //Used in Phases 1 and 3 after Entangle or while having nobody in melee range. A shot that hits her target for 4097-5543 Physical damage. + //Used in Phases 1 and 3 after Entangle or while having nobody in melee range. A shot that hits her pTarget for 4097-5543 Physical damage. DoCast(m_creature->getVictim(), SPELL_SHOOT); break; case 1: @@ -312,7 +312,7 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI { if (!CanAttack && Intro) { - if (AggroTimer < diff) + if (AggroTimer <= diff) { CanAttack = true; m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -336,33 +336,33 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI if (Phase == 1 || Phase == 3) { //ShockBlast_Timer - if (ShockBlast_Timer < diff) + if (ShockBlast_Timer <= diff) { //Shock Burst - //Randomly used in Phases 1 and 3 on Vashj's target, it's a Shock spell doing 8325-9675 nature damage and stunning the target for 5 seconds, during which she will not attack her target but switch to the next person on the aggro list. + //Randomly used in Phases 1 and 3 on Vashj's pTarget, it's a Shock spell doing 8325-9675 nature damage and stunning the pTarget for 5 seconds, during which she will not attack her pTarget but switch to the next person on the aggro list. DoCast(m_creature->getVictim(), SPELL_SHOCK_BLAST); m_creature->TauntApply(m_creature->getVictim()); ShockBlast_Timer = 1000+rand()%14000; //random cooldown - }else ShockBlast_Timer -= diff; + } else ShockBlast_Timer -= diff; //StaticCharge_Timer - if (StaticCharge_Timer < diff) + if (StaticCharge_Timer <= diff) { //Static Charge - //Used on random people (only 1 person at any given time) in Phases 1 and 3, it's a debuff doing 2775 to 3225 Nature damage to the target and everybody in about 5 yards around it, every 1 seconds for 30 seconds. It can be removed by Cloak of Shadows, Iceblock, Divine Shield, etc, but not by Cleanse or Dispel Magic. - Unit *target = NULL; - target = SelectTarget(SELECT_TARGET_RANDOM, 0, 200, true); + //Used on random people (only 1 person at any given time) in Phases 1 and 3, it's a debuff doing 2775 to 3225 Nature damage to the pTarget and everybody in about 5 yards around it, every 1 seconds for 30 seconds. It can be removed by Cloak of Shadows, Iceblock, Divine Shield, etc, but not by Cleanse or Dispel Magic. + Unit *pTarget = NULL; + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 200, true); - if (target && !target->HasAura(SPELL_STATIC_CHARGE_TRIGGER)) + if (pTarget && !pTarget->HasAura(SPELL_STATIC_CHARGE_TRIGGER)) //cast Static Charge every 2 seconds for 20 seconds - DoCast(target, SPELL_STATIC_CHARGE_TRIGGER); + DoCast(pTarget, SPELL_STATIC_CHARGE_TRIGGER); StaticCharge_Timer = 10000+rand()%20000; //blizzlike - }else StaticCharge_Timer -= diff; + } else StaticCharge_Timer -= diff; //Entangle_Timer - if (Entangle_Timer < diff) + if (Entangle_Timer <= diff) { if (!Entangle) { @@ -378,7 +378,7 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI Entangle = false; Entangle_Timer = 20000+rand()%5000; } - }else Entangle_Timer -= diff; + } else Entangle_Timer -= diff; //Phase 1 if (Phase == 1) @@ -406,17 +406,17 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI else { //SummonSporebat_Timer - if (SummonSporebat_Timer < diff) + if (SummonSporebat_Timer <= diff) { Creature *Sporebat = NULL; Sporebat = m_creature->SummonCreature(TOXIC_SPOREBAT, SPOREBAT_X, SPOREBAT_Y, SPOREBAT_Z, SPOREBAT_O, TEMPSUMMON_CORPSE_DESPAWN, 0); if (Sporebat) { - Unit *target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (target) - Sporebat->AI()->AttackStart(target); + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + if (pTarget) + Sporebat->AI()->AttackStart(pTarget); } //summon sporebats faster and faster @@ -428,23 +428,23 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI if (SummonSporebat_Timer < 5000) SummonSporebat_Timer = 5000; - }else SummonSporebat_Timer -= diff; + } else SummonSporebat_Timer -= diff; } //Melee attack DoMeleeAttackIfReady(); //Check_Timer - used to check if somebody is in melee range - if (Check_Timer < diff) + if (Check_Timer <= diff) { bool InMeleeRange = false; - Unit *target; + Unit *pTarget; std::list<HostilReference *> t_list = m_creature->getThreatManager().getThreatList(); for (std::list<HostilReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { - target = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); + pTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); //if in melee range - if (target && target->IsWithinDistInMap(m_creature, 5)) + if (pTarget && pTarget->IsWithinDistInMap(m_creature, 5)) { InMeleeRange = true; break; @@ -456,29 +456,29 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI CastShootOrMultishot(); Check_Timer = 5000; - }else Check_Timer -= diff; + } else Check_Timer -= diff; } //Phase 2 else { //ForkedLightning_Timer - if (ForkedLightning_Timer < diff) + if (ForkedLightning_Timer <= diff) { //Forked Lightning //Used constantly in Phase 2, it shoots out completely randomly targeted bolts of lightning which hit everybody in a roughtly 60 degree cone in front of Vashj for 2313-2687 nature damage. - Unit *target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM, 0); + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (!target) - target = m_creature->getVictim(); + if (!pTarget) + pTarget = m_creature->getVictim(); - DoCast(target, SPELL_FORKED_LIGHTNING); + DoCast(pTarget, SPELL_FORKED_LIGHTNING); ForkedLightning_Timer = 2000+rand()%6000; //blizzlike - }else ForkedLightning_Timer -= diff; + } else ForkedLightning_Timer -= diff; //EnchantedElemental_Timer - if (EnchantedElemental_Timer < diff) + if (EnchantedElemental_Timer <= diff) { Creature *Elemental; Elemental = m_creature->SummonCreature(ENCHANTED_ELEMENTAL, ElementPos[EnchantedElemental_Pos][0], ElementPos[EnchantedElemental_Pos][1], ElementPos[EnchantedElemental_Pos][2], ElementPos[EnchantedElemental_Pos][3], TEMPSUMMON_CORPSE_DESPAWN, 0); @@ -489,56 +489,56 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI EnchantedElemental_Pos++; EnchantedElemental_Timer = 10000+rand()%5000; - }else EnchantedElemental_Timer -= diff; + } else EnchantedElemental_Timer -= diff; //TaintedElemental_Timer - if (TaintedElemental_Timer < diff) + if (TaintedElemental_Timer <= diff) { Creature *Tain_Elemental; uint32 pos = rand()%8; Tain_Elemental = m_creature->SummonCreature(TAINTED_ELEMENTAL, ElementPos[pos][0], ElementPos[pos][1], ElementPos[pos][2], ElementPos[pos][3], TEMPSUMMON_DEAD_DESPAWN, 0); TaintedElemental_Timer = 120000; - }else TaintedElemental_Timer -= diff; + } else TaintedElemental_Timer -= diff; //CoilfangElite_Timer - if (CoilfangElite_Timer < diff) + if (CoilfangElite_Timer <= diff) { uint32 pos = rand()%3; Creature* CoilfangElite = NULL; CoilfangElite = m_creature->SummonCreature(COILFANG_ELITE, CoilfangElitePos[pos][0], CoilfangElitePos[pos][1], CoilfangElitePos[pos][2], CoilfangElitePos[pos][3], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); if (CoilfangElite) { - Unit *target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (target) - CoilfangElite->AI()->AttackStart(target); + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + if (pTarget) + CoilfangElite->AI()->AttackStart(pTarget); else if (m_creature->getVictim()) CoilfangElite->AI()->AttackStart(m_creature->getVictim()); } CoilfangElite_Timer = 45000+rand()%5000; - }else CoilfangElite_Timer -= diff; + } else CoilfangElite_Timer -= diff; //CoilfangStrider_Timer - if (CoilfangStrider_Timer < diff) + if (CoilfangStrider_Timer <= diff) { uint32 pos = rand()%3; Creature* CoilfangStrider = NULL; CoilfangStrider = m_creature->SummonCreature(COILFANG_STRIDER, CoilfangStriderPos[pos][0], CoilfangStriderPos[pos][1], CoilfangStriderPos[pos][2], CoilfangStriderPos[pos][3], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); if (CoilfangStrider) { - Unit *target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (target) - CoilfangStrider->AI()->AttackStart(target); + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + if (pTarget) + CoilfangStrider->AI()->AttackStart(pTarget); else if (m_creature->getVictim()) CoilfangStrider->AI()->AttackStart(m_creature->getVictim()); } CoilfangStrider_Timer = 60000+rand()%10000; - }else CoilfangStrider_Timer -= diff; + } else CoilfangStrider_Timer -= diff; //Check_Timer - if (Check_Timer < diff) + if (Check_Timer <= diff) { //Start Phase 3 if (pInstance && pInstance->GetData(DATA_CANSTARTPHASE3)) @@ -556,7 +556,7 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim()); } Check_Timer = 1000; - }else Check_Timer -= diff; + } else Check_Timer -= diff; } } }; @@ -620,7 +620,7 @@ struct TRINITY_DLL_DECL mob_enchanted_elementalAI : public ScriptedAI return; } - if (move < diff) + if (move <= diff) { m_creature->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); if (phase == 1) @@ -702,26 +702,26 @@ struct TRINITY_DLL_DECL mob_tainted_elementalAI : public ScriptedAI void UpdateAI(const uint32 diff) { //PoisonBolt_Timer - if (PoisonBolt_Timer < diff) + if (PoisonBolt_Timer <= diff) { - Unit *target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM, 0); + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (target && target->IsWithinDistInMap(m_creature, 30)) - DoCast(target, SPELL_POISON_BOLT); + if (pTarget && pTarget->IsWithinDistInMap(m_creature, 30)) + DoCast(pTarget, SPELL_POISON_BOLT); PoisonBolt_Timer = 5000+rand()%5000; - }else PoisonBolt_Timer -= diff; + } else PoisonBolt_Timer -= diff; //Despawn_Timer - if (Despawn_Timer < diff) + if (Despawn_Timer <= diff) { //call Unsummon() m_creature->setDeathState(DEAD); //to prevent crashes Despawn_Timer = 1000; - }else Despawn_Timer -= diff; + } else Despawn_Timer -= diff; } }; @@ -774,21 +774,21 @@ struct TRINITY_DLL_DECL mob_toxic_sporebatAI : public ScriptedAI void UpdateAI (const uint32 diff) { //Random movement - if (movement_timer < diff) + if (movement_timer <= diff) { uint32 rndpos = rand()%8; m_creature->GetMotionMaster()->MovePoint(1,SporebatWPPos[rndpos][0], SporebatWPPos[rndpos][1], SporebatWPPos[rndpos][2]); movement_timer = 6000; - }else movement_timer -= diff; + } else movement_timer -= diff; //toxic spores - if (bolt_timer < diff) + if (bolt_timer <= diff) { - Unit *target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (target) + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + if (pTarget) { - Creature* trig = m_creature->SummonCreature(TOXIC_SPORES_TRIGGER,target->GetPositionX(),target->GetPositionY(),target->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN,30000); + Creature* trig = m_creature->SummonCreature(TOXIC_SPORES_TRIGGER,pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN,30000); if (trig) { trig->setFaction(14); @@ -800,7 +800,7 @@ struct TRINITY_DLL_DECL mob_toxic_sporebatAI : public ScriptedAI else bolt_timer -= diff; //Check_Timer - if (Check_Timer < diff) + if (Check_Timer <= diff) { if (pInstance) { @@ -817,7 +817,7 @@ struct TRINITY_DLL_DECL mob_toxic_sporebatAI : public ScriptedAI } Check_Timer = 1000; - }else Check_Timer -= diff; + } else Check_Timer -= diff; } }; @@ -887,7 +887,7 @@ struct TRINITY_DLL_DECL mob_shield_generator_channelAI : public ScriptedAI if (!pInstance) return; - if (Check_Timer < diff) + if (Check_Timer <= diff) { Unit *Vashj = NULL; Vashj = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_LADYVASHJ)); @@ -902,7 +902,7 @@ struct TRINITY_DLL_DECL mob_shield_generator_channelAI : public ScriptedAI } } Check_Timer = 1000; - }else Check_Timer -= diff; + } else Check_Timer -= diff; } }; diff --git a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp index d1d8e160e15..83912b588fd 100644 --- a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp +++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp @@ -117,27 +117,27 @@ struct TRINITY_DLL_DECL mob_inner_demonAI : public ScriptedAI { m_creature->AddThreat(owner,999999); AttackStart(owner); - }else if (owner && owner->isDead()) + } else if (owner && owner->isDead()) { m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); return; } } - if (Link_Timer < diff) + if (Link_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_SOUL_LINK, true); Link_Timer = 1000; - }else Link_Timer -= diff; + } else Link_Timer -= diff; if (!m_creature->HasAura(AURA_DEMONIC_ALIGNMENT)) DoCast(m_creature, AURA_DEMONIC_ALIGNMENT,true); - if (ShadowBolt_Timer < diff) + if (ShadowBolt_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_SHADOWBOLT, false); ShadowBolt_Timer = 10000; - }else ShadowBolt_Timer -= diff; + } else ShadowBolt_Timer -= diff; DoMeleeAttackIfReady(); } @@ -331,11 +331,11 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI Creature* pUnit = Unit::GetCreature((*m_creature), InnderDemon[i]); if (pUnit && pUnit->isAlive()) { - Unit* pUnit_target = Unit::GetUnit(*pUnit, CAST_AI(mob_inner_demonAI, pUnit->AI())->victimGUID); - if (pUnit_target && pUnit_target->isAlive()) + Unit* pUnit_pTarget = Unit::GetUnit(*pUnit, CAST_AI(mob_inner_demonAI, pUnit->AI())->victimGUID); + if (pUnit_pTarget && pUnit_pTarget->isAlive()) { - pUnit->CastSpell(pUnit_target, SPELL_CONSUMING_MADNESS, true); - DoModifyThreatPercent(pUnit_target, -100); + pUnit->CastSpell(pUnit_pTarget, SPELL_CONSUMING_MADNESS, true); + DoModifyThreatPercent(pUnit_pTarget, -100); } } } @@ -384,15 +384,15 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI //Return since we have no target if (m_creature->HasAura(AURA_BANISH) || !UpdateVictim()) { - if (BanishTimer<diff) + if (BanishTimer<= diff) { CheckBanish();//no need to check every update tick BanishTimer = 1000; - }else BanishTimer -= diff; + } else BanishTimer -= diff; return; } if (m_creature->HasAura(SPELL_WHIRLWIND)) - if (Whirlwind_Timer < diff) + if (Whirlwind_Timer <= diff) { Unit *newTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); if (newTarget) @@ -402,7 +402,7 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI m_creature->GetMotionMaster()->MovePoint(0,newTarget->GetPositionX(),newTarget->GetPositionY(),newTarget->GetPositionZ()); } Whirlwind_Timer = 2000; - }else Whirlwind_Timer -= diff; + } else Whirlwind_Timer -= diff; // reseting after changing forms and after ending whirlwind if (NeedThreatReset && !m_creature->HasAura(SPELL_WHIRLWIND)) @@ -425,25 +425,25 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI m_creature->InterruptNonMeleeSpells(false); DoCast(m_creature, SPELL_BERSERK); EnrageUsed = true; - }else Berserk_Timer -= diff; + } else Berserk_Timer -= diff; if (!DemonForm) { //Whirldind Timer if (!m_creature->HasAura(SPELL_WHIRLWIND)) { - if (Whirlwind_Timer < diff) + if (Whirlwind_Timer <= diff) { DoCast(m_creature, SPELL_WHIRLWIND); // while whirlwinding this variable is used to countdown target's change Whirlwind_Timer = 2000; NeedThreatReset = true; - }else Whirlwind_Timer -= diff; + } else Whirlwind_Timer -= diff; } //Switch_Timer if (!IsFinalForm) - if (SwitchToDemon_Timer < diff) + if (SwitchToDemon_Timer <= diff) { //switch to demon form m_creature->RemoveAurasDueToSpell(SPELL_WHIRLWIND,0); @@ -454,7 +454,7 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI DemonForm = true; NeedThreatReset = true; SwitchToDemon_Timer = 45000; - }else SwitchToDemon_Timer -= diff; + } else SwitchToDemon_Timer -= diff; DoMeleeAttackIfReady(); } else @@ -464,7 +464,7 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI return; if (m_creature->IsWithinDist(m_creature->getVictim(), 30)) m_creature->StopMoving(); - if (ChaosBlast_Timer < diff) + if (ChaosBlast_Timer <= diff) { // will cast only when in range of spell if (m_creature->IsWithinDist(m_creature->getVictim(), 30)) @@ -474,9 +474,9 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI m_creature->CastCustomSpell(m_creature->getVictim(), SPELL_CHAOS_BLAST, &damage, NULL, NULL, false, NULL, NULL, m_creature->GetGUID()); } ChaosBlast_Timer = 3000; - }else ChaosBlast_Timer -= diff; + } else ChaosBlast_Timer -= diff; //Summon Inner Demon - if (InnerDemons_Timer < diff) + if (InnerDemons_Timer <= diff) { std::list<HostilReference *>& ThreatList = m_creature->getThreatManager().getThreatList(); std::vector<Unit *> TargetList; @@ -518,10 +518,10 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI DoScriptText(SAY_INNER_DEMONS, m_creature); InnerDemons_Timer = 999999; - }else InnerDemons_Timer -= diff; + } else InnerDemons_Timer -= diff; //Switch_Timer - if (SwitchToHuman_Timer < diff) + if (SwitchToHuman_Timer <= diff) { //switch to nightelf form m_creature->SetDisplayId(MODEL_NIGHTELF); @@ -534,7 +534,7 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI NeedThreatReset = true; SwitchToHuman_Timer = 60000; - }else SwitchToHuman_Timer -= diff; + } else SwitchToHuman_Timer -= diff; } if (!IsFinalForm && (m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 15) @@ -608,7 +608,7 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blind_demonformAI : public ScriptedAI if (m_creature->IsWithinDist(m_creature->getVictim(), 30)) m_creature->StopMoving(); - if (ChaosBlast_Timer < diff) + if (ChaosBlast_Timer <= diff) { // will cast only when in range od spell if (m_creature->IsWithinDist(m_creature->getVictim(), 30)) @@ -618,7 +618,7 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blind_demonformAI : public ScriptedAI m_creature->CastCustomSpell(m_creature->getVictim(), SPELL_CHAOS_BLAST, &damage, NULL, NULL, false, NULL, NULL, m_creature->GetGUID()); ChaosBlast_Timer = 3000; } - }else ChaosBlast_Timer -= diff; + } else ChaosBlast_Timer -= diff; //Do NOT deal any melee damage to the target. } @@ -709,17 +709,17 @@ struct TRINITY_DLL_DECL mob_greyheart_spellbinderAI : public ScriptedAI return; } - if (Mindblast_Timer < diff) + if (Mindblast_Timer <= diff) { - Unit* target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM,0); + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); - if (target)DoCast(target, SPELL_MINDBLAST); + if (pTarget)DoCast(pTarget, SPELL_MINDBLAST); Mindblast_Timer = 10000 + rand()%5000; - }else Mindblast_Timer -= diff; + } else Mindblast_Timer -= diff; - if (Earthshock_Timer < diff) + if (Earthshock_Timer <= diff) { Map* pMap = m_creature->GetMap(); Map::PlayerList const &PlayerList = pMap->GetPlayers(); @@ -740,7 +740,7 @@ struct TRINITY_DLL_DECL mob_greyheart_spellbinderAI : public ScriptedAI } } Earthshock_Timer = 8000 + rand()%7000; - }else Earthshock_Timer -= diff; + } else Earthshock_Timer -= diff; DoMeleeAttackIfReady(); } 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 82de875628b..c58af1495ed 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 @@ -181,22 +181,22 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI Submerged = false; WaitTimer2 = 500; } - if(!Submerged && WaitTimer2 < diff)//wait 500ms before emerge anim + if (!Submerged && WaitTimer2 <= diff)//wait 500ms before emerge anim { m_creature->RemoveAllAuras(); m_creature->RemoveFlag(UNIT_NPC_EMOTESTATE,EMOTE_STATE_SUBMERGED); DoCast(m_creature,SPELL_EMERGE,false); WaitTimer2 = 60000;//never reached WaitTimer = 3000; - }else WaitTimer2 -= diff; + } else WaitTimer2 -= diff; - if(WaitTimer < diff)//wait 3secs for emerge anim, then attack + if (WaitTimer <= diff)//wait 3secs for emerge anim, then attack { WaitTimer = 3000; CanStartEvent=true;//fresh fished from pool m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - }else WaitTimer -= diff; + } else WaitTimer -= diff; } return; } @@ -209,15 +209,15 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI } if (!Submerged) { - if (PhaseTimer < diff) + if (PhaseTimer <= diff) { m_creature->InterruptNonMeleeSpells(false); DoCast(m_creature,SPELL_SUBMERGE); PhaseTimer = 60000;//60secs submerged Submerged = true; - }else PhaseTimer-=diff; + } else PhaseTimer-=diff; - if (SpoutTimer < diff) + if (SpoutTimer <= diff) { m_creature->MonsterTextEmote(EMOTE_SPOUT,0,true); me->SetReactState(REACT_PASSIVE); @@ -226,16 +226,16 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI WhirlTimer = 20000;//whirl directly after spout RotTimer = 20000; return; - }else SpoutTimer -= diff; + } else SpoutTimer -= diff; //Whirl directly after a Spout and at random times - if (WhirlTimer < diff) + if (WhirlTimer <= diff) { WhirlTimer = 18000; DoCast(m_creature,SPELL_WHIRL); - }else WhirlTimer -= diff; + } else WhirlTimer -= diff; - if(CheckTimer < diff)//check if there are players in melee range + if (CheckTimer <= diff)//check if there are players in melee range { InRange = false; Map* pMap = m_creature->GetMap(); @@ -249,7 +249,7 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI } } CheckTimer = 2000; - }else CheckTimer -= diff; + } else CheckTimer -= diff; if(RotTimer) { @@ -264,40 +264,40 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI } } - if(SpoutAnimTimer < diff) + if (SpoutAnimTimer <= diff) { DoCast(m_creature,SPELL_SPOUT_ANIM,true); SpoutAnimTimer = 1000; - }else SpoutAnimTimer -= diff; + } else SpoutAnimTimer -= diff; - if(RotTimer < diff) + if (RotTimer <= diff) { RotTimer = 0; - }else RotTimer -= diff; + } else RotTimer -= diff; return; } - if (GeyserTimer < diff) + if (GeyserTimer <= diff) { - Unit* target = SelectUnit(SELECT_TARGET_RANDOM,1); - if (!target && m_creature->getVictim()) - target = m_creature->getVictim(); - if (target) - DoCast(target,SPELL_GEYSER,true); + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,1); + if (!pTarget && m_creature->getVictim()) + pTarget = m_creature->getVictim(); + if (pTarget) + DoCast(pTarget,SPELL_GEYSER,true); GeyserTimer = rand()%5000 + 15000; - }else GeyserTimer -= diff; + } else GeyserTimer -= diff; if(!InRange)//if on players in melee range cast Waterbolt { - if (WaterboltTimer < diff) + if (WaterboltTimer <= diff) { - Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0); - if (!target && m_creature->getVictim()) - target = m_creature->getVictim(); - if (target) - DoCast(target,SPELL_WATERBOLT,true); + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); + if (!pTarget && m_creature->getVictim()) + pTarget = m_creature->getVictim(); + if (pTarget) + DoCast(pTarget,SPELL_WATERBOLT,true); WaterboltTimer = 3000; - }else WaterboltTimer -= diff; + } else WaterboltTimer -= diff; } if (!UpdateCombatState()) @@ -307,7 +307,7 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI }else//submerged { - if (PhaseTimer < diff) + if (PhaseTimer <= diff) { Submerged = false; m_creature->InterruptNonMeleeSpells(false);//shouldn't be any @@ -319,7 +319,7 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI SpoutTimer = 3000; // directly cast Spout after emerging! PhaseTimer = 120000; return; - }else PhaseTimer-=diff; + } else PhaseTimer-=diff; if(m_creature->getThreatManager().getThreatList().empty())//check if should evade { @@ -404,25 +404,25 @@ struct TRINITY_DLL_DECL mob_coilfang_ambusherAI : public Scripted_NoMovementAI void UpdateAI(const uint32 diff) { - if (MultiShotTimer < diff) + if (MultiShotTimer <= diff) { if (m_creature->getVictim()) DoCast(m_creature->getVictim(), SPELL_SPREAD_SHOT, true); MultiShotTimer = 10000+rand()%10000; ShootBowTimer += 1500;//add global cooldown - }else MultiShotTimer -= diff; + } else MultiShotTimer -= diff; - if (ShootBowTimer < diff) + if (ShootBowTimer <= diff) { - Unit* target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM, 0); + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); int bp0 = 1100; - if (target) - m_creature->CastCustomSpell(target,SPELL_SHOOT,&bp0,NULL,NULL,true); + if (pTarget) + m_creature->CastCustomSpell(pTarget,SPELL_SHOOT,&bp0,NULL,NULL,true); ShootBowTimer = 4000+rand()%5000; MultiShotTimer += 1500;//add global cooldown - }else ShootBowTimer -= diff; + } else ShootBowTimer -= diff; } }; diff --git a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp index 73f8992fa7a..784b99b5dd9 100644 --- a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp +++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp @@ -182,7 +182,7 @@ struct TRINITY_DLL_DECL boss_morogrim_tidewalkerAI : public ScriptedAI return; //Earthquake_Timer - if (Earthquake_Timer < diff) + if (Earthquake_Timer <= diff) { if (!Earthquake) { @@ -196,45 +196,45 @@ struct TRINITY_DLL_DECL boss_morogrim_tidewalkerAI : public ScriptedAI for (uint8 i = 0; i < 10; ++i) { - Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0); + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); Creature* Murloc = m_creature->SummonCreature(MurlocCords[i][0],MurlocCords[i][1],MurlocCords[i][2],MurlocCords[i][3],MurlocCords[i][4], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); - if (target && Murloc) - Murloc->AI()->AttackStart(target); + if (pTarget && Murloc) + Murloc->AI()->AttackStart(pTarget); } DoScriptText(EMOTE_EARTHQUAKE, m_creature); Earthquake = false; Earthquake_Timer = 40000+rand()%5000; } - }else Earthquake_Timer -= diff; + } else Earthquake_Timer -= diff; //TidalWave_Timer - if (TidalWave_Timer < diff) + if (TidalWave_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_TIDAL_WAVE); TidalWave_Timer = 20000; - }else TidalWave_Timer -= diff; + } else TidalWave_Timer -= diff; if (!Phase2) { //WateryGrave_Timer - if (WateryGrave_Timer < diff) + if (WateryGrave_Timer <= diff) { //Teleport 4 players under the waterfalls - Unit *target; + Unit *pTarget; using std::set; set<int>list; set<int>::iterator itr; for (uint8 i = 0; i < 4; ++i) { counter = 0; - do{target = SelectTarget(SELECT_TARGET_RANDOM, 1, 50, true); //target players only + do{pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 50, true); //pTarget players only if (counter < Playercount) break; - if (target) itr = list.find(target->GetGUID()); + if (pTarget) itr = list.find(pTarget->GetGUID()); counter++; }while(itr != list.end()); - if (target){list.insert(target->GetGUID()); - ApplyWateryGrave(target, i); + if (pTarget){list.insert(pTarget->GetGUID()); + ApplyWateryGrave(pTarget, i); } } @@ -242,7 +242,7 @@ struct TRINITY_DLL_DECL boss_morogrim_tidewalkerAI : public ScriptedAI DoScriptText(EMOTE_WATERY_GRAVE, m_creature); WateryGrave_Timer = 30000; - }else WateryGrave_Timer -= diff; + } else WateryGrave_Timer -= diff; //Start Phase2 if ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 25) @@ -251,27 +251,30 @@ struct TRINITY_DLL_DECL boss_morogrim_tidewalkerAI : public ScriptedAI else { //WateryGlobules_Timer - if (WateryGlobules_Timer < diff) + if (WateryGlobules_Timer <= diff) { - Unit* globuletarget; + Unit* pGlobuleTarget; using std::set; set<int>globulelist; set<int>::iterator itr; - for (int8 g = 0; g < 4; g++) //one unit cant cast more than one spell per update, so some players have to cast for us XD + for (uint8 g = 0; g < 4; g++) //one unit can't cast more than one spell per update, so some players have to cast for us XD { counter = 0; - do {globuletarget = SelectTarget(SELECT_TARGET_RANDOM, 0,50,true); - if (globuletarget) itr = globulelist.find(globuletarget->GetGUID()); - if (counter > Playercount) - break; - counter++; + do { + pGlobuleTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 50, true); + if (pGlobuleTarget) + itr = globulelist.find(pGlobuleTarget->GetGUID()); + if (counter > Playercount) + break; + ++counter; } while (itr != globulelist.end()); - if (globuletarget)globulelist.insert(globuletarget->GetGUID()); - globuletarget->CastSpell(globuletarget, globulespell[g], true); + if (pGlobuleTarget) + globulelist.insert(pGlobuleTarget->GetGUID()); + pGlobuleTarget->CastSpell(pGlobuleTarget, globulespell[g], true); } DoScriptText(EMOTE_WATERY_GLOBULES, m_creature); WateryGlobules_Timer = 25000; - }else WateryGlobules_Timer -= diff; + } else WateryGlobules_Timer -= diff; } DoMeleeAttackIfReady(); @@ -305,7 +308,7 @@ struct TRINITY_DLL_DECL mob_water_globuleAI : public ScriptedAI if (who->isTargetableForAttack() && who->isInAccessiblePlaceFor(m_creature) && m_creature->IsHostileTo(who)) { - //no attack radius check - it attacks the first target that moves in his los + //no attack radius check - it attacks the first pTarget that moves in his los //who->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH); AttackStart(who); } @@ -317,7 +320,7 @@ struct TRINITY_DLL_DECL mob_water_globuleAI : public ScriptedAI if (!UpdateVictim()) return; - if (Check_Timer < diff) + if (Check_Timer <= diff) { if (m_creature->IsWithinDistInMap(m_creature->getVictim(), 5)) { @@ -328,7 +331,7 @@ struct TRINITY_DLL_DECL mob_water_globuleAI : public ScriptedAI return; } Check_Timer = 500; - }else Check_Timer -= diff; + } else Check_Timer -= diff; //do NOT deal any melee damage to the target. } 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 b83fafa9f1e..b80d0f7f38e 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 @@ -133,14 +133,14 @@ struct TRINITY_DLL_DECL instance_serpentshrine_cavern : public ScriptedInstance //Lurker Fishing event if(LurkerSubEvent == LURKER_FISHING) { - if(FishingTimer < diff) + if (FishingTimer <= diff) { LurkerSubEvent = LURKER_HOOKED; 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; + } else FishingTimer -= diff; } //Water checks - if(WaterCheckTimer < diff) + if (WaterCheckTimer <= diff) { if(TrashCount >= MIN_KILLS) Water = WATERSTATE_SCALDING; @@ -163,7 +163,7 @@ struct TRINITY_DLL_DECL instance_serpentshrine_cavern : public ScriptedInstance { pPlayer->CastSpell(pPlayer, SPELL_SCALDINGWATER,true); } - }else if(Water == WATERSTATE_FRENZY) + } else if(Water == WATERSTATE_FRENZY) { //spawn frenzy if(DoSpawnFrenzy) @@ -183,12 +183,12 @@ struct TRINITY_DLL_DECL instance_serpentshrine_cavern : public ScriptedInstance } WaterCheckTimer = 500;//remove stress from core - }else WaterCheckTimer -= diff; - if(FrenzySpawnTimer < diff) + } else WaterCheckTimer -= diff; + if (FrenzySpawnTimer <= diff) { DoSpawnFrenzy = true; FrenzySpawnTimer = 2000; - }else FrenzySpawnTimer -= diff; + } else FrenzySpawnTimer -= diff; } void OnGameObjectCreate(GameObject* pGo, bool add) diff --git a/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp index 7df3157e555..7ae790bb623 100644 --- a/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp +++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp @@ -93,36 +93,36 @@ struct TRINITY_DLL_DECL boss_thespiaAI : public ScriptedAI return; //LightningCloud_Timer - if (LightningCloud_Timer < diff) + if (LightningCloud_Timer <= diff) { //cast twice in Heroic mode - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(target, SPELL_LIGHTNING_CLOUD); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget, SPELL_LIGHTNING_CLOUD); if (HeroicMode) - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(target, SPELL_LIGHTNING_CLOUD); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget, SPELL_LIGHTNING_CLOUD); LightningCloud_Timer = 15000+rand()%10000; - }else LightningCloud_Timer -=diff; + } else LightningCloud_Timer -=diff; //LungBurst_Timer - if (LungBurst_Timer < diff) + if (LungBurst_Timer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(target, SPELL_LUNG_BURST); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget, SPELL_LUNG_BURST); LungBurst_Timer = 7000+rand()%5000; - }else LungBurst_Timer -=diff; + } else LungBurst_Timer -=diff; //EnvelopingWinds_Timer - if (EnvelopingWinds_Timer < diff) + if (EnvelopingWinds_Timer <= diff) { //cast twice in Heroic mode - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(target, SPELL_ENVELOPING_WINDS); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget, SPELL_ENVELOPING_WINDS); if (HeroicMode) - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(target, SPELL_ENVELOPING_WINDS); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget, SPELL_ENVELOPING_WINDS); EnvelopingWinds_Timer = 10000+rand()%5000; - }else EnvelopingWinds_Timer -=diff; + } else EnvelopingWinds_Timer -=diff; DoMeleeAttackIfReady(); } @@ -151,11 +151,11 @@ struct TRINITY_DLL_DECL mob_coilfang_waterelementalAI : public ScriptedAI if (!UpdateVictim()) return; - if (WaterBoltVolley_Timer < diff) + if (WaterBoltVolley_Timer <= diff) { DoCast(m_creature, HEROIC(SPELL_WATER_BOLT_VOLLEY, H_SPELL_WATER_BOLT_VOLLEY)); WaterBoltVolley_Timer = 7000+rand()%5000; - }else WaterBoltVolley_Timer -= diff; + } else WaterBoltVolley_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp index 8726d91d725..14b4a49f5d9 100644 --- a/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp +++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp @@ -17,7 +17,7 @@ /* ScriptData SDName: Boss_Mekgineer_Steamrigger SD%Complete: 60 -SDComment: Mechanics' interrrupt heal doesn't work very well, also a proper movement needs to be implemented -> summon further away and move towards target to repair. +SDComment: Mechanics' interrrupt heal doesn't work very well, also a proper movement needs to be implemented -> summon further away and move towards pTarget to repair. SDCategory: Coilfang Resevoir, The Steamvault EndScriptData */ @@ -119,23 +119,23 @@ struct TRINITY_DLL_DECL boss_mekgineer_steamriggerAI : public ScriptedAI if (!UpdateVictim()) return; - if (Shrink_Timer < diff) + if (Shrink_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_SUPER_SHRINK_RAY); Shrink_Timer = 20000; - }else Shrink_Timer -= diff; + } else Shrink_Timer -= diff; - if (Saw_Blade_Timer < diff) + if (Saw_Blade_Timer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,1)) - DoCast(target,SPELL_SAW_BLADE); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,1)) + DoCast(pTarget,SPELL_SAW_BLADE); else DoCast(m_creature->getVictim(),SPELL_SAW_BLADE); Saw_Blade_Timer = 15000; } else Saw_Blade_Timer -= diff; - if (Electrified_Net_Timer < diff) + if (Electrified_Net_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_ELECTRIFIED_NET); Electrified_Net_Timer = 10000; @@ -213,7 +213,7 @@ struct TRINITY_DLL_DECL mob_steamrigger_mechanicAI : public ScriptedAI void UpdateAI(const uint32 diff) { - if (Repair_Timer < diff) + if (Repair_Timer <= diff) { if (pInstance && pInstance->GetData64(DATA_MEKGINEERSTEAMRIGGER) && pInstance->GetData(TYPE_MEKGINEER_STEAMRIGGER) == IN_PROGRESS) { @@ -237,8 +237,8 @@ struct TRINITY_DLL_DECL mob_steamrigger_mechanicAI : public ScriptedAI //m_creature->GetMotionMaster()->MoveFollow(pMekgineer,0,0); } } - }else Repair_Timer = 5000; - }else Repair_Timer -= diff; + } else Repair_Timer = 5000; + } else Repair_Timer -= diff; if (!UpdateVictim()) return; diff --git a/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp index bf042c90c8d..b0c8a3eafc8 100644 --- a/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp +++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp @@ -146,7 +146,7 @@ struct TRINITY_DLL_DECL boss_warlord_kalithreshAI : public ScriptedAI if (!UpdateVictim()) return; - if (Rage_Timer < diff) + if (Rage_Timer <= diff) { if (Creature* distiller = me->FindNearestCreature(17954, 100.0f)) { @@ -155,23 +155,23 @@ struct TRINITY_DLL_DECL boss_warlord_kalithreshAI : public ScriptedAI CAST_AI(mob_naga_distillerAI, distiller->AI())->StartRageGen(m_creature); } Rage_Timer = 3000+rand()%15000; - }else Rage_Timer -= diff; + } else Rage_Timer -= diff; //Reflection_Timer - if (Reflection_Timer < diff) + if (Reflection_Timer <= diff) { DoCast(m_creature, SPELL_SPELL_REFLECTION); Reflection_Timer = 15000+rand()%10000; - }else Reflection_Timer -= diff; + } else Reflection_Timer -= diff; //Impale_Timer - if (Impale_Timer < diff) + if (Impale_Timer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(target,SPELL_IMPALE); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget,SPELL_IMPALE); Impale_Timer = 7500+rand()%5000; - }else Impale_Timer -= diff; + } else Impale_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/outland/coilfang_resevoir/underbog/boss_hungarfen.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/underbog/boss_hungarfen.cpp index c8337023b78..816d1c3f126 100644 --- a/src/bindings/scripts/scripts/outland/coilfang_resevoir/underbog/boss_hungarfen.cpp +++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/underbog/boss_hungarfen.cpp @@ -63,22 +63,22 @@ struct TRINITY_DLL_DECL boss_hungarfenAI : public ScriptedAI } } - if (Mushroom_Timer < diff) + if (Mushroom_Timer <= diff) { - if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0)) - m_creature->SummonCreature(17990, target->GetPositionX()+(rand()%8), target->GetPositionY()+(rand()%8), target->GetPositionZ(), (rand()%5), TEMPSUMMON_TIMED_DESPAWN, 22000); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + m_creature->SummonCreature(17990, pTarget->GetPositionX()+(rand()%8), pTarget->GetPositionY()+(rand()%8), pTarget->GetPositionZ(), (rand()%5), TEMPSUMMON_TIMED_DESPAWN, 22000); else m_creature->SummonCreature(17990, m_creature->GetPositionX()+(rand()%8), m_creature->GetPositionY()+(rand()%8), m_creature->GetPositionZ(), (rand()%5), TEMPSUMMON_TIMED_DESPAWN, 22000); Mushroom_Timer = 10000; - }else Mushroom_Timer -= diff; + } else Mushroom_Timer -= diff; - if (AcidGeyser_Timer < diff) + if (AcidGeyser_Timer <= diff) { - if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(target,SPELL_ACID_GEYSER); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget,SPELL_ACID_GEYSER); AcidGeyser_Timer = 10000+rand()%7500; - }else AcidGeyser_Timer -= diff; + } else AcidGeyser_Timer -= diff; DoMeleeAttackIfReady(); } @@ -125,13 +125,13 @@ struct TRINITY_DLL_DECL mob_underbog_mushroomAI : public ScriptedAI { DoCast(m_creature,SPELL_GROW); Grow_Timer = 3000; - }else Grow_Timer -= diff; + } else Grow_Timer -= diff; if (Shrink_Timer <= diff) { m_creature->RemoveAurasDueToSpell(SPELL_GROW); Stop = true; - }else Shrink_Timer -= diff; + } else Shrink_Timer -= diff; } }; CreatureAI* GetAI_mob_underbog_mushroom(Creature* pCreature) diff --git a/src/bindings/scripts/scripts/outland/coilfang_resevoir/underbog/boss_the_black_stalker.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/underbog/boss_the_black_stalker.cpp index 6695ce6eb9c..2f5ada6b3af 100644 --- a/src/bindings/scripts/scripts/outland/coilfang_resevoir/underbog/boss_the_black_stalker.cpp +++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/underbog/boss_the_black_stalker.cpp @@ -70,8 +70,8 @@ struct TRINITY_DLL_DECL boss_the_black_stalkerAI : public ScriptedAI if (summon && summon->GetEntry() == ENTRY_SPORE_STRIDER) { Striders.push_back(summon->GetGUID()); - if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,1)) - summon->AI()->AttackStart(target); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,1)) + summon->AI()->AttackStart(pTarget); else if (m_creature->getVictim()) summon->AI()->AttackStart(m_creature->getVictim()); @@ -91,7 +91,7 @@ struct TRINITY_DLL_DECL boss_the_black_stalkerAI : public ScriptedAI return; // Evade if too far - if (check_Timer < diff) + if (check_Timer <= diff) { float x,y,z,o; m_creature->GetHomePosition(x,y,z,o); @@ -101,70 +101,70 @@ struct TRINITY_DLL_DECL boss_the_black_stalkerAI : public ScriptedAI return; } check_Timer = 1000; - }else check_Timer -= diff; + } else check_Timer -= diff; // Spore Striders - if (HeroicMode && SporeStriders_Timer < diff) + if (HeroicMode && SporeStriders_Timer <= diff) { DoCast(m_creature,SPELL_SUMMON_SPORE_STRIDER); SporeStriders_Timer = 10000+rand()%5000; - }else SporeStriders_Timer -= diff; + } else SporeStriders_Timer -= diff; // Levitate if (LevitatedTarget) { - if (LevitatedTarget_Timer < diff) + if (LevitatedTarget_Timer <= diff) { - if (Unit* target = Unit::GetUnit(*m_creature, LevitatedTarget)) + if (Unit *pTarget = Unit::GetUnit(*m_creature, LevitatedTarget)) { - if (!target->HasAura(SPELL_LEVITATE)) + if (!pTarget->HasAura(SPELL_LEVITATE)) { LevitatedTarget = 0; return; } if (InAir) { - target->AddAura(SPELL_SUSPENSION, target); + pTarget->AddAura(SPELL_SUSPENSION, pTarget); LevitatedTarget = 0; } else { - target->CastSpell(target, SPELL_MAGNETIC_PULL, true); + pTarget->CastSpell(pTarget, SPELL_MAGNETIC_PULL, true); InAir = true; LevitatedTarget_Timer = 1500; } } else LevitatedTarget = 0; - }else LevitatedTarget_Timer -= diff; + } else LevitatedTarget_Timer -= diff; } - if (Levitate_Timer < diff) + if (Levitate_Timer <= diff) { - if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,1)) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,1)) { - DoCast(target, SPELL_LEVITATE); - LevitatedTarget = target->GetGUID(); + DoCast(pTarget, SPELL_LEVITATE); + LevitatedTarget = pTarget->GetGUID(); LevitatedTarget_Timer = 2000; InAir = false; } Levitate_Timer = 12000+rand()%3000; - }else Levitate_Timer -= diff; + } else Levitate_Timer -= diff; // Chain Lightning - if (ChainLightning_Timer < diff) + if (ChainLightning_Timer <= diff) { - if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(target, SPELL_CHAIN_LIGHTNING); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget, SPELL_CHAIN_LIGHTNING); ChainLightning_Timer = 7000; - }else ChainLightning_Timer -= diff; + } else ChainLightning_Timer -= diff; // Static Charge - if (StaticCharge_Timer < diff) + if (StaticCharge_Timer <= diff) { - if (Unit *target = SelectTarget(SELECT_TARGET_RANDOM,0,30,true)) - DoCast(target, SPELL_STATIC_CHARGE); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,30,true)) + DoCast(pTarget, SPELL_STATIC_CHARGE); StaticCharge_Timer = 10000; - }else StaticCharge_Timer -= diff; + } else StaticCharge_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/outland/gruuls_lair/boss_gruul.cpp b/src/bindings/scripts/scripts/outland/gruuls_lair/boss_gruul.cpp index 12cd1a6e922..aacd944d02a 100644 --- a/src/bindings/scripts/scripts/outland/gruuls_lair/boss_gruul.cpp +++ b/src/bindings/scripts/scripts/outland/gruuls_lair/boss_gruul.cpp @@ -116,7 +116,7 @@ struct TRINITY_DLL_DECL boss_gruulAI : public ScriptedAI { if (pTarget->GetTypeId() == TYPEID_PLAYER) { - switch(rand()%2) + switch (urand(0,1)) { case 0: pTarget->CastSpell(pTarget, SPELL_MAGNETIC_PULL, true, NULL, NULL, m_creature->GetGUID()); break; case 1: pTarget->CastSpell(pTarget, SPELL_KNOCK_BACK, true, NULL, NULL, m_creature->GetGUID()); break; @@ -156,7 +156,7 @@ struct TRINITY_DLL_DECL boss_gruulAI : public ScriptedAI // Growth // Gruul can cast this spell up to 30 times - if (m_uiGrowth_Timer < uiDiff) + if (m_uiGrowth_Timer <= uiDiff) { DoScriptText(EMOTE_GROW, m_creature); DoCast(m_creature,SPELL_GROWTH); @@ -167,7 +167,7 @@ struct TRINITY_DLL_DECL boss_gruulAI : public ScriptedAI if (m_bPerformingGroundSlam) { - if (m_uiGroundSlamTimer < uiDiff) + if (m_uiGroundSlamTimer <= uiDiff) { m_uiGroundSlamTimer =120000; m_uiHurtfulStrike_Timer= 8000; @@ -183,12 +183,12 @@ struct TRINITY_DLL_DECL boss_gruulAI : public ScriptedAI else { // Hurtful Strike - if (m_uiHurtfulStrike_Timer < uiDiff) + if (m_uiHurtfulStrike_Timer <= uiDiff) { - Unit* target = SelectUnit(SELECT_TARGET_TOPAGGRO,1); + Unit *pTarget = SelectUnit(SELECT_TARGET_TOPAGGRO,1); - if (target && m_creature->IsWithinMeleeRange(m_creature->getVictim())) - DoCast(target,SPELL_HURTFUL_STRIKE); + if (pTarget && m_creature->IsWithinMeleeRange(m_creature->getVictim())) + DoCast(pTarget,SPELL_HURTFUL_STRIKE); else DoCast(m_creature->getVictim(),SPELL_HURTFUL_STRIKE); @@ -198,7 +198,7 @@ struct TRINITY_DLL_DECL boss_gruulAI : public ScriptedAI m_uiHurtfulStrike_Timer -= uiDiff; // Reverberation - if (m_uiReverberation_Timer < uiDiff) + if (m_uiReverberation_Timer <= uiDiff) { DoCast(m_creature->getVictim(), SPELL_REVERBERATION, true); m_uiReverberation_Timer = 15000 + rand()%10000; @@ -207,10 +207,10 @@ struct TRINITY_DLL_DECL boss_gruulAI : public ScriptedAI m_uiReverberation_Timer -= uiDiff; // Cave In - if (m_uiCaveIn_Timer < uiDiff) + if (m_uiCaveIn_Timer <= uiDiff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(target,SPELL_CAVE_IN); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget,SPELL_CAVE_IN); if (m_uiCaveIn_StaticTimer >= 4000) m_uiCaveIn_StaticTimer -= 2000; @@ -221,7 +221,7 @@ struct TRINITY_DLL_DECL boss_gruulAI : public ScriptedAI m_uiCaveIn_Timer -= uiDiff; // Ground Slam, Gronn Lord's Grasp, Stoned, Shatter - if (m_uiGroundSlamTimer < uiDiff) + if (m_uiGroundSlamTimer <= uiDiff) { m_creature->GetMotionMaster()->Clear(); m_creature->GetMotionMaster()->MoveIdle(); diff --git a/src/bindings/scripts/scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp b/src/bindings/scripts/scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp index 6c7b20a4a51..f8f77afc550 100644 --- a/src/bindings/scripts/scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp +++ b/src/bindings/scripts/scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp @@ -211,11 +211,11 @@ struct TRINITY_DLL_DECL boss_high_king_maulgarAI : public ScriptedAI //Only if not incombat check if the event is started if (!m_creature->isInCombat() && pInstance && pInstance->GetData(DATA_MAULGAREVENT)) { - Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_MAULGAREVENT_TANK)); + Unit *pTarget = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_MAULGAREVENT_TANK)); - if (target) + if (pTarget) { - AttackStart(target); + AttackStart(pTarget); GetCouncil(); } } @@ -232,25 +232,25 @@ struct TRINITY_DLL_DECL boss_high_king_maulgarAI : public ScriptedAI } //ArcingSmash_Timer - if (ArcingSmash_Timer < diff) + if (ArcingSmash_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_ARCING_SMASH); ArcingSmash_Timer = 10000; - }else ArcingSmash_Timer -= diff; + } else ArcingSmash_Timer -= diff; //Whirlwind_Timer - if (Whirlwind_Timer < diff) + if (Whirlwind_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_WHIRLWIND); Whirlwind_Timer = 55000; - }else Whirlwind_Timer -= diff; + } else Whirlwind_Timer -= diff; //MightyBlow_Timer - if (MightyBlow_Timer < diff) + if (MightyBlow_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_MIGHTY_BLOW); MightyBlow_Timer = 30000+rand()%10000; - }else MightyBlow_Timer -= diff; + } else MightyBlow_Timer -= diff; //Entering Phase 2 if (!Phase2 && (m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 50) @@ -266,24 +266,24 @@ struct TRINITY_DLL_DECL boss_high_king_maulgarAI : public ScriptedAI if (Phase2) { //Charging_Timer - if (Charging_Timer < diff) + if (Charging_Timer <= diff) { - Unit* target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (target) + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + if (pTarget) { - AttackStart(target); - DoCast(target, SPELL_BERSERKER_C); + AttackStart(pTarget); + DoCast(pTarget, SPELL_BERSERKER_C); } Charging_Timer = 20000; - }else Charging_Timer -= diff; + } else Charging_Timer -= diff; //Intimidating Roar - if (Roar_Timer < diff) + if (Roar_Timer <= diff) { DoCast(m_creature, SPELL_ROAR); Roar_Timer = 40000+(rand()%10000); - }else Roar_Timer -= diff; + } else Roar_Timer -= diff; } DoMeleeAttackIfReady(); @@ -359,11 +359,11 @@ struct TRINITY_DLL_DECL boss_olm_the_summonerAI : public ScriptedAI //Only if not incombat check if the event is started if (!m_creature->isInCombat() && pInstance && pInstance->GetData(DATA_MAULGAREVENT)) { - Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_MAULGAREVENT_TANK)); + Unit *pTarget = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_MAULGAREVENT_TANK)); - if (target) + if (pTarget) { - AttackStart(target); + AttackStart(pTarget); } } @@ -379,28 +379,28 @@ struct TRINITY_DLL_DECL boss_olm_the_summonerAI : public ScriptedAI } //DarkDecay_Timer - if (DarkDecay_Timer < diff) + if (DarkDecay_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_DARK_DECAY); DarkDecay_Timer = 20000; - }else DarkDecay_Timer -= diff; + } else DarkDecay_Timer -= diff; //Summon_Timer - if (Summon_Timer < diff) + if (Summon_Timer <= diff) { DoCast(m_creature, SPELL_SUMMON_WFH); Summon_Timer = 30000; - }else Summon_Timer -= diff; + } else Summon_Timer -= diff; //DeathCoil Timer /need correct timer - if (DeathCoil_Timer < diff) + if (DeathCoil_Timer <= diff) { - Unit* target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (target) - DoCast(target, SPELL_DEATH_COIL); + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + if (pTarget) + DoCast(pTarget, SPELL_DEATH_COIL); DeathCoil_Timer = 20000; - }else DeathCoil_Timer -= diff; + } else DeathCoil_Timer -= diff; DoMeleeAttackIfReady(); } @@ -462,11 +462,11 @@ struct TRINITY_DLL_DECL boss_kiggler_the_crazedAI : public ScriptedAI //Only if not incombat check if the event is started if (!m_creature->isInCombat() && pInstance && pInstance->GetData(DATA_MAULGAREVENT)) { - Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_MAULGAREVENT_TANK)); + Unit *pTarget = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_MAULGAREVENT_TANK)); - if (target) + if (pTarget) { - AttackStart(target); + AttackStart(pTarget); } } @@ -482,35 +482,35 @@ struct TRINITY_DLL_DECL boss_kiggler_the_crazedAI : public ScriptedAI } //GreaterPolymorph_Timer - if (GreaterPolymorph_Timer < diff) + if (GreaterPolymorph_Timer <= diff) { - Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (target) - DoCast(target, SPELL_GREATER_POLYMORPH); + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + if (pTarget) + DoCast(pTarget, SPELL_GREATER_POLYMORPH); GreaterPolymorph_Timer = 15000 + rand()%5000; - }else GreaterPolymorph_Timer -= diff; + } else GreaterPolymorph_Timer -= diff; //LightningBolt_Timer - if (LightningBolt_Timer < diff) + if (LightningBolt_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_LIGHTNING_BOLT); LightningBolt_Timer = 15000; - }else LightningBolt_Timer -= diff; + } else LightningBolt_Timer -= diff; //ArcaneShock_Timer - if (ArcaneShock_Timer < diff) + if (ArcaneShock_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_ARCANE_SHOCK); ArcaneShock_Timer = 20000; - }else ArcaneShock_Timer -= diff; + } else ArcaneShock_Timer -= diff; //ArcaneExplosion_Timer - if (ArcaneExplosion_Timer < diff) + if (ArcaneExplosion_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_ARCANE_EXPLOSION); ArcaneExplosion_Timer = 30000; - }else ArcaneExplosion_Timer -= diff; + } else ArcaneExplosion_Timer -= diff; DoMeleeAttackIfReady(); } @@ -570,11 +570,11 @@ struct TRINITY_DLL_DECL boss_blindeye_the_seerAI : public ScriptedAI //Only if not incombat check if the event is started if (!m_creature->isInCombat() && pInstance && pInstance->GetData(DATA_MAULGAREVENT)) { - Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_MAULGAREVENT_TANK)); + Unit *pTarget = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_MAULGAREVENT_TANK)); - if (target) + if (pTarget) { - AttackStart(target); + AttackStart(pTarget); } } @@ -590,25 +590,25 @@ struct TRINITY_DLL_DECL boss_blindeye_the_seerAI : public ScriptedAI } //GreaterPowerWordShield_Timer - if (GreaterPowerWordShield_Timer < diff) + if (GreaterPowerWordShield_Timer <= diff) { DoCast(m_creature, SPELL_GREATER_PW_SHIELD); GreaterPowerWordShield_Timer = 40000; - }else GreaterPowerWordShield_Timer -= diff; + } else GreaterPowerWordShield_Timer -= diff; //Heal_Timer - if (Heal_Timer < diff) + if (Heal_Timer <= diff) { DoCast(m_creature, SPELL_HEAL); Heal_Timer = 15000 + rand()%25000; - }else Heal_Timer -= diff; + } else Heal_Timer -= diff; //PrayerofHealing_Timer - if (PrayerofHealing_Timer < diff) + if (PrayerofHealing_Timer <= diff) { DoCast(m_creature, SPELL_PRAYER_OH); PrayerofHealing_Timer = 35000 + rand()%15000; - }else PrayerofHealing_Timer -= diff; + } else PrayerofHealing_Timer -= diff; DoMeleeAttackIfReady(); } @@ -668,11 +668,11 @@ struct TRINITY_DLL_DECL boss_krosh_firehandAI : public ScriptedAI //Only if not incombat check if the event is started if (!m_creature->isInCombat() && pInstance && pInstance->GetData(DATA_MAULGAREVENT)) { - Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_MAULGAREVENT_TANK)); + Unit *pTarget = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_MAULGAREVENT_TANK)); - if (target) + if (pTarget) { - AttackStart(target); + AttackStart(pTarget); } } @@ -692,37 +692,37 @@ struct TRINITY_DLL_DECL boss_krosh_firehandAI : public ScriptedAI { DoCast(m_creature->getVictim(), SPELL_GREATER_FIREBALL); GreaterFireball_Timer = 2000; - }else GreaterFireball_Timer -= diff; + } else GreaterFireball_Timer -= diff; //SpellShield_Timer - if (SpellShield_Timer < diff) + if (SpellShield_Timer <= diff) { m_creature->InterruptNonMeleeSpells(false); DoCast(m_creature->getVictim(), SPELL_SPELLSHIELD); SpellShield_Timer = 30000; - }else SpellShield_Timer -= diff; + } else SpellShield_Timer -= diff; //BlastWave_Timer - if (BlastWave_Timer < diff) + if (BlastWave_Timer <= diff) { - Unit *target; + Unit *pTarget; std::list<HostilReference *> t_list = m_creature->getThreatManager().getThreatList(); std::vector<Unit *> target_list; for (std::list<HostilReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { - target = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); + pTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); //15 yard radius minimum - if (target && target->IsWithinDist(m_creature, 15,false)) - target_list.push_back(target); - target = NULL; + if (pTarget && pTarget->IsWithinDist(m_creature, 15,false)) + target_list.push_back(pTarget); + pTarget = NULL; } if (target_list.size()) - target = *(target_list.begin()+rand()%target_list.size()); + pTarget = *(target_list.begin()+rand()%target_list.size()); m_creature->InterruptNonMeleeSpells(false); - DoCast(target, SPELL_BLAST_WAVE); + DoCast(pTarget, SPELL_BLAST_WAVE); BlastWave_Timer = 60000; - }else BlastWave_Timer -= diff; + } else BlastWave_Timer -= diff; } }; 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 1075b979e3a..56d01af1227 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 @@ -83,23 +83,23 @@ struct TRINITY_DLL_DECL boss_broggokAI : public ScriptedAI if (!UpdateVictim()) return; - if (AcidSpray_Timer < diff) + if (AcidSpray_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_SLIME_SPRAY); AcidSpray_Timer = 4000+rand()%8000; - }else AcidSpray_Timer -=diff; + } else AcidSpray_Timer -=diff; - if (PoisonBolt_Timer < diff) + if (PoisonBolt_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_POISON_BOLT); PoisonBolt_Timer = 4000+rand()%8000; - }else PoisonBolt_Timer -=diff; + } else PoisonBolt_Timer -=diff; - if (PoisonSpawn_Timer < diff) + if (PoisonSpawn_Timer <= diff) { DoCast(m_creature,SPELL_POISON_CLOUD); PoisonSpawn_Timer = 20000; - }else PoisonSpawn_Timer -=diff; + } else PoisonSpawn_Timer -=diff; DoMeleeAttackIfReady(); } 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 2ca3b67c727..936eb80b0b7 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 @@ -190,40 +190,40 @@ struct TRINITY_DLL_DECL boss_kelidan_the_breakerAI : public ScriptedAI { if (!UpdateVictim()) { - if (check_Timer < diff) + if (check_Timer <= diff) { if (!m_creature->IsNonMeleeSpellCasted(false)) DoCast(m_creature,SPELL_EVOCATION); check_Timer = 5000; - }else check_Timer -= diff; + } else check_Timer -= diff; return; } if (Firenova) { - if (Firenova_Timer < diff) + if (Firenova_Timer <= diff) { DoCast(m_creature, HEROIC(SPELL_FIRE_NOVA, H_SPELL_FIRE_NOVA), true); Firenova = false; ShadowVolley_Timer = 2000; - }else Firenova_Timer -=diff; + } else Firenova_Timer -=diff; return; } - if (ShadowVolley_Timer < diff) + if (ShadowVolley_Timer <= diff) { DoCast(m_creature, HEROIC(SPELL_SHADOW_BOLT_VOLLEY, H_SPELL_SHADOW_BOLT_VOLLEY)); ShadowVolley_Timer = 5000+rand()%8000; - }else ShadowVolley_Timer -=diff; + } else ShadowVolley_Timer -=diff; - if (Corruption_Timer < diff) + if (Corruption_Timer <= diff) { DoCast(m_creature,SPELL_CORRUPTION); Corruption_Timer = 30000+rand()%20000; - }else Corruption_Timer -=diff; + } else Corruption_Timer -=diff; - if (BurningNova_Timer < diff) + if (BurningNova_Timer <= diff) { if (m_creature->IsNonMeleeSpellCasted(false)) m_creature->InterruptNonMeleeSpells(true); @@ -248,7 +248,7 @@ struct TRINITY_DLL_DECL boss_kelidan_the_breakerAI : public ScriptedAI BurningNova_Timer = 20000+rand()%8000; Firenova_Timer= 5000; Firenova = true; - }else BurningNova_Timer -=diff; + } else BurningNova_Timer -=diff; DoMeleeAttackIfReady(); } @@ -314,7 +314,7 @@ struct TRINITY_DLL_DECL mob_shadowmoon_channelerAI : public ScriptedAI { if (!UpdateVictim()) { - if (check_Timer < diff) + if (check_Timer <= diff) { if (!m_creature->IsNonMeleeSpellCasted(false)) if (Creature *Kelidan = me->FindNearestCreature(ENTRY_KELIDAN, 100)) @@ -324,22 +324,22 @@ struct TRINITY_DLL_DECL mob_shadowmoon_channelerAI : public ScriptedAI DoCast(channeled,SPELL_CHANNELING); } check_Timer = 5000; - }else check_Timer -= diff; + } else check_Timer -= diff; return; } - if (MarkOfShadow_Timer < diff) + if (MarkOfShadow_Timer <= diff) { - if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(target,SPELL_MARK_OF_SHADOW); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget,SPELL_MARK_OF_SHADOW); MarkOfShadow_Timer = 15000+rand()%5000; - }else MarkOfShadow_Timer -=diff; + } else MarkOfShadow_Timer -=diff; - if (ShadowBolt_Timer < diff) + if (ShadowBolt_Timer <= diff) { DoCast(m_creature->getVictim(), HEROIC(SPELL_SHADOW_BOLT, H_SPELL_SHADOW_BOLT)); ShadowBolt_Timer = 5000+rand()%1000; - }else ShadowBolt_Timer -=diff; + } else ShadowBolt_Timer -=diff; DoMeleeAttackIfReady(); } 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 91f5873ed96..7598af0e8e6 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 @@ -101,36 +101,36 @@ struct TRINITY_DLL_DECL boss_the_makerAI : public ScriptedAI if (!UpdateVictim()) return; - if (AcidSpray_Timer < diff) + if (AcidSpray_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_ACID_SPRAY); AcidSpray_Timer = 15000+rand()%8000; - }else AcidSpray_Timer -=diff; + } else AcidSpray_Timer -=diff; - if (ExplodingBreaker_Timer < diff) + if (ExplodingBreaker_Timer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(target,SPELL_EXPLODING_BREAKER); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget,SPELL_EXPLODING_BREAKER); ExplodingBreaker_Timer = 4000+rand()%8000; - }else ExplodingBreaker_Timer -=diff; + } else ExplodingBreaker_Timer -=diff; /* // Disabled until Core Support for mind control - if (domination_timer_timer < diff) + if (domination_timer_timer <= diff) { - Unit* target; - target = SelectUnit(SELECT_TARGET_RANDOM,0); + Unit *pTarget; + pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); - DoCast(target,SPELL_DOMINATION); + DoCast(pTarget,SPELL_DOMINATION); domination_timer = 120000; - }else domination_timer -=diff; + } else domination_timer -=diff; */ - if (Knockdown_Timer < diff) + if (Knockdown_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_KNOCKDOWN); Knockdown_Timer = 4000+rand()%8000; - }else Knockdown_Timer -=diff; + } else Knockdown_Timer -=diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp index d1ec8b79b57..31947a421e6 100644 --- a/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp +++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp @@ -112,17 +112,17 @@ struct TRINITY_DLL_DECL boss_omor_the_unscarredAI : public ScriptedAI //only two may be wrong, perhaps increase timer and spawn periodically instead. if (SummonedCount < 2) { - if (Summon_Timer < diff) + if (Summon_Timer <= diff) { m_creature->InterruptNonMeleeSpells(false); DoCast(m_creature,SPELL_SUMMON_FIENDISH_HOUND); Summon_Timer = 15000+rand()%15000; - }else Summon_Timer -= diff; + } else Summon_Timer -= diff; } if (CanPullBack) { - if (ShadowWhip_Timer < diff) + if (ShadowWhip_Timer <= diff) { if (Player* temp = Unit::GetPlayer(PlayerGUID)) { @@ -136,9 +136,9 @@ struct TRINITY_DLL_DECL boss_omor_the_unscarredAI : public ScriptedAI PlayerGUID = 0; ShadowWhip_Timer = 2000; CanPullBack = false; - }else ShadowWhip_Timer -= diff; + } else ShadowWhip_Timer -= diff; } - else if (OrbitalStrike_Timer < diff) + else if (OrbitalStrike_Timer <= diff) { Unit* temp = NULL; if (m_creature->IsWithinMeleeRange(m_creature->getVictim())) @@ -154,39 +154,39 @@ struct TRINITY_DLL_DECL boss_omor_the_unscarredAI : public ScriptedAI if (PlayerGUID) CanPullBack = true; } - }else OrbitalStrike_Timer -= diff; + } else OrbitalStrike_Timer -= diff; if ((m_creature->GetHealth()*100) / m_creature->GetMaxHealth() < 20) { - if (DemonicShield_Timer < diff) + if (DemonicShield_Timer <= diff) { DoCast(m_creature,SPELL_DEMONIC_SHIELD); DemonicShield_Timer = 15000; - }else DemonicShield_Timer -= diff; + } else DemonicShield_Timer -= diff; } - if (Aura_Timer < diff) + if (Aura_Timer <= diff) { DoScriptText(SAY_CURSE, m_creature); - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) { - DoCast(target,HEROIC(SPELL_TREACHEROUS_AURA, H_SPELL_BANE_OF_TREACHERY)); + DoCast(pTarget,HEROIC(SPELL_TREACHEROUS_AURA, H_SPELL_BANE_OF_TREACHERY)); Aura_Timer = 8000+rand()%8000; } - }else Aura_Timer -= diff; + } else Aura_Timer -= diff; - if (Shadowbolt_Timer < diff) + if (Shadowbolt_Timer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) { - if (target) - target = m_creature->getVictim(); + if (pTarget) + pTarget = m_creature->getVictim(); - DoCast(target,HEROIC(SPELL_SHADOW_BOLT, H_SPELL_SHADOW_BOLT)); + DoCast(pTarget,HEROIC(SPELL_SHADOW_BOLT, H_SPELL_SHADOW_BOLT)); Shadowbolt_Timer = 4000+rand()%2500; } - }else Shadowbolt_Timer -= diff; + } else Shadowbolt_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp index 71043ecaa1f..13ef2de0981 100644 --- a/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp +++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp @@ -98,10 +98,10 @@ struct TRINITY_DLL_DECL boss_nazanAI : public ScriptedAI } } - void SpellHitTarget(Unit* target, const SpellEntry* entry) + void SpellHitTarget(Unit *pTarget, const SpellEntry* entry) { - if (target && entry->Id == SPELL_FIREBALL) - m_creature->SummonCreature(ENTRY_LIQUID_FIRE,target->GetPositionX(),target->GetPositionY(),target->GetPositionZ(),target->GetOrientation(),TEMPSUMMON_TIMED_DESPAWN,30000); + if (pTarget && entry->Id == SPELL_FIREBALL) + m_creature->SummonCreature(ENTRY_LIQUID_FIRE,pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(),pTarget->GetOrientation(),TEMPSUMMON_TIMED_DESPAWN,30000); } void UpdateAI(const uint32 diff) @@ -115,7 +115,7 @@ struct TRINITY_DLL_DECL boss_nazanAI : public ScriptedAI return; } - if (Fireball_Timer < diff) + if (Fireball_Timer <= diff) { if (Unit *victim = SelectUnit(SELECT_TARGET_RANDOM,0)) DoCast(victim, SPELL_FIREBALL,true); @@ -138,9 +138,9 @@ struct TRINITY_DLL_DECL boss_nazanAI : public ScriptedAI DoStartMovement(m_creature->getVictim()); DoScriptText(EMOTE, m_creature); return; - }else Fly_Timer -= diff; + } else Fly_Timer -= diff; - if (Turn_Timer < diff) + if (Turn_Timer <= diff) { uint32 waypoint = (Fly_Timer/10000)%2; if (m_creature->IsWithinDist3d(VazrudenRing[waypoint][0],VazrudenRing[waypoint][1],VazrudenRing[waypoint][2], 5)) @@ -150,14 +150,14 @@ struct TRINITY_DLL_DECL boss_nazanAI : public ScriptedAI } else // phase 2 - land fight { - if (ConeOfFire_Timer < diff) + if (ConeOfFire_Timer <= diff) { DoCast(m_creature, SPELL_CONE_OF_FIRE); ConeOfFire_Timer = 12000; Fireball_Timer = 4000; } else ConeOfFire_Timer -= diff; - if (HeroicMode && BellowingRoar_Timer < diff) + if (HeroicMode && BellowingRoar_Timer <= diff) { DoCast(m_creature, SPELL_BELLOWING_ROAR); BellowingRoar_Timer = 45000; @@ -220,7 +220,7 @@ struct TRINITY_DLL_DECL boss_vazrudenAI : public ScriptedAI return; } - if (Revenge_Timer < diff) + if (Revenge_Timer <= diff) { if (Unit *victim = m_creature->getVictim()) DoCast(victim, SPELL_REVENGE); @@ -341,7 +341,7 @@ struct TRINITY_DLL_DECL boss_vazruden_the_heraldAI : public ScriptedAI return; break; case 1: // go to the middle and begin the fight - if (check < diff) + if (check <= diff) { if (!m_creature->IsWithinDist3d(VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2],5)) { @@ -355,10 +355,10 @@ struct TRINITY_DLL_DECL boss_vazruden_the_heraldAI : public ScriptedAI phase = 2; return; } - }else check -= diff; + } else check -= diff; break; default: // adds do the job now - if (check < diff) + if (check <= diff) { Creature *Nazan = Unit::GetCreature(*m_creature, NazanGUID); Creature *Vazruden = Unit::GetCreature(*m_creature, VazrudenGUID); @@ -380,7 +380,7 @@ struct TRINITY_DLL_DECL boss_vazruden_the_heraldAI : public ScriptedAI m_creature->Kill(m_creature); } check = 2000; - }else check -= diff; + } else check -= diff; break; } } @@ -410,7 +410,7 @@ struct TRINITY_DLL_DECL mob_hellfire_sentryAI : public ScriptedAI if (!UpdateVictim()) return; - if (KidneyShot_Timer < diff) + if (KidneyShot_Timer <= diff) { if (Unit *victim = m_creature->getVictim()) DoCast(victim, SPELL_KIDNEY_SHOT); diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp index aa8fe3e20e9..dc156647878 100644 --- a/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp +++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp @@ -17,7 +17,7 @@ /* ScriptData SDName: Boss_Watchkeeper_Gargolmar SD%Complete: 80 -SDComment: Missing adds to heal him. Surge should be used on target furthest away, not random. +SDComment: Missing adds to heal him. Surge should be used on pTarget furthest away, not random. SDCategory: Hellfire Citadel, Hellfire Ramparts EndScriptData */ @@ -105,29 +105,29 @@ struct TRINITY_DLL_DECL boss_watchkeeper_gargolmarAI : public ScriptedAI if (!UpdateVictim()) return; - if (MortalWound_Timer < diff) + if (MortalWound_Timer <= diff) { DoCast(m_creature->getVictim(),HEROIC(SPELL_MORTAL_WOUND, H_SPELL_MORTAL_WOUND)); MortalWound_Timer = 5000+rand()%8000; - }else MortalWound_Timer -= diff; + } else MortalWound_Timer -= diff; - if (Surge_Timer < diff) + if (Surge_Timer <= diff) { DoScriptText(SAY_SURGE, m_creature); - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(target,SPELL_SURGE); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget,SPELL_SURGE); Surge_Timer = 5000+rand()%8000; - }else Surge_Timer -= diff; + } else Surge_Timer -= diff; if ((m_creature->GetHealth()*100) / m_creature->GetMaxHealth() < 20) { - if (Retaliation_Timer < diff) + if (Retaliation_Timer <= diff) { DoCast(m_creature,SPELL_RETALIATION); Retaliation_Timer = 30000; - }else Retaliation_Timer -= diff; + } else Retaliation_Timer -= diff; } if (!YelledForHeal) diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp index 4188750bcde..bf8ea7310ce 100644 --- a/src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp +++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp @@ -59,11 +59,11 @@ static Yell RandomTaunt[]= #define SPELL_CLEAVE 30619 #define SPELL_QUAKE_TRIGGER 30657 // must be cast with 30561 as the proc spell #define SPELL_QUAKE_KNOCKBACK 30571 -#define SPELL_BLAZE_TARGET 30541 // core bug, does not support target 7 +#define SPELL_BLAZE_TARGET 30541 // core bug, does not support pTarget 7 #define SPELL_BLAZE_TRAP 30542 #define SPELL_DEBRIS_KNOCKDOWN 36449 #define SPELL_DEBRIS_VISUAL 30632 -#define SPELL_DEBRIS_DAMAGE 30631 // core bug, does not support target 8 +#define SPELL_DEBRIS_DAMAGE 30631 // core bug, does not support pTarget 8 #define SPELL_CAMERA_SHAKE 36455 #define SPELL_BERSERK 27680 @@ -79,7 +79,7 @@ static Yell RandomTaunt[]= #define SPELL_DARK_MENDING 30528 #define SPELL_FEAR 30530 //39176 #define SPELL_BURNING_ABYSSAL 30511 -#define SPELL_SOUL_TRANSFER 30531 // core bug, does not support target 7 +#define SPELL_SOUL_TRANSFER 30531 // core bug, does not support pTarget 7 #define SPELL_FIRE_BLAST 37110 @@ -138,28 +138,28 @@ struct TRINITY_DLL_DECL mob_abyssalAI : public ScriptedAI { if (trigger == 1) { - if (FireBlast_Timer < diff) + if (FireBlast_Timer <= diff) { m_creature->CastSpell(m_creature, SPELL_DEBRIS_DAMAGE, true); trigger = 3; - }else FireBlast_Timer -= diff; + } else FireBlast_Timer -= diff; } return; } - if (Despawn_Timer < diff) + if (Despawn_Timer <= diff) { m_creature->ForcedDespawn(); - }else Despawn_Timer -= diff; + } else Despawn_Timer -= diff; if (!UpdateVictim()) return; - if (FireBlast_Timer < diff) + if (FireBlast_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_FIRE_BLAST); FireBlast_Timer = 5000+rand()%10000; - }else FireBlast_Timer -= diff; + } else FireBlast_Timer -= diff; DoMeleeAttackIfReady(); } @@ -173,7 +173,7 @@ struct TRINITY_DLL_DECL boss_magtheridonAI : public ScriptedAI m_creature->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 10); m_creature->SetFloatValue(UNIT_FIELD_COMBATREACH, 10); - // target 7, random target with certain entry spell, need core fix + // pTarget 7, random pTarget with certain entry spell, need core fix SpellEntry *TempSpell; TempSpell = GET_SPELL(SPELL_BLAZE_TARGET); if (TempSpell && TempSpell->EffectImplicitTargetA[0] != 6) @@ -264,7 +264,7 @@ struct TRINITY_DLL_DECL boss_magtheridonAI : public ScriptedAI { DebuffClicker(clicker); (*i).second = 0; - }else ClickerNum++; + } else ClickerNum++; } // if 5 clickers from other cubes apply shadow cage @@ -316,11 +316,11 @@ struct TRINITY_DLL_DECL boss_magtheridonAI : public ScriptedAI { if (!m_creature->isInCombat()) { - if (RandChat_Timer < diff) + if (RandChat_Timer <= diff) { DoScriptText(RandomTaunt[rand()%6].id, m_creature); RandChat_Timer = 90000; - }else RandChat_Timer -= diff; + } else RandChat_Timer -= diff; } if (!UpdateVictim()) @@ -328,20 +328,20 @@ struct TRINITY_DLL_DECL boss_magtheridonAI : public ScriptedAI if (NeedCheckCube) NeedCheckCubeStatus(); - if (Berserk_Timer < diff) + if (Berserk_Timer <= diff) { m_creature->CastSpell(m_creature, SPELL_BERSERK, true); DoScriptText(EMOTE_BERSERK, m_creature); Berserk_Timer = 60000; - }else Berserk_Timer -= diff; + } else Berserk_Timer -= diff; - if (Cleave_Timer < diff) + if (Cleave_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_CLEAVE); Cleave_Timer = 10000; - }else Cleave_Timer -= diff; + } else Cleave_Timer -= diff; - if (BlastNova_Timer < diff) + if (BlastNova_Timer <= diff) { // to avoid earthquake interruption if (!m_creature->hasUnitState(UNIT_STAT_STUNNED)) @@ -350,9 +350,9 @@ struct TRINITY_DLL_DECL boss_magtheridonAI : public ScriptedAI DoCast(m_creature, SPELL_BLASTNOVA); BlastNova_Timer = 60000; } - }else BlastNova_Timer -= diff; + } else BlastNova_Timer -= diff; - if (Quake_Timer < diff) + if (Quake_Timer <= diff) { // to avoid blastnova interruption if (!m_creature->IsNonMeleeSpellCasted(false)) @@ -360,14 +360,14 @@ struct TRINITY_DLL_DECL boss_magtheridonAI : public ScriptedAI m_creature->CastSpell(m_creature, SPELL_QUAKE_TRIGGER, true); Quake_Timer = 50000; } - }else Quake_Timer -= diff; + } else Quake_Timer -= diff; - if (Blaze_Timer < diff) + if (Blaze_Timer <= diff) { - if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0)) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) { float x, y, z; - target->GetPosition(x, y, z); + pTarget->GetPosition(x, y, z); Creature *summon = m_creature->SummonCreature(MOB_ABYSSAL, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); if (summon) { @@ -377,7 +377,7 @@ struct TRINITY_DLL_DECL boss_magtheridonAI : public ScriptedAI } } Blaze_Timer = 20000 + rand()%20000; - }else Blaze_Timer -= diff; + } else Blaze_Timer -= diff; if (!Phase3 && m_creature->GetHealth()*10 < m_creature->GetMaxHealth()*3 && !m_creature->IsNonMeleeSpellCasted(false) // blast nova @@ -394,17 +394,17 @@ struct TRINITY_DLL_DECL boss_magtheridonAI : public ScriptedAI if (Phase3) { - if (Debris_Timer < diff) + if (Debris_Timer <= diff) { - if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0)) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) { float x, y, z; - target->GetPosition(x, y, z); + pTarget->GetPosition(x, y, z); Creature *summon = m_creature->SummonCreature(MOB_ABYSSAL, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); if (summon) CAST_AI(mob_abyssalAI, summon->AI())->SetTrigger(1); } Debris_Timer = 10000; - }else Debris_Timer -= diff; + } else Debris_Timer -= diff; } DoMeleeAttackIfReady(); @@ -476,32 +476,32 @@ struct TRINITY_DLL_DECL mob_hellfire_channelerAI : public ScriptedAI if (!UpdateVictim()) return; - if (ShadowBoltVolley_Timer < diff) + if (ShadowBoltVolley_Timer <= diff) { DoCast(m_creature, SPELL_SHADOW_BOLT_VOLLEY); ShadowBoltVolley_Timer = 10000 + rand()%10000; - }else ShadowBoltVolley_Timer -= diff; + } else ShadowBoltVolley_Timer -= diff; - if (DarkMending_Timer < diff) + if (DarkMending_Timer <= diff) { if ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 50) DoCast(m_creature, SPELL_DARK_MENDING); DarkMending_Timer = 10000 +(rand() % 10000); - }else DarkMending_Timer -= diff; + } else DarkMending_Timer -= diff; - if (Fear_Timer < diff) + if (Fear_Timer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 1)) - DoCast(target, SPELL_FEAR); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 1)) + DoCast(pTarget, SPELL_FEAR); Fear_Timer = 25000 + rand()%15000; - }else Fear_Timer -= diff; + } else Fear_Timer -= diff; - if (Infernal_Timer < diff) + if (Infernal_Timer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) - m_creature->CastSpell(target, SPELL_BURNING_ABYSSAL, true); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + m_creature->CastSpell(pTarget, SPELL_BURNING_ABYSSAL, true); Infernal_Timer = 30000 + rand()%10000; - }else Infernal_Timer -= diff; + } else Infernal_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp index 49c379889d2..cf123fed7a5 100644 --- a/src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp +++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp @@ -24,8 +24,8 @@ EndScriptData */ #include "precompiled.h" #include "magtheridons_lair.h" -#define SPELL_SOUL_TRANSFER 30531 // core bug, does not support target 7 -#define SPELL_BLAZE_TARGET 30541 // core bug, does not support target 7 +#define SPELL_SOUL_TRANSFER 30531 // core bug, does not support pTarget 7 +#define SPELL_BLAZE_TARGET 30541 // core bug, does not support pTarget 7 #define CHAMBER_CENTER_X -15.14 #define CHAMBER_CENTER_Y 1.8 @@ -212,7 +212,7 @@ struct TRINITY_DLL_DECL instance_magtheridons_lair : public ScriptedInstance Magtheridon->AI()->AttackStart(Magtheridon->SelectNearestTarget(999)); } CageTimer = 0; - }else CageTimer -= diff; + } else CageTimer -= diff; } if (RespawnTimer) @@ -230,7 +230,7 @@ struct TRINITY_DLL_DECL instance_magtheridons_lair : public ScriptedInstance } } RespawnTimer = 0; - }else RespawnTimer -= diff; + } else RespawnTimer -= diff; } } }; 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 6880256a710..74d930afd3b 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 @@ -232,7 +232,7 @@ struct TRINITY_DLL_DECL boss_grand_warlock_nethekurseAI : public ScriptedAI if (pInstance->GetData(TYPE_NETHEKURSE) == IN_PROGRESS) { - if (IntroEvent_Timer < diff) + if (IntroEvent_Timer <= diff) DoTauntPeons(); else IntroEvent_Timer -= diff; @@ -253,7 +253,7 @@ struct TRINITY_DLL_DECL boss_grand_warlock_nethekurseAI : public ScriptedAI SpinOnce = true; } - if (Cleave_Timer < diff) + if (Cleave_Timer <= diff) { DoCast(m_creature->getVictim(),HEROIC(SPELL_SHADOW_CLEAVE, H_SPELL_SHADOW_SLAM)); Cleave_Timer = 6000+rand()%2500; @@ -261,17 +261,17 @@ struct TRINITY_DLL_DECL boss_grand_warlock_nethekurseAI : public ScriptedAI } else { - if (ShadowFissure_Timer < diff) + if (ShadowFissure_Timer <= diff) { - if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(target,SPELL_SHADOW_FISSURE); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget,SPELL_SHADOW_FISSURE); ShadowFissure_Timer = urand(7500,15000); } else ShadowFissure_Timer -= diff; - if (DeathCoil_Timer < diff) + if (DeathCoil_Timer <= diff) { - if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(target,SPELL_DEATH_COIL); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget,SPELL_DEATH_COIL); DeathCoil_Timer = urand(15000,20000); } else DeathCoil_Timer -= diff; @@ -340,11 +340,11 @@ struct TRINITY_DLL_DECL mob_fel_orc_convertAI : public ScriptedAI if (!UpdateVictim()) return; - if (Hemorrhage_Timer < diff) + if (Hemorrhage_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_HEMORRHAGE); Hemorrhage_Timer = 15000; - }else Hemorrhage_Timer -= diff; + } else Hemorrhage_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp index 2b0a55a651b..ae1b5fa5d37 100644 --- a/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp +++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp @@ -122,12 +122,12 @@ struct TRINITY_DLL_DECL mob_omrogg_headsAI : public ScriptedAI if (!DeathYell) return; - if (Death_Timer < diff) + if (Death_Timer <= diff) { DoScriptText(YELL_DIE_R, m_creature); Death_Timer = false; m_creature->setDeathState(JUST_DIED); - }else Death_Timer -= diff; + } else Death_Timer -= diff; } }; @@ -288,7 +288,7 @@ struct TRINITY_DLL_DECL boss_warbringer_omroggAI : public ScriptedAI void UpdateAI(const uint32 diff) { - if (Delay_Timer < diff) + if (Delay_Timer <= diff) { Delay_Timer = 3500; @@ -328,7 +328,7 @@ struct TRINITY_DLL_DECL boss_warbringer_omroggAI : public ScriptedAI DoScriptText(KillingDelay[ikilling].id, source); KillingYell = false; } - }else Delay_Timer -= diff; + } else Delay_Timer -= diff; if (!UpdateVictim()) return; @@ -341,39 +341,39 @@ struct TRINITY_DLL_DECL boss_warbringer_omroggAI : public ScriptedAI if (BlastCount == 3) BlastCount = 0; - }else BlastWave_Timer -= diff; + } else BlastWave_Timer -= diff; - if (BurningMaul_Timer < diff) + if (BurningMaul_Timer <= diff) { DoScriptText(EMOTE_ENRAGE, m_creature); DoCast(m_creature,HEROIC(SPELL_BURNING_MAUL, H_SPELL_BURNING_MAUL)); BurningMaul_Timer = 40000; BlastWave_Timer = 16000; BlastCount = 1; - }else BurningMaul_Timer -= diff; + } else BurningMaul_Timer -= diff; - if (ResetThreat_Timer < diff) + if (ResetThreat_Timer <= diff) { - if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) { DoYellForThreat(); DoResetThreat(); - m_creature->AddThreat(target, 0.0f); + m_creature->AddThreat(pTarget, 0.0f); } ResetThreat_Timer = 25000+rand()%15000; - }else ResetThreat_Timer -= diff; + } else ResetThreat_Timer -= diff; - if (Fear_Timer < diff) + if (Fear_Timer <= diff) { DoCast(m_creature,SPELL_FEAR); Fear_Timer = 15000+rand()%20000; - }else Fear_Timer -= diff; + } else Fear_Timer -= diff; - if (ThunderClap_Timer < diff) + if (ThunderClap_Timer <= diff) { DoCast(m_creature,SPELL_THUNDERCLAP); ThunderClap_Timer = 15000+rand()%15000; - }else ThunderClap_Timer -= diff; + } else ThunderClap_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp index 1ac44b4317d..6a2b20aa160 100644 --- a/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp +++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp @@ -190,7 +190,7 @@ struct TRINITY_DLL_DECL boss_warchief_kargath_bladefistAI : public ScriptedAI { SpawnAssassin(); Assassins_Timer = 0; - }else Assassins_Timer -= diff; + } else Assassins_Timer -= diff; if (InBlade) { @@ -219,7 +219,7 @@ struct TRINITY_DLL_DECL boss_warchief_kargath_bladefistAI : public ScriptedAI (*m_creature).GetMotionMaster()->MovePoint(1,x,y,m_creature->GetPositionZ()); Wait_Timer = 0; } - }else Wait_Timer -= diff; + } else Wait_Timer -= diff; } else { @@ -232,18 +232,18 @@ struct TRINITY_DLL_DECL boss_warchief_kargath_bladefistAI : public ScriptedAI Blade_Dance_Timer = 0; m_creature->SetSpeed(MOVE_RUN,4); return; - }else Blade_Dance_Timer -= diff; + } else Blade_Dance_Timer -= diff; if (Charge_timer) if (Charge_timer <= diff) { DoCast(SelectUnit(SELECT_TARGET_RANDOM,0),H_SPELL_CHARGE); Charge_timer = 0; - }else Charge_timer -= diff; + } else Charge_timer -= diff; - if (Summon_Assistant_Timer < diff) + if (Summon_Assistant_Timer <= diff) { - Unit* target = NULL; + Unit *pTarget = NULL; for (uint8 i = 0; i < summoned; ++i) { @@ -256,12 +256,12 @@ struct TRINITY_DLL_DECL boss_warchief_kargath_bladefistAI : public ScriptedAI } if (rand()%100 < 20) summoned++; Summon_Assistant_Timer = 25000 + (rand()%10000) ; - }else Summon_Assistant_Timer -= diff; + } else Summon_Assistant_Timer -= diff; DoMeleeAttackIfReady(); } - if (resetcheck_timer < diff) + if (resetcheck_timer <= diff) { uint32 tempx,tempy; tempx = uint32(m_creature->GetPositionX()); @@ -272,7 +272,7 @@ struct TRINITY_DLL_DECL boss_warchief_kargath_bladefistAI : public ScriptedAI return; } resetcheck_timer = 5000; - }else resetcheck_timer -= diff; + } else resetcheck_timer -= diff; } }; diff --git a/src/bindings/scripts/scripts/outland/hellfire_peninsula.cpp b/src/bindings/scripts/scripts/outland/hellfire_peninsula.cpp index fe0a52e2c47..fc43ed75304 100644 --- a/src/bindings/scripts/scripts/outland/hellfire_peninsula.cpp +++ b/src/bindings/scripts/scripts/outland/hellfire_peninsula.cpp @@ -76,11 +76,11 @@ struct TRINITY_DLL_DECL npc_aeranasAI : public ScriptedAI { if (Faction_Timer) { - if (Faction_Timer < diff) + if (Faction_Timer <= diff) { m_creature->setFaction(FACTION_HOSTILE); Faction_Timer = 0; - }else Faction_Timer -= diff; + } else Faction_Timer -= diff; } if (!UpdateVictim()) @@ -97,17 +97,17 @@ struct TRINITY_DLL_DECL npc_aeranasAI : public ScriptedAI return; } - if (Shock_Timer < diff) + if (Shock_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_SHOCK); Shock_Timer = 10000; - }else Shock_Timer -= diff; + } else Shock_Timer -= diff; - if (EnvelopingWinds_Timer < diff) + if (EnvelopingWinds_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_ENVELOPING_WINDS); EnvelopingWinds_Timer = 25000; - }else EnvelopingWinds_Timer -= diff; + } else EnvelopingWinds_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/outland/nagrand.cpp b/src/bindings/scripts/scripts/outland/nagrand.cpp index f4f3792283f..3493c34f2c2 100644 --- a/src/bindings/scripts/scripts/outland/nagrand.cpp +++ b/src/bindings/scripts/scripts/outland/nagrand.cpp @@ -161,7 +161,7 @@ struct TRINITY_DLL_DECL mob_lumpAI : public ScriptedAI //check if we waiting for a reset if (bReset) { - if (Reset_Timer < diff) + if (Reset_Timer <= diff) { EnterEvadeMode(); bReset = false; @@ -176,11 +176,11 @@ struct TRINITY_DLL_DECL mob_lumpAI : public ScriptedAI return; //Spear_Throw_Timer - if (Spear_Throw_Timer < diff) + if (Spear_Throw_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_SPEAR_THROW); Spear_Throw_Timer = 20000; - }else Spear_Throw_Timer -= diff; + } else Spear_Throw_Timer -= diff; DoMeleeAttackIfReady(); } @@ -625,7 +625,7 @@ struct TRINITY_DLL_DECL npc_maghar_captiveAI : public npc_escortAI if (/*!m_creature->SelectHostilTarget() ||*/ !m_creature->getVictim()) return; - if (m_uiChainLightningTimer < uiDiff) + if (m_uiChainLightningTimer <= uiDiff) { DoCast(m_creature->getVictim(), SPELL_CHAIN_LIGHTNING); m_uiChainLightningTimer = urand(7000, 14000); @@ -635,7 +635,7 @@ struct TRINITY_DLL_DECL npc_maghar_captiveAI : public npc_escortAI if (m_creature->GetHealth()*100 < m_creature->GetMaxHealth()*30) { - if (m_uiHealTimer < uiDiff) + if (m_uiHealTimer <= uiDiff) { DoCast(m_creature, SPELL_HEALING_WAVE); m_uiHealTimer = 5000; @@ -644,7 +644,7 @@ struct TRINITY_DLL_DECL npc_maghar_captiveAI : public npc_escortAI m_uiHealTimer -= uiDiff; } - if (m_uiFrostShockTimer < uiDiff) + if (m_uiFrostShockTimer <= uiDiff) { DoCast(m_creature->getVictim(), SPELL_FROST_SHOCK); m_uiFrostShockTimer = urand(7500, 15000); @@ -769,7 +769,7 @@ struct TRINITY_DLL_DECL mob_sparrowhawkAI : public ScriptedAI void UpdateAI(const uint32 diff) { - if (Check_Timer < diff) + if (Check_Timer <= diff) { if (PlayerGUID) { diff --git a/src/bindings/scripts/scripts/outland/netherstorm.cpp b/src/bindings/scripts/scripts/outland/netherstorm.cpp index 6364aa74300..3b0c08c2f3a 100644 --- a/src/bindings/scripts/scripts/outland/netherstorm.cpp +++ b/src/bindings/scripts/scripts/outland/netherstorm.cpp @@ -219,7 +219,7 @@ struct TRINITY_DLL_DECL npc_manaforge_control_consoleAI : public ScriptedAI void UpdateAI(const uint32 diff) { - if (Event_Timer < diff) + if (Event_Timer <= diff) { switch(Phase) { @@ -271,7 +271,7 @@ struct TRINITY_DLL_DECL npc_manaforge_control_consoleAI : public ScriptedAI if (Wave) { - if (Wave_Timer < diff) + if (Wave_Timer <= diff) { DoWaveSpawnForCreature(m_creature); } else Wave_Timer -= diff; @@ -732,21 +732,21 @@ struct TRINITY_DLL_DECL mob_phase_hunterAI : public ScriptedAI if (!UpdateVictim()) return; - if (ManaBurnTimer < diff) // cast Mana Burn + if (ManaBurnTimer <= diff) // cast Mana Burn { if (m_creature->getVictim()->GetCreateMana() > 0) { DoCast(m_creature->getVictim(), SPELL_MANA_BURN); ManaBurnTimer = 8000 + (rand()%10 * 1000); // 8-18 sec cd } - }else ManaBurnTimer -= diff; + } else ManaBurnTimer -= diff; if (PlayerGUID) // start: support for quest 10190 { - Unit* target = Unit::GetUnit((*m_creature), PlayerGUID); + Unit *pTarget = Unit::GetUnit((*m_creature), PlayerGUID); - if (target && !Weak && m_creature->GetHealth() < (m_creature->GetMaxHealth() / 100 * WeakPercent) - && CAST_PLR(target)->GetQuestStatus(10190) == QUEST_STATUS_INCOMPLETE) + if (pTarget && !Weak && m_creature->GetHealth() < (m_creature->GetMaxHealth() / 100 * WeakPercent) + && CAST_PLR(pTarget)->GetQuestStatus(10190) == QUEST_STATUS_INCOMPLETE) { DoScriptText(EMOTE_WEAK, m_creature); Weak = true; @@ -771,8 +771,8 @@ struct TRINITY_DLL_DECL mob_phase_hunterAI : public ScriptedAI { DrainedPhaseHunter->SetLevel(Level); // set the summoned mob's data DrainedPhaseHunter->SetHealth(Health); - DrainedPhaseHunter->AddThreat(target, 10000.0f); - DrainedPhaseHunter->AI()->AttackStart(target); + DrainedPhaseHunter->AddThreat(pTarget, 10000.0f); + DrainedPhaseHunter->AI()->AttackStart(pTarget); } } }// end: support for quest 10190 diff --git a/src/bindings/scripts/scripts/outland/shadowmoon_valley.cpp b/src/bindings/scripts/scripts/outland/shadowmoon_valley.cpp index a1e8d5d8291..e6ad3f0100c 100644 --- a/src/bindings/scripts/scripts/outland/shadowmoon_valley.cpp +++ b/src/bindings/scripts/scripts/outland/shadowmoon_valley.cpp @@ -113,7 +113,7 @@ struct TRINITY_DLL_DECL mob_mature_netherwing_drakeAI : public ScriptedAI { if (bCanEat || bIsEating) { - if (EatTimer < diff) + if (EatTimer <= diff) { if (bCanEat && !bIsEating) { @@ -158,11 +158,11 @@ struct TRINITY_DLL_DECL mob_mature_netherwing_drakeAI : public ScriptedAI if (!UpdateVictim()) return; - if (CastTimer < diff) + if (CastTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_NETHER_BREATH); CastTimer = 5000; - }else CastTimer -= diff; + } else CastTimer -= diff; DoMeleeAttackIfReady(); } @@ -263,7 +263,7 @@ struct TRINITY_DLL_DECL mob_enslaved_netherwing_drakeAI : public ScriptedAI if (!UpdateVictim()) { if (Tapped) - if (FlyTimer < diff) + if (FlyTimer <= diff) { Tapped = false; if (PlayerGUID) @@ -293,7 +293,7 @@ struct TRINITY_DLL_DECL mob_enslaved_netherwing_drakeAI : public ScriptedAI m_creature->GetMotionMaster()->MovePoint(1, pos); } } - }else FlyTimer -= diff; + } else FlyTimer -= diff; return; } @@ -368,7 +368,7 @@ struct TRINITY_DLL_DECL mob_dragonmaw_peonAI : public ScriptedAI } PoisonTimer = 0; m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); - }else PoisonTimer -= diff; + } else PoisonTimer -= diff; } }; @@ -827,7 +827,7 @@ struct TRINITY_DLL_DECL npc_overlord_morghorAI : public ScriptedAI { ConversationTimer = NextStep(++Step); } - }else ConversationTimer -= diff; + } else ConversationTimer -= diff; } }; @@ -989,7 +989,7 @@ struct TRINITY_DLL_DECL npc_earthmender_wildaAI : public npc_escortAI //TODO: add more abilities if (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() <= 30) { - if (m_uiHealingTimer < uiDiff) + if (m_uiHealingTimer <= uiDiff) { DoCast(m_creature, SPELL_HEALING_WAVE); m_uiHealingTimer = 15000; @@ -1162,53 +1162,53 @@ struct TRINITY_DLL_DECL mob_illidari_spawnAI : public ScriptedAI //Illidari Soldier if (m_creature->GetEntry() == 22075) { - if (SpellTimer1 < diff) + if (SpellTimer1 <= diff) { DoCast(m_creature->getVictim(), SpawnCast[0].SpellId);//Spellbreaker SpellTimer1 = SpawnCast[0].Timer2 + (rand()%5 * 1000); - }else SpellTimer1 -= diff; + } else SpellTimer1 -= diff; } //Illidari Mind Breaker if (m_creature->GetEntry() == 22074) { - if (SpellTimer1 < diff) + if (SpellTimer1 <= diff) { - if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) { - if (target->GetTypeId() == TYPEID_PLAYER) + if (pTarget->GetTypeId() == TYPEID_PLAYER) { - DoCast(target, SpawnCast[1].SpellId); //Focused Bursts + DoCast(pTarget, SpawnCast[1].SpellId); //Focused Bursts SpellTimer1 = SpawnCast[1].Timer2 + (rand()%5 * 1000); - }else SpellTimer1 = 2000; + } else SpellTimer1 = 2000; } - }else SpellTimer1 -= diff; + } else SpellTimer1 -= diff; - if (SpellTimer2 < diff) + if (SpellTimer2 <= diff) { DoCast(m_creature->getVictim(), SpawnCast[2].SpellId);//Psychic Scream SpellTimer2 = SpawnCast[2].Timer2 + (rand()%13 * 1000); - }else SpellTimer2 -= diff; + } else SpellTimer2 -= diff; - if (SpellTimer3 < diff) + if (SpellTimer3 <= diff) { DoCast(m_creature->getVictim(), SpawnCast[3].SpellId);//Mind Blast SpellTimer3 = SpawnCast[3].Timer2 + (rand()%8 * 1000); - }else SpellTimer3 -= diff; + } else SpellTimer3 -= diff; } //Illidari Highlord if (m_creature->GetEntry() == 19797) { - if (SpellTimer1 < diff) + if (SpellTimer1 <= diff) { DoCast(m_creature->getVictim(), SpawnCast[4].SpellId);//Curse Of Flames SpellTimer1 = SpawnCast[4].Timer2 + (rand()%10 * 1000); - }else SpellTimer1 -= diff; + } else SpellTimer1 -= diff; - if (SpellTimer2 < diff) + if (SpellTimer2 <= diff) { DoCast(m_creature->getVictim(), SpawnCast[5].SpellId);//Flamestrike SpellTimer2 = SpawnCast[5].Timer2 + (rand()%7 * 13000); - }else SpellTimer2 -= diff; + } else SpellTimer2 -= diff; } DoMeleeAttackIfReady(); @@ -1302,13 +1302,13 @@ struct TRINITY_DLL_DECL mob_torloth_the_magnificentAI : public ScriptedAI if (AnimationTimer <= diff) { HandleAnimation(); - }else AnimationTimer -= diff; + } else AnimationTimer -= diff; } if (AnimationCount < 6) { m_creature->CombatStop(); - }else if (!Timers) + } else if (!Timers) { SpellTimer1 = SpawnCast[6].Timer1; @@ -1319,23 +1319,23 @@ struct TRINITY_DLL_DECL mob_torloth_the_magnificentAI : public ScriptedAI if (Timers) { - if (SpellTimer1 < diff) + if (SpellTimer1 <= diff) { DoCast(m_creature->getVictim(), SpawnCast[6].SpellId);//Cleave SpellTimer1 = SpawnCast[6].Timer2 + (rand()%10 * 1000); - }else SpellTimer1 -= diff; + } else SpellTimer1 -= diff; - if (SpellTimer2 < diff) + if (SpellTimer2 <= diff) { DoCast(m_creature->getVictim(), SpawnCast[7].SpellId);//Shadowfury SpellTimer2 = SpawnCast[7].Timer2 + (rand()%5 * 1000); - }else SpellTimer2 -= diff; + } else SpellTimer2 -= diff; - if (SpellTimer3 < diff) + if (SpellTimer3 <= diff) { DoCast(m_creature, SpawnCast[8].SpellId); SpellTimer3 = SpawnCast[8].Timer2 + (rand()%7 * 1000);//Spell Reflection - }else SpellTimer3 -= diff; + } else SpellTimer3 -= diff; } DoMeleeAttackIfReady(); @@ -1528,7 +1528,7 @@ struct TRINITY_DLL_DECL npc_lord_illidan_stormrageAI : public ScriptedAI } Failed = true; } - }else if (pPlayer->isDead() || !pPlayer->IsWithinDistInMap(m_creature, EVENT_AREA_RADIUS)) + } else if (pPlayer->isDead() || !pPlayer->IsWithinDistInMap(m_creature, EVENT_AREA_RADIUS)) { pPlayer->FailQuest(QUEST_BATTLE_OF_THE_CRIMSON_WATCH); Failed = true; @@ -1549,16 +1549,16 @@ struct TRINITY_DLL_DECL npc_lord_illidan_stormrageAI : public ScriptedAI if (!LiveCount && WaveCount < 4) { - if (!Announced && AnnounceTimer < diff) + if (!Announced && AnnounceTimer <= diff) { DoScriptText(WavesInfo[WaveCount].WaveTextId, m_creature); Announced = true; - }else AnnounceTimer -= diff; + } else AnnounceTimer -= diff; - if (WaveTimer < diff) + if (WaveTimer <= diff) { SummonNextWave(); - }else WaveTimer -= diff; + } else WaveTimer -= diff; } CheckEventFail(); diff --git a/src/bindings/scripts/scripts/outland/shattrath_city.cpp b/src/bindings/scripts/scripts/outland/shattrath_city.cpp index f929aa636c8..bce1abf034d 100644 --- a/src/bindings/scripts/scripts/outland/shattrath_city.cpp +++ b/src/bindings/scripts/scripts/outland/shattrath_city.cpp @@ -69,11 +69,11 @@ struct TRINITY_DLL_DECL npc_raliq_the_drunkAI : public ScriptedAI if (!UpdateVictim()) return; - if (Uppercut_Timer < diff) + if (Uppercut_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_UPPERCUT); Uppercut_Timer = 15000; - }else Uppercut_Timer -= diff; + } else Uppercut_Timer -= diff; DoMeleeAttackIfReady(); } @@ -142,11 +142,11 @@ struct TRINITY_DLL_DECL npc_salsalabimAI : public ScriptedAI if (!UpdateVictim()) return; - if (MagneticPull_Timer < diff) + if (MagneticPull_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_MAGNETIC_PULL); MagneticPull_Timer = 15000; - }else MagneticPull_Timer -= diff; + } else MagneticPull_Timer -= diff; DoMeleeAttackIfReady(); } @@ -428,11 +428,11 @@ struct TRINITY_DLL_DECL npc_dirty_larryAI : public ScriptedAI void UpdateAI(const uint32 diff) { - if (SayTimer < diff) + if (SayTimer <= diff) { if (Event) SayTimer = NextStep(++Step); - }else SayTimer -= diff; + } else SayTimer -= diff; if (Attack) { diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/arcatraz.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/arcatraz.cpp index c4c4f7f89ae..a41f239c8e7 100644 --- a/src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/arcatraz.cpp +++ b/src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/arcatraz.cpp @@ -132,7 +132,7 @@ struct TRINITY_DLL_DECL npc_millhouse_manastormAI : public ScriptedAI { if (!Init) { - if (EventProgress_Timer < diff) + if (EventProgress_Timer <= diff) { if (Phase < 8) { @@ -185,7 +185,7 @@ struct TRINITY_DLL_DECL npc_millhouse_manastormAI : public ScriptedAI LowHp = true; } - if (Pyroblast_Timer < diff) + if (Pyroblast_Timer <= diff) { if (m_creature->IsNonMeleeSpellCasted(false)) return; @@ -194,13 +194,13 @@ struct TRINITY_DLL_DECL npc_millhouse_manastormAI : public ScriptedAI DoCast(m_creature->getVictim(),SPELL_PYROBLAST); Pyroblast_Timer = 40000; - }else Pyroblast_Timer -=diff; + } else Pyroblast_Timer -=diff; - if (Fireball_Timer < diff) + if (Fireball_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_FIREBALL); Fireball_Timer = 4000; - }else Fireball_Timer -=diff; + } else Fireball_Timer -=diff; DoMeleeAttackIfReady(); } @@ -371,7 +371,7 @@ struct TRINITY_DLL_DECL npc_warden_mellicharAI : public ScriptedAI if (!IsRunning) return; - if (EventProgress_Timer < diff) + if (EventProgress_Timer <= diff) { if (pInstance) { @@ -391,7 +391,7 @@ struct TRINITY_DLL_DECL npc_warden_mellicharAI : public ScriptedAI switch(Phase) { case 2: - switch(rand()%2) + switch (urand(0,1)) { case 0: m_creature->SummonCreature(ENTRY_TRICKSTER,478.326,-148.505,42.56,3.19,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); break; case 1: m_creature->SummonCreature(ENTRY_PH_HUNTER,478.326,-148.505,42.56,3.19,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); break; @@ -404,14 +404,14 @@ struct TRINITY_DLL_DECL npc_warden_mellicharAI : public ScriptedAI DoScriptText(YELL_RELEASE2B, m_creature); break; case 5: - switch(rand()%2) + switch (urand(0,1)) { case 0: m_creature->SummonCreature(ENTRY_AKKIRIS,420.179,-174.396,42.58,0.02,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); break; case 1: m_creature->SummonCreature(ENTRY_SULFURON,420.179,-174.396,42.58,0.02,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); break; } break; case 6: - switch(rand()%2) + switch (urand(0,1)) { case 0: m_creature->SummonCreature(ENTRY_TW_DRAK,471.795,-174.58,42.58,3.06,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); break; case 1: m_creature->SummonCreature(ENTRY_BL_DRAK,471.795,-174.58,42.58,3.06,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); break; diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp index 19451b5ab7c..463e1f3a487 100644 --- a/src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp +++ b/src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp @@ -119,8 +119,8 @@ struct TRINITY_DLL_DECL boss_harbinger_skyrissAI : public ScriptedAI else summon->SetHealth((summon->GetMaxHealth()*66)/100); if (m_creature->getVictim()) - if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0)) - summon->AI()->AttackStart(target); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + summon->AI()->AttackStart(pTarget); } void KilledUnit(Unit* victim) @@ -152,7 +152,7 @@ struct TRINITY_DLL_DECL boss_harbinger_skyrissAI : public ScriptedAI if (!pInstance) return; - if (Intro_Timer < diff) + if (Intro_Timer <= diff) { switch(Intro_Phase) { @@ -179,7 +179,7 @@ struct TRINITY_DLL_DECL boss_harbinger_skyrissAI : public ScriptedAI Intro = true; break; } - }else Intro_Timer -=diff; + } else Intro_Timer -=diff; } if (!UpdateVictim()) @@ -196,58 +196,58 @@ struct TRINITY_DLL_DECL boss_harbinger_skyrissAI : public ScriptedAI IsImage33 = true; } - if (MindRend_Timer < diff) + if (MindRend_Timer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,1)) - DoCast(target,HEROIC(SPELL_MIND_REND, H_SPELL_MIND_REND)); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,1)) + DoCast(pTarget,HEROIC(SPELL_MIND_REND, H_SPELL_MIND_REND)); else DoCast(m_creature->getVictim(),HEROIC(SPELL_MIND_REND, H_SPELL_MIND_REND)); MindRend_Timer = 8000; - }else MindRend_Timer -=diff; + } else MindRend_Timer -=diff; - if (Fear_Timer < diff) + if (Fear_Timer <= diff) { if (m_creature->IsNonMeleeSpellCasted(false)) return; DoScriptText(RAND(SAY_FEAR_1,SAY_FEAR_2), m_creature); - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,1)) - DoCast(target,SPELL_FEAR); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,1)) + DoCast(pTarget,SPELL_FEAR); else DoCast(m_creature->getVictim(),SPELL_FEAR); Fear_Timer = 25000; - }else Fear_Timer -=diff; + } else Fear_Timer -=diff; - if (Domination_Timer < diff) + if (Domination_Timer <= diff) { if (m_creature->IsNonMeleeSpellCasted(false)) return; DoScriptText(RAND(SAY_MIND_1,SAY_MIND_2), m_creature); - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,1)) - DoCast(target,HEROIC(SPELL_DOMINATION, H_SPELL_DOMINATION)); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,1)) + DoCast(pTarget,HEROIC(SPELL_DOMINATION, H_SPELL_DOMINATION)); else DoCast(m_creature->getVictim(),HEROIC(SPELL_DOMINATION, H_SPELL_DOMINATION)); Domination_Timer = 16000+rand()%16000; - }else Domination_Timer -=diff; + } else Domination_Timer -=diff; if (HeroicMode) { - if (ManaBurn_Timer < diff) + if (ManaBurn_Timer <= diff) { if (m_creature->IsNonMeleeSpellCasted(false)) return; - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,1)) - DoCast(target,H_SPELL_MANA_BURN); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,1)) + DoCast(pTarget,H_SPELL_MANA_BURN); ManaBurn_Timer = 16000+rand()%16000; - }else ManaBurn_Timer -=diff; + } else ManaBurn_Timer -=diff; } DoMeleeAttackIfReady(); diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/botanica/boss_high_botanist_freywinn.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/botanica/boss_high_botanist_freywinn.cpp index 9b23a107792..22bde9cfcf2 100644 --- a/src/bindings/scripts/scripts/outland/tempest_keep/botanica/boss_high_botanist_freywinn.cpp +++ b/src/bindings/scripts/scripts/outland/tempest_keep/botanica/boss_high_botanist_freywinn.cpp @@ -101,7 +101,7 @@ struct TRINITY_DLL_DECL boss_high_botanist_freywinnAI : public ScriptedAI if (!UpdateVictim()) return; - if (TreeForm_Timer < diff) + if (TreeForm_Timer <= diff) { DoScriptText(RAND(SAY_TREE_1,SAY_TREE_2), m_creature); @@ -118,11 +118,11 @@ struct TRINITY_DLL_DECL boss_high_botanist_freywinnAI : public ScriptedAI MoveFree = false; TreeForm_Timer = 75000; - }else TreeForm_Timer -= diff; + } else TreeForm_Timer -= diff; if (!MoveFree) { - if (MoveCheck_Timer < diff) + if (MoveCheck_Timer <= diff) { if (!Adds_List.empty()) { @@ -140,7 +140,7 @@ struct TRINITY_DLL_DECL boss_high_botanist_freywinnAI : public ScriptedAI } } - if (DeadAddsCount < 3 && TreeForm_Timer-30000 < diff) + if (DeadAddsCount < 3 && TreeForm_Timer-30000 <= diff) DeadAddsCount = 3; if (DeadAddsCount >= 3) @@ -164,11 +164,11 @@ struct TRINITY_DLL_DECL boss_high_botanist_freywinnAI : public ScriptedAI return;*/ //one random seedling every 5 secs, but not in tree form - if (SummonSeedling_Timer < diff) + if (SummonSeedling_Timer <= diff) { DoSummonSeedling(); SummonSeedling_Timer = 6000; - }else SummonSeedling_Timer -= diff; + } else SummonSeedling_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/botanica/boss_laj.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/botanica/boss_laj.cpp index 58ff64a9493..d90e4f708b4 100644 --- a/src/bindings/scripts/scripts/outland/tempest_keep/botanica/boss_laj.cpp +++ b/src/bindings/scripts/scripts/outland/tempest_keep/botanica/boss_laj.cpp @@ -157,32 +157,32 @@ struct TRINITY_DLL_DECL boss_lajAI : public ScriptedAI if (CanSummon) { - if (Summon_Timer < diff) + if (Summon_Timer <= diff) { DoScriptText(EMOTE_SUMMON, m_creature); DoSummons(); Summon_Timer = 2500; - }else Summon_Timer -= diff; + } else Summon_Timer -= diff; } - if (Allergic_Timer < diff) + if (Allergic_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_ALLERGIC_REACTION); Allergic_Timer = 25000+rand()%15000; - }else Allergic_Timer -= diff; + } else Allergic_Timer -= diff; - if (Teleport_Timer < diff) + if (Teleport_Timer <= diff) { DoCast(m_creature,SPELL_TELEPORT_SELF); Teleport_Timer = 30000+rand()%10000; CanSummon = true; - }else Teleport_Timer -= diff; + } else Teleport_Timer -= diff; - if (Transform_Timer < diff) + if (Transform_Timer <= diff) { DoTransform(); Transform_Timer = 25000+rand()%15000; - }else Transform_Timer -= diff; + } else Transform_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/botanica/boss_warp_splinter.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/botanica/boss_warp_splinter.cpp index 486b60b41a5..af3369df259 100644 --- a/src/bindings/scripts/scripts/outland/tempest_keep/botanica/boss_warp_splinter.cpp +++ b/src/bindings/scripts/scripts/outland/tempest_keep/botanica/boss_warp_splinter.cpp @@ -52,7 +52,7 @@ struct TRINITY_DLL_DECL mob_treantAI : public ScriptedAI { if (!UpdateVictim()) { - if (WarpGuid && check_Timer < diff) + if (WarpGuid && check_Timer <= diff) { if (Unit *Warp = Unit::GetUnit(*m_creature, WarpGuid)) { @@ -66,7 +66,7 @@ struct TRINITY_DLL_DECL mob_treantAI : public ScriptedAI m_creature->GetMotionMaster()->MoveFollow(Warp,0,0); } check_Timer = 1000; - }else check_Timer -= diff; + } else check_Timer -= diff; return; } @@ -167,25 +167,25 @@ struct TRINITY_DLL_DECL boss_warp_splinterAI : public ScriptedAI return; //Check for War Stomp - if (War_Stomp_Timer < diff) + if (War_Stomp_Timer <= diff) { DoCast(m_creature->getVictim(),WAR_STOMP); War_Stomp_Timer = 25000 + rand()%15000; - }else War_Stomp_Timer -= diff; + } else War_Stomp_Timer -= diff; //Check for Arcane Volley - if (Arcane_Volley_Timer < diff) + if (Arcane_Volley_Timer <= diff) { DoCast(m_creature->getVictim(),ARCANE_VOLLEY); Arcane_Volley_Timer = 20000 + rand()%15000; - }else Arcane_Volley_Timer -= diff; + } else Arcane_Volley_Timer -= diff; //Check for Summon Treants - if (Summon_Treants_Timer < diff) + if (Summon_Treants_Timer <= diff) { SummonTreants(); Summon_Treants_Timer = 45000; - }else Summon_Treants_Timer -= diff; + } else Summon_Treants_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_alar.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_alar.cpp index 3ea6fc8e596..1f27a7089a0 100644 --- a/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_alar.cpp +++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_alar.cpp @@ -141,8 +141,8 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI void JustSummoned(Creature *summon) { if (summon->GetEntry() == CREATURE_EMBER_OF_ALAR) - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) - summon->AI()->AttackStart(target); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + summon->AI()->AttackStart(pTarget); } void MoveInLineOfSight(Unit *who) {} @@ -202,19 +202,19 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI if (!m_creature->isInCombat()) // sometimes isincombat but !incombat, faction bug? return; - if (Berserk_Timer < diff) + if (Berserk_Timer <= diff) { m_creature->CastSpell(m_creature, SPELL_BERSERK, true); Berserk_Timer = 60000; - }else Berserk_Timer -= diff; + } else Berserk_Timer -= diff; if (ForceMove) { - if (ForceTimer < diff) + if (ForceTimer <= diff) { m_creature->GetMotionMaster()->MovePoint(0, waypoint[cur_wp][0], waypoint[cur_wp][1], waypoint[cur_wp][2]); ForceTimer = 5000; - }else ForceTimer -= diff; + } else ForceTimer -= diff; } if (WaitEvent) @@ -266,15 +266,15 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI WaitTimer = 4000; return; case WE_DIVE: - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) { m_creature->RemoveAurasDueToSpell(SPELL_DIVE_BOMB_VISUAL); - m_creature->CastSpell(target, SPELL_DIVE_BOMB, true); + m_creature->CastSpell(pTarget, SPELL_DIVE_BOMB, true); float dist = 3.0f; - if (m_creature->IsWithinDist3d(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 5.0f)) + if (m_creature->IsWithinDist3d(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 5.0f)) dist = 5.0f; WaitTimer = 1000 + floor(dist / 80 * 1000.0f); - m_creature->GetMap()->CreatureRelocation(m_creature, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(),0.0f); + m_creature->GetMap()->CreatureRelocation(m_creature, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(),0.0f); m_creature->StopMoving(); WaitEvent = WE_LAND; } @@ -302,7 +302,7 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI WaitEvent = WE_NONE; WaitTimer = 0; - }else WaitTimer -= diff; + } else WaitTimer -= diff; } return; } @@ -315,7 +315,7 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI return; } - if (Platforms_Move_Timer < diff) + if (Platforms_Move_Timer <= diff) { if (cur_wp == 4) { @@ -344,25 +344,25 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI m_creature->GetMotionMaster()->MovePoint(0, waypoint[cur_wp][0], waypoint[cur_wp][1], waypoint[cur_wp][2]); WaitTimer = 0; return; - }else Platforms_Move_Timer -= diff; + } else Platforms_Move_Timer -= diff; } else { - if (Charge_Timer < diff) + if (Charge_Timer <= diff) { - Unit *target= SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); - if (target) - DoCast(target, SPELL_CHARGE); + Unit *pTarget= SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); + if (pTarget) + DoCast(pTarget, SPELL_CHARGE); Charge_Timer = 30000; - }else Charge_Timer -= diff; + } else Charge_Timer -= diff; - if (MeltArmor_Timer < diff) + if (MeltArmor_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_MELT_ARMOR); MeltArmor_Timer = 60000; - }else MeltArmor_Timer -= diff; + } else MeltArmor_Timer -= diff; - if (DiveBomb_Timer < diff) + if (DiveBomb_Timer <= diff) { m_creature->AttackStop(); m_creature->GetMotionMaster()->MovePoint(6, waypoint[4][0], waypoint[4][1], waypoint[4][2]); @@ -372,13 +372,13 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI WaitTimer = 0; DiveBomb_Timer = 40000+rand()%5000; return; - }else DiveBomb_Timer -= diff; + } else DiveBomb_Timer -= diff; - if (FlamePatch_Timer < diff) + if (FlamePatch_Timer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) { - Creature* Summoned = m_creature->SummonCreature(CREATURE_FLAME_PATCH_ALAR, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 120000); + Creature* Summoned = m_creature->SummonCreature(CREATURE_FLAME_PATCH_ALAR, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 120000); if (Summoned) { Summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -390,7 +390,7 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI } } FlamePatch_Timer = 30000; - }else FlamePatch_Timer -= diff; + } else FlamePatch_Timer -= diff; } DoMeleeAttackIfReady(); @@ -407,10 +407,10 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI } else { - Unit *target = NULL; - target = m_creature->SelectNearestTarget(5); - if (target) - m_creature->AI()->AttackStart(target); + Unit *pTarget = NULL; + pTarget = m_creature->SelectNearestTarget(5); + if (pTarget) + m_creature->AI()->AttackStart(pTarget); else { m_creature->CastSpell(m_creature, SPELL_FLAME_BUFFET, true); diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_astromancer.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_astromancer.cpp index 8d61fb29f56..60c2e3c79df 100644 --- a/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_astromancer.cpp +++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_astromancer.cpp @@ -160,8 +160,8 @@ struct TRINITY_DLL_DECL boss_high_astromancer_solarianAI : public ScriptedAI Creature* Summoned = m_creature->SummonCreature(entry, x, y, z, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); if (Summoned) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) - Summoned->AI()->AttackStart(target); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + Summoned->AI()->AttackStart(pTarget); Summons.Summon(Summoned); } @@ -169,21 +169,16 @@ struct TRINITY_DLL_DECL boss_high_astromancer_solarianAI : public ScriptedAI float Portal_X(float radius) { - if ((rand()%2)==1) + if (urand(0,1)) radius = -radius; - return (radius * (float)(rand()%100)/100.0f + CENTER_X); + return radius * (float)(rand()%100)/100.0f + CENTER_X; } float Portal_Y(float x, float radius) { - float z = 0.0f; + float z = RAND(1, -1); - switch(rand()%2) - { - case 0: z = 1; break; - case 1: z = -1; break; - } return (z*sqrt(radius*radius - (x - CENTER_X)*(x - CENTER_X)) + CENTER_Y); } @@ -196,7 +191,7 @@ struct TRINITY_DLL_DECL boss_high_astromancer_solarianAI : public ScriptedAI { m_creature->StopMoving(); m_creature->AttackStop(); - if (AppearDelay_Timer < diff) + if (AppearDelay_Timer <= diff) { AppearDelay = false; if (Phase == 2) @@ -205,42 +200,44 @@ struct TRINITY_DLL_DECL boss_high_astromancer_solarianAI : public ScriptedAI m_creature->SetVisibility(VISIBILITY_OFF); } AppearDelay_Timer = 2000; - }else AppearDelay_Timer -= diff; + } else AppearDelay_Timer -= diff; } if (Phase == 1) { - if (BlindingLight_Timer < diff){ + if (BlindingLight_Timer <= diff) + { BlindingLight = true; BlindingLight_Timer = 45000; - }else BlindingLight_Timer -= diff; + } else BlindingLight_Timer -= diff; - if (Wrath_Timer < diff) + if (Wrath_Timer <= diff) { m_creature->InterruptNonMeleeSpells(false); - DoCast(SelectTarget(SELECT_TARGET_RANDOM,1,100,true), SPELL_WRATH_OF_THE_ASTROMANCER, true); + if(Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true)) + DoCast(pTarget, SPELL_WRATH_OF_THE_ASTROMANCER, true); Wrath_Timer = 20000+rand()%5000; - }else Wrath_Timer -= diff; + } else Wrath_Timer -= diff; - if (ArcaneMissiles_Timer < diff) + if (ArcaneMissiles_Timer <= diff) { if (BlindingLight) { DoCast(m_creature->getVictim(), SPELL_BLINDING_LIGHT); BlindingLight = false; }else{ - Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0); + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (!m_creature->HasInArc(2.5f, target)) - target = m_creature->getVictim(); + if (!m_creature->HasInArc(2.5f, pTarget)) + pTarget = m_creature->getVictim(); - if (target) - DoCast(target, SPELL_ARCANE_MISSILES); + if (pTarget) + DoCast(pTarget, SPELL_ARCANE_MISSILES); } ArcaneMissiles_Timer = 3000; - }else ArcaneMissiles_Timer -= diff; + } else ArcaneMissiles_Timer -= diff; - if (m_uiWrathOfTheAstromancer_Timer < diff) + if (m_uiWrathOfTheAstromancer_Timer <= diff) { m_creature->InterruptNonMeleeSpells(false); @@ -253,10 +250,10 @@ struct TRINITY_DLL_DECL boss_high_astromancer_solarianAI : public ScriptedAI } else m_uiWrathOfTheAstromancer_Timer = 1000; - }else m_uiWrathOfTheAstromancer_Timer -= diff; + } else m_uiWrathOfTheAstromancer_Timer -= diff; //Phase1_Timer - if (Phase1_Timer < diff) + if (Phase1_Timer <= diff) { Phase = 2; Phase1_Timer = 50000; @@ -295,14 +292,14 @@ struct TRINITY_DLL_DECL boss_high_astromancer_solarianAI : public ScriptedAI } } AppearDelay = true; - }else Phase1_Timer-=diff; + } else Phase1_Timer-=diff; } else if (Phase == 2) { //10 seconds after Solarian disappears, 12 mobs spawn out of the three portals. m_creature->AttackStop(); m_creature->StopMoving(); - if (Phase2_Timer < diff) + if (Phase2_Timer <= diff) { Phase = 3; for (int i=0; i<=2; ++i) @@ -319,7 +316,7 @@ struct TRINITY_DLL_DECL boss_high_astromancer_solarianAI : public ScriptedAI m_creature->StopMoving(); //Check Phase3_Timer - if (Phase3_Timer < diff) + if (Phase3_Timer <= diff) { Phase = 1; @@ -338,23 +335,23 @@ struct TRINITY_DLL_DECL boss_high_astromancer_solarianAI : public ScriptedAI DoScriptText(SAY_SUMMON2, m_creature); AppearDelay = true; Phase3_Timer = 15000; - }else Phase3_Timer -= diff; + } else Phase3_Timer -= diff; } else if (Phase == 4) { //Fear_Timer - if (Fear_Timer < diff) + if (Fear_Timer <= diff) { DoCast(m_creature, SPELL_FEAR); Fear_Timer = 20000; - }else Fear_Timer -= diff; + } else Fear_Timer -= diff; //VoidBolt_Timer - if (VoidBolt_Timer < diff) + if (VoidBolt_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_VOID_BOLT); VoidBolt_Timer = 10000; - }else VoidBolt_Timer -= diff; + } else VoidBolt_Timer -= diff; } //When Solarian reaches 20% she will transform into a huge void walker. @@ -405,35 +402,35 @@ struct TRINITY_DLL_DECL mob_solarium_priestAI : public ScriptedAI if (!UpdateVictim()) return; - if (healTimer < diff) + if (healTimer <= diff) { - Unit* target = NULL; + Unit *pTarget = NULL; - switch(rand()%2) + switch (urand(0,1)) { case 0: if (pInstance) - target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_ASTROMANCER)); + pTarget = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_ASTROMANCER)); break; case 1: - target = m_creature; + pTarget = m_creature; break; } - if (target) + if (pTarget) { - DoCast(target,SPELL_SOLARIUM_GREAT_HEAL); + DoCast(pTarget,SPELL_SOLARIUM_GREAT_HEAL); healTimer = 9000; } } else healTimer -= diff; - if (holysmiteTimer < diff) + if (holysmiteTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_SOLARIUM_HOLY_SMITE); holysmiteTimer = 4000; } else holysmiteTimer -= diff; - if (aoesilenceTimer < diff) + if (aoesilenceTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_SOLARIUM_ARCANE_TORRENT); aoesilenceTimer = 13000; diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp index b0919f1e06b..07bc7c8740a 100644 --- a/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp +++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp @@ -367,8 +367,8 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0)) - AttackStart(target); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + AttackStart(pTarget); } else @@ -465,7 +465,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI { case 1: { - Unit *target = NULL; + Unit *pTarget = NULL; Creature* Advisor = NULL; //Subphase switch @@ -473,7 +473,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI { //Subphase 1 - Start case 0: - if (Phase_Timer < diff) + if (Phase_Timer <= diff) { DoScriptText(SAY_INTRO_THALADRED, m_creature); @@ -485,7 +485,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI //Subphase 1 - Unlock advisor case 1: - if (Phase_Timer < diff) + if (Phase_Timer <= diff) { Advisor = (Unit::GetCreature((*m_creature), m_auiAdvisorGuid[0])); @@ -494,9 +494,9 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI Advisor->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); Advisor->setFaction(m_creature->getFaction()); - target = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (target) - Advisor->AI()->AttackStart(target); + pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + if (pTarget) + Advisor->AI()->AttackStart(pTarget); } ++PhaseSubphase; @@ -519,7 +519,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI //Subphase 2 - Unlock advisor case 3: - if (Phase_Timer < diff) + if (Phase_Timer <= diff) { Advisor = (Unit::GetCreature((*m_creature), m_auiAdvisorGuid[1])); @@ -528,9 +528,9 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI Advisor->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); Advisor->setFaction(m_creature->getFaction()); - target = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (target) - Advisor->AI()->AttackStart(target); + pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + if (pTarget) + Advisor->AI()->AttackStart(pTarget); } ++PhaseSubphase; @@ -553,7 +553,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI //Subphase 3 - Unlock advisor case 5: - if (Phase_Timer < diff) + if (Phase_Timer <= diff) { Advisor = (Unit::GetCreature((*m_creature), m_auiAdvisorGuid[2])); @@ -562,9 +562,9 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI Advisor->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); Advisor->setFaction(m_creature->getFaction()); - target = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (target) - Advisor->AI()->AttackStart(target); + pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + if (pTarget) + Advisor->AI()->AttackStart(pTarget); } ++PhaseSubphase; @@ -587,7 +587,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI //Subphase 4 - Unlock advisor case 7: - if (Phase_Timer < diff) + if (Phase_Timer <= diff) { Advisor = (Unit::GetCreature((*m_creature), m_auiAdvisorGuid[3])); @@ -596,9 +596,9 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI Advisor->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); Advisor->setFaction(m_creature->getFaction()); - target = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (target) - Advisor->AI()->AttackStart(target); + pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + if (pTarget) + Advisor->AI()->AttackStart(pTarget); } Phase_Timer = 3000; @@ -630,10 +630,10 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI { if (PhaseSubphase == 0) { - if (Phase_Timer < diff) + if (Phase_Timer <= diff) { PhaseSubphase = 1; - }else Phase_Timer -= diff; + } else Phase_Timer -= diff; } //Spawn weapons @@ -652,14 +652,14 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI if (PhaseSubphase == 2) { - if (Phase_Timer < diff) + if (Phase_Timer <= diff) { DoScriptText(SAY_PHASE3_ADVANCE, m_creature); if(m_pInstance) m_pInstance->SetData(DATA_KAELTHASEVENT, 3); Phase = 3; PhaseSubphase = 0; - }else Phase_Timer -= diff; + } else Phase_Timer -= diff; } }break; @@ -685,7 +685,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI Phase_Timer = TIME_PHASE_3_4; } - if (Phase_Timer < diff) + if (Phase_Timer <= diff) { DoScriptText(SAY_PHASE4_INTRO2, m_creature); Phase = 4; @@ -699,8 +699,8 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) - AttackStart(target); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + AttackStart(pTarget); Phase_Timer = 30000; } else Phase_Timer -= diff; @@ -718,7 +718,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI //Fireball_Timer if (!InGravityLapse && !ChainPyros && Phase != 5) { - if (Fireball_Timer < diff) + if (Fireball_Timer <= diff) { if (!IsCastingFireball) { @@ -742,13 +742,13 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI } else Fireball_Timer -= diff; //ArcaneDisruption_Timer - if (ArcaneDisruption_Timer < diff) + if (ArcaneDisruption_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_ARCANE_DISRUPTION, true); ArcaneDisruption_Timer = 60000; } else ArcaneDisruption_Timer -= diff; - if (FlameStrike_Timer < diff) + if (FlameStrike_Timer <= diff) { if (Unit* pUnit = SelectUnit(SELECT_TARGET_RANDOM, 0)) DoCast(pUnit, SPELL_FLAME_STRIKE); @@ -756,7 +756,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI FlameStrike_Timer = 30000; } else FlameStrike_Timer -= diff; - if (MindControl_Timer < diff) + if (MindControl_Timer <= diff) { if (m_creature->getThreatManager().getThreatList().size() >= 2) for (uint32 i = 0; i < 3; ++i) @@ -770,7 +770,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI } //Phoenix_Timer - if (Phoenix_Timer < diff) + if (Phoenix_Timer <= diff) { DoCast(m_creature, SPELL_PHOENIX_ANIMATION); DoScriptText(RAND(SAY_SUMMON_PHOENIX1,SAY_SUMMON_PHOENIX2), m_creature); @@ -802,13 +802,13 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI } //ShockBarrier_Timer - if (ShockBarrier_Timer < diff) + if (ShockBarrier_Timer <= diff) { DoCast(m_creature, SPELL_SHOCK_BARRIER); ChainPyros = true; PyrosCasted = 0; ShockBarrier_Timer = 60000; - }else ShockBarrier_Timer -= diff; + } else ShockBarrier_Timer -= diff; //Chain Pyros (3 of them max) if (ChainPyros && !m_creature->IsNonMeleeSpellCasted(false)) @@ -829,7 +829,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI if (Phase == 5) { - if (Phase_Timer < diff) + if (Phase_Timer <= diff) { m_creature->InterruptNonMeleeSpells(false); m_creature->RemoveAurasDueToSpell(SPELL_FULLPOWER); @@ -847,7 +847,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI { //GravityLapse_Timer - if (GravityLapse_Timer < diff) + if (GravityLapse_Timer <= diff) { std::list<HostilReference*>::iterator i = m_creature->getThreatManager().getThreatList().begin(); switch (GravityLapse_Phase) @@ -934,19 +934,19 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI AttackStart(m_creature->getVictim()); break; } - }else GravityLapse_Timer -= diff; + } else GravityLapse_Timer -= diff; if (InGravityLapse) { //ShockBarrier_Timer - if (ShockBarrier_Timer < diff) + if (ShockBarrier_Timer <= diff) { DoCast(m_creature, SPELL_SHOCK_BARRIER); ShockBarrier_Timer = 20000; } else ShockBarrier_Timer -= diff; //NetherBeam_Timer - if (NetherBeam_Timer < diff) + if (NetherBeam_Timer <= diff) { if (Unit* pUnit = SelectUnit(SELECT_TARGET_RANDOM, 0)) DoCast(pUnit, SPELL_NETHER_BEAM); @@ -1012,26 +1012,26 @@ struct TRINITY_DLL_DECL boss_thaladred_the_darkenerAI : public advisorbase_ai return; //Gaze_Timer - if (Gaze_Timer < diff) + if (Gaze_Timer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) { DoResetThreat(); - m_creature->AddThreat(target, 5000000.0f); - DoScriptText(EMOTE_THALADRED_GAZE, m_creature, target); + m_creature->AddThreat(pTarget, 5000000.0f); + DoScriptText(EMOTE_THALADRED_GAZE, m_creature, pTarget); Gaze_Timer = 8500; } } else Gaze_Timer -= diff; //Silence_Timer - if (Silence_Timer < diff) + if (Silence_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_SILENCE); Silence_Timer = 20000; } else Silence_Timer -= diff; //PsychicBlow_Timer - if (PsychicBlow_Timer < diff) + if (PsychicBlow_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_PSYCHIC_BLOW); PsychicBlow_Timer = 20000+rand()%5000; @@ -1084,7 +1084,7 @@ struct TRINITY_DLL_DECL boss_lord_sanguinarAI : public advisorbase_ai return; //Fear_Timer - if (Fear_Timer < diff) + if (Fear_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_BELLOWING_ROAR); Fear_Timer = 25000+rand()%10000; //approximately every 30 seconds @@ -1161,7 +1161,7 @@ struct TRINITY_DLL_DECL boss_grand_astromancer_capernianAI : public advisorbase_ //Yell_Timer if (!Yell) { - if (Yell_Timer < diff) + if (Yell_Timer <= diff) { DoScriptText(SAY_CAPERNIAN_AGGRO, m_creature); Yell = true; @@ -1169,20 +1169,20 @@ struct TRINITY_DLL_DECL boss_grand_astromancer_capernianAI : public advisorbase_ } //Fireball_Timer - if (Fireball_Timer < diff) + if (Fireball_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_CAPERNIAN_FIREBALL); Fireball_Timer = 4000; } else Fireball_Timer -= diff; //Conflagration_Timer - if (Conflagration_Timer < diff) + if (Conflagration_Timer <= diff) { - Unit *target = NULL; - target = SelectUnit(SELECT_TARGET_RANDOM, 0); + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (target && m_creature->IsWithinDistInMap(target, 30)) - DoCast(target, SPELL_CONFLAGRATION); + if (pTarget && m_creature->IsWithinDistInMap(pTarget, 30)) + DoCast(pTarget, SPELL_CONFLAGRATION); else DoCast(m_creature->getVictim(), SPELL_CONFLAGRATION); @@ -1190,10 +1190,10 @@ struct TRINITY_DLL_DECL boss_grand_astromancer_capernianAI : public advisorbase_ } else Conflagration_Timer -= diff; //ArcaneExplosion_Timer - if (ArcaneExplosion_Timer < diff) + if (ArcaneExplosion_Timer <= diff) { bool InMeleeRange = false; - Unit *target = NULL; + Unit *pTarget = NULL; std::list<HostilReference*>& m_threatlist = m_creature->getThreatManager().getThreatList(); for (std::list<HostilReference*>::iterator i = m_threatlist.begin(); i!= m_threatlist.end(); ++i) { @@ -1202,13 +1202,13 @@ struct TRINITY_DLL_DECL boss_grand_astromancer_capernianAI : public advisorbase_ if (pUnit && pUnit->IsWithinDistInMap(m_creature, 5)) { InMeleeRange = true; - target = pUnit; + pTarget = pUnit; break; } } if (InMeleeRange) - DoCast(target, SPELL_ARCANE_EXPLOSION); + DoCast(pTarget, SPELL_ARCANE_EXPLOSION); ArcaneExplosion_Timer = 4000+rand()%2000; } else ArcaneExplosion_Timer -= diff; @@ -1263,17 +1263,17 @@ struct TRINITY_DLL_DECL boss_master_engineer_telonicusAI : public advisorbase_ai return; //Bomb_Timer - if (Bomb_Timer < diff) + if (Bomb_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_BOMB); Bomb_Timer = 25000; } else Bomb_Timer -= diff; //RemoteToy_Timer - if (RemoteToy_Timer < diff) + if (RemoteToy_Timer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(target, SPELL_REMOTE_TOY); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_REMOTE_TOY); RemoteToy_Timer = 10000+rand()%5000; } else RemoteToy_Timer -= diff; @@ -1312,7 +1312,7 @@ struct TRINITY_DLL_DECL mob_kael_flamestrikeAI : public ScriptedAI } //Timer - if (Timer < diff) + if (Timer <= diff) { if (!KillSelf) { @@ -1351,7 +1351,7 @@ struct TRINITY_DLL_DECL mob_phoenix_tkAI : public ScriptedAI if (!UpdateVictim()) return; - if (Cycle_Timer < diff) + if (Cycle_Timer <= diff) { //spell Burn should possible do this, but it doesn't, so do this for now. uint32 dmg = urand(4500,5500); diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp index a1063356ed3..bc7b2fb832f 100644 --- a/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp +++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp @@ -97,49 +97,49 @@ struct TRINITY_DLL_DECL boss_void_reaverAI : public ScriptedAI return; // Pounding - if (Pounding_Timer < diff) + if (Pounding_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_POUNDING); DoScriptText(RAND(SAY_POUNDING1,SAY_POUNDING2), m_creature); Pounding_Timer = 15000; //cast time(3000) + cooldown time(12000) - }else Pounding_Timer -= diff; + } else Pounding_Timer -= diff; // Arcane Orb - if (ArcaneOrb_Timer < diff) + if (ArcaneOrb_Timer <= diff) { - Unit *target = NULL; + Unit *pTarget = NULL; std::list<HostilReference *> t_list = m_creature->getThreatManager().getThreatList(); std::vector<Unit *> target_list; for (std::list<HostilReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { - target = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); - if (!target) + pTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); + if (!pTarget) continue; // exclude pets & totems - if (target->GetTypeId() != TYPEID_PLAYER) + if (pTarget->GetTypeId() != TYPEID_PLAYER) continue; //18 yard radius minimum - if (target && target->GetTypeId() == TYPEID_PLAYER && target->isAlive() && !target->IsWithinDist(m_creature, 18, false)) - target_list.push_back(target); - target = NULL; + if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER && pTarget->isAlive() && !pTarget->IsWithinDist(m_creature, 18, false)) + target_list.push_back(pTarget); + pTarget = NULL; } if (target_list.size()) - target = *(target_list.begin()+rand()%target_list.size()); + pTarget = *(target_list.begin()+rand()%target_list.size()); else - target = m_creature->getVictim(); + pTarget = m_creature->getVictim(); - if (target) - m_creature->CastSpell(target->GetPositionX(),target->GetPositionY(),target->GetPositionZ(), SPELL_ARCANE_ORB, false, NULL, NULL, NULL, target); + if (pTarget) + m_creature->CastSpell(pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(), SPELL_ARCANE_ORB, false, NULL, NULL, NULL, pTarget); ArcaneOrb_Timer = 3000; - }else ArcaneOrb_Timer -= diff; + } else ArcaneOrb_Timer -= diff; // Single Target knock back, reduces aggro - if (KnockAway_Timer < diff) + if (KnockAway_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_KNOCK_AWAY); @@ -148,14 +148,14 @@ struct TRINITY_DLL_DECL boss_void_reaverAI : public ScriptedAI DoModifyThreatPercent(m_creature->getVictim(),-25); KnockAway_Timer = 30000; - }else KnockAway_Timer -= diff; + } else KnockAway_Timer -= diff; //Berserk if (Berserk_Timer < diff && !Enraged) { DoCast(m_creature,SPELL_BERSERK); Enraged = true; - }else Berserk_Timer -= diff; + } else Berserk_Timer -= diff; DoMeleeAttackIfReady(); diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/the_eye.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/the_eye.cpp index cfb96a3a4dc..b41596478f5 100644 --- a/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/the_eye.cpp +++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/the_eye.cpp @@ -55,11 +55,11 @@ struct TRINITY_DLL_DECL mob_crystalcore_devastatorAI : public ScriptedAI //Check if we have a current target //Knockaway_Timer - if (Knockaway_Timer < diff) + if (Knockaway_Timer <= diff) { m_creature->CastSpell(m_creature->getVictim(),SPELL_KNOCKAWAY, true); - // current aggro target is knocked away pick new target + // current aggro pTarget is knocked away pick new target Unit* Target = SelectUnit(SELECT_TARGET_TOPAGGRO, 0); if (!Target || Target == m_creature->getVictim()) @@ -73,11 +73,11 @@ struct TRINITY_DLL_DECL mob_crystalcore_devastatorAI : public ScriptedAI else Knockaway_Timer -= diff; //Countercharge_Timer - if (Countercharge_Timer < diff) + if (Countercharge_Timer <= diff) { DoCast(this->m_creature,SPELL_COUNTERCHARGE); Countercharge_Timer = 45000; - }else Countercharge_Timer -= diff; + } else Countercharge_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp index 946108a72f0..29425cf758e 100644 --- a/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp +++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp @@ -86,14 +86,14 @@ struct TRINITY_DLL_DECL boss_gatewatcher_iron_handAI : public ScriptedAI return; //Shadow Power - if (Shadow_Power_Timer < diff) + if (Shadow_Power_Timer <= diff) { DoCast(m_creature,HEROIC(SPELL_SHADOW_POWER, H_SPELL_SHADOW_POWER)); Shadow_Power_Timer = 20000 + rand()%8000; - }else Shadow_Power_Timer -= diff; + } else Shadow_Power_Timer -= diff; //Jack Hammer - if (Jackhammer_Timer < diff) + if (Jackhammer_Timer <= diff) { //TODO: expect cast this about 5 times in a row (?), announce it by emote only once DoScriptText(EMOTE_HAMMER, m_creature); @@ -105,14 +105,14 @@ struct TRINITY_DLL_DECL boss_gatewatcher_iron_handAI : public ScriptedAI DoScriptText(RAND(SAY_HAMMER_1,SAY_HAMMER_2), m_creature); Jackhammer_Timer = 30000; - }else Jackhammer_Timer -= diff; + } else Jackhammer_Timer -= diff; //Stream of Machine Fluid - if (Stream_of_Machine_Fluid_Timer < diff) + if (Stream_of_Machine_Fluid_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_STREAM_OF_MACHINE_FLUID); Stream_of_Machine_Fluid_Timer = 35000 + rand()%15000; - }else Stream_of_Machine_Fluid_Timer -= diff; + } else Stream_of_Machine_Fluid_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp index f1122027490..d5db9f2bb16 100644 --- a/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp +++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp @@ -101,21 +101,21 @@ struct TRINITY_DLL_DECL boss_nethermancer_sepethreaAI : public ScriptedAI return; //Frost Attack - if (frost_attack_Timer < diff) + if (frost_attack_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_FROST_ATTACK); frost_attack_Timer = 7000 + rand()%3000; - }else frost_attack_Timer -= diff; + } else frost_attack_Timer -= diff; //Arcane Blast - if (arcane_blast_Timer < diff) + if (arcane_blast_Timer <= diff) { DoCast(m_creature->getVictim(), SPELL_ARCANE_BLAST); arcane_blast_Timer = 15000; - }else arcane_blast_Timer -= diff; + } else arcane_blast_Timer -= diff; //Dragons Breath - if (dragons_breath_Timer < diff) + if (dragons_breath_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_DRAGONS_BREATH); { @@ -125,21 +125,21 @@ struct TRINITY_DLL_DECL boss_nethermancer_sepethreaAI : public ScriptedAI DoScriptText(RAND(SAY_DRAGONS_BREATH_1,SAY_DRAGONS_BREATH_2), m_creature); } dragons_breath_Timer = 12000 + rand()%10000; - }else dragons_breath_Timer -= diff; + } else dragons_breath_Timer -= diff; //Knockback - if (knockback_Timer < diff) + if (knockback_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_KNOCKBACK); knockback_Timer = 15000 + rand()%10000; - }else knockback_Timer -= diff; + } else knockback_Timer -= diff; //Solarburn - if (solarburn_Timer < diff) + if (solarburn_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_SOLARBURN); solarburn_Timer = 30000; - }else solarburn_Timer -= diff; + } else solarburn_Timer -= diff; DoMeleeAttackIfReady(); } @@ -189,7 +189,7 @@ struct TRINITY_DLL_DECL mob_ragin_flamesAI : public ScriptedAI void UpdateAI(const uint32 diff) { //Check_Timer - if (Check_Timer < diff) + if (Check_Timer <= diff) { if (pInstance) { @@ -201,30 +201,30 @@ struct TRINITY_DLL_DECL mob_ragin_flamesAI : public ScriptedAI } } Check_Timer = 1000; - }else Check_Timer -= diff; + } else Check_Timer -= diff; if (!UpdateVictim()) return; if (!onlyonce) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0)) - m_creature->GetMotionMaster()->MoveChase(target); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + m_creature->GetMotionMaster()->MoveChase(pTarget); onlyonce = true; } - if (inferno_Timer < diff) + if (inferno_Timer <= diff) { DoCast(m_creature->getVictim(),HEROIC(SPELL_INFERNO, H_SPELL_INFERNO)); m_creature->TauntApply(m_creature->getVictim()); inferno_Timer = 10000; - }else inferno_Timer -= diff; + } else inferno_Timer -= diff; - if (flame_timer < diff) + if (flame_timer <= diff) { DoCast(m_creature,SPELL_FIRE_TAIL); flame_timer = 500; - }else flame_timer -=diff; + } else flame_timer -=diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp index f26efdf25f9..8ceb2247da7 100644 --- a/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp +++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp @@ -105,50 +105,50 @@ struct TRINITY_DLL_DECL boss_pathaleon_the_calculatorAI : public ScriptedAI if (!UpdateVictim()) return; - if (Summon_Timer < diff) + if (Summon_Timer <= diff) { for (uint8 i = 0; i < 3; ++i) { - Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0); + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); Creature* Wraith = m_creature->SummonCreature(21062,m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); - if (target && Wraith) - Wraith->AI()->AttackStart(target); + if (pTarget && Wraith) + Wraith->AI()->AttackStart(pTarget); } DoScriptText(SAY_SUMMON, m_creature); Summon_Timer = 30000 + rand()%15000; - }else Summon_Timer -= diff; + } else Summon_Timer -= diff; - if (ManaTap_Timer < diff) + if (ManaTap_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_MANA_TAP); ManaTap_Timer = 14000 + rand()%8000; - }else ManaTap_Timer -= diff; + } else ManaTap_Timer -= diff; - if (ArcaneTorrent_Timer < diff) + if (ArcaneTorrent_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_ARCANE_TORRENT); ArcaneTorrent_Timer = 12000 + rand()%6000; - }else ArcaneTorrent_Timer -= diff; + } else ArcaneTorrent_Timer -= diff; - if (Domination_Timer < diff) + if (Domination_Timer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,1)) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,1)) { DoScriptText(RAND(SAY_DOMINATION_1,SAY_DOMINATION_2), m_creature); - DoCast(target,SPELL_DOMINATION); + DoCast(pTarget,SPELL_DOMINATION); } Domination_Timer = 25000 + rand()%5000; - }else Domination_Timer -= diff; + } else Domination_Timer -= diff; //Only casting if Heroic Mode is used if (HeroicMode) { - if (ArcaneExplosion_Timer < diff) + if (ArcaneExplosion_Timer <= diff) { DoCast(m_creature->getVictim(),H_SPELL_ARCANE_EXPLOSION); ArcaneExplosion_Timer = 10000 + rand()%4000; - }else ArcaneExplosion_Timer -= diff; + } else ArcaneExplosion_Timer -= diff; } if (!Enraged && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 21) @@ -194,32 +194,32 @@ struct TRINITY_DLL_DECL mob_nether_wraithAI : public ScriptedAI if (!UpdateVictim()) return; - if (ArcaneMissiles_Timer < diff) + if (ArcaneMissiles_Timer <= diff) { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,1)) - DoCast(target,SPELL_ARCANE_MISSILES); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,1)) + DoCast(pTarget,SPELL_ARCANE_MISSILES); else DoCast(m_creature->getVictim(),SPELL_ARCANE_MISSILES); ArcaneMissiles_Timer = 5000 + rand()%5000; - }else ArcaneMissiles_Timer -=diff; + } else ArcaneMissiles_Timer -=diff; if (!Detonation) { - if (Detonation_Timer < diff) + if (Detonation_Timer <= diff) { DoCast(m_creature,SPELL_DETONATION); Detonation = true; - }else Detonation_Timer -= diff; + } else Detonation_Timer -= diff; } if (Detonation) { - if (Die_Timer < diff) + if (Die_Timer <= diff) { m_creature->setDeathState(JUST_DIED); m_creature->RemoveCorpse(); - }else Die_Timer -= diff; + } else Die_Timer -= diff; } DoMeleeAttackIfReady(); diff --git a/src/bindings/scripts/scripts/outland/terokkar_forest.cpp b/src/bindings/scripts/scripts/outland/terokkar_forest.cpp index 1d0d0bdc144..4c0f51bf39f 100644 --- a/src/bindings/scripts/scripts/outland/terokkar_forest.cpp +++ b/src/bindings/scripts/scripts/outland/terokkar_forest.cpp @@ -117,22 +117,22 @@ struct TRINITY_DLL_DECL mob_unkor_the_ruthlessAI : public ScriptedAI } else { - if (UnkorUnfriendly_Timer < diff) + if (UnkorUnfriendly_Timer <= diff) { EnterEvadeMode(); return; - }else UnkorUnfriendly_Timer -= diff; + } else UnkorUnfriendly_Timer -= diff; } } if (!UpdateVictim()) return; - if (Pulverize_Timer < diff) + if (Pulverize_Timer <= diff) { DoCast(m_creature,SPELL_PULVERIZE); Pulverize_Timer = 9000; - }else Pulverize_Timer -= diff; + } else Pulverize_Timer -= diff; DoMeleeAttackIfReady(); } @@ -340,23 +340,23 @@ struct TRINITY_DLL_DECL npc_floonAI : public ScriptedAI if (!UpdateVictim()) return; - if (Silence_Timer < diff) + if (Silence_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_SILENCE); Silence_Timer = 30000; - }else Silence_Timer -= diff; + } else Silence_Timer -= diff; - if (FrostNova_Timer < diff) + if (FrostNova_Timer <= diff) { DoCast(m_creature,SPELL_FROST_NOVA); FrostNova_Timer = 20000; - }else FrostNova_Timer -= diff; + } else FrostNova_Timer -= diff; - if (Frostbolt_Timer < diff) + if (Frostbolt_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_FROSTBOLT); Frostbolt_Timer = 5000; - }else Frostbolt_Timer -= diff; + } else Frostbolt_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/outland/zangarmarsh.cpp b/src/bindings/scripts/scripts/outland/zangarmarsh.cpp index d03e161a2c5..19914eb258d 100644 --- a/src/bindings/scripts/scripts/outland/zangarmarsh.cpp +++ b/src/bindings/scripts/scripts/outland/zangarmarsh.cpp @@ -153,11 +153,11 @@ struct TRINITY_DLL_DECL npc_cooshcooshAI : public ScriptedAI if (!UpdateVictim()) return; - if (LightningBolt_Timer < diff) + if (LightningBolt_Timer <= diff) { DoCast(m_creature->getVictim(),SPELL_LIGHTNING_BOLT); LightningBolt_Timer = 5000; - }else LightningBolt_Timer -= diff; + } else LightningBolt_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/world/boss_emeriss.cpp b/src/bindings/scripts/scripts/world/boss_emeriss.cpp index 89c3840de80..ba189d717c3 100644 --- a/src/bindings/scripts/scripts/world/boss_emeriss.cpp +++ b/src/bindings/scripts/scripts/world/boss_emeriss.cpp @@ -69,7 +69,7 @@ struct TRINITY_DLL_DECL boss_emerissAI : public ScriptedAI return; //Sleep_Timer - if (m_uiSleep_Timer < uiDiff) + if (m_uiSleep_Timer <= uiDiff) { if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_SLEEP); @@ -80,7 +80,7 @@ struct TRINITY_DLL_DECL boss_emerissAI : public ScriptedAI m_uiSleep_Timer -= uiDiff; //NoxiousBreath_Timer - if (m_uiNoxiousBreath_Timer < uiDiff) + if (m_uiNoxiousBreath_Timer <= uiDiff) { DoCast(m_creature->getVictim(), SPELL_NOXIOUSBREATH); m_uiNoxiousBreath_Timer = 14000 + rand()%6000; @@ -89,7 +89,7 @@ struct TRINITY_DLL_DECL boss_emerissAI : public ScriptedAI m_uiNoxiousBreath_Timer -= uiDiff; //Tailsweep every 2 seconds - if (m_uiTailSweep_Timer < uiDiff) + if (m_uiTailSweep_Timer <= uiDiff) { DoCast(m_creature, SPELL_TAILSWEEP); m_uiTailSweep_Timer = 2000; @@ -98,7 +98,7 @@ struct TRINITY_DLL_DECL boss_emerissAI : public ScriptedAI m_uiTailSweep_Timer -= uiDiff; //MarkOfNature_Timer - //if (m_uiMarkOfNature_Timer < uiDiff) + //if (m_uiMarkOfNature_Timer <= uiDiff) //{ // DoCast(m_creature->getVictim(), SPELL_MARKOFNATURE); // m_uiMarkOfNature_Timer = 45000; @@ -107,7 +107,7 @@ struct TRINITY_DLL_DECL boss_emerissAI : public ScriptedAI // m_uiMarkOfNature_Timer -= uiDiff; //VolatileInfection_Timer - if (m_uiVolatileInfection_Timer < uiDiff) + if (m_uiVolatileInfection_Timer <= uiDiff) { DoCast(m_creature->getVictim(), SPELL_VOLATILEINFECTION); m_uiVolatileInfection_Timer = 7000 + rand()%5000; diff --git a/src/bindings/scripts/scripts/world/boss_taerar.cpp b/src/bindings/scripts/scripts/world/boss_taerar.cpp index a3a6e87f2d5..c632307919a 100644 --- a/src/bindings/scripts/scripts/world/boss_taerar.cpp +++ b/src/bindings/scripts/scripts/world/boss_taerar.cpp @@ -92,7 +92,7 @@ struct TRINITY_DLL_DECL boss_taerarAI : public ScriptedAI void UpdateAI(const uint32 uiDiff) { - if (m_bShades && m_uiShades_Timer < uiDiff) + if (m_bShades && m_uiShades_Timer <= uiDiff) { //Become unbanished again m_creature->setFaction(14); @@ -111,7 +111,7 @@ struct TRINITY_DLL_DECL boss_taerarAI : public ScriptedAI return; //Sleep_Timer - if (m_uiSleep_Timer < uiDiff) + if (m_uiSleep_Timer <= uiDiff) { if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_SLEEP); @@ -122,7 +122,7 @@ struct TRINITY_DLL_DECL boss_taerarAI : public ScriptedAI m_uiSleep_Timer -= uiDiff; //NoxiousBreath_Timer - if (m_uiNoxiousBreath_Timer < uiDiff) + if (m_uiNoxiousBreath_Timer <= uiDiff) { DoCast(m_creature->getVictim(), SPELL_NOXIOUSBREATH); m_uiNoxiousBreath_Timer = 14000 + rand()%6000; @@ -131,7 +131,7 @@ struct TRINITY_DLL_DECL boss_taerarAI : public ScriptedAI m_uiNoxiousBreath_Timer -= uiDiff; //Tailsweep every 2 seconds - if (m_uiTailSweep_Timer < uiDiff) + if (m_uiTailSweep_Timer <= uiDiff) { DoCast(m_creature, SPELL_TAILSWEEP); m_uiTailSweep_Timer = 2000; @@ -140,7 +140,7 @@ struct TRINITY_DLL_DECL boss_taerarAI : public ScriptedAI m_uiTailSweep_Timer -= uiDiff; //MarkOfNature_Timer - //if (m_uiMarkOfNature_Timer < uiDiff) + //if (m_uiMarkOfNature_Timer <= uiDiff) //{ // DoCast(m_creature->getVictim(), SPELL_MARKOFNATURE); // m_uiMarkOfNature_Timer = 45000; @@ -149,7 +149,7 @@ struct TRINITY_DLL_DECL boss_taerarAI : public ScriptedAI // m_uiMarkOfNature_Timer -= uiDiff; //ArcaneBlast_Timer - if (m_uiArcaneBlast_Timer < uiDiff) + if (m_uiArcaneBlast_Timer <= uiDiff) { DoCast(m_creature->getVictim(), SPELL_ARCANEBLAST); m_uiArcaneBlast_Timer = 7000 + rand()%5000; @@ -158,7 +158,7 @@ struct TRINITY_DLL_DECL boss_taerarAI : public ScriptedAI m_uiArcaneBlast_Timer -= uiDiff; //BellowingRoar_Timer - if (m_uiBellowingRoar_Timer < uiDiff) + if (m_uiBellowingRoar_Timer <= uiDiff) { DoCast(m_creature->getVictim(), SPELL_BELLOWINGROAR); m_uiBellowingRoar_Timer = 20000 + rand()%10000; @@ -215,7 +215,7 @@ struct TRINITY_DLL_DECL boss_shadeoftaerarAI : public ScriptedAI return; //PoisonCloud_Timer - if (m_uiPoisonCloud_Timer < uiDiff) + if (m_uiPoisonCloud_Timer <= uiDiff) { DoCast(m_creature->getVictim(), SPELL_POSIONCLOUD); m_uiPoisonCloud_Timer = 30000; @@ -224,7 +224,7 @@ struct TRINITY_DLL_DECL boss_shadeoftaerarAI : public ScriptedAI m_uiPoisonCloud_Timer -= uiDiff; //PosionBreath_Timer - if (m_uiPosionBreath_Timer < uiDiff) + if (m_uiPosionBreath_Timer <= uiDiff) { DoCast(m_creature->getVictim(), SPELL_POSIONBREATH); m_uiPosionBreath_Timer = 12000; diff --git a/src/bindings/scripts/scripts/world/boss_ysondre.cpp b/src/bindings/scripts/scripts/world/boss_ysondre.cpp index 5f612b43f0a..160f49ed5d2 100644 --- a/src/bindings/scripts/scripts/world/boss_ysondre.cpp +++ b/src/bindings/scripts/scripts/world/boss_ysondre.cpp @@ -80,7 +80,7 @@ struct TRINITY_DLL_DECL boss_ysondreAI : public ScriptedAI return; //Sleep_Timer - if (m_uiSleep_Timer < uiDiff) + if (m_uiSleep_Timer <= uiDiff) { if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_SLEEP); @@ -91,7 +91,7 @@ struct TRINITY_DLL_DECL boss_ysondreAI : public ScriptedAI m_uiSleep_Timer -= uiDiff; //NoxiousBreath_Timer - if (m_uiNoxiousBreath_Timer < uiDiff) + if (m_uiNoxiousBreath_Timer <= uiDiff) { DoCast(m_creature->getVictim(), SPELL_NOXIOUSBREATH); m_uiNoxiousBreath_Timer = 14000 + rand()%6000; @@ -100,10 +100,10 @@ struct TRINITY_DLL_DECL boss_ysondreAI : public ScriptedAI m_uiNoxiousBreath_Timer -= uiDiff; //Tailsweep every 2 seconds - if (m_uiTailSweep_Timer < uiDiff) + if (m_uiTailSweep_Timer <= uiDiff) { - if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(target, SPELL_TAILSWEEP); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_TAILSWEEP); m_uiTailSweep_Timer = 2000; } @@ -111,7 +111,7 @@ struct TRINITY_DLL_DECL boss_ysondreAI : public ScriptedAI m_uiTailSweep_Timer -= uiDiff; //MarkOfNature_Timer - //if (m_uiMarkOfNature_Timer < uiDiff) + //if (m_uiMarkOfNature_Timer <= uiDiff) //{ // DoCast(m_creature->getVictim(), SPELL_MARKOFNATURE); // m_uiMarkOfNature_Timer = 45000; @@ -120,11 +120,11 @@ struct TRINITY_DLL_DECL boss_ysondreAI : public ScriptedAI // m_uiMarkOfNature_Timer -= uiDiff; //LightningWave_Timer - if (m_uiLightningWave_Timer < uiDiff) + if (m_uiLightningWave_Timer <= uiDiff) { //Cast LIGHTNINGWAVE on a Random target - if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(target, SPELL_LIGHTNINGWAVE); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_LIGHTNINGWAVE); m_uiLightningWave_Timer = 7000 + rand()%5000; } @@ -164,7 +164,7 @@ struct TRINITY_DLL_DECL mob_dementeddruidsAI : public ScriptedAI return; //MoonFire_Timer - if (m_uiMoonFire_Timer < uiDiff) + if (m_uiMoonFire_Timer <= uiDiff) { DoCast(m_creature->getVictim(), SPELL_MOONFIRE); m_uiMoonFire_Timer = 5000; diff --git a/src/bindings/scripts/scripts/world/guards.cpp b/src/bindings/scripts/scripts/world/guards.cpp index ead30387b18..abaf993342e 100644 --- a/src/bindings/scripts/scripts/world/guards.cpp +++ b/src/bindings/scripts/scripts/world/guards.cpp @@ -2550,7 +2550,7 @@ struct TRINITY_DLL_DECL guard_shattrath_aldorAI : public guardAI if (CanTeleport) { - if (Exile_Timer < diff) + if (Exile_Timer <= diff) { if (Unit* temp = Unit::GetUnit(*m_creature,PlayerGUID)) { @@ -2560,9 +2560,9 @@ struct TRINITY_DLL_DECL guard_shattrath_aldorAI : public guardAI PlayerGUID = 0; Exile_Timer = 8500; CanTeleport = false; - }else Exile_Timer -= diff; + } else Exile_Timer -= diff; } - else if (Banish_Timer < diff) + else if (Banish_Timer <= diff) { Unit* temp = m_creature->getVictim(); if (temp && temp->GetTypeId() == TYPEID_PLAYER) @@ -2573,7 +2573,7 @@ struct TRINITY_DLL_DECL guard_shattrath_aldorAI : public guardAI if (PlayerGUID) CanTeleport = true; } - }else Banish_Timer -= diff; + } else Banish_Timer -= diff; DoMeleeAttackIfReady(); } @@ -2746,7 +2746,7 @@ struct TRINITY_DLL_DECL guard_shattrath_scryerAI : public guardAI if (CanTeleport) { - if (Exile_Timer < diff) + if (Exile_Timer <= diff) { if (Unit* temp = Unit::GetUnit(*m_creature,PlayerGUID)) { @@ -2756,9 +2756,9 @@ struct TRINITY_DLL_DECL guard_shattrath_scryerAI : public guardAI PlayerGUID = 0; Exile_Timer = 8500; CanTeleport = false; - }else Exile_Timer -= diff; + } else Exile_Timer -= diff; } - else if (Banish_Timer < diff) + else if (Banish_Timer <= diff) { Unit* temp = m_creature->getVictim(); if (temp && temp->GetTypeId() == TYPEID_PLAYER) @@ -2769,7 +2769,7 @@ struct TRINITY_DLL_DECL guard_shattrath_scryerAI : public guardAI if (PlayerGUID) CanTeleport = true; } - }else Banish_Timer -= diff; + } else Banish_Timer -= diff; DoMeleeAttackIfReady(); } diff --git a/src/bindings/scripts/scripts/world/item_scripts.cpp b/src/bindings/scripts/scripts/world/item_scripts.cpp index 0e0f5795be9..77da633fcbe 100644 --- a/src/bindings/scripts/scripts/world/item_scripts.cpp +++ b/src/bindings/scripts/scripts/world/item_scripts.cpp @@ -41,9 +41,9 @@ enum eOnlyForFlight SPELL_ARCANE_CHARGES = 45072 }; -bool ItemUse_item_only_for_flight(Player* pPlayer, Item* _Item, SpellCastTargets const& targets) +bool ItemUse_item_only_for_flight(Player* pPlayer, Item* pItem, SpellCastTargets const& targets) { - uint32 itemId = _Item->GetEntry(); + uint32 itemId = pItem->GetEntry(); bool disabled = false; //for special scripts @@ -68,7 +68,7 @@ bool ItemUse_item_only_for_flight(Player* pPlayer, Item* _Item, SpellCastTargets return false; // error - pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,_Item,NULL); + pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,pItem,NULL); return true; } @@ -78,16 +78,16 @@ bool ItemUse_item_only_for_flight(Player* pPlayer, Item* _Item, SpellCastTargets //This is just a hack and should be removed from here. //Creature/Item are in fact created before spell are sucessfully casted, without any checks at all to ensure proper/expected behavior. -bool ItemUse_item_draenei_fishing_net(Player* pPlayer, Item* _Item, SpellCastTargets const& targets) +bool ItemUse_item_draenei_fishing_net(Player* pPlayer, Item* pItem, SpellCastTargets const& targets) { //if (targets.getGOTarget() && targets.getGOTarget()->GetTypeId() == TYPEID_GAMEOBJECT && //targets.getGOTarget()->GetGOInfo()->type == GAMEOBJECT_TYPE_SPELL_FOCUS && targets.getGOTarget()->GetEntry() == 181616) //{ if (pPlayer->GetQuestStatus(9452) == QUEST_STATUS_INCOMPLETE) { - if (rand()%100 < 35) + if (urand(0,99) < 35) { - Creature *Murloc = pPlayer->SummonCreature(17102,pPlayer->GetPositionX() ,pPlayer->GetPositionY()+20, pPlayer->GetPositionZ(), 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + Creature *Murloc = pPlayer->SummonCreature(17102, pPlayer->GetPositionX(), pPlayer->GetPositionY()+20, pPlayer->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); if (Murloc) Murloc->AI()->AttackStart(pPlayer); } @@ -97,11 +97,10 @@ bool ItemUse_item_draenei_fishing_net(Player* pPlayer, Item* _Item, SpellCastTar uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 23614, 1); if (msg == EQUIP_ERR_OK) { - Item* item = pPlayer->StoreNewItem(dest,23614,true); - if (item) + if (Item* item = pPlayer->StoreNewItem(dest,23614,true)) pPlayer->SendNewItem(item,1,false,true); - }else - pPlayer->SendEquipError(msg,NULL,NULL); + } else + pPlayer->SendEquipError(msg,NULL,NULL); } } //} @@ -112,15 +111,15 @@ bool ItemUse_item_draenei_fishing_net(Player* pPlayer, Item* _Item, SpellCastTar # item_nether_wraith_beacon #####*/ -bool ItemUse_item_nether_wraith_beacon(Player* pPlayer, Item* _Item, SpellCastTargets const& targets) +bool ItemUse_item_nether_wraith_beacon(Player* pPlayer, Item* pItem, SpellCastTargets const& targets) { if (pPlayer->GetQuestStatus(10832) == QUEST_STATUS_INCOMPLETE) { Creature *Nether; - Nether = pPlayer->SummonCreature(22408,pPlayer->GetPositionX() ,pPlayer->GetPositionY()+20, pPlayer->GetPositionZ(), 0,TEMPSUMMON_TIMED_DESPAWN,180000); - Nether = pPlayer->SummonCreature(22408,pPlayer->GetPositionX() ,pPlayer->GetPositionY()-20, pPlayer->GetPositionZ(), 0,TEMPSUMMON_TIMED_DESPAWN,180000); + Nether = pPlayer->SummonCreature(22408, pPlayer->GetPositionX(), pPlayer->GetPositionY()+20, pPlayer->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 180000); + Nether = pPlayer->SummonCreature(22408, pPlayer->GetPositionX(), pPlayer->GetPositionY()-20, pPlayer->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 180000); if (Nether) - (Nether->AI())->AttackStart(pPlayer); + Nether->AI()->AttackStart(pPlayer); } return false; } @@ -129,9 +128,9 @@ bool ItemUse_item_nether_wraith_beacon(Player* pPlayer, Item* _Item, SpellCastTa # item_flying_machine #####*/ -bool ItemUse_item_flying_machine(Player* pPlayer, Item* _Item, SpellCastTargets const& targets) +bool ItemUse_item_flying_machine(Player* pPlayer, Item* pItem, SpellCastTargets const& targets) { - uint32 itemId = _Item->GetEntry(); + uint32 itemId = pItem->GetEntry(); if (itemId == 34060) if (pPlayer->GetBaseSkillValue(SKILL_RIDING) >= 225) return false; @@ -141,7 +140,7 @@ bool ItemUse_item_flying_machine(Player* pPlayer, Item* _Item, SpellCastTargets return false; debug_log("TSCR: Player attempt to use item %u, but did not meet riding requirement",itemId); - pPlayer->SendEquipError(EQUIP_ERR_ERR_CANT_EQUIP_SKILL,_Item,NULL); + pPlayer->SendEquipError(EQUIP_ERR_ERR_CANT_EQUIP_SKILL,pItem,NULL); return true; } @@ -149,13 +148,13 @@ bool ItemUse_item_flying_machine(Player* pPlayer, Item* _Item, SpellCastTargets # item_gor_dreks_ointment #####*/ -bool ItemUse_item_gor_dreks_ointment(Player* pPlayer, Item* _Item, SpellCastTargets const& targets) +bool ItemUse_item_gor_dreks_ointment(Player* pPlayer, Item* pItem, SpellCastTargets const& targets) { if (targets.getUnitTarget() && targets.getUnitTarget()->GetTypeId()==TYPEID_UNIT && targets.getUnitTarget()->GetEntry() == 20748 && !targets.getUnitTarget()->HasAura(32578)) return false; - pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,_Item,NULL); + pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,pItem,NULL); return true; } @@ -163,15 +162,13 @@ bool ItemUse_item_gor_dreks_ointment(Player* pPlayer, Item* _Item, SpellCastTarg # item_incendiary_explosives #####*/ -bool ItemUse_item_incendiary_explosives(Player* pPlayer, Item* _Item, SpellCastTargets const& targets) +bool ItemUse_item_incendiary_explosives(Player* pPlayer, Item* pItem, SpellCastTargets const& targets) { if (pPlayer->FindNearestCreature(26248,15) || pPlayer->FindNearestCreature(26249,15)) - { return false; - } else { - pPlayer->SendEquipError(EQUIP_ERR_OUT_OF_RANGE,_Item,NULL); + pPlayer->SendEquipError(EQUIP_ERR_OUT_OF_RANGE,pItem,NULL); return true; } } @@ -180,14 +177,13 @@ bool ItemUse_item_incendiary_explosives(Player* pPlayer, Item* _Item, SpellCastT # item_mysterious_egg #####*/ -bool ItemExpire_item_mysterious_egg(Player* pPlayer, ItemPrototype const * _ItemProto) +bool ItemExpire_item_mysterious_egg(Player* pPlayer, ItemPrototype const * pItemProto) { ItemPosCountVec dest; uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 39883, 1); // Cracked Egg if (msg == EQUIP_ERR_OK) - { pPlayer->StoreNewItem(dest, 39883, true, Item::GenerateItemRandomPropertyId(39883)); - } + return true; } @@ -195,14 +191,13 @@ bool ItemExpire_item_mysterious_egg(Player* pPlayer, ItemPrototype const * _Item # item_disgusting_jar #####*/ -bool ItemExpire_item_disgusting_jar(Player* pPlayer, ItemPrototype const * _ItemProto) +bool ItemExpire_item_disgusting_jar(Player* pPlayer, ItemPrototype const * pItemProto) { ItemPosCountVec dest; uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 44718, 1); // Ripe Disgusting Jar if (msg == EQUIP_ERR_OK) - { pPlayer->StoreNewItem(dest, 44718, true, Item::GenerateItemRandomPropertyId(44718)); - } + return true; } @@ -210,7 +205,7 @@ bool ItemExpire_item_disgusting_jar(Player* pPlayer, ItemPrototype const * _Item # item_harvesters_gift #####*/ #define GHOULS 28845 -bool ItemUse_item_harvesters_gift(Player* pPlayer, Item* _Item, SpellCastTargets const& targets) +bool ItemUse_item_harvesters_gift(Player* pPlayer, Item* pItem, SpellCastTargets const& targets) { std::list<Creature*> MinionList; pPlayer->GetAllMinionsByEntry(MinionList,GHOULS); @@ -220,9 +215,7 @@ bool ItemUse_item_harvesters_gift(Player* pPlayer, Item* _Item, SpellCastTargets if (!MinionList.empty()) { if (MinionList.size() < 5) - { return false; - } else { //This should be sent to the player as red text. @@ -230,12 +223,11 @@ bool ItemUse_item_harvesters_gift(Player* pPlayer, Item* _Item, SpellCastTargets return true; } } - else return false; + else + return false; } else - { return true; - } } void AddSC_item_scripts() diff --git a/src/bindings/scripts/scripts/world/mob_generic_creature.cpp b/src/bindings/scripts/scripts/world/mob_generic_creature.cpp index 4d53ba575de..f7fbfb32742 100644 --- a/src/bindings/scripts/scripts/world/mob_generic_creature.cpp +++ b/src/bindings/scripts/scripts/world/mob_generic_creature.cpp @@ -57,7 +57,7 @@ struct TRINITY_DLL_DECL generic_creatureAI : public ScriptedAI //Buff timer (only buff when we are alive and not in combat if (!m_creature->isInCombat() && m_creature->isAlive()) - if (BuffTimer < diff) + if (BuffTimer <= diff) { //Find a spell that targets friendly and applies an aura (these are generally buffs) SpellEntry const *info = SelectSpell(m_creature, -1, -1, SELECT_TARGET_ANY_FRIEND, 0, 0, 0, 0, SELECT_EFFECT_AURA); @@ -74,7 +74,7 @@ struct TRINITY_DLL_DECL generic_creatureAI : public ScriptedAI BuffTimer = 600000; }//Try agian in 30 seconds else BuffTimer = 30000; - }else BuffTimer -= diff; + } else BuffTimer -= diff; //Return since we have no target if (!UpdateVictim()) @@ -175,7 +175,7 @@ struct TRINITY_DLL_DECL trigger_periodicAI : public NullCreatureAI void UpdateAI(const uint32 diff) { - if (timer < diff) + if (timer <= diff) { if (spell) me->CastSpell(me, spell, true); diff --git a/src/bindings/scripts/scripts/world/npcs_special.cpp b/src/bindings/scripts/scripts/world/npcs_special.cpp index 5ca874c09d3..434eec9f4c9 100644 --- a/src/bindings/scripts/scripts/world/npcs_special.cpp +++ b/src/bindings/scripts/scripts/world/npcs_special.cpp @@ -191,7 +191,7 @@ struct TRINITY_DLL_DECL npc_air_force_botsAI : public ScriptedAI Aura* pMarkAura = pWho->GetAura(SPELL_GUARDS_MARK, 0); if (pMarkAura) { - // the target wasn't able to move out of our range within 25 seconds + // the pTarget wasn't able to move out of our range within 25 seconds if (!pLastSpawnedGuard) { pLastSpawnedGuard = SummonGuard(); @@ -278,11 +278,11 @@ struct TRINITY_DLL_DECL npc_chicken_cluckAI : public ScriptedAI // Reset flags after a certain time has passed so that the next player has to start the 'event' again if (m_creature->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER)) { - if (ResetFlagTimer < diff) + if (ResetFlagTimer <= diff) { EnterEvadeMode(); return; - }else ResetFlagTimer -= diff; + } else ResetFlagTimer -= diff; } if (UpdateVictim()) @@ -373,7 +373,7 @@ struct TRINITY_DLL_DECL npc_dancing_flamesAI : public ScriptedAI active = true; can_iteract = 3500; m_creature->HandleEmoteCommand(EMOTE_ONESHOT_DANCE); - }else can_iteract -= diff; + } else can_iteract -= diff; } } @@ -732,7 +732,7 @@ void npc_doctorAI::UpdateAI(const uint32 diff) if (Event) { - if (SummonPatient_Timer < diff) + if (SummonPatient_Timer <= diff) { Creature* Patient = NULL; Location* Point = NULL; @@ -771,7 +771,7 @@ void npc_doctorAI::UpdateAI(const uint32 diff) } SummonPatient_Timer = 10000; SummonPatientCount++; - }else SummonPatient_Timer -= diff; + } else SummonPatient_Timer -= diff; } } @@ -989,7 +989,7 @@ struct TRINITY_DLL_DECL npc_garments_of_questsAI : public npc_escortAI EnterEvadeMode(); //something went wrong RunAwayTimer = 30000; - }else RunAwayTimer -= diff; + } else RunAwayTimer -= diff; } npc_escortAI::UpdateAI(diff); @@ -1414,7 +1414,7 @@ struct TRINITY_DLL_DECL npc_tonk_mineAI : public ScriptedAI void UpdateAI(const uint32 diff) { - if (ExplosionTimer < diff) + if (ExplosionTimer <= diff) { m_creature->CastSpell(m_creature, SPELL_TONK_MINE_DETONATE, true); m_creature->setDeathState(DEAD); // unsummon it @@ -1513,7 +1513,7 @@ struct TRINITY_DLL_DECL npc_snake_trap_serpentsAI : public ScriptedAI m_creature->SetStatFloatValue(UNIT_FIELD_RANGED_ATTACK_POWER , Info->attackpower); } - //Redefined for random target selection: + //Redefined for random pTarget selection: void MoveInLineOfSight(Unit *who) { if (!m_creature->getVictim() && who->isTargetableForAttack() && (m_creature->IsHostileTo(who)) && who->isInAccessiblePlaceFor(m_creature)) @@ -1553,7 +1553,7 @@ struct TRINITY_DLL_DECL npc_snake_trap_serpentsAI : public ScriptedAI return; } - if (SpellTimer < diff) + if (SpellTimer <= diff) { if (IsViper) //Viper { @@ -1576,7 +1576,7 @@ struct TRINITY_DLL_DECL npc_snake_trap_serpentsAI : public ScriptedAI DoCast(m_creature->getVictim(),SPELL_DEADLY_POISON); SpellTimer = VENOMOUS_SNAKE_TIMER + (rand() %5)*100; } - }else SpellTimer-=diff; + } else SpellTimer-=diff; DoMeleeAttackIfReady(); } }; @@ -1614,7 +1614,7 @@ struct TRINITY_DLL_DECL mob_mojoAI : public ScriptedAI { if (m_creature->HasAura(20372,0)) { - if (hearts<diff) + if (hearts<= diff) { m_creature->RemoveAurasDueToSpell(20372); hearts = 15000; @@ -1837,7 +1837,7 @@ struct TRINITY_DLL_DECL npc_training_dummy : Scripted_NoMovementAI { EnterEvadeMode(); ResetTimer = 10000; - }else ResetTimer -= diff; + } else ResetTimer -= diff; return; } void MoveInLineOfSight(Unit *who){return;} diff --git a/src/game/SharedDefines.h b/src/game/SharedDefines.h index adc5f5ce78a..8fbd95403c3 100644 --- a/src/game/SharedDefines.h +++ b/src/game/SharedDefines.h @@ -78,7 +78,7 @@ enum Classes CLASS_SHAMAN = 7, CLASS_MAGE = 8, CLASS_WARLOCK = 9, - // CLASS_UNK2 = 10,unused + //CLASS_UNK = 10, CLASS_DRUID = 11, }; |