Polish up a bit Sorfina's code

1 files changed, 64 insertions, 64 deletions

diff --git a/npc/029-2/sorfina.txt b/npc/029-2/sorfina.txt
index 8bb911fb..945924ca 100644
--- a/npc/029-2/sorfina.txt
+++ b/npc/029-2/sorfina.txt
@@ -13,44 +13,44 @@ L_Main:
     goto L_Start;
 
 L_Start:
-    mes "You open your eyes.";
+    mes l("You open your eyes.");
     mes "";
-    mes "[Old Woman]";
-    mes "\"Ah, you woke up. You washed ashore on the beach 3 days ago. You've been asleep since.";
-    mes "You must have been thrown off one of the ships sailing during that last tremor.\"";
-    mes "\"My little granddaughter Tanisha found you. Kaan was able to carry you to bed.";
-    mes "We've been taking care of you ever since. Waiting for you to wake up.\"";
-    mes "\"You didn't have any possessions on you when we found you and no one knows who you are.\"";
-    mes "Do you have a name?";
-    menu
-        strcharinfo(0), L_name;
+    mesn l("Old Woman");
+    mes l("\"Ah, you woke up. You washed ashore on the beach 3 days ago. You've been asleep since.");
+    mes l("You must have been thrown off one of the ships sailing during that last tremor.\"");
+    next;
+    mes l("\"My little granddaughter Tanisha found you. Kaan was able to carry you to bed.");
+    mes l("We've been taking care of you ever since. Waiting for you to wake up.\"");
+    next;
+    mesq l("You didn't have any possessions on you when we found you and no one knows who you are.");
+    mes l("Do you have a name?");
+    select
+        strcharinfo(0);
 
-L_name:
-    mes "[Old Woman]";
-    mes "\"Well " + strcharinfo(0) + " what else can you tell me about yourself?.\"";
+    mesn l("Old Woman");
+    mesq l("Well %s what else can you tell me about yourself?.", strcharinfo(0));
     next;
-    mes "[Old Woman]";
-    mes "\"Go on. If you need to think a bit, take your time.\"";
+    mesn l("Old Woman");
+    mesq l("Go on. If you need to think a bit, take your time.");
     select
-        "... Tulimshar in Tonori ... I'm a Talpan.";
+        l("... Tulimshar in Tonori ... I'm a Talpan.");
     mes "";
-    mes "[Old Woman]";
-    mes "\"Anything else you can remember?\"";
-    menu
-        "Umm... no... I... I don't remember anything else...", L_KnowNothing;
+    mesn l("Old Woman");
+    mesq l("Anything else you can remember?");
+    select
+        l("Umm... no... I... I don't remember anything else...");
 
-L_KnowNothing:
-    mes "[Old Woman]";
-    mes "\"Well I can tell you some useful things, if you want to hear.";
-    mes "Some of it might jog your memory or at least help you catch your bearings.";
-    mes "Oh, and by the way my name is Sorfina.\"";
+    mesn l("Old Woman");
+    mes l("Well I can tell you some useful things, if you want to hear.");
+    mes l("Some of it might jog your memory or at least help you catch your bearings.");
+    mes l("Oh, and by the way my name is Sorfina.\"");
     menu
-        "That would be great!",L_Tut,
-        "No, thanks. I already know how things are going.",L_SkipTut;
+        l("That would be great!"), L_Tut,
+        l("No, thanks. I already know how things are going."), L_SkipTut;
 
 L_Tut:
-    mes "She smiles at you.";
-    mes "[Sorfina]";
+    mesc l("She smiles at you.");
+    mesn;
     mes "\"You have arrived at a very strange time. The Council is visiting Candor today.\"";
     mes "\"All the recent rumbling from the cave has all of Candor worried.\"";
     mes "\"Our guess is something with the last big shaker was the reason you ended up here.\"";
@@ -58,7 +58,7 @@ L_Tut:
     goto L_Carpet;
 
 L_Carpet:
-    mes "[Sorfina]";
+    mesn;
     mes "\"Try to take a few steps and walk to that carpet over there.";
     next;
     camera "#Carpet";
@@ -72,7 +72,7 @@ L_Carpet:
     goto L_close;
 
 L_Dresser:
-    mes "[Sorfina]";
+    mesn;
     mes "\"You should get dressed now.\"";
     next;
     camera "Dresser#tutorial";
