Replace trivial menu invokes without labels to select.

15 files changed, 62 insertions, 60 deletions

diff --git a/npc/000-0/sailors.txt b/npc/000-0/sailors.txt
index 1c30cf9c..dde99cab 100644
--- a/npc/000-0/sailors.txt
+++ b/npc/000-0/sailors.txt
@@ -49,18 +49,18 @@ OnTouch:
     next;
     restorecam;
 
-    menu
-        menuimage("flags/en", "I hear you... (English)"), -,
-        menuimage("flags/fr", "Je vous entends... (Français)"), -,
-        menuimage("flags/ru", "Да я вас слышу... (Русский)"), -,
-        menuimage("flags/es", "Te oigo... (Español)"), -,
-        menuimage("flags/pt_BR", "Eu te ouço... (Português)"), -,
-        menuimage("flags/de", "Ich höre euch... (Deutsch)"), -,
-        menuimage("flags/vls", "'k hoar ui wel... (Vlaams)"), -,
-        menuimage("flags/pl", "Słyszę cię... (Polski)"), -,
-        menuimage("flags/it", "Vi sento... (Italiano)"), -,
-        menuimage("flags/nl_BE", "Ik kan je horen... (Nederlands)"), -,
-        menuimage("flags/ca", "Et escolto (Català)"), -;
+    select
+        menuimage("flags/en", "I hear you... (English)"),
+        menuimage("flags/fr", "Je vous entends... (Français)"),
+        menuimage("flags/ru", "Да я вас слышу... (Русский)"),
+        menuimage("flags/es", "Te oigo... (Español)"),
+        menuimage("flags/pt_BR", "Eu te ouço... (Português)"),
+        menuimage("flags/de", "Ich höre euch... (Deutsch)"),
+        menuimage("flags/vls", "'k hoar ui wel... (Vlaams)"),
+        menuimage("flags/pl", "Słyszę cię... (Polski)"),
+        menuimage("flags/it", "Vi sento... (Italiano)"),
+        menuimage("flags/nl_BE", "Ik kan je horen... (Nederlands)"),
+        menuimage("flags/ca", "Et escolto (Català)");
     .@lang = @menu-1;
     if (.@lang < 0 || .@lang > 10) close;
     Lang = .@lang;
diff --git a/npc/000-1/astapolos.txt b/npc/000-1/astapolos.txt
index 41630596..a25c814e 100644
--- a/npc/000-1/astapolos.txt
+++ b/npc/000-1/astapolos.txt
@@ -18,8 +18,8 @@
     mesq l("So finally someone has came to visit me?");
     next;
 
-    menu
-        lg("Actually, I came here to work on my task."), -;
+    select
+        lg("Actually, I came here to work on my task.");
 
     mes "";
     mesn;
@@ -48,8 +48,8 @@
     mesq lg("Oh, but you didn't come here to talk about that, am I right?");
     next;
 
-    menu
-        lg("Actually, I was here to help you with those boxes. Can I bring one of them back to Gugli?"), -;
+    select
+        lg("Actually, I was here to help you with those boxes. Can I bring one of them back to Gugli?");
 
     mes "";
     mesn;
diff --git a/npc/000-1/darlin.txt b/npc/000-1/darlin.txt
index b3bffa18..14fa9d3a 100644
--- a/npc/000-1/darlin.txt
+++ b/npc/000-1/darlin.txt
@@ -54,9 +54,9 @@
     next;
     restorecam;
 
-    menu
-         strcharinfo(0) + ".", -,
-         l("Maybe you can come down to talk?"), -;
+    select
+         strcharinfo(0) + ".",
+         l("Maybe you can come down to talk?");
 
     setcamnpc;
     mes "";
diff --git a/npc/000-1/gugli.txt b/npc/000-1/gugli.txt
index 1cf22fe6..69c41f15 100644
--- a/npc/000-1/gugli.txt
+++ b/npc/000-1/gugli.txt
@@ -41,8 +41,8 @@ OnTalk:
     mesq l("As you may know, we are explorers on a long distance voyage, and our swashbuckling mariners need to store enough food to survive. You don't know how dangerous the sea life can be.");
     next;
 
-    menu
-        l("Actually, I have an in-depth knowledge of this type of life."), -;
+    select
+        l("Actually, I have an in-depth knowledge of this type of life.");
 
     mes "";
     mesn;
@@ -55,8 +55,8 @@ OnTalk:
     mesq l("At the moment, our crew is busy collecting @@s, @@s and @@s.", getitemlink(513), getitemlink(515), getitemlink(509));
     next;
 
