summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorjesusalva <cpntb1@ymail.com>2018-02-12 22:50:33 -0200
committerjesusalva <cpntb1@ymail.com>2018-02-12 22:50:33 -0200
commitc34ee3ffc06d612c05eaece202de84244716d0bb (patch)
tree1a1442debd2b9e1e0f1948a3bf005391966b37ea /npc
parenta1a4827064ba5d17716a9933ab6999f46a04476d (diff)
downloadserverdata-c34ee3ffc06d612c05eaece202de84244716d0bb.tar.gz
serverdata-c34ee3ffc06d612c05eaece202de84244716d0bb.tar.bz2
serverdata-c34ee3ffc06d612c05eaece202de84244716d0bb.tar.xz
serverdata-c34ee3ffc06d612c05eaece202de84244716d0bb.zip
Fix warp bug at Nard's ship and precedence error
Diffstat (limited to 'npc')
-rw-r--r--npc/002-4/elmo.txt3
-rw-r--r--npc/003-1/_warps.txt1
2 files changed, 2 insertions, 2 deletions
diff --git a/npc/002-4/elmo.txt b/npc/002-4/elmo.txt
index 9b75c0d82..0ce832109 100644
--- a/npc/002-4/elmo.txt
+++ b/npc/002-4/elmo.txt
@@ -8,9 +8,10 @@
002-4,27,27,0 script Elmo NPC_ELMO,{
if (LOCATION$ == "") sailortalk;
- if (getq(General_Narrator) == 1) sailortalk;
if (getq(CandorQuest_Sailors) == 2) goto L_Party;
+ if (getq(General_Narrator) == 1) sailortalk;
+
mesn;
mes l("\"Hey, have you already got the money necessary for the travel?");
mes l("If you haven't, maybe there are a few things you can do besides selling items.\"");
diff --git a/npc/003-1/_warps.txt b/npc/003-1/_warps.txt
index 46b562f7b..be0479dc3 100644
--- a/npc/003-1/_warps.txt
+++ b/npc/003-1/_warps.txt
@@ -13,7 +13,6 @@
003-1,111,137,0 warp #003-1_111_137 0,0,003-7,39,40
003-1,107,132,0 warp #003-1_107_132 0,0,003-7,29,31
003-1,112,100,0 warp #003-1_112_100 0,0,003-8,31,43
-003-1,82,68,0 warp #003-1_82_68 0,0,002-3,35,40
003-1,51,65,0 warp #003-1_51_65 0,0,003-2,42,34
003-1,115,93,0 warp #003-1_115_93 0,0,003-8,41,28
003-1,60,157,0 warp #003-1_60_157 0,0,004-1,64,57