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

diff --git a/npc/jobs/2-1a/Sniper.txt b/npc/jobs/2-1a/Sniper.txt
index e99885cbb..96e579294 100644
--- a/npc/jobs/2-1a/Sniper.txt
+++ b/npc/jobs/2-1a/Sniper.txt
@@ -15,7 +15,69 @@
 //= 1.3 Now saves/restores all the quest skills [Lupus]
 //============================================================ 
 
-// -== Sniper ==-
-valkyrie,44,55,6	script	Sniper	727,{
-	callfunc "F_Rebirth",Job_Archer_High,"High Archer",Job_Sniper,"Sniper";
+valkyrie,44,55,5	script	Sniper#Valkyrie	727,{
+	if (ADVJOB == 0 || Upper != 1) {
+		set .@karma_d,rand(1,10);
+		if (.@karma_d > 4) {
+			mes "[Sniper]";
+			mes "Congratulations.";
+			mes "Honor to the warriors!";
+			close;
+		}
+		mes "[Sniper]";
+		mes "One shot.";
+		mes "One kill.";
+		mes "It's not so hard";
+		mes "once you develop the";
+		mes "vision for that style";
+		mes "of battling.";
+		close;
+	}
+	else if (ADVJOB == Job_Sniper && Class == Job_Archer_High && JobLevel > 39) {
+		mes "[Sniper]";
+		mes "The world is in";
+		mes "need of mighty Bowmen";
+		mes "like you. Are you ready for";
+		mes "the awesome responsibility?";
+		next;
+		mes "[Sniper]";
+		mes "Are you willing to";
+		mes "take the next step and";
+		mes "become a Sniper?";
+		next;
+		if (select("No.:Yes.") == 1) {
+			mes "[Sniper]";
+			mes "When you're ready,";
+			mes "feel free to come back.";
+			mes "Honor to the warriors!";
+			close;
+		}
+		if (SkillPoint) {
+			mes "[Sniper]";
+			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_Sniper;
+		set ADVJOB,0;
+		mes "[Sniper]";
+		mes "Congratulations!";
+		mes "As a Sniper, I hope";
+		mes "that the minions of evil";
+		mes "will never be safe so";
+		mes "long as they are in";
+		mes "your sight!";
+		close;
+	}
+	mes "[Sniper]";
+	mes "Welcome";
+	mes "to Valhalla,";
+	mes "the Hall of Honor.";
+	next;
+	mes "[Sniper]";
+	mes "Please make";
+	mes "yourself comfortable";
+	mes "while you are here.";
+	mes "Honor to the warriors!";
+	close;
 }