* Removed usage of the 'goto' command from job quests.

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

5 files changed, 268 insertions, 384 deletions

diff --git a/npc/jobs/2-2/alchemist.txt b/npc/jobs/2-2/alchemist.txt
index 428c58276..32c08548f 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.9
+//= 3.0
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -16,6 +16,7 @@
 //= 2.7 Added missing checkweights. [L0ne_W0lf]
 //= 2.8 Fixed minor typo in test section. [L0ne_W0lf]
 //= 2.9 Added Quest Log commands. [Kisuka]
+//= 3.0 Removed the need for use of 'goto.' [L0ne_W0lf]
 //============================================================ 
 
 alde_alche,27,185,5	script	Alchemist Guildsman#am	744,{
@@ -413,75 +414,101 @@ alde_alche,175,107,3	script	Fastidious Alchemist#am	749,{
 		mes "Even if you tried studying for a thousand years, maybe even more, it'd be useless to you! Forget about it and just worry about your store!";
 		close;
 	}
-	else if (ALCH_Q == 4) {
-		mes "Heeheehee";
-		mes "keheheh~!";
-		mes "What do you";
-		mes "want, kid?";
-		next;
-		mes "[Raspuchin Gregory]";
-		mes "What...?";
-		mes "Join the Union!?";
-		mes "I don't like it...";
-		mes "I just don't...!";
-		next;
-		mes "[Raspuchin Gregory]";
-		mes "Nowadays, anyone thinks they can";
-		mes "be Alchemists just by knowing how to mix a few herbs. That's why my interview is necessary.";
-		next;
-		mes "[Raspuchin Gregory]";
-		mes "Heeheehee";
-		mes "keheheh~!";
-		mes "I plan on weeding out all the dumb and incompetent, and chase them";
-		mes "all away! We don't need morons!";
-		next;
-		if (JobLevel == 50) {
+	else if ((ALCH_Q == 4) || (ALCH_Q == 5)) {
+		if (ALCH_Q == 4) {
+			mes "Heeheehee";
+			mes "keheheh~!";
+			mes "What do you";
+			mes "want, kid?";
+			next;
 			mes "[Raspuchin Gregory]";
-			mes "Wait...";
-			mes "Maybe I've";
-			mes "misjudged you.";
-			if (sex == 1) {
-				mes "You might be a pretty boy,";
-				mes "but I can tell you're smart";
-				mes "from your eyes.";
+			mes "What...?";
+			mes "Join the Union!?";
+			mes "I don't like it...";
+			mes "I just don't...!";
+			next;
+			mes "[Raspuchin Gregory]";
+			mes "Nowadays, anyone thinks they can";
+			mes "be Alchemists just by knowing how to mix a few herbs. That's why my interview is necessary.";
+			next;
+			mes "[Raspuchin Gregory]";
+			mes "Heeheehee";
+			mes "keheheh~!";
+			mes "I plan on weeding out all the dumb and incompetent, and chase them";
+			mes "all away! We don't need morons!";
+			next;
+			if (JobLevel == 50) {
+				mes "[Raspuchin Gregory]";
+				mes "Wait...";
+				mes "Maybe I've";
+				mes "misjudged you.";
+				if (sex == 1) {
+					mes "You might be a pretty boy,";
+					mes "but I can tell you're smart";
+					mes "from your eyes.";
+				}
+				else {
+					mes "Huh. You're a cutie alright,";
+					mes "but I can tell you've got brains.";
+				}
+				next;
+				mes "[Raspuchin Gregory]";
+				mes "You're not just some stupid kid.";
+				mes "I can tell youve gone through some rough times as a Merchant. Excellent. Keh heh heh~";
+				next;
+				mes "[Raspuchin Gregory]";
+				mes "Fine, just so we don't insult each other's intelligence, I'll just let you pass the interview.";
+				next;
+				mes "[Raspuchin Gregory]";
+				mes "So hurry up, become an Alchemist, do some good research, and you might turn out to be of some help to me. Hahahahahaha~!";
+				next;
+				mes "[Raspuchin Gregory]";
+				mes "Now go to Darwin!";
+				mes "He'll teach you how to do the experiments. Just tell him that";
+				mes "I sent you.";
+				set ALCH_Q,6;
+				close;
 			}
 			else {
-				mes "Huh. You're a cutie alright,";
-				mes "but I can tell you've got brains.";
+				mes "[Raspuchin Gregory]";
+				mes "Surprised, are you?";
+				mes "Keheheh~ If you thought";
+				mes "becoming an Alchemist was";
+				mes "just a matter of changing";
+				mes "your clothes, then you're";
+				mes "sadly mistaken.";
+				next;
+				mes "[Raspuchin Gregory]";
+				mes "Now, try solving";
+				mes "all these problems.";
+				mes "Let's see how smart";
+				mes "really are.";
 			}
+		}
+		else if (ALCH_Q == 5) {
+			mes "What...?!";
+			mes "You want to take";
+			mes "the test again?!";
+			mes "I thought I told";
+			mes "you to leave!";
 			next;
 			mes "[Raspuchin Gregory]";
-			mes "You're not just some stupid kid.";
-			mes "I can tell youve gone through some rough times as a Merchant. Excellent. Keh heh heh~";
-			next;
-			mes "[Raspuchin Gregory]";
-			mes "Fine, just so we don't insult each other's intelligence, I'll just let you pass the interview.";
+			mes "I don't like it...";
+			mes "I don't like this!";
 			next;
 			mes "[Raspuchin Gregory]";
-			mes "So hurry up, become an Alchemist, do some good research, and you might turn out to be of some help to me. Hahahahahaha~!";
+			mes "Fine...";
+			mes "I'll try to overlook your pitiful performance last time and give";
+			mes "you another chance. Don't screw";
+			mes "up again, got it?";
 			next;
 			mes "[Raspuchin Gregory]";
-			mes "Now go to Darwin!";
-			mes "He'll teach you how to do the experiments. Just tell him that";
-			mes "I sent you.";
-			set ALCH_Q,6;
-			close;
+			mes "Now then,";
+			mes "give me all the";
+			mes "^551A8Bright^000000 answers";
+			mes "this time.";
 		}
-		mes "[Raspuchin Gregory]";
-		mes "Surprised, are you?";
-		mes "Keheheh~ If you thought";
-		mes "becoming an Alchemist was";
-		mes "just a matter of changing";
-		mes "your clothes, then you're";
-		mes "sadly mistaken.";
-		next;
-		mes "[Raspuchin Gregory]";
-		mes "Now, try solving";
-		mes "all these problems.";
-		mes "Let's see how smart";
-		mes "really are.";
 		next;
-L_AskQuestions:
 		switch(rand(1,3)) {
 		case 1:
 			mes "[Raspuchin Gregory]";
@@ -750,31 +777,6 @@ L_AskQuestions:
 		changequest 2031,2032;
 		close;
 	}
-	else if (ALCH_Q == 5) {
-		mes "What...?!";
-		mes "You want to take";
-		mes "the test again?!";
-		mes "I thought I told";
-		mes "you to leave!";
-		next;
-		mes "[Raspuchin Gregory]";
-		mes "I don't like it...";
-		mes "I don't like this!";
-		next;
-		mes "[Raspuchin Gregory]";
-		mes "Fine...";
-		mes "I'll try to overlook your pitiful performance last time and give";
-		mes "you another chance. Don't screw";
-		mes "up again, got it?";
-		next;
-		mes "[Raspuchin Gregory]";
-		mes "Now then,";
-		mes "give me all the";
-		mes "^551A8Bright^000000 answers";
-		mes "this time.";
-		next;
-		goto L_AskQuestions;
-	}
 	else if (ALCH_Q == 6) {
 		mes "What are you doing?";
 		mes "Go and find Darwin now.";
diff --git a/npc/jobs/2-2/bard.txt b/npc/jobs/2-2/bard.txt
index acf9a0193..4f33c36d5 100644
--- a/npc/jobs/2-2/bard.txt
+++ b/npc/jobs/2-2/bard.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Muad_Dib(The Prometheus Project), Lupus, Samuray22
 //===== Current Version: ===================================== 
-//= 2.5
+//= 2.6
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -22,6 +22,7 @@
 //=	- Changed item names to item IDs
 //= 2.4 Fixed hang up on bard quest. ($kiN.) [L0ne_W0lf]
 //= 2.5 Added Quest Log commands. [Kisuka]
+//= 2.6 Removed the need for use of 'goto.' [L0ne_W0lf]
 //============================================================
 
 //=============== Ayealo ============================
@@ -421,27 +422,60 @@ comodo,226,123,5	script	Wandering Bard	741,{
 		cutin "job_bard_aiolo01",255;
 		end;
 	}
-	else if(BARD_Q == 3) {
-		if(xmas_npc > 10) { //this var is set in LUTIE.TXT
+	else if ((BARD_Q >= 3) || (BARD_Q <= 5)) {
+		if (BARD_Q == 3) {
+			if(xmas_npc > 10) { //this var is set in LUTIE.TXT
+				cutin "job_bard_aiolo01",2;
+				mes "[Lalo]";
+				mes "How was the trip? Did you meet a lot of people?";
+				mes "You should have been able to learn something more important than a gift.";
+				next;
+				mes "[Lalo]";
+				mes "Then, do you want to try singing...?";
+				mes "I'll sing a short melody...";
+				mes "and you try after.";
+				if(checkquest(3003) == -1) {
+					changequest 3002,3003;
+				}
+				next;
+				mes "[Lalo]";
+				mes "Here I go.";
+				mes "Ehem *clears throat*";
+				mes "1, 2, 3, 4";
+				next;
+			}
+			else {
+				cutin "job_bard_aiolo01",2;
+				set xmas_npc,1;
+				mes "[Lalo]";
+				mes "Eh, you still haven't become his friend?";
+				mes "Talking will not be enough.";
+				next;
+				mes "[Lalo]";
+				mes "if you become friends with ^008800Jack Frost^000000, you will receive something.";
+				mes "And talk with the village people, too...";
+				close2;
+				cutin "job_bard_aiolo01",255;
+				end;
+			}
+		}
+		else if (BARD_Q == 4) {
 			cutin "job_bard_aiolo01",2;
 			mes "[Lalo]";
-			mes "How was the trip? Did you meet a lot of people?";
-			mes "You should have been able to learn something more important than a gift.";
+			mes "Hmm... this time you can do better, right?";
+			mes "Let's try again, you can do it.";
 			next;
 			mes "[Lalo]";
-			mes "Then, do you want to try singing...?";
-			mes "I'll sing a short melody...";
-			mes "and you try after.";
-			if(checkquest(3003) == -1) {
-				changequest 3002,3003;
-			}
+			mes "I'll sing one part...";
+			mes "and you try it after.";
 			next;
 			mes "[Lalo]";
-			mes "Here I go.";
-			mes "Ehem *clears throat*";
+			mes "Here we go.";
+			mes "*Ehem*";
 			mes "1, 2, 3, 4";
 			next;
-B_Sing:
+		}
+		if (BARD_Q != 5) {
 			set .@bard_s, rand(1,5);
 			if (.@bard_s == 1) {
 				mes "^3377FFThere was a man^000000";
@@ -808,113 +842,64 @@ B_Sing:
 			mes "Do you want to just change jobs now?";
 			mes "Or do you want a present.";
 			next;
-			if (select("Just change my job please.:I'd be thankful for a present.") == 1) {
-B_Change:
-				if(SkillPoint) {
+			set .@selection,select("Just change my job please.:I'd be thankful for a present.");
+		}
+		if ((.@selection == 1) || (BARD_Q == 5)) {
+			if(SkillPoint) {
+				cutin "job_bard_aiolo01",2;
+				mes "[Lalo]";
+				mes "Ah... Everything is good, but you still have some skill points left.";
+				mes "Go learn the rest of the skills and come back.";
+				next;
+				mes "[Lalo]";
+				mes "And I am going to give you a small present...";
+				mes "So bring some trunks.";
+				mes "It doesn't matter what kind, as long as they are 60 of the same kind...";
+				close2;
+				cutin "job_bard_aiolo01",255;
+				end;
+			}
+			else {
+				switch(BARD_Q) {
+				case 5:
+					if(countitem(1019) > 59) callsub S_ChangeJob,1019,1901;
+					else if(countitem(1068) > 59) callsub S_ChangeJob,1068,1903;
+					else if(countitem(1067) > 59) callsub S_ChangeJob,1067,1903;
+					else if(countitem(1066) > 59) {
+						if(JobLevel > 49) callsub S_ChangeJob,1066,1910;
+						else callsub S_ChangeJob,1066,1905;
+					}
 					cutin "job_bard_aiolo01",2;
 					mes "[Lalo]";
-					mes "Ah... Everything is good, but you still have some skill points left.";
-					mes "Go learn the rest of the skills and come back.";
+					mes "Mmm? Seems like you haven't prepared all trunks the yet? ";
+					mes "Do you want to just change jobs anyways?";
+					next;
+					if (select("Yes, just change my job already.:No, I'll go prepare them.") == 2)
+						break;
+				default:
+					completequest 3003;
+					callfunc "Job_Change",Job_Bard;
+					callfunc "F_ClearJobVar";		//clears all job variables for the current player
+					mes "[Lalo]";
+					mes "Very well! Hope you sing happy enjoyable songs.";
+					mes "Live like the wind and the clouds!";
 					next;
 					mes "[Lalo]";
-					mes "And I am going to give you a small present...";
-					mes "So bring some trunks.";
-					mes "It doesn't matter what kind, as long as they are 60 of the same kind...";
+					mes "See you again next time!";
 					close2;
 					cutin "job_bard_aiolo01",255;
 					end;
 				}
-				completequest 3003;
-				callfunc "Job_Change",Job_Bard;
-				callfunc "F_ClearJobVar";		//clears all job variables for the current player
-				mes "[Lalo]";
-				mes "Very well! Hope you sing happy enjoyable songs.";
-				mes "Live like the wind and the clouds!";
-				next;
-				mes "[Lalo]";
-				mes "See you again next time!";
-				close2;
-				cutin "job_bard_aiolo01",255;
-				end;
 			}
-			changequest 3003,3004;
-			mes "[Lalo]";
-			mes "Hmm... very well, bring some trunks.";
-			mes "It doesn't matter what kind, as long as they are 60 of the same kind...";
-			next;
-			mes "[Lalo]";
-			mes "I will give you a gift once you bring them.";
-			mes "Have a safe trip.";
-			close2;
-			cutin "job_bard_aiolo01",255;
-			end;
-		}
-		cutin "job_bard_aiolo01",2;
-		set xmas_npc,1;
-		mes "[Lalo]";
-		mes "Eh, you still haven't become his friend?";
-		mes "Talking will not be enough.";
-		next;
-		mes "[Lalo]";
-		mes "if you become friends with ^008800Jack Frost^000000, you will receive something.";
-		mes "And talk with the village people, too...";
-		close2;
-		cutin "job_bard_aiolo01",255;
-		end;
-	} 
-	else if(BARD_Q == 4) {
-		cutin "job_bard_aiolo01",2;
-		mes "[Lalo]";
-		mes "Hmm... this time you can do better, right?";
-		mes "Let's try again, you can do it.";
-		next;
-		mes "[Lalo]";
-		mes "I'll sing one part...";
-		mes "and you try it after.";
-		next;
-		mes "[Lalo]";
-		mes "Here we go.";
-		mes "*Ehem*";
-		mes "1, 2, 3, 4";
-		next;
-		goto B_SING;
-	}
-	else if(BARD_Q == 5) {
-		if(SkillPoint) {
-			cutin "job_bard_aiolo01",2;
-			mes "[Lalo]";
-			mes "Ah... Everything is good, but you still have some skill points left.";
-			mes "Go learn the rest of the skills and come back.";
-			next;
-			mes "[Lalo]";
-			mes "And I am going to give you a small present...";
-			mes "So don't forget the trunks.";
-			mes "It doesn't matter what kind, as long as they are 60 of the same sort...";
-			close2;
-			cutin "job_bard_aiolo01",255;
-			end;
-		}
-		if(countitem(1019) > 59) callsub S_ChangeJob,1019,1901;
-		else if(countitem(1068) > 59) callsub S_ChangeJob,1068,1903;
-		else if(countitem(1067) > 59) callsub S_ChangeJob,1067,1903;
-		else if(countitem(1066) > 59) {
-			if(JobLevel > 49) callsub S_ChangeJob,1066,1910;
-			else callsub S_ChangeJob,1066,1905;
 		}
-		cutin "job_bard_aiolo01",2;
-		mes "[Lalo]";
-		mes "Mmm? Seems like you haven't prepared all trunks the yet? ";
-		mes "Do you want to just change jobs anyways?";
-		next;
-		if (select("Yes, just change my job already.:No, I'll go prepare them.") == 1) goto B_Change;
-		cutin "job_bard_aiolo01",2;
+		changequest 3003,3004;
 		mes "[Lalo]";
-		mes "Hmm... ok, bring some ^3355FFtrunks^000000.";
-		mes "Doesn't matter what kind, as long as they are 60 of the same sort.";
+		mes "Hmm... very well, bring some trunks.";
+		mes "It doesn't matter what kind, as long as they are 60 of the same kind...";
 		next;
 		mes "[Lalo]";
-		mes "I'll give you a present if you bring them.";
-		mes "Then see you soon.";
+		mes "I will give you a gift once you bring them.";
+		mes "Have a safe trip.";
 		close2;
 		cutin "job_bard_aiolo01",255;
 		end;
diff --git a/npc/jobs/2-2/crusader.txt b/npc/jobs/2-2/crusader.txt
index be9f2b58c..295a79009 100644
--- a/npc/jobs/2-2/crusader.txt
+++ b/npc/jobs/2-2/crusader.txt
@@ -4,7 +4,7 @@
 //= Made by: Black Dragon
 //= Converted by: Shin
 //===== Current Version: ===================================== 
-//= 3.2
+//= 3.3
 //===== Compatible With: ===================================== 
 //= eAthena  SVN
 //===== Description: ========================================= 
@@ -31,6 +31,7 @@
 //= 3.0 Updated waiting room. (Removes global var) [L0ne_W0lf]
 //= 3.1 Adding Hermemton's changes. [L0ne_W0lf]
 //= 3.2 Added Quest Log commands. [Kisuka]
+//= 3.3 Removed the need for use of 'goto.' [L0ne_W0lf]
 //============================================================
 
 
@@ -491,40 +492,40 @@ prt_church,95,127,3	script	Crusader	745,{
 		mes "If you would like to become a Crusader, please speak with our leader in the Prontera Central Palace.";
 		close;
 	}
-	else if(CRUS_Q == 6) {
-		mes "Welcome.";
-		mes "Did you do well";
-		mes "on those painful tests?";
-		mes "I will be conducting your next test.";
-		next;
-		mes "[Gabriel Valentine]";
-		mes "My name is Gabriel Valentine. I, too, am preparing for the Holy War. For the time being, I act as guard for this church.";
-		next;
-		mes "[Gabriel Valentine]";
-		mes "I will test to see if you have acquired the knowledge that is necessary to become a Crusader.";
-		mes "We can't very well win the Holy War just by swinging a sword.";
-		next;
-		mes "[Gabriel Valentine]";
-		mes "I will give";
-		mes "you 10 questions.";
-		mes "Answer them correctly.";
-		next;
-		goto C_Questions;
-	} 
-	else if(CRUS_Q == 7) {
-		mes "Welcome back~";
-		mes "Did you prepare";
-		mes "well for this test?";
-		mes "Let's try again,";
-		mes "shall we...?";
-		next;
-		mes "[Gabriel Valentine]";
-		mes "Once again, I'm going";
-		mes "to give you 10 questions";
-		mes "Listen carefully, and";
-		mes "choose the correct answer.";
-		next;
-C_Questions:
+	else if((CRUS_Q == 6) || (CRUS_Q == 7)) {
+		if(CRUS_Q == 6) {
+			mes "Welcome.";
+			mes "Did you do well";
+			mes "on those painful tests?";
+			mes "I will be conducting your next test.";
+			next;
+			mes "[Gabriel Valentine]";
+			mes "My name is Gabriel Valentine. I, too, am preparing for the Holy War. For the time being, I act as guard for this church.";
+			next;
+			mes "[Gabriel Valentine]";
+			mes "I will test to see if you have acquired the knowledge that is necessary to become a Crusader.";
+			mes "We can't very well win the Holy War just by swinging a sword.";
+			next;
+			mes "[Gabriel Valentine]";
+			mes "I will give";
+			mes "you 10 questions.";
+			mes "Answer them correctly.";
+			next;
+		}
+		else if(CRUS_Q == 7) {
+			mes "Welcome back~";
+			mes "Did you prepare";
+			mes "well for this test?";
+			mes "Let's try again,";
+			mes "shall we...?";
+			next;
+			mes "[Gabriel Valentine]";
+			mes "Once again, I'm going";
+			mes "to give you 10 questions";
+			mes "Listen carefully, and";
+			mes "choose the correct answer.";
+			next;
+		}
 		set .@cru_m,rand(1,3);
 		if (.@cru_m == 1) {
 			mes "[Gabriel Valentine]";
@@ -768,7 +769,7 @@ C_Questions:
 		mes "[Gabriel Valentine]";
 		mes "Don't stress, you need to know a lot in order to pass this test. In any case, I'll be waiting right here. When you think you're ready, come back, alright?";
 		close;
-	}
+	} 
 	else if(CRUS_Q == 8 || CRUS_Q == 9) {
 		mes "Like I mentioned before, you should go to Prontera Castle and meet with Bliant Piyord to take your next test. Good luck, and become a Crusder soon, alright?";
 		close;
diff --git a/npc/jobs/2-2/monk.txt b/npc/jobs/2-2/monk.txt
index f5b2d2997..b3c5121b7 100644
--- a/npc/jobs/2-2/monk.txt
+++ b/npc/jobs/2-2/monk.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Dino9021, Edited / Translated by Celest
 //===== Current Version: ===================================== 
-//= 2.4
+//= 2.5
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -15,6 +15,7 @@
 //= 2.3 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 2.3a Deleted unused variables. [Samuray22]
 //= 2.4 Added Quest Log commands. [Kisuka]
+//= 2.5 Removed the need for use of 'goto.' [L0ne_W0lf]
 //============================================================ 
 
 prt_monk,59,247,1	script	Guarding Monk#mk	120,6,2,{
@@ -903,42 +904,49 @@ monk_in,99,58,1	script	Sensei Moohae#mk	60,{
 }
 
 prt_monk,251,255,1	script	Touha#mk	79,{
-	if (MONK_Q == 10) {
-		mes "[Touha]";
-		mes "What brings you to me.";
-		mes "Do you wish to share a conversation with me?";
-		next;
-		mes "[Touha]";
-		mes "Oh, I see. You're on the monk in training.";
-		mes "You already possess a similar spirit as a monk's.";
-		next;
-		mes "[Touha]";
-		mes "By the looks of you, it seems, you";
-		mes "have already visited Sensei Moohae. Good.";
-		next;
-		mes "[Touha]";
-		mes "Let me inform you about certain things you must know as a monk.";
-		mes "Then I will help you to strengthen your body so that you can bear your next training.";
-		next;
-		mes "[Touha]";
-		mes "Calm your mind.";
-		mes "Relax your body...are you ready?";
-		next;
-		if (select("Yes.:No.") == 2) {
+	if (MONK_Q >= 10 && MONK_Q < 14) {
+		if (MONK_Q == 10) {
 			mes "[Touha]";
-			mes "Please come back when you're ready.";
-			close;
+			mes "What brings you to me.";
+			mes "Do you wish to share a conversation with me?";
+			next;
+			mes "[Touha]";
+			mes "Oh, I see. You're on the monk in training.";
+			mes "You already possess a similar spirit as a monk's.";
+			next;
+			mes "[Touha]";
+			mes "By the looks of you, it seems, you";
+			mes "have already visited Sensei Moohae. Good.";
+			next;
+			mes "[Touha]";
+			mes "Let me inform you about certain things you must know as a monk.";
+			mes "Then I will help you to strengthen your body so that you can bear your next training.";
+			next;
+			mes "[Touha]";
+			mes "Calm your mind.";
+			mes "Relax your body...are you ready?";
+			next;
+			if (select("Yes.:No.") == 2) {
+				mes "[Touha]";
+				mes "Please come back when you're ready.";
+				close;
+			}
+			mes "[Touha]";
+			mes "Ok...then.";
+			next;
+			mes "[Touha]";
+			mes "Please repeat after me.";
+			next;
+			changequest 3024,3025;
+		}
+		else {
+			mes "[Touha]";
+			mes "Now, pay attention this time...";
+			next;
 		}
 		mes "[Touha]";
-		mes "Ok...then.";
-		next;
-		mes "[Touha]";
-		mes "Please repeat after me.";
-		next;
-		mes "[Touha]";
-		changequest 3024,3025;
-		switch(rand(1,3)) {
-		case 1:
+		set .@rand,rand(1,3);
+		if ((.@rand == 1) || (MONK_Q == 11)) {
 			set MONK_Q,11;
 			mes "I seek the path";
 			next;
@@ -968,8 +976,8 @@ prt_monk,251,255,1	script	Touha#mk	79,{
 			next;
 			mes "[Touha]";
 			mes "et Spiritus Sancti.";
-			break;
-		case 2:
+		}
+		else if ((.@rand == 2) || (MONK_Q == 12)) {
 			set MONK_Q,12;
 			mes "I commit myself to";
 			next;
@@ -999,8 +1007,8 @@ prt_monk,251,255,1	script	Touha#mk	79,{
 			next;
 			mes "[Touha]";
 			mes "et Spiritus Sancti.";
-			break;
-		case 3:
+		}
+		else if ((.@rand == 3) || (MONK_Q == 13)) {
 			set MONK_Q,13;
 			mes "And shepherds we shall be,";
 			next;
@@ -1032,12 +1040,13 @@ prt_monk,251,255,1	script	Touha#mk	79,{
 			mes "et Spiritus Sancti.";
 		}
 		next;
-		mes "[Touha]";
-		mes "Ok, that is all. Now repeat what I have spoken.";
-		if (MONK_Q == 11) {
-L_MonkOath1:
+		if (MONK_Q == 10) {
+			mes "[Touha]";
+			mes "Ok, that is all. Now repeat what I have spoken.";
 			mes "" + strcharinfo(0) + ", your turn.";
 			next;
+		}
+		if (MONK_Q == 11) {
 			switch(select("shall hold true:We monks:and will help protect others:through the teachings:In nomine Patris, et Filii:to what we believe:I seek the path:we learn through our lives.:et Spiritus Sancti.:of enlightenment.")) {
 			case 1:
 				mes "[" + strcharinfo(0) + "]";
@@ -1219,9 +1228,6 @@ L_MonkOath1:
 			}
 		}
 		else if (MONK_Q == 12) {
-L_MonkOath2:
-			mes "" + strcharinfo(0) + ", your turn.";
-			next;
 			switch(select("I will follow my path:veritas and aequitas.:to enlightenment and purity.:I commit myself to:I will protect my:victorious while I breathe.:brothers with my life.:Evil shall never be:In nomine Patris, et Filii:et Spiritus Sancti.")) {
 			case 1:
 				mes "[" + strcharinfo(0) + "]";
@@ -1402,9 +1408,6 @@ L_MonkOath2:
 			}
 		}
 		else if (MONK_Q == 13) {
-L_MonkOath3:
-			mes "" + strcharinfo(0) + ", your turn.";
-			next;
 			switch(select("for thee my lord for thee.:And shepherds we shall be,:Power hath descended forth:out thy command. And we shall:from the hand:flow a river forth to thee and:so our feet may swiftly carry:teeming with souls shall it ever be:et Spiritus Sancti.:In nomine Patris, et Filii")) {
 			case 1:
 				mes "[" + strcharinfo(0) + "]";
@@ -1637,114 +1640,6 @@ L_MonkOath3:
 			close;
 		}
 	}
-	else if (MONK_Q > 10 && MONK_Q < 14) {
-		mes "[Touha]";
-		mes "Now, pay attention this time...";
-		next;
-		mes "[Touha]";
-		if (MONK_Q == 11) {
-			mes "I seek the path";
-			next;
-			mes "[Touha]";
-			mes "of enlightenment.";
-			next;
-			mes "[Touha]";
-			mes "We monks";
-			next;
-			mes "[Touha]";
-			mes "shall hold true";
-			next;
-			mes "[Touha]";
-			mes "to what we believe";
-			next;
-			mes "[Touha]";
-			mes "and will help protect others";
-			next;
-			mes "[Touha]";
-			mes "through the teachings";
-			next;
-			mes "[Touha]";
-			mes "we learn through our lives.";
-			next;
-			mes "[Touha]";
-			mes "In nomine Patris, et Filii";
-			next;
-			mes "[Touha]";
-			mes "et Spiritus Sancti.";
-			next;
-			mes "[Touha]";
-			mes "Ok, that is the end.";
-			goto L_MonkOath1;
-		}
-		else if (MONK_Q == 12) {
-			mes "I commit myself to";
-			next;
-			mes "[Touha]";
-			mes "veritas and aequitas.";
-			next;
-			mes "[Touha]";
-			mes "I will follow my path";
-			next;
-			mes "[Touha]";
-			mes "to enlightenment and purity.";
-			next;
-			mes "[Touha]";
-			mes "I will protect my";
-			next;
-			mes "[Touha]";
-			mes "brothers with my life.";
-			next;
-			mes "[Touha]";
-			mes "Evil shall never be";
-			next;
-			mes "[Touha]";
-			mes "victorious while I breathe.";
-			next;
-			mes "[Touha]";
-			mes "In nomine Patris, et Filii";
-			next;
-			mes "[Touha]";
-			mes "et Spiritus Sancti.";
-			next;
-			mes "[Touha]";
-			mes "That's it... were you paying attention?.";
-			goto L_MonkOath2;
-		}
-		else if (MONK_Q == 13) {
-			mes "And shepherds we shall be,";
-			next;
-			mes "[Touha]";
-			mes "for thee my lord for thee.";
-			next;
-			mes "[Touha]";
-			mes "Power hath descended forth";
-			next;
-			mes "[Touha]";
-			mes "from the hand";
-			next;
-			mes "[Touha]";
-			mes "so our feet may swiftly carry";
-			next;
-			mes "[Touha]";
-			mes "out thy command. And we shall";
-			next;
-			mes "[Touha]";
-			mes "flow a river forth to thee and";
-			next;
-			mes "[Touha]";
-			mes "teeming with souls shall it ever be";
-			next;
-			mes "[Touha]";
-			mes "In nomine Patris, et Filii";
-			next;
-			mes "[Touha]";
-			mes "et Spiritus Sancti.";
-			next;
-			mes "[Touha]";
-			mes "I hope you were paying attention this time. This is a sacred family prayer.";
-			goto L_MonkOath3;
-		}
-	}
 	else if (MONK_Q == 14) {
 		mes "[Touha]";
 		mes "Hmm... did you forget who to visit?";
diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt
index 40ec29baf..0a4ed575a 100644
--- a/npc/jobs/2-2/sage.txt
+++ b/npc/jobs/2-2/sage.txt
@@ -5,7 +5,7 @@
 //= Unknown Translator (1.0)
 //= Darkchild (1.2)
 //===== Current Version: ===================================== 
-//= 2.7
+//= 2.8
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -26,6 +26,7 @@
 //= 2.6 Fixed Kayron Grik cutin not being removed as reported by jc1991, bugreport:1825 [Brainstorm]
 //= 2.6a Fixed a Little Bug with Whispers Summoned in the Last Test. (bugreport:2253) [Samuray22]
 //= 2.7 Added Quest Log commands. [Kisuka]
+//= 2.8 Removed the need for use of 'goto.' [L0ne_W0lf]
 //============================================================ 
 
 yuno_in02,38,61,5	script	Dean of the Academy#sa	743,{