Merge pull request #206 from wushin/AST-FIX

AST script fix

6 files changed, 20 insertions, 20 deletions

diff --git a/world/map/npc/052-2/_mobs.txt b/world/map/npc/052-2/_mobs.txt
index f105c44e..9c43d9af 100644
--- a/world/map/npc/052-2/_mobs.txt
+++ b/world/map/npc/052-2/_mobs.txt
@@ -3,7 +3,7 @@
 
 
 
-052-2.gat,0,0,0|script|Mob052-2|-1,
+052-2.gat,0,0,0|script|Mob052-2|-1
 {
     end;
 }
diff --git a/world/map/npc/052-2/chest.txt b/world/map/npc/052-2/chest.txt
index 84c5a5cd..fc57e654 100644
--- a/world/map/npc/052-2/chest.txt
+++ b/world/map/npc/052-2/chest.txt
@@ -12,7 +12,7 @@
 //     3: player choosed to leave the room
 //-----------------------------------------------------------------------------
 
-052-2.gat,136,73,0|script|Chest#illia|111,
+052-2.gat,136,73,0|script|Chest#illia|111
 {
     set @step, 8;
     if ($@illia_progress < @step) goto L_ShouldNotBeHere;
diff --git a/world/map/npc/052-2/janitor.txt b/world/map/npc/052-2/janitor.txt
index 7ee68955..d78c4bba 100644
--- a/world/map/npc/052-2/janitor.txt
+++ b/world/map/npc/052-2/janitor.txt
@@ -1,5 +1,5 @@
 // Lobby janitor
-052-2.gat,1,1,0|script|#IlliaJanitor5|127,
+052-2.gat,1,1,0|script|#IlliaJanitor5|127
 {
 end;
 
@@ -12,7 +12,7 @@ OnCommandClean:
 }
 
 // Storage janitor
-052-2.gat,1,1,0|script|#IlliaJanitor6|127,
+052-2.gat,1,1,0|script|#IlliaJanitor6|127
 {
 end;
 
@@ -24,7 +24,7 @@ OnCommandClean:
 }
 
 // Final boss janitor
-052-2.gat,1,1,0|script|#IlliaJanitor7|127,
+052-2.gat,1,1,0|script|#IlliaJanitor7|127
 {
 end;
 
diff --git a/world/map/npc/052-2/lobby.txt b/world/map/npc/052-2/lobby.txt
index c707c76f..fb9dd41e 100644
--- a/world/map/npc/052-2/lobby.txt
+++ b/world/map/npc/052-2/lobby.txt
@@ -14,7 +14,7 @@
 //     8: Witch guards defeated. Door is open.
 //-----------------------------------------------------------------------------
 
-052-2.gat,40,19,0|script|#InnDoorTrigger|32767,2,2,
+052-2.gat,40,19,0|script|#InnDoorTrigger|32767,2,2
 {
     set @step, 5;
     if ($@illia_progress < @step) goto L_ShouldNotBeHere;
@@ -33,7 +33,7 @@ L_ShouldNotBeHere:
 
 }
 
-052-2.gat,33,40,0|script|#EntranceTrigger|32767,4,2,
+052-2.gat,33,40,0|script|#EntranceTrigger|32767,4,2
 {
     set @step, 5;
     if ($@illia_progress < @step) goto L_ShouldNotBeHere;
@@ -50,7 +50,7 @@ L_ShouldNotBeHere:
     end;
 }
 
-052-2.gat,1,1,0|script|#LuviaShadow|127,
+052-2.gat,1,1,0|script|#LuviaShadow|127
 {
 end;
 
@@ -103,7 +103,7 @@ OnNN:
 
 }
 
-052-2.gat,1,1,0|script|#MysteriousVoice|127,
+052-2.gat,1,1,0|script|#MysteriousVoice|127
 {
 end;
 
@@ -149,7 +149,7 @@ L_Continue:
 
 // Dummy npc to display the mysterious voice,
 // as a workaround to fakenpcname causing problems
-052-2.gat,1,1,0|script|?|127,
+052-2.gat,1,1,0|script|?|127
 {
 end;
 
diff --git a/world/map/npc/052-2/partyroom.txt b/world/map/npc/052-2/partyroom.txt
index ef04a667..a2857e9c 100644
--- a/world/map/npc/052-2/partyroom.txt
+++ b/world/map/npc/052-2/partyroom.txt
@@ -9,7 +9,7 @@
 //     3: Luvia is defeated
 //-----------------------------------------------------------------------------
 
-052-2.gat,88,19,0|script|#TriggerDialog|32767,3,2,
+052-2.gat,88,19,0|script|#TriggerDialog|32767,3,2
 {
     set @step, 7;
     if ($@illia_progress < @step) goto L_ShouldNotBeHere;
@@ -29,7 +29,7 @@ L_ShouldNotBeHere:
 
 // A trigger whose only purpose is to place Luvia npcs back in place.
 // (even though the Janitor 7 will have done this job)
-052-2.gat,77,48,0|script|#TriggerPlaceLuvia|32767,1,1,
+052-2.gat,77,48,0|script|#TriggerPlaceLuvia|32767,1,1
 {
     if (strcharinfo(0) != $@ILLIA_HERO$) end;
     if ($@illia_progress == 7 && $@illia_level_7_progress == 0) goto L_PlaceLuvia;
@@ -42,7 +42,7 @@ L_PlaceLuvia:
 
 }
 
-052-2.gat,88,15,0|script|Luvia|371,
+052-2.gat,88,15,0|script|Luvia|371
 {
     set @step, 7;
     if ($@illia_progress < @step) goto L_ShouldNotBeHere;
@@ -83,7 +83,7 @@ OnTimer15000:
 
 }
 
-052-2.gat,88,15,0|script|#LuviaDaemon|127,
+052-2.gat,88,15,0|script|#LuviaDaemon|127
 {
 end;
 
@@ -214,7 +214,7 @@ OnDeath:
         end;
     set $@illia_level_7_progress, 4;
     killmonster "052-2.gat", "#LuviaDaemon::OnWGD";
-    mapannounce "052-2.gat", "Luvia : How? By mere humans! But we will see again! Enjoy your victory while it lasts, " + $@ILLIA_HERO$ + "!!", 0;
+    mapannounce "052-2.gat", "Luvia:* How? By mere humans! But we will see again! Enjoy your victory while it lasts, " + $@ILLIA_HERO$ + "!!", 0;
 
     set $@illia_bp, $Illia_Luvia_Harvest * 16 / 10 + 120;
     areatimer "052-2.gat", 73, 11, 115, 49, 0, "#LuviaDaemon::OnBP";
@@ -272,7 +272,7 @@ OnW00t:
 }
 
 // Warp from the party room, to the chest room
-052-2.gat,88,12,0|script|#ToLuviaRoomDoor|32767,1,2,
+052-2.gat,88,12,0|script|#ToLuviaRoomDoor|32767,1,2
 {
     set @step, 7;
     if ($@illia_progress < @step) goto L_ShouldNotBeHere;
diff --git a/world/map/npc/052-2/storage.txt b/world/map/npc/052-2/storage.txt
index 50c4bad7..1951cfaf 100644
--- a/world/map/npc/052-2/storage.txt
+++ b/world/map/npc/052-2/storage.txt
@@ -8,7 +8,7 @@
 //     2: All spawns are done and the players killed all mobs
 //-----------------------------------------------------------------------------
 
-052-2.gat,23,69,0|script|#TriggerItemsInvoker|32767,1,0,
+052-2.gat,23,69,0|script|#TriggerItemsInvoker|32767,1,0
 {
     set @step, 6;
     if ($@illia_progress < @step) goto L_ShouldNotBeHere;
@@ -27,14 +27,14 @@ L_StartItemInvoker:
 
 }
 
-052-2.gat,1,1,0|script|#ItemsInvoker|127,
+052-2.gat,1,1,0|script|#ItemsInvoker|127
 {
 end;
 
 OnInit:
     setarray $@illia_storage_items, 541, 567, 568, 562;
     setarray $@illia_storage_special_items, 687, 827, 1229;
-    // Map coords : x1,y1, x2,y2, ...
+    // Map coords:* x1,y1, x2,y2, ...
     setarray $@illia_storage_item_points, 20,67, 22,75, 27,71, 30,73, 34,76, 30,64, 34,65, 34,62, 21,61, 22,64;
     end;
 
@@ -172,7 +172,7 @@ OnWow:
 
 }
 
-052-2.gat,35,68,0|script|#ToPartyRoom|32767,1,1,
+052-2.gat,35,68,0|script|#ToPartyRoom|32767,1,1
 {
     set @step, 6;
     if ($@illia_progress < @step) goto L_ShouldNotBeHere;