added NJ/GS job quests. temp ones tough

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5680 54d463be-8e91-2dee-dedb-b68131a5f0ec

4 files changed, 136 insertions, 0 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 72a6d8e9f..9dd46e59d 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -28,6 +28,7 @@ Nexon
 Date		Added

 ======

 03/20

+	* Added temp Job quests of Ninja and Gunslinger, thx2 Gywall [Lupus]

 	* Fixed endless warping loops, thanks to Manipulator [Lupus]

 	* Fixed possible Castle Economy investment overflow with Emsolute Develop learnt [Lupus]

 	* Removed Berserk Potions from all shops, but Comodo [Lupus]

diff --git a/npc/jobs/1-1e/gunslinger.txt b/npc/jobs/1-1e/gunslinger.txt
new file mode 100644
index 000000000..89e5d09a5
--- /dev/null
+++ b/npc/jobs/1-1e/gunslinger.txt
@@ -0,0 +1,53 @@
+//===== eAthena Script ======================================= 

+//= Gunslinger Job Quest

+//===== By: ================================================== 

+//= Lord Gywall

+//===== Current Version: ===================================== 

+//= 1.0

+//===== Compatible With: ===================================== 

+//= eAthena SVN

+//===== Description: ========================================= 

+//= Temp Gunslinger Quest

+//===== Additional Comments: ================================= 

+//= 1.0 Fixed minor things [Lupus]

+//============================================================ 

+

+

+einbroch.gat,244,110,1	script	Gunslinger	859,{

+	mes "[Gunslinger]";

+	mes "*cough* Uh, Who's there?";

+	if(Class==Job_Novice) goto N_Novice;

+	mes "Hey! You're no novice!";

+	close;

+N_Novice:

+	mes "Oh, A novice.. I guess you want to shoot things.";

+	next;

+	menu "I wish to become a Gunslinger",N_Question,"What are the requirements",N_Require,"Leave",-;

+	close;

+N_Question:

+	mes "[Gunslinger]";

+	if(JobLevel<10 || SkillPoint) goto N_Bad;

+	mes "Where is needed to fire a gun?";

+	next;

+	menu "Bullets",N_C,"Arrows",N_W,"Bolts",N_W,"Something.. I dunno",N_W;

+N_C:

+	mes "[Gunslinger]";

+	mes "..Yep, Your right.";

+	mes "You know what goes in guns, so hey.. Use them!.";

+	next;

+	jobchange Job_Gunslinger;

+	mes "[Gunslinger]";

+	mes "Congratulations. Now go train.";

+	close;

+N_W:

+	mes "Argh.. Dammit, you idiot!";

+	close;

+N_Bad:

+	mes "Wait a second.. Your either too low in job level or you have Skill Points.";

+	close;

+N_Require:

+	mes "[Gunslinger]";

+	mes "Get the simple question right..";

+	mes "Your job level must be at least 10 before trying.";

+	close;

+}

diff --git a/npc/jobs/1-1e/ninja.txt b/npc/jobs/1-1e/ninja.txt
new file mode 100644
index 000000000..b10e24a2c
--- /dev/null
+++ b/npc/jobs/1-1e/ninja.txt
@@ -0,0 +1,80 @@
+//===== eAthena Script ======================================= 

+//= Ninja Job Quest

+//===== By: ================================================== 

+//= Lord Gywall

+//===== Current Version: ===================================== 

+//= 1.0

+//===== Compatible With: ===================================== 

+//= eAthena SVN

+//===== Description: ========================================= 

+//= Temp Ninja Quest

+//===== Additional Comments: ================================= 

+//= 1.0 Fixed minor things [Lupus]

+//============================================================ 

+

+

+amatsu.gat,46,137,4	script	Ninja Master	730,{

+	mes "[Ninja Master]";

+	mes "Huh, what?";

+	if(Class==Job_Novice) goto N_Novice;

+	mes "Hey! Get lost!";

+	close;

+N_Novice:

+	mes "Oh, A novice.. I guess your here to learn the ways of a Ninja.";

+	next;

+	menu "I wish to become a Ninja",N_Question,"What are the requirements",N_Require,"Leave",-;

+	close;

+

+N_Question:

+	mes "[Ninja Master]";

+	if(JobLevel<10 || SkillPoint) goto N_Bad;

+	set @qnumber,rand(1,5);

+	if(@qnumber==1) goto N_Q1;

+	if(@qnumber==2) goto N_Q2;

+	if(@qnumber==3) goto N_Q3;

+	if(@qnumber==4) goto N_Q4;

+	mes "Where can you find a Poison Toad?";

+	menu "Amatsu Field",N_C,"Louyang Field",N_W,"Prontera Field",N_W,"Einbroch Field",N_W;

+N_Q1:

+	mes "[Gunslinger]";

+	mes "Which of these places does not have it's own fields?";

+	next;

+	menu "Geffen",N_W,"Alberta",N_C,"Payon",N_W,"Lighthalzen",N_W;

+N_Q2:

+	mes "[Gunslinger]";

+	mes "Dammit.. Which one is a fake weapon?";

+	next;

+	menu "Dirk",N_W,"Coward",N_W,"Stardust Blade",N_W,"Myrital",N_C;

+N_Q3:

+	mes "[Gunslinger]";

+	mes "It's Night and what new creature walks fields?";

+	next;

+	menu "Familiar",N_W,"Shadowring",N_C,"Zombie",N_W,"Willow",N_W;

+N_Q4:

+	mes "[Gunslinger]";

+	mes "What one is the odd one out?";

+	next;

+	menu "Super Novice",N_W,"Gunslinger",N_W,"TaeKwon",N_C,"Ninja",N_W;

+N_C:

+	mes "[Gunslinger]";

+	mes "..That's right.";

+	mes "You can be a ninja from this day forward.";

+	next;

+	jobchange Job_Ninja;

+	mes "[Ninja Master]";

+	mes "Congratulations. Now go train.";

+	close;

+N_W:

+	mes "Argh.. Dammit, you baka!";

+	next;

+	menu "Try Again",N_Question,"Give up",-;

+	close;

+N_Bad:

+	mes "Wait a second.. Your either too low in job level or you have Skill Points.";

+	close;

+N_Require:

+	mes "[Ninja Master]";

+	mes "Your required to correctly answer a question I fire at you randomly.";

+	mes "Your job level must be at least 10 before trying.";

+	close;

+}

diff --git a/npc/scripts_jobs.conf b/npc/scripts_jobs.conf
index 4ec511f48..753f207b9 100644
--- a/npc/scripts_jobs.conf
+++ b/npc/scripts_jobs.conf
@@ -62,6 +62,8 @@ npc: npc/jobs/2-2a/Paladin.txt
 npc: npc/jobs/2-2a/Professor.txt

 npc: npc/jobs/2-2a/Stalker.txt

 // -- 1-1E (Without Quest)

+npc: npc/jobs/1-1e/gunslinger.txt

+npc: npc/jobs/1-1e/ninja.txt

 npc: npc/jobs/1-1e/taekwon.txt

 // -- 2-1E (Place Holder)

 npc: npc/jobs/2-1e/StarGladiator.txt