Merge pull request #206 from wushin/AST-FIX

AST script fix

6 files changed, 36 insertions, 36 deletions

diff --git a/world/map/npc/051-3/_mobs.txt b/world/map/npc/051-3/_mobs.txt
index 6166fefa..cc796b3b 100644
--- a/world/map/npc/051-3/_mobs.txt
+++ b/world/map/npc/051-3/_mobs.txt
@@ -1,25 +1,25 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Illia Bandit Cave mobs
 
-051-3.gat,31,52,21,13|monster|RedSlime|1008,8,100000,30000,Mob051-3::On1008
-051-3.gat,31,52,19,14|monster|CaveMaggot|1056,3,100000,30000,Mob051-3::On1056
-051-3.gat,56,102,3,2|monster|Spider|1012,1,100000,250000,Mob051-3::On1012
-051-3.gat,61,102,2,2|monster|Spider|1012,1,100000,250000,Mob051-3::On1012
-051-3.gat,65,102,2,2|monster|Spider|1012,1,100000,250000,Mob051-3::On1012
-051-3.gat,71,109,4,2|monster|BlackScorpion|1009,1,100000,250000,Mob051-3::On1009
-051-3.gat,59,56,12,36|monster|Bandit|1064,47,100000,10000,Mob051-3::On1064
-051-3.gat,59,44,13,13|monster|BanditLord|1065,4,100000,20000,Mob051-3::On1065
-051-3.gat,60,69,18,9|monster|BanditLord|1065,4,100000,20000,Mob051-3::On1065
-051-3.gat,63,94,0,0|monster|SleepingBandit|1099,1,100000,60000,Mob051-3::On1099
-051-3.gat,53,93,0,0|monster|SleepingBandit|1099,1,100000,60000,Mob051-3::On1099
-051-3.gat,48,71,0,0|monster|SleepingBandit|1099,1,100000,60000,Mob051-3::On1099
-051-3.gat,38,30,17,12|monster|Bandit|1064,12,100000,10000,Mob051-3::On1064
-051-3.gat,39,33,11,8|monster|BanditLord|1065,2,100000,20000,Mob051-3::On1065
-051-3.gat,80,101,10,12|monster|CopperSlime|1098,7,100000,60000,Mob051-3::On1098
-051-3.gat,60,94,18,5|monster|CopperSlime|1098,7,100000,60000,Mob051-3::On1098
+051-3.gat,31,52,21,13|monster|RedSlime|1008,8,100000ms,30000ms,Mob051-3::On1008
+051-3.gat,31,52,19,14|monster|CaveMaggot|1056,3,100000ms,30000ms,Mob051-3::On1056
+051-3.gat,56,102,3,2|monster|Spider|1012,1,100000ms,250000ms,Mob051-3::On1012
+051-3.gat,61,102,2,2|monster|Spider|1012,1,100000ms,250000ms,Mob051-3::On1012
+051-3.gat,65,102,2,2|monster|Spider|1012,1,100000ms,250000ms,Mob051-3::On1012
+051-3.gat,71,109,4,2|monster|BlackScorpion|1009,1,100000ms,250000ms,Mob051-3::On1009
+051-3.gat,59,56,12,36|monster|Bandit|1064,47,100000ms,10000ms,Mob051-3::On1064
+051-3.gat,59,44,13,13|monster|BanditLord|1065,4,100000ms,20000ms,Mob051-3::On1065
+051-3.gat,60,69,18,9|monster|BanditLord|1065,4,100000ms,20000ms,Mob051-3::On1065
+051-3.gat,63,94,0,0|monster|SleepingBandit|1099,1,100000ms,60000ms,Mob051-3::On1099
+051-3.gat,53,93,0,0|monster|SleepingBandit|1099,1,100000ms,60000ms,Mob051-3::On1099
+051-3.gat,48,71,0,0|monster|SleepingBandit|1099,1,100000ms,60000ms,Mob051-3::On1099
+051-3.gat,38,30,17,12|monster|Bandit|1064,12,100000ms,10000ms,Mob051-3::On1064
+051-3.gat,39,33,11,8|monster|BanditLord|1065,2,100000ms,20000ms,Mob051-3::On1065
+051-3.gat,80,101,10,12|monster|CopperSlime|1098,7,100000ms,60000ms,Mob051-3::On1098
+051-3.gat,60,94,18,5|monster|CopperSlime|1098,7,100000ms,60000ms,Mob051-3::On1098
 
 
-051-3.gat,0,0,0|script|Mob051-3|-1,
+051-3.gat,0,0,0|script|Mob051-3|-1
 {
     end;
 
diff --git a/world/map/npc/051-3/ambush.txt b/world/map/npc/051-3/ambush.txt
index 109d55b2..10cf8d28 100644
--- a/world/map/npc/051-3/ambush.txt
+++ b/world/map/npc/051-3/ambush.txt
@@ -10,13 +10,13 @@
 //     4: Key of the door found, to leave the cave
 //-----------------------------------------------------------------------------
 
-051-3.gat,40,52,0|script|#WayBlockedTrigger|32767,2,2,
+051-3.gat,40,52,0|script|#WayBlockedTrigger|32767,2,2
 {
     message strcharinfo(0), "There is no way I can pass here. Let's find another way.";
     end;
 }
 
-051-3.gat,31,70,0|script|#AmbushReadyTrigger|32767,2,2,
+051-3.gat,31,70,0|script|#AmbushReadyTrigger|32767,2,2
 {
     set @step, 2;
     if ($@illia_progress < @step) goto L_ShouldNotBeHere;
@@ -34,7 +34,7 @@ L_ShouldNotBeHere:
 
 }
 
-051-3.gat,31,93,0|script|#BanditAmbushTrigger|32767,3,3,
+051-3.gat,31,93,0|script|#BanditAmbushTrigger|32767,3,3
 {
     set @step, 2;
     if ($@illia_progress < @step) goto L_ShouldNotBeHere;
@@ -52,7 +52,7 @@ L_ShouldNotBeHere:
     end;
 }
 
-051-3.gat,1,1,0|script|#BndtTl|127,
+051-3.gat,1,1,0|script|#BndtTl|127
 {
     end;
 
@@ -141,7 +141,7 @@ L_CaptureHelper3:
 
 }
 
-051-3.gat,29,94,0|script|Sneaky Bandit|127,
+051-3.gat,29,94,0|script|Sneaky Bandit|127
 {
     end;
 
@@ -161,7 +161,7 @@ OnTimer3600:
 
 }
 
-051-3.gat,33,95,0|script|Another Sneaky Bandit|127,
+051-3.gat,33,95,0|script|Another Sneaky Bandit|127
 {
     end;
 
diff --git a/world/map/npc/051-3/jailslimes.txt b/world/map/npc/051-3/jailslimes.txt
index e0ad4062..48a70de9 100644
--- a/world/map/npc/051-3/jailslimes.txt
+++ b/world/map/npc/051-3/jailslimes.txt
@@ -1,10 +1,10 @@
 // Separate spawns for the copper slimes in the 4 jails
-051-3.gat,57,104,1,1|monster|Copper Slime|1098,1,60000,30000,IlliaCMobs051-3::On1098
-051-3.gat,62,104,1,1|monster|Copper Slime|1098,1,60000,30000,IlliaCMobs051-3::On1098
-051-3.gat,63,104,1,1|monster|Copper Slime|1098,1,60000,30000,IlliaCMobs051-3::On1098
-051-3.gat,70,111,1,1|monster|Copper Slime|1098,1,60000,30000,IlliaCMobs051-3::On1098
+051-3.gat,57,104,1,1|monster|CopperSlime|1098,1,60000ms,30000ms,IlliaCMobs051-3::On1098
+051-3.gat,62,104,1,1|monster|CopperSlime|1098,1,60000ms,30000ms,IlliaCMobs051-3::On1098
+051-3.gat,63,104,1,1|monster|CopperSlime|1098,1,60000ms,30000ms,IlliaCMobs051-3::On1098
+051-3.gat,70,111,1,1|monster|CopperSlime|1098,1,60000ms,30000ms,IlliaCMobs051-3::On1098
 
-051-3.gat,0,0,0|script|IlliaCMobs051-3|-1,
+051-3.gat,0,0,0|script|IlliaCMobs051-3|-1
 {
     end;
 
diff --git a/world/map/npc/051-3/janitor.txt b/world/map/npc/051-3/janitor.txt
index 527ca24c..c33d791b 100644
--- a/world/map/npc/051-3/janitor.txt
+++ b/world/map/npc/051-3/janitor.txt
@@ -1,5 +1,5 @@
 // Bandit cave janitor
-051-3.gat,1,1,0|script|#IlliaJanitor2|127,
+051-3.gat,1,1,0|script|#IlliaJanitor2|127
 {
 end;
 
diff --git a/world/map/npc/051-3/locks.txt b/world/map/npc/051-3/locks.txt
index e04740af..f0fcb9d7 100644
--- a/world/map/npc/051-3/locks.txt
+++ b/world/map/npc/051-3/locks.txt
@@ -1,4 +1,4 @@
-051-3.gat,69,107,0|script|Jail Lock 1|400,
+051-3.gat,69,107,0|script|Jail Lock 1|400
 {
     if (isin("051-3.gat", 69, 108, 73, 111)) goto L_Do_Lock_Picking;
     end;
@@ -17,7 +17,7 @@ L_OpenDoor:
     close;
 }
 
-051-3.gat,64,100,0|script|Jail Lock 2|400,
+051-3.gat,64,100,0|script|Jail Lock 2|400
 {
     if (isin("051-3.gat", 64, 101, 66, 104)) goto L_Do_Lock_Picking;
     end;
@@ -34,7 +34,7 @@ L_OpenDoor:
     close;
 }
 
-051-3.gat,62,100,0|script|Jail Lock 3|400,
+051-3.gat,62,100,0|script|Jail Lock 3|400
 {
     if (isin("051-3.gat", 61, 101, 62, 104)) goto L_Do_Lock_Picking;
     end;
@@ -51,7 +51,7 @@ L_OpenDoor:
     close;
 }
 
-051-3.gat,58,100,0|script|Jail Lock 4|400,
+051-3.gat,58,100,0|script|Jail Lock 4|400
 {
     if (isin("051-3.gat", 57, 101, 58, 104)) goto L_Do_Lock_Picking;
     end;
diff --git a/world/map/npc/051-3/reinforcements.txt b/world/map/npc/051-3/reinforcements.txt
index 75bc1f19..66db7451 100644
--- a/world/map/npc/051-3/reinforcements.txt
+++ b/world/map/npc/051-3/reinforcements.txt
@@ -1,4 +1,4 @@
-051-3.gat,47,30,0|script|#BndtRnfrcmtsTrigger|32767,2,3,
+051-3.gat,47,30,0|script|#BndtRnfrcmtsTrigger|32767,2,3
 {
     set @step, 2;
     if ($@illia_progress < @step) goto L_ShouldNotBeHere;
@@ -14,7 +14,7 @@ L_ShouldNotBeHere:
     end;
 }
 
-051-3.gat,37,24,0|script|Door|400,
+051-3.gat,37,24,0|script|Door|400
 {
     set @step, 2;
     if ($@illia_progress < @step) goto L_ShouldNotBeHere;
@@ -48,7 +48,7 @@ OnRnfrcmts:
     // Spawn 4 bandit lords
     areamonster "051-3.gat", 29, 25, 48, 39, "", 1065, 3, "Door::OnB";
     initnpctimer;
-    mapannounce "051-3.gat", "Bandit Lords : Do not let them escape!!" , 0;
+    mapannounce "051-3.gat", "Bandit Lords:* Do not let them escape!!" , 0;
     areatimer "051-3.gat", 25, 20, 80, 85, 10, "Door::OnDRnfrcmts";
     end;