-    menu
-        l("So, what can I do for you?"), -;
+    select
+        l("So, what can I do for you?");
 
     mes "";
     mesn;
diff --git a/npc/000-1/jalad.txt b/npc/000-1/jalad.txt
index 3c42777e..55367dd2 100644
--- a/npc/000-1/jalad.txt
+++ b/npc/000-1/jalad.txt
@@ -31,8 +31,8 @@
     mesq l("You should go see him. He is one of the most experienced sailors we have.");
     next;
 
-    menu
-        l("I will surely visit him. Do you need any help with your boxes?"), -;
+    select
+        l("I will surely visit him. Do you need any help with your boxes?");
 
 L_Continue:
     mes "";
diff --git a/npc/000-1/muller.txt b/npc/000-1/muller.txt
index b51db535..e45c7d98 100644
--- a/npc/000-1/muller.txt
+++ b/npc/000-1/muller.txt
@@ -17,8 +17,8 @@
     mesq l("Can't you see I'm working?!");
     next;
 
-    menu
-        l("Well I'm working too! Don't you want me to carry one of these boxes back to Gugli?"), -;
+    select
+        l("Well I'm working too! Don't you want me to carry one of these boxes back to Gugli?");
 
     mes "";
     mesn;
@@ -34,8 +34,8 @@
     mesq l("Are you blind? Do you really think these boxes are light and soft as a piou's feather?!");
     next;
 
-    menu
-        lg("I am sure that I can run with one of them on my shoulder."), -;
+    select
+        lg("I am sure that I can run with one of them on my shoulder.");
 
     mes "";
     mesn;
diff --git a/npc/000-1/sapartan.txt b/npc/000-1/sapartan.txt
index fab65396..60ff312d 100644
--- a/npc/000-1/sapartan.txt
+++ b/npc/000-1/sapartan.txt
@@ -33,8 +33,8 @@
     mesq l("But remember that not every place in this world is peaceful and safe nowadays. Even the white shores you are walking on can hide some dangerous beings.");
     next;
 
-    menu
-        l("What danger?! Where?!"), -;
+    select
+        l("What danger?! Where?!");
 
     setcamnpc "Max";
     mes "";
@@ -67,8 +67,8 @@
     mesq l("Secondly, choose wisely which weapon is suited for you. Some people like to face their enemies closely with a heavy axe, others prefer to attack from a distance with a bow for example.");
     next;
 
-    menu
-        l("Yeah, well what's the difference?"), -;
+    select
+        l("Yeah, well what's the difference?");
 
     mes "";
     mesn;
diff --git a/npc/000-1/tibbo.txt b/npc/000-1/tibbo.txt
index 8da1e286..757fcd14 100644
--- a/npc/000-1/tibbo.txt
+++ b/npc/000-1/tibbo.txt
@@ -18,8 +18,8 @@
     mesq l("Uh? Hi! I'm sorry, but I have no time for chatting.");
     next;
 
-    menu
-        l("Fine... I was just going to give you some help..."), -;
+    select
+        l("Fine... I was just going to give you some help...");
 
     mes "";
     mesn;
@@ -28,8 +28,8 @@
     mesq l("What kind of help?");
     next;
 
-    menu
-        lg("Gugli asked me to help you carrying one of these boxes you are filling."), -;
+    select
+        lg("Gugli asked me to help you carrying one of these boxes you are filling.");
 
     mes "";
     mesn;
diff --git a/npc/000-2-0/billybons.txt b/npc/000-2-0/billybons.txt
index 40badcf6..3a925b43 100644
--- a/npc/000-2-0/billybons.txt
+++ b/npc/000-2-0/billybons.txt
@@ -16,8 +16,8 @@
     mes col(l("The sailor chugs his beer."), 9);
     next;
 
-    menu
-        lg("Excuse me? Do you know who I am?"), -;
+    select
+        lg("Excuse me? Do you know who I am?");
 
     mes "";
     mesn;
diff --git a/npc/000-2-0/julia.txt b/npc/000-2-0/julia.txt
index 9519c17d..e3478ac9 100644
--- a/npc/000-2-0/julia.txt
+++ b/npc/000-2-0/julia.txt
@@ -215,8 +215,8 @@ L_Regret:
     mesq l("Why? And who should you bring it back to?");
     next;
 
-    menu
-        l("Ehm... He was really upset because of some past stories."), -;
+    select
+        l("Ehm... He was really upset because of some past stories.");
 
     mes "";
     mesn;
@@ -237,8 +237,8 @@ L_Rumors:
     mesq l("You shouldn't believe every tale drunken sailors tell you.");
     next;
 
