Merge pull request #206 from wushin/AST-FIX

AST script fix

18 files changed, 24 insertions, 24 deletions

diff --git a/world/map/npc/009-2/_mobs.txt b/world/map/npc/009-2/_mobs.txt
index f404b00d..987e4ef3 100644
--- a/world/map/npc/009-2/_mobs.txt
+++ b/world/map/npc/009-2/_mobs.txt
@@ -3,7 +3,7 @@
 
 
 
-009-2.gat,0,0,0|script|Mob009-2|-1,
+009-2.gat,0,0,0|script|Mob009-2|-1
 {
     end;
 }
diff --git a/world/map/npc/009-2/airlia.txt b/world/map/npc/009-2/airlia.txt
index 3748269d..df430683 100644
--- a/world/map/npc/009-2/airlia.txt
+++ b/world/map/npc/009-2/airlia.txt
@@ -6,7 +6,7 @@
 //   * Airlia quest = 2 unlocks other options, perhaps with future Warrior Guild prospects (this is long term)
 
 
-009-2.gat,123,71,0|script|Airlia|108,
+009-2.gat,123,71,0|script|Airlia|108
 {
     // Subquest 1a: Caretaker's daughter (initial, once)
     set @LETTER_REWARD_GOLD_INITIAL, 1000;
diff --git a/world/map/npc/009-2/alan.txt b/world/map/npc/009-2/alan.txt
index a6209b70..b02b1904 100644
--- a/world/map/npc/009-2/alan.txt
+++ b/world/map/npc/009-2/alan.txt
@@ -8,7 +8,7 @@
 //#################################################################################
 
 // Archer Shop Master
-009-2.gat,99,23,0|script|Alan|125,
+009-2.gat,99,23,0|script|Alan|125
 {
     callfunc "ClearVariables";
 
diff --git a/world/map/npc/009-2/doctor.txt b/world/map/npc/009-2/doctor.txt
index 1f2ecbd3..8810e4e3 100644
--- a/world/map/npc/009-2/doctor.txt
+++ b/world/map/npc/009-2/doctor.txt
@@ -1,6 +1,6 @@
 // Doctor
 
-009-2.gat,148,25,0|script|Doctor|107,
+009-2.gat,148,25,0|script|Doctor|107
 {
     callfunc "ClearVariables";
 
diff --git a/world/map/npc/009-2/drunks.txt b/world/map/npc/009-2/drunks.txt
index 73158c14..c5585d59 100644
--- a/world/map/npc/009-2/drunks.txt
+++ b/world/map/npc/009-2/drunks.txt
@@ -1,6 +1,6 @@
 //Left drinking contest guy
 
-009-2.gat,65,55,0|script|Drinker#1|121,
+009-2.gat,65,55,0|script|Drinker#1|121
 {
     mes "[Binge Drinker]";
     mes "\"Ha! I'll drink muuuch mo.. more than you! Im not ooone biiit dr...dr..unk!\"";
@@ -9,7 +9,7 @@
 
 //Right drinking contest guy
 
-009-2.gat,68,55,0|script|Drinker#2|121,
+009-2.gat,68,55,0|script|Drinker#2|121
 {
     mes "[Binge Drinker]";
     mes "\"I can still drink more! Better give up you... you... teelotaler! MORE BEER MELINDA!\"";
diff --git a/world/map/npc/009-2/inspector.txt b/world/map/npc/009-2/inspector.txt
index 662b0c74..476b4596 100644
--- a/world/map/npc/009-2/inspector.txt
+++ b/world/map/npc/009-2/inspector.txt
@@ -1,6 +1,6 @@
 //
 
-009-2.gat,24,99,0|script|Inspector#Hurnscald|150,
+009-2.gat,24,99,0|script|Inspector#Hurnscald|150
 {
     callfunc "ClearVariables";
 
diff --git a/world/map/npc/009-2/kfahr.txt b/world/map/npc/009-2/kfahr.txt
index 9c772452..ef5cb001 100644
--- a/world/map/npc/009-2/kfahr.txt
+++ b/world/map/npc/009-2/kfahr.txt
@@ -13,7 +13,7 @@
 //#
 //#################################################################################
 
-009-2.gat,67,57,0|script|Kfahr|125,
+009-2.gat,67,57,0|script|Kfahr|125
 {
     set @halloween_npc_id, $@halloween_npc_kfahr;
     callfunc "TrickOrTreat";
diff --git a/world/map/npc/009-2/lena.txt b/world/map/npc/009-2/lena.txt
index d5ce1d8e..e29863c5 100644
--- a/world/map/npc/009-2/lena.txt
+++ b/world/map/npc/009-2/lena.txt
@@ -1,7 +1,7 @@
 // Quest for Fairy Hat and Forest Armor
 // Variables used: nibble 0 of QUEST_Hurnscald
 
-009-2.gat,146,43,0|script|Lena|182,
+009-2.gat,146,43,0|script|Lena|182
 {
     // This NPC previously used the variable TMW_Quest
     callfunc "ClearVarTMW_Quest";
diff --git a/world/map/npc/009-2/misc.txt b/world/map/npc/009-2/misc.txt
index 1959ad9c..ff350b88 100644
--- a/world/map/npc/009-2/misc.txt
+++ b/world/map/npc/009-2/misc.txt
@@ -1,6 +1,6 @@
 //Note in bar
 
-009-2.gat,54,49,0|script|Note#bar|400,
+009-2.gat,54,49,0|script|Note#bar|400
 {
     mes "[Note]";
     mes "\"We refuse service to anyone who:\"";
@@ -12,7 +12,7 @@
 }
 
 //Bookshelf
-009-2.gat,109,44,0|script|#Book|400,
+009-2.gat,109,44,0|script|#Book|400
 {
     if (getskilllv(SKILL_MAGIC))
         goto L_magic;
diff --git a/world/map/npc/009-2/nicholas.txt b/world/map/npc/009-2/nicholas.txt
index 31a1d0da..568f9a71 100644
--- a/world/map/npc/009-2/nicholas.txt
+++ b/world/map/npc/009-2/nicholas.txt
@@ -11,7 +11,7 @@
 //#
 //#################################################################################
 
-009-2.gat,185,55,0|script|Nicholas|135,
+009-2.gat,185,55,0|script|Nicholas|135
 {
     set @SETZER_XP, 100000;
     set @SHIELD_XP, 20000;
diff --git a/world/map/npc/009-2/nurse.txt b/world/map/npc/009-2/nurse.txt
index 44605134..3c6be98a 100644
--- a/world/map/npc/009-2/nurse.txt
+++ b/world/map/npc/009-2/nurse.txt
@@ -22,7 +22,7 @@
 
 
 //######################################################################################
-009-2.gat,147,65,0|script|Nurse|119,
+009-2.gat,147,65,0|script|Nurse|119
 {
     callfunc "ClearVariables";
     set @halloween_npc_id, $@halloween_npc_nurse;
diff --git a/world/map/npc/009-2/olana.txt b/world/map/npc/009-2/olana.txt
index cf200391..7c654759 100644
--- a/world/map/npc/009-2/olana.txt
+++ b/world/map/npc/009-2/olana.txt
@@ -1,6 +1,6 @@
 // Authors: alastrim, Ali-g, Dark Mage
 
-009-2.gat,63,79,0|script|Olana|190,
+009-2.gat,63,79,0|script|Olana|190
 {
     set @MinLevel, 60;
 
diff --git a/world/map/npc/009-2/peter.txt b/world/map/npc/009-2/peter.txt
index 4c0d2bd2..2c739055 100644
--- a/world/map/npc/009-2/peter.txt
+++ b/world/map/npc/009-2/peter.txt
@@ -1,6 +1,6 @@
 // Nicholas' Apprentice and Armorsmith
 
-009-2.gat,183,57,0|script|Peter|157,
+009-2.gat,183,57,0|script|Peter|157
 {
     set @peter_chain_mail_coal, 10;
     set @peter_chain_mail_ingot, 5;
diff --git a/world/map/npc/009-2/richard.txt b/world/map/npc/009-2/richard.txt
index 143de014..f7c48633 100644
--- a/world/map/npc/009-2/richard.txt
+++ b/world/map/npc/009-2/richard.txt
@@ -1,6 +1,6 @@
 //
 
-009-2.gat,20,99,0|script|Richard|161,
+009-2.gat,20,99,0|script|Richard|161
 {
     callfunc "ClearVariables";
     set @npcname$, "Richard";
diff --git a/world/map/npc/009-2/selim.txt b/world/map/npc/009-2/selim.txt
index 81531749..4a19336a 100644
--- a/world/map/npc/009-2/selim.txt
+++ b/world/map/npc/009-2/selim.txt
@@ -5,7 +5,7 @@
 //#                                                                               #
 //#################################################################################
 
-009-2.gat,32,104,0|script|Selim|326,
+009-2.gat,32,104,0|script|Selim|326
 {
     setarray @all_colours$, "red", "green", "dark blue", "yellow", "light blue", "pink", "black", "orange", "purple", "dark green";
 
diff --git a/world/map/npc/009-2/shops.txt b/world/map/npc/009-2/shops.txt
index bcf512b5..1b3ed2ca 100644
--- a/world/map/npc/009-2/shops.txt
+++ b/world/map/npc/009-2/shops.txt
@@ -6,11 +6,11 @@
 
 // Bartender
 // sells beer, cake and steak
-009-2.gat,65,49,0|shop|Barkeeper|112,539:-1,513:-1,676:-1
+009-2.gat,65,49,0|shop|Barkeeper|112,Beer:*1,Cake:*1,Steak:*1
 
 // Receptionist
 // Offers the player to rest at the inn for 100gp
-009-2.gat,50,48,0|script|Receptionist#inn|108,
+009-2.gat,50,48,0|script|Receptionist#inn|108
 {
     set @npcname$, "Receptionist";
     set @cost, 100;
@@ -20,12 +20,12 @@
 
 // Archer Shop
 // sells bow, short bow, arrows and iron arrows
-009-2.gat,97,24,0|shop|Apprentice|120,Arrow :-1,IronArrow :-1,Bow :1000,ShortBow :3000
+009-2.gat,97,24,0|shop|Apprentice|120,Arrow:*1,IronArrow:*1,Bow:*1000,ShortBow:*3000
 
 // Potion Shop
 // sells cactus drink, cactus potion, iron potion, concentration potion, and slow poison potion
-009-2.gat,123,22,0|shop|Potions#_M|400,CactusDrink :-1,CactusPotion :-1,IronPotion :-1,ConcentrationPotion :-1,SlowPoisonPotion :-1
+009-2.gat,123,22,0|shop|Potions#_M|400,CactusDrink:*1,CactusPotion:*1,IronPotion:*1,ConcentrationPotion:*1,SlowPoisonPotion:*1
 
 // General Store
 // Sells various things, many not sold elsewhere
-009-2.gat,32,99,0|shop|General Store#hurnscald|112,Milk :-1,BottleOfWater :-1,CottonShirt :-1,CottonShorts :-1,Boots :-1,SerfHat :-1,CottonHeadband :-1,CottonGloves :-1
+009-2.gat,32,99,0|shop|General Store#hurnscald|112,Milk:*1,BottleOfWater:*1,CottonShirt:*1,CottonShorts:*1,Boots:*1,SerfHat:*1,CottonHeadband:*1,CottonGloves:*1
diff --git a/world/map/npc/009-2/waitress.txt b/world/map/npc/009-2/waitress.txt
index 553e20f6..57eca972 100644
--- a/world/map/npc/009-2/waitress.txt
+++ b/world/map/npc/009-2/waitress.txt
@@ -1,6 +1,6 @@
 // Waitress
 
-009-2.gat,60,52,0|script|Melinda|140,
+009-2.gat,60,52,0|script|Melinda|140
 {
     mes "[Melinda]";
     mes "\"Hi, sweetie! Want a fresh beer for 170 GP?\"";
diff --git a/world/map/npc/009-2/wyara.txt b/world/map/npc/009-2/wyara.txt
index a9b738a0..65c16fc7 100644
--- a/world/map/npc/009-2/wyara.txt
+++ b/world/map/npc/009-2/wyara.txt
@@ -1,7 +1,7 @@
 // ----------------------------------------
 // Wyara the Hurnscald witch
 // ----------------------------------------
-009-2.gat,121,26,0|script|Wyara#_M|103,
+009-2.gat,121,26,0|script|Wyara#_M|103
 {
     set @Q_MASK, NIBBLE_2_MASK;
     set @Q_SHIFT, NIBBLE_2_SHIFT;