A little dialogue changes and restyling in Rumly NPC script

1 files changed, 53 insertions, 43 deletions

diff --git a/npc/000-2-1/rumly.txt b/npc/000-2-1/rumly.txt
index de1b9b30a..120380d31 100644
--- a/npc/000-2-1/rumly.txt
+++ b/npc/000-2-1/rumly.txt
@@ -1,9 +1,10 @@
 000-2-1,67,25,0	script	Rumly	NPC_RUMLY,{
-    mesn;
-    mesq l("Hello! Do you have any mushrooms?");
+    speech 4,
+        l("Hello! Do you have any mushrooms?");
 
 L_Menu:
     .@visited = getq(General_Rumly);
+
     menu
         rif(.@visited == 0, l("Who are you?")), L_FirstTime,
         rif(.@visited >  0, l("Can you reset my stats please?")), L_ResetStats,
@@ -11,15 +12,18 @@ L_Menu:
 
     if (.@visited != 2) goto L_Quit;
         
-    mesn;
-    mesq l("See you! And come back with the mushrooms!");
+    speech 5,
+        l("See you! And come back with the mushrooms!");
+
     goto L_Quit;
 
 L_ResetStats:
     if (.@visited == 1) goto L_ChangedMind;
     
-    mesn;
-    mesq lg("Are you sure about this?");
+    speech 5,
+        lg("Are you sure about this?");
+
+L_ConfirmReset:
     menu
         rif(countitem(Plushroom) == 0, lg("Yes, I am sure that I want to reset my stats.")), -,
         rif(countitem(Plushroom) >= 1, lg("Yes, and I have even brought the mushrooms you like!")), -,
@@ -27,8 +31,8 @@ L_ResetStats:
         lg("I've just decided I will never reset my stats, sorry."), L_Never;
 
 L_GiveShrooms:
-    mesn;
-    mesq l("Then give me one @@ and we should start!", getitemlink(Plushroom));
+    speech 5,
+        l("Then give me one @@ and we should start!", getitemlink(Plushroom));
 
     menu
         rif(countitem(Plushroom) >= 1, l("Of course! *give him one @@*", l(getitemname(Plushroom)))), -,
@@ -36,51 +40,53 @@ L_GiveShrooms:
         lg("No way. I really should go."), L_Later;
 
     delitem Plushroom, 1;
-    mesn;
-    mesq lg("Thank you.");
-    next;
-    mesq lg("Now stand still. It would not take much time...");
-    next;
+
+    speech 5,
+        l("Thank you"),
+        l("Now stand still. It would not take much time...");
+
     .@wasSP = StatusPoint;
     resetstatus;
     if (StatusPoint == .@wasSP) goto L_NothingToReset;
-    mesq l("Let's see. @@ of your status points have just been reset.", StatusPoint - .@wasSP);
-    next;
-    mesn;
-    mesq l("Spend it wisely this time.");
-    next;
-    mesq lg("But you are welcome to reset your stats again if you will bring me more mushrooms!");
+
+    speech 5,
+        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 will bring me more mushrooms!");
+
     goto L_Quit;
 
 L_NothingToReset:
-    mesn;
-    mesq l("It seems that you have no status points to reset!");
-    next;
-    mesq lg("But mushrooms you have brought are really awesome you know.");
-    next;
-    mesq lg("Come back when you will really need me. And bring more mushrooms with you!");
+    speech 5,
+        l("It seems that you have no status points to reset!"),
+        lg("But mushrooms you have brought are really awesome you know."),
+        lg("Come back when you will really need me. And bring more mushrooms with you!");
+
     goto L_Quit;
 
 L_ChangedMind:
-    mesn;
-    mesq lg("Changed your mind, uh?");
+    speech 5,
+        lg("Changed your mind, uh?");
+
     menu
         lg("Yes, I really need my stats to be reset."), -,
         lg("Sorry, I've just realized that I still do not need my stats reset."), L_Never,
         rif(countitem(Plushroom) >= 1, lg("I have brought some mushrooms to you!")), L_GiveShrooms;
 
-    mesn;
-    mesq l("Very good!");
     setq General_Rumly, 2;
     .@visited = 2;
-    next;
-    goto L_ResetStats;
+
+    speech 5,
+        l("Very good."),
+        l("Status point reset can't be undone. Do you really want this?");
+
+    goto L_ConfirmReset;
 
 L_FirstTime:
-    mesn;
-    mesq lg("I am Rumly, the one who likes mushrooms so much!");
-    next;
-    mesq lg("Also I can make your stats clean! Just like fresh mushrooms...");
+    speech 5,
+        l("I am Rumly, the one who likes mushrooms so much!"),
+        lg("Also I can make your stats clean! Just like fresh mushrooms...");
+
     menu
         lg("Sounds well! I think I could get you that mushrooms"), -,
         rif(countitem(Plushroom) >= 1, lg("I already have some mushrooms you like so much.")), -,
@@ -88,25 +94,29 @@ L_FirstTime:
         lg("I will never need to reset my stats because I am sure I am doing right!"), L_Never;
 
     setq General_Rumly, 2;
-    mesn;
-    mesq l("Great! Can't wait for tasty mushrooms!");
-    next;
+
+    speech 5,
+        l("Great! Can't wait for tasty mushrooms!");
+
     goto L_Menu;
 
 L_Later:
     setq General_Rumly, 2;
-    mesn;
-    mesq l("Come back soon! And bring the mushrooms with you!");
+
+    speech 5,
+        l("Come back soon! And bring the mushrooms with you!");
+
     goto L_Quit;
 
 L_Never:
     setq General_Rumly, 1;
-    mesn;
-    mesq lg("I am sure you will change your mind.");
+
+    speech 5,
+        lg("I am sure that you will change your mind.");
+
     goto L_Quit;
 
 L_Quit:
-    next;
     goodbye;
 
 OnInit: