diff options
| author | Jinnaix <37972361+Jinnaix@users.noreply.github.com> | 2021-07-21 19:57:01 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-03-11 19:08:22 +0100 |
| commit | 6cc8bebdd6973920e80d98ff19ac8ec50f70e76c (patch) | |
| tree | c5648534b6f8c5e60936eb1cd2acc129149392f7 /src | |
| parent | 1b22d75019e983e18e2319ce36a57ab5f17e6752 (diff) | |
Game/Event: zone_hellfire_peninsula.cpp (#26724)
* Game/Event: zone_hellfire_peninsula.cpp
Convert script timer into game event
* _events.Reset(); - just in case
* Rename 9999_99_99_99_world.sql to 2021_07_21_03_world.sql
Co-authored-by: Giacomo Pozzoni <giacomopoz@gmail.com>
(cherry picked from commit 39e1d293bf5c26c26d26fe9509189a67ce0c4f37)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/scripts/Outland/zone_hellfire_peninsula.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp index 75511d819c0..3ebfa24c0d4 100644 --- a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp +++ b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp @@ -639,6 +639,8 @@ enum WatchCommanderLeonus EVENT_CAST = 2, EVENT_END = 3, + GAME_EVENT_HELLFIRE = 85, + NPC_INFERNAL_RAIN = 18729, NPC_FEAR_CONTROLLER = 19393, SPELL_INFERNAL_RAIN = 33814, @@ -649,12 +651,13 @@ struct npc_watch_commander_leonus : public ScriptedAI { npc_watch_commander_leonus(Creature* creature) : ScriptedAI(creature) { } - void JustAppeared() override + void OnGameEvent(bool start, uint16 eventId) override { - ScriptedAI::JustAppeared(); - - _events.Reset(); - _events.ScheduleEvent(EVENT_START, 2min, 10min); + if (eventId == GAME_EVENT_HELLFIRE && start) + { + _events.Reset(); + _events.ScheduleEvent(EVENT_START, 1s); + } } void UpdateAI(uint32 diff) override @@ -681,8 +684,6 @@ struct npc_watch_commander_leonus : public ScriptedAI for (Creature* dummy : dummies) if (dummy->GetCreatureData()->movementType == 0) dummy->AI()->SetData(EVENT_START, 0); - - _events.Repeat(1h); break; } } |