diff options
author | Jesusaves <cpntb1@ymail.com> | 2020-05-02 08:38:34 -0300 |
---|---|---|
committer | Jesusaves <cpntb1@ymail.com> | 2020-05-02 08:38:34 -0300 |
commit | c3a06533a478c7b949e1c5bfbee31418ce83f352 (patch) | |
tree | 908c9a27a246afc7846e4ec600156abef59ac1ca | |
parent | 6de8b41875b9c0ed4f90fd1058fd33b13c90b83a (diff) | |
download | serverdata-c3a06533a478c7b949e1c5bfbee31418ce83f352.tar.gz serverdata-c3a06533a478c7b949e1c5bfbee31418ce83f352.tar.bz2 serverdata-c3a06533a478c7b949e1c5bfbee31418ce83f352.tar.xz serverdata-c3a06533a478c7b949e1c5bfbee31418ce83f352.zip |
Between asking Arthur to instance_destroy() and setting a timeout...
Timeout wins, Kamelot instances now last 6 hours and are automatically renewed
when someone enters on it.
-rw-r--r-- | npc/014-4/kamelot.txt | 6 | ||||
-rw-r--r-- | npc/042-11/boss.txt | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/npc/014-4/kamelot.txt b/npc/014-4/kamelot.txt index 404df254a..7911f31fe 100644 --- a/npc/014-4/kamelot.txt +++ b/npc/014-4/kamelot.txt @@ -74,7 +74,7 @@ OnTouch: if ($KAMELOT_COOLDOWN[.@g] < gettimeparam(GETTIME_WEEKDAY)) { KamelotCleanup(.@g); } else { - dispbottom l("The gates are firmly shut by some weird magical power."); + dispbottom l("The gates are firmly shut by some weird magical power. %s", (TUTORIAL ? l("Perhaps we should wait a few days."):"")); end; } } @@ -97,7 +97,7 @@ OnTouch: instance_attachmap("042-9", .@inst, .@g, "042-9@"+.@g); instance_attachmap("042-10", .@inst, .@g, "042-10@"+.@g); instance_attachmap("042-11", .@inst, .@g, "042-11@"+.@g); - instance_set_timeout(0, 0, .@inst); // FIXME: Bad Idea? + instance_set_timeout(21600, 21600, .@inst); // Instance lasts 6 hours instance_init(.@inst); $@KAMELOT_ID[.@g] = .@inst; } @@ -105,6 +105,8 @@ OnTouch: // You can enter in every other state if (is_admin()) warp "042-0@"+.@g, any(59, 60), 80; + // Renew the instance clock : 6 hours + instance_set_timeout(21600, 21600, $@KAMELOT_ID[.@g]); end; // Debug is only allowed if server is in override mode diff --git a/npc/042-11/boss.txt b/npc/042-11/boss.txt index 76ddac08f..1e10b1770 100644 --- a/npc/042-11/boss.txt +++ b/npc/042-11/boss.txt @@ -40,6 +40,6 @@ L_NoAccess: // TODO: Boss Showdown // TODO: Spawn GMGiftBox and Treasure Chests upon end - +// TODO: Arthur gives rewards to survivors and boot them out of Kamelot |