summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--npc/000-0-0/sailors.txt3
-rw-r--r--npc/002-3/doors.txt25
-rw-r--r--npc/002-4/nard.txt3
3 files changed, 18 insertions, 13 deletions
diff --git a/npc/000-0-0/sailors.txt b/npc/000-0-0/sailors.txt
index d89dfd7a0..8ebbf8ff8 100644
--- a/npc/000-0-0/sailors.txt
+++ b/npc/000-0-0/sailors.txt
@@ -70,7 +70,8 @@ OnTalk:
setq General_Narrator, 0;
percentheal 100,100;
addtimer(45000,"Magic Arpan::OnSlow");
- warp "002-1", 53, 38;
+ LOCATION$ = "Candor";
+ warp "002-1@Candor", 53, 38;
savepoint "002-1", 55, 40;
closedialog;
close;
diff --git a/npc/002-3/doors.txt b/npc/002-3/doors.txt
index 82a005a08..75a08348d 100644
--- a/npc/002-3/doors.txt
+++ b/npc/002-3/doors.txt
@@ -7,6 +7,19 @@
002-3,30,28,0 script AreaNPC#doors4 NPC_HIDDEN,0,0,{
OnTouch:
+ if (getq(ShipQuests_Julia) < 3) {
+ setcamnpc "Julia";
+ mesn "Julia";
+ mesq l("The captain has locked the door, you should go see him.");
+ next;
+
+ mesn "Narrator";
+ mesc l("Captain Nard is in the room to your right.");
+ next;
+ restorecam;
+ close;
+ }
+
if (LOCATION$ == "Candor") {
warp "005-1", 42, 107;
close;
@@ -15,17 +28,7 @@ OnTouch:
warp "003-1", 81, 68;
close;
}
-
- setcamnpc "Julia";
- mesn "Julia";
- mesq l("The captain has locked the door, you should go see him.");
- next;
-
- mesn "Narrator";
- mesc l("Captain Nard is in the room to your right.");
- next;
- restorecam;
-
+ debugmes "Script error: 002-3 door";
close;
diff --git a/npc/002-4/nard.txt b/npc/002-4/nard.txt
index 22667560f..d3c36e0df 100644
--- a/npc/002-4/nard.txt
+++ b/npc/002-4/nard.txt
@@ -16,7 +16,7 @@
L_Checker:
if (.@narrator) goto L_Travel;
- if (LOCATION$ != "") goto L_NotYet;
+ if (getq(ShipQuests_Julia) >= 3) goto L_NotYet;
// Referral program
if (#REFERRAL_PROG == 0 && $REFERRAL_ENABLED) {
@@ -110,6 +110,7 @@ L_MenuQuest:
mesn;
mesq l("Why we're going Tulimshar, you may ask? Because well, believe me, if you want to find out anything, the best place to ask around is Tulim!");
LOCATION$ = "Candor";
+ setq ShipQuests_Julia, 3;
close;