Tanker mastered with 3 skills

5 files changed, 41 insertions, 14 deletions

diff --git a/db/re/skill_tree.conf b/db/re/skill_tree.conf
index 0b0577a66..5aa1b695f 100644
--- a/db/re/skill_tree.conf
+++ b/db/re/skill_tree.conf
@@ -68,7 +68,7 @@ Human: {
 		//CR_TRUST already defined on Paladin
 		CR_AUTOGUARD: 0
 		CR_DEFENDER: 0
-		SM_RECOVERY: 10
+		SM_RECOVERY: 0
 
 		// Berseker
 		KN_AUTOCOUNTER: 0
diff --git a/npc/003-0/mages.txt b/npc/003-0/mages.txt
index b933ce23e..6f92cdd23 100644
--- a/npc/003-0/mages.txt
+++ b/npc/003-0/mages.txt
@@ -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)
+// Broken //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/paladin.txt b/npc/003-0/paladin.txt
index 6f8d8bb73..2a46f6c00 100644
--- a/npc/003-0/paladin.txt
+++ b/npc/003-0/paladin.txt
@@ -24,7 +24,7 @@ L_SignUp:
     next;
     if (askyesno() != ASK_YES)
         close;
-    // TODO: Requeriment for signing up to a subclass? Or is the tier quest hard enough?
+    // TODO: Requeriment for signing up to a subclass? Or is the tier + skill quest hard enough?
     MAGIC_SUBCLASS=MAGIC_SUBCLASS|CL_PALADIN;
     mesn;
     mesq l("Welcome to the paladin guild!");
diff --git a/npc/003-0/tanker.txt b/npc/003-0/tanker.txt
index 7854754d7..a7776fb1f 100644
--- a/npc/003-0/tanker.txt
+++ b/npc/003-0/tanker.txt
@@ -24,7 +24,7 @@ L_SignUp:
     next;
     if (askyesno() != ASK_YES)
         close;
-    // TODO: Requeriment for signing up to a subclass? Or is the tier quest hard enough?
+    // TODO: Requeriment for signing up to a subclass? Or is the tier + skill quest hard enough?
     MAGIC_SUBCLASS=MAGIC_SUBCLASS|CL_TANKER;
     mesn;
     mesq l("Welcome to the tanker guild!");
