Merge branch 'change_nard_dialog' into 'master'

add line in menu of both Nard.txt

change oder of sentence in menu, and add an information line of nard#artis
add an information line of nard#ship

See merge request !20

2 files changed, 20 insertions, 3 deletions

diff --git a/npc/000-2-3/nard.txt b/npc/000-2-3/nard.txt
index 9ca42ccd..cd2bd0ec 100644
--- a/npc/000-2-3/nard.txt
+++ b/npc/000-2-3/nard.txt
@@ -231,6 +231,7 @@ L_GoBackArtis:
         l("Enough of this island?"),
         l("Where would you like to go now?");
     switch (select(l("Let's go to Artis."),
+                   l("Tell me, where are we right now?"),
                    l("I would like to stay here a bit more.")))
     {
         case 1:
@@ -249,7 +250,13 @@ L_GoBackArtis:
 
             closedialog;
             close;
+
         case 2:
+            closedialog;
+            npctalk3 l("This is Drasil Island, I named it after an ancient mythical tree.");
+            close;
+
+        case 3:
             speech 5,
                 l("Ok I stay here with my paperwork if you need my help.");
 
diff --git a/npc/001-2-24/nard.txt b/npc/001-2-24/nard.txt
index d5efe9c7..b8eb9d58 100644
--- a/npc/001-2-24/nard.txt
+++ b/npc/001-2-24/nard.txt
@@ -30,10 +30,16 @@
     mesq g(l("Good day miss."), l("Good day mister."));
     next;
     mesq l("What can I do for you?");
+    .@q = getq(ArtisQuests_Enora);
 
+    // Before the player sees Enora, the menu shows L_Lost on top
+    // If the player saw Enora, the menu shows L_Lost at the bottom
+    // Because he shouldn't be lost after having talked to her, so the priority in menu changes
     menu
-        l("I'm lost, where should I go?"), L_Lost,
-        l("How long will you stay here?"), -;
+        rif(.@q == 0, l("I'm lost, where should I go?")), L_Lost,
+        rif(.@q > 0, l("Tell me, where are we right now?")), L_Info,
+        l("How long will you stay here?"), -,
+        rif(.@q > 0, l("I'm lost, where should I go?")), L_Lost;
 
     speech 5,
         l("We just returned from a long journey and Artis is a good city to rest and to conclude our exchange."),
@@ -66,8 +72,12 @@
             closedialog;
             close;
     }
+L_Info:
+    closedialog;
+    npctalk3 l("Don't you recognize the great city of Artis?");
+    close;
 
-L_Lost :
+L_Lost:
     mes "";
     mesn;
     mesq l("Julia made an appeal to the Legion of Aemil to get in touch with you, exit the ship and you should see your escort!");