Update Morgan instructions, fix typo on @debug menu

1 files changed, 22 insertions, 17 deletions

diff --git a/npc/029-2/morgan.txt b/npc/029-2/morgan.txt
index d5416802..b393cb1f 100644
--- a/npc/029-2/morgan.txt
+++ b/npc/029-2/morgan.txt
@@ -91,34 +91,39 @@ L_Start:
     next;
     mesn;
     mesq l("Speak to me again once you've cast the spell.");
+    mesc l("As an offensive spell, it'll only work if you have a valid target, like a monster.");
     close;
 
 L_Started:
-    mes "[Morgan]";
-    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.\"";
+    mesn;
+    mesq l("Lets start with a basic wand attack: %s.", b("confringo"));
+    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")));
+    mesq l("Speak to me again once you've cast the spell.");
+    mesc l("As an offensive spell, it'll only work if you have a valid target, like a monster.");
     close;
 
 L_CastOnce:
-    mes "[Morgan]";
-    mes "\"Ok, good job! Looks like you have good mana flow.\"";
-    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.).\"";
+    mesn;
+    mesq l("Ok, good job! Looks like you have good mana flow.");
+    mesq l("Onto the next lesson. Now that you have %s cast,", b("confringo"));
+    mesq l("Each time you attack the wand will convert a bit of you mana into a magic bolt.");
+    next;
+    mesq l("If an offensive spell requires an item, then after so many attacks, you may need to recast the whole invocation to stay attuned to the wand.");
+    mesc l("(Logging out will also cancel any spell effects currently active in-game.).");
+    next;
+    mesq l("In other words, offensive spells which require reagents won't consume these every time you cast, but will still require the items frequently.");
     next;
-    mes "\"I've taught you all I can for now. You should visit the Mana Seed north west of Hurnscald.\"";
+    mesq l("I've taught you all I can for now. You should visit the Mana Seed north west of Hurnscald.");
     QL_MORGAN = 4;
     close;
 
 L_LearningDone:
-    mes "[Morgan]";
-    mes "\"" + b("confringo") + " is a basic wand attack.\"";
-    mes "\"A Wand must be equipped to use the spell.\"";
-    mes "\"To cast a spell open the chat window, type the invocation and press enter.\"";
-    mes "\"I've taught you all I can for now. You should visit the Mana Seed north west of Hurnscald.\"";
+    mesn;
+    mesq l("%s is a basic wand attack.", b("confringo"));
+    mesq l("A Wand must be equipped to use the 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")));
+    mesq l("I've taught you all I can for now. You should visit the Mana Seed north west of Hurnscald.");
     learnskill SKILL_CONFRINGO;
     if (get_nibble(##03_TMWQUEST, 0) == 1) {
         mes "";