diff options
Diffstat (limited to 'npc/functions')
| -rw-r--r-- | npc/functions/aurora.txt | 9 | ||||
| -rw-r--r-- | npc/functions/event.txt | 3 |
2 files changed, 12 insertions, 0 deletions
diff --git a/npc/functions/aurora.txt b/npc/functions/aurora.txt index 20d777478..af6cc7a45 100644 --- a/npc/functions/aurora.txt +++ b/npc/functions/aurora.txt @@ -96,4 +96,13 @@ function script FYE_Regnum { return; } +// Stops any Aurora Event +function script FYStopEvent { + setarray .@av$, "Kamelot", "Regnum"; + if (array_find(.@av$, $EVENT$) >= 0) { + sClear(); + $EVENT$=""; + } + return; +} diff --git a/npc/functions/event.txt b/npc/functions/event.txt index 01afec06b..89c02ee03 100644 --- a/npc/functions/event.txt +++ b/npc/functions/event.txt @@ -321,6 +321,9 @@ OnClock0000: // continue... } + // Stop previous event + FYStopEvent(); + // Trigger event framework if (.@dofy && $EVENT$ == "") FYNewEvent(); |