*Fixed bug in 13.1 quest which caused quest log to remain after completion.

*Added warps up to Episode 14.2.

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

1 files changed, 48 insertions, 48 deletions

diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt
index 6d551141f..b71f06605 100644
--- a/npc/quests/quests_13_1.txt
+++ b/npc/quests/quests_13_1.txt
@@ -2286,51 +2286,39 @@ moc_fild22b,230,197,5	script	Munkenro#2	967,{
 			close;
 		}
 	}
-	if ($@ep13_test == 2) {
+	if (ep13_ryu == 20) {
 		mes "[Munkenro]";
-		mes "You're quite shrewd...";
-		mes "How come you passed the test";
-		mes "before? I can't believe this.";
+		mes "I am the head of the Three Kingdoms Alliance. You've come here for the discovery of the dimensional rift. Am I right?";
 		next;
 		mes "[Munkenro]";
-		mes "I will give you one more chance.";
-		mes "Don't make any mistakes again.";
+		mes "Um. You're the one that";
+		mes "did some favors before...";
+		mes "Your name is " + strcharinfo(0) + "?";
+		mes "I remember you.";
 		next;
-		set ep13_ryu,21;
-		set $@ep13_test,0;
 		mes "[Munkenro]";
-		mes "Once you get ready,";
-		mes "just let me know,";
-		mes "to start!";
-		close;
-	}
-	if ($@ep13_test == 1) {
+		mes "Sikaiz retired from his position urgently. I am his replacement.";
+		next;
 		mes "[Munkenro]";
-		mes "We are testing the other adventurers, so unless you have any business with me, visit me later.";
-		close;
-	}
-	if (($@ep13_test == 0) && (ep13_ryu == 22)) {
+		mes "You don't need to know in detail all about it now. That's not important to you. Is it?";
+		next;
 		mes "[Munkenro]";
-		mes "Good! You did a good job!";
-		mes "Though we didn't get enough time to test, I think it's almost perfect.";
+		mes "You are here for the discovery of the dimensional rift. I can't send you there right away. I know that you've passed your tests, but that's the past. You have not been tested by me. ~";
 		next;
 		mes "[Munkenro]";
-		mes "You can feel I am too strict... I'm just doing what I need to do as head of the Alliance.";
+		mes "So you need to be tested again. I don't have too much time to test you now. So let's just do a short test.";
 		next;
 		mes "[Munkenro]";
-		mes "If I can't manage the alliance well, I will feel guilty, that I am not doing Sikaiz's job any justice. Anyway, I will do my best.";
+		mes "Now the soldiers here will start to attack you... If you survive, I will approve of you. Just do it in good time.";
 		next;
 		mes "[Munkenro]";
-		mes "Huh? I'm just whining.";
-		mes "You don't need to hear this.";
-		mes "Just forget it.";
+		mes "This can prove that you're strong enough. That's the minimum test I can perform.";
 		next;
-		completequest 10078;
-		set ep13_ryu,100;
-		getexp 66000,21000;
+		changequest 10076,10077;
+		set ep13_ryu,21;
 		mes "[Munkenro]";
-		mes "I will let you go there.";
-		mes "Let me know once you are ready.";
+		mes "Once you get ready,";
+		mes "just let me know.";
 		close;
 	}
 	if (ep13_ryu == 21) {
@@ -2358,39 +2346,51 @@ moc_fild22b,230,197,5	script	Munkenro#2	967,{
 			close;
 		}
 	}
-	if (ep13_ryu == 20) {
+	if ($@ep13_test == 2) {
 		mes "[Munkenro]";
-		mes "I am the head of the Three Kingdoms Alliance. You've come here for the discovery of the dimensional rift. Am I right?";
+		mes "You're quite shrewd...";
+		mes "How come you passed the test";
+		mes "before? I can't believe this.";
 		next;
 		mes "[Munkenro]";
-		mes "Um. You're the one that";
-		mes "did some favors before...";
-		mes "Your name is " + strcharinfo(0) + "?";
-		mes "I remember you.";
+		mes "I will give you one more chance.";
+		mes "Don't make any mistakes again.";
 		next;
+		set ep13_ryu,21;
+		set $@ep13_test,0;
 		mes "[Munkenro]";
-		mes "Sikaiz retired from his position urgently. I am his replacement.";
-		next;
+		mes "Once you get ready,";
+		mes "just let me know,";
+		mes "to start!";
+		close;
+	}
+	if ($@ep13_test == 1) {
 		mes "[Munkenro]";
-		mes "You don't need to know in detail all about it now. That's not important to you. Is it?";
-		next;
+		mes "We are testing the other adventurers, so unless you have any business with me, visit me later.";
+		close;
+	}
+	if (($@ep13_test == 0) && (ep13_ryu == 22)) {
 		mes "[Munkenro]";
-		mes "You are here for the discovery of the dimensional rift. I can't send you there right away. I know that you've passed your tests, but that's the past. You have not been tested by me. ~";
+		mes "Good! You did a good job!";
+		mes "Though we didn't get enough time to test, I think it's almost perfect.";
 		next;
 		mes "[Munkenro]";
-		mes "So you need to be tested again. I don't have too much time to test you now. So let's just do a short test.";
+		mes "You can feel I am too strict... I'm just doing what I need to do as head of the Alliance.";
 		next;
 		mes "[Munkenro]";
-		mes "Now the soldiers here will start to attack you... If you survive, I will approve of you. Just do it in good time.";
+		mes "If I can't manage the alliance well, I will feel guilty, that I am not doing Sikaiz's job any justice. Anyway, I will do my best.";
 		next;
 		mes "[Munkenro]";
-		mes "This can prove that you're strong enough. That's the minimum test I can perform.";
+		mes "Huh? I'm just whining.";
+		mes "You don't need to hear this.";
+		mes "Just forget it.";
 		next;
-		changequest 10076,10077;
-		set ep13_ryu,21;
+		completequest 10078;
+		set ep13_ryu,100;
+		getexp 66000,21000;
 		mes "[Munkenro]";
-		mes "Once you get ready,";
-		mes "just let me know.";
+		mes "I will let you go there.";
+		mes "Let me know once you are ready.";
 		close;
 	}
 }