diff options
| author | Jesusaves <cpntb1@ymail.com> | 2020-05-15 13:24:25 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2020-05-15 13:24:25 -0300 |
| commit | 12fa226622a9ac3cfa4fa455fb27cca85cb8a6d2 (patch) | |
| tree | 440923febc7779a062e639e58d541612c26d71e3 /npc | |
| parent | 8da8efa2aa3ace1c88f0acd344f2be11e4994e2c (diff) | |
| download | serverdata-12fa226622a9ac3cfa4fa455fb27cca85cb8a6d2.tar.gz serverdata-12fa226622a9ac3cfa4fa455fb27cca85cb8a6d2.tar.bz2 serverdata-12fa226622a9ac3cfa4fa455fb27cca85cb8a6d2.tar.xz serverdata-12fa226622a9ac3cfa4fa455fb27cca85cb8a6d2.zip | |
Aurora Event Framework initial commit.
Every 12 weeks, Kamelot Season will begin.
During Kamelot Season, the dungeon may be challenged daily!
However, a minimum cooldown of 6 hours must be respected.
WARNING: THIS RELEASES KAMELOT TO PUBLIC/STABLE
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/014-4/kamelot.txt | 7 | ||||
| -rw-r--r-- | npc/commands/event.txt | 2 | ||||
| -rw-r--r-- | npc/functions/event.txt | 4 | ||||
| -rw-r--r-- | npc/scripts.conf | 1 |
4 files changed, 7 insertions, 7 deletions
diff --git a/npc/014-4/kamelot.txt b/npc/014-4/kamelot.txt index 5ec2b9bd7..760b609a8 100644 --- a/npc/014-4/kamelot.txt +++ b/npc/014-4/kamelot.txt @@ -61,10 +61,9 @@ OnTouch: end; } - // XXX STATUS: STAGING - FINAL TESTING XXX - if ($EVENT$ != "Kamelot") { - dispbottom l("Kamelot Castle gates are closed; Please wait for the GM Team announcements."); - end; + // Aurora Event Framework Handler + if ($EVENT$ == "Kamelot") { + FYE_Kamelot(); } // Save your GID for reference diff --git a/npc/commands/event.txt b/npc/commands/event.txt index 55ae062d5..e65112e79 100644 --- a/npc/commands/event.txt +++ b/npc/commands/event.txt @@ -305,7 +305,7 @@ function script GlobalEventMenu { ("Enable Event Horizon"), ("Enable Christmas"), ("Enable Demure's Birthday"), - ("Enable Kamelot"), + ("[FY] Enable Kamelot"), ("Reset Kill Saulc Event (Monthly)"); switch (@menu) { diff --git a/npc/functions/event.txt b/npc/functions/event.txt index 1ca0c8a81..6c38bd1f4 100644 --- a/npc/functions/event.txt +++ b/npc/functions/event.txt @@ -321,9 +321,9 @@ OnClock0000: // continue... } - // TODO: Trigger event framework + // Trigger event framework if (.@dofy) - debugmes "\033[1mFY event is set to happen..."; + FYNewEvent(); else debugmes "\033[1mAnother event is scheduled!"; } diff --git a/npc/scripts.conf b/npc/scripts.conf index 193e9160b..51db67310 100644 --- a/npc/scripts.conf +++ b/npc/scripts.conf @@ -144,6 +144,7 @@ "npc/functions/gmbot.txt", "npc/functions/instances.txt", "npc/functions/captcha.txt", +"npc/functions/aurora.txt", // Maps specific scripts @include "npc/_import.txt" |