- Some little adjustments to the job change quests, also reverted some variables to the old job change files.

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

1 files changed, 110 insertions, 109 deletions

diff --git a/npc/jobs/valkyrie.txt b/npc/jobs/valkyrie.txt
index 178acd4bc..0569d9c80 100644
--- a/npc/jobs/valkyrie.txt
+++ b/npc/jobs/valkyrie.txt
@@ -40,7 +40,7 @@
 //============================================================ 
 
 valkyrie,48,86,4	script	Valkyrie#	811,{
-	if (FJOB != 0 || Upper == 1) {
+	if (ADVJOB != 0 || Upper == 1) {
 		mes "[Valkyrie]";
 		mes "Welcome";
 		mes "to Valhalla,";
@@ -53,7 +53,7 @@ valkyrie,48,86,4	script	Valkyrie#	811,{
 		mes "Honor to the warriors!";
 		close;
 	}
-	if ((Baselevel > 98) && (JobLevel > 49) && ((Class >= Job_Knight) && (Class <= Job_Crusader2))) {
+	if ((Baselevel > 98) && (JobLevel > 49) && (Class >= Job_Knight) && (Class <= Job_Crusader2)) {
 		mes "[Valkyrie]";
 		mes "Welcome";
 		mes "to Valhalla,";
@@ -84,113 +84,114 @@ valkyrie,48,86,4	script	Valkyrie#	811,{
 			warp "yuno_in02",93,205;
 			end;
 		}
-		else {
-			mes "[Valkyrie]";
-			mes "I see you've already";
-			mes "released yourself from";
-			mes "all worldy attachments,";
-			mes ""+ strcharinfo(0) +".";
-			next;
-			mes "[Valkyrie]";
-			mes "That's an admirable attitude for an adventurer such as yourself. Honor comes when you abandon all personal desires for the sake of mankind.";
-			next;
-			if (SkillPoint) {
-				mes "[Valkyrie]";
-				mes "Hmm... I sense that you have";
-				mes "some lingering attachment or";
-				mes "unfinished business in your";
-				mes "current life. Take care of that,";
-				mes "and bring closure to your present life.";
-				close2;
-				warp "yuno_in02",93,205;
-				end;
-			}
-			mes "[Valkyrie]";
-			mes "Now, let me remove all";
-			mes "of your present memories...";
-			mes "However, you will be able to";
-			mes "remember the most honorable";
-			mes "moments of this life.";
-			next;
-			mes "[Valkyrie]";
-			mes "With one,";
-			mes "I will ask the";
-			mes "goddess Urd to remove";
-			mes "all of your present";
-			mes "memories.";
-			next;
-			mes "[Valkyrie]";
-			mes "With two,";
-			mes "I will ask the";
-			mes "goddess Verdandi to keep";
-			mes "and record the most honorable moments of your present life.";
-			next;
-			mes "[Valkyrie]";
-			mes "With three,";
-			mes "I will ask the";
-			mes "goddess Skuld to";
-			mes "guide you to your";
-			mes "next life.";
-			next;
-			mes "[Valkyrie]";
-			mes "One...";
-			callfunc "F_ClearJobVar";
-			next;
-			mes "[Valkyrie]";
-			mes "One...";
-			mes "Two......";
-			next;
-			mes "[Valkyrie]";
-			mes "One...";
-			mes "Two......";
-			mes "And Three.";
-			jobchange Job_Novice_High;
-			resetlvl(1);
-			set MISC_QUEST,MISC_QUEST | 1024; //<-reset Skill Reset Event
-			skill 142,1,0;
-			skill 143,1,0;
-			completequest 1000;
-			next;
-			mes "[Valkyrie]";
-			mes "Congratulations.";
-			mes "You are now reborn";
-			mes "into a brand new life.";
-			mes "Please take these small gifts";
-			mes "in preparation for your new adventures.";
-			getitem 1202,1; //Knife_
-			getitem 2302,1; //Cotton_Shirt_
-			next;
-			mes "[Valkyrie]";
-			mes "I wish that the release the goddess Urd has granted you proves to be a blessing. I hope that the memories Verdandi has recorded will always honor you.";
-			next;
+		mes "[Valkyrie]";
+		mes "I see you've already";
+		mes "released yourself from";
+		mes "all worldy attachments,";
+		mes ""+ strcharinfo(0) +".";
+		next;
+		mes "[Valkyrie]";
+		mes "That's an admirable attitude for an adventurer such as yourself. Honor comes when you abandon all personal desires for the sake of mankind.";
+		next;
+		if (SkillPoint) {
 			mes "[Valkyrie]";
-			mes "And I pray that the new life to which the goddess Skuld will guide you will be even more honorable than your last.";
+			mes "Hmm... I sense that you have";
+			mes "some lingering attachment or";
+			mes "unfinished business in your";
+			mes "current life. Take care of that,";
+			mes "and bring closure to your present life.";
 			close2;
-			switch (FJOB) {
-			case 4054:
-			case 4066:
-				warp "izlude",94,103; break;
-			case 4057:
-			case 4070:
-				warp "prontera",273,354; break;
-			case 4055:
-			case 4067:
-				warp "geffen",120,60; break;
-			case 4058:
-			case 4071:
-				warp "alberta",116,57; break;
-			case 4056:
-			case 4068:
-			case 4069:
-				warp "payon",69,100; break;
-			case 4059:
-			case 4072:
-				warp "morocc",154,50; break;
-			default:
-				warp "yuno_in02",93,205; break;
-			}
+			warp "yuno_in02",93,205;
 			end;
 		}
+		mes "[Valkyrie]";
+		mes "Now, let me remove all";
+		mes "of your present memories...";
+		mes "However, you will be able to";
+		mes "remember the most honorable";
+		mes "moments of this life.";
+		next;
+		mes "[Valkyrie]";
+		mes "With one,";
+		mes "I will ask the";
+		mes "goddess Urd to remove";
+		mes "all of your present";
+		mes "memories.";
+		next;
+		mes "[Valkyrie]";
+		mes "With two,";
+		mes "I will ask the";
+		mes "goddess Verdandi to keep";
+		mes "and record the most honorable moments of your present life.";
+		next;
+		mes "[Valkyrie]";
+		mes "With three,";
+		mes "I will ask the";
+		mes "goddess Skuld to";
+		mes "guide you to your";
+		mes "next life.";
+		next;
+		mes "[Valkyrie]";
+		mes "One...";
+		callfunc "F_ClearJobVar";
+		next;
+		mes "[Valkyrie]";
+		mes "One...";
+		mes "Two......";
+		next;
+		mes "[Valkyrie]";
+		mes "One...";
+		mes "Two......";
+		mes "And Three.";
+		set ADVJOB, Class+Job_Novice_High; //memo the target 3rd Job ID
+		if(ADVJOB == Job_Lord_Knight2) set ADVJOB,Job_Lord_Knight;
+		if(ADVJOB == Job_Paladin2) set ADVJOB,Job_Paladin;
+		jobchange Job_Novice_High;
+		resetlvl(1);
+		set MISC_QUEST,MISC_QUEST | 1024; //<-reset Skill Reset Event
+		skill 142,1,0;
+		skill 143,1,0;
+		completequest 1000;
+		next;
+		mes "[Valkyrie]";
+		mes "Congratulations.";
+		mes "You are now reborn";
+		mes "into a brand new life.";
+		mes "Please take these small gifts";
+		mes "in preparation for your new adventures.";
+		getitem 1202,1; //Knife_
+		getitem 2302,1; //Cotton_Shirt_
+		next;
+		mes "[Valkyrie]";
+		mes "I wish that the release the goddess Urd has granted you proves to be a blessing. I hope that the memories Verdandi has recorded will always honor you.";
+		next;
+		mes "[Valkyrie]";
+		mes "And I pray that the new life to which the goddess Skuld will guide you will be even more honorable than your last.";
+		close2;
+		switch (ADVJOB) {
+		case 4008:
+		case 4015:
+			warp "izlude",94,103; break;
+		case 4009:
+		case 4016:
+			warp "prontera",273,354; break;
+		case 4010:
+		case 4017:
+			warp "geffen",120,60; break;
+		case 4011:
+		case 4019:
+			warp "alberta",116,57; break;
+		case 4012:
+		case 4020:
+		case 4021:
+			warp "payon",69,100; break;
+		case 4013:
+		case 4018:
+			warp "morocc",154,50; break;
+		default:
+			warp "yuno_in02",93,205; break;
+		}
+		end;
 	}
 	mes "[Valkyrie]";
 	mes "Welcome";
@@ -205,7 +206,7 @@ valkyrie,48,86,4	script	Valkyrie#	811,{
 }
 
 yuno_in02,88,164,5	script	Metheus Sylphe#Library	742,{
-	if ((Baselevel > 98) && (JobLevel > 49) && ((Class >= Job_Knight) && (Class <= Job_Crusader2))) {
+	if ((Baselevel > 98) && (JobLevel > 49) && (Class >= Job_Knight) && (Class <= Job_Crusader2)) {
 		if (valkyrie_Q == 0) {
 			mes "[Metheus Sylphe]";
 			mes "Welcome to the Library of the Schweicherbil Magic Academy.";
@@ -252,7 +253,7 @@ yuno_in02,88,164,5	script	Metheus Sylphe#Library	742,{
 }
 
 yuno_in02,93,207,1	script	Book of Ymir	111,{
-	if (FJOB != 0 || Upper == 1) {
+	if (ADVJOB != 0 || Upper == 1) {
 		mes "[The Book of Ymir]";
 		mes "...The entrance to the Hall of Honor is open to anyone who has moved forward into their next life. It is there to help heroes decide what they want to do, and can lead them to anywhere in this world.";
 		next;
@@ -270,7 +271,7 @@ yuno_in02,93,207,1	script	Book of Ymir	111,{
 		warp "valkyrie",48,8;
 		end;
 	}
-	if ((Baselevel > 98) && (JobLevel > 49) && ((Class >= Job_Knight) && (Class <= Job_Crusader2))) {
+	if ((Baselevel > 98) && (JobLevel > 49) && (Class >= Job_Knight) && (Class <= Job_Crusader2)) {
 		if (valkyrie_Q != 0) {
 			mes "[The Book of Ymir]";
 			mes "...Therefore, ancient heroes were";
@@ -338,7 +339,7 @@ yuno_in02,93,207,1	script	Book of Ymir	111,{
 }
 
 yuno_in05,49,43,1	script	Heart of Ymir	111,{
-	if ((Baselevel > 98) && (JobLevel > 49) && ((Class >= Job_Knight) && (Class <= Job_Crusader2))) {
+	if ((Baselevel > 98) && (JobLevel > 49) && (Class >= Job_Knight) && (Class <= Job_Crusader2)) {
 		if (valkyrie_Q == 2) warp "valkyrie",48,8;
 	}
 	end;