Merge pull request #206 from wushin/AST-FIX

AST script fix

7 files changed, 24 insertions, 24 deletions

diff --git a/world/map/npc/008-1/_mobs.txt b/world/map/npc/008-1/_mobs.txt
index 04a93ca3..546a93a2 100644
--- a/world/map/npc/008-1/_mobs.txt
+++ b/world/map/npc/008-1/_mobs.txt
@@ -1,18 +1,18 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Hurnscald Outskirts mobs
 
-008-1.gat,0,0,0,0|monster|PinkFlower|1014,10,20,0,Mob008-1::On1014
-008-1.gat,0,0,0,0|monster|Pinkie|1018,18,20,0,Mob008-1::On1018
-008-1.gat,0,0,0,0|monster|SpikyMushroom|1019,18,20,0,Mob008-1::On1019
-008-1.gat,0,0,0,0|monster|Snail|1041,5,30,0,Mob008-1::On1041
-008-1.gat,0,0,0,0|monster|MauvePlant|1029,2,270000,180000,Mob008-1::On1029
-008-1.gat,0,0,0,0|monster|Silkworm|1035,2,60000,30000,Mob008-1::On1035
-008-1.gat,0,0,0,0|monster|CloverPatch|1037,2,0,1000,Mob008-1::On1037
-008-1.gat,0,0,0,0|monster|Squirrel|1038,10,30,20,Mob008-1::On1038
-008-1.gat,0,0,0,0|monster|Butterfly|1055,10,30,20,Mob008-1::On1055
-
-
-008-1.gat,0,0,0|script|Mob008-1|-1,
+008-1.gat,0,0,0,0|monster|PinkFlower|1014,10,20ms,0ms,Mob008-1::On1014
+008-1.gat,0,0,0,0|monster|Pinkie|1018,18,20ms,0ms,Mob008-1::On1018
+008-1.gat,0,0,0,0|monster|SpikyMushroom|1019,18,20ms,0ms,Mob008-1::On1019
+008-1.gat,0,0,0,0|monster|Snail|1041,5,30ms,0ms,Mob008-1::On1041
+008-1.gat,0,0,0,0|monster|MauvePlant|1029,2,270000ms,180000ms,Mob008-1::On1029
+008-1.gat,0,0,0,0|monster|Silkworm|1035,2,60000ms,30000ms,Mob008-1::On1035
+008-1.gat,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms,Mob008-1::On1037
+008-1.gat,0,0,0,0|monster|Squirrel|1038,10,30ms,20ms,Mob008-1::On1038
+008-1.gat,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob008-1::On1055
+
+
+008-1.gat,0,0,0|script|Mob008-1|-1
 {
     end;
 
diff --git a/world/map/npc/008-1/andra.txt b/world/map/npc/008-1/andra.txt
index 25a7684a..989005f0 100644
--- a/world/map/npc/008-1/andra.txt
+++ b/world/map/npc/008-1/andra.txt
@@ -1,6 +1,6 @@
 // Andra asks for your help to keep the soil fertile. The best way to do it is planting, so she asks for water and seeds. When she plants the seeds, some plants are spawned.
 
-008-1.gat,36,26,0|script|Andra|201,
+008-1.gat,36,26,0|script|Andra|201
 {
     set @water_amount, 1;
     set @seeds_amount, 4;
diff --git a/world/map/npc/008-1/annualeaster.txt b/world/map/npc/008-1/annualeaster.txt
index d42be802..698aa65f 100644
--- a/world/map/npc/008-1/annualeaster.txt
+++ b/world/map/npc/008-1/annualeaster.txt
@@ -9,7 +9,7 @@
 // the event in these days.
 
 
-function|script|AnnualEasterEvent|,
+function|script|AnnualEasterEvent
 {
     if ((gettimetick(2)-TUT_var < 5*7*86400) || (BaseLevel < 40)) //player must be created at least 5 weeks ago
         goto L_EndTooYoung;
@@ -113,21 +113,21 @@ L_End1:
     return;
 }
 
-008-1.gat,65,40,0|script|#TestEgg0|375,
+008-1.gat,65,40,0|script|#TestEgg0|375
 {
     set @EasterEggID, 0;
     callfunc("AnnualEasterEvent");
     end;
 }
 
-008-1.gat,65,40,0|script|#TestEgg1|375,
+008-1.gat,65,40,0|script|#TestEgg1|375
 {
     set @EasterEggID, 1;
     callfunc("AnnualEasterEvent");
     end;
 }
 
-008-1.gat,65,40,0|script|#TestEgg2|375,
+008-1.gat,65,40,0|script|#TestEgg2|375
 {
     set @EasterEggID, 2;
     callfunc("AnnualEasterEvent");
@@ -135,7 +135,7 @@ L_End1:
 }
 
 
-008-1.gat,59,38,0|script|#AnnualEaster|-1,
+008-1.gat,59,38,0|script|#AnnualEaster|-1
 {
     end;
 
diff --git a/world/map/npc/008-1/diryn.txt b/world/map/npc/008-1/diryn.txt
index 2755866c..d0630074 100644
--- a/world/map/npc/008-1/diryn.txt
+++ b/world/map/npc/008-1/diryn.txt
@@ -2,7 +2,7 @@
 // Author: Wombat, wushin
 // cost depending on level and adapted to new scripting guidelines: Jenalya
 
-008-1.gat,81,82,0|script|Diryn the Traveler|103,
+008-1.gat,81,82,0|script|Diryn the Traveler|103
 {
     set @NpcName$, "Diryn";
     set @NpcTravelBit, $@hurnscald_bit;
diff --git a/world/map/npc/008-1/dock.txt b/world/map/npc/008-1/dock.txt
index 240cdc15..d24355bd 100644
--- a/world/map/npc/008-1/dock.txt
+++ b/world/map/npc/008-1/dock.txt
@@ -1,18 +1,18 @@
 // The ferry dock
 
-008-1.gat,134,63,0|script|Ferry Schedule#5|397,
+008-1.gat,134,63,0|script|Ferry Schedule#5|397
 {
     callfunc "FerryManifest";
     end;
 }
 
-008-1.gat,147,64,0|script|Hurnscald Koga|395,8,3,
+008-1.gat,147,64,0|script|Hurnscald Koga|395,8,3
 {
     callfunc "BoardFerry";
     close;
 }
 
-008-1.gat,120,44,0|script|#HurnscaldDock|127,
+008-1.gat,120,44,0|script|#HurnscaldDock|127
 {
     end;
 OnCommandArrive:
diff --git a/world/map/npc/008-1/george.txt b/world/map/npc/008-1/george.txt
index df89f52c..af36f75f 100644
--- a/world/map/npc/008-1/george.txt
+++ b/world/map/npc/008-1/george.txt
@@ -1,6 +1,6 @@
 //
 
-008-1.gat,136,36,0|script|George#pirate|138,
+008-1.gat,136,36,0|script|George#pirate|138
 {
     set @halloween_npc_id, $@halloween_npc_george;
     callfunc "TrickOrTreat";
diff --git a/world/map/npc/008-1/hinnak.txt b/world/map/npc/008-1/hinnak.txt
index f3ada878..36a8d3f5 100644
--- a/world/map/npc/008-1/hinnak.txt
+++ b/world/map/npc/008-1/hinnak.txt
@@ -5,7 +5,7 @@
 //
 // Variables used: Nibble 1 of QUEST_Hurnscald (previously QUEST_Scythe_state)
 
-008-1.gat,101,30,0|script|Hinnak|142,
+008-1.gat,101,30,0|script|Hinnak|142
 {
     callfunc "ClearVariables";