* Added all the Gunslinger gun quests

- sphere creation and ammo casing are still missing, working on it
- removed erKURITA's version, he's okay with it

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

3 files changed, 228 insertions, 85 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 76b94faa1..3c80861ba 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -35,6 +35,10 @@ Playtester
 

 Date		Added

 ======

+08/15

+	* Added all the Gunslinger gun quests [Playtester]

+	- sphere creation and ammo casing are still missing, working on it

+	- removed erKURITA's version, he's okay with it

 08/14

 	* Various changes in other/dts_warper.txt [Evera]

 	- Uses new global var $dtsday to count voting sessions [Evera]

diff --git a/npc/quests/Another_Garrison.txt b/npc/quests/Another_Garrison.txt
deleted file mode 100644
index 1cf1a3a18..000000000
--- a/npc/quests/Another_Garrison.txt
+++ /dev/null
@@ -1,80 +0,0 @@
-que_ng.gat,182,85,2	script	Garrison	109,{

-

-if (garrisonq == 1) {

-	mes "[Garrison]";

-	mes "Hey, you've comeback, let's see if you brought your items:";

-	if (Zeny < 30000) {

-		mes "You're going to need at least 30,000z. Get some please";

-		close;

-	} else if (countitem(999) < 50) {

-		mes "You need "+(50 - countitem(999))+" steels. Get more please";

-		close;

-	} else if (countitem(985) < 3) {

-		mes "You need "+(3 - countitem(985))+" eluniums. Get more please";

-		close;

-	} else if (countitem(1003) < 50) {

-		mes "You need "+(50 - countitem(1003))+" coals. Get more please";

-		close;

-	} else if (countitem(7317) < 20) {

-		mes "You need "+(20 - countitem(7317))+" Rusty screws. Get more please";

-		close;

-	} else

-	mes "Awesome! You've got them all!";

-	next;

-	mes "[Garrison]";

-	mes "Here's your ^800000Garrison^000000!";

-	delitem 999,50;

-	delitem 985,3;

-	delitem 1003,50;

-	delitem 7317,20;

-	set Zeny,Zeny-30000;

-	getitem 13104,1;

-	set garrisonq,0;

-	next;

-	mes "[Garrison]";

-	mes "Enjoy it and use it wise~~";

-	close;

-}

-mes "[Garrison]";

-mes "Hiya there!~~ Have you ever heard about ''The Garrison''?";

-switch(select("The handgun?:Err, besides you, no")) {

-	case 1:

-		next;

-		mes "[Garrison]";

-		mes "YES YES! That one!. The garrison is a nice overall handgun which combines gunpowder's power and accuracy.";

-		next;

-		mes "[Garrison]";

-		mes "However, it's not publicly made nowadays, but I do know how to make one. It will cost you a few things though... Interested?";

-		switch(select("Yes I am:Nah, guns are not my type")) {

-			case 1:

-				next;

-				mes "[Garrison]";

-				mes "Ok, here's what you need:";

-				mes "^80808050 Steels^000000";

-				mes "^4747473 Eluniums^000000";

-				mes "50 Coals";

-				mes "^80000020 Rusted Screws^000000";

-				mes "^FFAA0030,000 Zeny^000000";

-				next;

-				mes "[Garrison]";

-				mes "Still interested?";

-				if (select("Yes I am:No thanks...") == 1) {

-					next;

-					mes "[Garrison]";

-					mes "Good stuff. Come back with the items then";

-					set garrisonq,1;

-					close;

-				}

-			case 2:

-				next;

-				mes "[Garrison]";

-				mes "Come back anytime then!";

-				close;

-		}

-	case 2:

-		next;

-		mes "[Garrison]";

-		mes "Bad thing then...";

-		close;

-	}

-}

diff --git a/npc/quests/gunslinger_quests.txt b/npc/quests/gunslinger_quests.txt
index b4f937fca..66dc72eee 100644
--- a/npc/quests/gunslinger_quests.txt
+++ b/npc/quests/gunslinger_quests.txt
@@ -1,7 +1,7 @@
 //===== By: ==================================================

 //= Playtester

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

