diff options
| author | mekolat <mekolat@users.noreply.github.com> | 2016-03-30 19:52:24 -0400 |
|---|---|---|
| committer | mekolat <mekolat@users.noreply.github.com> | 2016-04-07 06:58:14 -0400 |
| commit | 40add9a2181ef5cb2d8804eeb01c0a190d6c8ee5 (patch) | |
| tree | b2fb2774a570950cb6db582da8a25361e8d70249 /world/map/npc/annuals | |
| parent | c22162b0a8cd9cceab579548bbc1b68ff67ba4dd (diff) | |
| download | serverdata-40add9a2181ef5cb2d8804eeb01c0a190d6c8ee5.tar.gz serverdata-40add9a2181ef5cb2d8804eeb01c0a190d6c8ee5.tar.bz2 serverdata-40add9a2181ef5cb2d8804eeb01c0a190d6c8ee5.tar.xz serverdata-40add9a2181ef5cb2d8804eeb01c0a190d6c8ee5.zip | |
slowly getting things done
explain the debug spell is deprecated
upmarmu typo
cooldown fix
make maps with updated converter, make nodes
update permissions
Diffstat (limited to 'world/map/npc/annuals')
| -rw-r--r-- | world/map/npc/annuals/fathertime.txt | 8 | ||||
| -rw-r--r-- | world/map/npc/annuals/halloween/debug.txt | 1 | ||||
| -rw-r--r-- | world/map/npc/annuals/xmas/debug.txt | 1 |
3 files changed, 2 insertions, 8 deletions
diff --git a/world/map/npc/annuals/fathertime.txt b/world/map/npc/annuals/fathertime.txt index 6d61f446..29406f63 100644 --- a/world/map/npc/annuals/fathertime.txt +++ b/world/map/npc/annuals/fathertime.txt @@ -6,17 +6,13 @@ OnInit: if (debug >= 2) end; - goto L_StartTimer; - -L_StartTimer: - setnpctimer 0; - initnpctimer; + donpcevent strnpcinfo(0) + "::OnTimer20000"; end; OnTimer20000: - setnpctimer 0; donpcevent "#XmasConfig::OnCommandRestartQuest"; donpcevent "#HalloweenConfig::OnCommandRestartQuest"; + donpcevent "Easter Eggs::OnCheckEaster"; initnpctimer; end; } diff --git a/world/map/npc/annuals/halloween/debug.txt b/world/map/npc/annuals/halloween/debug.txt index cbc918e2..8f3d066e 100644 --- a/world/map/npc/annuals/halloween/debug.txt +++ b/world/map/npc/annuals/halloween/debug.txt @@ -42,7 +42,6 @@ L_LastReset: goto L_Debug; L_HalloweenTimeKey: - if (getgmlevel() < 20) goto L_Close; mes "Halloween Time Key Change."; mes "Start Month?"; input @halloween_time_key_smonth; diff --git a/world/map/npc/annuals/xmas/debug.txt b/world/map/npc/annuals/xmas/debug.txt index f0170a0d..6c513ff1 100644 --- a/world/map/npc/annuals/xmas/debug.txt +++ b/world/map/npc/annuals/xmas/debug.txt @@ -96,7 +96,6 @@ L_Reset: goto L_Close; L_XmasTimeKey: - if (getgmlevel() < 20) goto L_Close; mes "Xmas Time Key Change."; mes "Start Month?"; input @xmas_time_key_smonth; |