- 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

39 files changed, 225 insertions, 249 deletions

diff --git a/npc/jobs/2-1/assassin.txt b/npc/jobs/2-1/assassin.txt
index 740c53ab4..a20493a47 100644
--- a/npc/jobs/2-1/assassin.txt
+++ b/npc/jobs/2-1/assassin.txt
@@ -110,7 +110,6 @@ in_moc_16,19,33,1	script	Guildsman	55,{
 		} else {
 			jobchange Job_Assassin;
 		}
-		set FJOB,Job_Guillotine_Cross;
 		changequest 8007,8008;
 		completequest 8008;
 		mes "[Assassin Expert 'Huey']";
diff --git a/npc/jobs/2-1/blacksmith.txt b/npc/jobs/2-1/blacksmith.txt
index bfcf40601..f96a41a25 100644
--- a/npc/jobs/2-1/blacksmith.txt
+++ b/npc/jobs/2-1/blacksmith.txt
@@ -219,7 +219,6 @@ ein_in01,18,28,4	script	Guildsman#BLS	731,{
 			} else {
 				jobchange Job_Blacksmith;
 			}
-			set FJOB,Job_Mechanic;
 			mes "[Altiregen]";
 			mes "Always remember that we are creators, and artists over metals. Be wary that you do not fall into the pitfalls of selfishness";
 			mes "and greed.";
diff --git a/npc/jobs/2-1/hunter.txt b/npc/jobs/2-1/hunter.txt
index 721756b4e..e0552351b 100644
--- a/npc/jobs/2-1/hunter.txt
+++ b/npc/jobs/2-1/hunter.txt
@@ -158,7 +158,6 @@ hu_in01,386,373,4	script	Hunter Guildsman#hnt	727,{
 				} else {
 					jobchange Job_Hunter;
 				}
-				set FJOB,Job_Ranger;
 				completequest 4013;
 				next;
 				mes "[Hunter Sherin]";
diff --git a/npc/jobs/2-1/knight.txt b/npc/jobs/2-1/knight.txt
index 9beb42334..2bb88ec18 100644
--- a/npc/jobs/2-1/knight.txt
+++ b/npc/jobs/2-1/knight.txt
@@ -624,7 +624,6 @@ prt_in,88,101,4	script	Chivalry Captain	56,{
 		} else {
 			jobchange Job_Knight;
 		}
-		set FJOB,Job_Rune_Knight;
 		mes "[Captain Herman]";
 		mes "I hereby declare";
 		mes "you a member of";
diff --git a/npc/jobs/2-1/priest.txt b/npc/jobs/2-1/priest.txt
index d86ed1f9b..b1af76b1a 100644
--- a/npc/jobs/2-1/priest.txt
+++ b/npc/jobs/2-1/priest.txt
@@ -512,7 +512,6 @@ prt_church,16,41,4	script	High Bishop#prst	60,{
 		} else {
 			jobchange Job_Priest;
 		}
-		set FJOB,Job_Arch_Bishop;
 		changequest 8015,8016;
 		mes "[Bishop Paul]";
 		mes "Now you are born again as a Priest. I congratulate you, and hope you will greatly help other people for the rest of your life.";
diff --git a/npc/jobs/2-1/wizard.txt b/npc/jobs/2-1/wizard.txt
index b8c74d40d..b5fef11e8 100644
--- a/npc/jobs/2-1/wizard.txt
+++ b/npc/jobs/2-1/wizard.txt
@@ -420,7 +420,6 @@ gef_tower,111,37,4	script	Wizard Guildsman	70,{
 		} else {
 			jobchange Job_Wizard;
 		}
-		set FJOB,Job_Warlock;
 		completequest 9018;
 		mes "[Catherine]";
 		mes "Since you're a Wizard now, act like a Wizard, got it?";
diff --git a/npc/jobs/2-1a/AssassinCross.txt b/npc/jobs/2-1a/AssassinCross.txt
index ae3f68db5..0ed46590c 100644
--- a/npc/jobs/2-1a/AssassinCross.txt
+++ b/npc/jobs/2-1a/AssassinCross.txt
@@ -16,7 +16,7 @@
 //============================================================ 
 
 valkyrie,44,58,5	script	Assassin Cross#Valkyrie	725,{
