Revert a regression: Forgetful NPCs work again.

And with new rules. And I excluded Destructive magic from the NPCs.

3 files changed, 7 insertions, 120 deletions

diff --git a/npc/027-1/elza.txt b/npc/027-1/elza.txt
index 5acdb881f..d948917f7 100644
--- a/npc/027-1/elza.txt
+++ b/npc/027-1/elza.txt
@@ -5,44 +5,12 @@
 //  Forgetful
 
 027-1,86,110,0	script	Elza	NPC_DARK_SORCERER_F,{
-    mesn l("Elza, the Forgetful");
+    mesn l("%s, the Forgetful", .name$);
     mesq l("What was I doing before...? I totally forgot!");
     if (any(true, false))
         mesc l("Have you seen my brother %s?", any("Enzo", "Ezra"));
-    // FIXME
-    close;
     next;
-    mesc l("Teaching Elza your skills will make you both forget them."), 1;
-    mesc l("Once your skill is forgotten, the Magic Skill Points used will be freed."), 1;
-    mesc l("But be careful: Only 3MSP-costed skills can be forgotten, and learning fees WON'T be given back!"), 1;
-    do
-    {
-        next;
-        mesc l("Which skill will you FORGET permanently today?"), 1;
-        menuint
-            l("Uhm... Bye?"), 0,          
-            rif(getskilllv(WZ_FROSTNOVA),       l("Frost Nova")), WZ_FROSTNOVA,
-            rif(getskilllv(AC_SHOWER),          l("Arrow Shower")), AC_SHOWER,
-            rif(getskilllv(SN_SHARPSHOOTING),   l("Sharpshooter")), SN_SHARPSHOOTING,
-            rif(getskilllv(SN_WINDWALK),   	    l("Wind Walk")), SN_WINDWALK,
-            rif(getskilllv(CR_TRUST),           l("Last Man Standing")), CR_TRUST,  
-            l("None at the moment!"), 0;
-        if (!@menuret)
-            close;
-        mes "";
-        mesc l("Skill @@ will be permanently lost!", @menuret), 1;
-        mesc l("Continue anyway?"), 1;
-        if (askyesno() == ASK_YES) {
-            .@lv=getskilllv(@menuret)+2;
-            skill @menuret, 0, 0;
-            MAGIC_PTS-=.@lv;
-            mesc l("Skill @@ has been lost", @menuret), 3;
-            mesc l("You recovered @@ magic skill points", .@lv), 3;
-        } else {
-            mesn l("Elza, the Forgetful");
-            mesq l("Uh, what?");
-        }
-    } while (@menuret);
+    ForgetfulNPC(.name$, CLASS_SCHOLARSHIP);
     close;
 
 OnInit:
diff --git a/npc/027-1/enzo.txt b/npc/027-1/enzo.txt
index 9c2b27704..2c3e157af 100644
--- a/npc/027-1/enzo.txt
+++ b/npc/027-1/enzo.txt
@@ -5,52 +5,10 @@
 //  Forgetful
 
 027-1,94,115,0	script	Enzo	NPC_BLACKWIZARD,{
-    mesn l("Enzo, the Forgetful");
+    mesn l("%s, the Forgetful", .name$);
     mesq l("What was I doing before...? I forgot!");
-    // FIXME
-    close;
     next;
-    mesc l("Teaching Enzo your skills will make you both forget them."), 1;
-    mesc l("Once your skill is forgotten, the Magic Skill Points used will be freed."), 1;
-    mesc l("But be careful: Only 1MSP-costed skills can be forgotten, and learning fees WON'T be given back!"), 1;
-    do
-    {
-        next;
-        mesc l("Which skill will you FORGET permanently today?"), 1;
-        menuint
-            l("Uhm... Bye?"), 0,
-            rif(getskilllv(AL_HEAL),        l("Healing")), AL_HEAL,
-            rif(getskilllv(TMW2_SAGE),      l("Mana Wisdom")), TMW2_SAGE,
-            rif(getskilllv(HW_MAGICPOWER),  l("Accumulate Power")), HW_MAGICPOWER,
-            rif(getskilllv(SM_PROVOKE),     l("Provoke")), SM_PROVOKE,
-            rif(getskilllv(SA_FREECAST),    l("Free Casting")), SA_FREECAST,
-            rif(getskilllv(TF_BACKSLIDING), l("Tactical Retreat")), TF_BACKSLIDING,
-            rif(getskilllv(MG_FIREWALL),    l("Nature Wall")), MG_FIREWALL,
-            rif(getskilllv(ALL_FULL_THROTTLE), l("Last Resort")), ALL_FULL_THROTTLE,
-            rif(getskilllv(SM_BASH),        l("Falkon Punch!")), SM_BASH,
-            rif(getskilllv(MC_MAMMONITE),   l("Supreme Attack")), MC_MAMMONITE,
-            rif(getskilllv(AC_SHOWER),      l("Arrow Shower")), AC_SHOWER,
-            rif(getskilllv(MG_FIREBALL),    l("Fireball")), MG_FIREBALL,
-            rif(getskilllv(AL_HOLYLIGHT),   l("Holy Light")), AL_HOLYLIGHT,
-            rif(getskilllv(MG_SOULSTRIKE),  l("Magic Strike")), MG_SOULSTRIKE,
-            rif(getskilllv(MG_LIGHTNINGBOLT),  l("Lightning Bolt")), MG_LIGHTNINGBOLT,
-            l("None at the moment!"), 0;
-        if (!@menuret)
-            close;
-        mes "";
-        mesc l("Skill @@ will be permanently lost!", @menuret), 1;
-        mesc l("Continue anyway?"), 1;
-        if (askyesno() == ASK_YES) {
-            .@lv=getskilllv(@menuret);
-            skill @menuret, 0, 0;
-            MAGIC_PTS-=.@lv;
-            mesc l("Skill @@ has been lost", @menuret), 3;
-            mesc l("You recovered @@ magic skill points", .@lv), 3;
-        } else {
-            mesn l("Enzo, the Forgetful");
-            mesq l("Uh, what?");
-        }
-    } while (@menuret);
+    ForgetfulNPC(.name$, CLASS_PHYSICAL);
     close;
 
 OnInit:
diff --git a/npc/027-1/ezra.txt b/npc/027-1/ezra.txt
index 8bf2e5cad..3879ca7ec 100644
--- a/npc/027-1/ezra.txt
+++ b/npc/027-1/ezra.txt
@@ -5,51 +5,12 @@
 //  Forgetful
 
 027-1,131,100,0	script	Ezra	NPC_BLACKWIZARD,{
-    mesn l("Ezra, the very Forgetful");
+    mesn l("%s, the Forgetful", .name$);
     mesq l("What was I doing before...? I forgot!");
-    // FIXME
-    close;
-    next;
-    mesc l("Teaching Ezra your skills will make you both forget them."), 1;
-    mesc l("Once your skill is forgotten, the Magic Skill Points used will be freed."), 1;
-    mesc l("But be careful: Only 2MSP-costed skills can be forgotten, and learning fees WON'T be given back!"), 1;
-    do
-    {
-        next;
-        mesc l("Which skill will you FORGET permanently today?"), 1;
-        menuint
-            l("Uhm... Bye?"), 0,
-            rif(getskilllv(MG_NAPALMBEAT),          l("Napalm Beat")), MG_NAPALMBEAT,
-	    	rif(getskilllv(MG_FROSTDIVER),          l("Frost Diver")), MG_FROSTDIVER,
-	    	rif(getskilllv(SO_FIREWALK), 			l("Fire Walk")), SO_FIREWALK,
-	    	rif(getskilllv(KN_AUTOCOUNTER),			l("Counter Attack")), KN_AUTOCOUNTER,
-	    	rif(getskilllv(ASC_METEORASSAULT),		l("Ground Strike")), ASC_METEORASSAULT,
-	    	rif(getskilllv(EVOL_AREA_PROVOKE),		l("Area Provoke")), EVOL_AREA_PROVOKE,
-	    	rif(getskilllv(EVOL_MASS_PROVOKE),		l("Mass Provoke")), EVOL_MASS_PROVOKE,
-	    	rif(getskilllv(AB_HIGHNESSHEAL),		l("High Healing")), AB_HIGHNESSHEAL,
-	    	rif(getskilllv(GC_DARKILLUSION),		l("Sudden Attack")), GC_DARKILLUSION,
-	    	rif(getskilllv(NV_TRICKDEAD),			l("Trick Dead")), NV_TRICKDEAD,
-            l("None at the moment!"), 0;
-        if (!@menuret)
-            goto L_Close;
-        mes "";
-        mesc l("Skill @@ will be permanently lost!", @menuret), 1;
-        mesc l("Continue anyway?"), 1;
-        if (askyesno() == ASK_YES) {
-            .@lv=getskilllv(@menuret)+1;
-            skill @menuret, 0, 0;
-            MAGIC_PTS-=.@lv;
-            mesc l("Skill @@ has been lost", @menuret), 3;
-            mesc l("You recovered @@ magic skill points", .@lv), 3;
-        } else {
-            mesn l("Ezra, the very Forgetful");
-            mesq l("Uh, what?");
-        }
-    } while (@menuret);
     next;
+    ForgetfulNPC(.name$, CLASS_TRICKS);
 
-L_Close:
-    mesn l("Ezra, the Very Forgetful");
+    mesn l("%s, the Forgetful", .name$);
     mesq l("Do you know where my brother Enzo is? I forgot that too!");
     close;