From 202efdfbd4c20bf1088ea5abb916b47b5fa55968 Mon Sep 17 00:00:00 2001
From: wushin <pasekei@gmail.com>
Date: Wed, 5 Nov 2014 11:07:05 -0600
Subject: Fix Annuals for AST

---
 world/map/npc/annuals/fathertime.txt               |  4 +--
 world/map/npc/annuals/halloween/config.txt         |  2 +-
 world/map/npc/annuals/halloween/debug.txt          |  8 +++---
 world/map/npc/annuals/halloween/munro.txt          |  6 ++---
 world/map/npc/annuals/halloween/trick_or_treat.txt |  8 +++---
 world/map/npc/annuals/tree_beard.txt               | 30 +++++++++++-----------
 world/map/npc/annuals/xmas/barriers.txt            |  8 +++---
 world/map/npc/annuals/xmas/config.txt              |  2 +-
 world/map/npc/annuals/xmas/core.txt                | 26 +++++++++----------
 world/map/npc/annuals/xmas/debug.txt               | 12 ++++-----
 world/map/npc/annuals/xmas/helpers.txt             |  2 +-
 world/map/npc/annuals/xmas/list.txt                |  6 ++---
 world/map/npc/annuals/xmas/mobmanager.txt          | 10 ++++----
 world/map/npc/annuals/xmas/reagents.txt            |  8 +++---
 world/map/npc/annuals/xmas/states.txt              |  2 +-
 15 files changed, 67 insertions(+), 67 deletions(-)

diff --git a/world/map/npc/annuals/fathertime.txt b/world/map/npc/annuals/fathertime.txt
index 4d3cdf68..0cbc5cf6 100644
--- a/world/map/npc/annuals/fathertime.txt
+++ b/world/map/npc/annuals/fathertime.txt
@@ -1,6 +1,6 @@
 // Annual Timer
 // One timer to check to enable all holiday events
-017-9.gat,26,28,0|script|#HolidayConfig|-1,
+017-9.gat,26,28,0|script|#HolidayConfig|-1
 {
     end;
 
@@ -19,7 +19,7 @@ OnTimer20000:
     initnpctimer;
     end;
 }
-017-9.gat,31,24,0|script|HolidayDebug#1|105,
+017-9.gat,31,24,0|script|HolidayDebug#1|105
 {
     if(getgmlevel() < 40)
         goto L_End;
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))
diff --git a/world/map/npc/annuals/tree_beard.txt b/world/map/npc/annuals/tree_beard.txt
index 5923637f..27cf930e 100644
--- a/world/map/npc/annuals/tree_beard.txt
+++ b/world/map/npc/annuals/tree_beard.txt
@@ -1,80 +1,80 @@
 // Annual Environment changes
-020-1.gat,90,78,0|script|#GhostTreeOne|133,
+020-1.gat,90,78,0|script|#GhostTreeOne|133
 {
     callfunc "HalloweenTree";
     close;
 }
 
-020-1.gat,90,78,0|script|#Tree|380,
+020-1.gat,90,78,0|script|#Tree|380
 {
     end;
 }
 
-020-1.gat,90,78,0|script|#XmasTree|379,
+020-1.gat,90,78,0|script|#XmasTree|379
 {
     end;
 }
 
-020-1.gat,90,79,0|script|Present#1|386,
+020-1.gat,90,79,0|script|Present#1|386
 {
     callfunc "XmasStates";
     callfunc "XmasMainItemReward";
     close;
 }
 
-009-1.gat,54,38,0|script|#GhostTreeTwo|133,
+009-1.gat,54,38,0|script|#GhostTreeTwo|133
 {
     callfunc "HalloweenTree";
     close;
 }
 
-009-1.gat,54,38,0|script|#TreeNoSnow|394,
+009-1.gat,54,38,0|script|#TreeNoSnow|394
 {
     end;
 }
 
-009-1.gat,54,38,0|script|#XmasTreeNoSnow|381,
+009-1.gat,54,38,0|script|#XmasTreeNoSnow|381
 {
     end;
 }
 
-009-1.gat,54,39,0|script|Present#2|386,
+009-1.gat,54,39,0|script|Present#2|386
 {
     callfunc "XmasStates";
     callfunc "XmasMainItemReward";
     close;
 }
 
-001-1.gat,41,45,0|script|#GhostTreeThree|133,
+001-1.gat,41,45,0|script|#GhostTreeThree|133
 {
     callfunc "HalloweenTree";
     close;
 }
 
-001-1.gat,41,45,0|script|#PalmTree|384,
+001-1.gat,41,45,0|script|#PalmTree|384
 {
     end;
 }
 
