* Rather large Kafra update. (May need further testing)

- Updated a good portion of the kafra functions.
- Added proper dialog for most functions.
- Updated guild Kafras and some o f their locations. 
* Updated all Guide NPCs. They are now mostly 100% official.
- Renamed some of the old files to make them look better, IE: yun to juno.
- Added Kunlun and Ayotaya guides.
* Added the Einbech tool Dealer since it seemed to had gotten lost when I updated shops.
* Updated Dye Maker and Hair Dyer to official. 

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

1 files changed, 27 insertions, 32 deletions

diff --git a/npc/kafras/kafras_gef.txt b/npc/kafras/kafras_gef.txt
index d05e2b02e..2e1ae6fcf 100644
--- a/npc/kafras/kafras_gef.txt
+++ b/npc/kafras/kafras_gef.txt
@@ -3,7 +3,7 @@
 //===== By: =========================
 //= eAthena Dev Team
 //===== Current Version: ===================
-//= 2.3
+//= 2.4
 //===== Compatible With: =====================
 //= eAthena 1.0
 //===== Description: ============================================
@@ -13,71 +13,66 @@
 //=    When set to 2 the Guild Kafra message is displayed. 
 //=  arg(1): Set to 1 to disable teleport menu option. Otherwise set to 0.
 //=  arg(2): Set to 1 to disable info menu.  Otherwise set to 0.
+//=  arg(3): Cost of Storage service
+//=  arg(4): Cost of Rent a Pushcart service
 //===== Additional Comments: ==========================================
 //= v1.1 Now using functions :)
 //= v2.1b Minor changes to function calls. Using arguments.
 //= This version uses arrays .[kobra_k88]
 //= 2.2 New warps and prices [Evera]
 //= 2.3 Can't save outside city [Evera]
+//= 2.4 Updated function calls with new arguments. [L0ne_W0lf]
+//=	Added unique Kafra Welcome messages.
+//=	Removed North and West Kafra
 //=====================================================================
 
 
 // South =====================================
-geffen,120,62,8	script	Kafra::kaf_geffen	115,{
+geffen,120,62,0	script	Kafra::kaf_geffen	115,{
 	cutin "kafra_03",2;
 	callfunc "F_KafSetGef";
-	callfunc "F_Kafra",0,0,0;
+	mes "[Kafra Employee]";
+	mes "Welcome~!";
+	mes "The Kafra Services";
+	mes "are always on your side.";
+	mes "So how can I help you?";
+	callfunc "F_Kafra",5,0,0,30,750;
 
 	M_Save:
 		savepoint "geffen",119,40;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Geffen";
 }
 
 // East ==============================================
-geffen,203,123,3	script	Kafra::geffen2	114,{
+geffen,203,123,2	script	Kafra::geffen2	114,{
 	cutin "kafra_04",2;
 	callfunc "F_KafSetGef";
-	callfunc "F_Kafra",0,0,0;
+	mes "[Kafra Employee]";
+	mes "Welcome!";
+	mes "The Kafra Corporation";
+	mes "will always support the";
+	mes "adventurers of Rune-Midgard";
+	mes "with its excellent service. So";
+	mes "what can I do for you today?";
+	callfunc "F_Kafra",5,0,0,30,750;
 
 	M_Save:
 		savepoint "geffen",200,124;
-		callfunc "F_KafEnd",0,1;
-}
-
-// North ==============================================
-geffen,116,202,3	script	Kafra::geffen3	116,{
-	cutin "kafra_02",2;
-	callfunc "F_KafSetGef";
-	callfunc "F_Kafra",0,0,0;
-
-	M_Save:
-		savepoint "geffen",110,199;
-		callfunc "F_KafEnd",0,1;
-}
-
-// West =========================================
-geffen,37,116,6	script	Kafra::geffen4	117,{
-	cutin "kafra_01",2;
-	callfunc "F_KafSetGef";
-	callfunc "F_Kafra",0,0,0;
-
-	M_Save:
-		savepoint "geffen",43,108;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Geffen";
 }
 
 
 // Function: Sets variables for Geffen Kafras -------------------
 function	script	F_KafSetGef	{
 	cleararray @wrpC$[0],"",getarraysize(@wrpC$);
-	setarray @wrpD$[0], "Prontera", "Al De Baran", "Orc Dungeon", "Coal Mine(Dead Pit)";
+	setarray @wrpD$[0], "Prontera", "Al De Baran", "Orc Dungeon", "Mjolnir Dead Pit";
 	setarray @wrpP[0], 1200, 1200, 1200, 1700;
 	set @wrpC$[0], @wrpD$[0]+" -> "+@wrpP[0];
 	set @wrpC$[1], @wrpD$[1]+" -> "+@wrpP[1];
 	set @wrpC$[2], @wrpD$[2]+" -> "+@wrpP[2];
 	set @wrpC$[3], @wrpD$[3]+" -> "+@wrpP[3];
 	set @wrpC$[4], "Cancel";
-	setarray @viewpX[0], 120, 203, 116, 37;
-	setarray @viewpY[0], 62, 123, 202, 116;
+	setarray @viewpX[0], 120, 203;
+	setarray @viewpY[0], 62, 123;
 	return;
 }