summaryrefslogtreecommitdiff
path: root/world/map/npc/027-1
diff options
context:
space:
mode:
authorWushin <pasekei@gmail.com>2014-11-07 08:42:44 -0600
committerWushin <pasekei@gmail.com>2014-11-07 08:42:44 -0600
commit63c2f12d64ab327d60fc41bfa37fd12b5f7e7649 (patch)
treefd9087fa7497649a1f4defc4cf8e9b1c241fe0b0 /world/map/npc/027-1
parent95c0fa59d5ab80b96500a89aa9d28fe87e544dc6 (diff)
parent4cc9ace3c293a6592bcca06db2a558e01308372a (diff)
downloadserverdata-63c2f12d64ab327d60fc41bfa37fd12b5f7e7649.tar.gz
serverdata-63c2f12d64ab327d60fc41bfa37fd12b5f7e7649.tar.bz2
serverdata-63c2f12d64ab327d60fc41bfa37fd12b5f7e7649.tar.xz
serverdata-63c2f12d64ab327d60fc41bfa37fd12b5f7e7649.zip
Merge pull request #206 from wushin/AST-FIX
AST script fix
Diffstat (limited to 'world/map/npc/027-1')
-rw-r--r--world/map/npc/027-1/_mobs.txt40
-rw-r--r--world/map/npc/027-1/golbenez.txt2
-rw-r--r--world/map/npc/027-1/graves.txt26
-rw-r--r--world/map/npc/027-1/traveler.txt2
4 files changed, 35 insertions, 35 deletions
diff --git a/world/map/npc/027-1/_mobs.txt b/world/map/npc/027-1/_mobs.txt
index 9982b965..4972c857 100644
--- a/world/map/npc/027-1/_mobs.txt
+++ b/world/map/npc/027-1/_mobs.txt
@@ -1,26 +1,26 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Graveyard mobs
-027-1.gat,81,91,95,27|monster|Poltergeist|1047,4,900000,60000,Mob027-1::On1047
-027-1.gat,81,91,97,25|monster|Spectre|1042,4,900000,60000,Mob027-1::On1042
-027-1.gat,81,91,99,23|monster|Wisp|1040,4,900000,60000,Mob027-1::On1040
-027-1.gat,37,64,32,20|monster|Skeleton|1043,2,60000,8000,Mob027-1::On1043
-027-1.gat,37,64,32,20|monster|LadySkeleton|1044,2,60000,8000,Mob027-1::On1044
-027-1.gat,71,41,31,22|monster|Skeleton|1043,1,175000,20000,Mob027-1::On1043
-027-1.gat,71,41,31,22|monster|LadySkeleton|1044,1,175000,20000,Mob027-1::On1044
-027-1.gat,37,41,33,22|monster|Skeleton|1043,4,180000,20000,Mob027-1::On1043
-027-1.gat,37,41,33,22|monster|LadySkeleton|1044,4,180000,20000,Mob027-1::On1044
-027-1.gat,105,40,32,21|monster|Skeleton|1043,2,35000,20000,Mob027-1::On1043
-027-1.gat,105,40,32,21|monster|LadySkeleton|1044,3,33000,25000,Mob027-1::On1044
-027-1.gat,70,64,31,20|monster|Skeleton|1043,1,60000,8000,Mob027-1::On1043
-027-1.gat,70,64,31,21|monster|LadySkeleton|1044,1,60000,8000,Mob027-1::On1044
-027-1.gat,104,64,31,20|monster|Skeleton|1043,2,60000,8000,Mob027-1::On1043
-027-1.gat,104,64,31,21|monster|LadySkeleton|1044,2,60000,8000,Mob027-1::On1044
-027-1.gat,70,40,100,20|monster|VampireBat|1066,15,100000,30000,Mob027-1::On1066
-027-1.gat,99,90,34,16|monster|GrassSnake|1034,3,100000,50000,Mob027-1::On1034
-
-
-027-1.gat,0,0,0|script|Mob027-1|-1,
+027-1.gat,81,91,95,27|monster|Poltergeist|1047,4,900000ms,60000ms,Mob027-1::On1047
+027-1.gat,81,91,97,25|monster|Spectre|1042,4,900000ms,60000ms,Mob027-1::On1042
+027-1.gat,81,91,99,23|monster|Wisp|1040,4,900000ms,60000ms,Mob027-1::On1040
+027-1.gat,37,64,32,20|monster|Skeleton|1043,2,60000ms,8000ms,Mob027-1::On1043
+027-1.gat,37,64,32,20|monster|LadySkeleton|1044,2,60000ms,8000ms,Mob027-1::On1044
+027-1.gat,71,41,31,22|monster|Skeleton|1043,1,175000ms,20000ms,Mob027-1::On1043
+027-1.gat,71,41,31,22|monster|LadySkeleton|1044,1,175000ms,20000ms,Mob027-1::On1044
+027-1.gat,37,41,33,22|monster|Skeleton|1043,4,180000ms,20000ms,Mob027-1::On1043
+027-1.gat,37,41,33,22|monster|LadySkeleton|1044,4,180000ms,20000ms,Mob027-1::On1044
+027-1.gat,105,40,32,21|monster|Skeleton|1043,2,35000ms,20000ms,Mob027-1::On1043
+027-1.gat,105,40,32,21|monster|LadySkeleton|1044,3,33000ms,25000ms,Mob027-1::On1044
+027-1.gat,70,64,31,20|monster|Skeleton|1043,1,60000ms,8000ms,Mob027-1::On1043
+027-1.gat,70,64,31,21|monster|LadySkeleton|1044,1,60000ms,8000ms,Mob027-1::On1044
+027-1.gat,104,64,31,20|monster|Skeleton|1043,2,60000ms,8000ms,Mob027-1::On1043
+027-1.gat,104,64,31,21|monster|LadySkeleton|1044,2,60000ms,8000ms,Mob027-1::On1044
+027-1.gat,70,40,100,20|monster|VampireBat|1066,15,100000ms,30000ms,Mob027-1::On1066
+027-1.gat,99,90,34,16|monster|GrassSnake|1034,3,100000ms,50000ms,Mob027-1::On1034
+
+
+027-1.gat,0,0,0|script|Mob027-1|-1
{
end;
diff --git a/world/map/npc/027-1/golbenez.txt b/world/map/npc/027-1/golbenez.txt
index b32b862c..ea19db7b 100644
--- a/world/map/npc/027-1/golbenez.txt
+++ b/world/map/npc/027-1/golbenez.txt
@@ -1,4 +1,4 @@
-027-1.gat,68,89,0|script|#Golbenez#_M|204,
+027-1.gat,68,89,0|script|#Golbenez#_M|204
{
set @fee, 666;
diff --git a/world/map/npc/027-1/graves.txt b/world/map/npc/027-1/graves.txt
index 5f522e15..cd2d137a 100644
--- a/world/map/npc/027-1/graves.txt
+++ b/world/map/npc/027-1/graves.txt
@@ -1,6 +1,6 @@
// Easter egg graves
-function|script|GraveTooFar|,
+function|script|GraveTooFar
{
if (isin("027-1.gat",89,54,122,76))
goto L_Return;
@@ -11,7 +11,7 @@ L_Return:
return;
}
-027-1.gat,89,62,0|script|Grave#1|400,
+027-1.gat,89,62,0|script|Grave#1|400
{
callfunc "GraveTooFar";
mes "~ FotherJ ~";
@@ -19,7 +19,7 @@ L_Return:
close;
}
-027-1.gat,118,54,0|script|Grave#2|400,
+027-1.gat,118,54,0|script|Grave#2|400
{
callfunc "GraveTooFar";
mes "~ Yosuhara ~";
@@ -27,7 +27,7 @@ L_Return:
close;
}
-027-1.gat,111,62,0|script|Grave#3|400,
+027-1.gat,111,62,0|script|Grave#3|400
{
callfunc "GraveTooFar";
mes "~ Feline Monstrosity ~";
@@ -35,7 +35,7 @@ L_Return:
close;
}
-027-1.gat,112,76,0|script|Grave#4|400,
+027-1.gat,112,76,0|script|Grave#4|400
{
callfunc "GraveTooFar";
mes "~ Superkoop ~";
@@ -43,7 +43,7 @@ L_Return:
close;
}
-027-1.gat,120,76,0|script|Grave#5|400,
+027-1.gat,120,76,0|script|Grave#5|400
{
callfunc "GraveTooFar";
mes "~ Aroleon ~";
@@ -51,7 +51,7 @@ L_Return:
close;
}
-027-1.gat,100,68,0|script|Grave#6|400,
+027-1.gat,100,68,0|script|Grave#6|400
{
callfunc "GraveTooFar";
mes "~ John P ~";
@@ -59,7 +59,7 @@ L_Return:
close;
}
-027-1.gat,94,70,0|script|Grave#7|400,
+027-1.gat,94,70,0|script|Grave#7|400
{
callfunc "GraveTooFar";
mes "~ Spit23 ~";
@@ -67,7 +67,7 @@ L_Return:
close;
}
-027-1.gat,106,60,0|script|Grave#8|400,
+027-1.gat,106,60,0|script|Grave#8|400
{
callfunc "GraveTooFar";
mes "~ Black Don ~";
@@ -75,7 +75,7 @@ L_Return:
close;
}
-027-1.gat,92,54,0|script|Grave#9|400,
+027-1.gat,92,54,0|script|Grave#9|400
{
callfunc "GraveTooFar";
mes "~ Jaxad0127 ~";
@@ -83,7 +83,7 @@ L_Return:
close;
}
-027-1.gat,122,64,0|script|Grave#10|400,
+027-1.gat,122,64,0|script|Grave#10|400
{
callfunc "GraveTooFar";
mes "~ Ces Vargavind ~";
@@ -91,7 +91,7 @@ L_Return:
close;
}
-027-1.gat,102,62,0|script|Grave#11|400,
+027-1.gat,102,62,0|script|Grave#11|400
{
callfunc "GraveTooFar";
mes "~ Crush ~";
@@ -99,7 +99,7 @@ L_Return:
close;
}
-027-1.gat,104,76,0|script|Grave#12|400,
+027-1.gat,104,76,0|script|Grave#12|400
{
callfunc "GraveTooFar";
mes "~ Freeyorp ~";
diff --git a/world/map/npc/027-1/traveler.txt b/world/map/npc/027-1/traveler.txt
index b2c1b6ee..d07e952e 100644
--- a/world/map/npc/027-1/traveler.txt
+++ b/world/map/npc/027-1/traveler.txt
@@ -2,7 +2,7 @@
// Author: Wombat, wushin
// cost depending on level and adapted to new scripting guidelines: Jenalya
-027-1.gat,83,84,0|script|Styx the Traveler|103,
+027-1.gat,83,84,0|script|Styx the Traveler|103
{
set @NpcName$, "Styx";
set @NpcTravelBit, $@graveyard_bit;