Move Juliet & Billy Bons to 002-1

5 files changed, 9 insertions, 8 deletions

diff --git a/maps/re/002-1.mcache b/maps/re/002-1.mcache
index d33dbdbf6..09d68f680 100644
--- a/maps/re/002-1.mcache
+++ b/maps/re/002-1.mcache
diff --git a/npc/002-1/_import.txt b/npc/002-1/_import.txt
index 459d26fd2..4bc0b9230 100644
--- a/npc/002-1/_import.txt
+++ b/npc/002-1/_import.txt
@@ -4,12 +4,14 @@
 "npc/002-1/_savepoints.txt",
 "npc/002-1/alige.txt",
 "npc/002-1/arpan.txt",
+"npc/002-1/billybons.txt",
 "npc/002-1/chefgado.txt",
 "npc/002-1/chest.txt",
 "npc/002-1/dan.txt",
 "npc/002-1/devis.txt",
 "npc/002-1/doors.txt",
 "npc/002-1/hammock.txt",
+"npc/002-1/juliet.txt",
 "npc/002-1/knife.txt",
 "npc/002-1/mapflags.txt",
 "npc/002-1/peter.txt",
diff --git a/npc/002-3/billybons.txt b/npc/002-1/billybons.txt
index 6e1c77300..d23b13736 100644
--- a/npc/002-3/billybons.txt
+++ b/npc/002-1/billybons.txt
@@ -6,7 +6,7 @@
 //    Drunk easteregg telling about the player's past.
 //    For TMW2 it is just to provide a bottle
 
-002-3,31,23,0	script	Billy Bons#TMW2	NPC_BILLY_BONS,{
+002-1,29,33,0	script	Billy Bons#TMW2	NPC_BILLY_BONS,{
     if (rand(5) == 2) goto L_Hic;
     .@q = getq(ShipQuests_Bottle);
     if (.@q == 1) goto L_Hic;
diff --git a/npc/002-3/juliet.txt b/npc/002-1/juliet.txt
index c4aac8108..0c9e25c7a 100644
--- a/npc/002-3/juliet.txt
+++ b/npc/002-1/juliet.txt
@@ -11,11 +11,12 @@
 //    0 ShipQuests_Julia
 // Values:
 //    Julia:
-//    10   Default, no quest given.
-//    01   Need to see Julia.
-//    02   Has been registered by Julia.
+//    0   Default, haven't started the game yet.
+//    1   Need to see Julia.
+//    2   Has been registered by Julia.
+//    3   Has talked with Nard
 
-002-3,38,24,0	script	Juliet	NPC_JULIA,2,10,{
+002-1,67,26,0	script	Juliet	NPC_JULIA,2,10,{
 
     function ynMenu {
         if (select(l("Yes, I do."), l("No, none.")) == 1) {
@@ -194,7 +195,7 @@ OnTouch:
         mesq l("Oh, and I almost forgot! Do not share passwords or pincodes, not even with staff! And do not use the same password somewhere else, they can be stolen!");
         next;
         mesn;
-        mesq l("If you want to read this page again, there is a copy up on the left wall.");
+        mesq l("If you want to read this page again, there is a copy up on the wall.");
         next;
         mesn;
         mesq l("Also, take this book so you don't forget the rules. You can always read it, or type ##B@rules##b on the chat.");
diff --git a/npc/002-3/_import.txt b/npc/002-3/_import.txt
index 0fae87c7e..3421a5c5e 100644
--- a/npc/002-3/_import.txt
+++ b/npc/002-3/_import.txt
@@ -1,8 +1,6 @@
 // Map 002-3: First Deck
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/002-3/_mobs.txt",
-"npc/002-3/billybons.txt",
 "npc/002-3/doors.txt",
-"npc/002-3/juliet.txt",
 "npc/002-3/mapflags.txt",
 "npc/002-3/note.txt",