Class Tier 2. T2 Class Skill still TODO

1 files changed, 26 insertions, 10 deletions

diff --git a/npc/functions/class.txt b/npc/functions/class.txt
index a7f76eb59..9d123d091 100644
--- a/npc/functions/class.txt
+++ b/npc/functions/class.txt
@@ -5,7 +5,7 @@
 //  Description:
 //    Handles Colin and Luca. They say exactly the same things, afterall.
 
-// ClassID, ClassName, OtherClass, sk1,
+// ClassID, ClassName, OtherClass, sk1, sk2
 function	script	ClassMaster	{
     .@CLASS=getarg(0);
     .@CNAME$=getarg(1);
@@ -14,6 +14,7 @@ function	script	ClassMaster	{
 
     // Skills
     .@SK_T1=getarg(3);
+    .@SK_T2=getarg(4);
     mesn;
     mesq l("I am the @@ master.", .@CNAME$);
     if (!MAGIC_LVL) goto L_NoMagic;
@@ -144,6 +145,11 @@ L_Tier2Ok:
     mesn;
     mesq l("However, beware! That potion is short-lived, you'll be running against time. Get ready to travel a lot.");
     next;
+    if (nard_reputation() < 8) {
+        mesn;
+        mesq l("I advise you to do more quests on Tulimshar and Candor, otherwise, you might fail right at the end.");
+        next;
+    }
     mesn;
     mesq l("Come talk to me when you're ready, and we can begin.");
     close;
@@ -164,11 +170,9 @@ L_T2_Fail:
         }
     }
 
-    if (ST_TIER == 7) {
-        if (1) {//countitem(Grimorie) > 0) {
-            //delitem Grimorie, 1;
-            dispbottom l("Blame Jesusalva");
-            close;
+    if (ST_TIER == 10) {
+        if countitem(JesusalvaGrimorium) > 0) {
+            delitem JesusalvaGrimorium, 1;
         } else {
             mesn;
             mes col("WARNING. YOU ARE CHEATING THE GRIMORIE QUEST.", 1);
@@ -196,8 +200,10 @@ L_T2_S0:
     if (getskilllv(.@CLASS) == 1 && MAGIC_LVL >= 2 && ST_TIER == 3) goto L_T2_S3;
     if (getskilllv(.@CLASS) == 1 && MAGIC_LVL >= 2 && ST_TIER == 4) goto L_T2_S4;
     if (getskilllv(.@CLASS) == 1 && MAGIC_LVL >= 2 && ST_TIER == 5) goto L_T2_S5;
-    if (getskilllv(.@CLASS) == 1 && MAGIC_LVL >= 2 && ST_TIER < 8) goto L_T2_S6;
-    if (getskilllv(.@CLASS) == 1 && MAGIC_LVL >= 2 && ST_TIER == 8) goto L_T2_S7;
+    if (getskilllv(.@CLASS) == 1 && MAGIC_LVL >= 2 && ST_TIER == 6) goto L_T2_S6;
+    if (getskilllv(.@CLASS) == 1 && MAGIC_LVL >= 2 && ST_TIER <= 9) goto L_T2_S7;
+    if (getskilllv(.@CLASS) == 1 && MAGIC_LVL >= 2 && ST_TIER == 10) goto L_T2_Final;
+    mes col("Error, error, L_T2_S0 General Error, REPORT ME", 9);
     close;
 
 L_T2_S1:
@@ -206,6 +212,11 @@ L_T2_S1:
     mesn;
     mesq l("So, young disciple! I wish I could just chant some gibberish words and that automatically granted you more skills, but alas, that won't work.");
     next;
+    if (nard_reputation() < 8) {
+        mesn;
+        mesq l("I advise you to do more quests on Tulimshar and Candor, otherwise, you will fail right at the end.");
+        next;
+    }
     mesn;
     mesq l("I can, however, prepare you a potion. But beware, that potion will only last 35 minutes once baked.");
     next;
@@ -310,9 +321,12 @@ L_T2_S5:
     close;
 
 L_T2_S6:
+    ST_TIER=7;
     mesn;
     mesq l("You did it! You're now on the last stage of this BORING and LONG quest!");
     next;
+
+L_T2_S7:
     mesn;
     mesq l("Jesusaves wrote a grimorie, with ancient secrets of our world.");
     next;
@@ -320,8 +334,10 @@ L_T2_S6:
     mesq l("Captain Nard have it. Fetch it with him! Quick, you only have @@ left!", FuzzyTime(QUEST_ELEVARTEMPO,2,2));
     close;
 
-L_T2_S7:
-    // getitembound "JesusalvaGrimorium", 1, 1;
+// You gain two skills: Provoke (works better, but limited usability) and the class skill
+L_T2_Final:
+    skill(.@SK_T2,1,0);
+    skill(SM_PROVOKE, 1, 0);
     addtoskill(.@CLASS,2,0);
     getexp 40000, 0; // Yes, 40k experience points. Waw.
     mes col(".:: Congratulations! ::.", 2);