How to make tanking possible (+fix Auldsbel pos)

3 files changed, 25 insertions, 59 deletions

diff --git a/npc/003-0/audsbel.txt b/npc/003-0/audsbel.txt
index b840d82b0..e2e96af76 100644
--- a/npc/003-0/audsbel.txt
+++ b/npc/003-0/audsbel.txt
@@ -7,7 +7,7 @@
 
 //    Gives #parum
 
-003-0,34,37,0	script	Auldsbel	NPC_AULDSBEL,{
+003-0,32,24,0	script	Auldsbel	NPC_AULDSBEL,{
     if (MAGIC_LVL < 2)
         goto L_Cheat;
     mesn l("Auldsbel the Wizard");
diff --git a/npc/003-0/mages.txt b/npc/003-0/mages.txt
index 0122bb47b..b933ce23e 100644
--- a/npc/003-0/mages.txt
+++ b/npc/003-0/mages.txt
@@ -1,4 +1,4 @@
-// Wizard
+// Wizard 
 //  MG_COLDBOLT (ice)
 //  MG_LIGHTNINGBOLT (wind)
 //  WZ_EARTHSPIKE (earth)
@@ -14,7 +14,7 @@
 // some summoning magic, maybe? Or just MAGIC_EXP gain rate up
 
 // Priest
-// AL_PNEUMA (BLOCKS ranged (4+ tiles) physical attacks on a 3x3 area. No bows :D)
+// //AL_PNEUMA (BLOCKS ranged (4+ tiles) physical attacks on a 3x3 area. No bows :D)
 // AL_HOLYLIGHT (standard holy magic attack - 125% of MATK)
 // MG_SRECOVERY (small increase to SP Recovery while idle each 10 sec.)
 // ALL_RESURRECTION (Revive at 10% HP. May insta-kill undead.)
diff --git a/npc/003-0/tanker.txt b/npc/003-0/tanker.txt
index cf0e29807..ca96d2533 100644
--- a/npc/003-0/tanker.txt
+++ b/npc/003-0/tanker.txt
@@ -5,8 +5,10 @@
 //    Leader of the TANKER class
 
 003-0,38,41,2	script	Tanker Master	NPC_PLAYER,{
+    /*
     if (!is_staff())
         goto L_Close;
+    */
     if (!(MAGIC_SUBCLASS & CL_TANKER))
         goto L_SignUp;
     goto L_Member;
@@ -52,10 +54,11 @@ L_Member:
     mesn;
     mesq l("Hey there! Do you want to learn new skills for a very small teaching fee?");
     select
-        rif(sk_intcost(CR_TRUST) && !getskilllv(CR_TRUST), l("Learn Last Standing Man")),
-        rif(sk_intcost(CR_AUTOGUARD) && sk_canlvup(CR_AUTOGUARD), l("Improve Guard")),
-        rif(sk_intcost(CR_DEFENDER) && sk_canlvup(CR_DEFENDER), l("Improve Arrow Shield")),
-        rif(sk_intcost(SM_RECOVERY) && sk_canlvup(SM_RECOVERY), l("Improve Standing HP Regen")),
+        rif(sk_intcost(CR_TRUST) && getskilllv(CR_TRUST) < degree_subclass()/2, l("Learn Last Standing Man")),
+        "","",
+        //rif(sk_intcost(CR_AUTOGUARD) && sk_canlvup(CR_AUTOGUARD), l("Improve Guard")),
+        //rif(sk_intcost(CR_DEFENDER) && sk_canlvup(CR_DEFENDER), l("Improve Arrow Shield")),
+        rif(sk_intcost(SM_RECOVERY) && !getskilllv(SM_RECOVERY), l("Learn Standing HP Regen")),
         l("Nothing at the moment.");
     mes "";
     switch (@menu) {
@@ -105,69 +108,32 @@ L_Member:
             sk_lvup(CR_DEFENDER);
             break;
         case 4:
-            // TODO: Requirem, quest, agree
-            sk_lvup(SM_RECOVERY);
-            break;
-        /*
-        case 1:
             mesn;
             mesq l("This useful skill will only require:");
-            mesc l("@@/@@ @@", countitem(ManaPiouFeathers),  (getskilllv(SM_BASH)+1)*15,  getitemlink(ManaPiouFeathers));
-            mesc l("@@/@@ @@", countitem(CaveSnakeSkin),     (getskilllv(SM_BASH)+1)*4,  getitemlink(CaveSnakeSkin));
-            mesc l("@@/@@ @@", countitem(RubyPowder),        (getskilllv(SM_BASH)+1)*2,  getitemlink(RubyPowder));
-            mesc l("@@/@@ @@", countitem(StrengthPotion),    (getskilllv(SM_BASH)+1)*2,  getitemlink(StrengthPotion));
+            mesc l("@@/@@ @@", countitem(PiberriesInfusion), (getskilllv(SM_RECOVERY)+1)*10, getitemlink(PiberriesInfusion));
+            mesc l("@@/@@ @@", countitem(BlackMambaEgg),     (getskilllv(SM_RECOVERY)+1)*6,  getitemlink(BlackMambaEgg));
+            mesc l("@@/@@ @@", countitem(MoubooSteak),       (getskilllv(SM_RECOVERY)+1)*4,  getitemlink(MoubooSteak));
+            mesc l("@@/@@ @@", countitem(TonoriDelight),     (getskilllv(SM_RECOVERY)+1)*8,  getitemlink(TonoriDelight));
             next;
             if (askyesno() == ASK_YES) {
                 if (
-                    countitem(ManaPiouFeathers) < (getskilllv(SM_BASH)+1)*15 ||
-                    countitem(CaveSnakeSkin)    < (getskilllv(SM_BASH)+1)*4 ||
-                    countitem(RubyPowder)       < (getskilllv(SM_BASH)+1)*2 ||
-                    countitem(StrengthPotion)   < (getskilllv(SM_BASH)+1)*2) goto L_Missing;
+                    countitem(PiberriesInfusion) < (getskilllv(SM_RECOVERY)+1)*10 ||
+                    countitem(BlackMambaEgg)     < (getskilllv(SM_RECOVERY)+1)*6 ||
+                    countitem(MoubooSteak)       < (getskilllv(SM_RECOVERY)+1)*4 ||
+                    countitem(TonoriDelight)     < (getskilllv(SM_RECOVERY)+1)*8) goto L_Missing;
 
-                delitem PiberriesInfusion, (getskilllv(SM_BASH)+1)*15;
-                delitem BlackMambaEgg,     (getskilllv(SM_BASH)+1)*4;
-                delitem MoubooSteak,       (getskilllv(SM_BASH)+1)*2;
-                delitem IronIngot,         (getskilllv(SM_BASH)+1)*2;
+                delitem PiberriesInfusion, (getskilllv(SM_RECOVERY)+1)*10;
+                delitem BlackMambaEgg,     (getskilllv(SM_RECOVERY)+1)*6;
+                delitem MoubooSteak,       (getskilllv(SM_RECOVERY)+1)*4;
+                delitem TonoriDelight,     (getskilllv(SM_RECOVERY)+1)*8;
 
-                sk_lvup(SM_BASH);
+                sk_lvup(SM_RECOVERY);
+                mesc l("This skill can be further improved with Job Points");
 
                 next;
             }
             break;
-        case 2:
-            mesn;
-            mesq l("This useful skill will only require:");
-            mesc l("@@/@@ @@", countitem(PiberriesInfusion), (getskilllv(AL_ANGELUS)+1)*10, getitemlink(PiberriesInfusion));
-            mesc l("@@/@@ @@", countitem(BlackMambaEgg),     (getskilllv(AL_ANGELUS)+1)*2,  getitemlink(BlackMambaEgg));
-            mesc l("@@/@@ @@", countitem(MoubooSteak),       (getskilllv(AL_ANGELUS)+1)*4,  getitemlink(MoubooSteak));
-            mesc l("@@/@@ @@", countitem(IronIngot),         (getskilllv(AL_ANGELUS)+1)*1,  getitemlink(IronIngot));
-            next;
-            if (askyesno() == ASK_YES) {
-                if (
-                    countitem(PiberriesInfusion) < (getskilllv(AL_ANGELUS)+1)*10 ||
-                    countitem(BlackMambaEgg)     < (getskilllv(AL_ANGELUS)+1)*2 ||
-                    countitem(MoubooSteak)       < (getskilllv(AL_ANGELUS)+1)*4 ||
-                    countitem(IronIngot)         < (getskilllv(AL_ANGELUS)+1)*1) goto L_Missing;
-
-                delitem PiberriesInfusion, (getskilllv(AL_ANGELUS)+1)*10;
-                delitem BlackMambaEgg,     (getskilllv(AL_ANGELUS)+1)*2;
-                delitem MoubooSteak,       (getskilllv(AL_ANGELUS)+1)*4;
-                delitem IronIngot,         (getskilllv(AL_ANGELUS)+1)*1;
-
-                sk_lvup(AL_ANGELUS);
-
-                next;
-            }
-            break;
-        case 3:
-            // TODO: Requirem, quest, agree
-            sk_lvup(MER_INCAGI);
-            break;
-        case 4:
-            // TODO: Requirem, quest, agree
-            sk_lvup(PR_REDEMPTIO);
-            break;
-        */
+        /*
         default:
             goto L_Close;
     }