diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/scripts/northrend/gundrak/boss_drakkari_colossus.cpp | 26 | ||||
| -rw-r--r-- | src/scripts/northrend/gundrak/boss_eck.cpp | 28 | ||||
| -rw-r--r-- | src/scripts/northrend/gundrak/boss_gal_darah.cpp | 99 | ||||
| -rw-r--r-- | src/scripts/northrend/gundrak/boss_moorabi.cpp | 42 | ||||
| -rw-r--r-- | src/scripts/northrend/gundrak/boss_slad_ran.cpp | 54 | ||||
| -rw-r--r-- | src/scripts/northrend/gundrak/gundrak.h | 2 | ||||
| -rw-r--r-- | src/scripts/northrend/gundrak/instance_gundrak.cpp | 2 |
7 files changed, 129 insertions, 124 deletions
diff --git a/src/scripts/northrend/gundrak/boss_drakkari_colossus.cpp b/src/scripts/northrend/gundrak/boss_drakkari_colossus.cpp index 1665f50a731..1f63bb3ef60 100644 --- a/src/scripts/northrend/gundrak/boss_drakkari_colossus.cpp +++ b/src/scripts/northrend/gundrak/boss_drakkari_colossus.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2010 TrinityCore <http://www.trinitycore.org/> + * Copyright (C) 2009 - 2010 TrinityCore <http://www.trinitycore.org/> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -59,7 +59,7 @@ struct boss_drakkari_colossusAI : public ScriptedAI m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); m_creature->clearUnitState(UNIT_STAT_STUNNED | UNIT_STAT_ROOT); m_creature->SetReactState(REACT_PASSIVE); - MightyBlowTimer = 10000; + MightyBlowTimer = 10*IN_MILISECONDS; bHealth = false; bHealth1 = false; } @@ -96,7 +96,7 @@ struct boss_drakkari_colossusAI : public ScriptedAI if (!UpdateVictim()) return; - if (!bHealth && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() <= 50 && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() >= 6) + if (!bHealth && HealthBelowPct(50) && !HealthBelowPct(6)) { CreatureState(m_creature, false); DoCast(m_creature,SPELL_FREEZE_ANIM); @@ -104,7 +104,7 @@ struct boss_drakkari_colossusAI : public ScriptedAI bHealth = true; } - if (!bHealth1 && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() <= 5) + if (!bHealth1 && HealthBelowPct(5)) { DoCast(m_creature,SPELL_EMERGE); CreatureState(m_creature, false); @@ -115,7 +115,7 @@ struct boss_drakkari_colossusAI : public ScriptedAI if (MightyBlowTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_MIGHTY_BLOW, true); - MightyBlowTimer = 10000; + MightyBlowTimer = 10*IN_MILISECONDS; } else MightyBlowTimer -= diff; if (!m_creature->hasUnitState(UNIT_STAT_STUNNED)) @@ -130,7 +130,7 @@ struct boss_drakkari_colossusAI : public ScriptedAI void JustSummoned(Creature* pSummon) { - if (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() <= 5) + if (HealthBelowPct(5)) pSummon->DealDamage(pSummon, pSummon->GetHealth() * 0.5 , NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); pSummon->AI()->AttackStart(m_creature->getVictim()); } @@ -160,7 +160,7 @@ struct boss_drakkari_elementalAI : public ScriptedAI { if (pColossus) CAST_AI(boss_drakkari_colossusAI, pColossus->AI())->CreatureState(m_creature, true); - uiSurgeTimer = 7000; + uiSurgeTimer = 7*IN_MILISECONDS; bGoToColossus = false; } @@ -184,7 +184,7 @@ struct boss_drakkari_elementalAI : public ScriptedAI if(!UpdateVictim()) return; - if(!bGoToColossus && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() <= 50 && pColossus->GetHealth()*100 / pColossus->GetMaxHealth() >= 6) + if(!bGoToColossus && HealthBelowPct(50) && !CAST_AI(boss_drakkari_colossusAI,pColossus->AI())->HealthBelowPct(6)) { m_creature->InterruptNonMeleeSpells(true); if (pColossus) @@ -195,7 +195,7 @@ struct boss_drakkari_elementalAI : public ScriptedAI if (uiSurgeTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_SURGE); - uiSurgeTimer = 7000; + uiSurgeTimer = 7*IN_MILISECONDS; } else uiSurgeTimer -= diff; DoMeleeAttackIfReady(); @@ -225,8 +225,8 @@ struct npc_living_mojoAI : public ScriptedAI void Reset() { - uiMojoWaveTimer = 2000; - uiMojoPuddleTimer = 7000; + uiMojoWaveTimer = 2*IN_MILISECONDS; + uiMojoPuddleTimer = 7*IN_MILISECONDS; } void EnterCombat(Unit* who) @@ -266,13 +266,13 @@ struct npc_living_mojoAI : public ScriptedAI if (uiMojoWaveTimer <= diff) { DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_MOJO_WAVE, H_SPELL_MOJO_WAVE)); - uiMojoWaveTimer = 15000; + uiMojoWaveTimer = 15*IN_MILISECONDS; } else uiMojoWaveTimer -= diff; if (uiMojoPuddleTimer <= diff) { DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_MOJO_PUDDLE, H_SPELL_MOJO_PUDDLE)); - uiMojoPuddleTimer = 18000; + uiMojoPuddleTimer = 18*IN_MILISECONDS; } else uiMojoPuddleTimer -= diff; DoMeleeAttackIfReady(); diff --git a/src/scripts/northrend/gundrak/boss_eck.cpp b/src/scripts/northrend/gundrak/boss_eck.cpp index cac1bfd8f3e..383b93126c2 100644 --- a/src/scripts/northrend/gundrak/boss_eck.cpp +++ b/src/scripts/northrend/gundrak/boss_eck.cpp @@ -1,5 +1,5 @@ /* -* Copyright (C) 2009-2010 TrinityCore <http://www.trinitycore.org/> +* Copyright (C) 2009 - 2010 TrinityCore <http://www.trinitycore.org/> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,11 +21,11 @@ enum Spells { - SPELL_ECK_BERSERK = 55816, //Eck goes berserk, increasing his attack speed by 150% and all damage he deals by 500%. - SPELL_ECK_BITE = 55813, //Eck bites down hard, inflicting 150% of his normal damage to an enemy. - SPELL_ECK_SPIT = 55814, //Eck spits toxic bile at enemies in a cone in front of him, inflicting 2970 Nature damage and draining 220 mana every 1 sec for 3 sec. - SPELL_ECK_SPRING_1 = 55815, //Eck leaps at a distant target. --> Drops aggro and charges a random player. Tank can simply taunt him back. - SPELL_ECK_SPRING_2 = 55837 //Eck leaps at a distant target. + SPELL_ECK_BERSERK = 55816, //Eck goes berserk, increasing his attack speed by 150% and all damage he deals by 500%. + SPELL_ECK_BITE = 55813, //Eck bites down hard, inflicting 150% of his normal damage to an enemy. + SPELL_ECK_SPIT = 55814, //Eck spits toxic bile at enemies in a cone in front of him, inflicting 2970 Nature damage and draining 220 mana every 1 sec for 3 sec. + SPELL_ECK_SPRING_1 = 55815, //Eck leaps at a distant target. --> Drops aggro and charges a random player. Tank can simply taunt him back. + SPELL_ECK_SPRING_2 = 55837 //Eck leaps at a distant target. }; static Position EckSpawnPoint = { 1643.877930, 936.278015, 107.204948, 0.668432 }; @@ -48,10 +48,10 @@ struct boss_eckAI : public ScriptedAI void Reset() { - uiBerserkTimer = 60000 + rand()%30000; //60-90 secs according to wowwiki - uiBiteTimer = 5000; - uiSpitTimer = 10000; - uiSpringTimer = 8000; + uiBerserkTimer = urand(60*IN_MILISECONDS,90*IN_MILISECONDS); //60-90 secs according to wowwiki + uiBiteTimer = 5*IN_MILISECONDS; + uiSpitTimer = 10*IN_MILISECONDS; + uiSpringTimer = 8*IN_MILISECONDS; bBerserk = false; @@ -74,13 +74,13 @@ struct boss_eckAI : public ScriptedAI if (uiBiteTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_ECK_BITE); - uiBiteTimer = 8000 + rand()%4000; + uiBiteTimer = urand(8*IN_MILISECONDS,12*IN_MILISECONDS); } else uiBiteTimer -= diff; if (uiSpitTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_ECK_SPIT); - uiSpitTimer = 6000 + rand()%8000; + uiSpitTimer = urand(6*IN_MILISECONDS,14*IN_MILISECONDS); } else uiSpitTimer -= diff; if (uiSpringTimer <= diff) @@ -89,7 +89,7 @@ struct boss_eckAI : public ScriptedAI if(pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) { DoCast(pTarget, RAND(SPELL_ECK_SPRING_1, SPELL_ECK_SPRING_2)); - uiSpringTimer = 5000 + rand()%10000; + uiSpringTimer = urand(5*IN_MILISECONDS,10*IN_MILISECONDS); } } else uiSpringTimer -= diff; @@ -104,7 +104,7 @@ struct boss_eckAI : public ScriptedAI else { uiBerserkTimer -= diff; - if (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 20) + if (HealthBelowPct(20)) { DoCast(m_creature, SPELL_ECK_BERSERK); bBerserk = true; diff --git a/src/scripts/northrend/gundrak/boss_gal_darah.cpp b/src/scripts/northrend/gundrak/boss_gal_darah.cpp index eefd3b9c105..4bf66f47526 100644 --- a/src/scripts/northrend/gundrak/boss_gal_darah.cpp +++ b/src/scripts/northrend/gundrak/boss_gal_darah.cpp @@ -1,14 +1,21 @@ -/* Script Data Start -SDName: Boss gal_darah -SDAuthor: LordVanMartin -SD%Complete: -SDComment: -SDCategory: -Script Data End */ - -/*** SQL START *** -update creature_template set scriptname = '' where entry = ''; -*** SQL END ***/ +/* +* Copyright (C) 2009 - 2010 TrinityCore <http://www.trinitycore.org/> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + #include "ScriptedPch.h" #include "gundrak.h" @@ -32,22 +39,22 @@ enum Spells //Yells enum Yells { - SAY_AGGRO = -1604000, - SAY_SLAY_1 = -1604001, - SAY_SLAY_2 = -1604002, - SAY_SLAY_3 = -1604003, - SAY_DEATH = -1604004, - SAY_SUMMON_RHINO_1 = -1604005, - SAY_SUMMON_RHINO_2 = -1604006, - SAY_SUMMON_RHINO_3 = -1604007, - SAY_TRANSFORM_1 = -1604008, //Phase change - SAY_TRANSFORM_2 = -1604009 + SAY_AGGRO = -1604000, + SAY_SLAY_1 = -1604001, + SAY_SLAY_2 = -1604002, + SAY_SLAY_3 = -1604003, + SAY_DEATH = -1604004, + SAY_SUMMON_RHINO_1 = -1604005, + SAY_SUMMON_RHINO_2 = -1604006, + SAY_SUMMON_RHINO_3 = -1604007, + SAY_TRANSFORM_1 = -1604008, //Phase change + SAY_TRANSFORM_2 = -1604009 }; enum Achievements { - ACHIEVEMENT_WHAT_THE_ECK = 1864, - ACHIEVEMENT_SHARE_THE_LOVE = 2152 + ACHIEV_WHAT_THE_ECK = 1864, + ACHIEV_SHARE_THE_LOVE = 2152 }; @@ -80,12 +87,12 @@ struct boss_gal_darahAI : public ScriptedAI void Reset() { - uiStampedeTimer = 10000; - uiWhirlingSlashTimer = 20000; - uiPunctureTimer = 10000; - uiEnrageTimer = 15000; - uiImpalingChargeTimer = 20000; - uiStompTimer = 25000; + uiStampedeTimer = 10*IN_MILISECONDS; + uiWhirlingSlashTimer = 20*IN_MILISECONDS; + uiPunctureTimer = 10*IN_MILISECONDS; + uiEnrageTimer = 15*IN_MILISECONDS; + uiImpalingChargeTimer = 20*IN_MILISECONDS; + uiStompTimer = 25*IN_MILISECONDS; uiPhaseCounter = 0; lImpaledPlayers.clear(); @@ -126,13 +133,13 @@ struct boss_gal_darahAI : public ScriptedAI { DoCast(m_creature, SPELL_STAMPEDE); DoScriptText(RAND(SAY_SUMMON_RHINO_1,SAY_SUMMON_RHINO_2,SAY_SUMMON_RHINO_3),m_creature); - uiStampedeTimer = 15000; + uiStampedeTimer = 15*IN_MILISECONDS; } else uiStampedeTimer -= diff; if (uiWhirlingSlashTimer <= diff) { DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_WHIRLING_SLASH, H_SPELL_WHIRLING_SLASH)); - uiWhirlingSlashTimer = 20000; + uiWhirlingSlashTimer = 20*IN_MILISECONDS; ++uiPhaseCounter; } else uiWhirlingSlashTimer -= diff; } @@ -150,19 +157,19 @@ struct boss_gal_darahAI : public ScriptedAI if (uiPunctureTimer <= diff) { DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_PUNCTURE, H_SPELL_PUNCTURE)); - uiPunctureTimer = 8000; + uiPunctureTimer = 8*IN_MILISECONDS; } else uiPunctureTimer -= diff; if (uiEnrageTimer <= diff) { DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_ENRAGE, H_SPELL_ENRAGE)); - uiEnrageTimer = 20000; + uiEnrageTimer = 20*IN_MILISECONDS; } else uiEnrageTimer -= diff; if (uiStompTimer <= diff) { DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_STOMP, H_SPELL_STOMP)); - uiStompTimer = 20000; + uiStompTimer = 20*IN_MILISECONDS; } else uiStompTimer -= diff; if (uiImpalingChargeTimer <= diff) @@ -172,7 +179,7 @@ struct boss_gal_darahAI : public ScriptedAI DoCast(pTarget, DUNGEON_MODE(SPELL_IMPALING_CHARGE, H_SPELL_IMPALING_CHARGE)); lImpaledPlayers.insert(pTarget->GetGUID()); } - uiImpalingChargeTimer = 30000; + uiImpalingChargeTimer = 30*IN_MILISECONDS; ++uiPhaseCounter; } else uiImpalingChargeTimer -= diff; } @@ -186,27 +193,25 @@ struct boss_gal_darahAI : public ScriptedAI { DoScriptText(SAY_DEATH, m_creature); - if (IsHeroic()) + if (pInstance) { - AchievementEntry const *achievWhatTheEck = GetAchievementStore()->LookupEntry(ACHIEVEMENT_WHAT_THE_ECK); - if (achievWhatTheEck) + if (IsHeroic()) { - Map* pMap = m_creature->GetMap(); - if (pMap && pMap->IsDungeon()) + if (lImpaledPlayers.size() == 5) + pInstance->DoCompleteAchievement(ACHIEV_SHARE_THE_LOVE); + + AchievementEntry const *achievWhatTheEck = GetAchievementStore()->LookupEntry(ACHIEV_WHAT_THE_ECK); + if (achievWhatTheEck) { - Map::PlayerList const &players = pMap->GetPlayers(); + Map::PlayerList const &players = pInstance->instance->GetPlayers(); for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) if (itr->getSource()->HasAura(SPELL_ECK_RESIDUE)) itr->getSource()->CompletedAchievement(achievWhatTheEck); } } - } - - if (pInstance && IsHeroic() && lImpaledPlayers.size() == 5) - pInstance->DoCompleteAchievement(ACHIEVEMENT_SHARE_THE_LOVE); - - if (pInstance) + pInstance->SetData(DATA_GAL_DARAH_EVENT, DONE); + } } void KilledUnit(Unit *victim) diff --git a/src/scripts/northrend/gundrak/boss_moorabi.cpp b/src/scripts/northrend/gundrak/boss_moorabi.cpp index e2843eb2ecb..f0f972fe078 100644 --- a/src/scripts/northrend/gundrak/boss_moorabi.cpp +++ b/src/scripts/northrend/gundrak/boss_moorabi.cpp @@ -1,5 +1,5 @@ /* -* Copyright (C) 2009-2010 TrinityCore <http://www.trinitycore.org/> +* Copyright (C) 2009 - 2010 TrinityCore <http://www.trinitycore.org/> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,7 +25,7 @@ enum eSpells SPELL_GROUND_TREMOR = 55142, SPELL_NUMBING_SHOUT = 55106, SPELL_DETERMINED_GORE = 55102, - SPELL_DETERMINED_GORE_1 = 59444, + H_SPELL_DETERMINED_GORE = 59444, SPELL_QUAKE = 55101, SPELL_NUMBING_ROAR = 55100, SPELL_MOJO_FRENZY = 55163, @@ -34,19 +34,19 @@ enum eSpells enum eArchivements { - ACHIEVEMENT_LESS_RABI = 2040 + ACHIEV_LESS_RABI = 2040 }; enum eSays { - SAY_AGGRO = -1604010, - //SAY_SLAY_1 = -1604011, // not in db - SAY_SLAY_2 = -1604012, - SAY_SLAY_3 = -1604013, - SAY_DEATH = -1604014, - SAY_TRANSFORM = -1604015, - SAY_QUAKE = -1604016, - EMOTE_TRANSFORM = -1604017 + SAY_AGGRO = -1604010, + //SAY_SLAY_1 = -1604011, // not in db + SAY_SLAY_2 = -1604012, + SAY_SLAY_3 = -1604013, + SAY_DEATH = -1604014, + SAY_TRANSFORM = -1604015, + SAY_QUAKE = -1604016, + EMOTE_TRANSFORM = -1604017 }; struct boss_moorabiAI : public ScriptedAI @@ -67,10 +67,10 @@ struct boss_moorabiAI : public ScriptedAI void Reset() { - uiGroundTremorTimer = 18000; - uiNumblingShoutTimer = 10000; - uiDeterminedStabTimer = 20000; - uiTransformationTImer = 12000; + uiGroundTremorTimer = 18*IN_MILISECONDS; + uiNumblingShoutTimer = 10*IN_MILISECONDS; + uiDeterminedStabTimer = 20*IN_MILISECONDS; + uiTransformationTImer = 12*IN_MILISECONDS; bPhase = false; if (pInstance) @@ -105,7 +105,7 @@ struct boss_moorabiAI : public ScriptedAI DoCast(m_creature->getVictim(), SPELL_QUAKE, true); else DoCast(m_creature->getVictim(), SPELL_GROUND_TREMOR, true); - uiGroundTremorTimer = 10000; + uiGroundTremorTimer = 10*IN_MILISECONDS; } else uiGroundTremorTimer -= uiDiff; if (uiNumblingShoutTimer <= uiDiff) @@ -114,16 +114,16 @@ struct boss_moorabiAI : public ScriptedAI DoCast(m_creature->getVictim(), SPELL_NUMBING_ROAR, true); else DoCast(m_creature->getVictim(), SPELL_NUMBING_SHOUT, true); - uiNumblingShoutTimer = 10000; + uiNumblingShoutTimer = 10*IN_MILISECONDS; } else uiNumblingShoutTimer -=uiDiff; if (uiDeterminedStabTimer <= uiDiff) { if (bPhase) - DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_DETERMINED_GORE, SPELL_DETERMINED_GORE_1)); + DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_DETERMINED_GORE, H_SPELL_DETERMINED_GORE)); else DoCast(m_creature->getVictim(), SPELL_DETERMINED_STAB, true); - uiDeterminedStabTimer = 8000; + uiDeterminedStabTimer = 8*IN_MILISECONDS; } else uiDeterminedStabTimer -=uiDiff; if (!bPhase && uiTransformationTImer <= uiDiff) @@ -131,7 +131,7 @@ struct boss_moorabiAI : public ScriptedAI DoScriptText(EMOTE_TRANSFORM, m_creature); DoScriptText(SAY_TRANSFORM, m_creature); DoCast(m_creature, SPELL_TRANSFORMATION, false); - uiTransformationTImer = 10000; + uiTransformationTImer = 10*IN_MILISECONDS; } else uiTransformationTImer -= uiDiff; DoMeleeAttackIfReady(); @@ -146,7 +146,7 @@ struct boss_moorabiAI : public ScriptedAI pInstance->SetData(DATA_MOORABI_EVENT, DONE); if (IsHeroic() && !bPhase) - pInstance->DoCompleteAchievement(ACHIEVEMENT_LESS_RABI); + pInstance->DoCompleteAchievement(ACHIEV_LESS_RABI); } } diff --git a/src/scripts/northrend/gundrak/boss_slad_ran.cpp b/src/scripts/northrend/gundrak/boss_slad_ran.cpp index 521eba5d1e7..143d1f095f6 100644 --- a/src/scripts/northrend/gundrak/boss_slad_ran.cpp +++ b/src/scripts/northrend/gundrak/boss_slad_ran.cpp @@ -1,5 +1,5 @@ /* -* Copyright (C) 2009-2010 TrinityCore <http://www.trinitycore.org/> +* Copyright (C) 2009 - 2010 TrinityCore <http://www.trinitycore.org/> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -33,28 +33,28 @@ enum Spells //Yell enum Yells { - SAY_AGGRO = -1604017, - SAY_SLAY_1 = -1604018, - SAY_SLAY_2 = -1604019, - SAY_SLAY_3 = -1604020, - SAY_DEATH = -1604021, - SAY_SUMMON_SNAKES = -1604022, - SAY_SUMMON_CONSTRICTORS = -1604023 + SAY_AGGRO = -1604017, + SAY_SLAY_1 = -1604018, + SAY_SLAY_2 = -1604019, + SAY_SLAY_3 = -1604020, + SAY_DEATH = -1604021, + SAY_SUMMON_SNAKES = -1604022, + SAY_SUMMON_CONSTRICTORS = -1604023 }; //Creatures enum Creatures { - CREATURE_SNAKE = 29680, - CREATURE_CONSTRICTORS = 29713 + CREATURE_SNAKE = 29680, + CREATURE_CONSTRICTORS = 29713 }; //Creatures' spells enum ConstrictorSpells { - SPELL_GRIP_OF_SLAD_RAN = 55093, - SPELL_VENOMOUS_BITE = 54987, - H_SPELL_VENOMOUS_BITE = 58996 + SPELL_GRIP_OF_SLAD_RAN = 55093, + SPELL_VENOMOUS_BITE = 54987, + H_SPELL_VENOMOUS_BITE = 58996 }; static Position SpawnLoc[]= @@ -86,10 +86,10 @@ struct boss_slad_ranAI : public ScriptedAI void Reset() { - uiPoisonNovaTimer = 10000; - uiPowerfullBiteTimer = 3000; - uiVenomBoltTimer = 15000; - uiSpawnTimer = 5000; + uiPoisonNovaTimer = 10*IN_MILISECONDS; + uiPowerfullBiteTimer = 3*IN_MILISECONDS; + uiVenomBoltTimer = 15*IN_MILISECONDS; + uiSpawnTimer = 5*IN_MILISECONDS; uiPhase = 0; lSummons.DespawnAll(); @@ -115,19 +115,19 @@ struct boss_slad_ranAI : public ScriptedAI if (uiPoisonNovaTimer <= diff) { DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_POISON_NOVA, H_SPELL_POISON_NOVA)); - uiPoisonNovaTimer = 15000; + uiPoisonNovaTimer = 15*IN_MILISECONDS; } else uiPoisonNovaTimer -= diff; if (uiPowerfullBiteTimer <= diff) { DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_POWERFULL_BITE, H_SPELL_POWERFULL_BITE)); - uiPowerfullBiteTimer = 10000; + uiPowerfullBiteTimer = 10*IN_MILISECONDS; } else uiPowerfullBiteTimer -= diff; if (uiVenomBoltTimer <= diff) { DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_VENOM_BOLT, H_SPELL_VENOM_BOLT)); - uiVenomBoltTimer = 10000; + uiVenomBoltTimer = 10*IN_MILISECONDS; } else uiVenomBoltTimer -= diff; if (uiPhase) @@ -136,11 +136,11 @@ struct boss_slad_ranAI : public ScriptedAI { if (uiPhase == 1) for (uint8 i = 0; i < DUNGEON_MODE(3, 5); ++i) - m_creature->SummonCreature(CREATURE_SNAKE, SpawnLoc[i], TEMPSUMMON_CORPSE_TIMED_DESPAWN,20000); + m_creature->SummonCreature(CREATURE_SNAKE, SpawnLoc[i], TEMPSUMMON_CORPSE_TIMED_DESPAWN,20*IN_MILISECONDS); if (uiPhase == 2) for (uint8 i = 0; i < DUNGEON_MODE(3, 5); ++i) - m_creature->SummonCreature(CREATURE_CONSTRICTORS, SpawnLoc[i], TEMPSUMMON_CORPSE_TIMED_DESPAWN,20000); - uiSpawnTimer = 5000; + m_creature->SummonCreature(CREATURE_CONSTRICTORS, SpawnLoc[i], TEMPSUMMON_CORPSE_TIMED_DESPAWN,20*IN_MILISECONDS); + uiSpawnTimer = 5*IN_MILISECONDS; } else uiSpawnTimer -= diff; } @@ -187,7 +187,7 @@ struct mob_slad_ran_constrictorAI : public ScriptedAI void Reset() { - uiGripOfSladRanTimer = 1000; + uiGripOfSladRanTimer = 1*IN_MILISECONDS; } void UpdateAI(const uint32 diff) @@ -197,7 +197,7 @@ struct mob_slad_ran_constrictorAI : public ScriptedAI if (uiGripOfSladRanTimer <= diff) { DoCast(m_creature->getVictim(), SPELL_GRIP_OF_SLAD_RAN); - uiGripOfSladRanTimer = 5000; + uiGripOfSladRanTimer = 5*IN_MILISECONDS; } else uiGripOfSladRanTimer -= diff; } @@ -214,7 +214,7 @@ struct mob_slad_ran_viperAI : public ScriptedAI void Reset() { - uiVenomousBiteTimer = 2000; + uiVenomousBiteTimer = 2*IN_MILISECONDS; } void UpdateAI(const uint32 diff) @@ -225,7 +225,7 @@ struct mob_slad_ran_viperAI : public ScriptedAI if (uiVenomousBiteTimer <= diff) { DoCast(m_creature->getVictim(), DUNGEON_MODE(SPELL_VENOMOUS_BITE, H_SPELL_VENOMOUS_BITE)); - uiVenomousBiteTimer = 10000; + uiVenomousBiteTimer = 10*IN_MILISECONDS; } else uiVenomousBiteTimer -= diff; } }; diff --git a/src/scripts/northrend/gundrak/gundrak.h b/src/scripts/northrend/gundrak/gundrak.h index 17f0097bbf7..a443aa4e698 100644 --- a/src/scripts/northrend/gundrak/gundrak.h +++ b/src/scripts/northrend/gundrak/gundrak.h @@ -1,5 +1,5 @@ /* -* Copyright (C) 2009-2010 TrinityCore <http://www.trinitycore.org/> +* Copyright (C) 2009 - 2010 TrinityCore <http://www.trinitycore.org/> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/scripts/northrend/gundrak/instance_gundrak.cpp b/src/scripts/northrend/gundrak/instance_gundrak.cpp index 88043730ae5..e96495eee26 100644 --- a/src/scripts/northrend/gundrak/instance_gundrak.cpp +++ b/src/scripts/northrend/gundrak/instance_gundrak.cpp @@ -1,5 +1,5 @@ /* -* Copyright (C) 2009-2010 TrinityCore <http://www.trinitycore.org/> +* Copyright (C) 2009 - 2010 TrinityCore <http://www.trinitycore.org/> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by |