last minute changes

8 files changed, 153 insertions, 170 deletions

diff --git a/npc/001-1/calypsan.txt b/npc/001-1/calypsan.txt
index d597e30e..88cd5267 100644
--- a/npc/001-1/calypsan.txt
+++ b/npc/001-1/calypsan.txt
@@ -61,16 +61,16 @@
 
     do
     {
-        menuint
-            rif(.@fexil == 1, l("Have you seen Fexil?")), 0,
-            menuaction(l("Trade")), 1,
-            l("How do these dyes work?"), 2,
-            l("I want to make my own dyes."), 3,
-            menuaction(l("Quit")), 4;
+        select
+            rif(.@fexil == 1, l("Have you seen Fexil?")),
+            menuaction(l("Trade")),
+            l("How do these dyes work?"),
+            l("I want to make my own dyes."),
+            menuaction(l("Quit"));
 
-        switch (@menuret)
+        switch (@menu)
         {
-            case 0:
+            case 1:
                 setcamnpc "Fexil#001-1";
                 speech 5,
                     l("Oh yeye did, his store is just beside me!"),
@@ -78,22 +78,20 @@
                 restorecam;
 
                 break;
-            case 1:
+            case 2:
                 sell_dye;
                 close;
 
-            case 2:
+            case 3:
                 explain_dyes;
                 break;
-            case 3:
+            case 4:
                 speech 5,
                     l("Yoiis is not yet ready to make his own dyes."),
                     l("But in the future I might be able to help you create some of your own.");
                 break;
-            case 4:
-                break;
         }
-    } while (@menuret != 4);
+    } while (@menu != 5);
 
     closedialog;
     goodbye;
diff --git a/npc/001-1/chelios.txt b/npc/001-1/chelios.txt
index 1cebfdc7..2be8f87d 100644
--- a/npc/001-1/chelios.txt
+++ b/npc/001-1/chelios.txt
@@ -81,13 +81,14 @@
     do
     {
         .@enora = getq (ArtisQuests_Enora);
-        menuint rif (.@enora == 1, lg("I came to retrieve a package for Enora.")), 1,
-                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,
-                menuaction(l("Quit")), 5;
-
-        switch (@menuret)
+        select
+            rif (.@enora == 1, lg("I came to retrieve a package for Enora.")),
+            rif (.@enora == 3, l("I have your black iron.")),
+            rif (.@enora >= 2, l("Where is the Merchant Guild?")),
+            l("What is this building?"),
+            menuaction(l("Quit"));
+
+        switch (@menu)
         {
             case 1:
                 give_small_quest;
@@ -101,10 +102,8 @@
             case 4:
                 blacksmith_house;
                 break;
-            case 5:
-                break;
         }
-    } while (@menuret != 5);
+    } while (@menu != 5);
 
     closedialog;
     goodbye;
