updated job quests.

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

11 files changed, 248 insertions, 338 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index be56abb7e..ab47a9ea7 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -36,6 +36,9 @@ Musashiden
 

 Date		Added

 ======

+06/19

+	* Removed Jfunc1-1.txt, merged parts of scripts back. Changed job numbers to constants [Lupus]

+	- Jfunc2-1.txt & Jfunc2-2.txt todo

 06/17

 	* Fixed a Rachel warp thanks to Dr.Evil [Playtester]

 	* Fixed some typos in quests_lighthalzen.txt thanks to Karore [Playtester]

diff --git a/npc/jobs/1-1/acolyte.txt b/npc/jobs/1-1/acolyte.txt
index 52a7a4207..c0b220c04 100644
--- a/npc/jobs/1-1/acolyte.txt
+++ b/npc/jobs/1-1/acolyte.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 

 //= kobra_k88

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

-//= 1.5

+//= 1.6

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

 //= eAthena 1.0 +

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

@@ -16,6 +16,7 @@
 //= v1.3 Added Baby Class support [Lupus]

 //= v1.4 Optimised and moved first checker to Jfunc1-1 [massdriller]

 //= 1.5 Now saves/restores all quest skills [Lupus]

+//= 1.6 Merged back JFunc [Lupus]

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

 

 

