summaryrefslogtreecommitdiff
path: root/world/map/npc/010-2
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/010-2
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/010-2')
-rw-r--r--world/map/npc/010-2/_mobs.txt2
-rw-r--r--world/map/npc/010-2/band.txt10
-rw-r--r--world/map/npc/010-2/chef.txt2
-rw-r--r--world/map/npc/010-2/dimonds.txt28
-rw-r--r--world/map/npc/010-2/doug.txt2
-rw-r--r--world/map/npc/010-2/loratay.txt2
-rw-r--r--world/map/npc/010-2/workers.txt4
7 files changed, 25 insertions, 25 deletions
diff --git a/world/map/npc/010-2/_mobs.txt b/world/map/npc/010-2/_mobs.txt
index 46950616..5f2a75f0 100644
--- a/world/map/npc/010-2/_mobs.txt
+++ b/world/map/npc/010-2/_mobs.txt
@@ -3,7 +3,7 @@
-010-2.gat,0,0,0|script|Mob010-2|-1,
+010-2.gat,0,0,0|script|Mob010-2|-1
{
end;
}
diff --git a/world/map/npc/010-2/band.txt b/world/map/npc/010-2/band.txt
index d0783d8d..ab0074f3 100644
--- a/world/map/npc/010-2/band.txt
+++ b/world/map/npc/010-2/band.txt
@@ -1,22 +1,22 @@
// dimonds band
-010-2.gat,40,35,0|script|Phil|157,
+010-2.gat,40,35,0|script|Phil|157
{
callfunc "DimondBand";
end;
}
-010-2.gat,40,37,0|script|Jerry|160,
+010-2.gat,40,37,0|script|Jerry|160
{
callfunc "DimondBand";
end;
}
-010-2.gat,42,36,0|script|Robert|162,
+010-2.gat,42,36,0|script|Robert|162
{
callfunc "DimondBand";
end;
}
-function|script|DimondBand|,
+function|script|DimondBand
{
npctalk $@SongLyrics$[$@LyricSpot];
set $@LyricSpot, ($@LyricSpot + 1);
@@ -27,7 +27,7 @@ function|script|DimondBand|,
L_Return:
return;
}
--|script|#BandConfig|-1,
+-|script|#BandConfig|-1
{
end;
diff --git a/world/map/npc/010-2/chef.txt b/world/map/npc/010-2/chef.txt
index 9fcc1831..572e5185 100644
--- a/world/map/npc/010-2/chef.txt
+++ b/world/map/npc/010-2/chef.txt
@@ -1,4 +1,4 @@
-010-2.gat,33,25,0|script|Chef#dimond|148,
+010-2.gat,33,25,0|script|Chef#dimond|148
{
mes "[Chef]";
mes "";
diff --git a/world/map/npc/010-2/dimonds.txt b/world/map/npc/010-2/dimonds.txt
index 6f158c65..94c3f494 100644
--- a/world/map/npc/010-2/dimonds.txt
+++ b/world/map/npc/010-2/dimonds.txt
@@ -1,6 +1,6 @@
//
-010-2.gat,34,38,0|script|Dimond|165,
+010-2.gat,34,38,0|script|Dimond|165
{
mes "[Dimond]";
mes "\"Welcome to Dimond's Cove!\"";
@@ -12,7 +12,7 @@
close;
}
-010-2.gat,35,35,0|script|Shannon|193,
+010-2.gat,35,35,0|script|Shannon|193
{
set @month, 1;
set @start_day, 24;
@@ -458,7 +458,7 @@ L_Close:
close;
}
-010-2.gat,27,30,0|script|Bar Rules|400,
+010-2.gat,27,30,0|script|Bar Rules|400
{
mes "Dimonds Cove Bar Rules";
next;
@@ -478,28 +478,28 @@ L_Close:
close;
}
-010-2.gat,71,38,0|script|Store Policy#1|400,
+010-2.gat,71,38,0|script|Store Policy#1|400
{
mes "All sales are final.";
mes "Returns are subject to a 50% re-stocking fee.";
close;
}
-010-2.gat,77,38,0|script|Store Policy#2|400,
+010-2.gat,77,38,0|script|Store Policy#2|400
{
mes "All sales are final.";
mes "Returns are subject to a 50% re-stocking fee.";
close;
}
-010-2.gat,36,30,0|script|Directions|400,
+010-2.gat,36,30,0|script|Directions|400
{
mes "This way to the Dimonds Cove Inn.";
mes "Five star accommodation for the weary traveler!";
close;
}
-010-2.gat,80,32,0|script|Dimonds Cove 1|400,
+010-2.gat,80,32,0|script|Dimonds Cove 1|400
{
mes "The Story of Dimonds Cove";
next;
@@ -519,7 +519,7 @@ L_Close:
close;
}
-010-2.gat,85,32,0|script|Dimonds Cove 2|400,
+010-2.gat,85,32,0|script|Dimonds Cove 2|400
{
mes "List of Events at Dimonds Cove";
mes "January 2008 - Construction of Dimonds Cove.";
@@ -527,7 +527,7 @@ L_Close:
}
-010-2.gat,71,30,0|script|Inn|400,
+010-2.gat,71,30,0|script|Inn|400
{
mes "Welcome to the Dimonds Cove Inn";
mes "Rooms are 200 gp a night.";
@@ -536,15 +536,15 @@ L_Close:
}
-010-2.gat,24,27,0|shop|Bartender|112,Beer :-1,IronPotion :-1,ConcentrationPotion :-1
+010-2.gat,24,27,0|shop|Bartender|112,Beer:*1,IronPotion:*1,ConcentrationPotion:*1
-010-2.gat,32,34,0|shop|Waitress|139,CherryCake :-1,RoastedMaggot :-1,OrangeCupcake :-1,ChickenLeg :-1,Steak :-1
+010-2.gat,32,34,0|shop|Waitress|139,CherryCake:*1,RoastedMaggot:*1,OrangeCupcake:*1,ChickenLeg:*1,Steak:*1
-010-2.gat,85,41,0|shop|Blacksmith|146,ForestBow :-1,IronArrow :-1,LeatherShield :-1
+010-2.gat,85,41,0|shop|Blacksmith|146,ForestBow:*1,IronArrow:*1,LeatherShield:*1
-010-2.gat,65,41,0|shop|General Store#dimond|137,CottonShorts :-1,FancyHat :-1,SilkHeadband :-1,CottonSkirt :-1,Boots :-1,CottonBoots :-1
+010-2.gat,65,41,0|shop|General Store#dimond|137,CottonShorts:*1,FancyHat:*1,SilkHeadband:*1,CottonSkirt:*1,Boots:*1,CottonBoots:*1
-010-2.gat,75,68,0|script|Basil|107,
+010-2.gat,75,68,0|script|Basil|107
{
set @npcname$, "Basil the Inn Keeper";
set @cost, 200;
diff --git a/world/map/npc/010-2/doug.txt b/world/map/npc/010-2/doug.txt
index 4b5598d7..1f984a3d 100644
--- a/world/map/npc/010-2/doug.txt
+++ b/world/map/npc/010-2/doug.txt
@@ -1,6 +1,6 @@
//
-010-2.gat,68,87,0|script|Doug|113,
+010-2.gat,68,87,0|script|Doug|113
{
mes "[Doug]";
mes "\"This room is too dark. I want to brighten it up.\"";
diff --git a/world/map/npc/010-2/loratay.txt b/world/map/npc/010-2/loratay.txt
index 9d98cdaa..f10395a2 100644
--- a/world/map/npc/010-2/loratay.txt
+++ b/world/map/npc/010-2/loratay.txt
@@ -1,4 +1,4 @@
-010-2.gat,85,85,0|script|Lora Tay|151,
+010-2.gat,85,85,0|script|Lora Tay|151
{
set @ROBE_COCOONS_NR, 150; // must be multiple of ten
set @ROBE_ZENY, 10000;
diff --git a/world/map/npc/010-2/workers.txt b/world/map/npc/010-2/workers.txt
index 17109491..e88ba650 100644
--- a/world/map/npc/010-2/workers.txt
+++ b/world/map/npc/010-2/workers.txt
@@ -1,13 +1,13 @@
//
-010-2.gat,23,70,0|script|Josh|155,
+010-2.gat,23,70,0|script|Josh|155
{
mes "[Josh]";
mes "\"We're working on getting the cellar pass open.\"";
close;
}
-010-2.gat,39,75,0|script|Zack|155,
+010-2.gat,39,75,0|script|Zack|155
{
set @halloween_npc_id, $@halloween_npc_zack;
callfunc "TrickOrTreat";