- Here comes the big Job folder Update.

* Updated all 1-1, 2-1, 2-2 and the expanded files to the latest available official files and also added support for baby job change.
* There might be some optimizations still needed at some places and there maybe occur some errors as well or the job change isn't fully working anymore since I didn't test all the jobs through the end (Me = Lazy), if so then please fill out a bug report in our bug tracker: http://rathena.org/board/tracker/project-4-scripts/
* Ninja, Gunslinger and the other files will follow within the next days.

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

1 files changed, 46 insertions, 53 deletions

diff --git a/npc/jobs/valkyrie.txt b/npc/jobs/valkyrie.txt
index bf6aa5cb3..178acd4bc 100644
--- a/npc/jobs/valkyrie.txt
+++ b/npc/jobs/valkyrie.txt
@@ -40,7 +40,7 @@
 //============================================================ 
 
 valkyrie,48,86,4	script	Valkyrie#	811,{
-	if (ADVJOB != 0 || Upper == 1) {
+	if (FJOB != 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;
 	}
-	else 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,";
@@ -144,9 +144,6 @@ valkyrie,48,86,4	script	Valkyrie#	811,{
 			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
@@ -169,25 +166,25 @@ valkyrie,48,86,4	script	Valkyrie#	811,{
 			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:
+			switch (FJOB) {
+			case 4054:
+			case 4066:
 				warp "izlude",94,103; break;
-			case 4009:
-			case 4016:
+			case 4057:
+			case 4070:
 				warp "prontera",273,354; break;
-			case 4010:
-			case 4017:
+			case 4055:
+			case 4067:
 				warp "geffen",120,60; break;
-			case 4011:
-			case 4019:
+			case 4058:
+			case 4071:
 				warp "alberta",116,57; break;
-			case 4012:
-			case 4020:
-			case 4021:
+			case 4056:
+			case 4068:
+			case 4069:
 				warp "payon",69,100; break;
-			case 4013:
-			case 4018:
+			case 4059:
+			case 4072:
 				warp "morocc",154,50; break;
 			default:
 				warp "yuno_in02",93,205; break;
@@ -195,22 +192,20 @@ valkyrie,48,86,4	script	Valkyrie#	811,{
 			end;
 		}
 	}
-	else {
-		mes "[Valkyrie]";
-		mes "Welcome";
-		mes "to Valhalla,";
-		mes "the Hall of Honor.";
-		next;
-		mes "[Valkyrie]";
-		mes "Unfortunately, you have not yet been invited here. I ask you to leave immediately. Honor to the warriors!";
-		close2;
-		warp "yuno_in02",93,205;
-		end;
-	}
+	mes "[Valkyrie]";
+	mes "Welcome";
+	mes "to Valhalla,";
+	mes "the Hall of Honor.";
+	next;
+	mes "[Valkyrie]";
+	mes "Unfortunately, you have not yet been invited here. I ask you to leave immediately. Honor to the warriors!";
+	close2;
+	warp "yuno_in02",93,205;
+	end;
 }
 
 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.";
@@ -257,7 +252,7 @@ yuno_in02,88,164,5	script	Metheus Sylphe#Library	742,{
 }
 
 yuno_in02,93,207,1	script	Book of Ymir	111,{
-	if (ADVJOB != 0 || Upper == 1) {
+	if (FJOB != 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;
@@ -275,7 +270,7 @@ yuno_in02,93,207,1	script	Book of Ymir	111,{
 		warp "valkyrie",48,8;
 		end;
 	}
-	else 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";
@@ -343,7 +338,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;
@@ -365,23 +360,22 @@ valkyrie,44,33,5	script	Teleporter	124,{
 		mes "..........";
 		close;
 	}
-	else {
-		mes "[Teleporter]";
-		mes "Honorable one,";
-		mes "which place do you wish to go?";
-		next;
-		switch(select("Prontera:Morroc:Payon:Geffen:Alberta:Izlude:Al De Baran:Comodo:Juno")) {
-		case 1: callsub S_Warpchar,"prontera",116,72;
-		case 2: callsub S_Warpchar,"morocc",156,46;
-		case 3: callsub S_Warpchar,"payon",69,100;
-		case 4: callsub S_Warpchar,"geffen",120,39;
-		case 5: callsub S_Warpchar,"alberta",117,56;
-		case 6: callsub S_Warpchar,"izlude",94,103;
-		case 7: callsub S_Warpchar,"aldebaran",91,105;
-		case 8: callsub S_Warpchar,"comodo",209,143;
-		case 9: callsub S_Warpchar,"yuno",328,101;
-		}
+	mes "[Teleporter]";
+	mes "Honorable one,";
+	mes "which place do you wish to go?";
+	next;
+	switch(select("Prontera:Morroc:Payon:Geffen:Alberta:Izlude:Al De Baran:Comodo:Juno")) {
+	case 1: callsub S_Warpchar,"prontera",116,72;
+	case 2: callsub S_Warpchar,"morocc",156,46;
+	case 3: callsub S_Warpchar,"payon",69,100;
+	case 4: callsub S_Warpchar,"geffen",120,39;
+	case 5: callsub S_Warpchar,"alberta",117,56;
+	case 6: callsub S_Warpchar,"izlude",94,103;
+	case 7: callsub S_Warpchar,"aldebaran",91,105;
+	case 8: callsub S_Warpchar,"comodo",209,143;
+	case 9: callsub S_Warpchar,"yuno",328,101;
 	}
+
 S_WarpChar:
 	mes "[Teleporter]";
 	mes "Have a nice trip.";
@@ -394,5 +388,4 @@ S_WarpChar:
 // Warps
 //============================================================ 
 valkyrie,48,73,0	warp	valk01#1	1,1,valkyrie,48,64
-valkyrie,48,66,0	warp	valk01#2	1,1,valkyrie,48,75
-
+valkyrie,48,66,0	warp	valk01#2	1,1,valkyrie,48,75
\ No newline at end of file