-001-1.gat,41,46,0|script|Present#3|386,
+001-1.gat,41,46,0|script|Present#3|386
 {
     callfunc "XmasStates";
     callfunc "XmasMainItemReward";
     close;
 }
 
-001-1.gat,41,45,0|script|#XmasPalmTree|383,
+001-1.gat,41,45,0|script|#XmasPalmTree|383
 {
     end;
 }
 
-function|script|SpawnMobs|,
+function|script|SpawnMobs
 {
     cmdothernpc "XmasSpawnManager", "SpawnStart";
     return;
 }
 
-function|script|PresentHandler|,
+function|script|PresentHandler
 {
     if($@xmas_time == $@xmas_reward_time)
         goto L_DeliverPresents;
@@ -96,7 +96,7 @@ L_Return:
     return;
 }
 
-function|script|ReplaceTrees|,
+function|script|ReplaceTrees
 {
     disablenpc "#Tree";
     disablenpc "#TreeNoSnow";
diff --git a/world/map/npc/annuals/xmas/barriers.txt b/world/map/npc/annuals/xmas/barriers.txt
index 07bff6f7..551c59f6 100644
--- a/world/map/npc/annuals/xmas/barriers.txt
+++ b/world/map/npc/annuals/xmas/barriers.txt
@@ -2,7 +2,7 @@
 // author: Jenalya, Chayenne, cinderweb, wushin
 // please see #XmasConfig
 
-function|script|ThrowOutTheBum|,
+function|script|ThrowOutTheBum
 {
     if((@xmas_thrown_out) && ($@xmas_time))
         goto L_SideOut;
@@ -31,7 +31,7 @@ L_Return:
 }
 
 // Annual Xmas Boss Fight Door
-030-2.gat,153,21,0|script|#DarkDoor|45,0,0,
+030-2.gat,153,21,0|script|#DarkDoor|45,0,0
 {
     callfunc "XmasStates";
 
@@ -67,7 +67,7 @@ L_Close:
 
 // Annual Xmas secret passage to a trapdoor in Santa's Inn Basement
 
-030-3.gat,100,49,0|script|SmallCrack#XmasPassage|400,0,1,
+030-3.gat,100,49,0|script|SmallCrack#XmasPassage|400,0,1
 {
     callfunc "XmasStates";
 
@@ -134,7 +134,7 @@ L_Close:
 }
 
 // Annual Xmas Escape Hatch
-030-2.gat,48,44,0|script|#BasementDoor|45,0,0,
+030-2.gat,48,44,0|script|#BasementDoor|45,0,0
 {
     callfunc "XmasStates";
 
diff --git a/world/map/npc/annuals/xmas/config.txt b/world/map/npc/annuals/xmas/config.txt
index e8ac5cc2..5a982c5c 100644
--- a/world/map/npc/annuals/xmas/config.txt
+++ b/world/map/npc/annuals/xmas/config.txt
@@ -38,7 +38,7 @@
 // 30: Helper Bit
 // 31: Side Choosen: Naughty vs. Nice
 
--|script|#XmasConfig|-1,
+-|script|#XmasConfig|-1
 {
     end;
 
diff --git a/world/map/npc/annuals/xmas/core.txt b/world/map/npc/annuals/xmas/core.txt
index c925b6eb..30562e13 100644
--- a/world/map/npc/annuals/xmas/core.txt
+++ b/world/map/npc/annuals/xmas/core.txt
@@ -2,7 +2,7 @@
 // author: Jenalya, Chayenne, cinderweb, wushin
 // please see #XmasConfig
 
-function|script|XmasNaughty|,
+function|script|XmasNaughty
 {
     set @xmas_karma, ((XMASTIME & NIBBLE_1_MASK) >> NIBBLE_1_SHIFT);
     if((@xmas_karma - @karma_bonus) >= 0)
@@ -23,7 +23,7 @@ L_Return:
     return;
 }
 
-function|script|XmasNice|,
+function|script|XmasNice
 {
     set @xmas_karma, ((XMASTIME & NIBBLE_1_MASK) >> NIBBLE_1_SHIFT);
     if((@xmas_karma + @karma_bonus) < 16)
@@ -45,7 +45,7 @@ L_Return:
 }
 
 // Called for a basic reward for quests state completion
-function|script|XmasXpReward|,
+function|script|XmasXpReward
 {
     if (BaseLevel >= 10)
         goto L_HigherLevel;
@@ -63,44 +63,44 @@ L_Return:
     return;
 }
 
-function|script|XmasSetState|,
+function|script|XmasSetState
 {
     set XMASTIME, (XMASTIME & ~(NIBBLE_0_MASK) | (@xmas_state << NIBBLE_0_SHIFT));
     return;
 }
 
-function|script|XmasSetSide|,
+function|script|XmasSetSide
 {
     set XMASTIME, XMASTIME | $@xmas_side_bit;
     return;
 }
 
-function|script|XmasSetRoute|,
+function|script|XmasSetRoute
 {
     set XMASTIME, XMASTIME | $@xmas_route_bit;
     return;
 }
 
-function|script|XmasThrowOut|,
+function|script|XmasThrowOut
 {
     set XMASTIME, XMASTIME | $@xmas_thrown_out_bit;
     return;
 }
 
-function|script|XmasSetBossStart|,
+function|script|XmasSetBossStart
 {
     set XMASTIME, XMASTIME | $@xmas_boss_start_bit;
     return;
 }
 
-function|script|XmasSetBossHero|,
+function|script|XmasSetBossHero
 {
     set XMASTIME, XMASTIME | $@xmas_boss_hero_bit;
     return;
 }
 
 // Tallys the players quest
-function|script|XmasSetReward|,
+function|script|XmasSetReward
 {
     set @xmas_endgame, 0;
     set @xmas_reward_side, 0;
@@ -138,7 +138,7 @@ L_SetRewardBonus:
 }
 
 // Main quest completion reward
-function|script|XmasMainXpBpReward|,
+function|script|XmasMainXpBpReward
 {
     callfunc "XmasSetReward";
 
@@ -169,7 +169,7 @@ L_XmasExp:
 }
 
 // Final Item reward
-function|script|XmasMainItemReward|,
+function|script|XmasMainItemReward
 {
     callfunc "XmasSetReward";
 
@@ -237,7 +237,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|XmasCheckOld|,
+function|script|XmasCheckOld
 {
     if(XMASYEAR == $XMAS_TIME_KEY[5])
         goto L_Return;
diff --git a/world/map/npc/annuals/xmas/debug.txt b/world/map/npc/annuals/xmas/debug.txt
index a26565b6..248321fb 100644
--- a/world/map/npc/annuals/xmas/debug.txt
+++ b/world/map/npc/annuals/xmas/debug.txt
@@ -2,7 +2,7 @@
 // author: Jenalya, Chayenne, cinderweb, wushin
 // please see #XmasConfig
 
-function|script|XmasDebug|,
+function|script|XmasDebug
 {
     if(debug)
         goto L_Debug;
@@ -171,7 +171,7 @@ L_Close:
     close;
 }
 
-030-1.gat,91,48,0|script|XmasDebug#1|105,
+030-1.gat,91,48,0|script|XmasDebug#1|105
 {
     callfunc "XmasDebug";
     goto L_End;
@@ -185,7 +185,7 @@ L_End:
     end;
 }
 
-030-2.gat,193,62,0|script|XmasDebug#2|105,
+030-2.gat,193,62,0|script|XmasDebug#2|105
 {
     callfunc "XmasDebug";
     goto L_End;
@@ -199,7 +199,7 @@ L_End:
     end;
 }
 
-030-3.gat,26,26,0|script|XmasDebug#3|105,
+030-3.gat,26,26,0|script|XmasDebug#3|105
 {
     callfunc "XmasDebug";
     goto L_End;
@@ -213,7 +213,7 @@ L_End:
     end;
 }
 
-030-4.gat,30,30,0|script|XmasDebug#4|111,
+030-4.gat,30,30,0|script|XmasDebug#4|111
 {
     callfunc "XmasDebug";
     goto L_End;
@@ -227,7 +227,7 @@ L_End:
     end;
 }
 
-020-1.gat,86,76,0|script|XmasDebug#5|105,
+020-1.gat,86,76,0|script|XmasDebug#5|105
 {
     callfunc "XmasDebug";
     goto L_End;
diff --git a/world/map/npc/annuals/xmas/helpers.txt b/world/map/npc/annuals/xmas/helpers.txt
index eeb8c50c..0d566de7 100644
--- a/world/map/npc/annuals/xmas/helpers.txt
+++ b/world/map/npc/annuals/xmas/helpers.txt
@@ -3,7 +3,7 @@
 // please see #XmasConfig
 // TODO: Make Helpers static functions
 
-function|script|XmasHelperPoints|,
+function|script|XmasHelperPoints
 {
     set @xmas_helper_count, 0;
     set @xmas_helper_loop, 0;
diff --git a/world/map/npc/annuals/xmas/list.txt b/world/map/npc/annuals/xmas/list.txt
index 94dc4b23..1805e6a8 100644
--- a/world/map/npc/annuals/xmas/list.txt
+++ b/world/map/npc/annuals/xmas/list.txt
@@ -2,7 +2,7 @@
 // author: Jenalya, Chayenne, cinderweb, wushin
 // please see #XmasConfig
 
-function|script|XmasCheckList|,
+function|script|XmasCheckList
 {
     set @xmas_list_count, 0;
     set @xmas_list_loop, 0;
@@ -47,7 +47,7 @@ L_Return:
     return;
 }
 
-function|script|XmasList|,
+function|script|XmasList
 {
     callfunc "XmasStates";
 
@@ -79,7 +79,7 @@ L_Return:
     return;
 }
 
-function|script|XmasListList|,
+function|script|XmasListList
 {
     set @xmas_list_loop, 0;
     set @xmas_child_loop, 0;
diff --git a/world/map/npc/annuals/xmas/mobmanager.txt b/world/map/npc/annuals/xmas/mobmanager.txt
index 71393290..59f48cb7 100644
--- a/world/map/npc/annuals/xmas/mobmanager.txt
+++ b/world/map/npc/annuals/xmas/mobmanager.txt
@@ -1,6 +1,6 @@
 // Spawns mobs
 
-019-1.gat,0,0,0|script|XmasSpawnManager|400,
+019-1.gat,0,0,0|script|XmasSpawnManager|400
 {
     end;
 
@@ -54,7 +54,7 @@ L_End:
     end;
 }
 
-019-1.gat,0,0,0|script|XmasSpawnCounter#0|400,
+019-1.gat,0,0,0|script|XmasSpawnCounter#0|400
 {
     end;
 
@@ -63,7 +63,7 @@ OnTally:
     end;
 }
 
-019-3.gat,0,0,0|script|XmasSpawnCounter#1|400,
+019-3.gat,0,0,0|script|XmasSpawnCounter#1|400
 {
     end;
 
@@ -72,7 +72,7 @@ OnTally:
     end;
 }
 
-030-1.gat,0,0,0|script|XmasSpawnCounter#2|400,
+030-1.gat,0,0,0|script|XmasSpawnCounter#2|400
 {
     end;
 
@@ -81,7 +81,7 @@ OnTally:
     end;
 }
 
-030-3.gat,0,0,0|script|XmasSpawnCounter#3|400,
+030-3.gat,0,0,0|script|XmasSpawnCounter#3|400
 {
     end;
 
diff --git a/world/map/npc/annuals/xmas/reagents.txt b/world/map/npc/annuals/xmas/reagents.txt
index 0b4eaa8b..4adcaf12 100644
--- a/world/map/npc/annuals/xmas/reagents.txt
+++ b/world/map/npc/annuals/xmas/reagents.txt
@@ -2,7 +2,7 @@
 // author: Jenalya, Chayenne, cinderweb, wushin
 // please see #XmasConfig
 
-function|script|CheckReagents|,
+function|script|CheckReagents
 {
     set @xmas_reagent_loop, 0;
     if((@xmas_reagent_done_state) || !(@xmas_reagent_start_state))
@@ -42,7 +42,7 @@ L_Return:
     return;
 }
 
-function|script|DeleteReagents|,
+function|script|DeleteReagents
 {
     set @xmas_reagent_loop, 0;
     if(@xmas_side)
@@ -73,7 +73,7 @@ L_Return:
     return;
 }
 
-function|script|ListReagents|,
+function|script|ListReagents
 {
     set @xmas_reagent_loop, 0;
     mes "\"I'm going to need \"";
@@ -109,7 +109,7 @@ L_AllReagents:
     return;
 }
 
-function|script|BadPowderMake|,
+function|script|BadPowderMake
 {
     if(countitem("PileOfAsh") < ($@xmas_red_amount + $@xmas_yellow_amount))
         goto L_NotEnough;
diff --git a/world/map/npc/annuals/xmas/states.txt b/world/map/npc/annuals/xmas/states.txt
index 8d81864f..49f51000 100644
--- a/world/map/npc/annuals/xmas/states.txt
+++ b/world/map/npc/annuals/xmas/states.txt
@@ -2,7 +2,7 @@
 // author: Jenalya, Chayenne, cinderweb, wushin
 // please see #XmasConfig
 
-function|script|XmasStates|,
+function|script|XmasStates
 {
     // Check for Old Quest Line Keys. Reset Quest if so.
     callfunc "XmasCheckOld";
-- 
cgit v1.2.3-60-g2f50