Add menuaction script function. Replace all action string to this function.

Also fix other usage of chars "[]".

11 files changed, 22 insertions, 18 deletions

diff --git a/npc/001-1/calypsan.txt b/npc/001-1/calypsan.txt
index f74db3df..dc48a46b 100644
--- a/npc/001-1/calypsan.txt
+++ b/npc/001-1/calypsan.txt
@@ -44,10 +44,10 @@
     {
         menuint
             rif(.@fexil == 1, l("Have you seen Fexil?")), 0,
-            l("[Trade]"), 1,
+            menuaction(l("Trade")), 1,
             l("How do these dyes work?"), 2,
             l("I want to make my own dyes."), 3,
-            l("[Quit]"), 4;
+            menuaction(l("Quit")), 4;
 
         switch (@menuret)
         {
diff --git a/npc/001-1/chelios.txt b/npc/001-1/chelios.txt
index a9429ec9..a6ccb39a 100644
--- a/npc/001-1/chelios.txt
+++ b/npc/001-1/chelios.txt
@@ -83,7 +83,7 @@
                 rif (.@enora == 3, l("I have your black iron.")), 2,
                 rif (.@enora >= 2, l("Where is the Merchant Guild?")), 3,
                 l("What is this building?"), 4,
-                l("[Quit]"), 5;
+                menuaction(l("Quit")), 5;
 
         switch (@menuret)
         {
diff --git a/npc/001-1/enora.txt b/npc/001-1/enora.txt
index a6d05154..794a5a4f 100644
--- a/npc/001-1/enora.txt
+++ b/npc/001-1/enora.txt
@@ -342,7 +342,7 @@
         speech 5,
             l("Are you sure that they are my potions?");
 
-        switch (select (l("[Yes]"), l("[No]")))
+        switch (select (menuaction(l("Yes")), menuaction(l("No"))))
         {
             case 1:
                 delitem PibberiesInfusion, 5;
diff --git a/npc/001-1/qpid.txt b/npc/001-1/qpid.txt
index 1a793a11..afa5967e 100644
--- a/npc/001-1/qpid.txt
+++ b/npc/001-1/qpid.txt
@@ -128,8 +128,8 @@
             l("But if you fail, you will have to get them from the alchemist."),
             l("Deal?");
 
-        switch (select (l("[Yes]"),
-                        l("[No]")))
+        switch (select (menuaction(l("Yes")),
+                        menuaction(l("No"))))
         {
             case 1:
                 riddle_enigma;
@@ -176,11 +176,11 @@
 
         menuint
             rif (.@enora == 7, l("Enora wants her potions.")), 0,
-            l("[Trade]"), 1,
+            menuaction(l("Trade")), 1,
             rif (.@enora > 7, l("What was your riddle?")), 2,
             l("How do you do your potions?"), 3,
             l("What are you reading?"), 4,
-            l("[Quit]"), 5;
+            menuaction(l("Quit")), 5;
 
         switch (@menuret)
         {
diff --git a/npc/001-1/salem.txt b/npc/001-1/salem.txt
index 40f30185..3fb6d4ee 100644
--- a/npc/001-1/salem.txt
+++ b/npc/001-1/salem.txt
@@ -112,7 +112,7 @@ L_SalemMenuShop:
         l("Let's trade."), 1,
         rif(.@q != 0, l("I'd like to buy a piou.")), 2,
         rif(.@fexil == 1, l("I'm looking for somebody named Fexil.")), 3,
-        l("[Quit]"), 4;
+        menuaction(l("Quit")), 4;
 
     switch (@menuret)
     {
diff --git a/npc/001-2-0/resa.txt b/npc/001-2-0/resa.txt
index 38c4546c..c74ba61e 100644
--- a/npc/001-2-0/resa.txt
+++ b/npc/001-2-0/resa.txt
@@ -46,9 +46,9 @@
     {
         .@enora = getq (ArtisQuests_Enora);
         menuint rif (.@enora == 5, l("I came to retrieve a package for Enora.")), 0,
-                l("[Trade]"), 1,
+                menuaction(l("Trade")), 1,
                 l("How can I improve my equipment?"), 2,
-                l("[Quit]"), 3;
+                menuaction(l("Quit")), 3;
 
         switch (@menuret)
         {
diff --git a/npc/001-2-26/ivan.txt b/npc/001-2-26/ivan.txt
index 42706804..45a45db8 100644
--- a/npc/001-2-26/ivan.txt
+++ b/npc/001-2-26/ivan.txt
@@ -61,7 +61,7 @@
 
     menuint rif(.@enora == 8, l("The Legion need some potions.")), 1,
             rif(.@enora >= 8, l("Who are you?")), 2,
-            l("[Quit]"), 3;
+            menuaction(l("Quit")), 3;
 
     switch (@menuret)
     {
diff --git a/npc/001-2-28/plush.txt b/npc/001-2-28/plush.txt
index 4089a0f0..8480fc1b 100644
--- a/npc/001-2-28/plush.txt
+++ b/npc/001-2-28/plush.txt
@@ -65,8 +65,8 @@
             l("This will remain your respawn point until set elsewhere."),
             l("Is that okay?");
 
-        switch (select (l("[Yes]"),
-                        l("[No]")))
+        switch (select (menuaction(l("Yes")),
+                        menuaction(l("No"))))
         {
             case 1:
                 accepted_room (.@price);
@@ -97,7 +97,7 @@
                 l("If you are registered somewhere else you will loose that reservation."),
                 l("Do you still want to lodge here?");
 
-            switch (select (l("[Yes]"), l("[No]")))
+            switch (select (menuaction(l("Yes")), menuaction(l("No"))))
             {
                 case 1: 
                     register_room; 
diff --git a/npc/001-2-36/training_room_npc.txt b/npc/001-2-36/training_room_npc.txt
index ae07db99..68127b18 100644
--- a/npc/001-2-36/training_room_npc.txt
+++ b/npc/001-2-36/training_room_npc.txt
@@ -142,7 +142,7 @@ JobIsDone:
 // ----- DEBUG START ! -----
 
 debug_it:
-	mes "[DEBUG INFO]";
+	mesn "DEBUG INFO";
 	mes "- CharVariable:FIGHT_TRAINING "+ FIGHT_TRAINING;
 	mes "- maxWaves "+ $@MAX_WAVES;
 	mes "- currentWave "+ $@CURRENT_WAVE_LEVEL;
diff --git a/npc/functions/beds.txt b/npc/functions/beds.txt
index 87a26e12..299ceda8 100644
--- a/npc/functions/beds.txt
+++ b/npc/functions/beds.txt
@@ -21,7 +21,7 @@ function	script	bedTouch	{
 function	script	bedClic	{
     narrator 4, l("Do you want to use this place as save point?");
 
-    if (select (l("[Yes]"), l("[No]")) == 1)
+    if (select (menuaction(l("Yes")), menuaction(l("No"))) == 1)
     {
         savepointparticle (getarg (0), getarg (1), getarg (2), getarg (3));
     }
diff --git a/npc/functions/main.txt b/npc/functions/main.txt
index 0c55caa2..0632bcec 100644
--- a/npc/functions/main.txt
+++ b/npc/functions/main.txt
@@ -9,6 +9,10 @@ function	script	menuimage	{
     return getarg(0) + "|" + getarg(1);
 }
 
+function	script	menuaction	{
+    return "[" + getarg(0) + "]";
+}
+
 function	script	mesn	{
     if (getargcount() > 0)
     {
@@ -96,7 +100,7 @@ function	script	narrator	{
     if (.@flags & 0x1)
         mes "";
 
-    mes l("[Narrator]");
+    mesn l("Narrator");
     for (.@i = .@start; .@i < .@argc; .@i++)
     {
         mes col(getarg(.@i), 9);