* 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, 68 insertions, 3 deletions

diff --git a/npc/jobs/2-1a/HighWizard.txt b/npc/jobs/2-1a/HighWizard.txt
index 1189c4891..1977999c3 100644
--- a/npc/jobs/2-1a/HighWizard.txt
+++ b/npc/jobs/2-1a/HighWizard.txt
@@ -15,7 +15,72 @@
 //= 1.3 Now saves/restores all the quest skills [Lupus]
 //============================================================ 
 
-// -== High Wizard ==-
-valkyrie,44,47,6	script	High Wizard	735,{
-	callfunc "F_Rebirth",Job_Mage_High,"High Mage",Job_High_Wizard,"High Wizard";
+valkyrie,44,47,5	script	High Wizard#Valkyrie	735,{
+	if (ADVJOB == 0 ||  Upper != 1) {
+		set .@karma_d,rand(1,10);
+		if (.@karma_d > 4) {
+			mes "[High Wizard]";
+			mes "Congratulations.";
+			mes "Honor to the warriors!";
+			close;
+		}
+		mes "[High Wizard]";
+		mes "We High Wizards have";
+		mes "the responsibility of";
+		mes "using our destructive magic";
+		mes "for the right purposes.";
+		next;
+		mes "[High Wizard]";
+		mes "A lifetime of training";
+		mes "is required before becoming";
+		mes "a High Wizard. Can you imagine";
+		mes "what would happen if our power";
+		mes "was placed in the wrong hands?!";
+		close;
+	}
+	else if (ADVJOB == Job_High_Wizard && Class == Job_Mage_High && JobLevel > 39) {
+		mes "[High Wizard]";
+		mes "It is time.";
+		mes "And Rune-Midgard has";
+		mes "need of those who can";
+		mes "wield the strongest of magic...";
+		next;
+		mes "[High Wizard]";
+		mes "Would you like to";
+		mes "become a High Wizard?";
+		next;
+		if (select("No.:Yes.") == 1) {
+			mes "[High Wizard]";
+			mes "When you're ready,";
+			mes "feel free to come back.";
+			mes "Honors to the warriors!";
+			close;
+		}
+		if (SkillPoint) {
+			mes "[High Wizard]";
+			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_high_Wizard;
+		set ADVJOB,0;
+		mes "[High Wizard]";
+		mes "Congratulations.";
+		mes "As a High Wizard,";
+		mes "I hope use you use";
+		mes "your powers to bring";
+		mes "peace to the oppressed.";
+		close;
+	}
+	mes "[High Wizard]";
+	mes "Welcome";
+	mes "to Valhalla,";
+	mes "the Hall of Honor.";
+	next;
+	mes "[High Wizard]";
+	mes "Please make";
+	mes "yourself comfortable";
+	mes "while you are here.";
+	mes "Honor to the warriors!";
+	close;
 }