* Corrected some delitems in Kyel Hyre Quest. (bugreport:690)

* Corrected a Typo error in Yuno NPCs. (bugreport:716)
* Corrected a Typo error in Novice Training Ground. (bugreport:728)

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

4 files changed, 16 insertions, 8 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 5d7c2012b..4b41193d6 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,9 @@
 Date		Added
 ======
+2008/01/01
+	* Corrected some delitems in Kyel Hyre Quest. (bugreport:690) [Samuray22]
+	* Corrected a Typo error in Yuno NPCs. (bugreport:716)
+	* Corrected a Typo error in Novice Training Ground. (bugreport:728)
 2007/12/26
 	* More official Veins spawns [Playtester]
 2007/12/23
diff --git a/npc/cities/yuno.txt b/npc/cities/yuno.txt
index b6f263898..b23d3ebc6 100644
--- a/npc/cities/yuno.txt
+++ b/npc/cities/yuno.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= KitsuneStarwind, kobra_k88, L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.4
+//= 1.4a
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -19,6 +19,7 @@
 //= 1.3.3 Removed Noyee	NPC (it's implemented in sleipnir_seal.txt)
 //= 1.4 Updated to Aegis 10.3 standards. [L0ne_W0lf]
 //=	Added Juno Airship Representative.
+//= 1.4a Corrected a Typo error (bugreport:716) [Samuray22]
 //============================================================ 
 
 // Juno
@@ -29,10 +30,10 @@ yuno,184,173,4	script	Freidrich#juno	729,{
 		mes "^3355FFJuno^000000 is kept aloft in the air by an ancient and mysterious force.";
 		next;
 		mes "[Freidrich]";
-		mes "This power is said to come from a relic from an ancient civilization called ^3355FFJupheros^000000 which existed here long before Juno.";
+		mes "This power is said to come from a relic from an ancient civilization called ^3355FFJuperos^000000 which existed here long before Juno.";
 		next;
 		mes "[Freidrich]";
-		mes "Research revealed that Juno's power source based on ^3355FFPieces of Ymir's Heart^000000. I hear that this power source is found where Jupheros used to exist.";
+		mes "Research revealed that Juno's power source based on ^3355FFPieces of Ymir's Heart^000000. I hear that this power source is found where Juperos used to exist.";
 		next;
 		mes "[Freidrich]";
 		mes "Since many scholars have been coming to Juno to study and research this power source, our city is basically a well known mecca for scholars.";
diff --git a/npc/jobs/novice/novice.txt b/npc/jobs/novice/novice.txt
index cd9007e54..64233dbf1 100644
--- a/npc/jobs/novice/novice.txt
+++ b/npc/jobs/novice/novice.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Dr.Evil & MasterOfMuppets
 //===== Current Version: ===================================== 
-//= 1.7a
+//= 1.7b
 //===== Compatible With: ===================================== 
 //= eAthena SVN 3422+(Requires jA Script System)
 //===== Description: ========================================= 
@@ -20,6 +20,7 @@
 //= 1.6 Changed clone maps new_1-? -> new_zone0? [Lupus]
 //= 1.7 Now Kafra Tickets are given at correct NPC/Actions [Lupus]
 //= 1.7a a bit of optimization [Lupus]
+//= 1.7b Corrected a little Typo Error. (bugreport:728) [Samuray22]
 //============================================================ 
 
 //====================================================================
@@ -2915,7 +2916,7 @@ L_cancel:
 		set NOV_3_ARCHER,NOV_3_ARCHER+1;break;
 	case 3:	set NOV_3_MAGICIAN,NOV_3_MAGICIAN+1;
 		set NOV_3_THIEF,NOV_3_THIEF+1;
-		set NOV_3_MERCHAN,NOV_3_MERCHAN+1;	
+		set NOV_3_MERCHANT,NOV_3_MERCHAN+1;	
 	}
 	mes "[Hanson]";
 	mes "You happened to pick up";
diff --git a/npc/quests/Kiel_Hyre_Quest.txt b/npc/quests/Kiel_Hyre_Quest.txt
index 56cb53e59..88ee28130 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: ===================================== 
-//= 3.7
+//= 3.8
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -73,6 +73,7 @@
 //= 3.6 Keil Hyre removes ALL outstanding quest items when he is talked [L0ne_W0lf]
 //=	to after finishing the quest.
 //= 3.7 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
+//= 3.8 Corrected some delitems. (bugreport:690) [Samuray22]
 //============================================================ 
 //============================================================================
 // Kiel Hyre Quest/Robotic Lab Dungeon
@@ -5134,8 +5135,9 @@ kh_mansion,22,28,4	script	Kiel Hyre	903,{
 		delitem 7501,countitem(7501); //K.H's_Letter
 		delitem 7502,countitem(7502); //James's_Memo
 		delitem 7503,countitem(7503); //Portrait_of_a_Guy
-		delitem 7504,countitem(7505); //Power_Source
-		delitem 7505,countitem(7506); //Toy_Key
+		delitem 7504,countitem(7504); //Power_Source
+		delitem 7505,countitem(7505); //Toy_Key
+		delitem 7506,countitem(7506); //Black_Keycard
 		delitem 7508,countitem(7508); //Elysia_Ring
 		delitem 7516,countitem(7516); //Green_Keycard
 	}