summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwushin <pasekei@gmail.com>2014-11-05 11:14:54 -0600
committerwushin <pasekei@gmail.com>2014-11-05 11:47:24 -0600
commit0caff92c344cf6c6e1bf7cb44e075638a80abe14 (patch)
treeaca57297432191fd087fdf32b460676684db7374
parent1e481b3c39ff1050a311890b2abb60bf96b1f26a (diff)
downloadserverdata-0caff92c344cf6c6e1bf7cb44e075638a80abe14.tar.gz
serverdata-0caff92c344cf6c6e1bf7cb44e075638a80abe14.tar.bz2
serverdata-0caff92c344cf6c6e1bf7cb44e075638a80abe14.tar.xz
serverdata-0caff92c344cf6c6e1bf7cb44e075638a80abe14.zip
NPCs on 022-* fixed
-rw-r--r--world/map/npc/022-1/adrian.txt2
-rw-r--r--world/map/npc/022-1/anwar.txt2
-rw-r--r--world/map/npc/022-1/dock.txt12
-rw-r--r--world/map/npc/022-1/ferry_master.txt2
-rw-r--r--world/map/npc/022-1/npcs.txt8
5 files changed, 13 insertions, 13 deletions
diff --git a/world/map/npc/022-1/adrian.txt b/world/map/npc/022-1/adrian.txt
index 978c537e..7d76cf9d 100644
--- a/world/map/npc/022-1/adrian.txt
+++ b/world/map/npc/022-1/adrian.txt
@@ -5,7 +5,7 @@
// state 2: Adrian gave the luggage to the player
// state 3: player gave luggage to Kylian and Kylian asks who to talk to for the shop license
-022-1.gat,58,54,0|script|Adrian|213,
+022-1.gat,58,54,0|script|Adrian|213
{
set @state, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT);
diff --git a/world/map/npc/022-1/anwar.txt b/world/map/npc/022-1/anwar.txt
index 7c031d9c..5de4532e 100644
--- a/world/map/npc/022-1/anwar.txt
+++ b/world/map/npc/022-1/anwar.txt
@@ -16,7 +16,7 @@
// state 13: Anwar asked to bring present to Eomie
// state 14: gave present to Eomie
// state 15: reported back to Anwar and done
-022-1.gat,41,46,0|script|Anwar|156,
+022-1.gat,41,46,0|script|Anwar|156
{
set @state, ((QUEST_NorthTulimshar & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
diff --git a/world/map/npc/022-1/dock.txt b/world/map/npc/022-1/dock.txt
index ce8d2785..8da5b8aa 100644
--- a/world/map/npc/022-1/dock.txt
+++ b/world/map/npc/022-1/dock.txt
@@ -2,25 +2,25 @@
// Author: Wushin
// Ferry Sign
-022-1.gat,62,36,0|script|Ferry Schedule#2|396,
+022-1.gat,62,36,0|script|Ferry Schedule#2|396
{
callfunc "FerryManifest";
end;
}
-022-1.gat,65,71,0|script|Ferry Schedule#3|396,
+022-1.gat,65,71,0|script|Ferry Schedule#3|396
{
callfunc "FerryManifest";
end;
}
-022-1.gat,85,71,0|script|Tulimshar South Koga|395,6,2,
+022-1.gat,85,71,0|script|Tulimshar South Koga|395,6,2
{
callfunc "BoardFerry";
close;
}
-022-1.gat,80,62,0|script|#Tulimshar SouthDock|127,
+022-1.gat,80,62,0|script|#Tulimshar SouthDock|127
{
end;
OnCommandArrive:
@@ -32,13 +32,13 @@ OnCommandWarp:
end;
}
-022-1.gat,60,24,0|script|Tulimshar North Koga|395,4,4,
+022-1.gat,60,24,0|script|Tulimshar North Koga|395,4,4
{
callfunc "BoardCandorFerry";
close;
}
-022-1.gat,65,25,0|script|#Tulimshar NorthDock|127,
+022-1.gat,65,25,0|script|#Tulimshar NorthDock|127
{
end;
OnCommandArrive:
diff --git a/world/map/npc/022-1/ferry_master.txt b/world/map/npc/022-1/ferry_master.txt
index 5c78dc77..d9594bcd 100644
--- a/world/map/npc/022-1/ferry_master.txt
+++ b/world/map/npc/022-1/ferry_master.txt
@@ -1,6 +1,6 @@
//
-022-1.gat,71,71,0|script|Ferry Master|138,
+022-1.gat,71,71,0|script|Ferry Master|138
{
mes "[Ferry Master]";
mes "\"Hello! Do you need something?\"";
diff --git a/world/map/npc/022-1/npcs.txt b/world/map/npc/022-1/npcs.txt
index dbbc8784..b94f790e 100644
--- a/world/map/npc/022-1/npcs.txt
+++ b/world/map/npc/022-1/npcs.txt
@@ -1,6 +1,6 @@
// Talk NPCs to help make trek interesting between Tutorial and Bazaar.
-022-1.gat,35,36,0|script|Marikel|211,
+022-1.gat,35,36,0|script|Marikel|211
{
set @npcname$, "Marikel";
@@ -27,7 +27,7 @@ L_Marikel_2:
close;
}
-022-1.gat,65,46,0|script|Joelin|212,
+022-1.gat,65,46,0|script|Joelin|212
{
set @npcname$, "Joelin";
@@ -38,7 +38,7 @@ L_Marikel_2:
close;
}
-022-1.gat,67,46,0|script|Harper|213,
+022-1.gat,67,46,0|script|Harper|213
{
set @npcname$, "Harper";
@@ -47,7 +47,7 @@ L_Marikel_2:
close;
}
-022-1.gat,75,99,0|script|Swezanne|206,
+022-1.gat,75,99,0|script|Swezanne|206
{
set @npcname$, "Swezanne";