Added magic level 3 quests for Aulsbel and Elanore. Also added appropriate quest items and extended magic debug functionality as needed.

1 files changed, 84 insertions, 0 deletions

diff --git a/npc/021-2_Tulimshar/bakery.txt b/npc/021-2_Tulimshar/bakery.txt
index 7116503f..6458c781 100644
--- a/npc/021-2_Tulimshar/bakery.txt
+++ b/npc/021-2_Tulimshar/bakery.txt
@@ -4,7 +4,91 @@
 021-2.gat,95,21,0	script	Riskim	148,{
 	mes "[Riskim]";
 	mes "\"Welcome to our bakery!\"";
+
+	callfunc "KadiyaSubquestConsts";
+        if ((@Q_kadiya_status == @Q_STATUS_WANTS_CHOCOCAKE) && (countitem ("MopoxCurePotion") > 0))
+        	goto L_lace_chococake;
+
+        if ((@Q_kadiya_status == @Q_STATUS_WANTS_ORANGECUPCAKE) && (countitem ("MopoxCurePotion") > 0))
+        	goto L_lace_cupcake;
+
 	close;
+
+L_lace_chococake:
+        next;
+
+        menu
+		"Thanks!  Let me have a look around...", L_end,
+                "Can you put this potion into a chocolate cake?", -,
+		"Goodbye!", L_end;
+
+	mes "[Riskim]";
+        mes "As you show him the potion, Riskim leans back, away from it.";
+        mes "\"Ooooh, I remember that smell...\"";
+        mes "\"Elanore's Mopox potion, right?  She made me drink that, too...\"";
+        mes "He chuckles.";
+        mes "\"Yes, well, you do want to hide that.\"";
+        next;
+
+	mes "[Riskim]";
+        mes "\"We'll need extra chocolate for that one.  If you can give me ten pieces of chocolate and that potion, plus 400 GP, I will bake you a special chocolate cake that hides the taste.\"";
+        next;
+
+        menu
+		"I will get them for you.", L_end,
+                "Here you are!", -,
+                "Maybe later.", L_end;
+
+        if (countitem("ChocolateBar") < 10)
+		goto L_lacking_ingredients;
+        if (countitem("MopoxCurePotion") < 1)
+		goto L_lacking_ingredients;
+        if (zeny < 400)
+		goto L_lacking_zeny;
+        delitem "MopoxCurePotion", 1;
+        delitem "ChocolateBar", 10;
+        getitem "LacedChocolateCake", 1;
+        set zeny, zeny - 400;
+
+	mes "[Riskim]";
+        mes "\"Please have a seat.\"";
+        mes "You watch at Riskim melts the chocolate and stirs in the potion, then glazes a cake with it.";
+        mes "\"It's a bit more chocolaty than your average chocolate cake, of course...\"";
+        next;
+
+	mes "[Riskim]";
+        mes "Riskim hands you the cake.";
+        mes "\"Here you are.  I hope that this works.\"";
+        close;
+
+L_lacking_zeny:
+	mes "[Riskim]";
+        mes "\"I'm sorry, but I have to charge 400 GP.\"";
+        close;
+
+L_lacking_ingredients:
+	mes "[Riskim]";
+        mes "\"Sorry, but I need ten chocolate bars AND your cure potion for this.  Please come back later when you have everything.\"";
+        close;
+
+L_lace_cupcake:
+        next;
+
+        menu
+		"Thanks!  Let me have a look around...", L_end,
+                "Can you put this potion into an orange cupcake?", -,
+		"Goodbye!", L_end;
+
+	mes "[Riskim]";
+        mes "\"Orange cupcakes?  Oh dear... I'm sorry, but I have a very bad orange allergy.\"";
+        next;
+	mes "[Riskim]";
+        mes "\"Perhaps the Chef at Dimond's Cove can help you?  We get all our cupcakes from him.\"";
+        next;
+
+L_end:
+        close;
+
 }
 
 // Server?