Auldsbel + pipeline fixes.

2 files changed, 100 insertions, 3 deletions

diff --git a/npc/003-0/audsbel.txt b/npc/003-0/audsbel.txt
index afa57e4ae..4ad97e598 100644
--- a/npc/003-0/audsbel.txt
+++ b/npc/003-0/audsbel.txt
@@ -19,7 +19,6 @@
     next;
 
 L_Main:
-    .@q=getq(General_Auldsbel);
     select
         l("What's the difference from a Mana Wizard and a Mage?"),
         l("Who are you? Where are you from?"),
@@ -102,7 +101,7 @@ L_Main:
         // Teaching and helping are bound one to other, to save space on variable e.e
         case 5: // Can you teach me Mana Magic?
         case 6: // Do you still need help with your experiments?
-            next;
+            goto L_Magic;
             break;
         default: // Actually, I gotta go, see ya!
             goodbye;
@@ -111,6 +110,105 @@ L_Main:
     }
     goto L_Main;
 
+L_Magic:
+    .@q=getq(General_Auldsbel);
+    switch (.@q) {
+    // Help on research to gain his favor
+    case 0:
+        mesn;
+        mesq l("I actually need help. Padric and I were doing some research with catalysts, you see.");
+        next;
+        mesn;
+        mesq l("Now I need 20 @@, 20 @@ and 60 @@ to finish my research. Easy materials, except for the Shadow Herb.", getitemlink(MauveHerb), getitemlink(ShadowHerb), getitemlink(SilkCocoon));
+        next;
+        mesn;
+        mesq l("Shadow Herb only grows on dangerous places, and is mostly found on the Land Of Fire, or underground of very very deep caves.");
+        next;
+        select
+            l("I'll try to find them."),
+            l("I actually have them, here.");
+        if (@menu == 2) {
+            mes "";
+            mesn;
+            mesq l("Excellent! Let me see...");
+            next;
+            if (
+                countitem(MauveHerb) < 20 ||
+                countitem(ShadowHerb) < 20 ||
+                countitem(SilkCocoon) < 60)
+                    goto L_Lie;
+            delitem MauveHerb, 20;
+            delitem ShadowHerb, 20;
+            delitem SilkCocoon, 60;
+            getexp 2500, 0;
+            Zeny=Zeny+250;
+            setq General_Auldsbel, 1;
+            mesn;
+            mesq l("Yes, many thanks. This will help me a lot.");
+            mesc l("Gained 2500 XP and 250 GP");
+        }
+        break;
+    // Learn #parum
+    case 1:
+        mesn;
+        mesq l("Hmm, I think I can teach you a basic Mana Skill now. That one is pretty simple.");
+        next;
+        skill(TMW2_PARUM,1,0);
+        setq General_Auldsbel, 2;
+        mesn;
+        mesq l("This is the @@ skill. It transmutes a single @@ in a @@.", "##B@sk-parum##b", getitemlink(RawLog), getitemlink(MoubooFigurine));
+        next;
+        mesn;
+        mesq l("It may also create some @@ or a @@, with enough skill.", getitemlink(Arrow), getitemlink(WoodenLog));
+        next;
+        mesn;
+        mesq l("So! Please transmute a @@ and bring it to me. You may need to switch with another mana skill, until you are successful.", getitemlink(MoubooFigurine));
+        break;
+    // Bring the Mouboo figurine back
+    case 2:
+        mesn;
+        mesq l("Have you managed to transmute the @@ I asked for?", getitemlink(MoubooFigurine));
+        next;
+        if (askyesno() == ASK_YES) {
+            if (!countitem(MoubooFigurine)) goto L_Lie;
+            delitem MoubooFigurine, 1;
+            getexp 5000, 0;
+            setq General_Auldsbel, 3;
+            mesn;
+            mesq l("Very well - Congratulations! That was very easy, though, and this one is full of imperfections.");
+            mesc l("Gained 5000 XP");
+            next;
+            mesn;
+            mesq l("That skill was only to allow you to practice. Now listen well: Transmutation is ##BNOT##b crafting!");
+            next;
+            mesn;
+            mesq l("Magic is sacred. With transmutation, you can create convenience items, specially reagents for other magic skills.");
+            next;
+            mesn;
+            mesq l("But if you try to create equipment, assuming magic doesn't backfire, YOU WILL BE BANNED from this school, and lose your class. Permanently.");
+            next;
+            mesn;
+            mesq l("This is just a friendly advise. We don't take magic lightly. And you shouldn't, either.");
+        }
+        break;
+    default:
+        mesn;
+        mesq l("Uhm, no, not really. Maybe later, who knows?");
+        break;
+    }
+    next;
+    goto L_Main;
+
+
+// Fallbacks
+L_Lie:
+    mesn;
+    mesq l("Really interesting, how I am NOT seeing the items I asked for...");
+    next;
+    mesn;
+    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
diff --git a/npc/003-0/tanker.txt b/npc/003-0/tanker.txt
index 42d73c67c..7854754d7 100644
--- a/npc/003-0/tanker.txt
+++ b/npc/003-0/tanker.txt
@@ -133,7 +133,6 @@ L_Member:
                 next;
             }
             break;
-        /*
         default:
             goto L_Close;
     }