Fix a comments and improve Auldsbel to have an smoother logicjesusalva/magic

2 files changed, 15 insertions, 9 deletions

diff --git a/npc/008-1/auldsbel.txt b/npc/008-1/auldsbel.txt
index 1b9f9400..7f0bc2b1 100644
--- a/npc/008-1/auldsbel.txt
+++ b/npc/008-1/auldsbel.txt
@@ -22,22 +22,28 @@
     }
     speech
         l("Hello."),
-        l("Oh, you look more interested in magic.. the brotherhood did forbid most of the interesting paths of magic, but boring baby spells are still allowed."),
-        lg("If you come back later, I may teach you something. But psst, practising magic is quite dangerous these days.");
-
+        l("Oh, you look more interested in magic.. the brotherhood did forbid most of the interesting paths of magic, but boring baby spells are still allowed.");
     // Give poor Auldsbel some weak magic D:
     if (!MAGIC_CLU[EVOL_MONSTER_IDENTIFY]) {
         mesn;
         mesq l("May I interest you in an useless skill?");
+        ShowAbizit(true);
+        next;
         mesc l("Identify Monsters - Unlocks the %s chat command.", "##B/mi##b");
         mesc l("It will analyse and inform about the monster stats and drops.");
         mesc l("If multiple monsters have same name, all of them will be listed.");
         mesc l("Alias: %s", "##B@monsterinfo##b");
         next;
+        mesn;
+        mesq l("May I interest you in an useless skill?");
+        mesc l("Skill: %s", getskillname(EVOL_MONSTER_IDENTIFY));
+        // FIXME You know that learn_magic has its own prompt, right?
         if (askyesno() == ASK_YES) {
             learn_magic(EVOL_MONSTER_IDENTIFY);
         }
-        ShowAbizit(true);
+    } else {
+        mesn;
+        mesq lg("If you come back later, I may teach you something. But psst, practising magic is quite dangerous these days.");
     }
     close;
 
diff --git a/npc/config/magic.txt b/npc/config/magic.txt
index b924d3c0..dbe665a6 100644
--- a/npc/config/magic.txt
+++ b/npc/config/magic.txt
@@ -326,6 +326,9 @@ OnInit:
     // Trick Dead (A)
     RegisterMagic(0, NV_TRICKDEAD, 1, MagicFeather, 1,
                         CLASS_MASTER, 0);
+    // Sudden Attack (A)
+    RegisterMagic(0, GC_DARKILLUSION, 1, MagicFeather, 1,
+                        CLASS_MASTER, 0);
 
     //////////////////////// Master Skill Book: Spells
     // MATK Charge (A)
@@ -340,19 +343,16 @@ OnInit:
     // Discount (P)
     RegisterMagic(0, MC_DISCOUNT, 1, MagicFeather, 1,
                         CLASS_MASTER, 0);
-    // Sudden Attack (A)
-    RegisterMagic(0, GC_DARKILLUSION, 1, MagicFeather, 1,
-                        CLASS_MASTER, 0);
 
 
     //////////////////////// War Magic: Skills
     // Charged Shot (R)
     RegisterMagic(1, AC_CHARGEARROW, 1, MagicFeather, 1,
                         CLASS_WAR, 0);
-    // Arrow Shower (R)
+    // Arrow Shower (RX)
     RegisterMagic(1, AC_SHOWER, 1, MagicFeather, 1,
                         CLASS_WAR, 0);
-    // Ground Strike (A)
+    // Ground Strike (AX)
     RegisterMagic(1, ASC_METEORASSAULT, 1, MagicFeather, 1,
                         CLASS_WAR, 0);
     // Sharp Shooter (R)