@@ -85,7 +85,7 @@ L_Dresser:
     goto L_close;
 
 L_Naked:
-    mes "[Sorfina]";
+    mesn;
     mes "\"Press [###keyWindowInventory;] or click on the Inventory button in the bar at the upper right corner to open your bag.\"";
     mes "\"Once we stop talking, double-click on the clothes to equip.\"";
     mes "\"Talk to me again after you get dressed. You can either click on me, or press [###keyTargetNPC;] to focus on me and [###keyTalk;] to talk.\"";
@@ -94,7 +94,7 @@ L_Naked:
 L_Clothes:
     if (getequipid(equip_torso) < 0)
         goto L_Naked;
-    mes "[Sorfina]";
+    mesn;
     mes "\"That's much better, don't you think?\"";
     mes "\"Here take this.\"";
     getitem "HitchhikersTowel", 1;
@@ -116,7 +116,7 @@ L_Clothes:
     goto L_close;
 
 L_Again:
-    mes "[Sorfina]";
+    mesn;
     mes "\"Make yourself at home! Do you have any questions?\"";
     menu
         "Yes, could you explain about...",L_Explain,
@@ -126,14 +126,14 @@ L_Again:
 L_Heal:
     if (BaseLevel > 20)
         goto L_NoHeal;
-    mes "[Sorfina]";
+    mesn;
     mes "\"Hello Dear! You look tired, you should rest a moment.\"";
     mes "You take a short nap and feel refreshed.";
     heal MaxHp, 0;
     goto L_Main;
 
 L_NoHeal:
-    mes "[Sorfina]";
+    mesn;
     mes "\"I'm sorry but your wounds are far to advanced for my skills.\"";
     goto L_Main;
 
@@ -148,7 +148,7 @@ L_Explain:
         "... nevermind.",L_close;
 
 L_Walk:
-    mes "[Sorfina]";
+    mesn;
     mes "\"You can use the arrow keys to walk around.";
     mes "Press [###keyMoveUp;] to move up, press [###keyMoveDown;] to move down, ";
     mes "press [###keyMoveLeft;] to move left, press [###keyMoveRight;] to move right ";
@@ -157,7 +157,7 @@ L_Walk:
     goto L_close;
 
 L_Talk:
-    mes "[Sorfina]";
+    mesn;
     mes "\"If you want to talk to a normal person, you can click at him or her.";
     mes "Or you can press [###keyTargetNPC;] to focus on the nearest person and then press [###keyTalk;] to talk.\"";
     next;
@@ -172,7 +172,7 @@ L_Talk:
     goto L_close;
 
 L_Items:
-    mes "[Sorfina]";
+    mesn;
     mes "\"There are three types of items.";
     mes "They can be Consumables, Equipment or Miscellaneous.\"";
     next;
@@ -195,7 +195,7 @@ L_Items:
     goto L_close;
 
 L_Shortcut:
-    mes "[Sorfina]";
+    mesn;
     mes "\"Press [###keyWindowShortcut;] or click the Shortcut button in the bar at the upper right to open your shortcut window.\"";
     next;
     mes "\"You can select the item you want to put on a shortcut with your mouse and then click on the position in the shortcut window you want to place it.\"";
@@ -204,7 +204,7 @@ L_Shortcut:
     goto L_close;
 
 L_Aidan:
-    mes "[Sorfina]";
+    mesn;
     mes "\"I heard Aidan and Valon are looking for brave adventurers, you might want to talk to them. ";
     mes "You can find Aidan near the camp fire outside. The fields are just south of the town exit. ";
     mes "You'll see Valon of the city gaurd standing there. They both are offering rewards for monster hunting.\"";
@@ -218,7 +218,7 @@ L_Aidan:
     goto L_close;
 
 L_Barber:
-    mes "[Sorfina]";
+    mesn;
     mes "\"Jessie downstairs can change your appearance.\"";
     mes "\"They will allow you to change your hair color or style as well as gender.\"";
     next;
@@ -227,7 +227,7 @@ L_Barber:
     goto L_close;
 
 L_Hasan:
-    mes "[Sorfina]";
+    mesn;
     mes "\"Make yourself at home! Do you have any questions?\"";
         menu
             "A guy named Hasan is bullying people.",L_Next,
