Merge pull request #206 from wushin/AST-FIX

AST script fix

4 files changed, 24 insertions, 24 deletions

diff --git a/world/map/npc/055-1/_mobs.txt b/world/map/npc/055-1/_mobs.txt
index 9643e9c5..a291e3b7 100644
--- a/world/map/npc/055-1/_mobs.txt
+++ b/world/map/npc/055-1/_mobs.txt
@@ -1,26 +1,26 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Woodland Hills mobs
 
-055-1.gat,68,72,22,19|monster|Butterfly|1055,16,10000,85000,Mob055-1::On1055
-055-1.gat,87,29,55,14|monster|Silkworm|1035,15,10000,85000,Mob055-1::On1035
-055-1.gat,79,30,84,17|monster|Squirrel|1038,10,10000,45000,Mob055-1::On1038
-055-1.gat,0,0,0,0|monster|Mouboo|1028,15,10000,85000,Mob055-1::On1028
-055-1.gat,91,49,6,4|monster|CloverPatch|1037,1,10000,180000,Mob055-1::On1037
-055-1.gat,103,54,5,3|monster|CloverPatch|1037,1,10000,180000,Mob055-1::On1037
-055-1.gat,64,75,27,16|monster|CloverPatch|1037,1,10000,120000,Mob055-1::On1037
-055-1.gat,80,34,82,25|monster|Snail|1041,3,10000,85000,Mob055-1::On1041
-055-1.gat,70,72,17,24|monster|AlizarinPlant|1032,2,10000,60000,Mob055-1::On1032
-055-1.gat,81,32,81,22|monster|AlizarinPlant|1032,2,10000,60000,Mob055-1::On1032
-055-1.gat,0,0,0,0|monster|MauvePlant|1029,7,10000,55000,Mob055-1::On1029
-055-1.gat,0,0,0,0|monster|CobaltPlant|1030,3,10000,60000,Mob055-1::On1030
-055-1.gat,0,0,0,0|monster|GambogePlant|1031,2,10000,60000,Mob055-1::On1031
-055-1.gat,116,60,4,2|monster|PinkFlower|1014,1,10000,45000,Mob055-1::On1014
-055-1.gat,97,60,4,2|monster|PinkFlower|1014,1,10000,45000,Mob055-1::On1014
-055-1.gat,64,73,23,17|monster|PinkFlower|1014,1,10000,45000,Mob055-1::On1014
-055-1.gat,0,0,0,0|monster|SpikyMushroom|1019,7,10000,60000,Mob055-1::On1019
+055-1.gat,68,72,22,19|monster|Butterfly|1055,16,10000ms,85000ms,Mob055-1::On1055
+055-1.gat,87,29,55,14|monster|Silkworm|1035,15,10000ms,85000ms,Mob055-1::On1035
+055-1.gat,79,30,84,17|monster|Squirrel|1038,10,10000ms,45000ms,Mob055-1::On1038
+055-1.gat,0,0,0,0|monster|Mouboo|1028,15,10000ms,85000ms,Mob055-1::On1028
+055-1.gat,91,49,6,4|monster|CloverPatch|1037,1,10000ms,180000ms,Mob055-1::On1037
+055-1.gat,103,54,5,3|monster|CloverPatch|1037,1,10000ms,180000ms,Mob055-1::On1037
+055-1.gat,64,75,27,16|monster|CloverPatch|1037,1,10000ms,120000ms,Mob055-1::On1037
+055-1.gat,80,34,82,25|monster|Snail|1041,3,10000ms,85000ms,Mob055-1::On1041
+055-1.gat,70,72,17,24|monster|AlizarinPlant|1032,2,10000ms,60000ms,Mob055-1::On1032
+055-1.gat,81,32,81,22|monster|AlizarinPlant|1032,2,10000ms,60000ms,Mob055-1::On1032
+055-1.gat,0,0,0,0|monster|MauvePlant|1029,7,10000ms,55000ms,Mob055-1::On1029
+055-1.gat,0,0,0,0|monster|CobaltPlant|1030,3,10000ms,60000ms,Mob055-1::On1030
+055-1.gat,0,0,0,0|monster|GambogePlant|1031,2,10000ms,60000ms,Mob055-1::On1031
+055-1.gat,116,60,4,2|monster|PinkFlower|1014,1,10000ms,45000ms,Mob055-1::On1014
+055-1.gat,97,60,4,2|monster|PinkFlower|1014,1,10000ms,45000ms,Mob055-1::On1014
+055-1.gat,64,73,23,17|monster|PinkFlower|1014,1,10000ms,45000ms,Mob055-1::On1014
+055-1.gat,0,0,0,0|monster|SpikyMushroom|1019,7,10000ms,60000ms,Mob055-1::On1019
 
 
-055-1.gat,0,0,0|script|Mob055-1|-1,
+055-1.gat,0,0,0|script|Mob055-1|-1
 {
     end;
 
diff --git a/world/map/npc/055-1/flowerpentagram4.txt b/world/map/npc/055-1/flowerpentagram4.txt
index 59c5195f..b0996bb3 100644
--- a/world/map/npc/055-1/flowerpentagram4.txt
+++ b/world/map/npc/055-1/flowerpentagram4.txt
@@ -1,6 +1,6 @@
 // Author: Jenalya
 
-055-1.gat,141,89,0|script|#FlowerPentagram4|400,
+055-1.gat,141,89,0|script|#FlowerPentagram4|400
 {
     if (OrumQuest >= 31) goto L_PlacedFifthFlower;
 
diff --git a/world/map/npc/055-1/pumpkins.txt b/world/map/npc/055-1/pumpkins.txt
index 98d820b9..391cf96f 100644
--- a/world/map/npc/055-1/pumpkins.txt
+++ b/world/map/npc/055-1/pumpkins.txt
@@ -1,10 +1,10 @@
 // Pumpkin mobs for the seasonal halloween event with Oscar
-055-1.gat,48,25,16,8|monster|Spawn Pumpkin|1063,12,10000,5000,PumpkinMob055-1::On1063
-055-1.gat,139,29,5,7|monster|Spawn Pumpkin|1063,7,10000,5000,PumpkinMob055-1::On1063
-055-1.gat,132,24,6,4|monster|Spawn Pumpkin|1063,4,10000,5000,PumpkinMob055-1::On1063
+055-1.gat,48,25,16,8|monster|Pumpkin|1063,12,10000ms,5000ms,PumpkinMob055-1::On1063
+055-1.gat,139,29,5,7|monster|Pumpkin|1063,7,10000ms,5000ms,PumpkinMob055-1::On1063
+055-1.gat,132,24,6,4|monster|Pumpkin|1063,4,10000ms,5000ms,PumpkinMob055-1::On1063
 
 
-055-1.gat,0,0,0|script|PumpkinMob055-1|-1,
+055-1.gat,0,0,0|script|PumpkinMob055-1|-1
 {
     end;
 
diff --git a/world/map/npc/055-1/traveler.txt b/world/map/npc/055-1/traveler.txt
index 881be4d2..cc5db3c3 100644
--- a/world/map/npc/055-1/traveler.txt
+++ b/world/map/npc/055-1/traveler.txt
@@ -2,7 +2,7 @@
 // Author: Wombat, wushin
 // cost depending on level and adapted to new scripting guidelines: Jenalya
 
-055-1.gat,135,60,0|script|Sherman the Traveler|103,
+055-1.gat,135,60,0|script|Sherman the Traveler|103
 {
     set @NpcName$, "Sherman";
     set @NpcTravelBit, $@hurns_farms_bit;