Merge pull request #206 from wushin/AST-FIX

AST script fix

24 files changed, 56 insertions, 56 deletions

diff --git a/world/map/npc/functions/banker.txt b/world/map/npc/functions/banker.txt
index df908e62..ea5dfa22 100644
--- a/world/map/npc/functions/banker.txt
+++ b/world/map/npc/functions/banker.txt
@@ -1,6 +1,6 @@
 //
 
-function|script|Banker|,
+function|script|Banker
 {
     if (BankAccount == 0)
         goto L_Start;
diff --git a/world/map/npc/functions/barber.txt b/world/map/npc/functions/barber.txt
index 58fee175..e7491cf3 100644
--- a/world/map/npc/functions/barber.txt
+++ b/world/map/npc/functions/barber.txt
@@ -9,7 +9,7 @@
 // or using GM commands, but scripts (such as this one) can set
 // any value 0-255
 
-function|script|Barber|,
+function|script|Barber
 {
     callfunc "getHeadStyles";
     goto L_Main;
diff --git a/world/map/npc/functions/clear_vars.txt b/world/map/npc/functions/clear_vars.txt
index 588c22d5..c894586b 100644
--- a/world/map/npc/functions/clear_vars.txt
+++ b/world/map/npc/functions/clear_vars.txt
@@ -1,6 +1,6 @@
 // Clears old variables
 
-function|script|ClearVariables|,
+function|script|ClearVariables
 {
     // Tutorial
     if ((TUTORIAL) || (sorfina))
@@ -264,7 +264,7 @@ L_Return:
 // The variable TMW_Quest was used to save the progress in several subquests linearly.
 // The subquests are moved to different nibbles of other variables
 // to make it possible to do some of the quests in parallel.
-function|script|ClearVarTMW_Quest|,
+function|script|ClearVarTMW_Quest
 {
     if (TMW_Quest == 0) goto L_Done;
     if (TMW_Quest <= 6)  goto L_Bernard_Mikhail;
@@ -324,7 +324,7 @@ L_Done:
     return;
 }
 
--|script|#ClearGlobalVars|-1,
+-|script|#ClearGlobalVars|-1
 {
     end;
 
diff --git a/world/map/npc/functions/dailyquest.txt b/world/map/npc/functions/dailyquest.txt
index a0360376..4448feed 100644
--- a/world/map/npc/functions/dailyquest.txt
+++ b/world/map/npc/functions/dailyquest.txt
@@ -27,7 +27,7 @@
 
 // (DailyQuestBonus makes a good reward from non-daily quests)
 
-function|script|DailyQuestPoints|,
+function|script|DailyQuestPoints
 {
     set @dq_earliest, gettimetick(2) - 86400;
     if (DailyQuestTime < @dq_earliest)
@@ -56,7 +56,7 @@ L_Bonus:
     return;
 }
 
-function|script|DailyQuest|,
+function|script|DailyQuest
 {
     callfunc "DailyQuestPoints";
 
diff --git a/world/map/npc/functions/debug.txt b/world/map/npc/functions/debug.txt
index a41633fc..af7fcee0 100755
--- a/world/map/npc/functions/debug.txt
+++ b/world/map/npc/functions/debug.txt
@@ -1,6 +1,6 @@
 // Authors: alastrim, Jenalya, Ali-G
 
-function|script|Debug|,
+function|script|Debug
 {
     goto L_Begin;
 
@@ -916,7 +916,7 @@ L_Close:
 
 }
 
-042-2.gat,30,26,0|script|Debug#0|154,
+042-2.gat,30,26,0|script|Debug#0|154
 {
     callfunc "Debug";
     end;
@@ -926,7 +926,7 @@ OnInit:
     end;
 }
 
-001-1.gat,41,29,0|script|Debug#1|154,
+001-1.gat,41,29,0|script|Debug#1|154
 {
     callfunc "Debug";
     end;
@@ -936,7 +936,7 @@ OnInit:
     end;
 }
 
-009-1.gat,52,33,0|script|Debug#2|154,
+009-1.gat,52,33,0|script|Debug#2|154
 {
     callfunc "Debug";
     end;
@@ -946,7 +946,7 @@ OnInit:
     end;
 }
 
-020-1.gat,75,85,0|script|Debug#3|154,
+020-1.gat,75,85,0|script|Debug#3|154
 {
     callfunc "Debug";
     end;
@@ -956,7 +956,7 @@ OnInit:
     end;
 }
 
-017-9.gat,21,24,0|script|Debug#4|154,
+017-9.gat,21,24,0|script|Debug#4|154
 {
     callfunc "Debug";
     end;
@@ -966,7 +966,7 @@ OnInit:
     end;
 }
 
-027-2.gat,125,103,0|script|Debug#5|154,
+027-2.gat,125,103,0|script|Debug#5|154
 {
     callfunc "Debug";
     end;
diff --git a/world/map/npc/functions/default_npc_checks.txt b/world/map/npc/functions/default_npc_checks.txt
index efe8818b..67815ab1 100644
--- a/world/map/npc/functions/default_npc_checks.txt
+++ b/world/map/npc/functions/default_npc_checks.txt
@@ -4,7 +4,7 @@
 // Range
 // Map, X, Y, Distance in Tiles
 // setarray @npc_loc, 24, 113, 4;
-function|script|PCtoNPCRange|,
+function|script|PCtoNPCRange
 {
     set @npc_check, 0;
     set @Nmap$, getmap() + ".gat";
@@ -26,7 +26,7 @@ L_Return:
 // @delitem_counts Counts of Items to delete
 // @getitem_ids Items to get
 // @getitem_counts Counts of Items to get
-function|script|CheckInventory|,
+function|script|CheckInventory
 {
     set @del_loop, 0;
     set @get_loop, 0;
diff --git a/world/map/npc/functions/evil_obelisk.txt b/world/map/npc/functions/evil_obelisk.txt
index 175040a5..5ea50a3b 100644
--- a/world/map/npc/functions/evil_obelisk.txt
+++ b/world/map/npc/functions/evil_obelisk.txt
@@ -1,4 +1,4 @@
-function|script|EvilObelisk|,
+function|script|EvilObelisk
 {
     mes "[Evil Obelisk]";
     mes "(A mystical aura surrounds this stone. It seems to crave money.)";
diff --git a/world/map/npc/functions/ferry.txt b/world/map/npc/functions/ferry.txt
index 8d530d1f..ec84f3cb 100644
--- a/world/map/npc/functions/ferry.txt
+++ b/world/map/npc/functions/ferry.txt
@@ -1,6 +1,6 @@
 // The ferry system
 
-017-9.gat,27,28,0|script|#FerryConfig|-1,
+017-9.gat,27,28,0|script|#FerryConfig|-1
 {
     end;
 
@@ -39,8 +39,8 @@ L_NextDock:
     cmdothernpc "#k1sound", "Ding";
     cmdothernpc "#k2sound", "Ding";
   
-    //mapannounce "035-2.tmx", " Koga - Main : Now arriving in "+$@MainDocks$[$@MainCurrentDock]+".", 0;
-    //mapannounce "036-2.tmx", " Koga - Candor : Now arriving in "+$@CandorDocks$[$@CandorCurrentDock]+".", 0;
+    //mapannounce "035-2.tmx", " Koga - Main:* Now arriving in "+$@MainDocks$[$@MainCurrentDock]+".", 0;
+    //mapannounce "036-2.tmx", " Koga - Candor:* Now arriving in "+$@CandorDocks$[$@CandorCurrentDock]+".", 0;
     initnpctimer;
     
     if($@MainCurrentDock == 2) goto L_k1city1;
@@ -51,8 +51,8 @@ L_NextDock:
 OnTimer10000:
     if ($@DockTickCount > $@DockLeaveCount)
         goto L_NextDock;
-    //mapannounce "035-2.tmx", "Koga - Main : Now docked in "+$@MainDocks$[$@MainCurrentDock]+", Departing soon", 0;
-    //mapannounce "036-2.tmx", "Koga - Candor : Now docked in "+$@CandorDocks$[$@CandorCurrentDock]+", Departing soon", 0;
+    //mapannounce "035-2.tmx", "Koga - Main:* Now docked in "+$@MainDocks$[$@MainCurrentDock]+", Departing soon", 0;
+    //mapannounce "036-2.tmx", "Koga - Candor:* Now docked in "+$@CandorDocks$[$@CandorCurrentDock]+", Departing soon", 0;
     set $@DockTickCount, $@DockTickCount + 1;
     initnpctimer;
     end;
@@ -90,7 +90,7 @@ L_k2city2:
 end;    
 }
 
-function|script|FerryManifest|,
+function|script|FerryManifest
 {
     mes "Which Ferry do you want to check the schedule for?";
     menu
@@ -119,7 +119,7 @@ L_Close:
     close;
 }
 
-function|script|BoardFerry|,
+function|script|BoardFerry
 {
     mes "Board the ferry?";
     menu
@@ -134,7 +134,7 @@ L_Return:
     return;
 }
 
-function|script|BoardCandorFerry|,
+function|script|BoardCandorFerry
 {
     mes "Board the ferry?";
     menu
diff --git a/world/map/npc/functions/game_rules.txt b/world/map/npc/functions/game_rules.txt
index 5ef85bda..9799b11d 100644
--- a/world/map/npc/functions/game_rules.txt
+++ b/world/map/npc/functions/game_rules.txt
@@ -1,6 +1,6 @@
 //
 
-function|script|GameRules|,
+function|script|GameRules
 {
     set @read, 0;
     menu
@@ -73,7 +73,7 @@ L_Danish:
 
 L_French:
     mes "ATTENTION: this translation is outdated. Please refer to the English version and submit a patch.";
-    mes "Les joueurs ne respectant pas les regles suivantes pourront, a la discretion des moderateurs (GM), etre bannis (jusqu'au banissement eternel inclus) ou avoir leur personnage reinitialise :";
+    mes "Les joueurs ne respectant pas les regles suivantes pourront, a la discretion des moderateurs (GM), etre bannis (jusqu'au banissement eternel inclus) ou avoir leur personnage reinitialise:*";
     mes "1. Ne manquez pas de respect envers les autres joueurs (insultes, language grossier, et autres choses du meme genre a l'intention d'un(e) joueur(se) en particulier ou d'un groupe de joueurs(ses))";
     mes "2. N'utilisez pas de \"bot\" (ceci inclus n'importe quelle activite dans le jeu en etant loin du clavier, dont poser un objet sur le clavier pour attaquer automatiquement les monstres)";
     mes "3. Ne faites pas de publicite inadequate (spam) et de repetitions intempestives (flood) (ceci inclus la repetition de demande de troc (trade))";
diff --git a/world/map/npc/functions/global_event_handler.txt b/world/map/npc/functions/global_event_handler.txt
index 5e923c7e..0e5650e1 100644
--- a/world/map/npc/functions/global_event_handler.txt
+++ b/world/map/npc/functions/global_event_handler.txt
@@ -1,4 +1,4 @@
-017-9.gat,0,0,0|script|#GlobalHandler|-1,
+017-9.gat,0,0,0|script|#GlobalHandler|-1
 {
     end;
 
diff --git a/world/map/npc/functions/gm_island.txt b/world/map/npc/functions/gm_island.txt
index cae9bdb0..7d3954e1 100644
--- a/world/map/npc/functions/gm_island.txt
+++ b/world/map/npc/functions/gm_island.txt
@@ -1,5 +1,5 @@
 // Add Localized Warp in town centers and Message to GM Island
--|script|#GmConfig|-1,
+-|script|#GmConfig|-1
 {
     end;
 
@@ -9,12 +9,12 @@ OnInit:
     disablenpc "Gm Event#3";
     end;
 }
-function|script|GmWarp|,
+function|script|GmWarp
 {
     warp "028-1", 110, 30;
     return;
 }
-function|script|GmDebug|,
+function|script|GmDebug
 {
     if (getgmlevel() < 60)
         goto L_Return;
@@ -42,22 +42,22 @@ L_GmStop:
 L_Return:
     return;
 }
-017-9.gat,32,21,0|script|Gm Event Debug|368,
+017-9.gat,32,21,0|script|Gm Event Debug|368
 {
     callfunc "GmDebug";
     close;
 }
-001-1.gat,49,68,0|script|Gm Event#1|368,0,0,
+001-1.gat,49,68,0|script|Gm Event#1|368,0,0
 {
     callfunc "GmWarp";
     end;
 }
-009-1.gat,46,30,0|script|Gm Event#2|368,0,0,
+009-1.gat,46,30,0|script|Gm Event#2|368,0,0
 {
     callfunc "GmWarp";
     end;
 }
-020-1.gat,67,89,0|script|Gm Event#3|368,0,0,
+020-1.gat,67,89,0|script|Gm Event#3|368,0,0
 {
     callfunc "GmWarp";
     end;
diff --git a/world/map/npc/functions/headstyles.txt b/world/map/npc/functions/headstyles.txt
index 4648ede4..9645d339 100644
--- a/world/map/npc/functions/headstyles.txt
+++ b/world/map/npc/functions/headstyles.txt
@@ -1,7 +1,7 @@
 // headstyles config file
 // author: meko
 
-function|script|getHeadStyles|,
+function|script|getHeadStyles
 {
     set @HairStyles$, 0;
     set @HairColors$, 0;
diff --git a/world/map/npc/functions/inn.txt b/world/map/npc/functions/inn.txt
index 45ed4052..ffa75582 100644
--- a/world/map/npc/functions/inn.txt
+++ b/world/map/npc/functions/inn.txt
@@ -1,6 +1,6 @@
 // INN
 
-function|script|Inn|,
+function|script|Inn
 {
     mes "[" + @npcname$ + "]";
     mes "\"Would you like to rest? It's only " + @cost + " gp.\"";
diff --git a/world/map/npc/functions/lockpicking.txt b/world/map/npc/functions/lockpicking.txt
index 375fd173..e878298e 100644
--- a/world/map/npc/functions/lockpicking.txt
+++ b/world/map/npc/functions/lockpicking.txt
@@ -4,7 +4,7 @@
 // The player has to find the good number of times to hit a pin
 //-----------------------------------------------------------------------------
 
-function|script|LockPicking|,
+function|script|LockPicking
 {
     set @lock_picking_success, 0;
     setarray @pins, rand(1,3), rand(1,3), rand(1,3);
diff --git a/world/map/npc/functions/magic.txt b/world/map/npc/functions/magic.txt
index 2715cf7e..38acb817 100644
--- a/world/map/npc/functions/magic.txt
+++ b/world/map/npc/functions/magic.txt
@@ -10,7 +10,7 @@
 // ------------------------------------------------------------
 // Gain initial magic skill
 // ------------------------------------------------------------
-function|script|MagicGainBasic|,
+function|script|MagicGainBasic
 {
     set MAGIC_FLAGS, MAGIC_FLAGS | MFLAG_DRANK_POTION;
     close;
@@ -19,7 +19,7 @@ function|script|MagicGainBasic|,
 // ------------------------------------------------------------
 // Initialise Menu for selecting a choice of things to ask about
 // ------------------------------------------------------------
-function|script|MagicTalkOptionsSetup|,
+function|script|MagicTalkOptionsSetup
 {
     set @QQ_ELANORE, 1;
     set @QQ_MANASEED, 2;
@@ -39,7 +39,7 @@ function|script|MagicTalkOptionsSetup|,
 // Returns the result in @c, or returns 0 if there is no result
 // ------------------------------------------------------------
 
-function|script|MagicTalkMenu|,
+function|script|MagicTalkMenu
 {
     setarray @choice$, "", "", "", "", "", "", "", "", "", "";
     set @choices_nr, 0;
@@ -169,7 +169,7 @@ L_MenuItems:
 // @SUP_name$		name of the skill to level up
 // @SUP_xp		# of experience points to award if the level up succeeds
 // ------------------------------------------------------------
-function|script|SkillUp|,
+function|script|SkillUp
 {
     if (getskilllv(@SUP_id) >= @SUP_lvl)
         goto L_shortcut;
diff --git a/world/map/npc/functions/mob_points.txt b/world/map/npc/functions/mob_points.txt
index 6e0744c3..eaf0aba3 100644
--- a/world/map/npc/functions/mob_points.txt
+++ b/world/map/npc/functions/mob_points.txt
@@ -1,6 +1,6 @@
 // Mob points
 
-function|script|MobPoints|,
+function|script|MobPoints
 {
     if (@mobID < 1002) goto L_Return;
 
diff --git a/world/map/npc/functions/process_equip.txt b/world/map/npc/functions/process_equip.txt
index 1e93320a..4a4b776f 100644
--- a/world/map/npc/functions/process_equip.txt
+++ b/world/map/npc/functions/process_equip.txt
@@ -1,6 +1,6 @@
 //
 
-function|script|ProcessEquip|,
+function|script|ProcessEquip
 {
     set @head, getequipid(equip_head);
     set @torso, getequipid(equip_torso);
diff --git a/world/map/npc/functions/slot_machine.txt b/world/map/npc/functions/slot_machine.txt
index ebf72471..c25dba03 100644
--- a/world/map/npc/functions/slot_machine.txt
+++ b/world/map/npc/functions/slot_machine.txt
@@ -1,6 +1,6 @@
 //
 
-function|script|SlotMachine|,
+function|script|SlotMachine
 {
     mes "Pull the lever...";
     next;
diff --git a/world/map/npc/functions/soul_menhir.txt b/world/map/npc/functions/soul_menhir.txt
index 0af50a74..e047e928 100644
--- a/world/map/npc/functions/soul_menhir.txt
+++ b/world/map/npc/functions/soul_menhir.txt
@@ -1,4 +1,4 @@
-function|script|SoulMenhir|,
+function|script|SoulMenhir
 {
     mes "[Soul Menhir]";
     mes "(A mystical aura surrounds this stone. You feel mysteriously attracted to it. Something tells you to touch it. What do you do?)";
diff --git a/world/map/npc/functions/strangerquiz.txt b/world/map/npc/functions/strangerquiz.txt
index b3488649..8da3f65a 100644
--- a/world/map/npc/functions/strangerquiz.txt
+++ b/world/map/npc/functions/strangerquiz.txt
@@ -1,5 +1,5 @@
 
-function|script|StrangerQuiz|,
+function|script|StrangerQuiz
 {
     // param @quizparam$$
     // return in @quizanswer$
diff --git a/world/map/npc/functions/time.txt b/world/map/npc/functions/time.txt
index 5f728639..9f141d3e 100644
--- a/world/map/npc/functions/time.txt
+++ b/world/map/npc/functions/time.txt
@@ -6,7 +6,7 @@
 // output @ts_date$ "yyyy-mm-dd"
 // output @ts_time$ "hh:mm:ss"
 
-function|script|time_stamp|,
+function|script|time_stamp
 {
     // local variables
     // if there is reasonable demand, these might be exported
diff --git a/world/map/npc/functions/travelers.txt b/world/map/npc/functions/travelers.txt
index 60db8375..6827aece 100644
--- a/world/map/npc/functions/travelers.txt
+++ b/world/map/npc/functions/travelers.txt
@@ -6,7 +6,7 @@
 // Costs Zeny
 
 // Contains all warp points to find
-017-9.gat,27,28,0|script|#TravelConfig|-1,
+017-9.gat,27,28,0|script|#TravelConfig|-1
 {
     end;
 
@@ -45,7 +45,7 @@ OnInit:
     end;
 }
 
-function|script|TravelerTut|,
+function|script|TravelerTut
 {
     //Explain Travelers
     mes "["+@NpcName$+"]";
@@ -63,7 +63,7 @@ L_Return:
     return;
 }
 
-function|script|Traveler|,
+function|script|Traveler
 {
     mes "["+@NpcName$+"]";
     mes "\"Greetings. I am "+@NpcName$+" the Traveler.\"";
diff --git a/world/map/npc/functions/undead_debug.txt b/world/map/npc/functions/undead_debug.txt
index 4b2a015a..a49fcd76 100644
--- a/world/map/npc/functions/undead_debug.txt
+++ b/world/map/npc/functions/undead_debug.txt
@@ -1,6 +1,6 @@
 // Debug Crypts Battle
 
-function|script|UndeadDebug|,
+function|script|UndeadDebug
 {
     goto L_Main;
 
@@ -82,7 +82,7 @@ L_Close:
 }
 
 // Debug for Krukan
-027-3.gat,84,89,0|script|UndeadDebug3|155,
+027-3.gat,84,89,0|script|UndeadDebug3|155
 {
     set @undeaddebug, 3;
     callfunc "UndeadDebug";
@@ -94,7 +94,7 @@ OnInit:
 }
 
 // Debug for Razha
-027-4.gat,76,79,0|script|UndeadDebug4|155,
+027-4.gat,76,79,0|script|UndeadDebug4|155
 {
     set @undeaddebug, 4;
     callfunc "UndeadDebug";
@@ -106,7 +106,7 @@ OnInit:
 }
 
 // Debug for Terogan
-027-5.gat,72,26,0|script|UndeadDebug5|155,
+027-5.gat,72,26,0|script|UndeadDebug5|155
 {
     set @undeaddebug, 5;
     callfunc "UndeadDebug";
diff --git a/world/map/npc/functions/water_bottle.txt b/world/map/npc/functions/water_bottle.txt
index f24f2bc5..b9a73740 100644
--- a/world/map/npc/functions/water_bottle.txt
+++ b/world/map/npc/functions/water_bottle.txt
@@ -1,6 +1,6 @@
 // Fills empty bottles with water
 
-function|script|WaterBottle|,
+function|script|WaterBottle
 {
     set @COST_PER_BOTTLE, 150;