diff options
Diffstat (limited to 'world/map/npc/annuals/halloween')
-rw-r--r-- | world/map/npc/annuals/halloween/config.txt | 2 | ||||
-rw-r--r-- | world/map/npc/annuals/halloween/debug.txt | 8 | ||||
-rw-r--r-- | world/map/npc/annuals/halloween/munro.txt | 6 | ||||
-rw-r--r-- | world/map/npc/annuals/halloween/trick_or_treat.txt | 8 |
4 files changed, 12 insertions, 12 deletions
diff --git a/world/map/npc/annuals/halloween/config.txt b/world/map/npc/annuals/halloween/config.txt index 7405a1c0..226d8bbb 100644 --- a/world/map/npc/annuals/halloween/config.txt +++ b/world/map/npc/annuals/halloween/config.txt @@ -81,7 +81,7 @@ // BIT 30: NPC #1 // BIT 31: NPC #0 --|script|#HalloweenConfig|-1, +-|script|#HalloweenConfig|-1 { end; diff --git a/world/map/npc/annuals/halloween/debug.txt b/world/map/npc/annuals/halloween/debug.txt index 0da5e361..64da1d38 100644 --- a/world/map/npc/annuals/halloween/debug.txt +++ b/world/map/npc/annuals/halloween/debug.txt @@ -1,7 +1,7 @@ // Halloween Debug // Author: Wushin -function|script|HalloweenDebug|, +function|script|HalloweenDebug { if(debug) goto L_Debug; @@ -139,7 +139,7 @@ L_Close: set @halloween_npc_id, 0; close; } -009-1.gat,51,38,0|script|HalloweenDebug#1|409, +009-1.gat,51,38,0|script|HalloweenDebug#1|409 { callfunc "HalloweenDebug"; goto L_End; @@ -152,7 +152,7 @@ OnInit: L_End: end; } -001-1.gat,38,26,0|script|HalloweenDebug#2|409, +001-1.gat,38,26,0|script|HalloweenDebug#2|409 { callfunc "HalloweenDebug"; goto L_End; @@ -165,7 +165,7 @@ OnInit: L_End: end; } -026-1.gat,23,37,0|script|HalloweenDebug#3|409, +026-1.gat,23,37,0|script|HalloweenDebug#3|409 { callfunc "HalloweenDebug"; goto L_End; diff --git a/world/map/npc/annuals/halloween/munro.txt b/world/map/npc/annuals/halloween/munro.txt index c3ff6367..3b894901 100644 --- a/world/map/npc/annuals/halloween/munro.txt +++ b/world/map/npc/annuals/halloween/munro.txt @@ -1,5 +1,5 @@ // Part of Annual halloween -026-1.gat,24,37,0|script|Munro|183, +026-1.gat,24,37,0|script|Munro|183 { callfunc "HalloweenCheckOld"; callfunc "TrickOrTreatTally"; @@ -30,7 +30,7 @@ L_Halloween: L_Exit: close; } -function|script|SpawnMunro|, +function|script|SpawnMunro { if ($@halloween_time) goto L_EnableMunro; @@ -47,7 +47,7 @@ L_DisableMunro: L_Return: return; } -function|script|CheckMunro|, +function|script|CheckMunro { if (($@halloween_time) || ($@xmas_time)) goto L_Return; diff --git a/world/map/npc/annuals/halloween/trick_or_treat.txt b/world/map/npc/annuals/halloween/trick_or_treat.txt index 150b5939..24a359d2 100644 --- a/world/map/npc/annuals/halloween/trick_or_treat.txt +++ b/world/map/npc/annuals/halloween/trick_or_treat.txt @@ -1,7 +1,7 @@ // Halloween Annual // Authors: alastrim, enchilado, o11c, wushin // See config -function|script|TrickOrTreat|, +function|script|TrickOrTreat { callfunc "HalloweenCheckOld"; if ($@halloween_time) @@ -226,7 +226,7 @@ L_QuickReturn: set @halloween_npc_id, 0; return; } -function|script|TrickOrTreatTally|, +function|script|TrickOrTreatTally { set @npc_loop, 0; set @npc_tally, 0; @@ -249,7 +249,7 @@ L_Return: // Checks for an expired event key // Each new annual event needs a new key // or it will allow completion from last year -function|script|HalloweenCheckOld|, +function|script|HalloweenCheckOld { if(HALLOWEENYEAR == $HALLOWEEN_TIME_KEY[5]) goto L_Return; @@ -263,7 +263,7 @@ L_OldMatch: L_Return: return; } -function|script|HalloweenTree|, +function|script|HalloweenTree { mes "[Confused Tree]"; if ((HALLOWEENTIME & 65535) > ($@halloween_num_npcs * 3)) |