Move Nard and Elmo to 002-3. Unlink 002-4 from world.

5 files changed, 17 insertions, 26 deletions

diff --git a/npc/002-3/_import.txt b/npc/002-3/_import.txt
index 3421a5c5e..6d7316fad 100644
--- a/npc/002-3/_import.txt
+++ b/npc/002-3/_import.txt
@@ -2,5 +2,7 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/002-3/_mobs.txt",
 "npc/002-3/doors.txt",
+"npc/002-3/elmo.txt",
 "npc/002-3/mapflags.txt",
+"npc/002-3/nard.txt",
 "npc/002-3/note.txt",
diff --git a/npc/002-3/doors.txt b/npc/002-3/doors.txt
index abf9c892a..79d95c2b9 100644
--- a/npc/002-3/doors.txt
+++ b/npc/002-3/doors.txt
@@ -8,13 +8,11 @@
 
 OnTouch:
     if (getq(ShipQuests_Julia) < 3) {
-        setcamnpc "Julia";
-        mesn "Julia";
-        mesq l("The captain has locked the door, you should go see him.");
+        setcamnpc "Nard";
+        mesn l("Nard");
+        mesq l("Where do you think you are going, without talking to me first?");
         next;
-
-        mesn "Narrator";
-        mesc l("Captain Nard is in the room to your right.");
+        mesc l("Talk to Nard to unlock the door.");
         next;
         restorecam;
         close;
@@ -34,21 +32,6 @@ OnTouch:
 
 }
 
-002-3,44,28,0	script	AreaNPC#doors5	NPC_HIDDEN,0,0,{
-
-OnTouch:
-    .@julia = getq(ShipQuests_Julia);
-    if (.@julia >= 2) goto L_Warp;
-    close;
-
-L_Warp:
-    if (LOCATION$ == "") 
-        warp "002-4", 20, 27;
-    else
-        warp "002-4@"+LOCATION$, 20, 27;
-    close;
-}
-
 002-3,42,25,0	script	AreaNPC#002-3d	NPC_HIDDEN,0,0,{
 
 OnTouch:
diff --git a/npc/002-4/elmo.txt b/npc/002-3/elmo.txt
index 2f7ea7037..fcd20608e 100644
--- a/npc/002-4/elmo.txt
+++ b/npc/002-3/elmo.txt
@@ -5,9 +5,10 @@
 //    Elmo's second dialog. He is Nard's deputy and second-in-command.
 //    Elmo was created in Evol by Qwerty Dragon and Reid
 
-002-4,27,27,0	script	Elmo	NPC_ELMO,{
+002-3,32,24,0	script	Elmo	NPC_ELMO,{
     showavatar NPC_ELMO;  // this is handled by avatars.xml
 
+    if (getq(ShipQuests_Julia) < 3) goto L_NotYet;
     if (getq(CandorQuest_Sailors) == 2) goto L_Party;
     if (LOCATION$ == "Candor") goto L_Candor;
 
@@ -15,6 +16,12 @@
     sailortalk;
     end; // double-sure
 
+L_NotYet:
+    mesn;
+    mes l("I'm not the Captain, Nard is.");
+    mes l("You should talk to him instead.");
+    close;
+
 L_Candor:
     mesn;
     if (getq(General_Narrator) < 1) mes l("\"Hey, have you already got the money necessary for the travel?");
@@ -81,7 +88,8 @@ L_Candor:
 
     // Report in an abstract way to the player how good they are at getting travel
     // discounts, and how much work is left to do. Some points are easy/required to get (eg. Dan, Peter, HAS, etc.)
-    close2;
+    next;
+    closeclientdialog;
     .@n=nard_reputation();
     if (.@n >= 15)
             npctalk3 l("Nard is truly amazed at you. I am impressed, too.");
diff --git a/npc/002-4/nard.txt b/npc/002-3/nard.txt
index 24b5997fd..b37495104 100644
--- a/npc/002-4/nard.txt
+++ b/npc/002-3/nard.txt
@@ -8,7 +8,7 @@
 //    Nard is a fair merchant ship's captain.
 //    Original Nard's from Evol by Qwerty Dragon and Reid
 
-002-4,25,26,0	script	Nard	NPC_NARD,{
+002-3,36,25,0	script	Nard	NPC_NARD,{
     showavatar NPC_NARD;  // this is handled by avatars.xml
 
     .@narrator = getq(General_Narrator);
diff --git a/npc/002-4/_import.txt b/npc/002-4/_import.txt
index 5def6f5d9..c2cede277 100644
--- a/npc/002-4/_import.txt
+++ b/npc/002-4/_import.txt
@@ -1,5 +1,3 @@
 // Map 002-4: Nard's Room
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/002-4/doors.txt",
-"npc/002-4/elmo.txt",
-"npc/002-4/nard.txt",