-//= 1.1

+//= 1.2

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

 //= SVN eA

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

@@ -64,7 +64,7 @@ que_ng.gat,182,85,3	script	Mr.Garrison	109,{
 			mes "^FF000030000 Zeny^000000.";

 			next;

 			mes @npcname$;

-			if ( (countitem(999)<50) || (countitem(985)<3) || (countitem(984)<1) ||(countitem(1003)<50) || (countitem(7317)<20) || (Zeny < 30000) ) {

+			if ( (countitem(999)<50) || (countitem(985)<3) || (countitem(984)<1) || (countitem(1003)<50) || (countitem(7317)<20) || (Zeny < 30000) ) {

 				mes "Come back when you have the materials.";

 				close;

 			}

@@ -178,13 +178,232 @@ que_ng.gat,187,156,3	script	Tony	86,{
 }

 

 que_ng.gat,187,163,3	script	Ingrid	744,{

-	end;

+	set @npcname$,"[Ingrid]";

+

+	mes @npcname$;

+	mes "I can make the strongest of";

+	mes "all weapons. The ultimate";

+	mes "grenade launcher.";

+	mes "It's called ^0000FFInferno^000000.";

+	next;

+	if(BaseJob != Job_Gunslinger || BaseLevel < 65){

+		mes @npcname$;

+		mes "But I don't think you are";

+		mes "experienced enough to use it.";

+		next;

+		mes @npcname$;

+		mes "You'll probably kill yourself.";

+		mes "It's just too powerful to use";

+		mes "for a beginner. I refuse to";

+		mes "make one for you.";

+		close;

+	}

+	mes @npcname$;

+	mes "You look experienced.";

+	mes "I think I could make one";

+	mes "for you.";

+	next;

+	mes @npcname$;

+	mes "So, do you want me to make an";

+	mes "^0000FFInferno^000000 for you?";

+	next;

+

+	switch(select("Yes, please.","No thanks."))

+	{

+

+		case 1:

+			mes @npcname$;

+			mes "Okay, but first you need to";

+			mes "bring me the materials I need";

+			mes "to create one.";

+			next;

+			mes @npcname$;

+			mes "This is what I need:";

+			mes "^FF0000100 Used Iron Plates^000000,";

+			mes "^FF000010 Oridecons^000000,";

+			mes "^FF000050 Rusty Screws^000000,";

+			mes "^FF0000100 Burning Hearts^000000 and";

+			mes "^FF0000200000 Zeny^000000.";

+			next;

+			mes @npcname$;

+			if ( (countitem(7319)<100) || (countitem(984)<10) || (countitem(7317)<50) || (countitem(7097)<100) || (Zeny < 200000) ) {

+				mes "Come back when you have the materials.";

+				close;

+			}

+			mes "Oh, you already have the materials.";

+			next;

+			delitem 7319,100;

+			delitem 984,10;

+			delitem 7317,50;

+			delitem 7097,100;

+			set Zeny,Zeny-200000;

+			mes @npcname$;

+			mes "I need to be careful...";

+			mes "...";

+			mes "...";

+			next;

+			getitem 13162,1;

+			mes @npcname$;

+			mes "It's done.";

+			mes "Be careful with it.";

+			close;

+

+		case 2:

+			mes @npcname$;

+			mes "Probably a good choice.";

+			mes "It's really dangerous.";

+			close;

+	}

 }

 

 que_ng.gat,185,180,3	script	Vanessa	726,{

-	end;

+	set @npcname$,"[Vanessa]";

+

+	mes @npcname$;

+	mes "I can make a grenade launcher";

+	mes "that can destroy armors.";

+	mes "It's called ^0000FFDestroyer^000000.";

+	next;

+	if(BaseJob != Job_Gunslinger || BaseLevel < 52){

+		mes @npcname$;

+		mes "But I don't think you are";

+		mes "experienced enough to use it.";

+		next;

+		mes @npcname$;

+		mes "Come back when you think";

+		mes "you are worthy to use this";

+		mes "weapon.";

+		close;

+	}

+	mes @npcname$;

+	mes "You look experienced.";

+	mes "I think I could make one";

+	mes "for you.";

+	next;

+	mes @npcname$;

+	mes "So, do you want me to make a";

+	mes "^0000FFDestroyer^000000 for you?";

+	next;

+

+	switch(select("Yes, please.","No thanks."))

+	{

+

+		case 1:

+			mes @npcname$;

+			mes "Okay, but first you need to";

+			mes "bring me the materials I need";

+			mes "to create one.";

+			next;

+			mes @npcname$;

+			mes "This is what I need:";

+			mes "^FF000050 Used Iron Plates^000000,";

+			mes "^FF00005 Oridecons^000000,";

+			mes "^FF000070 Rusty Screws^000000 and";

+			mes "^FF0000100000 Zeny^000000.";

+			next;

+			mes @npcname$;

+			if ( (countitem(7319)<50) || (countitem(984)<5) || (countitem(7317)<70) || (Zeny < 100000) ) {

+				mes "Come back when you have the materials.";

+				close;

+			}

+			mes "Oh, you already have the materials.";

+			next;

+			delitem 7319,50;

+			delitem 984,5;

+			delitem 7317,70;

+			set Zeny,Zeny-100000;

+			mes @npcname$;

+			mes "I'll make it in a minute...";

+			mes "...";

+			mes "...";

+			next;

+			getitem 13160,1;

+			mes @npcname$;

+			mes "It's done.";

+			mes "Be careful with it.";

+			close;

+

+		case 2:

+			mes @npcname$;

+			mes "Oh well, your loss.";

+			close;

+	}

 }

 

 que_ng.gat,149,178,5	script	N.A	744,{

-	end;

+	set @npcname$,"[N.A]";

+

+	mes @npcname$;

+	mes "If you like gatling guns, I'm the";

+	mes "right person to talk to.";

+	mes "I can make a ^0000FFDrifter^000000.";

+	next;

+	if(BaseJob != Job_Gunslinger || BaseLevel < 55){

+		mes @npcname$;

+		mes "But I don't think you are";

+		mes "experienced enough to use it.";

+		next;

+		mes @npcname$;

+		mes "Come back when you think";

+		mes "you are worthy to use this";

+		mes "weapon.";

+		close;

+	}

+	mes @npcname$;

+	mes "You look experienced.";

+	mes "I think I could make one";

+	mes "for you.";

+	next;

+	mes @npcname$;

+	mes "So, do you want me to make a";

+	mes "^0000FFDrifter^000000 for you?";

+	next;

+

+	switch(select("Yes, please.","No thanks."))

+	{

+

+		case 1:

+			mes @npcname$;

+			mes "Okay, but first you need to";

+			mes "bring me the materials I need";

+			mes "to create one.";

+			next;

+			mes @npcname$;

+			mes "This is what I need:";

+			mes "^FF000070 Steels^000000,";

+			mes "^FF00005 Eluniums^000000,";

+			mes "^FF00003 Oridecons^000000,";

+			mes "^FF000070 Coals^000000,";

+			mes "^FF000050 Rusty Screws^000000 and";

+			mes "^FF000050000 Zeny^000000.";

+			next;

+			mes @npcname$;

+			if ( (countitem(999)<70) || (countitem(985)<5) || (countitem(984)<3) || (countitem(1003)<70) || (countitem(7317)<50) || (Zeny < 50000) ) {

+				mes "Come back when you have the materials.";

+				close;

+			}

+			mes "I see you came prepared.";

+			next;

+			delitem 999,70;

+			delitem 985,5;

+			delitem 984,3;

+			delitem 1003,70;

+			delitem 7317,50;

+			set Zeny,Zeny-50000;

+			mes @npcname$;

+			mes "Alright, you won't regret it...";

+			mes "...";

+			mes "...";

+			next;

+			getitem 13157,1;

+			mes @npcname$;

+			mes "It's done. Now shoot the";

+			mes "enemies with no mercy!";

+			close;

+

+		case 2:

+			mes @npcname$;

+			mes "Oh well, your loss.";

+			close;

+	}

 }
\ No newline at end of file