From 53d342ac7ea490760126c2aaeb934f7f9adf3e97 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Wed, 14 Apr 2021 01:30:50 -0300
Subject: Polish a bit Morgan's code

---
 npc/029-2/morgan.txt | 40 ++++++++++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 12 deletions(-)

(limited to 'npc')

diff --git a/npc/029-2/morgan.txt b/npc/029-2/morgan.txt
index 8bdd480b..36b03d20 100644
--- a/npc/029-2/morgan.txt
+++ b/npc/029-2/morgan.txt
@@ -64,22 +64,38 @@ L_NotMagic:
     goto L_close;
 
 L_Start:
+    mesn;
+    mesq l("Great, lets begin your first lesson.");
+    next;
+    mesn;
+    mesq l("This is a wand, there are many like it but this one is now yours.");
+    getitem Wand, 1;
+    learnskill SKILL_CONFRINGO;
     QL_MORGAN = 2;
-    mes "\"Great, lets begin your first lesson.\"";
-    getitem 1171, 1;
-    mes "\"This is a wand, there are many like it but this one is now yours.\"";
-    mes "\"Various wands and staffs are found throughout the land with many different strengths and weaknesses.\"";
-    mes "\"To use the wand you need to have it equipped and speak the incantation to let it tap into your mana.\"";
-    mes "\"As the power of your magic grows so will the spells you can cast.\"";
-    mes "\"Lets start with a basic wand attack. " + get(.invocation$, "spell-wand") + "\"";
-    mes "\"Equip the wand and lets try out that spell.\"";
-    mes "\"To cast a spell open the chat window, type the invocation and press enter.\"";
-    mes "\"Speak to me again once you've cast the spell.\"";
+    next;
+    mesn;
+    mesq l("Various wands and staffs are found throughout the land with many different strengths and weaknesses.");
+    next;
+    mesq l("To use the wand you need to have it equipped and speak the incantation to let it tap into your mana.");
+    next;
+    mesn;
+    mesq l("As the power of your magic grows so will the spells you can cast.");
+    mesq l("Lets start with a basic wand attack: %s.", b("confringo"));
+    next;
+    mesn;
+    mesq l("Equip the wand and lets try out that spell.");
+    mesc l("To cast a spell open the skill window, select the spell you wish to use, and press the %s button.", b(l("Use")));
+    next;
+    mesn;
+    mesq l("It might be a good idea to drag the spell to the shortcut window, so you can target and attack using your keyboard instead of mouse.");
+    next;
+    mesn;
+    mesq l("Speak to me again once you've cast the spell.");
     goto L_close;
 
 L_Started:
     mes "[Morgan]";
-    mes "\"Lets start with a basic wand attack. " + get(.invocation$, "spell-wand") + "\"";
+    mes "\"Lets start with a basic wand attack. " + b("confringo") + "\"";
     mes "\"Equip the wand and lets try out that spell.\"";
     mes "\"To cast a spell open the chat window, type the invocation and press enter.\"";
     mes "\"Speak to me again once you've cast the spell.\"";
@@ -88,7 +104,7 @@ L_Started:
 L_CastOnce:
     mes "[Morgan]";
     mes "\"Ok, good job! Looks like you have good mana flow.\"";
-    mes "\"Onto the next lesson. Now that you have " + get(.invocation$, "spell-wand") + " cast,\"";
+    mes "\"Onto the next lesson. Now that you have " + b("confringo") + " cast,\"";
     mes "\"Each time you attack the wand will convert a bit of you mana into a magic bolt.\"";
     mes "\"After so many attacks, you will need to recast the invocation to stay attuned to the wand.\"";
     mes "\"(Logging out will also cancel any spell effects currently active in-game.).\"";
-- 
cgit v1.2.3-60-g2f50