Move Audsbel to Magic Council Room. Move #parum to magic level 1.

3 files changed, 49 insertions, 31 deletions

diff --git a/npc/003-0-1/_import.txt b/npc/003-0-1/_import.txt
index 573966206..4ccad0bfa 100644
--- a/npc/003-0-1/_import.txt
+++ b/npc/003-0-1/_import.txt
@@ -1,6 +1,7 @@
 // Map 003-0-1: The Magic Guild
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/003-0-1/_warps.txt",
+"npc/003-0-1/audsbel.txt",
 "npc/003-0-1/colin.txt",
 "npc/003-0-1/luca.txt",
 "npc/003-0-1/maxime.txt",
diff --git a/npc/003-0/audsbel.txt b/npc/003-0-1/audsbel.txt
index b474fa2c6..8964202ad 100644
--- a/npc/003-0/audsbel.txt
+++ b/npc/003-0-1/audsbel.txt
@@ -9,9 +9,7 @@
 //    Gives #mkpot
 //    TODO: Make dye? Make Lifestone?
 
-003-0,32,24,0	script	Auldsbel	NPC_AULDSBEL,{
-    if (MAGIC_LVL < 2)
-        goto L_Cheat;
+003-0-1,81,27,0	script	Auldsbel	NPC_AULDSBEL,{
     mesn l("Auldsbel the Wizard");
     mesq l("Welcome back, Padric!");
     mesq l("Do you believe I've lost my @@? I can't see anything well without that! %%a", getitemlink(Googles));
@@ -24,32 +22,45 @@
 
 L_Main:
     select
-        l("What's the difference from a Mana Wizard and a Mage?"),
+        rif(MAGIC_LVL, l("What's the difference from a Mana Wizard and a Mage?")),
         l("Who are you? Where are you from?"),
-        l("How do I advance in Mana Magic? How it works?"),
-        l("What do you know about other Mana Magic Professors?"),
-        l("Can you teach me Mana Magic?"),
+        rif(MAGIC_LVL, l("How do I advance in Mana Magic? How it works?")),
+        rif(MAGIC_LVL, l("What do you know about other Mana Magic Professors?")),
+        rif(MAGIC_LVL, l("Can you teach me Mana Magic?")),
         l("Do you still need help with your experiments?"),
         l("Actually, I gotta go, see ya!");
 
     mes "";
     switch (@menu) {
         case 1: // What's the difference from a Mana Wizard and a Mage?
-            mesn;
-            mesq l("%%4 Haven't you read your Grimorium yet?!");
-            next;
-            mesn;
-            mesq l("%%@ You can get Magic by joining class and subclass, and with some NPCs. These work out-of-box. Easy.");
-            next;
-            mesn;
-            mesq l("And there is the Mana Magic, for the pro %%e You'll waste your life on that, as it have an experience system.");
-            next;
-            mesn;
-            mesq l("%%G Just like normal magic, you need power from the Mana Stone, which is based on your levels, intelligence, and mana.");
-            next;
-            mesn;
-            mesq l("I like Mana Magic the best, as we can both summon creatures as transmutate stuff. %%N");
-            next;
+            if (MAGIC_LVL < 2) {
+                mesn;
+                mesn;
+                mesq l("%%4 Haven't you read your Grimorium yet?!");
+                next;
+                mesn;
+                mesq l("%%@ You can get Magic by joining class and subclass, and with some NPCs. These work out-of-box. Easy.");
+                next;
+                mesn;
+                mesq l("And there is the Mana Magic, for the pro %%e You'll waste your life on that, as it have an experience system.");
+                next;
+                mesn;
+                mesq l("%%G Just like normal magic, you need power from the Mana Stone, which is based on your levels, intelligence, and mana.");
+                next;
+                mesn;
+                mesq l("I like Mana Magic the best, as we can both summon creatures as transmutate stuff. %%N");
+                next;
+            } else {
+                mesn;
+                mesq l("Well, long story short, we have two magic systems. One works out of box. The later one, is the Mana Magic.");
+                next;
+                mesn;
+                mesq l("Mana Magic is less reliable and have an experience system. It's the most common for summoning and transmutation.");
+                next;
+                mesn;
+                mesq l("I could explain this better, but you are just a noob at magic, if you understand me.");
+                next;
+            }
             mesn;
             mesq l("To be honest, you should use both. And remember, all Mana Magic skills can be used like they were @sk-commands. %%H");
             next;
@@ -154,6 +165,8 @@ L_Magic:
         break;
     // Learn #parum
     case 1:
+        if (MAGIC_LVL < 1)
+            goto L_Magicless;
         mesn;
         mesq l("Hmm, I think I can teach you a basic Mana Skill now. That one is pretty simple.");
         next;
@@ -232,6 +245,8 @@ L_Magic:
         break;
     // Learn #mkpot
     case 4:
+        if (MAGIC_LVL < 2)
+            goto L_Magicless;
         mesn;
         mesq l("Hmm, I think I can teach you a basic Mana Skill now. This one is more advanced, though.");
         next;
@@ -262,6 +277,17 @@ L_Magic:
 
 
 // Fallbacks
+L_Magicless:
+    mesn;
+    mesq l("Well, you helped me. That's great! One hand washes the other, so, I'm willing to share knowledge with you.");
+    next;
+    mesn;
+    mesq l("But unless you touch a Mana Stone and get stronger magic, that would be as useful as teaching magic to a wall. No offense.");
+    next;
+    mesn;
+    mesq l("So, please, come to me with stronger magic powers. And then, I'll teach you a new magic spell.");
+    close;
+
 L_Lie:
     mesn;
     mesq l("Really interesting, how I am NOT seeing the items I asked for...");
@@ -270,14 +296,6 @@ L_Lie:
     mesq l("Say, what do you think if I transmuted your head into the missing materials? I can warrant your soul won't return to the Soul Menhir, either!");
     close;
 
-L_Cheat:
-    atcommand "@jail "+strcharinfo(0);
-    setparam(MaxHp, readparam(MaxHp)/2); // testing
-    setparam(Karma, -1); // testing
-    setparam(Manner, -10); // testing
-    dispbottom l("You are not allowed on this building, and was caught by Jesusalva's Police!!");
-    end;
-
 L_Lame:
     setparam(MaxHp, readparam(MaxHp)-50); // I want to see how permanent this is
     setparam(MaxSp, readparam(MaxSp)-25); // I want to see how permanent this is
diff --git a/npc/003-0/_import.txt b/npc/003-0/_import.txt
index 415c1919f..ea9a90d35 100644
--- a/npc/003-0/_import.txt
+++ b/npc/003-0/_import.txt
@@ -1,7 +1,6 @@
 // Map 003-0: Magic Academy
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/003-0/_warps.txt",
-"npc/003-0/audsbel.txt",
 "npc/003-0/berserk.txt",
 "npc/003-0/mages.txt",
 "npc/003-0/paladin.txt",