From 8bc8aeb4678bdf26f1508cbb2375d9f838d4f5c3 Mon Sep 17 00:00:00 2001
From: L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Mon, 30 Jul 2007 17:54:06 +0000
Subject: * 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
---
 npc/jobs/2-1a/AssassinCross.txt | 85 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 82 insertions(+), 3 deletions(-)

(limited to 'npc/jobs/2-1a/AssassinCross.txt')

diff --git a/npc/jobs/2-1a/AssassinCross.txt b/npc/jobs/2-1a/AssassinCross.txt
index fc5340fed..efdddf103 100644
--- a/npc/jobs/2-1a/AssassinCross.txt
+++ b/npc/jobs/2-1a/AssassinCross.txt
@@ -15,7 +15,86 @@
 //= 1.3 Now saves/restores all the quest skills [Lupus]
 //============================================================ 
 
-// -== Assassin Cross ==-
-valkyrie,44,58,6	script	Assassin Cross	725,{
-	callfunc "F_Rebirth",Job_Thief_High,"Thief High",Job_Assassin_Cross,"Assassin Cross";
+valkyrie,44,58,5	script	Assassin Cross#Valkyrie	725,{
+	if (ADVJOB == 0 || Upper != 1) {
+		set .@karma_d,rand(1,10);
+		if (.@karma_d > 4) {
+			mes "[Assassin Cross]";
+			mes "Congratulations...";
+			next;
+			mes "[Assassin Cross]";
+			mes "...";
+			next;
+			mes "[Assassin Cross]";
+			mes "...";
+			mes "......";
+			next;
+			mes "[Assassin Cross]";
+			mes "...";
+			mes "......";
+			mes "Honor to";
+			mes "the warriors.";
+			close;
+		}
+		mes "[Assassin Cross]";
+		mes "We are the warriors";
+		mes "of the desert. Nobody";
+		mes "looks down upon us.";
+		mes "Nobody...";
+		close;
+	}
+	else if (ADVJOB == Job_Assassin_Cross && Class == Job_Thief_High && JobLevel > 39) {
+		mes "[Assassin Cross]";
+		mes "The time has come.";
+		mes "The world needs you...";
+		mes "More than ever.";
+		next;
+		mes "[Assassin Cross]";
+		mes "I ask that you continue to live in the shadows, but as an even greater Assassin with a new appearance.";
+		next;
+		mes "[Assassin Cross]";
+		mes "Will you become";
+		mes "an Assassin Cross?";
+		next;
+		if (select("No.:Yes.") == 1) {
+			mes "[Assassin Cross]";
+			mes "When you are";
+			mes "ready, come back.";
+			next;
+			mes "[Assassin Cross]";
+			mes "Honor to";
+			mes "the warriors.";
+			close;
+		}
+		if (SkillPoint) {
+			mes "[Assassin Cross]";
+			mes "You still haven't";
+			mes "learned everything";
+			mes "that you can.";
+			next;
+			mes "[Assassin Cross]";
+			mes "Use all your";
+			mes "Skill Points";
+			mes "and then come back.";
+			close;
+		}
+		jobchange Job_Assassin_Cross;
+		set ADVJOB,0;
+		mes "[Assassin Cross]";
+		mes "Congratulations.";
+		mes "As an Assassin Cross,";
+		mes "I hope that you fight for a brighter future within the darkness.";
+		close;
+	}
+	mes "[Assassin Cross]";
+	mes "Welcome";
+	mes "to Valhalla,";
+	mes "the Hall of Honor.";
+	next;
+	mes "[Assassin Cross]";
+	mes "Please make";
+	mes "yourself comfortable";
+	mes "while you are here.";
+	mes "Honor to the warriors.";
+	close;
 }
-- 
cgit v1.2.3-70-g09d2