* Kiel Hyre quest fixes.

- Fixed a typo in Elly, in her room. (<= should have been <) 
- Added an 'end;' to the cookie basket. Kiel Hyre's final dialog will now delete all quest-related items.
* Complete rewrite of the Kiel Hyre warps. (warps/other/kiel.txt)

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

1 files changed, 29 insertions, 4 deletions

diff --git a/npc/quests/Kiel_Hyre_Quest.txt b/npc/quests/Kiel_Hyre_Quest.txt
index 0c6cbb72c..9be3662d2 100644
--- a/npc/quests/Kiel_Hyre_Quest.txt
+++ b/npc/quests/Kiel_Hyre_Quest.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf (Script), DZeroX (Timer)
 //===== Current Version: ===================================== 
-//= 2.9
+//= 3.0
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -60,6 +60,9 @@
 //=	Will add further improper dialogs as I get to them on the second runthrough of the quest.
 //= 2.8a minor optimization with extra goto, else or empty switch [Lupus]
 //= 2.9 Fixed the "enablenpc problem with the missing spaces. No idea how it happened. [L0ne_W0lf]
+//= 3.0 Fixed a typo in Elly, in her room. (<= should have been <) [L0ne_W0lf]
+//=	Added an 'end;' to the cookie basket. Kiel Hyre's final dialog will now delete all quest-related items.
+//=	
 //============================================================ 
 
 //============================================================================
@@ -930,7 +933,7 @@ kh_school,176,60,4	script	Lady::LadyKHQ	101,{
 			mes "may go now, and please";
 			mes "don't wander needlessly";
 			mes "around the academy.";
-			delitem 7487,1;
+			delitem 7487,1; //Culinary_Wine
 			set KielHyreQuest,4;
 			close;
 
@@ -1639,7 +1642,7 @@ kh_school,178,180,5	script	Elly	895,{
 		close;
 	}
 
-	if (KielHyreQuest <= 30) {
+	if (KielHyreQuest < 30) {
 		mes "[Elly]";
 		mes "Oh~!";
 		mes "Who are you!";
@@ -1858,6 +1861,7 @@ kh_school,175,175,0	script	Cookie Basket	111,{
 		mes "^3355FFthen they're a little cold.^000000";
 		close;
 	}
+	end;
 }
 
 //----------------------------------------------------------------------------
@@ -2315,7 +2319,7 @@ kh_vila,16,175,0	script	Box::BoxKHQ1	111,{
 				mes "^3355FFat all! It's just^000000";
 				mes "^3355FFnormal Pet Food!^000000";
 				set zeny,zeny-1100;
-				getitem 537,1;
+				getitem 537,1;	//Pet_Food
 				close;
 			}
 
@@ -7451,6 +7455,27 @@ kh_kiehl02,50,52,4	script	Kiehl#Original	902,{
 	else {
 		mes "......";
 		close2;
+		delitem 7487,1; //Culinary_Wine
+		delitem 7488,1; //Delivery_Package
+		delitem 7489,1; //Cottage Key
+		delitem 7493,1; //Golden_Key
+		delitem 7494,1; //Exquisite_Button
+		delitem 7495,1; //Blue_Keycard
+		delitem 7490,1; //Letter to Elly
+		delitem 7492,1; //Yellow_Keycard
+		delitem 7516,1;	//Green_Keycard
+		delitem 7491,1; //Iron_Box
+		delitem 7496,1; //Red_Keycard
+		delitem 7497,1; //Metal_Fragment
+		delitem 7504,1; //Power_Source
+		delitem 7498,1; //Losimier's_House_Key
+		delitem 7499,1; //Portrait_of_a_Family
+		delitem 7500,1; //Portrait_of_a_Lady
+		delitem 7501,1; //K.H's_Letter
+		delitem 7502,1; //James's_Memo
+		delitem 7503,1;	//Portrait_of_a_Guy
+		delitem 7505,1; //Toy_Key
+		delitem 7508,1; //Elisia's_Ring
 		cutin "",255;
 		end;
 	}