@@ -237,7 +237,7 @@ L_Hasan:
 L_Next:
     mes "\"Ah, Hasan. He's causing trouble again?\"";
     mes "She shakes her head.";
-    mes "[Sorfina]";
+    mesn;
     mes "\"This guy has been a plague ever since he could walk. He's always causing trouble.\"";
     mes "\"And his father... Well, one day his father thought he should teach Hasan a lesson.\"";
     mes "\"He took him into the desert and then left him there!";
@@ -252,14 +252,14 @@ L_Next:
     goto L_close;
 
 L_SkipTut:
-    mes "[Sorfina]";
+    mesn;
     mes "\"Really? You seem quite unexperienced. Listening to some advice won't hurt.\"";
     menu
         "Thinking about it twice... please tell me.",L_Tut,
         "Yeah, but thanks for the offer. Bye.",L_Bye;
 
 L_Bye:
-    mes "[Sorfina]";
+    mesn;
     mes "\"Alright, if you say so. But take at least this. See you later.\"";
     getitem Knife, 1;
     getitem SlingShot, 1;
@@ -287,16 +287,16 @@ OnTouch:
     if (QL_BEGIN != 1)
         end;
     mapmask getmask();
-    mes "[Sorfina]";
-    mes "\"You should get dressed now.\"";
+    mesn l("Sorfina");
+    mesq l("You should get dressed now.");
     next;
     camera "Dresser#tutorial";
     mapmask getmask() | 16;
-    mes "\"In that dresser there are some clothes you can wear.\"";
-    mes "\"To interact with things in your environment or talk to NPCs you can either click on it or press N to focus and T to talk/activate.\"";
+    mesq l("In that dresser there are some clothes you can wear.");
+    mesc l("To interact with things in your environment or talk to NPCs you can either click on it or press N to focus and T to talk/activate.");
     next;
     camera;
-    mes "\"Now get the clothes out of the dresser.\"";
+    mesq l("Now get the clothes out of the dresser.");
     QL_BEGIN = 2;
     close;
 }
@@ -307,25 +307,25 @@ OnTouch:
     goto L_Walk;
 
 L_Walk:
-    mes "[Sorfina]";
-    mes "\"Thats not what I said to do. Please don't skip ahead.\"";
+    mesn l("Sorfina");
+    mesq l("Thats not what I said to do. Please don't skip ahead.");
     close;
 
 L_Shirt:
     mapmask getmask();
-    mes "You take a simple Cotton Shirt and some very worn-out Ragged Shorts out of the dresser.";
+    mesc l("You take a simple Cotton Shirt and some very worn-out Ragged Shorts out of the dresser.");
     getitem CottonShirt, 1;
     getitem RaggedShorts, 1;
-    mes "[Sorfina]";
-    mes "\"Great! Now you can equip it.\"";
-    mes "\"You can open your inventory by pressing F3 or clicking on the 'Inventory' button in the bar at the upper right corner.\"";
-    next;
-    mes "\"After we finish talking, click on the clothes and press the equip button.\"";
     QL_BEGIN = 3;
+    mesn l("Sorfina");
+    mesq l("Great! Now you can equip it.");
+    mesc l("You can open your inventory by pressing F3 or clicking on the 'Inventory' button in the bar at the upper right corner.");
+    next;
+    mesq l("After we finish talking, click on the clothes and press the equip button.");
     close;
 
 L_Empty:
-    mes "The dresser is empty.";
+    mes l("The dresser is empty.");
     close;
 
 OnInit:
@@ -349,8 +349,8 @@ L_Block:
     if (TUT_var > 0)
         end;
     mes "[Server/Client Notice]";
-    mes "The explanations in this tutorial are based on the official client, Manaplus.";
-    mes "If you're using another client, settings and controls may be different.";
+    mesc l("The explanations in this tutorial are based on the Manaplus client.");
+    mesc l("If you're using another client, settings and controls may be different.");
     callfunc "GameRules";
     close;
 }
@@ -358,8 +358,8 @@ L_Block:
     if (TUT_var > 0)
         end;
     mes "[Server/Client Notice]";
-    mes "The explanations in this tutorial are based on the official client, Manaplus.";
-    mes "If you're using another client, settings and controls may be different.";
+    mesc l("The explanations in this tutorial are based on the Manaplus client.");
+    mesc l("If you're using another client, settings and controls may be different.");
     callfunc "GameRules";
     close;
 }