@@ -31,7 +32,33 @@ prt_church.gat,184,41,4	script	Father Mareusis	60,{
 

 	M_0:

 		mes "[Father Mareusis]";

-		callfunc "Aco_check";

+		if(BaseJob == Job_Acolyte) {

+			mes "Are you feeling okay?....";

+			emotion e_hmm;

+			next;

+			mes "[Father Mareusis]";

+			mes "...your attire...";

+			next;

+			mes "[Father Mareusis]";

+			mes "You're already are an Acolyte.....";

+			next;

+			mes "[Father Mareusis]";

+			mes "You are not joking with me, are you? Hoho!!..kids these days.";

+			emotion e_heh;

+			close;

+		}

+		if(BaseJob != Job_Novice) {

+			mes "I am sorry child.  You have already devoted your life to another profession.  I am afraid that you will no longer be able to devote it to God.";

+			close;

+		}

+		if(JobLevel < 10) {

+			mes "My child you do not yet possess the necessary skills to serve the lord.";

+			mes "Please come back when your faith in God has become stronger";

+			next;

+			mes "[Father Mareusis]";

+			mes "May God bless you.";

+			close;

+		}

 		mes "Do you truly wish to become a servant of God?";

 		next;

 		menu "Yes, Father, I do.",sM_0,"Nope, I lied.",sM_1;

diff --git a/npc/jobs/1-1/archer.txt b/npc/jobs/1-1/archer.txt
index 1f57a5227..e1cf9c51e 100644
--- a/npc/jobs/1-1/archer.txt
+++ b/npc/jobs/1-1/archer.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 

 //= kobra_k88

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

-//= 1.5

+//= 1.6

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

 //= eAthena 1.0 +

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

@@ -14,6 +14,7 @@
 //= v1.3 Added Baby Class support [Lupus]

 //= v1.4 Optimised and moved first checker to Jfunc1-1 [massdriller]

 //= 1.5 Now saves/restores all quest skills [Lupus]

+//= 1.6 Merged back JFunc [Lupus]

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

 

 

@@ -28,7 +29,26 @@ payon_in02.gat,64,71,4	script	Archer Guildsman	59,{
 

 	M_0:

 		mes "[Archer Guildsman]";

-		callfunc "Arc_check";

+		if(BaseJob == Job_Archer) {

+			mes "Your free spirited nature tells me that you're already an archer....that and the bow and arrow in your hands...Haha";

+			emotion e_heh;

+			close;

+		}

+		if(BaseJob != Job_Novice) {

+			mes "I'm sorry but you cannot leave your current job to become an Archer...though I can understand why you would want to do so."; 

+			close;

+		}

+		mes "You have made an excellent job choice.";

+		mes "Please submit your resume so that I can check your qualifications.";

+		next;

+		mes "(You hand over your resume)";

+		next;

+		mes "[Archer Guildsman]";

+		if(JobLevel < 10) {

+			mes "It seems that you are not qualified to become an Archer yet.  Please take a look at the job requirments once more.";

+			close;

+		}

+		set job_archer_q,1;

 		mes "Looks good.  You have the necesssary skills to become an archer....";

 		next;

 		mes "[Archer Guildsman]";

diff --git a/npc/jobs/1-1/mage.txt b/npc/jobs/1-1/mage.txt
index e6ce82f2b..d135bd11e 100644
--- a/npc/jobs/1-1/mage.txt
+++ b/npc/jobs/1-1/mage.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 

 //= kobra_k88

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

-//= 1.5

+//= 1.6

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

 //= eAthena 1.0 +

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

@@ -15,6 +15,7 @@
 //= 1.3 Added Baby Class support [Lupus]

 //= v1.4 Optimised and moved first checker to Jfunc1-1 [massdriller]

 //= 1.5 Now saves/restores all quest skills [Lupus]

+//= 1.6 Merged back JFunc, CHANGED NUMBERS TO CONSTANTS [Lupus]

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

 

 

@@ -34,7 +35,32 @@ M_Menu:
 		mes "You wanna be a Mage? Hmmm.....";

 		next;

 		mes "[Expert Mage]";

-		callfunc "Mag_check";

+		if(BaseJob == Job_Mage) {

+			mes "You should really get yourself a mirror.  Then you could see that you are ^ff0000already a Mage^000000.";

+			mes "It may even help you fix up your hair do.";

+			emotion e_swt;

+			close;

+		}

+		if(BaseJob != Job_Novice) {

+			mes "Oh...I'm sorry.  I know they say 2 is always better than 1, but when it comes to Jobs, it's a No No.";

+			mes "Try to stay positive.  Your current job can't be that bad.";

+			emotion e_no;

+			close;

+		}

+		mes "Okays, just fill out this application form pleeassse.";

+		next;

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

+		next;

+		mes "[Expert Mage]";

+		if(JobLevel < 10) {

+			mes "Oh...I'm sorry.  You need ^ff0000Job level 9^000000 and all of the ^0000ffBasic Skills^000000 before you can become a Mage.";

+			mes "Go out and kill some more Fabres okays.";

+			emotion e_no;

+			close;

+		}

+		mes "Oooh~ You have very nice hand writing ^0000dd"+ strcharinfo(0) +"^000000, and more importantly you have met the necessary prerequisites to become a mage.";

+		next;

+		mes "[Expert Mage]";

 		mes "The only thing left to do is to pass the official Geffen Mage Test.  Let me give you the details of the test.";

 		next;

 		set job_magician_q, rand(1,4);

diff --git a/npc/jobs/1-1/merchant.txt b/npc/jobs/1-1/merchant.txt
index 9ad6b5a33..41baf4dca 100644
--- a/npc/jobs/1-1/merchant.txt
+++ b/npc/jobs/1-1/merchant.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 

 //= kobra_k88

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

-//= 1.7

+//= 1.6

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

 //= eAthena 1.0 +

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

@@ -14,8 +14,9 @@
 //= v1.3 Added Baby Class support [Lupus]

 //= v1.4 Optimised and moved first checker to Jfunc1-1 [massdriller]

 //= 1.5 Changed Prontera->Izlude teleport price to 600 [Lupus]

-//= 1.6 Now saves/restores all quest skills [Lupus]

-//= 1.7 Removed Duplicates [Silent]

+//= 1.5.1 Removed Duplicates [Silent]

+//= 1.5.2 Now saves/restores all quest skills [Lupus]

+//= 1.6 Merged back JFunc, CHANGED NUMBERS TO CONSTANTS [Lupus]

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

 

 

@@ -35,7 +36,37 @@ M_Menu:
 	menu "I want to be a Merchant.",M_0,"What exactly is a Merchant?",M_1,"Give me the Requirements.",M_2,"End.",M_End;

 

      	M_0:

-		callfunc "Mer_check";

+

+     		if(BaseJob==Job_Merchant) {

+			mes "[Chief Mahnsoo]";

+			mes "Huh? What did you say? You noodle head! Take a good look at yourself.  Your ALREADY A MERCHANT!  Good lord!";

+			emotion e_what;

+			emotion e_gasp;

+			close;

+		}

+		if(BaseJob != Job_Novice) {

+			mes "[Chief Mahnsoo]";

+			mes "We Merchants really don't like people who work during the day, and then go out to crazy bars at night.  When it comes to money, for them it's 'easy come easy go.";

+			next;

+			mes "[Chief Mahnsoo]";

+			mes "Well.. I talked a little too long, I guess... but since you already have an occupation, we don't need you.";

+			close;

+		}

+		if(JobLevel < 10) {

+			mes "[Chief Mahnsoo]";

+			mes "I'm sorry but you have to have a Novice Job level of 9 with all 9 of the basic Skills.";

+			close;

+		}

+		mes "[Chief Mahnsoo]";

+		mes "A Merchant you say? Well...";

+		next;

+		mes "[Chief Mahnsoo]";

+		mes "Alright.  First fill out an application form and submit 1000 Zeny for the Memebership Fee.";

+		mes "If you don't have enough money right now, you can pay 500 Zeny first and then pay the rest later after you've passed the Merchant License Test.";

+		next;

+		mes "[Chief Mahnsoo]";

+		mes "How does that sound? Are you still interested?";

+

 		next;

 		menu "Sure why not.  Who needs college anyways.",sM_0a,"Maybe, later...",sM_0b;

 

diff --git a/npc/jobs/1-1/swordman.txt b/npc/jobs/1-1/swordman.txt
index ec3cd7c42..0c9c5e058 100644
--- a/npc/jobs/1-1/swordman.txt
+++ b/npc/jobs/1-1/swordman.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 

 //= kobra_k88

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

-//= 1.8

+//= 1.6

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

 //= eAthena 1.0 +

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

@@ -11,49 +11,18 @@
 //===== Additional Comments: ================================= 

 //= Fully working.  I have created a custom warp to get into the test room so disable

 //= the one in your warp script or scripts.  It is this warp: "izlude_in.gat",40,170.

-//= v1.1 Added instant job change for High Novice [Lupus]

+//= 1.1 Added instant job change for High Novice [Lupus]

 //= 1.3 Added Baby Class support [Lupus]

 //= 1.4 Changed the timing system to initnpctimer, now you do get warnings about time

 //=     and are limited to 7min to complete the quest [Fredzilla]

-//= v1.5 Optimised and moved first checker to Jfunc1-1 [massdriller]

-//= 1.6 Fixed possible EXP abuse [Lupus]

-//= 1.7 Now saves/restores all quest skills [Lupus]

-//= 1.8 Removed Duplicates [Silent]

+//= 1.5 Optimised and moved first checker to Jfunc1-1 [massdriller]

+//= 1.5.1 Fixed possible EXP abuse [Lupus]

+//= 1.5.2 Now saves/restores all quest skills [Lupus]

+//= 1.5.3 Removed Duplicates [Silent]

+//= 1.6 Merged back JFunc, CHANGED NUMBERS TO CONSTANTS [Lupus]

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

 

 

-// == Monsters ==

-//Spawn is included in this file so make shure its not elsewhere to!

-sword_1-1.gat,35,78,0,0	monster	Fabre	1184,4,0,0,0

-sword_1-1.gat,50,108,0,0	monster	Fabre	1184,2,0,0,0

-sword_1-1.gat,61,28,0,0	monster	Fabre	1184,4,0,0,0

-sword_1-1.gat,61,92,0,0	monster	Fabre	1184,2,0,0,0

-//

-sword_1-1.gat,110,112,0,0	monster	Fabre	1184,3,0,0,0

-sword_1-1.gat,161,94,0,0	monster	Fabre	1184,2,0,0,0

-sword_1-1.gat,130,76,0,0	monster	Fabre	1184,2,0,0,0

-sword_1-1.gat,103,58,0,0	monster	Fabre	1184,2,0,0,0

-sword_1-1.gat,130,24,0,0	monster	Fabre	1184,3,0,0,0

-//

-sword_1-1.gat,201,36,0,0	monster	Fabre	1184,2,0,0,0

-sword_1-1.gat,201,16,0,0	monster	Fabre	1184,2,0,0,0

-sword_1-1.gat,239,44,0,0	monster	Fabre	1184,2,0,0,0

-sword_1-1.gat,239,76,0,0	monster	Fabre	1184,2,0,0,0

-sword_1-1.gat,231,101,0,0	monster	Fabre	1184,2,0,0,0

-sword_1-1.gat,234,117,0,0	monster	Fabre	1184,2,0,0,0

-sword_1-1.gat,198,91,0,0	monster	Fabre	1184,2,0,0,0

-sword_1-1.gat,200,63,0,0	monster	Fabre	1184,2,0,0,0

-

-

-// == Warp ==

-// -- Warp to test room --

-izlude_in.gat,62,170,0	script	w1039	45,1,1,{

-	if(BaseJob==Job_Novice && job_sword_q > 0) warp "izlude_in.gat",40,170;

-	if(job_sword_q == 0) doevent "Swordsman::OnStart";

-	end;

-}

-

-

 // == Npcs ==

 // -- Master Swordsman --

 izlude_in.gat,74,172,5	script	Master Swordsman	119,{

@@ -68,37 +37,57 @@ L_Menu:
 

 	M_0:

 		mes "[Master Swordsman]";

-		callfunc "Swo_check";

-

-		O_1a:

-			set job_sword_q,1;

-			savepoint "izlude_in.gat",65,165;

-			mes "Okay.  Let me just review your information......";

+		if(BaseJob == Job_Swordman) {

+			mes "Muhahaha! You must be kidding me! You're already a swordsman.";

+			emotion e_heh;

+			close;

+		}

+		if(BaseJob != Job_Novice) {

+			mes "Im sorry but you can not hold more than one job at a time and therefore I must refuse your request.";

 			next;

 			mes "[Master Swordsman]";

-			mes "Ah!! I see that you have met the necessary requirements.....";

-			next;

+			mes "Try picking up a hobby to make use of your spare time. Muhahahahah!!";

+			emotion e_heh;

+			close;

+		}

+		mes "So you wish to become a Swordsman aye? A very good choice!!  Fill out this application form first.";

+		next;

+		mes "..(you fill out the form and hand it to him)..";

+		next;

+		mes "[Master Swordsman]";

+		if(JobLevel < 10) {

+			mes "A hem...., you have yet to learn all of the 'Basic Skills' needed to become a Swordsman.  Please check the requirements again.";

+			close;

+		}

+

+		set job_sword_q,1;

+		savepoint "izlude_in.gat",65,165;

+		mes "Okay.  Let me just review your information......";

+		next;

+		mes "[Master Swordsman]";

+		mes "Ah!! I see that you have met the necessary requirements.....";

+		next;

+		mes "[Master Swordsman]";

+		mes "But there is one last thing you need to do to before I can make you an offical Swordsman.";

+		mes "You must prove your valour by taking the Izlude Swordsman Test!!!";

+		next;

+		mes "[Master Swordsman]";

+		mes "Are you willing to do so?";

+		next;

+		menu "Yes.",sM_0,"No.",sM_1;

+

+		sM_0:

 			mes "[Master Swordsman]";

-			mes "But there is one last thing you need to do to before I can make you an offical Swordsman.";

-			mes "You must prove your valour by taking the Izlude Swordsman Test!!!";

+			mes "Very good!!!  The testing room is too my right.";

 			next;

 			mes "[Master Swordsman]";

-			mes "Are you willing to do so?";

-			next;

-			menu "Yes.",sM_0,"No.",sM_1;

-

-			sM_0:

-				mes "[Master Swordsman]";

-				mes "Very good!!!  The testing room is too my right.";

-				next;

-				mes "[Master Swordsman]";

-				mes "Good luck young warrior!!!";

-				close;

+			mes "Good luck young warrior!!!";

+			close;

 

-			sM_1:

-				mes "[Master Swordsman]";

-				mes "Very well then. Your registration is complete.  When you are ready to take the test, just enter the testing room to my right.";

-				close;

+		sM_1:

+			mes "[Master Swordsman]";

+			mes "Very well then. Your registration is complete.  When you are ready to take the test, just enter the testing room to my right.";

+			close;

 

 	M_1:

 		mes "[Master Swordsman]";

@@ -129,7 +118,12 @@ L_Menu:
 		mes "So you wish to become a swordsman....";

 		next;

 		if(BaseJob == Job_Novice) goto O_2a;

-		if(BaseJob == Job_Swordman) goto O_2b;

+		if(BaseJob == Job_Swordman) {

+			mes "[Master Swordsman]";

+			mes "....but you're already a Swordsman...????";

+			emotion e_hmm;

+			close;

+		}

 		mes "[Master Swordsman]";

 		mes "But you already have another job.... it's too late for you to become a Swordsman.";

 		next;

@@ -147,13 +141,7 @@ L_Menu:
 			mes "[Master Swordsman]";

 			mes "When you fullfill these 2 conditions, you can become an offical Swordsman.";

 			goto L_Menu;

-		

-		O_2b:

-			mes "[Master Swordsman]";

-			mes "....but you're already a Swordsman...????";

-			emotion e_hmm;

-			close;

-					

+

 	M_End:

 		mes "[Master Swordsman]";

 		mes "Enjoy your youth before you lose it~~ Muhahahaha!!!!";

@@ -183,6 +171,14 @@ L_Done:
 		close;

 }

 

+// == Warp ==

+// -- Warp to test room --

+izlude_in.gat,62,170,0	script	w1039	45,1,1,{

+	if(BaseJob==Job_Novice && job_sword_q > 0) warp "izlude_in.gat",40,170;

+	if(job_sword_q == 0) doevent "Swordsman::OnStart";

+	end;

+}

+

 // -- Swordsman --

 izlude_in.gat,65,171,5	script	Swordsman#01	85,{

 	doevent "Swordsman::OnStart";

@@ -769,6 +765,28 @@ sword_1-1.gat,176,163,4	duplicate(3_blank)	3_blank_30_a	139,0,2
 sword_1-1.gat,177,163,4	duplicate(3_blank)	3_blank_30_b	139,0,2

 sword_1-1.gat,181,163,4	duplicate(3_blank)	3_blank_30_c	139,2,0

 

+// == Monsters ==

+//Spawn is included in this file so make shure its not elsewhere to!

+sword_1-1.gat,35,78,0,0	monster	Fabre	1184,4,0,0,0

+sword_1-1.gat,50,108,0,0	monster	Fabre	1184,2,0,0,0

+sword_1-1.gat,61,28,0,0	monster	Fabre	1184,4,0,0,0

+sword_1-1.gat,61,92,0,0	monster	Fabre	1184,2,0,0,0

+//

+sword_1-1.gat,110,112,0,0	monster	Fabre	1184,3,0,0,0

+sword_1-1.gat,161,94,0,0	monster	Fabre	1184,2,0,0,0

+sword_1-1.gat,130,76,0,0	monster	Fabre	1184,2,0,0,0

+sword_1-1.gat,103,58,0,0	monster	Fabre	1184,2,0,0,0

+sword_1-1.gat,130,24,0,0	monster	Fabre	1184,3,0,0,0

+//

+sword_1-1.gat,201,36,0,0	monster	Fabre	1184,2,0,0,0

+sword_1-1.gat,201,16,0,0	monster	Fabre	1184,2,0,0,0

+sword_1-1.gat,239,44,0,0	monster	Fabre	1184,2,0,0,0

+sword_1-1.gat,239,76,0,0	monster	Fabre	1184,2,0,0,0

+sword_1-1.gat,231,101,0,0	monster	Fabre	1184,2,0,0,0

+sword_1-1.gat,234,117,0,0	monster	Fabre	1184,2,0,0,0

+sword_1-1.gat,198,91,0,0	monster	Fabre	1184,2,0,0,0

+sword_1-1.gat,200,63,0,0	monster	Fabre	1184,2,0,0,0

+

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

 // mapflag

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

diff --git a/npc/jobs/1-1/thief.txt b/npc/jobs/1-1/thief.txt
index 0359458ad..1bb5b1736 100644
--- a/npc/jobs/1-1/thief.txt
+++ b/npc/jobs/1-1/thief.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================

 //= eAthena dev team

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

-//= 1.5

+//= 1.6

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

 //= eAthena 1.0 +

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

@@ -15,6 +15,7 @@
 //= v1.4 Optimised and moved first checker to Jfunc1-1 [massdriller]

 //= Fixed possible EXP abuse [Lupus]

 //= 1.5 Now saves/restores all quest skills [Lupus]

+//= 1.6 Merged back JFunc [Lupus]

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

 

 

@@ -29,7 +30,44 @@ job_thief1.gat,0,0,0,0	monster	Spore	1014,30,0,0,0
 // == NPCs ==

 // -- Interviewer --

 moc_prydb1.gat,39,129,5	script	Thief Guide	69,{

-	callfunc "Thi_check";

+

+	mes "[Thief Guide]";

+	if(BaseJob == Job_Thief) {

+		mes "You're already a thief.....  What do you want from me... go away!";

+		emotion e_swt;

+		close;

+	}

+	if(BaseClass == Job_Swordman) {

+		mes "What the heck...? Meh!~Here's another 'Bash' head.  Do me a favor... why don't you go 'BASH', yourself in the head.  Ha!";

+		emotion e_gg;

+		close;

+	}

+	if(BaseClass == Job_Mage) {

+		mes "What the heck...? Ehhh??? A Circus Sideshow? Make a fire without a Matchstick, will ya?";

+		emotion e_swt2;

+		close;

+	}

+	if(BaseClass == Job_Archer) {

+		mes "What the heck...? Hahahaha~are you a 'Kill Stealing' Archer...?";

+		emotion e_heh;

+		close;

+	}

+	if(BaseClass == Job_Acolyte) {

+		mes "What the heck...? Ohhhhhh~GOD... PORING's worshipper, Acolyte...";

+		mes "So why aren't you in church praying, instead of wandering about here, huh?";

+		close;

+	}

+	if(BaseClass == Job_Merchant) {

+		mes "What the heck...? Eeeeeek~Merchant Scammer here...!!!! I am gonna report you to the GM!!!";

+		emotion e_gasp;

+		close;

+	}

+	if(BaseClass != Job_Novice) {

+		mes "You already have a job.  Stop bothering me and go help out some newbies or something.";

+		emotion e_no1;

+		close;

+	}

+

 	if(job_thief_q==2) goto L_1;

 	if(job_thief_q==1) goto L_Back;

 

@@ -144,8 +182,6 @@ M_Menu:
 	L_Back:

 		if(countitem(1069)>0 || countitem(1070)>0) goto sL_1;//Items: Orange_Net_Mushroom, Orange_Gooey_Mushroom_,

 

-		sL_0:

-			mes "[Thief Guide]";

 			mes "..... What are you doing here? You're supposed to be gathering mushrooms remember??";

 			mes "Don't tell me you forget what to do??? Jeeze... do you want me to explain it to you one more time?......";

 			emotion e_hmm;

@@ -166,7 +202,6 @@ M_Menu:
 				close;

 

 		sL_1:

-			mes "[Thief Guide]";

 			mes "What? You actually went and stole some mushrooms?? Are you some kinda idiot?";

 			mes "Haha... I can't believe you listened to me..... ";

 			emotion e_what;

@@ -177,7 +212,6 @@ M_Menu:
 			close;

 

 	L_1:

-		mes "[Thief Guide]";

 		mes "So how was the Mushroom Farm?  Did yah have much fun?";

 		next;

 		menu "Yeah, kinda Cool.",M_Cool,"It was horrible.",M_Not;

diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt
index 735f86c7b..e4bdbc575 100644
--- a/npc/jobs/2-2/sage.txt
+++ b/npc/jobs/2-2/sage.txt
@@ -411,7 +411,7 @@ L_Menu2_1:
 		mes "......";

 		next;

 		mes "Elemental magic is divided into four types...";

-			menu "...called Fire, Wind, Water, and Earth",L_ThesisMenu1_1,"...named Fire, Wind, Water, and Earth",L_ThesisMenu1_2,"...that oppose each other: Fire, Wind, Water, and Earth",L_ThesisMenu1_3;

+			menu "...called Fire, Wind, Water, and Earth",L_ThesisMenu1_1,"...named Fire, Wind, Water, and Earth",L_ThesisMenu1_2,"...that oppose each other Fire, Wind, Water, and Earth",L_ThesisMenu1_3;

 		L_ThesisMenu1_1:

 			mes "...called Fire, Wind, Water, and Earth";

 			goto L_Thesis2;

diff --git a/npc/jobs/Jfunc/Jfunc1-1.txt b/npc/jobs/Jfunc/Jfunc1-1.txt
deleted file mode 100644
index 2763a93e0..000000000
--- a/npc/jobs/Jfunc/Jfunc1-1.txt
+++ /dev/null
@@ -1,248 +0,0 @@
-//===== eAthena Script ======================================= 

-//= Global Job Function

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

-//= massdriller

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

-//= 0.2

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

-//= eAthena 1.0 +

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

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

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

-//= For 1-1 Jobs

-//= Simplified Job Checks [Silentdragon]

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

-

-//Acolyte Check

-

-function	script	Aco_check	{

-		if(BaseJob == Job_Acolyte) goto JobAco;

-		if(BaseJob != Job_Novice) goto NotNov;

-		if(JobLevel < 10) goto JobLess10;

-		return;

-

-		JobAco:

-			mes "Are you feeling okay?....";

-			emotion e_hmm;

-			next;

-			mes "[Father Mareusis]";

-			mes "...your attire...";

-			next;

-			mes "[Father Mareusis]";

-			mes "You're already are an Acolyte.....";

-			next;

-			mes "[Father Mareusis]";

-			mes "You are not joking with me, are you? Hoho!!..kids these days.";

-			emotion e_heh;

-			close;

-			

-

-		NotNov:

-			mes "I am sorry child.  You have already devoted your life to another profession.  I am afraid that you will no longer be able to devote it to God.";

-			close;

-			

-

-		JobLess10:

-			mes "My child you do not yet possess the necessary skills to serve the lord.";

-			mes "Please come back when your faith in God has become stronger";

-			next;

-			mes "[Father Mareusis]";

-			mes "May God bless you.";

-			close;

-			

-}

-

-//Archer Check

-

-function	script	Arc_check	{

-

-		if(BaseJob == Job_Archer) goto sL_Archer;

-		if(BaseJob != Job_Novice) goto sL_Other;

-		mes "You have made an execellent job choice.";

-		mes "Please submit your resume so that I can check your qualifications.";

-		next;

-		mes "(You hand over your resume)";

-		next;

-		mes "[Archer Guildsman]";

-		if(JobLevel < 10) goto sL_LowLvl;

-		set job_archer_q,1;

-		return;

-

-		sL_Archer:

-			mes "Your free spirited nature tells me that you're already an archer....that and the bow and arrow in your hands...Haha";

-			emotion e_heh;

-			close;

-			

-

-		sL_Other:

-			mes "I'm sorry but you cannot leave your current job to become an Archer...though I can understand why you would want to do so."; 

-			close;

-			

-

-		sL_LowLvl:

-			mes "It seems that you are not qualified to become an Archer yet.  Please take a look at the job requirments once more.";

-			close;

-			

-

-}

-

-//mage Check

-function	script	Mag_check	{

-	

-		if(BaseJob == 2) goto L_JobMage;

-		if(BaseJob != 0) goto L_JobOther;

-		mes "Okays, just fill out this application form pleeassse.";

-		next;

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

-		next;

-		mes "[Expert Mage]";

-		if(JobLevel < 10) goto L_JobLvl;

-		mes "Oooh~ You have very nice hand writing ^0000dd"+ strcharinfo(0) +"^000000, and more importantly you have met the necessary prerequisites to become a mage.";

-		next;

-		mes "[Expert Mage]";

-		return;

-

-		L_JobMage:

-			mes "You should really get yourself a mirror.  Then you could see that you are ^ff0000already a Mage^000000.";

-			mes "It may even help you fix up your hair do.";

-			emotion e_swt;

-			close;

-			

-

-		L_JobOther:

-			mes "Oh...I'm sorry.  I know they say 2 is always better than 1, but when it comes to Jobs, it's a No No.";

-			mes "Try to stay positive.  Your current job can't be that bad.";

-			emotion e_no;

-			close;

-			

-

-		L_JobLvl:

-			mes "Oh...I'm sorry.  You need ^ff0000Job level 9^000000 and all of the ^0000ffBasic Skills^000000 before you can become a Mage.";

-			mes "Go out and kill some more Fabres okays.";

-			emotion e_no;

-			close;

-			

-

-}

-

-//Merchant Check

-function	script	Mer_check	{

-

-     		if(BaseJob==5) goto L_JobMer;

-		if(BaseJob !=0) goto L_JobOther;

-		if(JobLevel < 10) goto L_JobLvl;

-		mes "[Chief Mahnsoo]";

-		mes "A Merchant you say? Well...";

-		next;

-		mes "[Chief Mahnsoo]";

-		mes "Alright.  First fill out an application form and submit 1000 Zeny for the Memebership Fee.";

-		mes "If you don't have enough money right now, you can pay 500 Zeny first and then pay the rest later after you've passed the Merchant License Test.";

-		next;

-		mes "[Chief Mahnsoo]";

-		mes "How does that sound? Are you still interested?";

-		return;

-	

-		L_JobMer:

-			mes "[Chief Mahnsoo]";

-			mes "Huh? What did you say? You noodle head! Take a good look at yourself.  Your ALREADY A MERCHANT!  Good lord!";

-			emotion e_what;

-			emotion e_gasp;

-			close;

-			

-

-		L_JobOther:

-			mes "[Chief Mahnsoo]";

-			mes "We Merchants really don't like people who work during the day, and then go out to crazy bars at night.  When it comes to money, for them it's 'easy come easy go.";

-			next;

-			mes "[Chief Mahnsoo]";

-			mes "Well.. I talked a little too long, I guess... but since you already have an occupation, we don't need you.";

-			close;

-			

-

-		L_JobLvl:

-			mes "[Chief Mahnsoo]";

-			mes "I'm sorry but you have to have a Novice Job level of 9 with all 9 of the basic Skills.";

-			close;

-			

-}

-

-//Swordsman Check

-function	script	Swo_check	{

-

-		if(BaseJob == Job_Swordman) goto O_1b;

-		if(BaseJob != Job_Novice) goto O_1c;

-		mes "So you wish to become a Swordsman aye? A very good choice!!  Fill out this application form first.";

-		next;

-		mes "..(you fill out the form and hand it to him)..";

-		next;

-		mes "[Master Swordsman]";

-		if(JobLevel < 10) goto O_1d;

-		return;

-

-		O_1b:

-			mes "Muhahaha! You must be kidding me! You're already a swordsman.";

-			emotion e_heh;

-			close;

-

-		O_1c:

-			mes "Im sorry but you can not hold more than one job at a time and therefore I must refuse your request.";

-			next;

-			mes "[Master Swordsman]";

-			mes "Try picking up a hobby to make use of your spare time. Muhahahahah!!";

-			emotion e_heh;

-			close;

-

-		O_1d:

-			mes "A hem...., you have yet to learn all of the 'Basic Skills' needed to become a Swordsman.  Please check the requirements again.";

-			close;

-

-}

-//Thief Check

-function	script	Thi_check	{

-

-	if(BaseJob == Job_Novice) return;

-	if(BaseJob == Job_Thief) goto L_JobThief;

-	mes "[Thief Guide]";

-	if(BaseClass == Job_Swordman) goto L_Swordman;

-	if(BaseClass == Job_Mage) goto L_Mage;

-	if(BaseClass == Job_Archer) goto L_Archer;

-	if(BaseClass == Job_Acolyte) goto L_Acolyte;

-	if(BaseClass == Job_Merchant) goto L_Merchant;

-

-		mes "You already have a job.  Stop bothering me and go help out some newbies or something.";

-		emotion e_no1;

-		close;

-

-	L_Acolyte:

-		mes "What the heck...? Ohhhhhh~GOD... PORING's worshipper, Acolyte...";

-		mes "So why aren't you in church praying, instead of wandering about here, huh?";

-		close;

-

-	L_Archer:

-		mes "What the heck...? Hahahaha~are you a 'Kill Stealing' Archer...?";

-		emotion e_heh;

-		close;

-

-	L_Mage:

-		mes "What the heck...? Ehhh??? A Circus Sideshow? Make a fire without a Matchstick, will ya?";

-		emotion e_swt2;

-		close;

-

-	L_Merchant:

-		mes "What the heck...? Eeeeeek~Merchant Scammer here...!!!! I am gonna report you to the GM!!!";

-		emotion e_gasp;

-		close;

-

-	L_Swordman:

-		mes "What the heck...? Meh!~Here's another 'Bash' head.  Do me a favor... why don't you go 'BASH', yourself in the head.  Ha!";

-		emotion e_gg;

-		close;

-

-L_JobThief:

-	mes "[Thief Guide]";

-	mes "You're already a thief.....  What do you want from me... go away!";

-	emotion e_swt;

-	close;

-

-}

-

diff --git a/npc/other/Global_Functions.txt b/npc/other/Global_Functions.txt
index 559e13266..2ead3a1c7 100644
--- a/npc/other/Global_Functions.txt
+++ b/npc/other/Global_Functions.txt
@@ -37,7 +37,7 @@ function	script	F_ClearJobVar	{
 	set job_archer_q,0;

 	set job_magician_q,0;

 	set job_merchant_q,0; set job_merchant_q2,0; set job_merchant_q3,0;

-	set job_sword_q,0; set job_sword_q2,0; set SWTEST, 0;

+	set job_sword_q,0; set SWTEST, 0;

 	set job_thief_q,0;

 	// Super Novice

 	set SUPNOV_Q,0;

diff --git a/npc/scripts_jobs.conf b/npc/scripts_jobs.conf
index 753f207b9..a799dab5f 100644
--- a/npc/scripts_jobs.conf
+++ b/npc/scripts_jobs.conf
@@ -18,7 +18,6 @@
 // ------------------------- Job Quests -------------------------

 

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

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

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

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

 // -- Novice