updated alchemist & dancer job quests

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9918 54d463be-8e91-2dee-dedb-b68131a5f0ec

2 files changed, 14 insertions, 6 deletions

diff --git a/npc/jobs/2-2/alchemist.txt b/npc/jobs/2-2/alchemist.txt
index 2041a2410..2206ab715 100644
--- a/npc/jobs/2-2/alchemist.txt
+++ b/npc/jobs/2-2/alchemist.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= nestor_zulueta (Fusion), converted by Darkchild
 //===== Current Version: ===================================== 
-//= 2.3
+//= 2.4
 //===== Compatible With: ===================================== 
 //= eAthena 1.0 +
 //===== Description: ========================================= 
@@ -24,6 +24,7 @@
 //= 2.0 Changed numbers to constants. [Vicious]
 //= 2.2 Got rid of 'al_morgen' var. Now uses (MISC_QUEST & 4) [Lupus]
 //= 2.3 Optimized, changed job numbers to constants. Fixed some spelling [Lupus]
+//= 2.4 Added alternative prizes according to JobLevel [Lupus]
 //============================================================ 
 
 
@@ -128,6 +129,7 @@ L_Start:
 		mes "[Parmry Gianino]";
 		mes "When you come back I will also collect the ^5533FF50,000^000000 zeny fee so don't forget about that either.";
 		mes "See you soon...";
+		set JBLVL, JobLevel; // used to determine what item to get at the end
 		set ALCH_Q,1;
 		close;
 L_LowLvl:
@@ -304,7 +306,7 @@ L_Start:
 		mes "Muffler, Boots, and Ear Muffs?";
 		next;
 		input @num;
-		if(@num == 19) set @score,@score+10;
+		if(@num == 20) set @score,@score+10;
 	q8:	
 		mes "[Rasputin Gregory]";
 		mes "If you buy 5 Helms with a 24%";
@@ -1057,6 +1059,7 @@ L_Change:
 	}
 	mes "Oh, Ok. You joined and learned the basics, too. Well done.";
 	next;
+	set @gift,JBLVL;
 	callfunc "Job_Change",Job_Alchem;
 	callfunc "F_ClearJobVar";
 	emotion e_grat;
@@ -1064,7 +1067,10 @@ L_Change:
 	mes "From now on, you are also a member of the Union as an Alchemist.";
 	mes "I hope you learn a lot...";
 	next;
-	getitem 7127,1;
+	if(@gift==50)
+		getitem 7133,1;
+	else
+		getitem 7127,1;
 	mes "[Vincent Carsciallo]";
 	mes "Here's a little something. ";
 	mes "Use it to start off with some research.";
diff --git a/npc/jobs/2-2/dancer.txt b/npc/jobs/2-2/dancer.txt
index 0a908a888..329497441 100644
--- a/npc/jobs/2-2/dancer.txt
+++ b/npc/jobs/2-2/dancer.txt
@@ -4,7 +4,7 @@
 //= Kalen - Original jAthena
 //= Fredzilla - Converted, Lupus
 //===== Current Version: ===================================== 
-//= 3.0
+//= 3.1
 //===== Compatible With: ===================================== 
 //= eAthena 9880+
 //===== Description: ========================================= 
@@ -13,6 +13,7 @@
 //= 2.5 Final fix of chrid issues, changed 'Improved
 //=	Concentration' to 'Attention Concentrate' [Lupus]
 //= 3.0 Some optimization, typos, added missing dialogues (4Kb lighter) [Lupus]
+//= 3.1 Implemented JOBLVL as in other quests [Lupus]
 //============================================================
 
 //= Warning Warp to escape the quest if need to
@@ -145,6 +146,7 @@ job_duncer.gat,43,93,4	script	Aire	724,{
 		next;
 		mes "[Aire]";
 		mes "When you have time for the next part of your journey talk to me again.";	
+		set JBLVL, JobLevel; // used to determine what item to get at the end
 		set DANC_Q,1;
 		close;
 
@@ -294,7 +296,7 @@ job_duncer.gat,95,93,4	script	Bijou	101,{
 		mes "[Bijou]";
 		mes "It will be your job to bring joy to all the people in Rune Midgard.";
 		next;
-		set @JobLevel,JobLevel;
+		set @gift,JBLVL;
 		mes "[Bijou]";
 		mes "Watch each time you dance from now on.";
 		next;
@@ -305,7 +307,7 @@ job_duncer.gat,95,93,4	script	Bijou	101,{
 		next;
 		mes "[Bijou]";
 		mes "This present is from me!";
-		if(@JobLevel==50) {
+		if(@gift==50) {
 			getitem 1953,1;
 			mes "Since you are very experienced I have given you a Line, instead of a simple Rope that normal people would get.";
 			mes "Now take you Line, and be the best Dancer you can be!";