diff --git a/npc/001-1/enora.txt b/npc/001-1/enora.txt
index a6eab456..231ad613 100644
--- a/npc/001-1/enora.txt
+++ b/npc/001-1/enora.txt
@@ -369,35 +369,35 @@
     do
     {
         .@q = getq(ArtisQuests_Enora);
-        menuint
-            rif(.@q == 0, l("She told me that you had some tasks for me.")), 0,
-            rif(.@q == 4 || .@q == 6 || .@q == 9, l("I have your package.")), 1,
-            rif(.@q == 8 && countitem(PiberriesInfusion) >= 5, l("I have your package.")), 2,
-            rif(.@q >= 10, l("I cleaned up the hill.")), 3,
-            rif(.@q >= 10, l("How many Fluffies did I kill on the hill?")), 4,
-            rif(.@q >= 1, l("Who is Don?")), 5,
-            rif(.@q >= 5, l("Where is the light armor shop?")), 6,
-            rif(.@q >= 7, l("Where is the market?")), 7,
-            rif(.@q >= 10, l("Where is the hill?")), 8,
-            rif(.@q >= 1, l("What is this \"legion\"?")), 9,
-            l("I wish I could remember something..."), 10,
-            rif(.@q != 0, l("Nothing.")), 11;
-
-        switch (@menuret)
+        select
+            rif(.@q == 0, l("She told me that you had some tasks for me.")),
+            rif(.@q == 4 || .@q == 6 || .@q == 9, l("I have your package.")),
+            rif(.@q == 8 && countitem(PiberriesInfusion) >= 5, l("I have your package.")),
+            rif(.@q >= 10, l("I cleaned up the hill.")),
+            rif(.@q >= 10, l("How many Fluffies did I kill on the hill?")),
+            rif(.@q >= 1, l("Who is Don?")),
+            rif(.@q >= 5, l("Where is the light armor shop?")),
+            rif(.@q >= 7, l("Where is the market?")),
+            rif(.@q >= 10, l("Where is the hill?")),
+            rif(.@q >= 1, l("What is this \"legion\"?")),
+            l("I wish I could remember something..."),
+            rif(.@q != 0, l("Nothing."));
+
+        switch (@menu)
         {
-            case 0:
+            case 1:
                 enora_first_quest;
                 break;
-            case 1:
+            case 2:
                 enora_quest_complete;
                 break;
-            case 2:
+            case 3:
                 enora_paid_potions;
                 break;
-            case 3:
+            case 4:
                 enora_hill_cleaned;
                 break;
-            case 4:
+            case 5:
                 speech 5,
                     l("You killed @@ Fluffies.", ArtisFluffyKilled);
                 if (ArtisFluffyKilled > 8)
@@ -406,29 +406,28 @@
                     next;
                 }
                 break;
-            case 5:
-                enora_don;
             case 6:
+                enora_don;
+            case 7:
                 enora_light_armor;
                 break;
-            case 7:
+            case 8:
                 enora_market;
                 break;
-            case 8:
+            case 9:
                 enora_hill;
                 break;
-            case 9:
+            case 10:
                 enora_legion;
                 break;
-            case 10:
+            case 11:
                 enora_memories;
                 break;
-            case 11:
+            case 12:
                 speech 5,
                     l("Please come back anytime!");
-                break;
         }
-    } while (@menuret != 11);
+    } while (@menu != 12);
 
     closedialog;
     goodbye;
diff --git a/npc/001-1/fexil.txt b/npc/001-1/fexil.txt
index 8684aa3c..807d54b4 100644
--- a/npc/001-1/fexil.txt
+++ b/npc/001-1/fexil.txt
@@ -76,13 +76,13 @@
 
     .@fexil = getq(ArtisQuests_Fexil);
 
-    menuint
-        l("OK, let's trade."), 1,
-        rif(.@fexil == 2, l("Do you still need help?")), 2,
-        rif(.@fexil > 2 && countitem(FluffyFur) > 0, l("I have some fur for you.")), 3,
-        l("No. Sorry."), 4;
+    select
+        l("OK, let's trade."),
+        rif(.@fexil == 2, l("Do you still need help?")),
+        rif(.@fexil > 2 && countitem(FluffyFur) > 0, l("I have some fur for you.")),
+        l("No. Sorry.");
 
