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

diff --git a/npc/jobs/2-2a/Clown.txt b/npc/jobs/2-2a/Clown.txt
index f92c92244..f0274ef29 100644
--- a/npc/jobs/2-2a/Clown.txt
+++ b/npc/jobs/2-2a/Clown.txt
@@ -15,7 +15,67 @@
 //= 1.3 Now saves/restores all the quest skills [Lupus]
 //============================================================ 
 
-// -== Clown ==-
-valkyrie,53,54,4	script	Clown	741,{
-	callfunc "F_Rebirth",Job_Archer_High,"High Archer",Job_Clown,"Clown";
+valkyrie,53,54,3	script	Minstrel#Valkyrie	741,{
+	if (ADVJOB == 0 || Upper != 1) {
+		set .@karma_d,rand(1,10);
+		if (.@karma_d > 4) {
+			mes "[Minstrel]";
+			mes "Congratulations.";
+			mes "Honor to the warriors!";
+			close;
+		}
+		mes "[Minstrel]";
+		mes "Do you want to";
+		mes "sing a song with me?";
+		mes "Sha la la la la~";
+		close;
+	}
+	else if (ADVJOB == Job_Clown && Class == Job_Archer_Hight && JobLevel > 39) {
+		mes "[Minstrel]";
+		mes "The dreary world";
+		mes "of mortals is in need";
+		mes "of more cheerful song.";
+		mes "Will you bring it to them";
+		mes "and turn the tide in the";
+		mes "battle against evil?";
+		next;
+		mes "[Minstrel]";
+		mes "Will you do this";
+		mes "for Rune-Midgard...";
+		mes "As a Minstrel?";
+		next;
+		if (select("No.:Yes.") == 1) {
+			mes "[Minstrel]";
+			mes "When you're ready,";
+			mes "feel free to come back.";
+			mes "Honor to the warriors!";
+			close;
+		}
+		if (SkillPoint) {
+			mes "[Minstrel]";
+			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_Clown;
+		set ADVJOB,0;
+		mes "[Minstrel]";
+		mes "Congratulations!";
+		mes "As a Minstrel, your";
+		mes "your songs will bring";
+		mes "hope to your allies, and";
+		mes "desperation to your foes.";
+		close;
+	}
+	mes "[Minstrel]";
+	mes "Welcome";
+	mes "to Valhalla,";
+	mes "the Hall of Honor.";
+	next;
+	mes "[Minstrel]";
+	mes "Please make";
+	mes "yourself comfortable";
+	mes "while you are here.";
+	mes "Honor to the warriors!";
+	close;
 }