Skip prompts when debug or $HARDCORE mode are defined. Debug takes precedence.

3 files changed, 28 insertions, 3 deletions

diff --git a/npc/000-0-0/sailors.txt b/npc/000-0-0/sailors.txt
index 5d98b8695..b06b3a521 100644
--- a/npc/000-0-0/sailors.txt
+++ b/npc/000-0-0/sailors.txt
@@ -253,6 +253,7 @@ L_Step5:
     getitem PiouLegs, 3; // Tutorial Reward
     goto L_Ready;
 
+OnSkip:
 L_Skip:
     setq ShipQuests_Arpan, 5;
     getitem CreasedShirt, 1;
diff --git a/npc/000-0/sailors.txt b/npc/000-0/sailors.txt
index 86f215bb5..139399a9c 100644
--- a/npc/000-0/sailors.txt
+++ b/npc/000-0/sailors.txt
@@ -26,6 +26,7 @@ OnTouch:
 
     showavatar 3;
     if ($EVENT$ == "Steam" && false) goto L_FiresOfSteam;
+    if ($HARDCORE || debug) goto L_ShortIntro;
 
     mesn "Narrator";
     mesc l("You open your eyes. The remants of the salt water in your eyes is not particularly helping you see.");
@@ -152,6 +153,7 @@ L_FiresOfSteam:
     GameRules(8 | 4);
     clear;
     closeclientdialog;
+
 OnForceReset:
     freeloop(true);
     while (BaseLevel < 60)
@@ -186,6 +188,23 @@ OnForceReset:
         warp "029-0", 202, 85;
     close;
 
+L_ShortIntro:
+    mesc l("This is a special server. New players should NOT chose this one to start playing."), 1;
+    mesc l("Did you hear what I just said?");
+    asklanguage(LANG_ON_SEA);
+    mes "";
+    mesc l("Remember to assign status points before fighting. By default, it can be done with %s.", b("F2")), 1;
+    mesc l("Do you want to do the tutorial?");
+    if (askyesno() == ASK_YES) {
+        warp "000-0-0", 30, 36;
+    } else {
+        setq ShipQuests_Arpan, 6;
+        setq ShipQuests_Julia, 2;
+        doevent "Elmo#sailors::OnSkip";
+    }
+    closeclientdialog;
+    close;
+
 OnForceReset2:
     logmes(sprintf("%s - Reset Forced by System Admin", getcharid(3)));
     #TUTORIAL_DONE=false;
diff --git a/npc/002-3/nard.txt b/npc/002-3/nard.txt
index e14c3668d..37ef38e94 100644
--- a/npc/002-3/nard.txt
+++ b/npc/002-3/nard.txt
@@ -387,13 +387,18 @@ OnNardStage:
     close;
 
 L_TestServer:
-    mesc l("THIS IS MOUBOOTAUR LEGENDS TEST SERVER."), 1;
+    if (debug)
+        mesc l("THIS IS MOUBOOTAUR LEGENDS TEST SERVER."), 1;
+    else if ($HARDCORE)
+        mesc l("THIS IS MOUBOOTAUR LEGENDS HARDCORE SERVER."), 1;
     mesc l("Progress on this server may be %s.", b(l("lost forever"))), 1;
     mes "";
     mesc l("Unless you know what you are doing, please go to Main Server instead."), 1;
     mesc l("Main server is: %s", b("server.moubootaurlegends.org")), 2;
-    mes "";
-    mesf "@@help://test-server|%s@@", l("more information about test server ->");
+    if (debug) {
+        mes "";
+        mesf "@@help://test-server|%s@@", l("more information about test server ->");
+    }
     next;
     goto L_Main;