Merge pull request #206 from wushin/AST-FIX

AST script fix

15 files changed, 41 insertions, 45 deletions

diff --git a/world/map/npc/021-1/_mobs.txt b/world/map/npc/021-1/_mobs.txt
index 0ec59bf0..285a62e1 100644
--- a/world/map/npc/021-1/_mobs.txt
+++ b/world/map/npc/021-1/_mobs.txt
@@ -1,14 +1,14 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // North Tulimshar mobs
 
-021-1.gat,126,86,3,2|monster|Maggot|1002,2,100000,30000,Mob021-1::On1002
-021-1.gat,90,65,3,2|monster|Maggot|1002,2,100000,30000,Mob021-1::On1002
-021-1.gat,95,124,3,2|monster|Maggot|1002,2,100000,30000,Mob021-1::On1002
-021-1.gat,103,53,6,2|monster|Maggot|1002,5,100000,30000,Mob021-1::On1002
-021-1.gat,98,24,2,2|monster|SeaSlime|1033,1,150000,100000,Mob021-1::On1033
+021-1.gat,126,86,3,2|monster|Maggot|1002,2,100000ms,30000ms,Mob021-1::On1002
+021-1.gat,90,65,3,2|monster|Maggot|1002,2,100000ms,30000ms,Mob021-1::On1002
+021-1.gat,95,124,3,2|monster|Maggot|1002,2,100000ms,30000ms,Mob021-1::On1002
+021-1.gat,103,53,6,2|monster|Maggot|1002,5,100000ms,30000ms,Mob021-1::On1002
+021-1.gat,98,24,2,2|monster|SeaSlime|1033,1,150000ms,100000ms,Mob021-1::On1033
 
 
-021-1.gat,0,0,0|script|Mob021-1|-1,
+021-1.gat,0,0,0|script|Mob021-1|-1
 {
     end;
 
diff --git a/world/map/npc/021-1/bakery.txt b/world/map/npc/021-1/bakery.txt
index 46337613..2bb932da 100644
--- a/world/map/npc/021-1/bakery.txt
+++ b/world/map/npc/021-1/bakery.txt
@@ -1,8 +1,8 @@
 // Outside the bakery
 
-021-1.gat,103,103,0|shop|Ara|163,WhiteCake :-1,ChocolateCake :-1,OrangeCake :-1,AppleCake :-1,CherryCake :-1
+021-1.gat,103,103,0|shop|Ara|163,WhiteCake:*1,ChocolateCake:*1,OrangeCake:*1,AppleCake:*1,CherryCake:*1
 
-021-1.gat,108,102,0|script|Itka|114,
+021-1.gat,108,102,0|script|Itka|114
 {
     mes "[Itka]";
     mes "\"This bakery is the best!\"";
diff --git a/world/map/npc/021-1/banu.txt b/world/map/npc/021-1/banu.txt
index e614fcae..db3830dc 100644
--- a/world/map/npc/021-1/banu.txt
+++ b/world/map/npc/021-1/banu.txt
@@ -3,7 +3,7 @@
 // Using bit 10 and 11 of QUEST_NorthTulimshar (second half of nibble 2)
 // author: Jenalya
 
-021-1.gat,102,54,0|script|Banu|154,
+021-1.gat,102,54,0|script|Banu|154
 {
     set @state, ((QUEST_NorthTulimshar & TWOBIT_5_MASK) >> TWOBIT_5_SHIFT);
     set @EXP, 30;
diff --git a/world/map/npc/021-1/eurni.txt b/world/map/npc/021-1/eurni.txt
index ca514740..e24d774c 100644
--- a/world/map/npc/021-1/eurni.txt
+++ b/world/map/npc/021-1/eurni.txt
@@ -1,6 +1,6 @@
 //
 
-021-1.gat,141,113,0|script|Eurni|136,
+021-1.gat,141,113,0|script|Eurni|136
 {
     set @halloween_npc_id, $@halloween_npc_eurni;
     callfunc "TrickOrTreat";
diff --git a/world/map/npc/021-1/gate_guards.txt b/world/map/npc/021-1/gate_guards.txt
index b26b5ec3..752718e8 100644
--- a/world/map/npc/021-1/gate_guards.txt
+++ b/world/map/npc/021-1/gate_guards.txt
@@ -1,14 +1,14 @@
 // Various guards at gates
 
 // Guards by the gates to the port
-021-1.gat,70,23,0|script|Guard#port1|104,
+021-1.gat,70,23,0|script|Guard#port1|104
 {
     mes "[Guard]";
     mes "\"Lots of stuff happens in the port district. Those sailors can get quite rowdy.\"";
     close;
 }
 
-021-1.gat,110,23,0|script|Guard#port2|104,
+021-1.gat,110,23,0|script|Guard#port2|104
 {
     mes "[Guard]";
     mes "\"You wouldn't believe the refuse that comes in from the docks.\"";
@@ -16,7 +16,7 @@
 }
 
 // Guard near the magic school
-021-1.gat,46,65,0|script|Guard#school|104,
+021-1.gat,46,65,0|script|Guard#school|104
 {
     mes "[Guard]";
     mes "\"I'm just here to provide a presence for the guards at this gate. The mages here can defend themselves without problem.\"";
@@ -24,20 +24,20 @@
 }
 
 // Guards by the gates to East Tulimshar
-021-1.gat,146,23,0|script|Guard#east1|104,
+021-1.gat,146,23,0|script|Guard#east1|104
 {
     mes "[Guard]";
     mes "\"I make sure less desirables don't enter the Noble District.\"";
     close;
 }
-021-1.gat,156,42,0|script|Guard#east2|104,
+021-1.gat,156,42,0|script|Guard#east2|104
 {
     mes "[Guard]";
     mes "\"The volcano and earthquake did a lot of damage, but the citizens of Tulimshar sure did a good job of cleaning up.\"";
     close;
 }
 
-021-1.gat,156,95,0|script|Guard#east3|104,
+021-1.gat,156,95,0|script|Guard#east3|104
 {
     mes "[Guard]";
     mes "\"The Palace is East of here. That is where you will find the Council of Wizards.\"";
@@ -45,7 +45,7 @@
 }
 
 // Near the bazaar, outside the government building
-021-1.gat,55,136,0|script|Guard#govt_out|123,
+021-1.gat,55,136,0|script|Guard#govt_out|123
 {
     mes "[Guard]";
     mes "\"This is a government building. They have some clerical and tax offices in here. There is also a jail in the subbasement.\"";
diff --git a/world/map/npc/021-1/hideandseek.txt b/world/map/npc/021-1/hideandseek.txt
index 4768eef1..621f8468 100644
--- a/world/map/npc/021-1/hideandseek.txt
+++ b/world/map/npc/021-1/hideandseek.txt
@@ -7,7 +7,7 @@
 // Bit 7: unused
 // Author: Jenalya
 
--|script|#hideandseekNTconfig|-1,
+-|script|#hideandseekNTconfig|-1
 {
     end;
 
@@ -21,7 +21,7 @@ OnInit:
     set $@hideandseekNT_ended, (1 << 6);
     end;
 }
-021-1.gat,89,66,0|script|AyashaDebug|258,
+021-1.gat,89,66,0|script|AyashaDebug|258
 {
     mes "[Ayasha Debug]";
     menu
@@ -60,7 +60,7 @@ OnInit:
         disablenpc "AyashaDebug";
     end;
 }
-021-1.gat,87,66,0|script|Ayasha|258,
+021-1.gat,87,66,0|script|Ayasha|258
 {
     set @child_number, 0;
     callfunc "XmasList";
@@ -129,7 +129,7 @@ L_Close:
     close;
 }
 
-022-1.gat,112,23,0|script|Latif|262,
+022-1.gat,112,23,0|script|Latif|262
 {
     set @child_number, 1;
     callfunc "XmasList";
@@ -191,7 +191,7 @@ L_Close:
     close;
 }
 
-001-1.gat,39,33,0|script|Charda|260,
+001-1.gat,39,33,0|script|Charda|260
 {
     set @child_number, 2;
     callfunc "XmasList";
@@ -245,7 +245,7 @@ L_Close:
     close;
 }
 
-021-1.gat,78,87,0|script|Faris|259,
+021-1.gat,78,87,0|script|Faris|259
 {
     set @child_number, 3;
     callfunc "XmasList";
@@ -297,7 +297,7 @@ L_Close:
     close;
 }
 
-022-1.gat,28,34,0|script|Rasin|263,
+022-1.gat,28,34,0|script|Rasin|263
 {
     set @child_number, 4;
     callfunc "XmasList";
@@ -338,7 +338,7 @@ L_Close:
     close;
 }
 
-068-1.gat,94,84,0|script|Ghada|265,
+068-1.gat,94,84,0|script|Ghada|265
 {
     set @child_number, 5;
     callfunc "XmasList";
diff --git a/world/map/npc/021-1/imec.txt b/world/map/npc/021-1/imec.txt
index 07965951..1c280253 100644
--- a/world/map/npc/021-1/imec.txt
+++ b/world/map/npc/021-1/imec.txt
@@ -2,7 +2,7 @@
 // after finishing this, daily quest with scorpion stingers
 // Using bit 8 and 9 of QUEST_NorthTulimshar (first half of nibble 2)
 // author: Jenalya
-021-1.gat,120,31,0|script|Imec|162,
+021-1.gat,120,31,0|script|Imec|162
 {
     set @state, ((QUEST_NorthTulimshar & TWOBIT_4_MASK) >> TWOBIT_4_SHIFT);
     set @money, 500;
diff --git a/world/map/npc/021-1/inac.txt b/world/map/npc/021-1/inac.txt
index 5903e34b..b2ed01bd 100644
--- a/world/map/npc/021-1/inac.txt
+++ b/world/map/npc/021-1/inac.txt
@@ -1,6 +1,6 @@
 //
 
-021-1.gat,53,103,0|script|Inac|156,
+021-1.gat,53,103,0|script|Inac|156
 {
     set @halloween_npc_id, $@halloween_npc_inac;
     callfunc "TrickOrTreat";
diff --git a/world/map/npc/021-1/north_shops.txt b/world/map/npc/021-1/north_shops.txt
index 81a05a20..db6dea50 100644
--- a/world/map/npc/021-1/north_shops.txt
+++ b/world/map/npc/021-1/north_shops.txt
@@ -3,16 +3,16 @@
 // More high-end stuff to satisfy the richer people in Royal Tulimshar
 
 // Some clothing
-021-1.gat,135,36,0|shop|Inar|108,CottonShirt :-1,CottonShorts :-1,CottonBoots :-1,CottonHeadband :-1
+021-1.gat,135,36,0|shop|Inar|108,CottonShirt:*1,CottonShorts:*1,CottonBoots:*1,CottonHeadband:*1
 
-021-1.gat,129,40,0|script|Well|400,
+021-1.gat,129,40,0|script|Well|400
 {
     callfunc "WaterBottle";
     end;
 }
 
 // An officer (for security)
-021-1.gat,128,37,0|script|Officer|150,
+021-1.gat,128,37,0|script|Officer|150
 {
     mes "[Officer]";
     mes "I'm here for extra security for this market.";
diff --git a/world/map/npc/021-1/npcs.txt b/world/map/npc/021-1/npcs.txt
index b4b87108..50d18a6a 100644
--- a/world/map/npc/021-1/npcs.txt
+++ b/world/map/npc/021-1/npcs.txt
@@ -1,6 +1,6 @@
 // Talk NPCs to help make trek interesting between Tutorial and Bazaar.
 
-021-1.gat,77,42,0|script|Jeric|214,
+021-1.gat,77,42,0|script|Jeric|214
 {
     set @npcname$, "Jeric";
 
@@ -12,7 +12,7 @@
     close;
 }
 
-021-1.gat,76,67,0|script|Silvia|207,
+021-1.gat,76,67,0|script|Silvia|207
 {
     set @npcname$, "Silvia";
 
@@ -26,7 +26,7 @@
     close;
 }
 
-021-1.gat,51,123,0|script|Michel|215,
+021-1.gat,51,123,0|script|Michel|215
 {
     set @npcname$, "Michel";
 
diff --git a/world/map/npc/021-1/pauline.txt b/world/map/npc/021-1/pauline.txt
index d28370c4..c2884c19 100644
--- a/world/map/npc/021-1/pauline.txt
+++ b/world/map/npc/021-1/pauline.txt
@@ -12,7 +12,7 @@
 //  @pauline_ingredient2$   Second ingredient input.
 //  @pauline_REWARD         amount of XP gained for telling her ingredients for each spell.
 
-021-1.gat,55,66,0|script|Pauline|208,
+021-1.gat,55,66,0|script|Pauline|208
 {
 
 //Bitmasking
@@ -268,13 +268,11 @@ L_Close:
 
 //Bitmasks
 S_Update_Mask:
-    set QUEST_MAGIC2,
-        (QUEST_MAGIC2 & ~(@Pauline_MASK))
-            | (@pauline_state << @Pauline_SHIFT);
+    set QUEST_MAGIC2, (QUEST_MAGIC2 & ~(@Pauline_MASK)) | (@pauline_state << @Pauline_SHIFT);
     return;
 }
 
-021-1.gat,53,66,0|script|PaulineDebug|208,
+021-1.gat,53,66,0|script|PaulineDebug|208
 {
 //load Bitmasks;
     set @Pauline_MASK, NIBBLE_4_MASK;
@@ -299,9 +297,7 @@ L_Close:
     close;
 
 S_Update_Mask:
-    set QUEST_MAGIC2,
-        (QUEST_MAGIC2 & ~(@Pauline_MASK))
-            | (@pauline_state << @Pauline_SHIFT);
+    set QUEST_MAGIC2, (QUEST_MAGIC2 & ~(@Pauline_MASK)) | (@pauline_state << @Pauline_SHIFT);
     return;
 
 OnInit:
diff --git a/world/map/npc/021-1/sewer_east.txt b/world/map/npc/021-1/sewer_east.txt
index 5dae481e..4a0b22d8 100644
--- a/world/map/npc/021-1/sewer_east.txt
+++ b/world/map/npc/021-1/sewer_east.txt
@@ -1,6 +1,6 @@
 // The Sewer Grate
 
-021-1.gat,145,136,0|script|#tulimsharsewer2|45,0,0,
+021-1.gat,145,136,0|script|#tulimsharsewer2|45,0,0
 {
     mes "Descend into the sewers?";
     next;
diff --git a/world/map/npc/021-1/sewer_north.txt b/world/map/npc/021-1/sewer_north.txt
index 572dbb5b..9c4ed277 100644
--- a/world/map/npc/021-1/sewer_north.txt
+++ b/world/map/npc/021-1/sewer_north.txt
@@ -1,6 +1,6 @@
 // The Sewer Grate
 
-021-1.gat,124,41,0|script|#tulimsharsewer1|45,0,0,
+021-1.gat,124,41,0|script|#tulimsharsewer1|45,0,0
 {
     mes "Descend into the sewers?";
     next;
diff --git a/world/map/npc/021-1/sewer_west.txt b/world/map/npc/021-1/sewer_west.txt
index fcb3aa25..b629c342 100644
--- a/world/map/npc/021-1/sewer_west.txt
+++ b/world/map/npc/021-1/sewer_west.txt
@@ -1,6 +1,6 @@
 // The Sewer Grate
 
-021-1.gat,52,104,0|script|#tulimsharsewer3|45,0,0,
+021-1.gat,52,104,0|script|#tulimsharsewer3|45,0,0
 {
     mes "Descend into the sewers?";
     next;
diff --git a/world/map/npc/021-1/weellos.txt b/world/map/npc/021-1/weellos.txt
index 2607b0fc..9f34e6a5 100644
--- a/world/map/npc/021-1/weellos.txt
+++ b/world/map/npc/021-1/weellos.txt
@@ -1,7 +1,7 @@
 // A historian
 // takes part in quest given by 021-2/kylian.txt
 
-021-1.gat,130,125,0|script|Weellos|103,
+021-1.gat,130,125,0|script|Weellos|103
 {
     set @halloween_npc_id, $@halloween_npc_weellos;
     callfunc "TrickOrTreat";