* Updated Juno and Comodo NPCs.

- Updated Monster Museum NPCs as well.
- Updated doomed swords quest, moved unrelated NPCs to proper files.
- Added the end of the Comodo and Juno doomed swords quests.
* Fixed "[Kafra Employee]" being shown twice at one instance.
* Fixed the Geffen Inn NPC.
* Updated the NPC names for the Geffen Kafra.
* Updated the PVP script to official. Includes Event mode.
- Added warps for the PVP Cross room.

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

2 files changed, 6 insertions, 5 deletions

diff --git a/npc/kafras/functions_kafras.txt b/npc/kafras/functions_kafras.txt
index 21e084a06..9af24f42c 100644
--- a/npc/kafras/functions_kafras.txt
+++ b/npc/kafras/functions_kafras.txt
@@ -5,7 +5,7 @@
 //= Darlskies, Darkchild, Syrus22, Lupus, kobra_k88 (2.0)
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 5.7
+//= 5.8
 //===== Compatible With: ===================================== 
 //= eAthena 1.0
 //===== Description: =========================================
@@ -52,6 +52,7 @@
 //= 5.6a Corrected a few wrong names in the teleport function. [L0ne_W0lf]
 //= 5.7 Correced end message no longer displaying, and the duplicate names [L0ne_W0lf]
 //=	Thanks to Barron-Monster for pointing out the issues.
+//= 5.8 Fixed another double name bing shown when "saving" [L0ne_W0lf]
 //============================================================ 
 
 
@@ -517,7 +518,6 @@ function	script	F_KafEnd	{
 	mes "[Kafra Employee]";
 	//Save
 	if(getarg(1)==1) {
-		mes "[Kafra Employee]";
 		mes "Your Respawn Point";
 		mes "has been saved here";
 		mes getarg(2)+".";
diff --git a/npc/kafras/kafras_gef.txt b/npc/kafras/kafras_gef.txt
index 2e1ae6fcf..ea066d09b 100644
--- a/npc/kafras/kafras_gef.txt
+++ b/npc/kafras/kafras_gef.txt
@@ -3,7 +3,7 @@
 //===== By: =========================
 //= eAthena Dev Team
 //===== Current Version: ===================
-//= 2.4
+//= 2.5
 //===== Compatible With: =====================
 //= eAthena 1.0
 //===== Description: ============================================
@@ -24,11 +24,12 @@
 //= 2.4 Updated function calls with new arguments. [L0ne_W0lf]
 //=	Added unique Kafra Welcome messages.
 //=	Removed North and West Kafra
+//= 2.5 Fixed Kafra NPC names. [L0ne_W0lf]
 //=====================================================================
 
 
 // South =====================================
-geffen,120,62,0	script	Kafra::kaf_geffen	115,{
+geffen,120,62,0	script	Kafra Employee::kaf_geffen	115,{
 	cutin "kafra_03",2;
 	callfunc "F_KafSetGef";
 	mes "[Kafra Employee]";
@@ -44,7 +45,7 @@ geffen,120,62,0	script	Kafra::kaf_geffen	115,{
 }
 
 // East ==============================================
-geffen,203,123,2	script	Kafra::geffen2	114,{
+geffen,203,123,2	script	Kafra Employee::geffen2	114,{
 	cutin "kafra_04",2;
 	callfunc "F_KafSetGef";
 	mes "[Kafra Employee]";