-	if (FJOB == 0 || Upper != 1) {
+	if (ADVJOB == 0 || Upper != 1) {
 		set .@karma_d,rand(1,10);
 		if (.@karma_d > 4) {
 			mes "[Assassin Cross]";
@@ -43,7 +43,7 @@ valkyrie,44,58,5	script	Assassin Cross#Valkyrie	725,{
 		mes "Nobody...";
 		close;
 	}
-	if ((FJOB == Job_Guillotine_Cross) && (Class == Job_Thief_High) && (JobLevel > 39)) {
+	if ((ADVJOB == Job_Assassin_Cross) && (Class == Job_Thief_High) && (JobLevel > 39)) {
 		mes "[Assassin Cross]";
 		mes "The time has come.";
 		mes "The world needs you...";
@@ -79,7 +79,7 @@ valkyrie,44,58,5	script	Assassin Cross#Valkyrie	725,{
 			close;
 		}
 		jobchange Job_Assassin_Cross;
-		set FJOB,0;
+		set ADVJOB,0;
 		mes "[Assassin Cross]";
 		mes "Congratulations.";
 		mes "As an Assassin Cross,";
diff --git a/npc/jobs/2-1a/HighPriest.txt b/npc/jobs/2-1a/HighPriest.txt
index f1d38802d..2235ad60e 100644
--- a/npc/jobs/2-1a/HighPriest.txt
+++ b/npc/jobs/2-1a/HighPriest.txt
@@ -16,7 +16,7 @@
 //============================================================ 
 
 valkyrie,44,42,5	script	High Priest#Valkyrie	60,{
-	if (FJOB == 0 || Upper != 1) {
+	if (ADVJOB == 0 || Upper != 1) {
 		set .@karma_d,rand(1,10);
 		if (.@karma_d > 4) {
 			mes "[High Priest]";
@@ -32,7 +32,7 @@ valkyrie,44,42,5	script	High Priest#Valkyrie	60,{
 		mes "us from the forces of evil...";
 		close;
 	}
-	if ((FJOB == Job_Arch_Bishop) && (Class == Job_Acolyte_High) && (JobLevel > 39)) {
+	if ((ADVJOB == Job_High_Priest) && (Class == Job_Acolyte_High) && (JobLevel > 39)) {
 		mes "[High Priest]";
 		mes "Our world is in";
 		mes "need of people of";
@@ -59,7 +59,7 @@ valkyrie,44,42,5	script	High Priest#Valkyrie	60,{
 			close;
 		}
 		jobchange Job_High_Priest;
-		set FJOB,0;
+		set ADVJOB,0;
 		mes "[High Priest]";
 		mes "Congratulations.";
 		mes "As a High Priest,";
diff --git a/npc/jobs/2-1a/HighWizard.txt b/npc/jobs/2-1a/HighWizard.txt
index 3ba1a57d9..320b1db0d 100644
--- a/npc/jobs/2-1a/HighWizard.txt
+++ b/npc/jobs/2-1a/HighWizard.txt
@@ -16,7 +16,7 @@
 //============================================================ 
 
 valkyrie,44,47,5	script	High Wizard#Valkyrie	735,{
-	if (FJOB == 0 ||  Upper != 1) {
+	if (ADVJOB == 0 ||  Upper != 1) {
 		set .@karma_d,rand(1,10);
 		if (.@karma_d > 4) {
 			mes "[High Wizard]";
@@ -38,7 +38,7 @@ valkyrie,44,47,5	script	High Wizard#Valkyrie	735,{
 		mes "was placed in the wrong hands?!";
 		close;
 	}
-	if ((FJOB == Job_Warlock) && (Class == Job_Mage_High) && (JobLevel > 39)) {
+	if ((ADVJOB == Job_High_Wizard) && (Class == Job_Mage_High) && (JobLevel > 39)) {
 		mes "[High Wizard]";
 		mes "It is time.";
 		mes "And Rune-Midgard has";
@@ -63,7 +63,7 @@ valkyrie,44,47,5	script	High Wizard#Valkyrie	735,{
 			close;
 		}
 		jobchange Job_High_Wizard;
-		set FJOB,0;
+		set ADVJOB,0;
 		mes "[High Wizard]";
 		mes "Congratulations.";
 		mes "As a High Wizard,";
diff --git a/npc/jobs/2-1a/LordKnight.txt b/npc/jobs/2-1a/LordKnight.txt
index 7ed54ba3e..73ed005e2 100644
--- a/npc/jobs/2-1a/LordKnight.txt
+++ b/npc/jobs/2-1a/LordKnight.txt
@@ -16,7 +16,7 @@
 //============================================================ 
 
 valkyrie,44,39,5	script	Lord Knight#Valkyrie	56,{
-	if (FJOB == 0 || Upper != 1) {
+	if (ADVJOB == 0 || Upper != 1) {
 		set .@karma_d,rand(1,10);
 		if (.@karma_d > 4) {
 			mes "[Lord Knight]";
@@ -36,7 +36,7 @@ valkyrie,44,39,5	script	Lord Knight#Valkyrie	56,{
 		mes "well being of our comrades.";
 		close;
 	}
-	if ((FJOB == Job_Rune_Knight) && (Class == Job_Swordman_High) && (JobLevel > 39)) {
+	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.";
@@ -61,7 +61,7 @@ valkyrie,44,39,5	script	Lord Knight#Valkyrie	56,{
 			close;
 		}
 		jobchange Job_Lord_Knight;
-		set FJOB,0;
+		set ADVJOB,0;
 		mes "[Lord Knight]";
 		mes "Congratulations!";
 		mes "As a Lord Knight,";
diff --git a/npc/jobs/2-1a/Sniper.txt b/npc/jobs/2-1a/Sniper.txt
index f5898ad87..963df71f9 100644
--- a/npc/jobs/2-1a/Sniper.txt
+++ b/npc/jobs/2-1a/Sniper.txt
@@ -16,7 +16,7 @@
 //============================================================ 
 
 valkyrie,44,55,5	script	Sniper#Valkyrie	727,{
-	if (FJOB == 0 || Upper != 1) {
+	if (ADVJOB == 0 || Upper != 1) {
 		set .@karma_d,rand(1,10);
 		if (.@karma_d > 4) {
 			mes "[Sniper]";
@@ -33,7 +33,7 @@ valkyrie,44,55,5	script	Sniper#Valkyrie	727,{
 		mes "of battling.";
 		close;
 	}
-	if ((FJOB == Job_Ranger) && (Class == Job_Archer_High) && (JobLevel > 39)) {
+	if ((ADVJOB == Job_Sniper) && (Class == Job_Archer_High) && (JobLevel > 39)) {
 		mes "[Sniper]";
 		mes "The world is in";
 		mes "need of mighty Bowmen";
@@ -59,7 +59,7 @@ valkyrie,44,55,5	script	Sniper#Valkyrie	727,{
 			close;
 		}
 		jobchange Job_Sniper;
-		set FJOB,0;
+		set ADVJOB,0;
 		mes "[Sniper]";
 		mes "Congratulations!";
 		mes "As a Sniper, I hope";
diff --git a/npc/jobs/2-1a/WhiteSmith.txt b/npc/jobs/2-1a/WhiteSmith.txt
index efc2fca35..3100a043d 100644
--- a/npc/jobs/2-1a/WhiteSmith.txt
+++ b/npc/jobs/2-1a/WhiteSmith.txt
@@ -16,7 +16,7 @@
 //============================================================ 
 
 valkyrie,44,50,5	script	MasterSmith#Valkyrie	731,{
-	if (FJOB == 0 || Upper != 1) {
+	if (ADVJOB == 0 || Upper != 1) {
 		set .@karma_d,rand(1,10);
 		if (.@karma_d > 4) {
 			mes "[MasterSmith]";
@@ -40,7 +40,7 @@ valkyrie,44,50,5	script	MasterSmith#Valkyrie	731,{
 		mes "crafting...";
 		close;
 	}
-	if ((FJOB == Job_Mechanic) && (Class == Job_Merchant_High) && (JobLevel > 39)) {
+	if ((ADVJOB == Job_WhiteSmith) && (Class == Job_Merchant_High) && (JobLevel > 39)) {
 		mes "[MasterSmith]";
 		mes "The time has come!";
 		mes "Our world needs brave,";
@@ -65,7 +65,7 @@ valkyrie,44,50,5	script	MasterSmith#Valkyrie	731,{
 			close;
 		}
 		jobchange Job_Whitesmith;
-		set FJOB,0;
+		set ADVJOB,0;
 		mes "[MasterSmith]";
 		mes "Congratulations!";
 		mes "As a MasterSmith,";
diff --git a/npc/jobs/2-2/alchemist.txt b/npc/jobs/2-2/alchemist.txt
index f4af70e25..1503ce948 100644
--- a/npc/jobs/2-2/alchemist.txt
+++ b/npc/jobs/2-2/alchemist.txt
@@ -2214,7 +2214,6 @@ alde_alche,101,184,4	script	Master Alchemist	122,{
 			} else {
 				jobchange Job_Alchemist;
 			}
-			set FJOB,Job_Genetic;
 			mes "[Vincent Carsciallo]";
 			mes "Henceforth, you are";
 			mes "now a member of our";
@@ -2248,7 +2247,6 @@ alde_alche,101,184,4	script	Master Alchemist	122,{
 		} else {
 			jobchange Job_Alchemist;
 		}
-		set FJOB,Job_Genetic;
 		mes "[Vincent Carsciallo]";
 		mes "Henceforth, you are";
 		mes "now a member of our";
diff --git a/npc/jobs/2-2/bard.txt b/npc/jobs/2-2/bard.txt
index 790051cba..4dd34568c 100644
--- a/npc/jobs/2-2/bard.txt
+++ b/npc/jobs/2-2/bard.txt
@@ -853,7 +853,6 @@ comodo,226,123,5	script	Roaming Bard	741,{
 				} else {
 					jobchange Job_Bard;
 				}
-				set FJOB,Job_Minstrel;
 				mes "[Lalo]";
 				mes "Very well! Hope you sing happy enjoyable songs.";
 				mes "Live like the wind and the clouds!";
@@ -1297,7 +1296,6 @@ comodo,226,123,5	script	Roaming Bard	741,{
 			} else {
 				jobchange Job_Bard;
 			}
-			set FJOB,Job_Minstrel;
 			mes "[Lalo]";
 			mes "Very well! Hope you sing happy enjoyable songs.";
 			mes "Live like the wind and the clouds!";
@@ -1341,7 +1339,6 @@ comodo,226,123,5	script	Roaming Bard	741,{
 			} else {
 				jobchange Job_Bard;
 			}
-			set FJOB,Job_Minstrel;
 			mes "[Lalo]";
 			mes "Good job. I will make you a job change souvenir with this.";
 			mes "Wait just a moment.";
@@ -1369,7 +1366,6 @@ comodo,226,123,5	script	Roaming Bard	741,{
 			} else {
 				jobchange Job_Bard;
 			}
-			set FJOB,Job_Minstrel;
 			mes "[Lalo]";
 			mes "Good job. I will make you a job change souvenir with this.";
 			mes "Wait just a moment.";
@@ -1397,7 +1393,6 @@ comodo,226,123,5	script	Roaming Bard	741,{
 			} else {
 				jobchange Job_Bard;
 			}
-			set FJOB,Job_Minstrel;
 			mes "[Lalo]";
 			mes "Good job. I will make you a job change souvenir with this.";
 			mes "Wait just a moment.";
@@ -1425,7 +1420,6 @@ comodo,226,123,5	script	Roaming Bard	741,{
 				} else {
 					jobchange Job_Bard;
 				}
-				set FJOB,Job_Minstrel;
 				mes "[Lalo]";
 				mes "Good job. I will make you a job change souvenir with this.";
 				mes "Wait just a moment.";
@@ -1451,7 +1445,6 @@ comodo,226,123,5	script	Roaming Bard	741,{
 			} else {
 				jobchange Job_Bard;
 			}
-			set FJOB,Job_Minstrel;
 			mes "[Lalo]";
 			mes "Good job. I will make you a job change souvenir with this.";
 			mes "Wait just a moment.";
@@ -1500,7 +1493,6 @@ comodo,226,123,5	script	Roaming Bard	741,{
 			} else {
 				jobchange Job_Bard;
 			}
-			set FJOB,Job_Minstrel;
 			completequest 3004;
 			mes "[Lalo]";
 			mes "Wonderful! Sing happy enjoyable songs.";
diff --git a/npc/jobs/2-2/crusader.txt b/npc/jobs/2-2/crusader.txt
index 4c4edc091..880ab7889 100644
--- a/npc/jobs/2-2/crusader.txt
+++ b/npc/jobs/2-2/crusader.txt
@@ -372,7 +372,6 @@ prt_castle,45,169,5	script	Senior Crusader	752,{
 			} else {
 				jobchange Job_Crusader;
 			}
-			set FJOB,Job_Royal_Guard;
 			mes "[Michael Halig]";
 			mes "Behold...!";
 			mes "You are now a Crusader!";
@@ -409,7 +408,6 @@ prt_castle,45,169,5	script	Senior Crusader	752,{
 		} else {
 			jobchange Job_Crusader;
 		}
-		set FJOB,Job_Royal_Guard;
 		mes "[Michael Halig]";
 		mes "Behold...!";
 		mes "You are now a Crusader!";
diff --git a/npc/jobs/2-2/dancer.txt b/npc/jobs/2-2/dancer.txt
index 619b26a60..f64fbe00f 100644
--- a/npc/jobs/2-2/dancer.txt
+++ b/npc/jobs/2-2/dancer.txt
@@ -935,7 +935,6 @@ job_duncer,95,93,4	script	Bijou	101,{
 		} else {
 			jobchange Job_Dancer;
 		}
-		set FJOB,Job_Wanderer;
 		completequest 7006;
 		mes "Ooh...!";
 		mes "You look great";
diff --git a/npc/jobs/2-2/monk.txt b/npc/jobs/2-2/monk.txt
index af2e08edb..08a7c9af8 100644
--- a/npc/jobs/2-2/monk.txt
+++ b/npc/jobs/2-2/monk.txt
@@ -925,7 +925,6 @@ monk_in,99,58,1	script	Sensei Moohae	60,{
 			} else {
 				jobchange Job_Monk;
 			}
-			set FJOB,Job_Sura;
 			mes "[Sensei Moohae]";
 			mes "....You are a monk.";
 			next;
diff --git a/npc/jobs/2-2/rogue.txt b/npc/jobs/2-2/rogue.txt
index 6006952cb..5310fbb9c 100644
--- a/npc/jobs/2-2/rogue.txt
+++ b/npc/jobs/2-2/rogue.txt
@@ -153,7 +153,6 @@ in_rogue,363,122,4	script	Rogue Guildsman	747,{
 				} else {
 					jobchange Job_Rogue;
 				}
-				set FJOB,Job_Shadow_Chaser;
 				changequest 2026,2027;
 				completequest 2027;
 				next;
@@ -188,7 +187,6 @@ in_rogue,363,122,4	script	Rogue Guildsman	747,{
 				} else {
 					jobchange Job_Rogue;
 				}
-				set FJOB,Job_Shadow_Chaser;
 				changequest 2026,2027;
 				completequest 2027;
 				next;
diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt
index 9aa41ab5e..71718fed2 100644
--- a/npc/jobs/2-2/sage.txt
+++ b/npc/jobs/2-2/sage.txt
@@ -170,7 +170,6 @@ yuno_in02,38,61,5	script	Dean of the Academy	743,{
 			} else {
 				jobchange Job_Sage;
 			}
-			set FJOB,Job_Sorcerer;
 			completequest 2052;
 			mes "[Kayron Grik]";
 			mes "Congratulations! You have now become a Sage.";
diff --git a/npc/jobs/2-2a/Champion.txt b/npc/jobs/2-2a/Champion.txt
index 1d60bb8f8..1e0df577b 100644
--- a/npc/jobs/2-2a/Champion.txt
+++ b/npc/jobs/2-2a/Champion.txt
@@ -16,7 +16,7 @@
 //============================================================ 
 
 valkyrie,53,42,3	script	Champion#Valkyrie	52,{
-	if (FJOB == 0 || Upper != 1) {
+	if (ADVJOB == 0 || Upper != 1) {
 		set .@karma_d,rand(1,10);
 		if (.@karma_d > 4) {
 			mes "[Champion]";
@@ -38,7 +38,7 @@ valkyrie,53,42,3	script	Champion#Valkyrie	52,{
 		mes "so much in life...";
 		close;
 	}
-	if ((FJOB == Job_Sura) && (Class == Job_Acolyte_High) && (JobLevel > 39)) {
+	if ((ADVJOB == Job_Champion) && (Class == Job_Acolyte_High) && (JobLevel > 39)) {
 		mes "[Champion]";
 		mes "It's time.";
 		mes "Time for great heroes";
@@ -64,7 +64,7 @@ valkyrie,53,42,3	script	Champion#Valkyrie	52,{
 			close;
 		}
 		jobchange Job_Champion;
-		set FJOB,0;
+		set ADVJOB,0;
 		mes "[Champion]";
 		mes "Congratulations!";
 		mes "Live as a Champion,";
diff --git a/npc/jobs/2-2a/Clown.txt b/npc/jobs/2-2a/Clown.txt
index 10b897d6d..b9c0d90b9 100644
--- a/npc/jobs/2-2a/Clown.txt
+++ b/npc/jobs/2-2a/Clown.txt
@@ -18,7 +18,7 @@
 //============================================================ 
 
 valkyrie,53,54,3	script	Minstrel#Valkyrie	741,{
-	if (FJOB == 0 || Upper != 1) {
+	if (ADVJOB == 0 || Upper != 1) {
 		set .@karma_d,rand(1,10);
 		if (.@karma_d > 4) {
 			mes "[Minstrel]";
@@ -32,7 +32,7 @@ valkyrie,53,54,3	script	Minstrel#Valkyrie	741,{
 		mes "Sha la la la la~";
 		close;
 	}
-	if ((FJOB == Job_Minstrell) && (Class == Job_Archer_High) && (JobLevel > 39)) {
+	if ((ADVJOB == Job_Clown) &&( Class == Job_Archer_High) && (JobLevel > 39)) {
 		mes "[Minstrel]";
 		mes "The dreary world";
 		mes "of mortals is in need";
@@ -60,7 +60,7 @@ valkyrie,53,54,3	script	Minstrel#Valkyrie	741,{
 			close;
 		}
 		jobchange Job_Clown;
-		set FJOB,0;
+		set ADVJOB,0;
 		mes "[Minstrel]";
 		mes "Congratulations!";
 		mes "As a Minstrel, your";
diff --git a/npc/jobs/2-2a/Creator.txt b/npc/jobs/2-2a/Creator.txt
index 1353c8ab7..6f9b2ed2d 100644
--- a/npc/jobs/2-2a/Creator.txt
+++ b/npc/jobs/2-2a/Creator.txt
@@ -16,7 +16,7 @@
 //============================================================ 
 
 valkyrie,53,50,3	script	Biochemist#Valkyrie	122,{
-	if (FJOB == 0 || Upper != 1) {
+	if (ADVJOB == 0 || Upper != 1) {
 		set .@karma_d,rand(1,10);
 		if (.@karma_d > 4) {
 			mes "[Biochemist]";
@@ -40,7 +40,7 @@ valkyrie,53,50,3	script	Biochemist#Valkyrie	122,{
 		mes "a place in Valhalla...";
 		close;
 	}
-	if ((FJOB == Job_Genetic) && (Class == Job_Merchant_High) && (JobLevel > 39)) {
+	if ((ADVJOB == Job_Creator) && (Class == Job_Merchant_High) && (JobLevel > 39)) {
 		mes "[Biochemist]";
 		mes "Yes...";
 		mes "It's about time.";
@@ -65,7 +65,7 @@ valkyrie,53,50,3	script	Biochemist#Valkyrie	122,{
 			close;
 		}
 		jobchange Job_Creator;
-		set FJOB,0;
+		set ADVJOB,0;
 		mes "[Biochemist]";
 		mes "Congratulations!";
 		mes "As a Biochemist,";
diff --git a/npc/jobs/2-2a/Gypsy.txt b/npc/jobs/2-2a/Gypsy.txt
index fdd65e526..5ab1730a4 100644
--- a/npc/jobs/2-2a/Gypsy.txt
+++ b/npc/jobs/2-2a/Gypsy.txt
@@ -16,7 +16,7 @@
 //============================================================ 
 
 valkyrie,53,56,3	script	Gypsy#Valkyrie	101,{
-	if (FJOB == 0 || Upper != 1) {
+	if (ADVJOB == 0 || Upper != 1) {
 		set .@karma_d,rand(1,10);
 		if (.@karma_d > 4) {
 			mes "[Gypsy]";
@@ -33,7 +33,7 @@ valkyrie,53,56,3	script	Gypsy#Valkyrie	101,{
 		mes "For me, it's a way of life~";
 		close;
 	}
-	if ((FJOB == Job_Wanderer) && (Class == Job_Archer_High) && (JobLevel > 39)) {
+	if ((ADVJOB == Job_Gypsy) && (Class == Job_Archer_High) && (JobLevel > 39)) {
 		mes "[Gypsy]";
 		mes "The land of Rune-Midgard";
 		mes "is in need of talented women";
@@ -60,7 +60,7 @@ valkyrie,53,56,3	script	Gypsy#Valkyrie	101,{
 			close;
 		}
 		jobchange Job_Gypsy;
-		set FJOB,0;
+		set ADVJOB,0;
 		mes "[Gypsy]";
 		mes "Congratulations!";
 		mes "As a Gypsy, I know";
diff --git a/npc/jobs/2-2a/Paladin.txt b/npc/jobs/2-2a/Paladin.txt
index d7a6906ea..179f4caf1 100644
--- a/npc/jobs/2-2a/Paladin.txt
+++ b/npc/jobs/2-2a/Paladin.txt
@@ -16,7 +16,7 @@
 //============================================================ 
 
 valkyrie,53,39,3	script	Paladin#Valkyrie	752,{
-	if (FJOB == 0 || Upper != 1) {
+	if (ADVJOB == 0 || Upper != 1) {
 		set .@karma_d,rand(1,10);
 		if (.@karma_d > 4) {
 			mes "[Paladin]";
@@ -33,7 +33,7 @@ valkyrie,53,39,3	script	Paladin#Valkyrie	752,{
 		mes "always brighten our path!";
 		close;
 	}
-	if ((FJOB == Job_Royal_Guard) && (Class == Job_Swordman_High) && (JobLevel > 39)) {
+	if ((ADVJOB == Job_Paladin) && (Class == Job_Swordman_High) && (JobLevel > 39)) {
 		mes "[Paladin]";
 		mes "The Holy War will";
 		mes "be upon us before we";
@@ -61,7 +61,7 @@ valkyrie,53,39,3	script	Paladin#Valkyrie	752,{
 			close;
 		}
 		jobchange Job_Paladin;
-		set FJOB,0;
+		set ADVJOB,0;
 		mes "[Paladin]";
 		mes "Congratulations.";
 		mes "As a Paladin, I hope";
diff --git a/npc/jobs/2-2a/Professor.txt b/npc/jobs/2-2a/Professor.txt
index 6b8b0e300..a28d695e6 100644
--- a/npc/jobs/2-2a/Professor.txt
+++ b/npc/jobs/2-2a/Professor.txt
@@ -16,7 +16,7 @@
 //============================================================ 
 
 valkyrie,53,47,3	script	Scholar#Valkyrie	743,{
-	if (FJOB == 0 || Upper != 1) {
+	if (ADVJOB == 0 || Upper != 1) {
 		set .@karma_d,rand(1,10);
 		if (.@karma_d > 4) {
 			mes "[Scholar]";
@@ -40,7 +40,7 @@ valkyrie,53,47,3	script	Scholar#Valkyrie	743,{
 		mes "process of learning...";
 		close;
 	}
-	if ((FJOB == Job_Sorcerer) && (Class == Job_Mage_High) && (JobLevel > 39)) {
+	if ((ADVJOB == Job_Professor) && (Class == Job_Mage_High) && (JobLevel > 39)) {
 		mes "[Scholar]";
 		mes "Rune-Midgard doesn't";
 		mes "have enough Scholars to";
@@ -68,7 +68,7 @@ valkyrie,53,47,3	script	Scholar#Valkyrie	743,{
 			close;
 		}
 		jobchange Job_Professor;
-		set FJOB,0;
+		set ADVJOB,0;
 		mes "[Scholar]";
 		mes "Congratulations!";
 		mes "As a Professor, I hope";
diff --git a/npc/jobs/2-2a/Stalker.txt b/npc/jobs/2-2a/Stalker.txt
index aa94e8501..e6ee9522c 100644
--- a/npc/jobs/2-2a/Stalker.txt
+++ b/npc/jobs/2-2a/Stalker.txt
@@ -16,7 +16,7 @@
 //============================================================ 
 
 valkyrie,53,58,3	script	Stalker#Valkyrie	747,{
-	if (FJOB == 0 || Upper != 1) {
+	if (ADVJOB == 0 || Upper != 1) {
 		set .@karma_d,rand(1,10);
 		if (.@karma_d > 4) {
 			mes "[Stalker]";
@@ -41,7 +41,7 @@ valkyrie,53,58,3	script	Stalker#Valkyrie	747,{
 		mes "they need me.";
 		close;
 	}
-	if ((FJOB == Job_Shadow_Chaser) && (Class == Job_Thief_High) && (JobLevel > 39)) {
+	if ((ADVJOB == Job_Stalker) && (Class == Job_Thief_High) && (JobLevel > 39)) {
 		mes "[Stalker]";
 		mes "This world needs";
 		mes "more heroes who are";
@@ -69,7 +69,7 @@ valkyrie,53,58,3	script	Stalker#Valkyrie	747,{
 			close;
 		}
 		jobchange Job_Stalker;
-		set FJOB,0;
+		set ADVJOB,0;
 		mes "[Stalker]";
 		mes "Congratulations!";
 		mes "As a Stalker, I hope";
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;
diff --git a/npc/pre-re/jobs/1-1/acolyte.txt b/npc/pre-re/jobs/1-1/acolyte.txt
index 0c8307cbb..20c1f50f3 100644
--- a/npc/pre-re/jobs/1-1/acolyte.txt
+++ b/npc/pre-re/jobs/1-1/acolyte.txt
@@ -15,7 +15,7 @@
 //============================================================ 
 prt_church,184,41,4	script	Cleric#aco	60,{
 	if (Upper == 1) {
-		if (FJOB == Job_Arch_Bishop || FJOB == Job_Sura) {
+		if (ADVJOB == Job_High_Priest || ADVJOB == Job_Champion) {
 			if (Class == Job_Novice_High) {
 				mes "[Father Mareusis]";
 				mes "Ah, I sense you have endured";
@@ -125,8 +125,8 @@ prt_church,184,41,4	script	Cleric#aco	60,{
 }
 
 prt_fild03,365,255,2	script	Ascetic#aco	89,{
-	if (Class == Job_Novice) {
-		if (ACO_Q== 6) {
+	if (Class == Job_Baby || Class == Job_Novice) {
+		if (ACO_Q == 6) {
 			mes "[Father Rubalkabara]";
 			mes "Please take care. They should know that you've met me by the time you arrive at the Prontera Sanctuary.";
 			next;
@@ -134,8 +134,8 @@ prt_fild03,365,255,2	script	Ascetic#aco	89,{
 			mes "I've sent a carrier pigeon with a message. I hope it will arrive there safely...";
 			close;
 		}
-		if (ACO_Q!= 0) {
-			if (ACO_Q== 2) {
+		if (ACO_Q != 0) {
+			if (ACO_Q == 2) {
 				mes "[Father Rubalkabara]";
 				mes "Oh...? You must be the one who aspires to become an Acolyte. I've already received news from the Sanctuary that you might be coming.";
 				next;
@@ -180,8 +180,8 @@ prt_fild03,365,255,2	script	Ascetic#aco	89,{
 		close;
 	}
 	if (Class == Job_Baby_Acolyte || Class == Job_Acolyte) {
-		if (PRST_Q != 0) {
-			if (PRST_Q == 1) {
+		if (ACO_Q2 != 0) {
+			if (ACO_Q2 == 1) {
 				mes "[Father Rubalkabara]";
 				mes "Ah yes, so you're the young Acolyte who wishes to become a Priest.";
 				next;
@@ -194,10 +194,10 @@ prt_fild03,365,255,2	script	Ascetic#aco	89,{
 				mes "[Father Rubalkabara]";
 				mes "Well then, please head to your next destination for your pilgrimage. Be safe in your travels.";
 				savepoint "prt_fild03",361,255;
-				set PRST_Q,2;
+				set ACO_Q2,2;
 				close;
 			}
-			if (PRST_Q == 2) {
+			if (ACO_Q2 == 2) {
 				mes "[Father Rubalkabara]";
 				mes "Please be hurry to the next destination for your pilgrimage. I hope you become a Priest soon.";
 				close;
@@ -228,8 +228,8 @@ prt_fild03,365,255,2	script	Ascetic#aco	89,{
 }
 
 moc_fild07,41,355,4	script	Ascetic#2	95,{
-	if (Class == Job_Novice) {
-		if (ACO_Q== 6) {
+	if (Class == Job_Baby || Class == Job_Novice) {
+		if (ACO_Q == 6) {
 			mes "[Mother Marthilda]";
 			mes "I will send a carrier pigeon to the Prontera Sanctuary. When you return, the Priest there should already have received my message.";
 			next;
@@ -237,8 +237,8 @@ moc_fild07,41,355,4	script	Ascetic#2	95,{
 			mes "I will pray to God, and hope that you become an Acolyte soon.";
 			close;
 		}
-		if (ACO_Q!= 0) {
-			if (ACO_Q== 3) {
+		if (ACO_Q != 0) {
+			if (ACO_Q == 3) {
 				mes "[Mother Marthilda]";
 				mes "Ah, you must be one of the Acolyte applicants. I sincerely welcome you.";
 				next;
@@ -278,8 +278,8 @@ moc_fild07,41,355,4	script	Ascetic#2	95,{
 		close;
 	}
 	if (Class == Job_Baby_Acolyte || Class == Job_Acolyte) {
-		if (PRST_Q != 0) {
-			if (PRST_Q == 1) {
+		if (ACO_Q2 != 0) {
+			if (ACO_Q2 == 1) {
 				mes "[Mother Marthilda]";
 				mes "Hmm...";
 				mes "It seems you're";
@@ -293,7 +293,7 @@ moc_fild07,41,355,4	script	Ascetic#2	95,{
 				mes "Perhaps you should ask Bishop Paul or Sister Cecilia once again. Well, may God be with you...";
 				close;
 			}
-			if (PRST_Q == 2) {
+			if (ACO_Q2 == 2) {
 				mes "[Mother Marthilda]";
 				mes "Ah, are you";
 				mes "a Priest trainee...?";
@@ -312,10 +312,10 @@ moc_fild07,41,355,4	script	Ascetic#2	95,{
 				mes "God for safety";
 				mes "on your journey.";
 				savepoint "moc_fild07",35,355;
-				set PRST_Q,3;
+				set ACO_Q2,3;
 				close;
 			}
-			if (PRST_Q == 3) {
+			if (ACO_Q2 == 3) {
 				mes "[Mother Marthilda]";
 				mes "Please leave soon, and";
 				mes "continue your training.";
@@ -345,8 +345,8 @@ moc_fild07,41,355,4	script	Ascetic#2	95,{
 }
 
 prt_fild00,208,218,6	script	Ascetic#3	98,{
-	if (Class == Job_Novice) {
-		if (ACO_Q== 8) {
+	if (Class == Job_Baby || Class == Job_Novice) {
+		if (ACO_Q == 8) {
 			mes "[Father Yosuke]";
 			mes "What?";
 			next;
@@ -354,8 +354,8 @@ prt_fild00,208,218,6	script	Ascetic#3	98,{
 			mes "Have you any more business with me?! You don't! Go back to the Sanctuary now!";
 			close;
 		}
-		if (ACO_Q!= 0) {
-			if (ACO_Q== 4) {
+		if (ACO_Q != 0) {
+			if (ACO_Q == 4) {
 				mes "[Father Yosuke]";
 				mes "Hey.";
 				mes "Whatever you are,";
@@ -401,8 +401,8 @@ prt_fild00,208,218,6	script	Ascetic#3	98,{
 		close;
 	}
 	if (Class == Job_Baby_Acolyte || Class == Job_Acolyte) {
-		if (PRST_Q != 0) {
-			if (PRST_Q == 1) {
+		if (ACO_Q2 != 0) {
+			if (ACO_Q2 == 1) {
 				mes "[Father Yosuke]";
 				mes "Hmm...";
 				mes "A Priest trainee, eh?";
@@ -415,7 +415,7 @@ prt_fild00,208,218,6	script	Ascetic#3	98,{
 				mes "Now, go back to Church, kid.";
 				close;
 			}
-			if (PRST_Q == 2) {
+			if (ACO_Q2 == 2) {
 				mes "[Father Yosuke]";
 				mes "Hmm...";
 				mes "A Priest trainee, eh?";
@@ -427,7 +427,7 @@ prt_fild00,208,218,6	script	Ascetic#3	98,{
 				mes "But that's your own fault. Go back to Church.";
 				close;
 			}
-			if (PRST_Q == 3) {
+			if (ACO_Q2 == 3) {
 				mes "[Father Yosuke]";
 				mes "Hmm.";
 				mes "A Priest";
@@ -446,10 +446,10 @@ prt_fild00,208,218,6	script	Ascetic#3	98,{
 				mes "your trials is now";
 				mes "completed.";
 				savepoint "prt_fild00",206,230;
-				set PRST_Q,4;
+				set ACO_Q2,4;
 				close;
 			}
-			if (PRST_Q == 4) {
+			if (ACO_Q2 == 4) {
 				mes "[Father Yosuke]";
 				mes "I told you to go back to church.";
 				mes "Or do you want to live with me here for the rest of your life...?";
diff --git a/npc/pre-re/jobs/1-1/archer.txt b/npc/pre-re/jobs/1-1/archer.txt
index c51a080bd..985b6c0f8 100644
--- a/npc/pre-re/jobs/1-1/archer.txt
+++ b/npc/pre-re/jobs/1-1/archer.txt
@@ -14,7 +14,7 @@
 //============================================================ 
 payon_in02,64,71,4	script	Archer Guildsman	85,{
 	if (Upper == 1) {
-		if ((Class == Job_Novice_High) && (FJOB == Job_Ranger || FJOB == Job_Minstrel || FJOB == Job_Wanderer)) {
+		if ((Class == Job_Novice_High) && (ADVJOB == Job_Sniper || ADVJOB == Job_Clown || ADVJOB == Job_Gypsy)) {
 			mes "[Archer Guildsman]";
 			mes "Hey, I know you.";
 			next;
@@ -76,7 +76,7 @@ payon_in02,64,71,4	script	Archer Guildsman	85,{
 				mes "extremely high concentration,";
 				mes "so we do not accept ";
 				mes "those who have little patience.";
-				close2;
+				close;
 			}
 			mes "[Archer Guildsman]";
 			mes "You seem to have learned the basic skills..";
diff --git a/npc/pre-re/jobs/1-1/mage.txt b/npc/pre-re/jobs/1-1/mage.txt
index 03b850049..51d4dbe27 100644
--- a/npc/pre-re/jobs/1-1/mage.txt
+++ b/npc/pre-re/jobs/1-1/mage.txt
@@ -14,7 +14,7 @@
 //============================================================ 
 geffen_in,164,124,4	script	Mage Guildsman	123,{
 	if (Upper == 1) {
-		if (FJOB == Job_Warlock || FJOB == Job_Sorcerer) {
+		if ((Class == Job_Novice_High) && (ADVJOB == Job_High_Wizard || ADVJOB == Job_Professor)) {
 			if (Class == Job_Novice_High) {
 				mes "[Mage Guildsman]";
 				mes "Whoa, long time no see! But weren't you supposed to be dead?";
diff --git a/npc/pre-re/jobs/1-1/merchant.txt b/npc/pre-re/jobs/1-1/merchant.txt
index 5b0b3557c..c9ad936fd 100644
--- a/npc/pre-re/jobs/1-1/merchant.txt
+++ b/npc/pre-re/jobs/1-1/merchant.txt
@@ -14,7 +14,7 @@
 //============================================================ 
 alberta_in,53,43,6	script	Merchant#mer	86,{
 	if (Upper == 1) {
-		if ((Class == Job_Novice_High) && (FJOB == Job_Mechanic || FJOB == Job_Genetic)) {
+		if ((Class == Job_Novice_High) && (ADVJOB == Job_Whitesmith || ADVJOB == Job_Creator)) {
 			mes "[Chief Mahnsoo]";
 			mes "Long time no see!";
 			mes "Hey, you didn't quit";
@@ -70,7 +70,7 @@ alberta_in,53,43,6	script	Merchant#mer	86,{
 				next;
 				mes "[Guildsman Mahnsoo]";
 				mes "Don't you think we need to learn some basic skills although we just deal with money?";
-				close2;
+				close;
 			}
 			mes "[Guildsman Mahnsoo]";
 			mes "Good, I think you're fully ready for it seeing that your basic skill level is fulfilled.";
@@ -169,7 +169,7 @@ alberta_in,53,43,6	script	Merchant#mer	86,{
 }
 
 alberta_in,28,29,2	script	Merchant Guildsman	83,{
-	if (MERCNT_Q == 0 || MERCNT_Q == 1 || MERCNT_Q == 2) {
+	if ((MERCNT_Q >= 0) && (MERCNT_Q <= 2)) {
 		mes "[Union Staff Kay]";
 		mes "I am sorry, but we don't make deliveries anymore.";
 		mes "Didn't Chief Mahnsoo tell you?";
diff --git a/npc/pre-re/jobs/1-1/swordman.txt b/npc/pre-re/jobs/1-1/swordman.txt
index 61ecdc253..15521250d 100644
--- a/npc/pre-re/jobs/1-1/swordman.txt
+++ b/npc/pre-re/jobs/1-1/swordman.txt
@@ -14,7 +14,7 @@
 //============================================================ 
 izlude_in,74,172,4	script	Swordman	119,{
 	if (Upper == 1) {
-		if ((Class == Job_Novice_High) && (FJOB == Job_Rune_Knight || FJOB == Job_Royal_Guard)) {
+		if ((Class == Job_Novice_High) && (ADVJOB == Job_Lord_Knight || ADVJOB == Job_Paladin)) {
 			mes "[Swordman Guildsman]";
 			mes "It...";
 			mes "Can't be...";
@@ -85,7 +85,7 @@ izlude_in,74,172,4	script	Swordman	119,{
 		if (Class == Job_Baby || Class == Job_Novice) {
 			if (getskilllv("NV_BASIC") < 9) {
 				mes "[Swordman Guildsman]";
-				mes "I'm sorry to tell you this but to be a Swordman, you must reach at least ^4d4dffJob Level 10^000000.";
+				mes "I'm sorry to tell you this but to be a Swordman, you must reach at least ^4d4dffJOB Level 10^000000.";
 				mes "and ^4d4dffBasic Skill Level 9^000000.";
 				next;
 				mes "[Swordman Guildsman]";
@@ -109,7 +109,6 @@ izlude_in,74,172,4	script	Swordman	119,{
 				} else {
 					jobchange Job_Swordman;
 				}
-				set job_sword_q,0;
 				getitem 13415,1; //N_Falchion
 				mes "[Swordman Guildsman]";
 				mes "Congratulations again for becomming a Swordman and I hope that you participate in many activities for the revival of our guild.";
@@ -121,7 +120,7 @@ izlude_in,74,172,4	script	Swordman	119,{
 				close;
 			}
 		}
-		if (Class == Job_Baby_Swordman || Class == Job_Swordman || Class == Job_Swordman) {
+		if (Class == Job_Baby_Swordman || Class == Job_Swordman) {
 			mes "[Swordman Guildsman]";
 			mes "You are already an excellent Swordman, aren't you?";
 			mes "Just devote yourself to be a great Swordman.";
diff --git a/npc/pre-re/jobs/1-1/thief.txt b/npc/pre-re/jobs/1-1/thief.txt
index 956b5c277..8f90b16d4 100644
--- a/npc/pre-re/jobs/1-1/thief.txt
+++ b/npc/pre-re/jobs/1-1/thief.txt
@@ -14,7 +14,7 @@
 //============================================================ 
 moc_prydb1,39,129,2	script	Thief Guildsman	69,{
 	if (Upper == 1) {
-		if (FJOB == Job_Guillotine_Cross || FJOB == Job_Shadow_Chaser) {
+		if ((Class == Job_Novice_High) && (ADVJOB == Job_Assassin_Cross || ADVJOB == Job_Stalker)) {
 			if (Class == Job_Novice_High) {
 				mes "[Thief Guildsman]";
 				mes "Huh? Do I know you? It's creepy that you seem so familiar. You don't have a twin, do you?";
diff --git a/npc/re/jobs/1-1/acolyte.txt b/npc/re/jobs/1-1/acolyte.txt
index 0c8307cbb..20c1f50f3 100644
--- a/npc/re/jobs/1-1/acolyte.txt
+++ b/npc/re/jobs/1-1/acolyte.txt
@@ -15,7 +15,7 @@
 //============================================================ 
 prt_church,184,41,4	script	Cleric#aco	60,{
 	if (Upper == 1) {
-		if (FJOB == Job_Arch_Bishop || FJOB == Job_Sura) {
+		if (ADVJOB == Job_High_Priest || ADVJOB == Job_Champion) {
 			if (Class == Job_Novice_High) {
 				mes "[Father Mareusis]";
 				mes "Ah, I sense you have endured";
@@ -125,8 +125,8 @@ prt_church,184,41,4	script	Cleric#aco	60,{
 }
 
 prt_fild03,365,255,2	script	Ascetic#aco	89,{
-	if (Class == Job_Novice) {
-		if (ACO_Q== 6) {
+	if (Class == Job_Baby || Class == Job_Novice) {
+		if (ACO_Q == 6) {
 			mes "[Father Rubalkabara]";
 			mes "Please take care. They should know that you've met me by the time you arrive at the Prontera Sanctuary.";
 			next;
@@ -134,8 +134,8 @@ prt_fild03,365,255,2	script	Ascetic#aco	89,{
 			mes "I've sent a carrier pigeon with a message. I hope it will arrive there safely...";
 			close;
 		}
-		if (ACO_Q!= 0) {
-			if (ACO_Q== 2) {
+		if (ACO_Q != 0) {
+			if (ACO_Q == 2) {
 				mes "[Father Rubalkabara]";
 				mes "Oh...? You must be the one who aspires to become an Acolyte. I've already received news from the Sanctuary that you might be coming.";
 				next;
@@ -180,8 +180,8 @@ prt_fild03,365,255,2	script	Ascetic#aco	89,{
 		close;
 	}
 	if (Class == Job_Baby_Acolyte || Class == Job_Acolyte) {
-		if (PRST_Q != 0) {
-			if (PRST_Q == 1) {
+		if (ACO_Q2 != 0) {
+			if (ACO_Q2 == 1) {
 				mes "[Father Rubalkabara]";
 				mes "Ah yes, so you're the young Acolyte who wishes to become a Priest.";
 				next;
@@ -194,10 +194,10 @@ prt_fild03,365,255,2	script	Ascetic#aco	89,{
 				mes "[Father Rubalkabara]";
 				mes "Well then, please head to your next destination for your pilgrimage. Be safe in your travels.";
 				savepoint "prt_fild03",361,255;
-				set PRST_Q,2;
+				set ACO_Q2,2;
 				close;
 			}
-			if (PRST_Q == 2) {
+			if (ACO_Q2 == 2) {
 				mes "[Father Rubalkabara]";
 				mes "Please be hurry to the next destination for your pilgrimage. I hope you become a Priest soon.";
 				close;
@@ -228,8 +228,8 @@ prt_fild03,365,255,2	script	Ascetic#aco	89,{
 }
 
 moc_fild07,41,355,4	script	Ascetic#2	95,{
-	if (Class == Job_Novice) {
-		if (ACO_Q== 6) {
+	if (Class == Job_Baby || Class == Job_Novice) {
+		if (ACO_Q == 6) {
 			mes "[Mother Marthilda]";
 			mes "I will send a carrier pigeon to the Prontera Sanctuary. When you return, the Priest there should already have received my message.";
 			next;
@@ -237,8 +237,8 @@ moc_fild07,41,355,4	script	Ascetic#2	95,{
 			mes "I will pray to God, and hope that you become an Acolyte soon.";
 			close;
 		}
-		if (ACO_Q!= 0) {
-			if (ACO_Q== 3) {
+		if (ACO_Q != 0) {
+			if (ACO_Q == 3) {
 				mes "[Mother Marthilda]";
 				mes "Ah, you must be one of the Acolyte applicants. I sincerely welcome you.";
 				next;
@@ -278,8 +278,8 @@ moc_fild07,41,355,4	script	Ascetic#2	95,{
 		close;
 	}
 	if (Class == Job_Baby_Acolyte || Class == Job_Acolyte) {
-		if (PRST_Q != 0) {
-			if (PRST_Q == 1) {
+		if (ACO_Q2 != 0) {
+			if (ACO_Q2 == 1) {
 				mes "[Mother Marthilda]";
 				mes "Hmm...";
 				mes "It seems you're";
@@ -293,7 +293,7 @@ moc_fild07,41,355,4	script	Ascetic#2	95,{
 				mes "Perhaps you should ask Bishop Paul or Sister Cecilia once again. Well, may God be with you...";
 				close;
 			}
-			if (PRST_Q == 2) {
+			if (ACO_Q2 == 2) {
 				mes "[Mother Marthilda]";
 				mes "Ah, are you";
 				mes "a Priest trainee...?";
@@ -312,10 +312,10 @@ moc_fild07,41,355,4	script	Ascetic#2	95,{
 				mes "God for safety";
 				mes "on your journey.";
 				savepoint "moc_fild07",35,355;
-				set PRST_Q,3;
+				set ACO_Q2,3;
 				close;
 			}
-			if (PRST_Q == 3) {
+			if (ACO_Q2 == 3) {
 				mes "[Mother Marthilda]";
 				mes "Please leave soon, and";
 				mes "continue your training.";
@@ -345,8 +345,8 @@ moc_fild07,41,355,4	script	Ascetic#2	95,{
 }
 
 prt_fild00,208,218,6	script	Ascetic#3	98,{
-	if (Class == Job_Novice) {
-		if (ACO_Q== 8) {
+	if (Class == Job_Baby || Class == Job_Novice) {
+		if (ACO_Q == 8) {
 			mes "[Father Yosuke]";
 			mes "What?";
 			next;
@@ -354,8 +354,8 @@ prt_fild00,208,218,6	script	Ascetic#3	98,{
 			mes "Have you any more business with me?! You don't! Go back to the Sanctuary now!";
 			close;
 		}
-		if (ACO_Q!= 0) {
-			if (ACO_Q== 4) {
+		if (ACO_Q != 0) {
+			if (ACO_Q == 4) {
 				mes "[Father Yosuke]";
 				mes "Hey.";
 				mes "Whatever you are,";
@@ -401,8 +401,8 @@ prt_fild00,208,218,6	script	Ascetic#3	98,{
 		close;
 	}
 	if (Class == Job_Baby_Acolyte || Class == Job_Acolyte) {
-		if (PRST_Q != 0) {
-			if (PRST_Q == 1) {
+		if (ACO_Q2 != 0) {
+			if (ACO_Q2 == 1) {
 				mes "[Father Yosuke]";
 				mes "Hmm...";
 				mes "A Priest trainee, eh?";
@@ -415,7 +415,7 @@ prt_fild00,208,218,6	script	Ascetic#3	98,{
 				mes "Now, go back to Church, kid.";
 				close;
 			}
-			if (PRST_Q == 2) {
+			if (ACO_Q2 == 2) {
 				mes "[Father Yosuke]";
 				mes "Hmm...";
 				mes "A Priest trainee, eh?";
@@ -427,7 +427,7 @@ prt_fild00,208,218,6	script	Ascetic#3	98,{
 				mes "But that's your own fault. Go back to Church.";
 				close;
 			}
-			if (PRST_Q == 3) {
+			if (ACO_Q2 == 3) {
 				mes "[Father Yosuke]";
 				mes "Hmm.";
 				mes "A Priest";
@@ -446,10 +446,10 @@ prt_fild00,208,218,6	script	Ascetic#3	98,{
 				mes "your trials is now";
 				mes "completed.";
 				savepoint "prt_fild00",206,230;
-				set PRST_Q,4;
+				set ACO_Q2,4;
 				close;
 			}
-			if (PRST_Q == 4) {
+			if (ACO_Q2 == 4) {
 				mes "[Father Yosuke]";
 				mes "I told you to go back to church.";
 				mes "Or do you want to live with me here for the rest of your life...?";
diff --git a/npc/re/jobs/1-1/archer.txt b/npc/re/jobs/1-1/archer.txt
index c51a080bd..985b6c0f8 100644
--- a/npc/re/jobs/1-1/archer.txt
+++ b/npc/re/jobs/1-1/archer.txt
@@ -14,7 +14,7 @@
 //============================================================ 
 payon_in02,64,71,4	script	Archer Guildsman	85,{
 	if (Upper == 1) {
-		if ((Class == Job_Novice_High) && (FJOB == Job_Ranger || FJOB == Job_Minstrel || FJOB == Job_Wanderer)) {
+		if ((Class == Job_Novice_High) && (ADVJOB == Job_Sniper || ADVJOB == Job_Clown || ADVJOB == Job_Gypsy)) {
 			mes "[Archer Guildsman]";
 			mes "Hey, I know you.";
 			next;
@@ -76,7 +76,7 @@ payon_in02,64,71,4	script	Archer Guildsman	85,{
 				mes "extremely high concentration,";
 				mes "so we do not accept ";
 				mes "those who have little patience.";
-				close2;
+				close;
 			}
 			mes "[Archer Guildsman]";
 			mes "You seem to have learned the basic skills..";
diff --git a/npc/re/jobs/1-1/mage.txt b/npc/re/jobs/1-1/mage.txt
index 03b850049..51d4dbe27 100644
--- a/npc/re/jobs/1-1/mage.txt
+++ b/npc/re/jobs/1-1/mage.txt
@@ -14,7 +14,7 @@
 //============================================================ 
 geffen_in,164,124,4	script	Mage Guildsman	123,{
 	if (Upper == 1) {
-		if (FJOB == Job_Warlock || FJOB == Job_Sorcerer) {
+		if ((Class == Job_Novice_High) && (ADVJOB == Job_High_Wizard || ADVJOB == Job_Professor)) {
 			if (Class == Job_Novice_High) {
 				mes "[Mage Guildsman]";
 				mes "Whoa, long time no see! But weren't you supposed to be dead?";
diff --git a/npc/re/jobs/1-1/merchant.txt b/npc/re/jobs/1-1/merchant.txt
index 5b0b3557c..c9ad936fd 100644
--- a/npc/re/jobs/1-1/merchant.txt
+++ b/npc/re/jobs/1-1/merchant.txt
@@ -14,7 +14,7 @@
 //============================================================ 
 alberta_in,53,43,6	script	Merchant#mer	86,{
 	if (Upper == 1) {
-		if ((Class == Job_Novice_High) && (FJOB == Job_Mechanic || FJOB == Job_Genetic)) {
+		if ((Class == Job_Novice_High) && (ADVJOB == Job_Whitesmith || ADVJOB == Job_Creator)) {
 			mes "[Chief Mahnsoo]";
 			mes "Long time no see!";
 			mes "Hey, you didn't quit";
@@ -70,7 +70,7 @@ alberta_in,53,43,6	script	Merchant#mer	86,{
 				next;
 				mes "[Guildsman Mahnsoo]";
 				mes "Don't you think we need to learn some basic skills although we just deal with money?";
-				close2;
+				close;
 			}
 			mes "[Guildsman Mahnsoo]";
 			mes "Good, I think you're fully ready for it seeing that your basic skill level is fulfilled.";
@@ -169,7 +169,7 @@ alberta_in,53,43,6	script	Merchant#mer	86,{
 }
 
 alberta_in,28,29,2	script	Merchant Guildsman	83,{
-	if (MERCNT_Q == 0 || MERCNT_Q == 1 || MERCNT_Q == 2) {
+	if ((MERCNT_Q >= 0) && (MERCNT_Q <= 2)) {
 		mes "[Union Staff Kay]";
 		mes "I am sorry, but we don't make deliveries anymore.";
 		mes "Didn't Chief Mahnsoo tell you?";
diff --git a/npc/re/jobs/1-1/swordman.txt b/npc/re/jobs/1-1/swordman.txt
index 61ecdc253..15521250d 100644
--- a/npc/re/jobs/1-1/swordman.txt
+++ b/npc/re/jobs/1-1/swordman.txt
@@ -14,7 +14,7 @@
 //============================================================ 
 izlude_in,74,172,4	script	Swordman	119,{
 	if (Upper == 1) {
-		if ((Class == Job_Novice_High) && (FJOB == Job_Rune_Knight || FJOB == Job_Royal_Guard)) {
+		if ((Class == Job_Novice_High) && (ADVJOB == Job_Lord_Knight || ADVJOB == Job_Paladin)) {
 			mes "[Swordman Guildsman]";
 			mes "It...";
 			mes "Can't be...";
@@ -85,7 +85,7 @@ izlude_in,74,172,4	script	Swordman	119,{
 		if (Class == Job_Baby || Class == Job_Novice) {
 			if (getskilllv("NV_BASIC") < 9) {
 				mes "[Swordman Guildsman]";
-				mes "I'm sorry to tell you this but to be a Swordman, you must reach at least ^4d4dffJob Level 10^000000.";
+				mes "I'm sorry to tell you this but to be a Swordman, you must reach at least ^4d4dffJOB Level 10^000000.";
 				mes "and ^4d4dffBasic Skill Level 9^000000.";
 				next;
 				mes "[Swordman Guildsman]";
@@ -109,7 +109,6 @@ izlude_in,74,172,4	script	Swordman	119,{
 				} else {
 					jobchange Job_Swordman;
 				}
-				set job_sword_q,0;
 				getitem 13415,1; //N_Falchion
 				mes "[Swordman Guildsman]";
 				mes "Congratulations again for becomming a Swordman and I hope that you participate in many activities for the revival of our guild.";
@@ -121,7 +120,7 @@ izlude_in,74,172,4	script	Swordman	119,{
 				close;
 			}
 		}
-		if (Class == Job_Baby_Swordman || Class == Job_Swordman || Class == Job_Swordman) {
+		if (Class == Job_Baby_Swordman || Class == Job_Swordman) {
 			mes "[Swordman Guildsman]";
 			mes "You are already an excellent Swordman, aren't you?";
 			mes "Just devote yourself to be a great Swordman.";
diff --git a/npc/re/jobs/1-1/thief.txt b/npc/re/jobs/1-1/thief.txt
index 956b5c277..8f90b16d4 100644
--- a/npc/re/jobs/1-1/thief.txt
+++ b/npc/re/jobs/1-1/thief.txt
@@ -14,7 +14,7 @@
 //============================================================ 
 moc_prydb1,39,129,2	script	Thief Guildsman	69,{
 	if (Upper == 1) {
-		if (FJOB == Job_Guillotine_Cross || FJOB == Job_Shadow_Chaser) {
+		if ((Class == Job_Novice_High) && (ADVJOB == Job_Assassin_Cross || ADVJOB == Job_Stalker)) {
 			if (Class == Job_Novice_High) {
 				mes "[Thief Guildsman]";
 				mes "Huh? Do I know you? It's creepy that you seem so familiar. You don't have a twin, do you?";