done merging jFunc 8) fixed some typos, etc

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

5 files changed, 248 insertions, 287 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 8f6f74d14..edb08d256 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -37,10 +37,10 @@ Musashiden
 Date		Added

 ======

 06/23

+	* Merged JFunc 2-1, 2-2 functions, fixed bugs with missing dialogues [Lupus]

+		and changed job numbers to constants

 	* Updated Valhalla [Lupus]

 	- Also fixed some typos. Thx2 Mitternacht

-	* Merged all JFunc 2-1 functions, fixed bugs with missing dialogues [Lupus]

-		and changed job numbers to constants

 06/22

 	* Fixed treasure chests round number exploit [Lupus]

 	  Now u get an extra chest one exact 4 Eco.pts adding

diff --git a/npc/jobs/2-2/alchemist.txt b/npc/jobs/2-2/alchemist.txt
index e76de0651..4e3d88e8f 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.2

+//= 2.3

 //===== Compatible With: ===================================== 

 //= eAthena 1.0 +

 //===== Description: ========================================= 

@@ -23,6 +23,7 @@
 //= 1.6a fixed some wrong answers, thanks to zlider for info [Lupus]

 //= 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]

 //============================================================ 

 

 

@@ -33,14 +34,13 @@ alde_alche.gat,27,185,4	script	Parmry Gianino	744,{
 	callfunc "F_BlockHigh",Job_Merchant_High,"Merchant High",Job_Creator,"Creator","Parmry Gianino";

 

 	mes "[Parmry Gianino]";

-	if(BaseJob == 5) goto L_Merc;

-	if(BaseJob == Job_Alchem) goto L_Alch;

-L_Other:	

+	if(baseJob == Job_Merchant) goto L_Merc;

+	if(baseJob == Job_Alchem){

+		mes "Hey there fellow Alchemist.  How's the business going?  Good I hope, well good luck to you.";

+		close;

+	}

 	mes "Welcome to the Alchemist Union.  Ah, I apologize but I'm busy right now.";

 	close;

-L_Alch:

-	mes "Hey there fellow Alchemist.  How's the business going?  Good I hope, well good luck to you.";

-	close;

 L_Merc:	

 	if(ALCH_Q == 1) goto L_Check;

 	if(ALCH_Q == 2) goto L_Test2;

@@ -52,9 +52,8 @@ L_Merc:
 	mes "Welcome to the Alchemist Union.";

 	mes "How may i help you?";

 	next;

-	menu "I would like to learn about Alchemey",M_Learn, "I want to become an Alchemist.",L_Start, "Nothing.",M_End;

+	menu "I would like to learn about Alchemy",-, "I want to become an Alchemist.",L_Start, "Nothing.",M_End;

 

-	M_Learn:

 		mes "[Parmry Gianino]";

 		mes "Alchemists study and create new materials using a variety of existing substances.";

 		mes "They research the atoms of chemicals, and experiment to change the properties of the chemicals.";

@@ -206,8 +205,7 @@ L_GoChange:
 //==================================================================================================//

 alde_alche.gat,175,107,4	script	Rasputin Gregory	749,{

 	mes "[Rasputin Gregory]";

-	if(BaseJob == 5) goto L_Merc;

-L_Other:

+	if(baseJob == Job_Merchant) goto L_Merc;

 	mes "What is it, kikikiki.  Are you curious about what I do...?";

 	mes "I'll just especially let you know.  You see I... Kekeke..";

 	next;

@@ -470,7 +468,7 @@ L_Skip:
 //==================================================================================================//

 alde_alche.gat,13,15,8	script	Darwin	750,{

 	mes "[Darwin]";

-	if(BaseJob == 5) goto L_Merc;

+	if(baseJob == Job_Merchant) goto L_Merc;

 L_Other:

 	mes "more to lose or gain...";

 	mes "It's always like that...";

@@ -640,7 +638,7 @@ L_Check:
 		set @score,@score+10;

 	M_4:

 

-	menu "Put in the noodles and fried it",M_5, "Put into the Empty Bottle",-, "Raise the medicine bowl and drink it",M_5;

+	menu "Put in the noodles and fry it",M_5, "Put into the Empty Bottle",-, "Raise the medicine bowl and drink it",M_5;

 

 		set @score,@score+10;

 	M_5:

@@ -694,7 +692,7 @@ L_NotEnuf:
 //==================================================================================================//

 alde_alche.gat,79,19,4	script	Van Helmont	748,{

 	mes "[Van Helmont]";

-	if(BaseJob == 5) goto L_Merc;

+	if(baseJob == Job_Merchant) goto L_Merc;

 L_Other:

 	mes "Just a little ... yes, a little bit more ....";

 	mes "agh, just a little bit more and it would've been done!";

@@ -774,9 +772,9 @@ L_Start:
 		mes "If you dont have business here just go away. Ok!!!";

 		close;

 L_Check:	

-	if((MISC_QUEST & 4)==0) goto L_NotRdy;

+	if((MISC_QUEST & 4)==0) goto L_NotRdy; //this's a Morgenstein Quest check

 	mes "Yes, cut the Tentacle..";

-	mes "and mix some Sticku Mucus,";

+	mes "and mix some Sticky Mucus,";

 	mes "Jellopy solution in the test tube Darn, where did the Medicine Bowl go...";

 	next;

 	mes "[Van Helmont]";

@@ -859,7 +857,7 @@ L_Done:
 //==================================================================================================//

 alde_alche.gat,145,19,4	script	Nicholas Flamel	57,{

 	mes "[Nicholas Flamel]";

-	if(BaseJob == 5) goto L_Merc;

+	if(baseJob == Job_Merchant) goto L_Merc;

 L_Other:

 	mes "Lorem ipsum dolor sit amet,";

 	mes "consectetuer adipiscing elit.";

@@ -1020,18 +1018,17 @@ L_Done:
 //==================================================================================================//

 alde_alche.gat,101,184,4	script	Vincent Carsciallo	122,{

 	mes "[Vincent Carsciallo]";

-	if(BaseJob == 5) goto L_Merc;

-	if(BaseJob == Job_Alchem) goto L_Alch;

-L_Other:

+	if(baseJob == Job_Merchant) goto L_Merc;

+	if(baseJob == Job_Alchem){

+		mes "How Alchemy going? Make sure to be carefull and think about safety at all times.";

+		mes "I wouldn't want you blowing yourself up or anything.....";

+		close;

+	}

 	mes "Hmmm? What may a civilian have to do here?";

 	next;

 	mes "[Vincent Carsciallo]";

 	mes "There's nothing amusing. Dont wander and leave.";

 	close;

-L_Alch:

-	mes "How Alchemy going? Make sure to be carefull and think about safety at all times.";

-	mes "I wouldn't want you blowing yourself up or anything.....";

-	close;

 L_Merc:

 	if(ALCH_Q == 7) goto L_Change;

 	mes "Hmmm? A merchant.";

@@ -1054,10 +1051,14 @@ L_Merc:
 	mes "try joining our Union.";

 	close;

 L_Change:

-	if(skillpoint != 0) goto L_Skpoint;

-	mes "Ooh, Ok. You joined and learned the basics, too. Well done.";

+	if(skillpoint){

+		mes "Please use all your skill point before talking to me.";

+		close;

+	}

+	mes "Oh, Ok. You joined and learned the basics, too. Well done.";

 	next;

 	callfunc "Job_Change",Job_Alchem;

+	callfunc "F_ClearJobVar";

 	emotion e_grat;

 	mes "[Vincent Carsciallo]";

 	mes "From now on, you are also a member of the Union as an Alchemist.";

@@ -1071,10 +1072,5 @@ L_Change:
 	mes "[Vincent Carsciallo]";

 	mes "I'll see you later then...";

 	mes "Be proud of being an Alchemist!";

-	callfunc "F_ClearJobVar";

 	close;

-

-	L_Skpoint:

-		mes "Please use all your skill point before talking to me.";

-		close;

 }

diff --git a/npc/jobs/2-2/rogue.txt b/npc/jobs/2-2/rogue.txt
index e1f9f140d..8988b799e 100644
--- a/npc/jobs/2-2/rogue.txt
+++ b/npc/jobs/2-2/rogue.txt
@@ -3,13 +3,13 @@
 //===== By: ================================================== 

 //= kobra_k88

 //===== Current Version: ===================================== 

-//= 2.1

+//= 2.2

 //===== Compatible With: ===================================== 

 //= eAthena 1.0 +

 //===== Description: ========================================= 

 //= Rogue job quest based off of official iRO Rogue quest.

-//= There are some differences from official quest due to scripting issues.

-//= Missing some message text.  

+//= There are some differences from official quest due to

+//= scripting issues. Missing some message text.  

 //===== Additional Comments: ================================= 

 //= 1.1 fixed 3 wrong questions, added missing lines [Lupus]

 //= 1.3 Baby Class Support + 40/50 JobLevel Item fix [Lupus]

@@ -19,6 +19,7 @@
 //= to go. [Lupus]

 //= 2.0 Changed numbers to constants. [Vicious]

 //= 2.1 Removed Duplicates [Silent]

+//= 2.2 Merged JFunc [Lupus]

 //============================================================ 

 

 

@@ -41,12 +42,11 @@ L_Rogue:
 	close;

 

 L_Thief:

-	if(JobLevel >= 40) goto L_Start;

-	mes "Oh hi there.  If you want to become a Rogue I'm afraid you'll have to come back after you've trained a little more.";

-	mes "Only Thieves with a ^5533FFJob level of at least 40^000000 can become Rogues.";

-	close;

-

-L_Start:

+	if(JobLevel < 40){

+		mes "Oh hi there.  If you want to become a Rogue I'm afraid you'll have to come back after you've trained a little more.";

+		mes "Only Thieves with a ^5533FFJob level of at least 40^000000 can become Rogues.";

+		close;

+	}

 	if(ROGUE_Q == 1) goto L_ReTest;

 	if(ROGUE_Q == 2) goto L_Test2;

 	if(ROGUE_Q == 3) goto L_Test3;

@@ -69,8 +69,7 @@ L_Start:
 	mes "By the way, here's an application form.....  please fill out all the necessary information.....";

 	next;

 	mes "(you fill out the form and hand it back)";

-	set JBLVL, 40;			// used to determine what item to get at the end

-	if(JobLevel == 50) set JBLVL, 50;	// used to determine what item to get at the end

+	set JBLVL, JobLevel;			// used to determine what item to get at the end

 	next;

 	mes "[Markie]";

 	mes "Okay honey.... looks good, I'll accept your application.";

@@ -93,7 +92,209 @@ L_Test1:
 	mes "[Markie]";

 	mes "I am going to ask you a few questions.  Listen carefully and choose what you think is the best answer okay?";

 	next;

-	callfunc "RogQ_check";

+	

+	savepoint "in_rogue.gat",366,114;

+	set @score, 0;

+	set ROGUE_Q, 1;

+	if(rand(2)) goto L_QSet2;

+

+		mes "[Markie]";

+		mes "1) What is the added flee rate that a Thief recieves when the ^5533FFImprove Dodge^000000 skill is ^5533FFmastered^000000?";

+		next;

+		menu "20",sM1_1, "30",-, "40",sM1_1, "160",sM1_1;

+

+			set @score, @score + 10;

+

+		sM1_1:

+

+		mes "[Markie]";

+		mes "2) Choose a monster that cannot detect a hidden or cloaked character?";

+		next;

+		menu "Mummy",sM1_2, "Worm Tail",-, "Argos",sM1_2, "Soldier Skeleton",sM1_2;

+

+			set @score, @score + 10;

+

+		sM1_2:

+

+		mes "[Markie]";

+		mes "3) Where is the Rogue guild located?";

+		next;

+		menu "Comodo",sM1_3, "Kokomo Beach",sM1_3, "Pharos Lightouse",-, "Morroc",sM1_3;

+

+			set @score, @score + 10;

+

+		sM1_3:

+

+		mes "[Markie]";

+		mes "4) In which of the following towns, can you become a Thief?";

+		next;

+		menu "Comodo",sM1_4, "Lutie",sM1_4, "Alberta",sM1_4, "Morroc",-;

+

+			set @score, @score + 10;

+

+		sM1_4:

+

+		mes "[Markie]";

+		mes "5) Choose the card that does ^FF3355not^000000 have an effect on a players ^5533FFDEX stat^000000...";

+		next;

+		menu "Rocker Card",sM1_5, "Mummy Card",-, "Zerom Card",sM1_5, "Drops",sM1_5;

+

+			set @score, @score + 10;

+

+		sM1_5:

+

+		mes "[Markie]";

+		mes "6) What do you think is cool about being a Rogue?";

+		next;

+		menu "Being a bad ass",sM1_6, "Being a hypocrite",sM1_6, "Being shameless",sM1_6, "Having excellent attack strength",-;

+

+			set @score, @score + 10;

+

+		sM1_6:

+

+		mes "[Markie]";

+		mes "7) At what job level can you change from a Thief to a Rogue?";

+		next;

+		menu "At job lvl 30",sM1_7, "At job lvl 35",sM1_7, "At job lvl 40",-, "At job lvl 50",-;

+

+			set @score, @score + 10;

+

+		sM1_7:

+

+		mes "[Markie]";

+		mes "8) If you wanted to dye your hair a different color, where would you have to go to do that?";

+		next;

+		menu 	"Building in SouthWestern part of Morroc",sM1_8, "Building in SouthWestern part of Prontera",-,

+			"Building in SouthEastern part of Morroc",sM1_8, "Building in NorthEastern part of Prontera",sM1_8;

+

+			set @score, @score + 10;

+

+		sM1_8:

+

+		mes "[Markie]";

+		mes "9) What mushrooms do you need to steal in order to become a Thief?";

+		next;

+		menu "Orange Gooey Mushrooms",-, "Red Hairy Mushrooms",sM1_9, "Orange Net Mushrooms",-, "Orange Sticky Mushrooms",sM1_9;

+

+			set @score, @score + 10;

+

+		sM1_9:

+

+		mes "[Markie]";

+		mes "10) Which of these cards is ^FF3355useless^000000 to a Rogue?";

+		next;

+		menu "Whisper Card",sM1_10, "Elder Willow Card",-, "Zerom Card",sM1_10, "Matyr Card",sM1_10;

+

+			set @score, @score + 10;

+

+		sM1_10:

+		goto L_Score;

+

+

+	L_QSet2:

+		mes "[Markie]";

+		mes "1) What skill do you need to learn before you can learn ^5533FFTunnel Drive^000000?";

+		next;

+		menu "Hiding",-, "Steal",sM2_1, "Improve Dodge",sM2_1, "Bash",sM2_1;

+

+			set @score, @score + 10;

+

+		sM2_1:

+

+		mes "[Markie]";

+		mes "2) How much more of a discount can a Rogue get with the ^5533FFHaggel^000000 skill than a merchant can with the ^5533FFDiscount^000000 skill?";

+		next;

+		menu "3%",sM2_2, "2%",sM2_2, "1%",-, "0%",sM2_2;

+

+			set @score, @score + 10;

+

+		sM2_2:

+

+		mes "[Markie]";

+		mes "3) What is the correct description for the skill ^5533FFMug^000000?";

+		next;

+		menu "Steal Items from players",sM2_3, "Steal Items from monsters",sM2_3, "Steal Zeny from monsters",-, "Steal Zeny from players",sM2_3;

+

+			set @score, @score + 10;

+

+		sM2_3:

+

+		mes "[Markie]";

+		mes "4) How many Rogues are required to activate the skill ^5533FFGangster's Paradise^000000?";

+		next;

+		menu "1 Rogue + 2 Assassins",sM2_4, "2 Rogues + 1 Thief",sM2_4, "4 Thieves",sM2_4, "2 or more Rogues",-;

+

+			set @score, @score + 10;

+

+		sM2_4:

+

+		mes "[Markie]";

+		mes "5) After increasing ^5533FFDivest Helm^000000 to level 5, what other skill becomes available for you learn?";

+		next;

+		menu "Envenom",sM2_5, "Strip Tease",sM2_5, "Venom Splasher",sM2_5, "Divest Shield",-;

+

+			set @score, @score + 10;

+

+		sM2_5:

+

+		mes "[Markie]";

+		mes "6) Choose a skill that allows its user to move while being hidden?";

+		next;

+		menu "Hiding",sM2_6, "Back Slide",sM2_6, "Tunnel Drive",-, "Sand Attack",sM2_6;

+

+			set @score, @score + 10;

+

+		sM2_6:

+

+		mes "[Markie]";

+		mes "7) Choose the card that increases the ^5533FFaccuracy rate^000000 of its owner?";

+		next;

+		menu "Andre",sM2_7, "Familiar",sM2_7, "Mummy",-, "Marina",sM2_7;

+

+			set @score, @score + 10;

+

+		sM2_7:

+

+		mes "[Markie]";

+		mes "8) Choose the monster that receives more damage when attacked by a weapon with a Vadon card attached to it?";

+		mes "(Vadon card inflicts 20% more damage to fire property monsters)";

+		next;

+		menu 	"Vadon",sM2_8, "Deviruchi",sM2_8, "Elder Willow",-, "Baphomet",sM2_8;

+

+			set @score, @score + 10;

+

+		sM2_8:

+

+		mes "[Markie]";

+		mes "9) How much SP does the ^5533FFDouble Attack^000000 skill require when used with a dagger?";

+		next;

+		menu "15 SP",sM2_9, "No SP needed",-, "10 SP",sM2_9, "54 SP",sM2_9;

+

+			set @score, @score + 10;

+

+		sM2_9:

+

+		mes "[Markie]";

+		mes "10) Choose an effective dagger to use in the Byalan Dungeon?";

+		next;

+		menu "Wind Main-Gauche",-, "Ice Main-Gauche",sM2_10, "Earth Main-Gauche",sM2_10, "Fire Main-Gauche",sM2_10;

+

+			set @score, @score + 10;

+

+		sM2_10:

+

+

+	L_Score:

+		mes "[Markie]";

+		mes "Okay, those are all of the questions I have.  Now that wasn't so bad was it sweetie?";

+		mes "I hope you don't mind, but I've been grading your answers.";

+		next;

+		mes "[Markie]";

+		mes "I like to give people scores on their interviews so that they can know how well they did.";

+		mes "It looks like you got a ^FF3355" + @score +"^000000/100............";

+		next;

+		mes "[Markie]";

+

 		if(@score< 90) goto sL_Failed;

 		if(@score<100) goto sL_Passed;

 

@@ -159,8 +360,11 @@ L_Change:
 	next;

 	mes "[Markie]";

 	mes "Now that you are a Rogue you are free to go where ever you want to and do what ever you want.";

-	if(JBLVL != 50) getitem 1219,1;		// 2 slott gladius

-	if(JBLVL == 50) getitem 1220,1;		// 3 slott gladius

+	if(JBLVL != 50) {

+		getitem 1219,1;		// 2 slott gladius

+	} else {

+		getitem 1220,1;		// 3 slott gladius

+	}

 	callfunc "F_ClearJobVar";

 	next;

 	mes "[Markie]";

@@ -460,7 +664,7 @@ function	script	F_RogueTest3	{
 	mes "Who's there?!!!";

 	mes "Who dares to trespass on my territory?";

 	if(BaseJob!=Job_Thief || ROGUE_Q<3 || ROGUE_Q2==0) close;

-L_Start:

+

 	deletearray @choice$[1], 4;

 	next;

 	menu "My father",M_1a, "Aragham",M_1b, "Antonio",M_1c, "Legolas",M_1d;

diff --git a/npc/jobs/Jfunc/Jfunc2-2.txt b/npc/jobs/Jfunc/Jfunc2-2.txt
deleted file mode 100644
index 64a2483be..000000000
--- a/npc/jobs/Jfunc/Jfunc2-2.txt
+++ /dev/null
@@ -1,236 +0,0 @@
-//===== eAthena Script ======================================= 

-//= Global Job Function

-//===== By: ================================================== 

-//= massdriller

-//===== Current Version: ===================================== 

-//= 0.1

-//===== Compatible With: ===================================== 

-//= eAthena 1.0 +

-//===== Description: ========================================= 

-//= Optimised scripts by moving all their checkers here.

-//===== Additional Comments: ================================= 

-//= For 2-2 Job Quests

-//============================================================ 

-

-//Alchemist Check

-function	script	Alc_check	{

-

-	if(BaseJob == Job_Alchem) goto L_Alch;

-	if(BaseJob == Job_Alchem || BaseJob == Job_Alchem) goto L_Other;

-	return;

-

-L_Other:	

-	mes "Welcome to the Alchemist Union.  Ah, I apologize but I'm busy right now.";

-	close;

-L_Alch:

-	mes "Hey there fellow Alchemist.  How's the business going?  Good I hope, well good luck to you.";

-	close;

-}

-

-//Rogue Questions

-function	script	RogQ_check	{

-	savepoint "in_rogue.gat",366,114;

-	set @score, 0;

-	set ROGUE_Q, 1;

-	set @temp, rand(2);

-	if(@temp == 1) goto L_QSet2;

-

-	L_QSet1:

-		mes "[Markie]";

-		mes "1) What is the added flee rate that a Thief recieves when the ^5533FFImprove Dodge^000000 skill is ^5533FFmastered^000000?";

-		next;

-		menu "20",sM1_1, "30",-, "40",sM1_1, "160",sM1_1;

-

-			set @score, @score + 10;

-

-		sM1_1:

-

-		mes "[Markie]";

-		mes "2) Choose a monster that cannot detect a hidden or cloaked character?";

-		next;

-		menu "Mummy",sM1_2, "Worm Tail",-, "Argos",sM1_2, "Soldier Skeleton",sM1_2;

-

-			set @score, @score + 10;

-

-		sM1_2:

-

-		mes "[Markie]";

-		mes "3) Where is the Rogue guild located?";

-		next;

-		menu "Comodo",sM1_3, "Kokomo Beach",sM1_3, "Pharos Lightouse",-, "Morroc",sM1_3;

-

-			set @score, @score + 10;

-

-		sM1_3:

-

-		mes "[Markie]";

-		mes "4) In which of the following towns, can you become a Thief?";

-		next;

-		menu "Comodo",sM1_4, "Lutie",sM1_4, "Alberta",sM1_4, "Morroc",-;

-

-			set @score, @score + 10;

-

-		sM1_4:

-

-		mes "[Markie]";

-		mes "5) Choose the card that does ^FF3355not^000000 have an effect on a players ^5533FFDEX stat^000000...";

-		next;

-		menu "Rocker Card",sM1_5, "Mummy Card",-, "Zerom Card",sM1_5, "Drops",sM1_5;

-

-			set @score, @score + 10;

-

-		sM1_5:

-

-		mes "[Markie]";

-		mes "6) What do you think is cool about being a Rogue?";

-		next;

-		menu "Being a bad ass",sM1_6, "Being a hypocrite",sM1_6, "Being shameless",sM1_6, "Having excellent attack strength",-;

-

-			set @score, @score + 10;

-

-		sM1_6:

-

-		mes "[Markie]";

-		mes "7) At what job level can you change from a Thief to a Rogue?";

-		next;

-		menu "At job lvl 30",sM1_7, "At job lvl 35",sM1_7, "At job lvl 40",-, "At job lvl 50",-;

-

-			set @score, @score + 10;

-

-		sM1_7:

-

-		mes "[Markie]";

-		mes "8) If you wanted to dye your hair a different color, where would you have to go to do that?";

-		next;

-		menu 	"Building in SouthWestern part of Morroc",sM1_8, "Building in SouthWestern part of Prontera",-,

-			"Building in SouthEastern part of Morroc",sM1_8, "Building in NorthEastern part of Prontera",sM1_8;

-

-			set @score, @score + 10;

-

-		sM1_8:

-

-		mes "[Markie]";

-		mes "9) What mushrooms do you need to steal in order to become a Thief?";

-		next;

-		menu "Orange Gooey Mushrooms",-, "Red Hairy Mushrooms",sM1_9, "Orange Net Mushrooms",-, "Orange Sticky Mushrooms",sM1_9;

-

-			set @score, @score + 10;

-

-		sM1_9:

-

-		mes "[Markie]";

-		mes "10) Which of these cards is ^FF3355useless^000000 to a Rogue?";

-		next;

-		menu "Whisper Card",sM1_10, "Elder Willow Card",-, "Zerom Card",sM1_10, "Matyr Card",sM1_10;

-

-			set @score, @score + 10;

-

-		sM1_10:

-		goto L_Score;

-

-

-	L_QSet2:

-		mes "[Markie]";

-		mes "1) What skill do you need to learn before you can learn ^5533FFTunnel Drive^000000?";

-		next;

-		menu "Hiding",-, "Steal",sM2_1, "Improve Dodge",sM2_1, "Bash",sM2_1;

-

-			set @score, @score + 10;

-

-		sM2_1:

-

-		mes "[Markie]";

-		mes "2) How much more of a discount can a Rogue get with the ^5533FFHaggel^000000 skill than a merchant can with the ^5533FFDiscount^000000 skill?";

-		next;

-		menu "3%",sM2_2, "2%",sM2_2, "1%",-, "0%",sM2_2;

-

-			set @score, @score + 10;

-

-		sM2_2:

-

-		mes "[Markie]";

-		mes "3) What is the correct description for the skill ^5533FFMug^000000?";

-		next;

-		menu "Steal Items from players",sM2_3, "Steal Items from monsters",sM2_3, "Steal Zeny from monsters",-, "Steal Zeny from players",sM2_3;

-

-			set @score, @score + 10;

-

-		sM2_3:

-

-		mes "[Markie]";

-		mes "4) How many Rogues are required to activate the skill ^5533FFGangster's Paradise^000000?";

-		next;

-		menu "1 Rogue + 2 Assassins",sM2_4, "2 Rogues + 1 Thief",sM2_4, "4 Thieves",sM2_4, "2 or more Rogues",-;

-

-			set @score, @score + 10;

-

-		sM2_4:

-

-		mes "[Markie]";

-		mes "5) After increasing ^5533FFDivest Helm^000000 to level 5, what other skill becomes available for you learn?";

-		next;

-		menu "Envenom",sM2_5, "Strip Tease",sM2_5, "Venom Splasher",sM2_5, "Divest Shield",-;

-

-			set @score, @score + 10;

-

-		sM2_5:

-

-		mes "[Markie]";

-		mes "6) Choose a skill that allows its user to move while being hidden?";

-		next;

-		menu "Hiding",sM2_6, "Back Slide",sM2_6, "Tunnel Drive",-, "Sand Attack",sM2_6;

-

-			set @score, @score + 10;

-

-		sM2_6:

-

-		mes "[Markie]";

-		mes "7) Choose the card that increases the ^5533FFaccuracy rate^000000 of its owner?";

-		next;

-		menu "Andre",sM2_7, "Familiar",sM2_7, "Mummy",-, "Marina",sM2_7;

-

-			set @score, @score + 10;

-

-		sM2_7:

-

-		mes "[Markie]";

-		mes "8) Choose the monster that receives more damage when attacked by a weapon with a Vadon card attached to it?";

-		mes "(Vadon card inflicts 20% more damage to fire property monsters)";

-		next;

-		menu 	"Vadon",sM2_8, "Deviruchi",sM2_8, "Elder Willow",-, "Baphomet",sM2_8;

-

-			set @score, @score + 10;

-

-		sM2_8:

-

-		mes "[Markie]";

-		mes "9) How much SP does the ^5533FFDouble Attack^000000 skill require when used with a dagger?";

-		next;

-		menu "15 SP",sM2_9, "No SP needed",-, "10 SP",sM2_9, "54 SP",sM2_9;

-

-			set @score, @score + 10;

-

-		sM2_9:

-

-		mes "[Markie]";

-		mes "10) Choose an effective dagger to use in the Byalan Dungeon?";

-		next;

-		menu "Wind Main-Gauche",-, "Ice Main-Gauche",sM2_10, "Earth Main-Gauche",sM2_10, "Fire Main-Gauche",sM2_10;

-

-			set @score, @score + 10;

-

-		sM2_10:

-

-

-	L_Score:

-		mes "[Markie]";

-		mes "Okay, those are all of the questions I have.  Now that wasn't so bad was it sweetie?";

-		mes "I hope you don't mind, but I've been grading your answers.";

-		next;

-		mes "[Markie]";

-		mes "I like to give people scores on their interviews so that they can know how well they did.";

-		mes "It looks like you got a ^FF3355" + @score +"^000000/100............";

-		next;

-		mes "[Markie]";

-		return;

-}

diff --git a/npc/scripts_jobs.conf b/npc/scripts_jobs.conf
index a799dab5f..06d1b6f60 100644
--- a/npc/scripts_jobs.conf
+++ b/npc/scripts_jobs.conf
@@ -17,9 +17,6 @@
 // --------------------------------------------------------------

 // ------------------------- Job Quests -------------------------

 

-//--Job Quest Functions. QUESTS WILL NOT WORK IF REMOVED!

-npc: npc/jobs/Jfunc/Jfunc2-1.txt

-npc: npc/jobs/Jfunc/Jfunc2-2.txt

 // -- Novice

 npc: npc/jobs/novice/novice.txt

 npc: npc/jobs/novice/supernovice.txt