* 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

1 files changed, 34 insertions, 35 deletions

diff --git a/npc/jobs/1-1e/taekwon.txt b/npc/jobs/1-1e/taekwon.txt
index 1a099ef2c..224b7741d 100644
--- a/npc/jobs/1-1e/taekwon.txt
+++ b/npc/jobs/1-1e/taekwon.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Tsuyuki & Samuray22
 //===== Current Version: ===================================== 
-//= 1.3
+//= 1.4
 //===== Compatible With: ===================================== 
 //= eAthena/Freya
 //===== Description: ========================================= 
@@ -13,6 +13,7 @@
 //= 1.1 Rewrote to the Aegis Standars. [Samuray22]
 //= 1.2 Fixed position the npc is facing. [Kisuka]
 //= 1.3 Added Quest Log commands. [Kisuka]
+//= 1.4 Removed use of 'goto', and fixed some indentation. [L0ne_W0lf]
 //============================================================ 
 
 
@@ -62,19 +63,17 @@ payon,157,141,5	script	Phoenix#TKJobChange	753,{
 		mes "I know that the answer";
 		mes "will come in time...";
 		next;
-		if (Class == Job_Novice && TK_Q == 0) {
-			goto L_change;
+		if (Class != Job_Novice && TK_Q != 0) {
+			mes "[Phoenix]";
+			mes "Noble adventurer:";
+			mes "if you know anyone who";
+			mes "has not chosen his path";
+			mes "in life, please recommend";
+			mes "him to me. If interested,";
+			mes "I may teach him my art...";
+			close;
 		}
 		mes "[Phoenix]";
-		mes "Noble adventurer:";
-		mes "if you know anyone who";
-		mes "has not chosen his path";
-		mes "in life, please recommend";
-		mes "him to me. If interested,";
-		mes "I may teach him my art...";
-		close;
-L_change:
-		mes "[Phoenix]";
 		mes "If you have not decided on";
 		mes "the path you wish to take in";
 		mes "life, I'd like you to consider";
@@ -128,14 +127,14 @@ L_change:
 			mes "the next time we meet.";
 			close;
 		}
-			mes "[Phoenix]";
-			mes "I understand. One's life can";
-			mes "take many paths, but you can";
-			mes "only choose to travel on one";
-			mes "at a time. I hope that you work";
-			mes "towards enlightenment in your";
-			mes "very own way, adventurer.";
-			close;
+		mes "[Phoenix]";
+		mes "I understand. One's life can";
+		mes "take many paths, but you can";
+		mes "only choose to travel on one";
+		mes "at a time. I hope that you work";
+		mes "towards enlightenment in your";
+		mes "very own way, adventurer.";
+		close;
 	}
 	switch(TK_Q) {
 	case 1:
@@ -151,13 +150,13 @@ L_change:
 			mes "the next portion of training.";
 			close;
 		}
-			mes "[Phoenix]";
-			mes "You must gain ^FF00001 more";
-			mes "Base Level^000000 to prove that";
-			mes "you can endure the hardship";
-			mes "that entails this job. Never";
-			mes "neglect your training.";
-			close;
+		mes "[Phoenix]";
+		mes "You must gain ^FF00001 more";
+		mes "Base Level^000000 to prove that";
+		mes "you can endure the hardship";
+		mes "that entails this job. Never";
+		mes "neglect your training.";
+		close;
 	case 2:
 		mes "[Phoenix]";
 		mes "For your spiritual training,";
@@ -411,14 +410,14 @@ L_change:
 			mes "sometime, "+strcharinfo(0)+".";
 			close;
 		}
-			mes "[Phoenix]";
-			mes "Hm, perhaps you are not";
-			mes "quite ready to progress from";
-			mes "your status as a student to";
-			mes "a full fledged disciple.";
-			mes "When you feel prepared,";
-			mes "come and speak to me.";
-			close;
+		mes "[Phoenix]";
+		mes "Hm, perhaps you are not";
+		mes "quite ready to progress from";
+		mes "your status as a student to";
+		mes "a full fledged disciple.";
+		mes "When you feel prepared,";
+		mes "come and speak to me.";
+		close;
 	}
 }