summaryrefslogtreecommitdiff
path: root/world
diff options
context:
space:
mode:
authorwushin <pasekei@gmail.com>2014-11-05 11:09:31 -0600
committerwushin <pasekei@gmail.com>2014-11-05 11:47:23 -0600
commit4b98edcff75b086cf9d99aa17efb0556d16f5913 (patch)
tree4ff6180ed60e21b22486dedee36b033021cea3c1 /world
parentff6f23e94c4ac068dae9e7441b9dc4e600787aa5 (diff)
downloadserverdata-4b98edcff75b086cf9d99aa17efb0556d16f5913.tar.gz
serverdata-4b98edcff75b086cf9d99aa17efb0556d16f5913.tar.bz2
serverdata-4b98edcff75b086cf9d99aa17efb0556d16f5913.tar.xz
serverdata-4b98edcff75b086cf9d99aa17efb0556d16f5913.zip
NPCs on 010-* fixed
Diffstat (limited to 'world')
-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/doug.txt2
-rw-r--r--world/map/npc/010-2/loratay.txt2
-rw-r--r--world/map/npc/010-2/workers.txt4
5 files changed, 10 insertions, 10 deletions
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/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";