Update map warp positions to reflect 000-0-0 update

1 files changed, 20 insertions, 16 deletions

diff --git a/npc/000-0-0/sailors.txt b/npc/000-0-0/sailors.txt
index 7336a6551..1d5b19304 100644
--- a/npc/000-0-0/sailors.txt
+++ b/npc/000-0-0/sailors.txt
@@ -10,16 +10,27 @@
 //    Elmo will handle dialogs between both NPCs. Modified for TMW2 by Jesusalva
 // Translation 
 // FR translated
-000-0-0,26,23,0	script	Elmo#sailors	NPC_ELMO,{
+000-0-0,29,45,0	script	Elmo#sailors	NPC_ELMO,{
 
 OnTalk:
     deltimer("Elmo#sailors::OnSlow");
     setcamnpc;
     showavatar NPC_ELMO;
     mesn "Elmo";
-    mesq lg("This girl is lucky we found her before a shark did. I have no idea where she comes from.", "This guy is lucky we found him before a shark did. I have no idea where he comes from.");
+    mesq l("Hey. You. You were in need of medical attention earlier. Do you remember how to walk, talk, attack, etc?");
     next;
+    select
+        l("Actually, a tutorial would be good!"),
+        l("Yes, I do.");
 
+    if (@menu == 2) {
+        mesn l("Magic Arpan");
+        mesq l("Yeye don't need to train here anymore! Let's head back to the ship before the sun sets, shall we?");
+        next;
+        goto L_Ready;
+    }
+
+    // TODO
     showavatar NPC_MAGIC_ARPAN;
     mesn "Magic Arpan";
     mesq lg("Yeye should go see the capt'n. We still don't know if she's friend or foe...", "Yeye should go see the capt'n. We still don't know if he's friend or foe...");
@@ -55,6 +66,7 @@ OnTalk:
     mesc l("(Protip: Use ##Barrow keys##b to walk around once you wake up.)");
     next;
 
+L_Ready:
     restorecam;
     adddefaultskills;
     setq General_Narrator, 0;
@@ -66,25 +78,17 @@ OnTalk:
     closedialog;
     close;
 
+// Prevent players from forgetting what they were meant to do
+// But if they logout, this will never trigger
 OnSlow:
-    /*
-    setcamnpc;
-    showavatar NPC_ELMO;
-    mesn;
-    mesc l("Pst, speak lower, you may wake @@ up...", strcharinfo(0));
-    next;
-    mesn;
-    mesc l("(Click on me to hear the conversation and advance. I am a NPC, and NPCs can be interact by clicking.)");
-    mesc l("(That was already explained on the intro. Read the dialogs! Important stuff can be found on them.)");
-    */
-    npctalk3 l("Pst! Speak lower! Otherwise we'll wake @@ up!", strcharinfo(0));
-    dispbottom l("Click on Elmo or Magic Arpan to continue...");
+    npctalk3 l("Hey @@! You haven't clicked on me yet!", strcharinfo(0));
     addtimer(30000,"Elmo#sailors::OnSlow2");
     end;
 
 OnSlow2:
     npctalk3 l("@@, do you need help? Are you lost? Click me!", strcharinfo(0));
-    addtimer(30000,"Elmo#sailors::OnSlow");
+    dispbottom l("Click on Elmo or Magic Arpan to continue and begin the game...");
+    addtimer(60000,"Elmo#sailors::OnSlow");
     end;
 
 OnInit:
@@ -92,7 +96,7 @@ OnInit:
     end;
 }
 
-000-0-0,25,23,0	script	Magic Arpan#sailors	NPC_MAGIC_ARPAN,{
+000-0-0,29,34,0	script	Magic Arpan#sailors	NPC_MAGIC_ARPAN,{
     doevent "Elmo#sailors::OnTalk";
     close;