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

diff --git a/npc/jobs/2-1a/HighPriest.txt b/npc/jobs/2-1a/HighPriest.txt
index 448ac1fdc..4460a2c0f 100644
--- a/npc/jobs/2-1a/HighPriest.txt
+++ b/npc/jobs/2-1a/HighPriest.txt
@@ -15,7 +15,68 @@
 //= 1.3 Now saves/restores all the quest skills [Lupus]
 //============================================================ 
 
-// -== High Priest ==-
-valkyrie,44,42,6	script	High Priest	60,{
-	callfunc "F_Rebirth",Job_Acolyte_High,"Acolyte High",Job_High_Priest,"High Priest";
+valkyrie,44,42,5	script	High Priest#Valkyrie	60,{
+	if (ADVJOB == 0 || Upper != 1) {
+		set .@karma_d,rand(1,10);
+		if (.@karma_d > 4) {
+			mes "[High Priest]";
+			mes "Congratulations.";
+			mes "Honor to the warriors!";
+			close;
+		}
+		mes "[High Priest]";
+		mes "Through the power";
+		mes "of holiness, may we";
+		mes "find peace, strength";
+		mes "and protection. Deliver";
+		mes "us from the forces of evil...";
+		close;
+	}
+	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";
+		mes "talent and conviction.";
+		mes "Please continue your";
+		mes "good works as an even";
+		mes "greater hero of holiness...";
+		next;
+		mes "[High Priest]";
+		mes "Would you like";
+		mes "to become a High Priest?";
+		next;
+		if (select("No.:Yes.") == 1) {
+			mes "[High Priest]";
+			mes "When you're ready,";
+			mes "feel free to come back.";
+			mes "Honor to the warriors!";
+			close;
+		}
+		if (SkillPoint) {
+			mes "[High Priest]";
+			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_Priest;
+		set ADVJOB,0;
+		mes "[High Priest]";
+		mes "Congratulations.";
+		mes "As a High Priest,";
+		mes "I hope you will guide";
+		mes "others upon the path";
+		mes "to holiness...";
+		close;
+	}
+	mes "[High Priest]";
+	mes "Welcome";
+	mes "to Valhalla,";
+	mes "the Hall of Honor.";
+	next;
+	mes "[High Priest]";
+	mes "Please make";
+	mes "yourself comfortable";
+	mes "while you are here.";
+	mes "Honor to the warriors!";
+	close;
 }