* Updated Job quests for 1-1 classes and Rebirthed classes.

- Moved valkyrie.txt from ../cities/ to ../jobs/. It's not a city. Doofus. 

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

1 files changed, 75 insertions, 3 deletions

diff --git a/npc/jobs/2-2a/Professor.txt b/npc/jobs/2-2a/Professor.txt
index b513044fd..6cb4eb27a 100644
--- a/npc/jobs/2-2a/Professor.txt
+++ b/npc/jobs/2-2a/Professor.txt
@@ -15,7 +15,79 @@
 //= 1.3 Now saves/restores all the quest skills [Lupus]
 //============================================================ 
 
-// -== Professor ==-
-valkyrie,53,47,4	script	Professor	743,{
-	callfunc "F_Rebirth",Job_Mage_High,"High Mage",Job_Professor,"Professor";
+valkyrie,53,47,3	script	Scholar#Valkyrie	743,{
+	if (ADVJOB == 0 || Upper != 1) {
+		set .@karma_d,rand(1,10);
+		if (.@karma_d > 4) {
+			mes "[Scholar]";
+			mes "Congratulations.";
+			mes "Honor to the warriors!";
+			close;
+		}
+		mes "[Scholar]";
+		mes "It takes a lifetime...";
+		mes "Literally a lifetime";
+		mes "to amass the knowledge";
+		mes "necessary to become";
+		mes "a Scholar...";
+		next;
+		mes "[Scholar]";
+		mes "It's overwhelming.";
+		mes "The more you learn, the";
+		mes "more you discover what";
+		mes "else you don't know.";
+		mes "There's no end to the";
+		mes "process of learning...";
+		close;
+	}
+	else if (ADVJOB == Job_Professer && Class == Job_Mage_High && JobLevel > 39) {
+		mes "[Scholar]";
+		mes "Rune-Midgard doesn't";
+		mes "have enough Scholars to";
+		mes "help usher in a new age";
+		mes "of prosperity. The";
+		mes "world needs you...";
+		next;
+		mes "[Scholar]";
+		mes "Will you take this";
+		mes "awesome responsibility?";
+		mes "Will you serve Rune-Midgard";
+		mes "as a Scholar?";
+		next;
+		if (select("No.:Yes.") == 1) {
+			mes "[Scholar]";
+			mes "When you're ready,";
+			mes "feel free to come back.";
+			mes "Honor to the warriors!";
+			close;
+		}
+		if (SkillPoint) {
+			mes "[Scholar]";
+			mes "It is still possible for you to learn more skills. Please use";
+			mes "all of your remaining Skill Points before returning to me.";
+			close;
+		}
+		jobchange Job_Professor;
+		set ADVJOB,0;
+		mes "[Scholar]";
+		mes "Congratulations!";
+		mes "As a Professor, I hope";
+		mes "that you will take an";
+		mes "active part in bringing";
+		mes "the light of knowledge";
+		mes "where there is darkness.";
+		close;
+	}
+	mes "[Scholar]";
+	mes "Welcome";
+	mes "to Valhalla,";
+	mes "the Hall of Honor.";
+	next;
+	mes "[Scholar]";
+	mes "Please make";
+	mes "yourself comfortable";
+	mes "while you are here.";
+	mes "Honor to the warriors!";
+	close;
 }
+