* Raw revert of all job files back to r16578, prior to the rewrite in r16579. The updates will be re-applied after more testing is done.

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

6 files changed, 13 insertions, 13 deletions

diff --git a/npc/jobs/2-1a/AssassinCross.txt b/npc/jobs/2-1a/AssassinCross.txt
index 0ed46590c..0776825fb 100644
--- a/npc/jobs/2-1a/AssassinCross.txt
+++ b/npc/jobs/2-1a/AssassinCross.txt
@@ -43,7 +43,7 @@ valkyrie,44,58,5	script	Assassin Cross#Valkyrie	725,{
 		mes "Nobody...";
 		close;
 	}
-	if ((ADVJOB == Job_Assassin_Cross) && (Class == Job_Thief_High) && (JobLevel > 39)) {
+	else if (ADVJOB == Job_Assassin_Cross && Class == Job_Thief_High && JobLevel > 39) {
 		mes "[Assassin Cross]";
 		mes "The time has come.";
 		mes "The world needs you...";
@@ -97,4 +97,4 @@ valkyrie,44,58,5	script	Assassin Cross#Valkyrie	725,{
 	mes "while you are here.";
 	mes "Honor to the warriors.";
 	close;
-}
\ No newline at end of file
+}
diff --git a/npc/jobs/2-1a/HighPriest.txt b/npc/jobs/2-1a/HighPriest.txt
index 2235ad60e..ae96a122e 100644
--- a/npc/jobs/2-1a/HighPriest.txt
+++ b/npc/jobs/2-1a/HighPriest.txt
@@ -32,7 +32,7 @@ valkyrie,44,42,5	script	High Priest#Valkyrie	60,{
 		mes "us from the forces of evil...";
 		close;
 	}
-	if ((ADVJOB == Job_High_Priest) && (Class == Job_Acolyte_High) && (JobLevel > 39)) {
+	else if (ADVJOB == Job_High_Priest && Class == Job_Acolyte_High && JobLevel > 39) {
 		mes "[High Priest]";
 		mes "Our world is in";
 		mes "need of people of";
@@ -79,4 +79,4 @@ valkyrie,44,42,5	script	High Priest#Valkyrie	60,{
 	mes "while you are here.";
 	mes "Honor to the warriors!";
 	close;
-}
\ No newline at end of file
+}
diff --git a/npc/jobs/2-1a/HighWizard.txt b/npc/jobs/2-1a/HighWizard.txt
index 320b1db0d..58f1bfce8 100644
--- a/npc/jobs/2-1a/HighWizard.txt
+++ b/npc/jobs/2-1a/HighWizard.txt
@@ -38,7 +38,7 @@ valkyrie,44,47,5	script	High Wizard#Valkyrie	735,{
 		mes "was placed in the wrong hands?!";
 		close;
 	}
-	if ((ADVJOB == Job_High_Wizard) && (Class == Job_Mage_High) && (JobLevel > 39)) {
+	else if (ADVJOB == Job_High_Wizard && Class == Job_Mage_High && JobLevel > 39) {
 		mes "[High Wizard]";
 		mes "It is time.";
 		mes "And Rune-Midgard has";
@@ -62,7 +62,7 @@ valkyrie,44,47,5	script	High Wizard#Valkyrie	735,{
 			mes "all of your remaining Skill Points before returning to me.";
 			close;
 		}
-		jobchange Job_High_Wizard;
+		jobchange Job_high_Wizard;
 		set ADVJOB,0;
 		mes "[High Wizard]";
 		mes "Congratulations.";
@@ -83,4 +83,4 @@ valkyrie,44,47,5	script	High Wizard#Valkyrie	735,{
 	mes "while you are here.";
 	mes "Honor to the warriors!";
 	close;
-}
\ No newline at end of file
+}
diff --git a/npc/jobs/2-1a/LordKnight.txt b/npc/jobs/2-1a/LordKnight.txt
index 73ed005e2..ba998483e 100644
--- a/npc/jobs/2-1a/LordKnight.txt
+++ b/npc/jobs/2-1a/LordKnight.txt
@@ -36,7 +36,7 @@ valkyrie,44,39,5	script	Lord Knight#Valkyrie	56,{
 		mes "well being of our comrades.";
 		close;
 	}
-	if ((ADVJOB == Job_Lord_Knight) && (Class == Job_Swordman_High) && (JobLevel > 39)) {
+	else if (ADVJOB == Job_Lord_Knight && Class == Job_Swordman_High && JobLevel > 39) {
 		mes "[Lord Knight]";
 		mes "Your time has come!";
 		mes "The world still needs you.";
@@ -81,4 +81,4 @@ valkyrie,44,39,5	script	Lord Knight#Valkyrie	56,{
 	mes "while you are here.";
 	mes "Honor to the warriors!";
 	close;
-}
\ No newline at end of file
+}
diff --git a/npc/jobs/2-1a/Sniper.txt b/npc/jobs/2-1a/Sniper.txt
index 963df71f9..cf5f4881e 100644
--- a/npc/jobs/2-1a/Sniper.txt
+++ b/npc/jobs/2-1a/Sniper.txt
@@ -33,7 +33,7 @@ valkyrie,44,55,5	script	Sniper#Valkyrie	727,{
 		mes "of battling.";
 		close;
 	}
-	if ((ADVJOB == Job_Sniper) && (Class == Job_Archer_High) && (JobLevel > 39)) {
+	else if (ADVJOB == Job_Sniper && Class == Job_Archer_High && JobLevel > 39) {
 		mes "[Sniper]";
 		mes "The world is in";
 		mes "need of mighty Bowmen";
@@ -80,4 +80,4 @@ valkyrie,44,55,5	script	Sniper#Valkyrie	727,{
 	mes "while you are here.";
 	mes "Honor to the warriors!";
 	close;
-}
\ No newline at end of file
+}
diff --git a/npc/jobs/2-1a/WhiteSmith.txt b/npc/jobs/2-1a/WhiteSmith.txt
index 3100a043d..42ac6164b 100644
--- a/npc/jobs/2-1a/WhiteSmith.txt
+++ b/npc/jobs/2-1a/WhiteSmith.txt
@@ -40,7 +40,7 @@ valkyrie,44,50,5	script	MasterSmith#Valkyrie	731,{
 		mes "crafting...";
 		close;
 	}
-	if ((ADVJOB == Job_WhiteSmith) && (Class == Job_Merchant_High) && (JobLevel > 39)) {
+	else if (ADVJOB == Job_WhiteSmith && Class == Job_Merchant_High && JobLevel > 39) {
 		mes "[MasterSmith]";
 		mes "The time has come!";
 		mes "Our world needs brave,";
@@ -85,4 +85,4 @@ valkyrie,44,50,5	script	MasterSmith#Valkyrie	731,{
 	mes "while you are here.";
 	mes "Honor to the warriors!";
 	close;
-}
\ No newline at end of file
+}