Merge pull request #206 from wushin/AST-FIX

AST script fix

5 files changed, 12 insertions, 12 deletions

diff --git a/world/map/npc/068-2/_mobs.txt b/world/map/npc/068-2/_mobs.txt
index d7abff17..c0b6cd10 100644
--- a/world/map/npc/068-2/_mobs.txt
+++ b/world/map/npc/068-2/_mobs.txt
@@ -1,10 +1,10 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Tulimshar Noble Indoors mobs
 
-068-2.gat,94,54,5,6|monster|Silkworm|1035,4,10000,85000,Mob068-2::On1035
+068-2.gat,94,54,5,6|monster|Silkworm|1035,4,10000ms,85000ms,Mob068-2::On1035
 
 
-068-2.gat,0,0,0|script|Mob068-2|-1,
+068-2.gat,0,0,0|script|Mob068-2|-1
 {
     end;
 
diff --git a/world/map/npc/068-2/bank.txt b/world/map/npc/068-2/bank.txt
index 70011c70..328d98ae 100644
--- a/world/map/npc/068-2/bank.txt
+++ b/world/map/npc/068-2/bank.txt
@@ -1,5 +1,5 @@
 // Another banker
-068-2.gat,29,83,0|script|Hydusun|149,
+068-2.gat,29,83,0|script|Hydusun|149
 {
     set @npcname$, "Hydusun";
     callfunc "Banker";
diff --git a/world/map/npc/068-2/hetchel.txt b/world/map/npc/068-2/hetchel.txt
index a14b64bd..7c20231f 100644
--- a/world/map/npc/068-2/hetchel.txt
+++ b/world/map/npc/068-2/hetchel.txt
@@ -1,5 +1,5 @@
 //  Hetchel the Silk Weaver
-//  bh28,
+//  bh28
 //  2013-03, GPLv2.
 //
 //  Hetchel is referred to by Lora Tay.
@@ -9,15 +9,15 @@
 //
 //  @wg_state: variable indicating winter gloves status.
 //  Lora Tay proposes silk Robe if (@wg_state>= 11).
-//  @SHEET_COCOONS_NR : Number of cocoons required per sheet.
+//  @SHEET_COCOONS_NR:* Number of cocoons required per sheet.
 //  Might ne calculated from @ROBE_COCOONS_NR/@ROBE_SHEETS_NR
 //  Actually: 150∕6 = 25
-//  @SHEET_ZENY       : Money to pay per sheet: A sixth of 10000-2*500-6000
+//  @SHEET_ZENY      :* Money to pay per sheet: A sixth of 10000-2*500-6000
 //  @SheetCount Number of sheets to buy (variable).
 //
 //  @silkpants_state: variable indicating silkpant quest status.
 
-068-2.gat,62,83,0|script|Hetchel|376,
+068-2.gat,62,83,0|script|Hetchel|376
 {
     set @wg_state, ((QUEST_WG_state & BYTE_0_MASK) >> BYTE_0_SHIFT);
     set @spants_state, ((QUEST_WG_state & NIBBLE_2_MASK) >> NIBBLE_2_SHIFT);
@@ -408,7 +408,7 @@ L_Close:
     close;
 }
 
-068-2.gat,60,83,0|script|HetchelDebug|376,
+068-2.gat,60,83,0|script|HetchelDebug|376
 {
 set @wg_state, ((QUEST_WG_state & BYTE_0_MASK) >> BYTE_0_SHIFT);
 set @spants_state, ((QUEST_WG_state & NIBBLE_2_MASK) >> NIBBLE_2_SHIFT);
diff --git a/world/map/npc/068-2/inya.txt b/world/map/npc/068-2/inya.txt
index f75fc2cb..b3301656 100644
--- a/world/map/npc/068-2/inya.txt
+++ b/world/map/npc/068-2/inya.txt
@@ -1,7 +1,7 @@
 //Gemstones: Diamond (white) , Ruby (red), Emerald (green), Sapphire (blue), Topaz (yellow), Amethyst (purple)
 //The power of the gems is important to future balance of these rings. Are they related to stats, tiers of power, schools of magic?
 
-068-2.gat,29,56,0|script|Inya|106,
+068-2.gat,29,56,0|script|Inya|106
 {
     mes "[Inya]";
     mes "\"I am Inya, a jeweler of fine rings. If you have a Simple Ring and a gem, I can make a nice ring for you for 1,000,000 gold pieces.\"";
diff --git a/world/map/npc/068-2/latoy.txt b/world/map/npc/068-2/latoy.txt
index 9031979f..13225bac 100644
--- a/world/map/npc/068-2/latoy.txt
+++ b/world/map/npc/068-2/latoy.txt
@@ -1,10 +1,10 @@
 // A snobby store that won't sell to the player
 // takes part in quest given by 021-2/kylian.txt
 
-// Shop: DesertShirt :-1,SilkRobe :-5,SerfHat :-1,DesertHat :-4
-068-2.gat,92,83,0|shop|#LatoyShop|127,DesertShirt :-1,SilkRobe :-5,SerfHat :-1,DesertHat :-4
+// Shop: DesertShirt:*1,SilkRobe:*5,SerfHat:*1,DesertHat:*4
+068-2.gat,92,83,0|shop|#LatoyShop|127,DesertShirt:*1,SilkRobe:*5,SerfHat:*1,DesertHat:*4
 
-068-2.gat,92,83,0|script|Latoy|106,
+068-2.gat,92,83,0|script|Latoy|106
 {
     set QUEST_NorthTulimshar, QUEST_NorthTulimshar | $@knowLatoyNT;
     set @kylian, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT);