diff options
| author | Carbenium <carbenium@outlook.com> | 2020-07-26 20:44:07 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-01-24 11:55:32 +0100 |
| commit | 310f996b1daf9dea701276847aa3fb30fcd43b9e (patch) | |
| tree | 6016e31d8f9f3f439f4c35868cfcde4652a898b1 /src/server/scripts/Outland/TempestKeep | |
| parent | 906a47b1616eebe1b9f73f0b5a849c5d946e8137 (diff) | |
Core/WorldObject: Partially std::chrono-ify SummonCreature overloads
TempSummon* SummonCreature(uint32 entry, float x, float y, float z, float o = 0, TempSummonType despawnType = TEMPSUMMON_MANUAL_DESPAWN, uint32 despawnTime = 0);
to
TempSummon* SummonCreature(uint32 entry, float x, float y, float z, float o = 0, TempSummonType despawnType = TEMPSUMMON_MANUAL_DESPAWN, Milliseconds despawnTime = 0s);
(cherry picked from commit 1131229ee9c43704b11187f0b11c327db92018b6)
Diffstat (limited to 'src/server/scripts/Outland/TempestKeep')
6 files changed, 30 insertions, 30 deletions
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index 2f436e6eb41..ab636b4efb6 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -433,7 +433,7 @@ class boss_alar : public CreatureScript { if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { - Creature* Summoned = me->SummonCreature(CREATURE_FLAME_PATCH_ALAR, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 120000); + Creature* Summoned = me->SummonCreature(CREATURE_FLAME_PATCH_ALAR, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 2min); if (Summoned) { Summoned->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE); diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp index bcc6207d694..7424cf3550c 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp @@ -115,9 +115,9 @@ class boss_high_astromancer_solarian : public CreatureScript Fear_Timer = 20000; VoidBolt_Timer = 10000; Phase1_Timer = 50000; - Phase2_Timer = 10000; - Phase3_Timer = 15000; - AppearDelay_Timer = 2000; + Phase2_Timer = 10s; + Phase3_Timer = 15s; + AppearDelay_Timer = 2s; BlindingLight = false; AppearDelay = false; Wrath_Timer = 20000 + rand32() % 5000;//twice in phase one @@ -132,9 +132,9 @@ class boss_high_astromancer_solarian : public CreatureScript uint32 Fear_Timer; uint32 VoidBolt_Timer; uint32 Phase1_Timer; - uint32 Phase2_Timer; - uint32 Phase3_Timer; - uint32 AppearDelay_Timer; + Milliseconds Phase2_Timer; + Milliseconds Phase3_Timer; + Milliseconds AppearDelay_Timer; uint32 defaultarmor; uint32 Wrath_Timer; @@ -177,7 +177,7 @@ class boss_high_astromancer_solarian : public CreatureScript void SummonMinion(uint32 entry, float x, float y, float z) { - Creature* Summoned = me->SummonCreature(entry, x, y, z, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + Creature* Summoned = me->SummonCreature(entry, x, y, z, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5s); if (Summoned) { if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) @@ -210,7 +210,7 @@ class boss_high_astromancer_solarian : public CreatureScript { me->StopMoving(); me->AttackStop(); - if (AppearDelay_Timer <= diff) + if (AppearDelay_Timer <= Milliseconds(diff)) { AppearDelay = false; if (Phase == 2) @@ -218,10 +218,10 @@ class boss_high_astromancer_solarian : public CreatureScript me->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE); me->SetVisible(false); } - AppearDelay_Timer = 2000; + AppearDelay_Timer = 2s; } else - AppearDelay_Timer -= diff; + AppearDelay_Timer -= Milliseconds(diff); } if (Phase == 1) { @@ -316,7 +316,7 @@ class boss_high_astromancer_solarian : public CreatureScript } for (int i = 0; i <= 2; ++i) { - if (Creature* Summoned = me->SummonCreature(NPC_ASTROMANCER_SOLARIAN_SPOTLIGHT, Portals[i][0], Portals[i][1], Portals[i][2], CENTER_O, TEMPSUMMON_TIMED_DESPAWN, Phase2_Timer + Phase3_Timer + AppearDelay_Timer + 1700)) + if (Creature* Summoned = me->SummonCreature(NPC_ASTROMANCER_SOLARIAN_SPOTLIGHT, Portals[i][0], Portals[i][1], Portals[i][2], CENTER_O, TEMPSUMMON_TIMED_DESPAWN, Phase2_Timer + Phase3_Timer + AppearDelay_Timer + 1700ms)) { Summoned->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE); Summoned->CastSpell(Summoned, SPELL_SPOTLIGHT, false); @@ -332,7 +332,7 @@ class boss_high_astromancer_solarian : public CreatureScript //10 seconds after Solarian disappears, 12 mobs spawn out of the three portals. me->AttackStop(); me->StopMoving(); - if (Phase2_Timer <= diff) + if (Phase2_Timer <= Milliseconds(diff)) { Phase = 3; for (int i=0; i <= 2; ++i) @@ -340,17 +340,17 @@ class boss_high_astromancer_solarian : public CreatureScript SummonMinion(NPC_SOLARIUM_AGENT, Portals[i][0], Portals[i][1], Portals[i][2]); Talk(SAY_SUMMON1); - Phase2_Timer = 10000; + Phase2_Timer = 10s; } else - Phase2_Timer -= diff; + Phase2_Timer -= Milliseconds(diff); } else if (Phase == 3) { me->AttackStop(); me->StopMoving(); //Check Phase3_Timer - if (Phase3_Timer <= diff) + if (Phase3_Timer <= Milliseconds(diff)) { Phase = 1; //15 seconds later Solarian reappears out of one of the 3 portals. Simultaneously, 2 healers appear in the two other portals. @@ -367,10 +367,10 @@ class boss_high_astromancer_solarian : public CreatureScript Talk(SAY_SUMMON2); AppearDelay = true; - Phase3_Timer = 15000; + Phase3_Timer = 15s; } else - Phase3_Timer -= diff; + Phase3_Timer -= Milliseconds(diff); } else if (Phase == 4) { diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index ed38cb6ae73..344876f75e5 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -1350,7 +1350,7 @@ class npc_phoenix_tk : public CreatureScript { //is this spell in use anylonger? //DoCast(me, SPELL_EMBER_BLAST, true); - me->SummonCreature(NPC_PHOENIX_EGG, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 16000); + me->SummonCreature(NPC_PHOENIX_EGG, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 16s); } void UpdateAI(uint32 diff) override @@ -1431,7 +1431,7 @@ class npc_phoenix_egg_tk : public CreatureScript if (Rebirth_Timer <= diff) { - me->SummonCreature(NPC_PHOENIX, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_CORPSE_DESPAWN, 5000); + me->SummonCreature(NPC_PHOENIX, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_CORPSE_DESPAWN, 5s); Rebirth_Timer = 0; } else diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp index af016f589b8..9a9003fd0cb 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp @@ -125,7 +125,7 @@ class boss_pathaleon_the_calculator : public CreatureScript { if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { - if (Creature* Wraith = me->SummonCreature(NPC_NETHER_WRAITH, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000)) + if (Creature* Wraith = me->SummonCreature(NPC_NETHER_WRAITH, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25s)) Wraith->AI()->AttackStart(target); } } diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp index b0e44415180..7b4620d6a7d 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp @@ -425,15 +425,15 @@ class npc_warden_mellichar : public CreatureScript switch (urand(0, 1)) { case 0: - me->SummonCreature(ENTRY_TRICKSTER, 478.326f, -148.505f, 42.56f, 3.19f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000); + me->SummonCreature(ENTRY_TRICKSTER, 478.326f, -148.505f, 42.56f, 3.19f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 10min); break; case 1: - me->SummonCreature(ENTRY_PH_HUNTER, 478.326f, -148.505f, 42.56f, 3.19f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000); + me->SummonCreature(ENTRY_PH_HUNTER, 478.326f, -148.505f, 42.56f, 3.19f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 10min); break; } break; case 3: - me->SummonCreature(ENTRY_MILLHOUSE, 413.292f, -148.378f, 42.56f, 6.27f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000); + me->SummonCreature(ENTRY_MILLHOUSE, 413.292f, -148.378f, 42.56f, 6.27f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 10min); break; case 4: Talk(YELL_RELEASE2B); @@ -442,10 +442,10 @@ class npc_warden_mellichar : public CreatureScript switch (urand(0, 1)) { case 0: - me->SummonCreature(ENTRY_AKKIRIS, 420.179f, -174.396f, 42.58f, 0.02f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000); + me->SummonCreature(ENTRY_AKKIRIS, 420.179f, -174.396f, 42.58f, 0.02f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 10min); break; case 1: - me->SummonCreature(ENTRY_SULFURON, 420.179f, -174.396f, 42.58f, 0.02f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000); + me->SummonCreature(ENTRY_SULFURON, 420.179f, -174.396f, 42.58f, 0.02f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 10min); break; } break; @@ -453,15 +453,15 @@ class npc_warden_mellichar : public CreatureScript switch (urand(0, 1)) { case 0: - me->SummonCreature(ENTRY_TW_DRAK, 471.795f, -174.58f, 42.58f, 3.06f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000); + me->SummonCreature(ENTRY_TW_DRAK, 471.795f, -174.58f, 42.58f, 3.06f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 10min); break; case 1: - me->SummonCreature(ENTRY_BL_DRAK, 471.795f, -174.58f, 42.58f, 3.06f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000); + me->SummonCreature(ENTRY_BL_DRAK, 471.795f, -174.58f, 42.58f, 3.06f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 10min); break; } break; case 7: - me->SummonCreature(ENTRY_SKYRISS, 445.763f, -191.639f, 44.64f, 1.60f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000); + me->SummonCreature(ENTRY_SKYRISS, 445.763f, -191.639f, 44.64f, 1.60f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 10min); Talk(YELL_WELCOME); break; } diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp index 902a527a9b3..afc47c5defc 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp @@ -198,7 +198,7 @@ class boss_warp_splinter : public CreatureScript float Y = Treant_Spawn_Pos_Y + TREANT_SPAWN_DIST * std::sin(angle); float O = - me->GetAbsoluteAngle(X, Y); - if (Creature* pTreant = me->SummonCreature(CREATURE_TREANT, treant_pos[i][0], treant_pos[i][1], treant_pos[i][2], O, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 25000)) + if (Creature* pTreant = me->SummonCreature(CREATURE_TREANT, treant_pos[i][0], treant_pos[i][1], treant_pos[i][2], O, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 25s)) ENSURE_AI(npc_warp_splinter_treant::npc_warp_splinter_treantAI, pTreant->AI())->WarpGuid = me->GetGUID(); } Talk(SAY_SUMMON); |
