* Added (finally) the official Inn Maid of Rachel. Save and warp points are official aswell, thanks to RockmanEXE [erKURITA]

* Added (finally) the Garrison quest npc. Item requirements are the official ones, but the quest... well you know. Thanks to RockmanEXE [erKURITA]

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

3 files changed, 90 insertions, 10 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index adb21c5a2..de1c19a6f 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -35,6 +35,11 @@ Playtester
 

 Date		Added

 ======

+08/14

+	* Added (finally) the official Inn Maid of Rachel. Save and warp points

+	  are official aswell, thanks to RockmanEXE [erKURITA]

+	* Added (finally) the Garrison quest npc. Item requirements are the official ones,

+	  but the quest... well you know. Thanks to RockmanEXE [erKURITA]

 08/13

 	* Finished Bio Ethics Quest, need bug testers before finalizing and moving to stable [Evera]

 	* Added Bio Ethics Quest variable to bit shift MISC_QUEST|64, and added to quest_variables.txt [Evera]

diff --git a/npc/cities/einbroch.txt b/npc/cities/einbroch.txt
index 59d10eeac..4602634f4 100644
--- a/npc/cities/einbroch.txt
+++ b/npc/cities/einbroch.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 

 //= Nexon

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

-//= 1.2

+//= 1.3

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

 //= eAthena Revision 3000+

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

@@ -24,6 +24,7 @@
 //= 1.0 Implemented the Lover's quest. [MasterOfMuppets]

 //= 1.1	Split quests into quests/cities_einbroch.txt [Evera]

 //= 1.2 Split more quests into above file [Evera]

+//= 1.3 Added (finally) the Garrison quest npc [erKURITA]

 //============================================================

 

 

@@ -836,13 +837,89 @@ OnTouch:
 	end;

 }

 

+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;

+	}

+}

 

 //| Temporal NPC locations until the text inside it has been obtained

 

-//que_ng.gat,182,85,2	script	TempNPC0	109,{

-//end;

-//}

-

 //que_ng.gat,187,149,3	script	TempNPC1	83,{

 //end;

 //}

diff --git a/npc/merchants/inn.txt b/npc/merchants/inn.txt
index b6dea80c5..bc86751e4 100644
--- a/npc/merchants/inn.txt
+++ b/npc/merchants/inn.txt
@@ -4,7 +4,7 @@
 //= Darkchild (1.1)

 //= Playtester (1.2)

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

-//= 1.4

+//= 1.3

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

 //= eAthena 1.0+

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

@@ -22,10 +22,8 @@
 //= 1.1a Minor bug fixes and optimizations. Switched from @variables 

 //= to arguments.[kobra_k88]

 //= 1.2 Rewrote inn script [Playtester]

-//= 1.3 Removed Duplicates [Silent]

-//= 1.4 Added Rachel Inn. Temporal NPC getarg(0) and warp location,

-//= 	  but the location and sprites are correct. Special thanks

-//=	  to RockmanEXE for the information. [erKURITA]

+//= 1.3 Added (finally) Rachel Inn Maid. Official warp

+//=	  and save points[erKURITA]

 //============================================================