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

diff --git a/npc/jobs/2-2a/Champion.txt b/npc/jobs/2-2a/Champion.txt
index b11b2f53f..7e7ec6373 100644
--- a/npc/jobs/2-2a/Champion.txt
+++ b/npc/jobs/2-2a/Champion.txt
@@ -15,7 +15,73 @@
 //= 1.3 Now saves/restores all the quest skills [Lupus]
 //============================================================ 
 
-// -== Champion ==-
-valkyrie,53,42,4	script	Champion	52,{
-	callfunc "F_Rebirth",Job_Acolyte_High,"Acolyte High",Job_Champion,"Champion";
+valkyrie,53,42,3	script	Champion#Valkyrie	52,{
+	if (ADVJOB == 0 || Upper != 1) {
+		set .@karma_d,rand(1,10);
+		if (.@karma_d > 4) {
+			mes "[Champion]";
+			mes "Congratulations.";
+			mes "Honor to the warriors!";
+			close;
+		}
+		mes "[Champion]";
+		mes "Skill.";
+		mes "Speed.";
+		mes "Strength.";
+		mes "Agility.";
+		next;
+		mes "[Champion]";
+		mes "A Champion can";
+		mes "benefit from all";
+		mes "these things. But";
+		mes "one can only master";
+		mes "so much in life...";
+		close;
+	}
+	else if (ADVJOB == Job_Champion && Class == Job_Acolyte_High && JobLevel > 39) {
+		mes "[Champion]";
+		mes "It's time.";
+		mes "Time for great heroes";
+		mes "to stand up against the";
+		mes "forces of evil which plague";
+		mes "the world of Rune-Midgard!";
+		next;
+		mes "[Champion]";
+		mes "Would you like";
+		mes "to become a Champion?";
+		next;
+		if (select("No.:Yes.") == 1) {
+			mes "[Champion]";
+			mes "When you're ready,";
+			mes "feel free to come back.";
+			mes "Honor to the warriors!";
+			close;
+		}
+		if (SkillPoint) {
+			mes "[Champion]";
+			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_Champion;
+		set ADVJOB,0;
+		mes "[Champion]";
+		mes "Congratulations!";
+		mes "Live as a Champion,";
+		mes "and bring light into";
+		mes "the world through the";
+		mes "strength of your fists.";
+		close;
+	}
+	mes "[Champion]";
+	mes "Welcome";
+	mes "to Valhalla,";
+	mes "the Hall of Honor.";
+	next;
+	mes "[Champion]";
+	mes "Please make";
+	mes "yourself comfortable";
+	mes "while you are here.";
+	mes "Honor to the warriors!";
+	close;
 }