aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Outland
diff options
context:
space:
mode:
authorVincent-Michael <Vincent_Michael@gmx.de>2014-07-23 06:32:44 +0200
committerVincent-Michael <Vincent_Michael@gmx.de>2014-07-23 06:32:44 +0200
commit8bc519a308ab78b1d6b243f49b332ddd9dd4ae17 (patch)
tree95c92ba85108b8df3b9f58027034accba018a9d1 /src/server/scripts/Outland
parent059f3030b4b842a241e2f526b60f5a48956ee5e6 (diff)
parent1bebe15698bea8ff314bfdf93b205e9dc17aeced (diff)
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
Diffstat (limited to 'src/server/scripts/Outland')
-rw-r--r--src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp14
-rw-r--r--src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp6
-rw-r--r--src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp4
-rw-r--r--src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp10
-rw-r--r--src/server/scripts/Outland/BlackTemple/boss_illidan.cpp10
-rw-r--r--src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp10
-rw-r--r--src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp8
-rw-r--r--src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp4
-rw-r--r--src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp2
-rw-r--r--src/server/scripts/Outland/BlackTemple/illidari_council.cpp2
-rw-r--r--src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp18
-rw-r--r--src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp38
-rw-r--r--src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp8
-rw-r--r--src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp2
-rw-r--r--src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp10
-rw-r--r--src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp4
-rw-r--r--src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp8
-rw-r--r--src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp6
-rw-r--r--src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp6
-rw-r--r--src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp6
-rw-r--r--src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp4
-rw-r--r--src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp16
-rw-r--r--src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp6
-rw-r--r--src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp10
-rw-r--r--src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp6
-rw-r--r--src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp2
-rw-r--r--src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp12
-rw-r--r--src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp4
-rw-r--r--src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp6
-rw-r--r--src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp8
-rw-r--r--src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp16
-rw-r--r--src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp2
-rw-r--r--src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp4
-rw-r--r--src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp2
-rw-r--r--src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp10
-rw-r--r--src/server/scripts/Outland/zone_blades_edge_mountains.cpp8
-rw-r--r--src/server/scripts/Outland/zone_nagrand.cpp6
-rw-r--r--src/server/scripts/Outland/zone_netherstorm.cpp10
-rw-r--r--src/server/scripts/Outland/zone_shadowmoon_valley.cpp34
-rw-r--r--src/server/scripts/Outland/zone_terokkar_forest.cpp14
40 files changed, 178 insertions, 178 deletions
diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
index ea877435acf..2b3928f322a 100644
--- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
+++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
@@ -190,9 +190,9 @@ public:
soulholder = 0;
soulclass = 0;
- Fear_timer = 15000 + rand()% 5000;
+ Fear_timer = 15000 + rand32() % 5000;
Ribbon_of_Souls_timer = 5000;
- StolenSoul_Timer = 25000 + rand()% 10000;
+ StolenSoul_Timer = 25000 + rand32() % 10000;
Avatar_summoned = false;
}
@@ -234,7 +234,7 @@ public:
void KilledUnit(Unit* /*victim*/) override
{
- if (rand()%2)
+ if (rand32() % 2)
return;
Talk(SAY_SLAY);
@@ -261,7 +261,7 @@ public:
DoCast(me, SPELL_SUMMON_AVATAR);
Avatar_summoned = true;
- StolenSoul_Timer = 15000 + rand()% 15000;
+ StolenSoul_Timer = 15000 + rand32() % 15000;
}
if (StolenSoul_Timer <= diff)
@@ -282,7 +282,7 @@ public:
DoCast(target, SPELL_STOLEN_SOUL);
me->SummonCreature(ENTRY_STOLEN_SOUL, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000);
- StolenSoul_Timer = 20000 + rand()% 10000;
+ StolenSoul_Timer = 20000 + rand32() % 10000;
} else StolenSoul_Timer = 1000;
}
} else StolenSoul_Timer -= diff;
@@ -292,13 +292,13 @@ public:
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(target, SPELL_RIBBON_OF_SOULS);
- Ribbon_of_Souls_timer = 5000 + (rand()%20 * 1000);
+ Ribbon_of_Souls_timer = 5000 + (rand32() % 20 * 1000);
} else Ribbon_of_Souls_timer -= diff;
if (Fear_timer <= diff)
{
DoCast(me, SPELL_SOUL_SCREAM);
- Fear_timer = 15000 + rand()% 15000;
+ Fear_timer = 15000 + rand32() % 15000;
} else Fear_timer -= diff;
DoMeleeAttackIfReady();
diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
index 26e9df6620c..683b253d8a1 100644
--- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
+++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
@@ -118,7 +118,7 @@ public:
if (dist < 15)
me->AddAura(SPELL_INHIBITMAGIC, i_pl);
}
- Inhibitmagic_Timer = 3000+(rand()%1000);
+ Inhibitmagic_Timer = 3000 + (rand32() % 1000);
} else Inhibitmagic_Timer -= diff;
//Return since we have no target
@@ -151,7 +151,7 @@ public:
me->SummonCreature(NPC_FOCUS_FIRE, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 5500);
Talk(EMOTE_FOCUSED, target);
}
- FocusFire_Timer = 15000+(rand()%5000);
+ FocusFire_Timer = 15000 + (rand32() % 5000);
} else FocusFire_Timer -= diff;
DoMeleeAttackIfReady();
@@ -181,7 +181,7 @@ public:
void Reset() override
{
- FieryBlast_Timer = 3000+(rand()%1000);
+ FieryBlast_Timer = 3000 + (rand32() % 1000);
fiery1 = fiery2 = true;
}
diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp
index 2a359419e79..f7f901a9349 100644
--- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp
@@ -61,7 +61,7 @@ public:
void Reset() override
{
- VoidBlast_Timer = 8000+rand()%15000;
+ VoidBlast_Timer = 8000 + rand32() % 15000;
DarkShell_Timer = 20000;
VoidBlast_Counter = 0;
}
@@ -97,7 +97,7 @@ public:
if (VoidBlast_Counter == 5)
{
- VoidBlast_Timer = 15000+rand()%10000;
+ VoidBlast_Timer = 15000 + rand32() % 10000;
VoidBlast_Counter = 0;
}
} else VoidBlast_Timer -= diff;
diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp
index cd53b5c18c1..9cb7505c015 100644
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp
@@ -66,7 +66,7 @@ public:
ArcaneVolley_Timer = 5000;
Sheep_Timer = 8000;
Blink_Timer = 35000;
- Slow_Timer = 15000+rand()%15000;
+ Slow_Timer = 15000 + rand32() % 15000;
Blink = false;
Intro = false;
ManaShield = false;
@@ -127,7 +127,7 @@ public:
if (ArcaneVolley_Timer <= diff)
{
DoCast(me, SPELL_ARCANE_VOLLEY);
- ArcaneVolley_Timer = 7000+rand()%5000;
+ ArcaneVolley_Timer = 7000 + rand32() % 5000;
} else ArcaneVolley_Timer -= diff;
if (Sheep_Timer <= diff)
@@ -142,7 +142,7 @@ public:
if (target)
DoCast(target, SPELL_POLYMORPH);
- Sheep_Timer = 15000+rand()%2500;
+ Sheep_Timer = 15000 + rand32() % 2500;
} else Sheep_Timer -= diff;
//may not be correct time to cast
@@ -157,7 +157,7 @@ public:
if (Slow_Timer <= diff)
{
DoCast(me, H_SPELL_SLOW);
- Slow_Timer = 15000+rand()%25000;
+ Slow_Timer = 15000 + rand32() % 25000;
} else Slow_Timer -= diff;
}
@@ -182,7 +182,7 @@ public:
DoCast(target, SPELL_BLINK_TELEPORT);
Blink = true;
}
- Blink_Timer = 35000+rand()%5000;
+ Blink_Timer = 35000 + rand32() % 5000;
} else Blink_Timer -= diff;
if (!Blink)
diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
index b1c3d607396..ec89acfb7b6 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
@@ -637,7 +637,7 @@ public:
break;
case PHASE_FLIGHT:
Timer[EVENT_FIREBALL] = 1000;
- if (!(rand()%4))
+ if (!(rand32() % 4))
Timer[EVENT_DARK_BARRAGE] = 10000;
Timer[EVENT_EYE_BLAST] = urand(10, 25) * 1000;
Timer[EVENT_MOVE_POINT] = urand(20, 40) * 1000;
@@ -993,7 +993,7 @@ public:
case EVENT_SHEAR:
// no longer exists in 3.0f.2
// DoCastVictim(SPELL_SHEAR);
- Timer[EVENT_SHEAR] = 25000 + (rand()%16 * 1000);
+ Timer[EVENT_SHEAR] = 25000 + (rand32() % 16 * 1000);
break;
case EVENT_FLAME_CRASH:
@@ -1062,7 +1062,7 @@ public:
case EVENT_MOVE_POINT:
Phase = PHASE_FLIGHT_SEQUENCE;
Timer[EVENT_FLIGHT_SEQUENCE] = 0; // do not start Event when changing hover point
- HoverPoint += (rand()%3 + 1);
+ HoverPoint += (rand32() % 3 + 1);
if (HoverPoint > 3)
HoverPoint -= 4;
me->GetMotionMaster()->MovePoint(0, HoverPosition[HoverPoint].x, HoverPosition[HoverPoint].y, HoverPosition[HoverPoint].z);
@@ -1254,7 +1254,7 @@ public:
if (!target || !me->IsWithinDistInMap(target, 80) || illidan->IsWithinDistInMap(target, 20))
{
- uint8 pos = rand()%4;
+ uint8 pos = rand32() % 4;
BlinkTo(HoverPosition[pos].x, HoverPosition[pos].y, HoverPosition[pos].z);
}
else
@@ -1720,7 +1720,7 @@ public:
{
float x, y, z;
me->GetPosition(x, y, z);
- Creature* Elite = me->SummonCreature(ILLIDARI_ELITE, x+rand()%10, y+rand()%10, z, 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 30000);
+ Creature* Elite = me->SummonCreature(ILLIDARI_ELITE, x + rand32() % 10, y + rand32() % 10, z, 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 30000);
// Creature* Elite = me->SummonCreature(ILLIDARI_ELITE, x, y, z, 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 30000);
if (Elite)
{
diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
index db3fcea35db..3415451fef5 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
@@ -155,7 +155,7 @@ public:
void TeleportPlayers()
{
- uint32 random = rand()%7;
+ uint32 random = rand32() % 7;
float X = TeleportPoint[random].x;
float Y = TeleportPoint[random].y;
float Z = TeleportPoint[random].z;
@@ -211,14 +211,14 @@ public:
uint32 Beam = CurrentBeam;
if (BeamCount > 3)
while (CurrentBeam == Beam)
- CurrentBeam = rand()%3;
+ CurrentBeam = rand32() % 3;
} else BeamTimer -= diff;
// Random Prismatic Shield every 15 seconds.
if (PrismaticShieldTimer <= diff)
{
- uint32 random = rand()%6;
+ uint32 random = rand32() % 6;
if (PrismaticAuras[random])
DoCast(me, PrismaticAuras[random]);
PrismaticShieldTimer = 15000;
@@ -264,13 +264,13 @@ public:
if (ShriekTimer <= diff)
{
DoCastVictim(SPELL_SILENCING_SHRIEK);
- ShriekTimer = 25000+rand()%10 * 1000;
+ ShriekTimer = 25000 + rand32() % 10 * 1000;
} else ShriekTimer -= diff;
if (SaberTimer <= diff)
{
DoCastVictim(SPELL_SABER_LASH);
- SaberTimer = 25000+rand()%10 * 1000;
+ SaberTimer = 25000 + rand32() % 10 * 1000;
} else SaberTimer -= diff;
//Enrage
diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
index 9b304c3cd7b..67d456286d5 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
@@ -205,7 +205,7 @@ public:
bool SummonSoul()
{
- uint32 random = rand()%6;
+ uint32 random = rand32() % 6;
float x = Coords[random].x;
float y = Coords[random].y;
@@ -478,7 +478,7 @@ public:
{
CastFixate();
FixateTimer = 5000;
- if (!(rand()%16))
+ if (!(rand32() % 16))
{
Talk(SUFF_SAY_AGGRO);
}
@@ -599,7 +599,7 @@ public:
me->InterruptNonMeleeSpells(false);
DoCastVictim(SPELL_DEADEN);
DeadenTimer = urand(25000, 35000);
- if (!(rand()%2))
+ if (!(rand32() % 2))
{
Talk(DESI_SAY_SPEC);
}
@@ -692,7 +692,7 @@ public:
{
DoCastVictim(SPELL_SOUL_SCREAM);
SoulScreamTimer = urand(9000, 11000);
- if (!(rand()%3))
+ if (!(rand32() % 3))
{
Talk(ANGER_SAY_SPEC);
}
diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
index 0d9537b8b7a..c2bf5966a5c 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
@@ -306,10 +306,10 @@ public:
switch (urand(0, 1))
{
case 0:
- coord += rand()%radius;
+ coord += rand32() % radius;
break;
case 1:
- coord -= rand()%radius;
+ coord -= rand32() % radius;
break;
}
return coord;
diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
index 2362f534b05..b9a9f41ca09 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
@@ -132,7 +132,7 @@ public:
Talk(SAY_AGGRO);
DoZoneInCombat();
events.ScheduleEvent(EVENT_BERSERK, 480000, GCD_CAST);
- events.ScheduleEvent(EVENT_YELL, 45000 + (rand()%76)*1000, GCD_YELL);
+ events.ScheduleEvent(EVENT_YELL, 45000 + (rand32() % 76) * 1000, GCD_YELL);
ResetTimer();
}
diff --git a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp
index 49762275169..ba7730ba566 100644
--- a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp
+++ b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp
@@ -489,7 +489,7 @@ public:
Unit* unit = me;
uint32 member = 0; // He chooses Lady Malande most often
- if (rand()%10 == 0) // But there is a chance he picks someone else.
+ if (rand32() % 10 == 0) // But there is a chance he picks someone else.
member = urand(1, 3);
if (member != 2) // No need to create another pointer to us using Unit::GetUnit
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
index c6b62ee8de7..0f9a10e5c4f 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
@@ -131,7 +131,7 @@ public:
{
CataclysmicBolt_Timer = 10000;
Enrage_Timer = 600000; //10 minutes
- SearNova_Timer = 20000+rand()%40000; // 20 - 60 seconds
+ SearNova_Timer = 20000 + rand32() % 40000; // 20 - 60 seconds
BlessingOfTides = false;
@@ -253,7 +253,7 @@ public:
if (SearNova_Timer <= diff)
{
DoCastVictim(SPELL_SEAR_NOVA);
- SearNova_Timer = 20000+rand()%40000;
+ SearNova_Timer = 20000 + rand32() % 40000;
} else SearNova_Timer -= diff;
//Enrage_Timer
@@ -508,7 +508,7 @@ public:
if (FrostShock_Timer <= diff)
{
DoCastVictim(SPELL_FROST_SHOCK);
- FrostShock_Timer = 25000+rand()%5000;
+ FrostShock_Timer = 25000 + rand32() % 5000;
} else FrostShock_Timer -= diff;
//Spitfire_Timer
@@ -575,9 +575,9 @@ public:
void Reset() override
{
WaterBoltVolley_Timer = 35000;
- TidalSurge_Timer = 15000+rand()%5000;
+ TidalSurge_Timer = 15000 + rand32() % 5000;
Heal_Timer = 55000;
- Cyclone_Timer = 30000+rand()%10000;
+ Cyclone_Timer = 30000 + rand32() % 10000;
instance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED);
}
@@ -628,16 +628,16 @@ public:
// Hacky way to do it - won't trigger elseways
if (me->GetVictim())
me->EnsureVictim()->CastSpell(me->GetVictim(), SPELL_TIDAL_SURGE_FREEZE, true);
- TidalSurge_Timer = 15000+rand()%5000;
+ TidalSurge_Timer = 15000 + rand32() % 5000;
} else TidalSurge_Timer -= diff;
//Cyclone_Timer
if (Cyclone_Timer <= diff)
{
//DoCast(me, SPELL_SUMMON_CYCLONE); // Doesn't work
- Cyclone_Timer = 30000+rand()%10000;
+ Cyclone_Timer = 30000 + rand32() % 10000;
- if (Creature* Cyclone = me->SummonCreature(CREATURE_CYCLONE, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), float(rand()%5), TEMPSUMMON_TIMED_DESPAWN, 15000))
+ if (Creature* Cyclone = me->SummonCreature(CREATURE_CYCLONE, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), float(rand32() % 5), TEMPSUMMON_TIMED_DESPAWN, 15000))
{
Cyclone->SetObjectScale(3.0f);
Cyclone->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -672,7 +672,7 @@ public:
Unit* selectAdvisorUnit()
{
Unit* unit = NULL;
- switch (rand()%4)
+ switch (rand32() % 4)
{
case 0:
unit = ObjectAccessor::GetUnit(*me, instance->GetData64(DATA_KARATHRESS));
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
index 0745a85bf02..f877ce83b37 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
@@ -182,15 +182,15 @@ public:
void Reset() override
{
AggroTimer = 19000;
- ShockBlastTimer = 1+rand()%60000;
+ ShockBlastTimer = 1 + rand32() % 60000;
EntangleTimer = 30000;
- StaticChargeTimer = 10000+rand()%15000;
+ StaticChargeTimer = 10000 + rand32() % 15000;
ForkedLightningTimer = 2000;
CheckTimer = 15000;
EnchantedElementalTimer = 5000;
TaintedElementalTimer = 50000;
- CoilfangEliteTimer = 45000+rand()%5000;
- CoilfangStriderTimer = 60000+rand()%10000;
+ CoilfangEliteTimer = 45000 + rand32() % 5000;
+ CoilfangStriderTimer = 60000 + rand32() % 10000;
SummonSporebatTimer = 10000;
SummonSporebatStaticTimer = 30000;
EnchantedElementalPos = 0;
@@ -304,7 +304,7 @@ public:
DoCastVictim(SPELL_MULTI_SHOT);
break;
}
- if (rand()%3)
+ if (rand32() % 3)
{
Talk(SAY_BOWSHOT);
}
@@ -346,7 +346,7 @@ public:
DoCastVictim(SPELL_SHOCK_BLAST);
me->TauntApply(me->GetVictim());
- ShockBlastTimer = 1000+rand()%14000; // random cooldown
+ ShockBlastTimer = 1000 + rand32() % 14000; // random cooldown
} else ShockBlastTimer -= diff;
// StaticChargeTimer
@@ -358,7 +358,7 @@ public:
if (target && !target->HasAura(SPELL_STATIC_CHARGE_TRIGGER))
DoCast(target, SPELL_STATIC_CHARGE_TRIGGER); // cast Static Charge every 2 seconds for 20 seconds
- StaticChargeTimer = 10000+rand()%20000;
+ StaticChargeTimer = 10000 + rand32() % 20000;
} else StaticChargeTimer -= diff;
// EntangleTimer
@@ -376,7 +376,7 @@ public:
{
CastShootOrMultishot();
Entangle = false;
- EntangleTimer = 20000+rand()%5000;
+ EntangleTimer = 20000 + rand32() % 5000;
}
} else EntangleTimer -= diff;
@@ -461,7 +461,7 @@ public:
DoCast(target, SPELL_FORKED_LIGHTNING);
- ForkedLightningTimer = 2000+rand()%6000;
+ ForkedLightningTimer = 2000 + rand32() % 6000;
} else ForkedLightningTimer -= diff;
// EnchantedElementalTimer
@@ -474,13 +474,13 @@ public:
else
++EnchantedElementalPos;
- EnchantedElementalTimer = 10000+rand()%5000;
+ EnchantedElementalTimer = 10000 + rand32() % 5000;
} else EnchantedElementalTimer -= diff;
// TaintedElementalTimer
if (TaintedElementalTimer <= diff)
{
- uint32 pos = rand()%8;
+ uint32 pos = rand32() % 8;
me->SummonCreature(TAINTED_ELEMENTAL, ElementPos[pos][0], ElementPos[pos][1], ElementPos[pos][2], ElementPos[pos][3], TEMPSUMMON_DEAD_DESPAWN, 0);
TaintedElementalTimer = 120000;
@@ -489,7 +489,7 @@ public:
// CoilfangEliteTimer
if (CoilfangEliteTimer <= diff)
{
- uint32 pos = rand()%3;
+ uint32 pos = rand32() % 3;
Creature* coilfangElite = me->SummonCreature(COILFANG_ELITE, CoilfangElitePos[pos][0], CoilfangElitePos[pos][1], CoilfangElitePos[pos][2], CoilfangElitePos[pos][3], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
if (coilfangElite)
{
@@ -498,13 +498,13 @@ public:
else if (me->GetVictim())
coilfangElite->AI()->AttackStart(me->GetVictim());
}
- CoilfangEliteTimer = 45000+rand()%5000;
+ CoilfangEliteTimer = 45000 + rand32() % 5000;
} else CoilfangEliteTimer -= diff;
// CoilfangStriderTimer
if (CoilfangStriderTimer <= diff)
{
- uint32 pos = rand()%3;
+ uint32 pos = rand32() % 3;
if (Creature* CoilfangStrider = me->SummonCreature(COILFANG_STRIDER, CoilfangStriderPos[pos][0], CoilfangStriderPos[pos][1], CoilfangStriderPos[pos][2], CoilfangStriderPos[pos][3], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000))
{
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
@@ -512,7 +512,7 @@ public:
else if (me->GetVictim())
CoilfangStrider->AI()->AttackStart(me->GetVictim());
}
- CoilfangStriderTimer = 60000+rand()%10000;
+ CoilfangStriderTimer = 60000 + rand32() % 10000;
} else CoilfangStriderTimer -= diff;
// CheckTimer
@@ -656,7 +656,7 @@ public:
void Reset() override
{
- PoisonBoltTimer = 5000+rand()%5000;
+ PoisonBoltTimer = 5000 + rand32() % 5000;
DespawnTimer = 30000;
}
@@ -681,7 +681,7 @@ public:
if (target && target->IsWithinDistInMap(me, 30))
DoCast(target, SPELL_POISON_BOLT);
- PoisonBoltTimer = 5000+rand()%5000;
+ PoisonBoltTimer = 5000 + rand32() % 5000;
} else PoisonBoltTimer -= diff;
// DespawnTimer
@@ -754,7 +754,7 @@ public:
// Random movement
if (MovementTimer <= diff)
{
- uint32 rndpos = rand()%8;
+ uint32 rndpos = rand32() % 8;
me->GetMotionMaster()->MovePoint(1, SporebatWPPos[rndpos][0], SporebatWPPos[rndpos][1], SporebatWPPos[rndpos][2]);
MovementTimer = 6000;
} else MovementTimer -= diff;
@@ -770,7 +770,7 @@ public:
trig->CastSpell(trig, SPELL_TOXIC_SPORES, true);
}
}
- BoltTimer = 10000+rand()%5000;
+ BoltTimer = 10000 + rand32() % 5000;
}
else BoltTimer -= diff;
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
index 1f58573465f..a0ff469733c 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
@@ -127,7 +127,7 @@ public:
SpoutTimer = 45000;
WhirlTimer = 18000; // after avery spout
PhaseTimer = 120000;
- GeyserTimer = rand()%5000 + 15000;
+ GeyserTimer = rand32() % 5000 + 15000;
CheckTimer = 15000; // give time to get in range when fight starts
WaitTimer = 60000; // never reached
WaitTimer2 = 60000; // never reached
@@ -299,7 +299,7 @@ public:
target = me->GetVictim();
if (target)
DoCast(target, SPELL_GEYSER, true);
- GeyserTimer = rand()%5000 + 15000;
+ GeyserTimer = rand32() % 5000 + 15000;
} else GeyserTimer -= diff;
if (!InRange) // if on players in melee range cast Waterbolt
@@ -403,7 +403,7 @@ public:
if (me->GetVictim())
DoCastVictim(SPELL_SPREAD_SHOT, true);
- MultiShotTimer = 10000+rand()%10000;
+ MultiShotTimer = 10000 + rand32() % 10000;
ShootBowTimer += 1500; // add global cooldown
} else MultiShotTimer -= diff;
@@ -412,7 +412,7 @@ public:
int bp0 = 1100;
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
me->CastCustomSpell(target, SPELL_SHOOT, &bp0, NULL, NULL, true);
- ShootBowTimer = 4000+rand()%5000;
+ ShootBowTimer = 4000 + rand32() % 5000;
MultiShotTimer += 1500; // add global cooldown
} else ShootBowTimer -= diff;
}
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
index 75d2026537e..d501b919614 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
@@ -197,7 +197,7 @@ public:
}
Talk(EMOTE_EARTHQUAKE);
Earthquake = false;
- Earthquake_Timer = 40000+rand()%5000;
+ Earthquake_Timer = 40000 + rand32() % 5000;
}
} else Earthquake_Timer -= diff;
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
index 848e9140f25..dc0a6643624 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
@@ -101,7 +101,7 @@ public:
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(target, SPELL_LIGHTNING_CLOUD);
- LightningCloud_Timer = 15000+rand()%10000;
+ LightningCloud_Timer = 15000 + rand32() % 10000;
} else LightningCloud_Timer -=diff;
//LungBurst_Timer
@@ -109,7 +109,7 @@ public:
{
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(target, SPELL_LUNG_BURST);
- LungBurst_Timer = 7000+rand()%5000;
+ LungBurst_Timer = 7000 + rand32() % 5000;
} else LungBurst_Timer -=diff;
//EnvelopingWinds_Timer
@@ -122,7 +122,7 @@ public:
if (IsHeroic())
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(target, SPELL_ENVELOPING_WINDS);
- EnvelopingWinds_Timer = 10000+rand()%5000;
+ EnvelopingWinds_Timer = 10000 + rand32() % 5000;
} else EnvelopingWinds_Timer -=diff;
DoMeleeAttackIfReady();
@@ -149,7 +149,7 @@ public:
void Reset() override
{
- WaterBoltVolley_Timer = 3000+rand()%3000;
+ WaterBoltVolley_Timer = 3000 + rand32() % 3000;
}
void EnterCombat(Unit* /*who*/) override { }
@@ -162,7 +162,7 @@ public:
if (WaterBoltVolley_Timer <= diff)
{
DoCast(me, SPELL_WATER_BOLT_VOLLEY);
- WaterBoltVolley_Timer = 7000+rand()%5000;
+ WaterBoltVolley_Timer = 7000 + rand32() % 5000;
} else WaterBoltVolley_Timer -= diff;
DoMeleeAttackIfReady();
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
index 5dbc6a91418..78a14539e25 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
@@ -117,9 +117,9 @@ public:
DoSpawnCreature(NPC_STREAMRIGGER_MECHANIC, -5, 5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000);
DoSpawnCreature(NPC_STREAMRIGGER_MECHANIC, -5, -5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000);
- if (rand()%2)
+ if (rand32() % 2)
DoSpawnCreature(NPC_STREAMRIGGER_MECHANIC, 5, -7, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000);
- if (rand()%2)
+ if (rand32() % 2)
DoSpawnCreature(NPC_STREAMRIGGER_MECHANIC, 7, -5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000);
}
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
index 536ea77a98b..ab6e0afaab4 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
@@ -123,7 +123,7 @@ public:
void Reset() override
{
Reflection_Timer = 10000;
- Impale_Timer = 7000+rand()%7000;
+ Impale_Timer = 7000 + rand32() % 7000;
Rage_Timer = 45000;
CanRage = false;
@@ -170,14 +170,14 @@ public:
DoCast(me, SPELL_WARLORDS_RAGE);
CAST_AI(npc_naga_distiller::npc_naga_distillerAI, distiller->AI())->StartRageGen(me);
}
- Rage_Timer = 3000+rand()%15000;
+ Rage_Timer = 3000 + rand32() % 15000;
} else Rage_Timer -= diff;
//Reflection_Timer
if (Reflection_Timer <= diff)
{
DoCast(me, SPELL_SPELL_REFLECTION);
- Reflection_Timer = 15000+rand()%10000;
+ Reflection_Timer = 15000 + rand32() % 10000;
} else Reflection_Timer -= diff;
//Impale_Timer
@@ -186,7 +186,7 @@ public:
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(target, SPELL_IMPALE);
- Impale_Timer = 7500+rand()%5000;
+ Impale_Timer = 7500 + rand32() % 5000;
} else Impale_Timer -= diff;
DoMeleeAttackIfReady();
diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp
index ae7d5fd2308..90853138448 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp
@@ -84,9 +84,9 @@ public:
if (Mushroom_Timer <= diff)
{
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
- me->SummonCreature(17990, target->GetPositionX()+(rand()%8), target->GetPositionY()+(rand()%8), target->GetPositionZ(), float(rand()%5), TEMPSUMMON_TIMED_DESPAWN, 22000);
+ me->SummonCreature(17990, target->GetPositionX() + (rand32() % 8), target->GetPositionY() + (rand32() % 8), target->GetPositionZ(), float(rand32() % 5), TEMPSUMMON_TIMED_DESPAWN, 22000);
else
- me->SummonCreature(17990, me->GetPositionX()+(rand()%8), me->GetPositionY()+(rand()%8), me->GetPositionZ(), float(rand()%5), TEMPSUMMON_TIMED_DESPAWN, 22000);
+ me->SummonCreature(17990, me->GetPositionX() + (rand32() % 8), me->GetPositionY() + (rand32() % 8), me->GetPositionZ(), float(rand32() % 5), TEMPSUMMON_TIMED_DESPAWN, 22000);
Mushroom_Timer = 10000;
} else Mushroom_Timer -= diff;
@@ -95,7 +95,7 @@ public:
{
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(target, SPELL_ACID_GEYSER);
- AcidGeyser_Timer = 10000+rand()%7500;
+ AcidGeyser_Timer = 10000 + rand32() % 7500;
} else AcidGeyser_Timer -= diff;
DoMeleeAttackIfReady();
diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp
index 7e37c22565a..7090a693876 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp
@@ -73,7 +73,7 @@ public:
Levitate_Timer = 12000;
ChainLightning_Timer = 6000;
StaticCharge_Timer = 10000;
- SporeStriders_Timer = 10000+rand()%5000;
+ SporeStriders_Timer = 10000 + rand32() % 5000;
check_Timer = 5000;
LevitatedTarget = 0;
LevitatedTarget_Timer = 0;
@@ -124,7 +124,7 @@ public:
if (IsHeroic() && SporeStriders_Timer <= diff)
{
DoCast(me, SPELL_SUMMON_SPORE_STRIDER);
- SporeStriders_Timer = 10000+rand()%5000;
+ SporeStriders_Timer = 10000 + rand32() % 5000;
} else SporeStriders_Timer -= diff;
// Levitate
@@ -164,7 +164,7 @@ public:
LevitatedTarget_Timer = 2000;
InAir = false;
}
- Levitate_Timer = 12000+rand()%3000;
+ Levitate_Timer = 12000 + rand32() % 3000;
} else Levitate_Timer -= diff;
// Chain Lightning
diff --git a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
index 89aad2534f0..3b7bb0c4312 100644
--- a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
+++ b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
@@ -153,7 +153,7 @@ public:
if (MightyBlow_Timer <= diff)
{
DoCastVictim(SPELL_MIGHTY_BLOW);
- MightyBlow_Timer = 30000+rand()%10000;
+ MightyBlow_Timer = 30000 + rand32() % 10000;
} else MightyBlow_Timer -= diff;
//Entering Phase 2
@@ -186,7 +186,7 @@ public:
if (Roar_Timer <= diff)
{
DoCast(me, SPELL_ROAR);
- Roar_Timer = 40000+(rand()%10000);
+ Roar_Timer = 40000 + (rand32() % 10000);
} else Roar_Timer -= diff;
}
@@ -537,7 +537,7 @@ public:
target = NULL;
}
if (!target_list.empty())
- target = *(target_list.begin()+rand()%target_list.size());
+ target = *(target_list.begin() + rand32() % target_list.size());
me->InterruptNonMeleeSpells(false);
DoCast(target, SPELL_BLAST_WAVE);
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
index 063a30ca875..55e9801320f 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
@@ -83,7 +83,7 @@ class boss_broggok : public CreatureScript
if (AcidSpray_Timer <= diff)
{
DoCastVictim(SPELL_SLIME_SPRAY);
- AcidSpray_Timer = 4000+rand()%8000;
+ AcidSpray_Timer = 4000 + rand32() % 8000;
}
else
AcidSpray_Timer -=diff;
@@ -91,7 +91,7 @@ class boss_broggok : public CreatureScript
if (PoisonBolt_Timer <= diff)
{
DoCastVictim(SPELL_POISON_BOLT);
- PoisonBolt_Timer = 4000+rand()%8000;
+ PoisonBolt_Timer = 4000 + rand32() % 8000;
}
else
PoisonBolt_Timer -=diff;
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
index c85a26a25ab..e56b82d4507 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
@@ -103,7 +103,7 @@ class boss_kelidan_the_breaker : public CreatureScript
void KilledUnit(Unit* /*victim*/) override
{
- if (rand()%2)
+ if (rand32() % 2)
return;
Talk(SAY_KILL);
@@ -206,7 +206,7 @@ class boss_kelidan_the_breaker : public CreatureScript
if (ShadowVolley_Timer <= diff)
{
DoCast(me, SPELL_SHADOW_BOLT_VOLLEY);
- ShadowVolley_Timer = 5000+rand()%8000;
+ ShadowVolley_Timer = 5000 + rand32() % 8000;
}
else
ShadowVolley_Timer -=diff;
@@ -214,7 +214,7 @@ class boss_kelidan_the_breaker : public CreatureScript
if (Corruption_Timer <= diff)
{
DoCast(me, SPELL_CORRUPTION);
- Corruption_Timer = 30000+rand()%20000;
+ Corruption_Timer = 30000 + rand32() % 20000;
}
else
Corruption_Timer -=diff;
@@ -235,7 +235,7 @@ class boss_kelidan_the_breaker : public CreatureScript
if (IsHeroic())
DoTeleportAll(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation());
- BurningNova_Timer = 20000+rand()%8000;
+ BurningNova_Timer = 20000 + rand32() % 8000;
Firenova_Timer= 5000;
Firenova = true;
}
@@ -281,8 +281,8 @@ class npc_shadowmoon_channeler : public CreatureScript
void Reset() override
{
- ShadowBolt_Timer = 1000+rand()%1000;
- MarkOfShadow_Timer = 5000+rand()%2000;
+ ShadowBolt_Timer = 1000 + rand32() % 1000;
+ MarkOfShadow_Timer = 5000 + rand32() % 2000;
check_Timer = 0;
if (me->IsNonMeleeSpellCast(false))
me->InterruptNonMeleeSpells(true);
@@ -327,7 +327,7 @@ class npc_shadowmoon_channeler : public CreatureScript
{
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(target, SPELL_MARK_OF_SHADOW);
- MarkOfShadow_Timer = 15000+rand()%5000;
+ MarkOfShadow_Timer = 15000 + rand32() % 5000;
}
else
MarkOfShadow_Timer -=diff;
@@ -335,7 +335,7 @@ class npc_shadowmoon_channeler : public CreatureScript
if (ShadowBolt_Timer <= diff)
{
DoCastVictim(SPELL_SHADOW_BOLT);
- ShadowBolt_Timer = 5000+rand()%1000;
+ ShadowBolt_Timer = 5000 + rand32() % 1000;
}
else
ShadowBolt_Timer -=diff;
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
index a24abac44d6..53680739e55 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
@@ -91,7 +91,7 @@ class boss_the_maker : public CreatureScript
if (AcidSpray_Timer <= diff)
{
DoCastVictim(SPELL_ACID_SPRAY);
- AcidSpray_Timer = 15000+rand()%8000;
+ AcidSpray_Timer = 15000 + rand32() % 8000;
}
else
AcidSpray_Timer -=diff;
@@ -100,7 +100,7 @@ class boss_the_maker : public CreatureScript
{
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(target, SPELL_EXPLODING_BREAKER);
- ExplodingBreaker_Timer = 4000+rand()%8000;
+ ExplodingBreaker_Timer = 4000 + rand32() % 8000;
}
else
ExplodingBreaker_Timer -=diff;
@@ -120,7 +120,7 @@ class boss_the_maker : public CreatureScript
if (Knockdown_Timer <= diff)
{
DoCastVictim(SPELL_KNOCKDOWN);
- Knockdown_Timer = 4000+rand()%8000;
+ Knockdown_Timer = 4000 + rand32() % 8000;
}
else
Knockdown_Timer -=diff;
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
index b735a831e35..237aa506589 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
@@ -88,7 +88,7 @@ class boss_omor_the_unscarred : public CreatureScript
void KilledUnit(Unit* /*victim*/) override
{
- if (rand()%2)
+ if (rand32() % 2)
return;
Talk(SAY_KILL_1);
@@ -122,7 +122,7 @@ class boss_omor_the_unscarred : public CreatureScript
{
me->InterruptNonMeleeSpells(false);
DoCast(me, SPELL_SUMMON_FIENDISH_HOUND);
- Summon_Timer = 15000+rand()%15000;
+ Summon_Timer = 15000 + rand32() % 15000;
}
else
Summon_Timer -= diff;
@@ -159,7 +159,7 @@ class boss_omor_the_unscarred : public CreatureScript
if (temp && temp->GetTypeId() == TYPEID_PLAYER)
{
DoCast(temp, SPELL_ORBITAL_STRIKE);
- OrbitalStrike_Timer = 14000+rand()%2000;
+ OrbitalStrike_Timer = 14000 + rand32() % 2000;
PlayerGUID = temp->GetGUID();
if (PlayerGUID)
@@ -187,7 +187,7 @@ class boss_omor_the_unscarred : public CreatureScript
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
{
DoCast(target, SPELL_TREACHEROUS_AURA);
- Aura_Timer = 8000+rand()%8000;
+ Aura_Timer = 8000 + rand32() % 8000;
}
}
else
@@ -201,7 +201,7 @@ class boss_omor_the_unscarred : public CreatureScript
target = me->GetVictim();
DoCast(target, SPELL_SHADOW_BOLT);
- Shadowbolt_Timer = 4000+rand()%2500;
+ Shadowbolt_Timer = 4000 + rand32() % 2500;
}
}
else
diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
index 1bdaf4fc260..c6756feb0ce 100644
--- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
@@ -180,7 +180,7 @@ class npc_abyssal : public CreatureScript
if (FireBlast_Timer <= diff)
{
DoCastVictim(SPELL_FIRE_BLAST);
- FireBlast_Timer = 5000+rand()%10000;
+ FireBlast_Timer = 5000 + rand32() % 10000;
}
else FireBlast_Timer -= diff;
@@ -232,7 +232,7 @@ class boss_magtheridon : public CreatureScript
Berserk_Timer = 1320000;
Quake_Timer = 40000;
Debris_Timer = 10000;
- Blaze_Timer = 10000+rand()%20000;
+ Blaze_Timer = 10000 + rand32() % 20000;
BlastNova_Timer = 60000;
Cleave_Timer = 15000;
RandChat_Timer = 90000;
@@ -538,7 +538,7 @@ class npc_hellfire_channeler : public CreatureScript
{
if (HealthBelowPct(50))
DoCast(me, SPELL_DARK_MENDING);
- DarkMending_Timer = 10000 +(rand() % 10000);
+ DarkMending_Timer = 10000 + (rand32() % 10000);
}
else
DarkMending_Timer -= diff;
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
index 88c3041b62c..9a8f83fa1c2 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
@@ -243,7 +243,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript
if (Cleave_Timer <= diff)
{
DoCastVictim(SPELL_SHADOW_CLEAVE);
- Cleave_Timer = 6000+rand()%2500;
+ Cleave_Timer = 6000 + rand32() % 2500;
}
else
Cleave_Timer -= diff;
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
index b03fc651e12..d61c40f8e3b 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
@@ -178,7 +178,7 @@ class boss_warbringer_omrogg : public CreatureScript
if (!LeftHead || !RightHead)
return;
- ithreat = rand()%4;
+ ithreat = rand32() % 4;
Creature* source = (LeftHead->GetEntry() == Threat[ithreat].creature ? LeftHead : RightHead);
@@ -195,7 +195,7 @@ class boss_warbringer_omrogg : public CreatureScript
if (Creature* LeftHead = ObjectAccessor::GetCreature(*me, LeftHeadGUID))
{
- iaggro = rand()%3;
+ iaggro = rand32() % 3;
LeftHead->AI()->Talk(GoCombat[iaggro].id);
@@ -227,7 +227,7 @@ class boss_warbringer_omrogg : public CreatureScript
if (!LeftHead || !RightHead)
return;
- ikilling = rand()%2;
+ ikilling = rand32() % 2;
Creature* source = (LeftHead->GetEntry() == Killing[ikilling].creature ? LeftHead : RightHead);
@@ -338,7 +338,7 @@ class boss_warbringer_omrogg : public CreatureScript
DoResetThreat();
me->AddThreat(target, 0.0f);
}
- ResetThreat_Timer = 25000+rand()%15000;
+ ResetThreat_Timer = 25000 + rand32() % 15000;
}
else
ResetThreat_Timer -= diff;
@@ -346,7 +346,7 @@ class boss_warbringer_omrogg : public CreatureScript
if (Fear_Timer <= diff)
{
DoCast(me, SPELL_FEAR);
- Fear_Timer = 15000+rand()%20000;
+ Fear_Timer = 15000 + rand32() % 20000;
}
else
Fear_Timer -= diff;
@@ -354,7 +354,7 @@ class boss_warbringer_omrogg : public CreatureScript
if (ThunderClap_Timer <= diff)
{
DoCast(me, SPELL_THUNDERCLAP);
- ThunderClap_Timer = 15000+rand()%15000;
+ ThunderClap_Timer = 15000 + rand32() % 15000;
}
else
ThunderClap_Timer -= diff;
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
index 66aa02bbeaf..f1dfcc2b391 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
@@ -213,8 +213,8 @@ class boss_warchief_kargath_bladefist : public CreatureScript
{
//move in bladedance
float x, y, randx, randy;
- randx = 0.0f + rand()%40;
- randy = 0.0f + rand()%40;
+ randx = 0.0f + rand32() % 40;
+ randy = 0.0f + rand32() % 40;
x = 210+ randx;
y = -60- randy;
me->GetMotionMaster()->MovePoint(1, x, y, me->GetPositionZ());
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
index bcc8b0c5a48..09cb72f1a47 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
@@ -245,7 +245,7 @@ class boss_alar : public CreatureScript
switch (WaitEvent)
{
case WE_PLATFORM:
- Platforms_Move_Timer = 30000+rand()%5000;
+ Platforms_Move_Timer = 30000 + rand32() % 5000;
break;
case WE_QUILL:
DoCast(me, SPELL_FLAME_QUILLS, true);
@@ -268,7 +268,7 @@ class boss_alar : public CreatureScript
DoCast(me, SPELL_REBIRTH, true);
MeltArmor_Timer = 60000;
Charge_Timer = 7000;
- DiveBomb_Timer = 40000+rand()%5000;
+ DiveBomb_Timer = 40000 + rand32() % 5000;
FlamePatch_Timer = 30000;
Phase1 = false;
break;
@@ -391,7 +391,7 @@ class boss_alar : public CreatureScript
me->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 50);
WaitEvent = WE_METEOR;
WaitTimer = 0;
- DiveBomb_Timer = 40000+rand()%5000;
+ DiveBomb_Timer = 40000 + rand32() % 5000;
return;
}
else
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
index 2cac4a0be1a..be437a154b3 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
@@ -143,7 +143,7 @@ class boss_high_astromancer_solarian : public CreatureScript
AppearDelay_Timer = 2000;
BlindingLight = false;
AppearDelay = false;
- Wrath_Timer = 20000+rand()%5000;//twice in phase one
+ Wrath_Timer = 20000 + rand32() % 5000;//twice in phase one
Phase = 1;
instance->SetData(DATA_HIGHASTROMANCERSOLARIANEVENT, NOT_STARTED);
@@ -195,7 +195,7 @@ class boss_high_astromancer_solarian : public CreatureScript
if (urand(0, 1))
radius = -radius;
- return radius * (float)(rand()%100)/100.0f + CENTER_X;
+ return radius * (float)(rand32() % 100) / 100.0f + CENTER_X;
}
float Portal_Y(float x, float radius)
@@ -241,7 +241,7 @@ class boss_high_astromancer_solarian : public CreatureScript
me->InterruptNonMeleeSpells(false);
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true))
DoCast(target, SPELL_WRATH_OF_THE_ASTROMANCER, true);
- Wrath_Timer = 20000+rand()%5000;
+ Wrath_Timer = 20000 + rand32() % 5000;
}
else
Wrath_Timer -= diff;
@@ -359,7 +359,7 @@ class boss_high_astromancer_solarian : public CreatureScript
{
Phase = 1;
//15 seconds later Solarian reappears out of one of the 3 portals. Simultaneously, 2 healers appear in the two other portals.
- int i = rand()%3;
+ int i = rand32() % 3;
me->GetMotionMaster()->Clear();
me->SetPosition(Portals[i][0], Portals[i][1], Portals[i][2], CENTER_O);
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
index a24e1d5d34f..29f240773e5 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
@@ -320,7 +320,7 @@ class boss_kaelthas : public CreatureScript
void Reset() override
{
- Fireball_Timer = 5000+rand()%10000;
+ Fireball_Timer = 5000 + rand32() % 10000;
ArcaneDisruption_Timer = 45000;
MindControl_Timer = 40000;
Phoenix_Timer = 50000;
@@ -746,7 +746,7 @@ class boss_kaelthas : public CreatureScript
{
//interruptable
me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_INTERRUPT_CAST, false);
- int32 dmg = 20000+rand()%5000;
+ int32 dmg = 20000 + rand32() % 5000;
me->CastCustomSpell(me->GetVictim(), SPELL_FIREBALL, &dmg, 0, 0, false);
IsCastingFireball = true;
Fireball_Timer = 2500;
@@ -757,7 +757,7 @@ class boss_kaelthas : public CreatureScript
//apply resistance
me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_INTERRUPT_CAST, true);
IsCastingFireball = false;
- Fireball_Timer = 5000+rand()%10000;
+ Fireball_Timer = 5000 + rand32() % 10000;
}
}
else
@@ -1089,7 +1089,7 @@ class boss_thaladred_the_darkener : public CreatureScript
if (PsychicBlow_Timer <= diff)
{
DoCastVictim(SPELL_PSYCHIC_BLOW);
- PsychicBlow_Timer = 20000+rand()%5000;
+ PsychicBlow_Timer = 20000 + rand32() % 5000;
}
else
PsychicBlow_Timer -= diff;
@@ -1158,7 +1158,7 @@ class boss_lord_sanguinar : public CreatureScript
if (Fear_Timer <= diff)
{
DoCastVictim(SPELL_BELLOWING_ROAR);
- Fear_Timer = 25000+rand()%10000; //approximately every 30 seconds
+ Fear_Timer = 25000 + rand32() % 10000; //approximately every 30 seconds
}
else
Fear_Timer -= diff;
@@ -1275,7 +1275,7 @@ class boss_grand_astromancer_capernian : public CreatureScript
else
DoCastVictim(SPELL_CONFLAGRATION);
- Conflagration_Timer = 10000+rand()%5000;
+ Conflagration_Timer = 10000 + rand32() % 5000;
}
else
Conflagration_Timer -= diff;
@@ -1301,7 +1301,7 @@ class boss_grand_astromancer_capernian : public CreatureScript
if (InMeleeRange)
DoCast(target, SPELL_ARCANE_EXPLOSION);
- ArcaneExplosion_Timer = 4000+rand()%2000;
+ ArcaneExplosion_Timer = 4000 + rand32() % 2000;
}
else
ArcaneExplosion_Timer -= diff;
@@ -1384,7 +1384,7 @@ class boss_master_engineer_telonicus : public CreatureScript
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(target, SPELL_REMOTE_TOY);
- RemoteToy_Timer = 10000+rand()%5000;
+ RemoteToy_Timer = 10000 + rand32() % 5000;
}
else
RemoteToy_Timer -= diff;
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
index 634d54ed58b..6b78706b437 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
@@ -132,7 +132,7 @@ class boss_void_reaver : public CreatureScript
}
if (!target_list.empty())
- target = *(target_list.begin()+rand()%target_list.size());
+ target = *(target_list.begin() + rand32() % target_list.size());
else
target = me->GetVictim();
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
index 1917bae1a6c..7563ecb40db 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
@@ -238,7 +238,7 @@ class boss_harbinger_skyriss : public CreatureScript
else
DoCastVictim(SPELL_DOMINATION);
- Domination_Timer = 16000+rand()%16000;
+ Domination_Timer = 16000 + rand32() % 16000;
}
else
Domination_Timer -=diff;
@@ -253,7 +253,7 @@ class boss_harbinger_skyriss : public CreatureScript
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1))
DoCast(target, H_SPELL_MANA_BURN);
- ManaBurn_Timer = 16000+rand()%16000;
+ ManaBurn_Timer = 16000 + rand32() % 16000;
}
else
ManaBurn_Timer -=diff;
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
index 2c15a6dd30d..0c322877808 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
@@ -98,7 +98,7 @@ class boss_high_botanist_freywinn : public CreatureScript
void DoSummonSeedling()
{
- switch (rand()%4)
+ switch (rand32() % 4)
{
case 0: DoCast(me, SPELL_PLANT_WHITE); break;
case 1: DoCast(me, SPELL_PLANT_GREEN); break;
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
index 8cab7485510..768c9b5b8f1 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
@@ -88,7 +88,7 @@ class boss_laj : public CreatureScript
void DoTransform()
{
- switch (rand()%5)
+ switch (rand32() % 5)
{
case 0:
me->SetDisplayId(MODEL_DEFAULT);
@@ -135,7 +135,7 @@ class boss_laj : public CreatureScript
void DoSummons()
{
- switch (rand()%4)
+ switch (rand32() % 4)
{
case 0:
DoCast(me, SPELL_SUMMON_LASHER_1, true);
@@ -187,7 +187,7 @@ class boss_laj : public CreatureScript
if (Allergic_Timer <= diff)
{
DoCastVictim(SPELL_ALLERGIC_REACTION);
- Allergic_Timer = 25000+rand()%15000;
+ Allergic_Timer = 25000 + rand32() % 15000;
}
else
Allergic_Timer -= diff;
@@ -195,7 +195,7 @@ class boss_laj : public CreatureScript
if (Teleport_Timer <= diff)
{
DoCast(me, SPELL_TELEPORT_SELF);
- Teleport_Timer = 30000+rand()%10000;
+ Teleport_Timer = 30000 + rand32() % 10000;
CanSummon = true;
}
else
@@ -204,7 +204,7 @@ class boss_laj : public CreatureScript
if (Transform_Timer <= diff)
{
DoTransform();
- Transform_Timer = 25000+rand()%15000;
+ Transform_Timer = 25000 + rand32() % 15000;
}
else
Transform_Timer -= diff;
diff --git a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp
index ebcddafe309..d54eb6fff8c 100644
--- a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp
+++ b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp
@@ -301,7 +301,7 @@ public:
if (spell->Id == SPELL_T_PHASE_MODULATOR && caster->GetTypeId() == TYPEID_PLAYER)
{
const uint32 entry_list[4] = {ENTRY_PROTO, ENTRY_ADOLE, ENTRY_MATUR, ENTRY_NIHIL};
- int cid = rand()%(4-1);
+ int cid = rand32() % (4 - 1);
if (entry_list[cid] == me->GetEntry())
++cid;
@@ -371,7 +371,7 @@ public:
if (IntangiblePresence_Timer <= diff)
{
DoCastVictim(SPELL_INTANGIBLE_PRESENCE);
- IntangiblePresence_Timer = 15000+rand()%15000;
+ IntangiblePresence_Timer = 15000 + rand32() % 15000;
} else IntangiblePresence_Timer -= diff;
if (ManaBurn_Timer <= diff)
@@ -379,13 +379,13 @@ public:
Unit* target = me->GetVictim();
if (target && target->getPowerType() == POWER_MANA)
DoCast(target, SPELL_MANA_BURN);
- ManaBurn_Timer = 8000+rand()%8000;
+ ManaBurn_Timer = 8000 + rand32() % 8000;
} else ManaBurn_Timer -= diff;
if (ArcaneBlast_Timer <= diff)
{
DoCastVictim(SPELL_ARCANE_BLAST);
- ArcaneBlast_Timer = 2500+rand()%5000;
+ ArcaneBlast_Timer = 2500 + rand32() % 5000;
} else ArcaneBlast_Timer -= diff;
DoMeleeAttackIfReady();
diff --git a/src/server/scripts/Outland/zone_nagrand.cpp b/src/server/scripts/Outland/zone_nagrand.cpp
index 3b9d865cb3b..f32d2516ee0 100644
--- a/src/server/scripts/Outland/zone_nagrand.cpp
+++ b/src/server/scripts/Outland/zone_nagrand.cpp
@@ -277,7 +277,7 @@ public:
{
if (spell->Id == SPELL_CHAIN_LIGHTNING)
{
- if (rand()%10)
+ if (rand32() % 10)
return;
Talk(SAY_MAG_LIGHTNING);
@@ -627,7 +627,7 @@ public:
{
if (spell->Id == SPELL_KUR_CHAIN_LIGHTNING)
{
- if (rand()%30)
+ if (rand32() % 30)
return;
Talk(SAY_KUR_LIGHTNING);
@@ -635,7 +635,7 @@ public:
if (spell->Id == SPELL_KUR_FROST_SHOCK)
{
- if (rand()%30)
+ if (rand32() % 30)
return;
Talk(SAY_KUR_SHOCK);
diff --git a/src/server/scripts/Outland/zone_netherstorm.cpp b/src/server/scripts/Outland/zone_netherstorm.cpp
index cb75ee3b2ad..6f331425be0 100644
--- a/src/server/scripts/Outland/zone_netherstorm.cpp
+++ b/src/server/scripts/Outland/zone_netherstorm.cpp
@@ -152,7 +152,7 @@ public:
switch (creature->GetEntry())
{
case ENTRY_BNAAR_C_CONSOLE:
- if (rand()%2)
+ if (rand32() % 2)
{
add = me->SummonCreature(ENTRY_SUNFURY_TECH, 2933.68f, 4162.55f, 164.00f, 1.60f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
if (add) add->GetMotionMaster()->MovePoint(0, 2927.36f, 4212.97f, 164.00f);
@@ -179,7 +179,7 @@ public:
Wave_Timer = 15000;
break;
case ENTRY_ARA_C_CONSOLE:
- if (rand()%2)
+ if (rand32() % 2)
{
add = me->SummonCreature(ENTRY_ARA_TECH, 4035.11f, 4038.97f, 194.27f, 2.57f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
if (add) add->GetMotionMaster()->MovePoint(0, 4003.42f, 4040.19f, 193.49f);
@@ -752,11 +752,11 @@ public:
Weak = false;
Materialize = false;
Drained = false;
- WeakPercent = 25 + (rand() % 16); // 25-40
+ WeakPercent = 25 + (rand32() % 16); // 25-40
PlayerGUID = 0;
- ManaBurnTimer = 5000 + (rand() % 3 * 1000); // 5-8 sec cd
+ ManaBurnTimer = 5000 + (rand32() % 3 * 1000); // 5-8 sec cd
if (me->GetEntry() == NPC_DRAINED_PHASE_HUNTER_ENTRY)
me->UpdateEntry(NPC_PHASE_HUNTER_ENTRY);
@@ -804,7 +804,7 @@ public:
if (!UnitsWithMana.empty())
{
DoCast(Trinity::Containers::SelectRandomContainerElement(UnitsWithMana), SPELL_MANA_BURN);
- ManaBurnTimer = 8000 + (rand() % 10 * 1000); // 8-18 sec cd
+ ManaBurnTimer = 8000 + (rand32() % 10 * 1000); // 8-18 sec cd
}
else
ManaBurnTimer = 3500;
diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp
index cfcc05a625c..e1590873455 100644
--- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp
+++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp
@@ -1051,7 +1051,7 @@ public:
void EnterCombat(Unit* who) override
{
//don't always use
- if (rand()%5)
+ if (rand32() % 5)
return;
//only aggro text if not player
@@ -1290,19 +1290,19 @@ public:
if (SpellTimer1 <= diff)
{
DoCastVictim(SpawnCast[6].SpellId);//Cleave
- SpellTimer1 = SpawnCast[6].Timer2 + (rand()%10 * 1000);
+ SpellTimer1 = SpawnCast[6].Timer2 + (rand32() % 10 * 1000);
} else SpellTimer1 -= diff;
if (SpellTimer2 <= diff)
{
DoCastVictim(SpawnCast[7].SpellId);//Shadowfury
- SpellTimer2 = SpawnCast[7].Timer2 + (rand()%5 * 1000);
+ SpellTimer2 = SpawnCast[7].Timer2 + (rand32() % 5 * 1000);
} else SpellTimer2 -= diff;
if (SpellTimer3 <= diff)
{
DoCast(me, SpawnCast[8].SpellId);
- SpellTimer3 = SpawnCast[8].Timer2 + (rand()%7 * 1000);//Spell Reflection
+ SpellTimer3 = SpawnCast[8].Timer2 + (rand32() % 7 * 1000);//Spell Reflection
} else SpellTimer3 -= diff;
}
@@ -1521,18 +1521,18 @@ public:
{
if (me->GetEntry() == 22075)//Illidari Soldier
{
- SpellTimer1 = SpawnCast[0].Timer1 + (rand()%4 * 1000);
+ SpellTimer1 = SpawnCast[0].Timer1 + (rand32() % 4 * 1000);
}
if (me->GetEntry() == 22074)//Illidari Mind Breaker
{
- SpellTimer1 = SpawnCast[1].Timer1 + (rand()%10 * 1000);
- SpellTimer2 = SpawnCast[2].Timer1 + (rand()%4 * 1000);
- SpellTimer3 = SpawnCast[3].Timer1 + (rand()%4 * 1000);
+ SpellTimer1 = SpawnCast[1].Timer1 + (rand32() % 10 * 1000);
+ SpellTimer2 = SpawnCast[2].Timer1 + (rand32() % 4 * 1000);
+ SpellTimer3 = SpawnCast[3].Timer1 + (rand32() % 4 * 1000);
}
if (me->GetEntry() == 19797)// Illidari Highlord
{
- SpellTimer1 = SpawnCast[4].Timer1 + (rand()%4 * 1000);
- SpellTimer2 = SpawnCast[5].Timer1 + (rand()%4 * 1000);
+ SpellTimer1 = SpawnCast[4].Timer1 + (rand32() % 4 * 1000);
+ SpellTimer2 = SpawnCast[5].Timer1 + (rand32() % 4 * 1000);
}
Timers = true;
}
@@ -1542,7 +1542,7 @@ public:
if (SpellTimer1 <= diff)
{
DoCastVictim(SpawnCast[0].SpellId);//Spellbreaker
- SpellTimer1 = SpawnCast[0].Timer2 + (rand()%5 * 1000);
+ SpellTimer1 = SpawnCast[0].Timer2 + (rand32() % 5 * 1000);
} else SpellTimer1 -= diff;
}
//Illidari Mind Breaker
@@ -1555,7 +1555,7 @@ public:
if (target->GetTypeId() == TYPEID_PLAYER)
{
DoCast(target, SpawnCast[1].SpellId); //Focused Bursts
- SpellTimer1 = SpawnCast[1].Timer2 + (rand()%5 * 1000);
+ SpellTimer1 = SpawnCast[1].Timer2 + (rand32() % 5 * 1000);
} else SpellTimer1 = 2000;
}
} else SpellTimer1 -= diff;
@@ -1563,13 +1563,13 @@ public:
if (SpellTimer2 <= diff)
{
DoCastVictim(SpawnCast[2].SpellId);//Psychic Scream
- SpellTimer2 = SpawnCast[2].Timer2 + (rand()%13 * 1000);
+ SpellTimer2 = SpawnCast[2].Timer2 + (rand32() % 13 * 1000);
} else SpellTimer2 -= diff;
if (SpellTimer3 <= diff)
{
DoCastVictim(SpawnCast[3].SpellId);//Mind Blast
- SpellTimer3 = SpawnCast[3].Timer2 + (rand()%8 * 1000);
+ SpellTimer3 = SpawnCast[3].Timer2 + (rand32() % 8 * 1000);
} else SpellTimer3 -= diff;
}
//Illidari Highlord
@@ -1578,13 +1578,13 @@ public:
if (SpellTimer1 <= diff)
{
DoCastVictim(SpawnCast[4].SpellId);//Curse Of Flames
- SpellTimer1 = SpawnCast[4].Timer2 + (rand()%10 * 1000);
+ SpellTimer1 = SpawnCast[4].Timer2 + (rand32() % 10 * 1000);
} else SpellTimer1 -= diff;
if (SpellTimer2 <= diff)
{
DoCastVictim(SpawnCast[5].SpellId);//Flamestrike
- SpellTimer2 = SpawnCast[5].Timer2 + (rand()%7 * 13000);
+ SpellTimer2 = SpawnCast[5].Timer2 + (rand32() % 7 * 13000);
} else SpellTimer2 -= diff;
}
@@ -1616,7 +1616,7 @@ void npc_lord_illidan_stormrage::npc_lord_illidan_stormrageAI::SummonNextWave()
if (WaveCount == 0)//1 Wave
{
- if (rand()%3 == 1 && FelguardCount<2)
+ if (rand32() % 3 == 1 && FelguardCount<2)
{
Spawn->SetDisplayId(18654);
++FelguardCount;
diff --git a/src/server/scripts/Outland/zone_terokkar_forest.cpp b/src/server/scripts/Outland/zone_terokkar_forest.cpp
index a902bd49154..c0755b6b06b 100644
--- a/src/server/scripts/Outland/zone_terokkar_forest.cpp
+++ b/src/server/scripts/Outland/zone_terokkar_forest.cpp
@@ -184,7 +184,7 @@ public:
{
if (done_by && done_by->GetTypeId() == TYPEID_PLAYER)
if (me->GetHealth() <= damage)
- if (rand()%100 < 75)
+ if (rand32() % 100 < 75)
//Summon Wood Mites
DoCast(me, 39130, true);
}
@@ -271,7 +271,7 @@ public:
{
if (done_by->GetTypeId() == TYPEID_PLAYER)
if (me->GetHealth() <= damage)
- if (rand()%100 < 75)
+ if (rand32() % 100 < 75)
//Summon Lots of Wood Mights
DoCast(me, 39134, true);
}
@@ -320,18 +320,18 @@ public:
if (player->GetQuestStatus(10873) == QUEST_STATUS_INCOMPLETE)
{
- if (rand()%100 < 25)
+ if (rand32() % 100 < 25)
{
me->SummonCreature(QUEST_TARGET, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000);
player->KilledMonsterCredit(QUEST_TARGET, 0);
}
else
- me->SummonCreature(netherwebVictims[rand()%6], 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000);
+ me->SummonCreature(netherwebVictims[rand32() % 6], 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000);
- if (rand()%100 < 75)
- me->SummonCreature(netherwebVictims[rand()%6], 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000);
+ if (rand32() % 100 < 75)
+ me->SummonCreature(netherwebVictims[rand32() % 6], 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000);
- me->SummonCreature(netherwebVictims[rand()%6], 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000);
+ me->SummonCreature(netherwebVictims[rand32() % 6], 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000);
}
}
};