-    switch (@menuret)
+    switch (@menu)
     {
         case 1:
             closedialog;
diff --git a/npc/001-1/qonan.txt b/npc/001-1/qonan.txt
index 062dcf13..b237de07 100644
--- a/npc/001-1/qonan.txt
+++ b/npc/001-1/qonan.txt
@@ -44,13 +44,13 @@
         l("I'm afraid to go there myself, but if you take the risk, you can have half of the loot."),
         l("So, what do you say?");
 
-    menuint
-        l("I like money! Consider it done."), 0,
-        l("Too risky, I might end up in jail. Do it yourself."), 1;
+    select
+        l("I like money! Consider it done."),
+        l("Too risky, I might end up in jail. Do it yourself.");
 
-    switch(@menuret)
+    switch(@menu)
     {
-        case 0:
+        case 1:
             setq ArtisQuests_QOnan, 1;
             getrandompoint(178,26,182,29);
             npcdebug "Chest buriad at (" + .move__rand_x + "," + .move__rand_y + ")";
@@ -61,7 +61,7 @@
                 l("I hope to see you soon.");
             getitem IronShovel, 1;
             close;
-        case 1:
+        case 2:
             speech 3,
                 l("Come on, don't be a coward!"),
                 l("Anyway, let me know if you change your mind.");
diff --git a/npc/001-1/qpid.txt b/npc/001-1/qpid.txt
index 27f7517e..e6dd8021 100644
--- a/npc/001-1/qpid.txt
+++ b/npc/001-1/qpid.txt
@@ -171,39 +171,37 @@
     {
         .@enora = getq(ArtisQuests_Enora);
 
-        menuint
-            rif (.@enora == 7, l("Enora wants her potions.")), 0,
-            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,
-            menuaction(l("Quit")), 5;
-
-        switch (@menuret)
+        select
+            rif (.@enora == 7, l("Enora wants her potions.")),
+            menuaction(l("Trade")),
+            rif (.@enora > 7, l("What was your riddle?")),
+            l("How do you do your potions?"),
+            l("What are you reading?"),
+            menuaction(l("Quit"));
+
+        switch (@menu)
         {
-            case 0:
+            case 1:
                 enora_quest;
                 break;
-            case 1:
+            case 2:
                 closedialog;
                 shop "Store#Potion001-1";
                 close;
-            case 2:
+            case 3:
                 riddle_enigma;
                 break;
-            case 3:
+            case 4:
                 alchemist_information;
                 break;
-            case 4:
+            case 5:
                 speech 5,
                     l("It's a poem, about poems... Why are you asking that?"),
                     l("Because I am an orc I can't read such things? That's rubbish."),
                     l("I borrowed it from the library, you should try to cultivate yourself more instead of insinuate things about people you don't know!");
                 break;
-            case 5:
-                break;
         }
-    } while (@menuret != 5);
+    } while (@menu != 6);
 
     closedialog;
     goodbye;
diff --git a/npc/001-1/rumly.txt b/npc/001-1/rumly.txt
index f677b4ac..195a8aa6 100644
--- a/npc/001-1/rumly.txt
+++ b/npc/001-1/rumly.txt
@@ -27,20 +27,20 @@ L_Menu:
     .@visited = getq(General_Rumly);
     .@plush_count = lognbaselvl(1, 10);
 
-    menuint
-        l("Plushrooms you say?"), 0,
-        l("Who are you?"), 1,
-        rif(.@visited >  0, l("Can you reset my stats please?")), 2,
-        lg("You are weird, I have to go sorry."), 3;
+    select
+        l("Plushrooms you say?"),
+        l("Who are you?"),
+        rif(.@visited >  0, l("Can you reset my stats please?")),
+        lg("You are weird, I have to go sorry.");
 
-    switch (@menuret)
+    switch (@menu)
     {
-        case 0:
+        case 1:
             speech 5,
                 l("Wind and grass is nice and cool, so juicy sweet..."),
                 l("Our only wish to eat a plush, so juicy sweet...");
             goto L_Menu;
-        case 1:
+        case 2:
             speech 5,
                 lg("Why are you asking? And who are you too? I've never seen you around before..."),
                 lg("Wait, are you one of those from the Legion of Aemil? I didn't do anything wrong, I promise!"),
@@ -63,15 +63,15 @@ L_Menu:
                 l("Bring me some of these plushrooms and I will show you how it works!"),
                 l("Although the more powerful you are, the more plushrooms you will need.");
 
-            menuint
-                l("Sounds good!"), 0,
-                rif(countitem(Plushroom) >= .@plush_count, lg("I think I have enough plushrooms on me.")), 1,
-                l("We will talk about it later."), 2,
-                l("My stats are too good, I won't need it."), 3;
+            select
+                l("Sounds good!"),
+                rif(countitem(Plushroom) >= .@plush_count, lg("I think I have enough plushrooms on me.")),
+                l("We will talk about it later."),
+                l("My stats are too good, I won't need it.");
 
-            switch (@menuret)
+            switch (@menu)
             {
-                case 0:
+                case 1:
                     if (.@visited < 2)
                     {
                         setq General_Rumly, 2;
@@ -81,17 +81,17 @@ L_Menu:
                         l("Great! Can't wait for some tasty mushrooms!");
 
                     goto L_Menu;
-                case 1:
-                    goto L_ResetStats;
                 case 2:
-                    goto L_Later;
+                    goto L_ResetStats;
                 case 3:
+                    goto L_Later;
+                case 4:
                     goto L_Never;
             }
 
-        case 2:
-            goto L_ResetStats;
         case 3:
+            goto L_ResetStats;
+        case 4:
             if (.@visited < 2) goto L_Quit;
 
             .@rand = rand (2);
@@ -139,55 +139,49 @@ L_ConfirmReset:
             speech 5,
                 l("Let me just have a quick look at you. Hm... I will need @@ @@s to reset your stats.", .@plush_count, getitemlink(Plushroom));
 
-            menuint
-                rif(countitem(Plushroom) >= .@plush_count, lg("Here, take as many as you need, I have plenty!")), 0,
-                rif(countitem(Plushroom) > 0 && countitem(Plushroom) < .@plush_count, lg("I don't have enough plushrooms...")), 1,
-                rif(countitem(Plushroom) == 0, lg("Oh no, I don't have any plushroom on me right now.")), 2,
-                lg("I have to go, sorry."), 3;
+            select
+                rif(countitem(Plushroom) >= .@plush_count, lg("Here, take as many as you need, I have plenty!")),
+                rif(countitem(Plushroom) > 0 && countitem(Plushroom) < .@plush_count, lg("I don't have enough plushrooms...")),
+                rif(countitem(Plushroom) == 0, lg("Oh no, I don't have any plushroom on me right now.")),
+                lg("I have to go, sorry.");
 
-            switch (@menuret)
+            if (@menu > 1)
             {
-                case 0:
-                    delitem Plushroom, .@plush_count;
+                goto L_Later;
+            }
 
-                    speech 5,
-                        l("Thank you."),
-                        l("Now stand still... It should not take much time...");
+            delitem Plushroom, .@plush_count;
 
-                    .@wasSP = StatusPoint;
-                    resetstatus;
-                    if (.@visited < 3)
-                    {
-                        setq General_Rumly, 3;
-                    }
-                    if (StatusPoint == .@wasSP)
-                    {
-                        speech 4,
-                            l("It seems that you have no status points to reset!"),
-                            lg("But the plushroom you brought was really awesome you know."),
-                            lg("Come back when you will really need me. And bring more plushrooms with you!");
-                    }
-                    else
-                    {
-                        speech 4,
-                            l("Let's see... @@ of your status points have just been reset!", StatusPoint - .@wasSP),
-                            l("Spend it wisely this time."),
-                            lg("But you are welcome to reset your stats again if you bring me some more plushrooms!");
-                    }
-                    goto L_Quit;
-                    break;
-                case 1:
-                case 2:
-                case 3:
-                    goto L_Later;
-                    break;
+            speech 5,
+                l("Thank you."),
+                l("Now stand still... It should not take much time...");
+
+            .@wasSP = StatusPoint;
+            resetstatus;
+            if (.@visited < 3)
+            {
+                setq General_Rumly, 3;
+            }
+            if (StatusPoint == .@wasSP)
+            {
+                speech 4,
+                    l("It seems that you have no status points to reset!"),
+                    lg("But the plushroom you brought was really awesome you know."),
+                    lg("Come back when you will really need me. And bring more plushrooms with you!");
+            }
+            else
+            {
+                speech 4,
+                    l("Let's see... @@ of your status points have just been reset!", StatusPoint - .@wasSP),
+                    l("Spend it wisely this time."),
+                    lg("But you are welcome to reset your stats again if you bring me some more plushrooms!");
             }
+            goto L_Quit;
+
         case 2:
             goto L_Later;
-            break;
         case 3:
             goto L_Never;
-            break;
     }
 
 L_Later:
diff --git a/npc/001-1/salem.txt b/npc/001-1/salem.txt
index e3b8cd74..3d6fd9c8 100644
--- a/npc/001-1/salem.txt
+++ b/npc/001-1/salem.txt
@@ -18,12 +18,13 @@
         .@price = getarg(0);
         mesq l("The piou costs @@ E.", .@price);
         next;
-        menuint l("Alright, I'll take one."), 1,
-                l("I changed my mind."), 2;
+        select
+            l("Alright, I'll take one."),
+            l("I changed my mind.");
 
         mes "";
         mesn;
-        if (@menuret == 2)
+        if (@menu == 2)
             return 4;
         if (Zeny < .@price)
         {
@@ -107,23 +108,23 @@
 L_SalemMenuShop:
     .@fexil = getq(ArtisQuests_Fexil);
 
-    menuint
-        l("What about those pious? They look so cute."), 0,
-        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,
-        menuaction(l("Quit")), 4;
+    select
+        l("What about those pious? They look so cute."),
+        l("Let's trade."),
+        rif(.@q != 0, l("I'd like to buy a piou.")),
+        rif(.@fexil == 1, l("I'm looking for somebody named Fexil.")),
+        menuaction(l("Quit"));
 
-    switch (@menuret)
+    switch (@menu)
     {
-        case 0:
+        case 1:
             goto L_AboutPious;
             break;
-        case 1:
+        case 2:
             closedialog;
             shop "Store#General001-1";
             close;
-        case 2:
+        case 3:
             if (.@q == 2 && ArtisQuests_PiouDiscount)
             {
                 speech 5,
@@ -133,12 +134,10 @@ L_SalemMenuShop:
             if (!BuyPiou(@ArtisQuests_PiouPrice))
                 ArtisQuests_PiouDiscount = 0;
             break;
-        case 3:
+        case 4:
             speech 5,
                 l("I think that I've seen this weakling wandering around the beach south from here this morning.");
             break;
-        case 5:
-            break;
     }
 
     closedialog;
@@ -168,25 +167,21 @@ L_AboutPious:
     mesq l("If you catch the escaped piou and bring it back, I will give you a 90% discount on a piou.");
     next;
 
-    menuint rif (.@q == 0, l("Sounds like a good deal to me. I'll do it.")), 0,
-            rif (.@q == 1, l("I'm on my way! I will bring it back to you.")), 1,
-            l("I don't really have time to go chasing pious, let me just buy one at the regular price (30000 E)."), 2,
-            l("I don't want to buy a piou right now."), 3;
+    select
+        rif (.@q == 0, l("Sounds like a good deal to me. I'll do it.")),
+        rif (.@q == 1, l("I'm on my way! I will bring it back to you.")),
+        l("I don't really have time to go chasing pious, let me just buy one at the regular price (30000 E)."),
+        l("I don't want to buy a piou right now.");
 
     mes "";
     mesn;
 
-    switch (@menuret)
+    switch (@menu)
     {
-        case 0:
-            goto L_QuestInfo;
         case 1:
-            break;
-        case 2:
-            BuyPiou @ArtisQuests_PiouPrice;
-            break;
+            goto L_QuestInfo;
         case 3:
-            break;
+            BuyPiou @ArtisQuests_PiouPrice;
     }
     closedialog;
     goodbye;