@@ -55,10 +55,10 @@ L_Member:
     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) < 1+(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")),
+        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")),
         l("Nothing at the moment.");
     mes "";
     switch (@menu) {
@@ -104,8 +104,35 @@ L_Member:
             sk_lvup(CR_AUTOGUARD);
             break;
         case 3:
-            // TODO: Requirem, quest, agree
-            sk_lvup(CR_DEFENDER);
+            mesn;
+            mesq l("This useful skill will only require:");
+            mesc l("@@/@@ @@", countitem(PiouFeathers),     (getskilllv(CR_DEFENDER)+1)*60, getitemlink(PiouFeathers));
+            mesc l("@@/@@ @@", countitem(PoisonArrow),      (getskilllv(CR_DEFENDER)+1)*10, getitemlink(PoisonArrow));
+            mesc l("@@/@@ @@", countitem(CursedArrow),      (getskilllv(CR_DEFENDER)+1)*10, getitemlink(CursedArrow));
+            mesc l("@@/@@ @@", countitem(OrangeCupcake),    (getskilllv(CR_DEFENDER)+1)*6,  getitemlink(OrangeCupcake));
+            mesc l("@@/@@ @@", countitem(Mashmallow),       (getskilllv(CR_DEFENDER)+1)*5,  getitemlink(Mashmallow));
+            mesc l("@@/@@ @@", countitem(Orange),           (getskilllv(CR_DEFENDER)+1)*4,  getitemlink(Orange));
+            next;
+            if (askyesno() == ASK_YES) {
+                if (
+                    countitem(PiouFeathers)     < (getskilllv(CR_DEFENDER)+1)*60 ||
+                    countitem(PoisonArrow)      < (getskilllv(CR_DEFENDER)+1)*10 ||
+                    countitem(CursedArrow)      < (getskilllv(CR_DEFENDER)+1)*10 ||
+                    countitem(OrangeCupcake)    < (getskilllv(CR_DEFENDER)+1)*6 ||
+                    countitem(Mashmallow)       < (getskilllv(CR_DEFENDER)+1)*5 ||
+                    countitem(Orange)           < (getskilllv(CR_DEFENDER)+1)*4) goto L_Missing;
+
+                delitem PiouFeathers,  (getskilllv(CR_DEFENDER)+1)*60;
+                delitem PoisonArrow,   (getskilllv(CR_DEFENDER)+1)*10;
+                delitem CursedArrow,   (getskilllv(CR_DEFENDER)+1)*10;
+                delitem PrangeCupcake, (getskilllv(CR_DEFENDER)+1)*6;
+                delitem Mashmallow,    (getskilllv(CR_DEFENDER)+1)*5;
+                delitem Orange,        (getskilllv(CR_DEFENDER)+1)*4;
+
+                sk_lvup(CR_DEFENDER);
+
+                next;
+            }
             break;
         case 4:
             mesn;
@@ -128,7 +155,7 @@ L_Member:
                 delitem TonoriDelight,     (getskilllv(SM_RECOVERY)+1)*8;
 
                 sk_lvup(SM_RECOVERY);
-                mesc l("This skill can be further improved with Job Points");
+                //mesc l("This skill can be further improved with Job Points");
 
                 next;
             }
diff --git a/npc/003-0/warriors.txt b/npc/003-0/warriors.txt
index a115593f1..ead55217e 100644
--- a/npc/003-0/warriors.txt
+++ b/npc/003-0/warriors.txt
@@ -1,8 +1,8 @@
 // Paladin
 //  CR_TRUST (raise Max HP in 200 and Holy Resistance in 5%, passive)
 //  AL_ANGELUS (DEF Increase 5% for	15s/LVL, 14x14 area for PARTY)
-//  PR_REDEMPTIO (suicide with death penalty. Revive dead party members on a 29x29 area. Min. 1% xp. 0.01% xp penalty reduction per revive)
-//  MER_INCAGI (raise agi and move speed for 20s/LVL. Have an HP cost.)
+//  Broken //PR_REDEMPTIO (suicide with death penalty. Revive dead party members on a 29x29 area. Min. 1% xp. 0.01% xp penalty reduction per revive)
+//  Broken? //MER_INCAGI (raise agi and move speed for 20s/LVL. Have an HP cost.)
 //  SM_BASH up to level 4 (+220% dmg and +20% acc). PS. If you have MP, SM_BASH is very powerful.
 
 // Warrior - Class extinct
@@ -10,14 +10,14 @@
 
 // Tanker
 //  CR_TRUST (raise Max HP in 200 and Holy Resistance in 5%, passive)
-//  CR_AUTOGUARD (5% chance to complety block attack. Freeze you for a while. Req. Shield. Last 5m.)
+//  Broken? //CR_AUTOGUARD (5% chance to complety block attack. Freeze you for a while. Req. Shield. Last 5m.)
 //  CR_DEFENDER (less damage from ranged attacks, but lowers move & attack speed. Req. Shield) - max lv 4 plz. Last 3m.
 //  SM_RECOVERY (insignificant HP recovery every 10s without moving. Better with higher level.) - low mp cost
 
 // Berserker
 // KN_AUTOCOUNTER (Counter any attack with 2x critical rate and block attack for 0.5s)
 // SM_ENDURE (deny stun penalty when hit, and MDEF bonus, for 10s)
-// SM_AUTOBERSERK (when < 25% hp, get +32% ATK and -55% VIT DEF. Drain SP and keep working even with 0 MP. Trigerrable passive.)
+// Broken? //SM_AUTOBERSERK (when < 25% hp, get +32% ATK and -55% VIT DEF. Drain SP and keep working even with 0 MP. Trigerrable passive.)