Prepare for the First Trial. Another unfinished thing like Anwar...

3 files changed, 129 insertions, 0 deletions

diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index 1a156ef39..fa2d48a65 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -1149,6 +1149,7 @@ mob_db: (
 		CanAttack: false
 	}
 	Drops: {
+		Acorn: 4200
 		MauveHerb: 3100
 		CobaltHerb: 3100
 		GambogeHerb: 3100
diff --git a/npc/003-0-1/colin.txt b/npc/003-0-1/colin.txt
index fc81b5d8d..d2c22263b 100644
--- a/npc/003-0-1/colin.txt
+++ b/npc/003-0-1/colin.txt
@@ -13,6 +13,9 @@
     if (!MAGIC_LVL) goto L_NoMagic;
     if (getskilllv(MAGIC_WARRIOR) && !is_admin()) close;
 
+    if (getskilllv(WIZARD_MAGE) == 1 && MAGIC_LVL >= 2 && ST_TIER == 0) goto L_Tier2;
+    if (getskilllv(WIZARD_MAGE) == 1 && MAGIC_LVL >= 2 && ST_TIER == 1) mes col("...Where is the recipe for the potion? Ah, I lost it...", 9);
+
     // Sanity check
     if (getskilllv(MG_FIREBALL) >= 1) mesq l("Are you using my skill?");
     if (getskilllv(MG_FIREBALL) >= 1) close;
@@ -85,6 +88,67 @@ L_NoMagic:
     mesq l("Perhaps, in the city, someone knows rumors about Mana Stones and can teach you. Other than that, you're on your own.");
     close;
 
+// progressbar("<color>", <seconds>)
+// Script will be canceled if character moves :D
+// So I probably could *try* to reuse TMW-BR Magic Tier 2 Scripts.
+L_Tier2:
+    next;
+    mesn;
+    mesq l("Wha, your magic power increased! How?! Ah, nevermind. You are eligible to get tier 2!");
+    next;
+    mesn;
+    mesq l("But whoa, not so fast! You must pass the seven steps of a trial first!");
+    next;
+    mesn;
+    mesq l("The first trial is simple, I'm not doing anything in special. Bring me 1 @@, or 20 @@ and 20 @@.", getitemlink(DivineApple), getitemlink(SilkCocoon), getitemlink(ChocolateMouboo));
+    next;
+    switch(select(
+        rif(countitem(DivineApple) >= 1, l("I got the apple.")),
+        rif(countitem(SilkCocoon) >= 20 && countitem(ChocolateMouboo) >= 20, l("I got the silk and chocolate.")),
+        l("I will apply later."))) {
+
+        case 1:
+            delitem DivineApple, 1;
+            goto L_Tier2Ok;
+            break;
+        case 2:
+            delitem SilkCocoon, 20;
+            delitem ChocolateMouboo, 20;
+            goto L_Tier2Ok;
+            break;
+        default:
+            break;
+    }
+
+    close;
+
+L_Tier2Ok:
+    // The last argument is duration: 0 - permanent 1- temporary. If omitted, defaults to 1.
+    addtoskill(MG_FIREBALL,1,0);
+    getexp 10000, 0;
+    ST_TIER=1;
+    mes "";
+    mesn;
+    mesq l("Good, good. The skill you got earlier just raised a single level. I'll also impair some experience on you, no biggies.");
+    next;
+    mesn;
+    mesq l("Now, the real challenge will start. You have a lot of raw power, but that doesn't gives you a lot of skills to learn.");
+    next;
+    mesn;
+    mesq l("I can make a nice, simple potion for you. Once you drink it, the raw mana will settle on your body.");
+    next;
+    mesn;
+    mesq l("However, beware! That potion is short-lived, you'll be running against time. Get ready to travel a lot.");
+    next;
+    mesn;
+    mesq l("Come talk to me when you're ready, and we can begin.");
+    close;
+
+L_T2_S1:
+    addtoskill(WIZARD_MAGE,1,0);
+    getexp 40000, 0; // Yes, 40k experience points. Waw.
+    close;
+
 OnInit:
     .@npcId = getnpcid(0, .name$);
     setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
diff --git a/npc/003-0-1/luca.txt b/npc/003-0-1/luca.txt
index fa4a0ebdf..434014a50 100644
--- a/npc/003-0-1/luca.txt
+++ b/npc/003-0-1/luca.txt
@@ -13,6 +13,9 @@
     if (!MAGIC_LVL) goto L_NoMagic;
     if (getskilllv(WIZARD_MAGE) && !is_admin()) close;
 
+    if (getskilllv(MAGIC_WARRIOR) == 1 && MAGIC_LVL >= 2 && ST_TIER == 0) goto L_Tier2;
+    if (getskilllv(MAGIC_WARRIOR) == 1 && MAGIC_LVL >= 2 && ST_TIER == 1) mes col("...Where is the recipe for the potion? Ah, I lost it...", 9);
+
     // Sanity check
     if (getskilllv(SM_BASH) >= 1) mesq l("Are you using my skill?");
     if (getskilllv(SM_BASH) >= 1) close;
@@ -84,6 +87,67 @@ L_NoMagic:
     mesq l("Perhaps, in the city, someone knows rumors about Mana Stones and can teach you. Other than that, you're on your own.");
     close;
 
+// progressbar("<color>", <seconds>)
+// Script will be canceled if character moves :D
+// So I probably could *try* to reuse TMW-BR Magic Tier 2 Scripts.
+L_Tier2:
+    next;
+    mesn;
+    mesq l("Wha, your magic power increased! How?! Ah, nevermind. You are eligible to get tier 2!");
+    next;
+    mesn;
+    mesq l("But whoa, not so fast! You must pass the seven steps of a trial first!");
+    next;
+    mesn;
+    mesq l("The first trial is simple, I'm not doing anything in special. Bring me 1 @@, or 20 @@ and 20 @@.", getitemlink(DivineApple), getitemlink(SilkCocoon), getitemlink(ChocolateMouboo));
+    next;
+    switch(select(
+        rif(countitem(DivineApple) >= 1, l("I got the apple.")),
+        rif(countitem(SilkCocoon) >= 20 && countitem(ChocolateMouboo) >= 20, l("I got the silk and chocolate.")),
+        l("I will apply later."))) {
+
+        case 1:
+            delitem DivineApple, 1;
+            goto L_Tier2Ok;
+            break;
+        case 2:
+            delitem SilkCocoon, 20;
+            delitem ChocolateMouboo, 20;
+            goto L_Tier2Ok;
+            break;
+        default:
+            break;
+    }
+
+    close;
+
+L_Tier2Ok:
+    // The last argument is duration: 0 - permanent 1- temporary. If omitted, defaults to 1.
+    addtoskill(SM_BASH,1,0);
+    getexp 10000, 0;
+    ST_TIER=1;
+    mes "";
+    mesn;
+    mesq l("Good, good. The skill you got earlier just raised a single level. I'll also impair some experience on you, no biggies.");
+    next;
+    mesn;
+    mesq l("Now, the real challenge will start. You have a lot of raw power, but that doesn't gives you a lot of skills to learn.");
+    next;
+    mesn;
+    mesq l("I can make a nice, simple potion for you. Once you drink it, the raw mana will settle on your body.");
+    next;
+    mesn;
+    mesq l("However, beware! That potion is short-lived, you'll be running against time. Get ready to travel a lot.");
+    next;
+    mesn;
+    mesq l("Come talk to me when you're ready, and we can begin.");
+    close;
+
+L_T2_S1:
+    addtoskill(MAGIC_WARRIOR,1,0);
+    getexp 40000, 0; // Yes, 40k experience points. Waw.
+    close;
+
 OnInit:
     .@npcId = getnpcid(0, .name$);
     setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);