-    menu
-        l("Let's say the person who told me about that is well respected on this ship and never drunk."), -;
+    select
+        l("Let's say the person who told me about that is well respected on this ship and never drunk.");
 
     mes "";
     mesn;
diff --git a/npc/000-2-1/arpan.txt b/npc/000-2-1/arpan.txt
index 6da37d20..b94c6973 100644
--- a/npc/000-2-1/arpan.txt
+++ b/npc/000-2-1/arpan.txt
@@ -123,8 +123,8 @@ L_OhWell:
     mesq lg("Oh well, we rescued you when you were yaying adrift in the sea.");
     next;
 
-    menu
-        l("And then what happened?"), -;
+    select
+        l("And then what happened?");
 
 L_Story:
     mes "";
diff --git a/npc/000-2-1/chefgado.txt b/npc/000-2-1/chefgado.txt
index d9e8a603..f81baaa4 100644
--- a/npc/000-2-1/chefgado.txt
+++ b/npc/000-2-1/chefgado.txt
@@ -56,8 +56,8 @@ L_Rude:
     mesq l("UAHAHAHAAH! I am the cook of that bunch of donkeys and I can be rude with everyone from this bossy captain to that harpy-lady!");
     next;
 
-    menu
-        l("Harpy-lady?"), -;
+    select
+        l("Harpy-lady?");
 
     mes "";
     mesn;
@@ -70,8 +70,8 @@ L_Rude:
     mesq l("But I swear that one day... Oh... My tasty revenge! Hhm, actually I wonder if... Maybe...");
     next;
 
-    menu
-        l("M... Maybe?"), -;
+    select
+        l("M... Maybe?");
 
     mes "";
     mesn;
@@ -180,8 +180,8 @@ L_Aborting:
     mesq l("Wait, why do you still have the dish with you?!");
     next;
 
-    menu
-        l("I informed Julia about your monstrous plan."), -;
+    select
+        l("I informed Julia about your monstrous plan.");
 
     mes "";
     mesn;
diff --git a/npc/000-2-3/nard.txt b/npc/000-2-3/nard.txt
index 6dae01e6..fe714f62 100644
--- a/npc/000-2-3/nard.txt
+++ b/npc/000-2-3/nard.txt
@@ -163,8 +163,8 @@ L_ChefQuestRedir:
     mesq l("They are each valued individuals and I need them both. In the past, I probably made my share of mistakes. I regret good management is so difficult. I was wondering if you could investigate and... Sort out this situation.");
     next;
 
-    menu
-        l("Of the two of them, who has 'good' on their side?"), -;
+    select
+        l("Of the two of them, who has 'good' on their side?");
 
     mes "";
     mesq l("I do not want to go pointing my finger at someone. I want to be honorable and fair, and I sense the same quality in you, so I put my trust in you. I am sure you will be able to judge and solve this troubling situation.");
@@ -188,8 +188,8 @@ L_ChefQuestComplete:
     mesq l("Take your reward from the box next to my desk!");
     next;
 
-    menu
-        l("I will take it! Thank you captain!"), -;
+    select
+        l("I will take it! Thank you captain!");
 
     setq ShipQuests_Nard, 4;
     getexp 50, 0;
diff --git a/npc/001-1/cookiemaster.txt b/npc/001-1/cookiemaster.txt
index b5c93ad5..caf45594 100644
--- a/npc/001-1/cookiemaster.txt
+++ b/npc/001-1/cookiemaster.txt
@@ -20,8 +20,8 @@
     mesq lg("Hey! Adventurer! Are you enjoying your life on Aemil?");
     next;
 
-    menu
-        l("Well in fact..."), -;
+    select
+        l("Well in fact...");
 
     mes "";
     mesn;
diff --git a/npc/001-2-21/julia.txt b/npc/001-2-21/julia.txt
index f288b9af..b9513526 100644
--- a/npc/001-2-21/julia.txt
+++ b/npc/001-2-21/julia.txt
@@ -91,9 +91,11 @@ L_What:
     mesq l("Oh, and there was this inscription on your raft. It represents the Legion of Aemil, the largest and biggest guild of the whole new world. Does that make you remember anything, anything at all?");
     next;
 
-    menu
-        l("Sorry, but I can't tell you anything about that."), L_NoChanges,
-        l("Nothing, sorry."), L_NoChanges;
+    select
+        l("Sorry, but I can't tell you anything about that."),
+        l("Nothing, sorry.");
+
+    goto L_NoChanges;
 
 L_Rules:
     mes "";