* 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

12 files changed, 713 insertions, 335 deletions

diff --git a/npc/kafras/functions_kafras.txt b/npc/kafras/functions_kafras.txt
index cf36e5e53..aa2290072 100644
--- a/npc/kafras/functions_kafras.txt
+++ b/npc/kafras/functions_kafras.txt
@@ -4,7 +4,7 @@
 //= eAthena Dev Team
 //= Darlskies, Darkchild, Syrus22, Lupus, kobra_k88 (2.0)
 //===== Current Version: ===================================== 
-//= 5.4b
+//= 5.5b
 //===== Compatible With: ===================================== 
 //= eAthena 1.0
 //===== Description: =========================================
@@ -46,6 +46,8 @@
 //= 5.5 Added proper Niflheim welcome message.	[L0ne_W0lf]
 //=	Cleaned up the menus a bit. Got rid of the proceeding "-" prefix.
 //= 5.5b Missed a preceeding hyphen, which was screwing up teleporting. [L0ne_W0lf]
+//= 5.6 Further dialog updates, added  dynamic costs for cart and storage use. [L0ne_W0lf]
+//=	Updated some functions to handle Guild Kafras the way they should. 
 //============================================================ 
 
 
@@ -53,12 +55,16 @@
 //=   arg(0): Used to determine which welcome message to show.
 //=   arg(1): Used to determine which menu to display.
 //=   arg(2): Used to determine if the info menu is shown in F_KafInfo.
+//=   arg(3): Cost to use Storage
+//=   arg(4): Cost to Rent a Pushcart
 //==========================================================================
 function	script	F_Kafra	{
 	callfunc "F_ClearGarbage"; //Clear outdated, unused variables
 
-	mes "[Kafra]";
+	//Display Kafra Welcome Message
+	mes "[Kafra Employee]";
 	switch(getarg(0)){
+		//Default message (obsolete)
 		default:
 		case 0:
 			mes "Welcome to the";
@@ -67,66 +73,86 @@ function	script	F_Kafra	{
 			mes "are always on your side.";
 			mes "How may I assist you?";
 			break;
-		//Niflheim
+
+		//Niflheim specific message
 		case 1:
 			mes "^666666W-weeeelc-c-come";
 			mes "to th-the K-kaaafrrrra";
 			mes "C-coorpoor-r-ratioooonn...^000000";
 			break;
-		//Guilds Castles
+
+		//Guild Castle Kafra message
 		case 2:
 	 		mes "Welcome. ^ff0000" + GetGuildName(@GID) + "^000000 Member.";
 			mes "The Kafra Coporation will stay with you wherever you go.";
 			break;
-		//Amatsu
+
+		//Amatsu specific message (obsolete)
 		case 3:
 			mes "So, have you come from a faraway land to study our culture, or are you just sightseeing?";
 			mes "In either case, why not stay awhile?";
 			mes "The air is eternally heavy with the";
 			mes "scent of pleasant wildflowers.";
 			break;
-		//Louyang, Ayothaya
+
+		//Louyang and Ayothaya specific message (obsolete)
 		case 4:
 			mes "With our many Kafra";
 			mes "service locations, you're never";
 			mes "far from home.";
 			break;
+
+		//NPC has it's own welcome message. (Display nothing)
+		case 5:
+			break;
 	}
 	next;
 
 	M_Menu:
 		cleararray @K_Menu0$[0],"",7;
 	switch(getarg(1)){
-		//only Save & Storage
+		// Save and Storage only
 		case 1:
 			setarray @K_Menu0$[0],"Save","Use Storage","Cancel";
 			break;
-		//only Storage
+
+		// Storage only
 		case 2:
 			setarray @K_Menu0$[0],"Use Storage","Cancel";
 			break;
-		//Common w/o teleport
+
+		// No Teleport (Common)
 		case 3: 
 			setarray @K_Menu0$[0],"Save","Use Storage","Rent a Pushcart","Guide","Check Other Information","Cancel";
 			break;
-		//Case 4 is Einbroch no tele message.
-		//Common w/o save and teleport
+
+		// Case 4 is Einbroch no tele message.
+
+		// No save, or teleport. (Common)
 		case 5:
 			setarray @K_Menu0$[0],"Use Storage","Rent a Pushcart","Check Other Information","Guide","Cancel";
 			break;
-		//Only storage and other info check
+
+		// Storage and Check Other Information only.
 		case 6:
 			setarray @K_Menu0$[0],"Use Storage","Guide","Check Other Information","Cancel";
 			break;
-		//Common Kafra
+
+		// Save, Storage, and Pushcart only (Kafra Warehouse)
+		case 7:
+			setarray @K_Menu0$[0],"Save","Use Storage","Rent a Pushcart","Cancel";
+			break;
+
+		// Common Kafra Employee
 		default:
 			setarray @K_Menu0$[0],"Save","Use Storage","Use Teleport Service","Rent a Pushcart","Guide","Check Other Information","Cancel";
 			break;
 	}
+
+	// Guild Kafra Menu override (free Teleport, free Storage, Free Cart)
 	if(getarg(0)==2) {
-	//Guilds Kafra (free Teleport, free Storage, Free Cart)
 		cleararray @K_Menu0$[0],"",7;
-		setarray @K_Menu0$[0],"Use Storage","Use Guild Storage","Rent a Cart","Use Teleport Service","Cancel";
+		setarray @K_Menu0$[0],"Use Storage","Use Guild Storage","Rent a Pushcart","Use Teleport Service","Cancel";
 	}
 	menu 	@K_Menu0$[0],K_Menu0,@K_Menu0$[1],K_Menu1,@K_Menu0$[2],K_Menu2,
 		@K_Menu0$[3],K_Menu3,@K_Menu0$[4],K_Menu4,@K_Menu0$[5],K_Menu5,
@@ -157,18 +183,23 @@ function	script	F_Kafra	{
 	K_Menuf:
 		if (@K_Menu0$[@num] == "Save") return;
 		if (@K_Menu0$[@num] == "Use Storage"){
-			//Don't charge for a common Kafra Storage in your Castle
-			if(getarg(0) == 2) callfunc "F_KafStor",2;
-			else callfunc "F_KafStor",0;
+			// Do not charge for Guild Storage
+			if(getarg(0) == 2) callfunc "F_KafStor",2,0,0;
+			else callfunc "F_KafStor",0,getarg(3),getarg(0);
 			next;
 			goto M_Menu;
 		}
 		if (@K_Menu0$[@num] == "Use Teleport Service"){
-			if(getarg(1) == 4){				//Check for Einbroch Tele notice
-				mes "[Kafra]";
-				mes "Because of the ^FF0000Limited Transport Agreement^000000, the Kafra Corporation cannot provide Teleport Services in the Schwarzwald Republic.";
+			// Display Einbroch "No Teleport Service" notice.
+			if(getarg(1) == 4){
+				mes "[Kafra Employee]";
+				mes "Because of the ^FF0000Limited";
+				mes "Transport Agreement^000000, the";
+				mes "Kafra Corporation cannot";
+				mes "provide Teleport Services";
+				mes "in the Schwaltzvalt Republic.";
 				next;
-				mes "[Kafra]";
+				mes "[Kafra Employee]";
 				mes "We ask that you please";
 				mes "use the Airship Service";
 				mes "instead. Thank you for your";
@@ -180,7 +211,7 @@ function	script	F_Kafra	{
 			goto M_Menu;
 		}
 		if (@K_Menu0$[@num] == "Rent a Pushcart"){
-			if(callfunc("F_KafCart",getarg(0)) == 1) next;
+			if(callfunc("F_KafCart",getarg(0),getarg(4)) == 1) next;
 			goto M_Menu;
 		}
 		if (@K_Menu0$[@num] == "Guide"){
@@ -197,7 +228,7 @@ function	script	F_Kafra	{
 			end;
 		}
 		if (@K_Menu0$[@num] == "Use Guild Storage"){
-			callfunc "F_KafStor",1;
+			callfunc "F_KafStor",1,0;
 			next;
 			goto M_Menu;
 		}
@@ -207,9 +238,10 @@ function	script	F_Kafra	{
 
 // Storage Function =======================================================
 function	script	F_KafStor	{
+	// Unable to access Guild Storage (Busy)
 	if(getarg(0) == 1){
 		if(guildopenstorage(0) == 1){
-			mes "[Kafra]";
+			mes "[Kafra Employee]";
 			mes "I'm sorry but another guild member is using the guild storage";
 			mes "right now.  Please wait until that person is finished.";
 			close2;
@@ -219,30 +251,74 @@ function	script	F_KafStor	{
 		cutin "", 255;
 		close;
 	}
+
+	// Unable to access Normal Storage (Insufficient Basic Skills)
 	if(basicskillcheck() && getskilllv(1) < 6){
-		mes "[Kafra]";
-		mes "I am sorry but you have to be at least Novice level 6 if you want to use the storage.";
+		mes "[Kafra Employee]";
+		// Niflheim Specific Message
+		if (getarg(2) == 1) {
+			mes "^666666S-s-ssoooorry,";
+			mes "y-you're a-a-aaaa";
+			mes "Nooviiice... N-neeeds";
+			mes "B-basic sssskill l-level 6...^000000";
+			return;
+		}
+		mes "I'm sorry, but you";
+		mes "need the Novice's";
+		mes "Basic Skill Level 6 to";
+		mes "use the Storage Service.";
 		return;
 	}
-	//don't charge for common storage in Castle
+
+	// Accessing Normal Storage (Skipped if accessing Storage from Guild castle)
 	if(getarg(0) != 2){
-		//we'll use Free Ticket for Kafra Storage if available
-		if(countitem(7059)){
-			delitem 7059,1;
-		} else {
-			if(Zeny<40){
-				mes "[Kafra]";
-				mes "Dear you don't have enough money. The Storage fee is 40 Zeny.";
+		// Consume "Free Ticket for Kafra Storage" if available.
+		if(countitem(7059)) delitem 7059,1;
+		else {
+			if(Zeny<getarg(1)){
+				mes "[Kafra Employee]";
+				// Niflheim Specific Message
+				if (getarg(2) == 1) {
+					percentheal -50,-50;
+					mes "^666666Zeeeeeny...";
+					mes "M-more z-zeny...!";
+					mes "N-neeed 150... zeny...";
+					mes "Ergh! T-taking bl-blood~!^000000";
+					return;
+				}
+				//Standard Message
+				mes "I'm sorry, but you don't";
+				mes "have enough zeny to use";
+				mes "the Storage Service. Our";
+				mes "Storage access fee is "+getarg(1)+" zeny.";
 				return;
 			}
-			set Zeny, Zeny-40;
-			set RESRVPTS, RESRVPTS + (40/5);
+			set Zeny, Zeny-getarg(1);
+			set RESRVPTS, RESRVPTS + (getarg(1)/5);
 		}
 	}
-	mes "[Kafra]";
-	mes "Close this window to open your storage.";
-	mes "We hope to see you again soon.";
 
+	// Surpress the "End" message if in guild castle.
+	if (getarg(0) != 2) {
+		// Niflheim specific Message
+		if (getarg(2) == 1) {
+			percentheal 0,-10;
+			mes "[Kafra Employee]";
+			mes "^666666Thank you.. for... using...";
+			mes "Thank you.. for... using...";
+			mes "Thank you.. for... using...";
+			mes "Thank you.. for... using...";
+			mes "Thank you.. for... using...^000000";
+		}
+		// Normal message
+		else {
+			mes "[Kafra Employee]";
+			mes "Here, let me open";
+			mes "your Storage for you.";
+			mes "Thank you for using";
+			mes "the Kafra Service.";
+		}
+	}
 	callfunc("F_CheckKafCode");	//check your storage password, if set
 
 	close2;
@@ -254,8 +330,9 @@ function	script	F_KafStor	{
 
 // Teleport Function ==================================================
 function	script	F_KafTele	{
-	mes "[Kafra]";
-	mes "Please set your destination.";
+	mes "[Kafra Employee]";
+	mes "Please choose";
+	mes "your destination.";
 	next;
 
 	menu 	@wrpC$[0],M_Wrp0, @wrpC$[1],M_Wrp1, @wrpC$[2],M_Wrp2, @wrpC$[3],M_Wrp3, 
@@ -284,14 +361,16 @@ function	script	F_KafTele	{
 
 	L_Warp:
 		if (@wrpC$[@num] == "Cancel") return;
-		// we'll use Free Ticket for Kafra Transportation if available
-		if(countitem(7060)){
-			delitem 7060,1;
-		} else {
+		// Consume "Free Ticket for Kafra Transportation" if available.
+		// Do not consume if in Guild castle
+		if(countitem(7060) > 0 && getarg(0) != 2) delitem 7060,1;
+		else {
 			if (Zeny<@wrpP[@num]){
-				mes "[Kafra]";
-				mes "Dear you don't have enough money. Please check your funds again.";
-				emotion e_cash;
+				mes "[Kafra Employee]";
+				mes "I'm sorry, but you don't have";
+				mes "enough zeny for the Teleport";
+				mes "Service. The fee to teleport";
+				mes "to "+@wrpD$[@num]+" is "+@wrpP[@num]+" zeny.";
 				close2;
 				cutin "", 255;
 				end;
@@ -320,56 +399,59 @@ function	script	F_KafTele	{
 
 // Cart Function ========================================================
 function	script	F_KafCart	{
+	// Ensure that the class wanting to rent a pushcart is a merchant
 	if(baseClass != Job_Merchant){
-		mes "[Kafra]";
-		mes "I'm sorry dear.  The Cart service is only provided for the Merchant and Blacksmith Class.";
-		return 1;
-	}
-	if(getskilllv(39)==0){
-		mes "[Kafra]";
-		mes "I'm sorry but you need the skill ^0000FF'Pushcart'^000000 to rent a cart.";
+		mes "[Kafra Employee]";
+		mes "I'm sorry, but the";
+		mes "Pushcart rental service";
+		mes "is only available to Merchants,";
+		mes "Blacksmiths, Master Smiths,";
+		mes "Alchemists and Biochemists.";
 		return 1;
 	}
-	if(checkcart() == 1){
-		mes "[Kafra]";
-		mes "Excuse me... but you already have a cart....";
-		emotion e_swt;
+	// Make sure the invoking character does not have a cart already
+	else if(checkcart() == 1){
+		mes "[Kafra Employee]";
+		mes "You already have";
+		mes "a Pushcart equipped.";
+		mes "Unfortunately, we can't";
+		mes "rent more than one to";
+		mes "each customer at a time.";
 		return 1;
 	}
-	//get Cart in Guild for free
-	if(getarg(0) == 2) goto L_FreeCart;
-	//use Free Ticket for the Cart Service if available
-	if(countitem(7061)){
-		delitem 7061,1;
-		goto L_FreeCart;
+
+	// Consume "Free Ticket for the Cart Service" if available.
+	// Do not consume if in Guild castle.
+	if(countitem(7061) > 0 && getarg(0) != 2) delitem 7061,1;
+	else {
+		mes "[Kafra Employee]";
+		mes "The Pushcart rental";
+		mes "fee is "+getarg(1)+" zeny. Would";
+		mes "you like to rent a Pushcart?";
+		next;
+		menu "Rent a Pushcart.",-, "Cancel.",M_End;
+			if(Zeny<getarg(1)){
+				mes "[Kafra Employee]";
+				mes "I'm sorry, but you";
+				mes "don't have enough";
+				mes "zeny to pay the Pushcart";
+				mes "rental fee of "+getarg(1)+" zeny.";
+				return 1;
+			}
+			set Zeny,Zeny-getarg(1);
+			set RESRVPTS, RESRVPTS + 48;
 	}
-	mes "[Kafra]";
-	mes "The Cart Fee is 800 Zeny.  Do you want to Rent a Cart?";
-	next;
-	menu "-Rent a Cart.",-, "-Cancel.",M_End;
+	setcart;
+	return 1;
 
-		if(Zeny<800){
-			mes "[Kafra]";
-			mes "Dear, you don't have enough Money. You need 800 Zeny.";
-			emotion e_cash;
-			return 1;
-		}
-		set Zeny,Zeny-800;
-		set RESRVPTS, RESRVPTS + 48;
-	L_FreeCart:
-		setcart;
-		mes "[Kafra]";
-		mes "Here is your cart.";
-		return 1;
-	M_End:
-		return 0;
+M_End:
+	return 0;
 }
 
 
 // Pass Function ===============================================================
 function	script	F_KafGuide	{
-
-	mes "[Kafra]";
+	mes "[Kafra Employee]";
 	mes "WIP...";
 	return;
 }
@@ -379,25 +461,26 @@ function	script	F_KafInfo	{
 
 	sM_Menu:
 //Uncomment next line to block Kafra Storage Protection
-//	if(getarg(0) == 0) menu "-Special Reserve Check",sM_ResChk, "-Kafra Locations",sM_KafLoc, "-Cancel",sM_End;
-	if(getarg(0) == 0) menu "-Special Reserve Check",sM_ResChk, "-Storage Password Service",sM_KafCode, "-Kafra Locations",sM_KafLoc, "-Cancel",sM_End;
+//	if(getarg(0) == 0) menu "Check Special Reserve Points.",sM_ResChk, "Kafra Employee Locations",sM_KafLoc, "Cancel",sM_End;
+	if(getarg(0) == 0) menu "Check Special Reserve Points.",sM_ResChk, "Storage Password Service",sM_KafCode, "Kafra Employee Locations",sM_KafLoc, "Cancel",sM_End;
 
 	sM_ResChk:
-		mes "[Kafra]";
-		mes "Here is your current amount of special reserve points:";
-		mes "^0000ff"+RESRVPTS+"^000000.";
-		next;
-		mes "[Kafra]";
-		mes "Remember to continue using Kafra services such as Storage and Teleport, to earn more special reserve points.";
+		mes "[Kafra Employee]";
+		mes "Let's see...";
+		mes strcharinfo(0) + "...";
+		mes "Ah, you have a total of";
+		mes RESRVPTS+ " Special Reserve Points.";
 		next;
-		mes "[Kafra]";
-		mes "You can trade them in at the Kafra Main Office in Al De Baran for useful items and cool prizes.";
+		mes "[Kafra Employee]";
+		mes "You can exchange your";
+		mes "Special Reserve Points for";
+		mes "rewards at the Kafra Main Office in Al De Baran. Please use our";
+		mes "convenient services to see the benefits of our rewards program.";
 		next;
 		if(getarg(0) == 1) return;
 		goto sM_Menu;
+
 	sM_KafLoc:
-		mes "[Kafra]";
-		mes "The flashing signals on your mini-map point to the locations of all of the Kafra Agents in this city.";
 		viewpoint 1,@viewpX[0],@viewpY[0],1,0xFF00FF;
 		viewpoint 1,@viewpX[1],@viewpY[1],2,0xFF00FF;
 		viewpoint 1,@viewpX[2],@viewpY[2],3,0xFF00FF;
@@ -420,16 +503,36 @@ function	script	F_KafInfo	{
 // End Function =====================================================
 //  arg(0): used to determine what message to display.
 //  arg(1): used to determine if save message is displayed.
+//  arg(2): used to display the name of the area you're saving in.
 //===================================================================
 function	script	F_KafEnd	{
-	mes "[Kafra]";
-	if(getarg(1)==1) mes "Your respawn point has been saved.";		// only shown when a player uses save
-	if(getarg(0)!=1) mes "Thank you for using Kafra Services.  We hope to see you again soon.";
-	if(getarg(0)==1) mes "We, Kafra Corporation.... Will be with you.... whenever.... wherever... therefore.... please don't forget us.....";
+	mes "[Kafra Employee]";
+	//Save
+	if(getarg(1)==1) {
+		mes "[Kafra Employee]";
+		mes "Your Respawn Point";
+		mes "has been saved here";
+		mes getarg(2)+".";
+		mes "Thank you for using";
+		mes "the Kafra Services.";
+	}
+
+	// Generic End
+	else if(getarg(0)==0) {
+		mes "We, here at Kafra Corporation,";
+		mes "are always endeavoring to provide you with the best services. We hope that we meet your adventuring needs and standards of excellence.";
+	}
+
+	// Niflheim End
+	else if(getarg(0)==1) {
+		percentheal 0,- 25;
+		mes "^666666Kaffffra n-never";
+		mes "diiiiiiiiiiiiiies. On...";
+		mes "On y-yooour siiiiide~^000000";
+	}
+
 	close2;
 	cutin "", 255;
-	emotion e_thx;
-	close;
 	end;
 }
 
@@ -452,7 +555,7 @@ function	script	F_CheckKafCode	{
 
 // Set / Change / Clear Storage Password Function ====================
 function	script	F_SetKafCode	{
-	mes "[Kafra]";
+	mes "[Kafra Employee]";
 	if(#kafra_code) {
 		mes "Your storage is protected with a password. What would you do now?";
 		next;
@@ -467,7 +570,7 @@ function	script	F_SetKafCode	{
 		"Cancel",M_END;
 	}
 
-	mes "[Kafra]";
+	mes "[Kafra Employee]";
 	mes "At first, please enter your ^0000FFold password^000000.";
 	set @code,callfunc("F_EntKafCode");
 	if(@code==0 || @code != #kafra_code-getcharid(3)-1337) {
@@ -478,7 +581,7 @@ function	script	F_SetKafCode	{
 	next;
 
 M_SET:
-	mes "[Kafra]";
+	mes "[Kafra Employee]";
 	mes "Now enter your ^FF0000new password^000000 to protect your storage from thieves.";
 	set @code,callfunc("F_EntKafCode");
 	if(@code==0) {
@@ -487,7 +590,7 @@ M_SET:
 		goto M_END;
 	}
 	next;
-	mes "[Kafra]";
+	mes "[Kafra Employee]";
 	if(Zeny < 5000) goto L_ZENY;
 	set Zeny,Zeny-5000;
 	set RESRVPTS, RESRVPTS + (5000/50);
@@ -499,7 +602,7 @@ M_SET:
 	goto M_END;	
 
 M_CLEAR:
-	mes "[Kafra]";
+	mes "[Kafra Employee]";
 	mes "Please, enter your password before its removal.";
 	set @code,callfunc("F_EntKafCode");
 	if(@code==0) {
@@ -508,7 +611,7 @@ M_CLEAR:
 		goto M_END;
 	}
 	next;
-	mes "[Kafra]";
+	mes "[Kafra Employee]";
 	if(Zeny < 1000) goto L_ZENY;
 	set Zeny,Zeny-1000;
 	set RESRVPTS, RESRVPTS + (1000/50);
diff --git a/npc/kafras/kafras_alb.txt b/npc/kafras/kafras_alb.txt
index cd3c95772..190665407 100644
--- a/npc/kafras/kafras_alb.txt
+++ b/npc/kafras/kafras_alb.txt
@@ -3,7 +3,7 @@
 //===== By: =========================
 //= eAthena Dev Team
 //===== Current Version: ===================
-//= 2.3
+//= 2.4
 //===== Compatible With: =====================
 //= eAthena 1.0
 //===== Description: ============================================
@@ -13,35 +13,52 @@
 //=    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 Teleport list and prices [Lupus]
 //= 2.3 Can't save outside city anymore [Evera]
+//= 2.4 Updated function calls with new arguments. [L0ne_W0lf]
+//=	Added unique Kafra Welcome message.
 //=====================================================================
 
 
 // NorthWest -----------------------------------------------------------------
-alberta,28,229,8	script	Kafra::kaf_alberta	115,{
-	cutin "kafra_03",2;
+alberta,28,229,0	script	Kafra Employee::kaf_alberta	116,{
+	cutin "kafra_02",2;
 	callfunc "F_KafSetAlb";
-	callfunc "F_Kafra",0,0,0;
+	mes "[Kafra Employee]";
+	mes "Welcome to the";
+	mes "Kafra Corporation.";
+	mes "Kafra's Employees are";
+	mes "always ready to serve you.";
+	mes "How can I help you today?";
+	callfunc "F_Kafra",5,0,0,50,850;
 
 	M_Save:
 		savepoint "alberta",31,231;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Alberta";
 }
 
 // South ---------------------------------------------------------------------
-alberta,113,60,5	script	Kafra::kaf_alberta2	112,{
+alberta,113,60,6	script	Kafra Employee::kaf_alberta2	112,{
 	cutin "kafra_06",2;
 	callfunc "F_KafSetAlb";
-	callfunc "F_Kafra",0,0,0;
+	mes "[Kafra Employee]";
+	mes "Welcome to the";
+	mes "Kafra Corporation~";
+	mes "The Kafra Services are";
+	mes "always here to support";
+	mes "you. So how can I be";
+	mes "of service today?";
+	callfunc "F_Kafra",5,0,0,50,850;
 
 	M_Save:
 		savepoint "alberta",117,57;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Alberta";
 }
 
 
diff --git a/npc/kafras/kafras_alde.txt b/npc/kafras/kafras_alde.txt
index 7ae7a6d8b..3d1de5ed7 100644
--- a/npc/kafras/kafras_alde.txt
+++ b/npc/kafras/kafras_alde.txt
@@ -3,7 +3,7 @@
 //===== By: ============================
 //= eAthena Dev Team
 //===== Current Version: =======================
-//= 2.2
+//= 2.3
 //===== Compatible With: ============================
 //= eAthena 1.0
 //===== Description: ============================================
@@ -13,39 +13,123 @@
 //=    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 teleport destinations, prices [Lupus]
+//= 2.3 Updated function calls with new arguments. [L0ne_W0lf]
+//=	Kafra Leilah is now a full NPC and no longer uses functions.
+//=	Added unique Kafra Welcome message.
+//=	Changed "Yuno" to "Juno"
 //=====================================================================
 
-
 // Kafra Main Office (Kafra Leilah) ------------------------------------
-aldeba_in,96,181,4	script	Kafra Leilah	113,{
+aldeba_in,96,181,4	script	Kafra Service	113,{
 	cutin "kafra_05",2;
-	callfunc "F_Kafra",0,2,1;
-
-	M_Save:
+	mes "[Kafra Leilah]";
+	mes "Hm...?";
+	mes "Oh, welcome to";
+	mes "the Kafra Corporation";
+	mes "Headquarters. Did you";
+	mes "need something?";
+	next;
+	switch(select("Save:Use Storage:Rent a Pushcart:Cancel")) {
+	case 1:
+		mes "[Kafra Leilah]";
+		mes "Your Respawn Point has";
+		mes "been saved here, inside";
+		mes "of the Kafra Corporation";
+		mes "Headquarters. Thank you.";
+		next;
 		savepoint "aldeba_in",96,179;
-		callfunc "F_KafEnd",0,1;
-
+		mes "[Kafra Leilah]";
+		mes "Please make use of";
+		mes "the Kafra Services that are";
+		mes "available throughout all of";
+		mes "Rune Midgard. Thank you for";
+		mes "visiting the Kafra Headquarters.";
+		close2;
+		break;
+	case 2:
+		if (zeny < 20) {
+			mes "[Kafra Leilah]";
+			mes "Excuse me, but it";
+			mes "seems that you don't";
+			mes "have the 20 zeny to pay";
+			mes "the Storage access fee...";
+		}
+		mes "[Kafra Leilah]";
+		mes "Although this facility is";
+		mes "exclusively intended for";
+		mes "the training of Kafra Employee";
+		mes "and administrative functions,";
+		mes "I'll access your Storage for you.";
+		next;
+		set zeny,zeny-20;
+		set RESRVPTS, RESRVPTS + (20/5);
+		mes "[Kafra Leilah]";
+		mes "In the future, please";
+		mes "ask the Kafra Employee on";
+		mes "duty if you wish to use";
+		mes "any of the Kafra Services.";
+		mes "Thank you for your patronage.";
+		close2;
+		openstorage;
+		break;
+	case 3:
+		mes "[Kafra Leilah]";
+		mes "My apologies, but I'm";
+		mes "not on duty. I'd assist you";
+		mes "if I could, but actually don't";
+		mes "have any available Pushcarts.";
+		mes "Why don't you ask another Kafra";
+		mes "Employee for assistance?";
+		next;
+		mes "[Kafra Leilah]";
+		mes "Kafra Employees are";
+		mes "stationed all over the";
+		mes "Rune Midgard continent,";
+		mes "and you should be able to find";
+		mes "plenty outside in Al De Baran.";
+		close2;
+		break;
+	case 4:
+		mes "[Kafra Leilah]";
+		mes "^666666*Whew...*^000000";
+		mes "Great, because I'm";
+		mes "actually on my break";
+		mes "right now. Choosing";
+		mes "''Cancel'' was a good";
+		mes "move on your part.";
+		close2;
+		break;
+	}
+	cutin "",255;
+	end;
 }
 
-// South --------------------------------------------------
-aldebaran,143,119,4	script	Kafra::kaf_aldebaran	113,{
+// Central --------------------------------------------------
+aldebaran,143,119,4	script	Kafra Employee::kaf_aldebaran	113,{
 	cutin "kafra_05",2;
 	cleararray @wrpC$[0],"",getarraysize(@wrpC$);
 	setarray @wrpP[0], 1200, 1200, 1800, 1700;
-	setarray @wrpD$[0], "Geffen", "Yuno" , "Izlude", "Coal Mine(Dead Pit)";
+	setarray @wrpD$[0], "Geffen", "Juno" , "Izlude", "Mjolnir Dead Pit";
 	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";
-	callfunc "F_Kafra",0,0,1;
+	mes "[Kafra Employee]";
+	mes "The Kafra Corporation";
+	mes "is always working to provide";
+	mes "you with convenient services.";
+	mes "How may I be of assistance?";
+	callfunc "F_Kafra",5,0,1,20,600;
 
 	M_Save:
 		savepoint "aldebaran",143,109;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Al De Baran";
 }
diff --git a/npc/kafras/kafras_com.txt b/npc/kafras/kafras_com.txt
index d833769ed..22314b8ee 100644
--- a/npc/kafras/kafras_com.txt
+++ b/npc/kafras/kafras_com.txt
@@ -3,7 +3,7 @@
 //===== By: ============================
 //= eAthena Dev Team
 //===== Current Version: =======================
-//= 2.21
+//= 2.3
 //===== Compatible With: ============================
 //= eAthena 1.0
 //===== Description: ============================================
@@ -13,6 +13,8 @@
 //=  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.
@@ -20,28 +22,36 @@
 //= Corrected savepoint for in town kafra.[kobra_k88]
 //= 2.2 New teleport destinations, prices [Lupus]
 //= 2.21 from Pharos, both warps are now 1200z [Evera]
+//= 2.3 Updated function calls with new arguments. [L0ne_W0lf]
+//=	Added unique Kafra Welcome message2.
 //=====================================================================
 
 
 // In Town ==============================================>\\
-comodo,200,148,4	script	Kafra::kaf_comodo	721,{
+comodo,195,150,4	script	Kafra Employee::kaf_comodo	721,{
 	cutin "kafra_07",2;
 	cleararray @wrpC$[0],"",getarraysize(@wrpC$);
-	setarray @wrpD$[0], "Morroc", "Comodo Pharos Lighthouse", "Umbala";
+	setarray @wrpD$[0], "Morroc", "Comodo Pharos Beacon", "Umbala";
 	setarray @wrpP[0], 1800, 1200, 1800;
 	set @wrpC$[0], @wrpD$[0]+" -> "+@wrpP[0];
 	set @wrpC$[1], @wrpD$[1]+" -> "+@wrpP[1];
 	set @wrpC$[2], @wrpD$[2]+" -> "+@wrpP[2];
 	set @wrpC$[3], "Cancel";
-	callfunc "F_Kafra",0,0,1;
+	mes "[Kafra Employee]";
+	mes "Welcome to the";
+	mes "Kafra Corporation.";
+	mes "You know that our";
+	mes "service is always";
+	mes "on your side~";
+	callfunc "F_Kafra",5,0,1,80,1000;
 
 	M_Save:
 		savepoint "comodo",204,143;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in Pyros Lighthouse";
 }
 
 // Comodo Pharos Lighthouse (Beacon Island) ===================>\\
-cmd_fild07,135,134,4	script	Kafra::kaf_cmd_fild07	721,{
+cmd_fild07,136,134,4	script	Kafra Employee::kaf_cmd_fild07	721,{
 	cutin "kafra_07",2;
 	cleararray @wrpC$[0],"",getarraysize(@wrpC$);
 	setarray @wrpD$[0], "Comodo", "Morroc";
@@ -49,9 +59,15 @@ cmd_fild07,135,134,4	script	Kafra::kaf_cmd_fild07	721,{
 	set @wrpC$[0], @wrpD$[0]+" -> "+@wrpP[0];
 	set @wrpC$[1], @wrpD$[1]+" -> "+@wrpP[1];
 	set @wrpC$[2], "Cancel";
-	callfunc "F_Kafra",0,0,1;
+	mes "[Kafra Employee]";
+	mes "Welcome to the";
+	mes "Kafra Corporation.";
+	mes "You know that our";
+	mes "service is always";
+	mes "on your side~";
+	callfunc "F_Kafra",5,0,1,80,1000;
 
 	M_Save:
 		savepoint "cmd_fild07",127,134;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the town of Comodo";
 }
diff --git a/npc/kafras/kafras_dungeons.txt b/npc/kafras/kafras_dungeons.txt
index c482f9039..a93a3cf0e 100644
--- a/npc/kafras/kafras_dungeons.txt
+++ b/npc/kafras/kafras_dungeons.txt
@@ -3,7 +3,7 @@
 //===== By: ============================
 //= eAthena Dev Team
 //===== Current Version: =======================
-//= 2.5
+//= 2.6
 //===== Compatible With: ============================
 //= eAthena 1.0
 //===== Description: ============================================
@@ -13,6 +13,8 @@
 //=    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. Added teleport service for Orc Dungeon
 //= and Coal Mine Kafras.
@@ -24,94 +26,111 @@
 //= 2.4 Now Baby Merchant can pass Merch Job Quest w/o probs [Lupus]
 //= 2.41 Removed useless warp points, already nullified by func call [Evera]
 //= 2.5 Allowed Culvert save point [Evera]
+//= 2.6 Updated function calls with new arguments. [L0ne_W0lf]
+//=	Added unique Kafra Welcome message.
+//=	Removed Ant Hell Kafra Employees.
 //===============================================================
 
-
-//<============================= Ant Hell ==============================>\\
-// Mocfild04 -----------------------------------------
-moc_fild04,230,329,3	script	Kafra::kaf_moc_fild04	115,{
-
-	cutin "kafra_03",2;
-	callfunc "F_Kafra",0,2,1;
-
-	M_Save:
-		savepoint "moc_fild04",231,339;
-		callfunc "F_KafEnd",0,1;
-}
-
-// Mocfild15 --------------------------------------------
-moc_fild15,264,260,3	script	Kafra::kaf_moc_fild15	115,{
-
-	cutin "kafra_03",2;
-	callfunc "F_Kafra",0,2,1;
-
-	M_Save:
-		savepoint "moc_fild15",266,271;
-		callfunc "F_KafEnd",0,1;
-}
-
 //<============================= Byalan Island ============================>\\
-izlu2dun,106,58,8	script	Kafra::kaf_izlu2dun	115,{
+izlu2dun,106,58,8	script	Kafra Employee::kaf_izlu2dun	115,{
 
 	cutin "kafra_03",2;
 	if(BaseJob==Job_Novice && job_merchant_q3>0) callfunc "F_MercKafra";  //F_MercKafra found in merchant.txt
-	callfunc "F_Kafra",0,2,1;
+	mes "[Kafra Employee]";
+	mes "Welcome to the";
+	mes "Kafra Corporation.";
+	mes "Kafra's Employees are";
+	mes "always ready to serve you.";
+	mes "How can I help you today?";
+	callfunc "F_Kafra",0,2,1,120,1200;
 
 	M_Save:
 		savepoint "izlu2dun",87,170;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"at Byalan Island";
 }
 
 
 //<============================ Culvert Sewers ============================>\\
-prt_fild05,290,224,1	script	Kafra::prt_fild05	114,{
+prt_fild05,290,224,3	script	Kafra Employee::prt_fild05	114,{
 	cutin "kafra_04",2;
-	callfunc "F_Kafra",0,1,1;
+	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",0,1,1,40,0;
 
 	M_Save:
 		savepoint "prt_fild05",274,243;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1, "at the Prontera Culverts";
 }
 
 
 //<=========================== Coal Mine (Dead Pitt) =======================>\\
-mjolnir_02,83,361,4	script	Kafra::kaf_mjolnir_02	114,{
-	cutin "kafra_04",2;
-	callfunc "F_Kafra",0,6,1;
+mjolnir_02,83,362,4	script	Kafra Employee::kaf_mjolnir_02	116,{
+	cutin "kafra_02",2;
+	mes "[Kafra Employee]";
+	mes "Welcome to the";
+	mes "Kafra Corporation.";
+	mes "Kafra's Employees are";
+	mes "always ready to serve you.";
+	mes "How can I help you today?";
+	callfunc "F_Kafra",5,6,1,100,0;
 
 	M_Save:
 		savepoint "mjolnir_02",98,352;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"at Mjolnir Dead Pit";
 }
 
 
 //<=============================== Morroc Ruins ============================>\\
-moc_ruins,61,156,5	script	Kafra::moc_ruins	114,{
+moc_ruins,61,156,5	script	Kafra Employee::moc_ruins	114,{
 	cutin "kafra_04",2;
-	callfunc "F_Kafra",0,2,1;
+	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,2,1,90,1200;
 
 	M_Save:
 		savepoint "moc_ruins",41,141;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1," at the Pyramids";
 }
 
 
 //<================================ Orc Dungeon ============================>\\
-gef_fild10,73,340,4	script	Kafra::kaf_gef_fild10	115,{
-	cutin "kafra_03",2;
-	callfunc "F_Kafra",0,6,1;
+gef_fild10,73,340,5	script	Kafra Employee::kaf_gef_fild10	116,{
+	cutin "kafra_02",2;
+	mes "[Kafra Employee]";
+	mes "Welcome to the";
+	mes "Kafra Corporation.";
+	mes "Kafra's Employees are";
+	mes "always ready to serve you.";
+	mes "How can I help you today?";
+	callfunc "F_Kafra",0,6,1,130,0;
 
 	M_Save:
 		savepoint "gef_fild10",54,326;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"at the Orc Dungeon";
 }
 
 //<============================== Treasure Island ==========================>\\
-alb2trea,59,69,1	script	Kafra::kaf_alb2trea	117,{
+alb2trea,59,69,5	script	Kafra Employee::kaf_alb2trea	117,{
 	cutin "kafra_01",2;
-	callfunc "F_Kafra",0,2,1;
+	mes "[Kafra Employee]";
+	mes "Welcome to the";
+	mes "Kafra Corporartion.";
+	mes "The Kafra services";
+	mes "are always on your side.";
+	mes "How may I assist you?";
+	callfunc "F_Kafra",0,2,1,50,0;
 
 	M_Save:
 		savepoint "alb2trea",92,64;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,0,"at Sunken Ship";
 }
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;
 }
diff --git a/npc/kafras/kafras_izl.txt b/npc/kafras/kafras_izl.txt
index ef9332b80..8362f26b5 100644
--- a/npc/kafras/kafras_izl.txt
+++ b/npc/kafras/kafras_izl.txt
@@ -3,7 +3,7 @@
 //===== By: =========================
 //= eAthena Dev Team
 //===== Current Version: ===================
-//= 2.21
+//= 2.3
 //===== Compatible With: =====================
 //= eAthena 1.0
 //===== Description: ============================================
@@ -13,16 +13,19 @@
 //=    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 teleport destinations, prices [Lupus]
 //= 2.21 Warps to Prontera rather than Payon now [Evera]
+//= 2.3 Updated function calls with new arguments. [L0ne_W0lf]
+//=	Added unique Kafra Welcome message2.
 //=====================================================================
 
-
-izlude,134,87,3	script	Kafra::kaf_izlude	117,{
+izlude,134,87,3	script	Kafra Employee::kaf_izlude	117,{
 	cutin "kafra_01",2;
 	cleararray @wrpC$[0],"",getarraysize(@wrpC$);
 	setarray @wrpD$[0], "Geffen", "Prontera", "Morroc", "Al De Baran";
@@ -32,9 +35,15 @@ izlude,134,87,3	script	Kafra::kaf_izlude	117,{
 	set @wrpC$[2], @wrpD$[2]+" -> "+@wrpP[2];
 	set @wrpC$[3], @wrpD$[3]+" -> "+@wrpP[3];
 	set @wrpC$[4], "Cancel";
-	callfunc "F_Kafra",0,0,1;
+	mes "[Kafra Employee]";
+	mes "Welcome to the";
+	mes "Kafra Corporartion.";
+	mes "The Kafra services";
+	mes "are always on your side.";
+	mes "How may I assist you?";
+	callfunc "F_Kafra",5,0,1,40,820;
 
 	M_Save:
-		savepoint "izlude",96,107;
-		callfunc "F_KafEnd",0,1;
+		savepoint "izlude",94,103;
+		callfunc "F_KafEnd",0,1,"in the city of Izlude";
 }
diff --git a/npc/kafras/kafras_mor.txt b/npc/kafras/kafras_mor.txt
index 3b0c8f793..d7578ce6f 100644
--- a/npc/kafras/kafras_mor.txt
+++ b/npc/kafras/kafras_mor.txt
@@ -3,7 +3,7 @@
 //===== By: =========================
 //= eAthena Dev Team
 //===== Current Version: ===================
-//= 2.3
+//= 2.4
 //===== Compatible With: =====================
 //= eAthena 1.0
 //===== Description: ============================================
@@ -13,63 +13,58 @@
 //=    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 teleport destinations, prices [Lupus]
 //= 2.3 Can't save outside city [Evera[
+//= 2.4 Updated function calls with new arguments. [L0ne_W0lf]
+//=	Added unique Kafra Welcome messages.
+//=	removed West and East Kafra
 //=====================================================================
 
 
 // South ================================
-morocc,156,97,4	script	Kafra::kaf_morocc	115,{
-	cutin "kafra_03",2;
+morocc,156,97,4	script	Kafra Employee::kaf_morocc	113,{
+	cutin "kafra_05",2;
 	callfunc "F_KafSetMoc";
-	callfunc "F_Kafra",0,0,0;
+	mes "[Kafra Employee]";
+	mes "The Kafra Corporation";
+	mes "is always working to provide";
+	mes "you with convenient services.";
+	mes "How may I be of assistance?";
+	callfunc "F_Kafra",5,0,0,60,930;
 
 	M_Save:
 		savepoint "morocc",156,46;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Morroc";
 }
 
 // North =================================
-morocc,162,271,4	script	Kafra::kaf_morocc2	114,{
+morocc,160,258,4	script	Kafra::kaf_morocc2	114,{
 	cutin "kafra_04",2;
 	callfunc "F_KafSetMoc";
-	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,60,930;
 
 	M_Save:
 		savepoint "morocc",157,272;
-		callfunc "F_KafEnd",0,1;
-}
-
-// West  =================================
-morocc,28,167,6	script	Kafra::kaf_morocc3	116,{
-	cutin "kafra_02",2;
-	callfunc "F_KafSetMoc";
-	callfunc "F_Kafra",0,0,0;
-
-	M_Save:
-		savepoint "morocc",31,164;
-		callfunc "F_KafEnd",0,1;
-}
-
-// East =================================
-morocc,292,211,4	script	Kafra::kaf_morocc4	112,{
-	cutin "kafra_06",2;
-	callfunc "F_KafSetMoc";
-	callfunc "F_Kafra",0,0,0;
-
-	M_Save:
-		savepoint "morocc",294,207;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Morroc";
 }
 
 // Function: Sets variables for Morroc Kafras --------------------------------
 function	script	F_KafSetMoc	{
 	cleararray @wrpC$[0],"",getarraysize(@wrpC$);
-	setarray @wrpD$[0], "Prontera", "Payon", "Alberta", "Comodo", "Comodo Pharos Lighthouse";
+	setarray @wrpD$[0], "Prontera", "Payon", "Alberta", "Comodo", "Comodo Pharos Beacon";
 	setarray @wrpP[0], 1200, 1200, 1800, 1800, 1200;
 	set @wrpC$[0], @wrpD$[0]+" -> "+@wrpP[0];
 	set @wrpC$[1], @wrpD$[1]+" -> "+@wrpP[1];
diff --git a/npc/kafras/kafras_new.txt b/npc/kafras/kafras_new.txt
index 1ab7f61b3..4a1955e2f 100644
--- a/npc/kafras/kafras_new.txt
+++ b/npc/kafras/kafras_new.txt
@@ -3,7 +3,7 @@
 //===== By: =========================
 //= eAthena Dev Team
 //===== Current Version: ===================
-//= 2.8
+//= 3.0
 //===== Compatible With: =====================
 //= eAthena 1.0
 //===== Description: ============================================
@@ -13,6 +13,8 @@
 //=    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.1 Added Niflheim Kafra by Dizzy
@@ -28,131 +30,195 @@
 //= 2.7c Added missing kafra in Lighthalzen, thanks to Muad_Dib [Vicious]
 //= 2.8 Removed warps from Umbala and Gonryun, thanks Drakee [Evera]
 //= 2.9 Fixed an incorrect savepoint (inside the hotel) the map was wrong.
-
+//= 3.0 Updated function calls with new arguments. [L0ne_W0lf]
+//=	Added unique Kafra Welcome messages.
 //==========================================================================
 
 // Amatsu ------------------------------------------------------------------
-amatsu,102,149,4	script	Kafra::kaf_amatsu	116,{
+amatsu,102,149,4	script	Kafra Employee::kaf_amatsu	116,{
 	cutin "kafra_02",2;
-	callfunc "F_Kafra",3,3,1;
+	mes "[Kafra Employee]";
+	mes "Welcome to the";
+	mes "Kafra Corporation.";
+	mes "Kafra's Employees are";
+	mes "always ready to serve you.";
+	mes "How can I help you today?";
+	callfunc "F_Kafra",5,3,1,50,700;
 
 	M_Save:
 		savepoint "amatsu",116,94;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Amatsu";
 }
 
 // Ayothaya ----------------------------------------------------------------
-ayothaya,212,169,5	script	Kafra::kaf_ayothaya	116,{
+ayothaya,212,169,5	script	Kafra Employee::kaf_ayothaya	116,{
 	cutin "kafra_02",2;
-	callfunc "F_Kafra",4,3,1;
+	mes "[Kafra Employee]";
+	mes "Welcome to the";
+	mes "Kafra Corporation.";
+	mes "Kafra's Employees are";
+	mes "always ready to serve you.";
+	mes "How can I help you today?";
+	callfunc "F_Kafra",5,3,1,50,700;
 
 	M_Save:
 		savepoint "ayothaya",149,69;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Ayotaya";
 }
 
 // Einbech -----------------------------------------------------------------
 
-einbech,181,132,4	script	Kafra::kaf_einbech	860,{
+einbech,181,132,5	script	Kafra Employee#ein3::kaf_einbech	860,{
 	cutin "kafra_08",2;
-	callfunc "F_Kafra",0,4,1;
+	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,4,1,40,850;
 
 	M_Save:
 		savepoint "einbech",182,124;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the town of Einbech";
 }
 
 // Einbroch (North-East) ---------------------------------------------------
-einbroch,242,205,5	script	Kafra::kaf_einbroch	115,{
-	cutin "kafra_03",2;
-	callfunc "F_Kafra",0,4,1;
+einbroch,242,205,5	script	::kaf_einbroch	860,{
+	cutin "kafra_08",2;
+	mes "[Kafra Employee]";
+	mes "Welcome to the";
+	mes "Kafra Corporation.";
+	mes "Kafra's Employees are";
+	mes "always ready to serve you.";
+	mes "How can I help you today?";
+	callfunc "F_Kafra",5,4,1,50,800;
 
 	M_Save:
 		savepoint "einbroch",238,198;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Einbroch";
 }
 
 // Einbroch (East) ---------------------------------------------------------
-einbroch,59,203,5	script	Kafra::kaf_einbroch2	117,{
-	cutin "kafra_01",2;
-	callfunc "F_Kafra",0,4,1;
+einbroch,59,203,6	script	Kafra Employee#ein1::kaf_einbroch2	861,{
+	cutin "kafra_09",2;
+	mes "[Kafra Employee]";
+	mes "Welcome to the";
+	mes "Kafra Corporartion.";
+	mes "The Kafra services";
+	mes "are always on your side.";
+	mes "How may I assist you?";
+	callfunc "F_Kafra",5,4,1,50,800;
 
 	M_Save:
 		savepoint "einbroch",240,197;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Einbroch";
 }
 
 // Gonryun -----------------------------------------------------------------
-gonryun,159,122,4	script	Kafra::kaf_gonryun	116,{
+gonryun,159,122,4	script	Kafra Employee::kaf_gonryun	116,{
 	cutin "kafra_02",2;
-	callfunc "F_Kafra",0,3,1;
+	mes "[Kafra Employee]";
+	mes "Welcome to the";
+	mes "Kafra Corporation.";
+	mes "Kafra's Employees are";
+	mes "always ready to serve you.";
+	mes "How can I help you today?";
+	callfunc "F_Kafra",5,3,1,50,700;
 
 	M_Save:
 		savepoint "gonryun",160,62;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Kunlun";
 }
 
 // Lighthalzen--------------------------------------------------------------
 
 //Outside the hotel
-lighthalzen,164,100,4	script	Kafra::kaf_lighthalzen	860,{
+lighthalzen,164,100,4	script	Kafra Employee::kaf_lighthalzen	860,{
 	cutin "kafra_08",2;
-	callfunc "F_Kafra",0,4,1;
+	mes "[Kafra Employee]";
+	mes "Welcome to the";
+	mes "Kafra Corporartion.";
+	mes "The Kafra services";
+	mes "are always on your side.";
+	mes "How may I assist you?";
+	callfunc "F_Kafra",5,4,1,40,800;
 
 	M_Save:
 		savepoint "lighthalzen",158,94;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Lighthalzen";
 }
 
 // Entrance
-lighthalzen,191,320,4	script	Kafra::kaf_lighthalzen2	861,{
+lighthalzen,191,320,4	script	Kafra Employee::kaf_lighthalzen2	861,{
 	cutin "kafra_09",2;
-	callfunc "F_Kafra",0,4,1;
+	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,4,1,40,800;
 
 	M_Save:
 		savepoint "lighthalzen",194,313;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Lighthalzen";
 }
 
 //Inside the hotel
-lhz_in02,237,284,4	script	Kafra::kaf_lhz_in02	861,{
+lhz_in02,237,284,4	script	Kafra Employee::kaf_lhz_in02	861,{
 	cutin "kafra_09",2;
-	callfunc "F_Kafra",0,4,1;
+	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,4,1,40,800;
 
 	M_Save:
 		savepoint "lhz_in02",278,215;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Lighthalzen";
 }
 
 // Louyang -----------------------------------------------------------------
-louyang,210,104,5	script	Kafra::kaf_louyang	117,{
+louyang,210,104,5	script	Kafra Employee::kaf_louyang	117,{
 	cutin "kafra_01",2;
-	callfunc "F_Kafra",4,3,1;
+	mes "[Kafra Employee]";
+	mes "Welcome to the";
+	mes "Kafra Corporation.";
+	mes "Kafra's Employees are";
+	mes "always ready to serve you.";
+	mes "How can I help you today?";
+	callfunc "F_Kafra",5,3,1,50,700;
 
 	M_Save:
 		savepoint "louyang",217,92;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Louyang";
 }
 
 // Umbala Kafra ------------------------------------------------------------
-umbala,128,133,4	script	Kafra::kaf_umbala	115,{
-	cutin "kafra_03",2;
+umbala,128,133,4	script	Kafra Employee::kaf_umbala	721,{
+	cutin "kafra_07",2;
 	cleararray @wrpC$[0],"",getarraysize(@wrpC$);
 	setarray @wrpD$[0], "Comodo";
 	setarray @wrpP[0], 1800;
 	set @wrpC$[0], @wrpD$[0]+" -> "+@wrpP[0];
 	set @wrpC$[1], "Cancel";
-	callfunc "F_Kafra",0,0,1;
+	mes "[Kafra Employee]";
+	mes "Welcome to the";
+	mes "Kafra Corporation.";
+	mes "You know that our";
+	mes "service is always";
+	mes "on your side~";
+	callfunc "F_Kafra",5,0,1,80,0;
 	M_Save:
 		savepoint "umbala",126,131;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Umbala";
 }
 
 // Niflheim ----------------------------------------------------------------
-niflheim,202,180,3	script	Kafra::kaf_niflheim	791,{
-	callfunc "F_Kafra",1,2,1;
-//this SAVE isn't used. Niflheim Kafra doesn't SAVE
+niflheim,202,180,3	script	Kafra Employee::kaf_niflheim	791,{
+	callfunc "F_Kafra",1,2,1,150,0;
+
 	M_Save:
 		savepoint "niflheim",192,182;
-		callfunc "F_KafEnd",1,1;
+		callfunc "F_KafEnd",1,1,"in the city of Niflheim";
 }
diff --git a/npc/kafras/kafras_pay.txt b/npc/kafras/kafras_pay.txt
index 52959f7f9..57c9b88f4 100644
--- a/npc/kafras/kafras_pay.txt
+++ b/npc/kafras/kafras_pay.txt
@@ -3,7 +3,7 @@
 //===== By: =========================
 //= eAthena Dev Team
 //===== Current Version: ===================
-//= 2.32
+//= 2.4
 //===== Compatible With: =====================
 //= eAthena 1.0
 //===== Description: ============================================
@@ -13,6 +13,8 @@
 //=    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.
@@ -21,40 +23,59 @@
 //= 2.3 1 New Kafra, fixed save menus
 //= 2.31 New prices [Evera]
 //= 2.32 Minor fix to Payon Archer Kafra [SinSloth]
+//= 2.4 Updated function calls with new arguments. [L0ne_W0lf]
+//=	Added unique Kafra Welcome message.
 //==========================================================================
 
 
 // Main Town, South ----------------------------------------------------------
-payon,181,104,4	script	Kafra::kaf_payon	113,{
+payon,181,104,4	script	Kafra Employee::kaf_payon	113,{
 	cutin "kafra_05",2;
 	callfunc "F_KafSetPay";
-	callfunc "F_Kafra",0,0,1;
+	mes "[Kafra Employee]";
+	mes "The Kafra Corporation";
+	mes "is always working to provide";
+	mes "you with convenient services.";
+	mes "How may I be of assistance?";
+	callfunc "F_Kafra",5,0,1,60,930;
 
 	M_Save:
 		savepoint "payon",160,58;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Payon";
 }
 
 // Main Town, Middle North --------------------------------------------------
 payon,175,226,4	script	Kafra::kaf_payon2	116,{
 	cutin "kafra_02",2;
 	callfunc "F_KafSetPay";
-	callfunc "F_Kafra",0,0,1;
+	mes "[Kafra Employee]";
+	mes "Welcome to the";
+	mes "Kafra Corporation.";
+	mes "The Kafra services are";
+	mes "always on your side.";
+	mes "How may I assist you?";
+	callfunc "F_Kafra",5,0,1,60,930;
 
 	M_Save:
 		savepoint "payon",257,242;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Payon";
 }
 
 // Archer Village ------------------------------------------------------------
 pay_arche,55,123,0	script	Kafra::kaf_payon3	115,{
 	cutin "kafra_03",2;
 	callfunc "F_KafSetPay";
-	callfunc "F_Kafra",0,5,1;
+	mes "[Kafra Employee]";
+	mes "Welcome to the";
+	mes "Kafra Corporartion.";
+	mes "The Kafra services";
+	mes "are always on your side.";
+	mes "How may I assist you?";
+	callfunc "F_Kafra",5,5,1,90,1200;
 
 	M_Save:
 		savepoint "pay_arche",49,144;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"at the Payon Dungeon";
 }
 
 
diff --git a/npc/kafras/kafras_pron.txt b/npc/kafras/kafras_pron.txt
index 773505036..5b85950bb 100644
--- a/npc/kafras/kafras_pron.txt
+++ b/npc/kafras/kafras_pron.txt
@@ -3,7 +3,7 @@
 //===== By: =========================
 //= eAthena Dev Team
 //===== Current Version: ===================
-//= 2.5
+//= 2.7
 //===== Compatible With: =====================
 //= eAthena 1.0
 //===== Description: ============================================
@@ -13,6 +13,8 @@
 //=    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.
@@ -24,61 +26,93 @@
 //= 2.41 New prices [Evera]
 //= 2.5 Can't save outside city [Evera]
 //= 2.6 Fixed central Kafra position (146,86 -> 146,98) [L0ne_W0lf]
+//= 2.7 Updated function calls with new arguments. [L0ne_W0lf]
+//=	Added unique Kafra Welcome messages.
 //=====================================================================
 
 
 // North ==================================
-prontera,152,326,4	script	Kafra::kaf_prontera	112,{
+prontera,152,326,3	script	Kafra Employee::kaf_prontera	112,{
 	cutin "kafra_06",2;
-	callfunc "F_Kafra",0,1,1;
+	mes "[Kafra Employee]";
+	mes "Welcome to the";
+	mes "Kafra Corporation~";
+	mes "The Kafra Services are";
+	mes "always here to support";
+	mes "you. So how can I be";
+	mes "of service today?";
+	callfunc "F_Kafra",5,0,0,40,800;
 
 M_Save:
 	savepoint "prontera",157,327;
-	callfunc "F_KafEnd",0,1;
+	callfunc "F_KafEnd",0,1,"in the city of Prontera";
 }
 
 // SOUTH ======================================
-prontera,151,29,8	script	Kafra::kaf_prontera2	116,{
-	cutin "kafra_02",2;
+prontera,151,29,0	script	Kafra Employee::kaf_prontera2	115,{
+	cutin "kafra_03",2;
 	callfunc "F_KafSetPront";
-	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,40,800;
 
 	M_Save:
 		savepoint "prontera",150,33;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Prontera";
 }
 
 //WEST=========================================
-prontera,29,207,6	script	Kafra::kaf_prontera3	113,{
+prontera,29,207,6	script	Kafra Employee::kaf_prontera3	113,{
 	cutin "kafra_05",2;
 	callfunc "F_KafSetPront";
-	callfunc "F_Kafra",0,0,0;
+	mes "[Kafra Employee]";
+	mes "The Kafra Corporation";
+	mes "is always working to provide";
+	mes "you with convenient services.";
+	mes "How may I be of assistance?";
+	callfunc "F_Kafra",5,0,0,40,800;
 
 	M_Save:
 		savepoint "prontera",33,208;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Prontera";
 }
 
 // East ===========================================
-prontera,282,200,4	script	Kafra::kaf_prontera4	115,{
-	cutin "kafra_03",2;
+prontera,282,200,2	script	Kafra Employee::kaf_prontera4	114,{
+	cutin "kafra_04",2;
 	callfunc "F_KafSetPront";
-	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,40,800;
 
 	M_Save:
 		savepoint "prontera",281,203;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Prontera";
 }
 
 // Center ===========================================
-prontera,146,89,6	script	Kafra::kaf_prontera5	117,{
+prontera,146,89,6	script	Kafra Employee::kaf_prontera5	117,{
 	cutin "kafra_01",2;
 	callfunc "F_KafSetPront";
-	callfunc "F_Kafra",0,0,0;
+	mes "[Kafra Employee]";
+	mes "Welcome to the";
+	mes "Kafra Corporartion.";
+	mes "The Kafra services";
+	mes "are always on your side.";
+	mes "How may I assist you?";
+	callfunc "F_Kafra",5,0,0,40,800;
 
 M_Save:
 	savepoint "prontera",116,73;
-	callfunc "F_KafEnd",0,1;
+	callfunc "F_KafEnd",0,1,"in the city of Prontera";
 }
 
 
diff --git a/npc/kafras/kafras_yun.txt b/npc/kafras/kafras_yun.txt
index fe3897656..dee43ef12 100644
--- a/npc/kafras/kafras_yun.txt
+++ b/npc/kafras/kafras_yun.txt
@@ -3,7 +3,7 @@
 //===== By: =========================
 //= eAthena Dev Team
 //===== Current Version: ===================
-//= 2.3
+//= 2.4
 //===== Compatible With: =====================
 //= eAthena 1.0
 //===== Description: ============================================
@@ -13,46 +13,65 @@
 //=    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 Now only warps to Aldebaran [Evera]
 //= 2.3 Updated a kafra location. [Musashiden]
+//= 2.4 Updated function calls with new arguments. [L0ne_W0lf]
+//=	Added unique Kafra Welcome message.
 //=====================================================================
 
 
 // Center ------------------------------------------------------------------
-yuno,152,187,4	script	Kafra::kaf_yuno	113,{
-	cutin "kafra_05",2;
+yuno,152,187,4	script	Kafra Employee::kaf_yuno	860,{
+	cutin "kafra_08",2;
 	callfunc "F_KafSetYun";
-	callfunc "F_Kafra",0,0,0;
+	mes "[Kafra Employee]";
+	mes "The Kafra Corporation";
+	mes "is always working to provide";
+	mes "you with convenient services.";
+	mes "How may I be of assistance?";
+	callfunc "F_Kafra",5,0,0,40,800;
 
 	M_Save:
 		savepoint "yuno",158,125;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Juno";
 }
 
 // South East --------------------------------------------------------------
-yuno,327,108,4	script	Kafra::kaf_yuno2	113,{
-	cutin "kafra_05",2;
+yuno,327,108,4	script	Kafra Employee::kaf_yuno2	860,{
+	cutin "kafra_08",2;
 	callfunc "F_KafSetYun";
-	callfunc "F_Kafra",0,0,0;
+	mes "[Kafra Employee]";
+	mes "The Kafra Corporation";
+	mes "is always working to provide";
+	mes "you with convenient services.";
+	mes "How may I be of assistance?";
+	callfunc "F_Kafra",5,0,0,40,800;
 
 	M_Save:
 		savepoint "yuno",328,101;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Juno";
 }
 
 // East --------------------------------------------------------------------
-yuno,277,221,4	script	Kafra::kaf_yuno3	117,{
-	cutin "kafra_01",2;
+yuno,277,221,4	script	Kafra Employee::kaf_yuno3	861,{
+	cutin "kafra_09",2;
 	callfunc "F_KafSetYun";
-	callfunc "F_Kafra",0,0,0;
+	mes "[Kafra Employee]";
+	mes "The Kafra Corporation";
+	mes "is always working to provide";
+	mes "you with convenient services.";
+	mes "How may I be of assistance?";
+	callfunc "F_Kafra",5,0,0,40,800;
 
 	M_Save:
 		savepoint "yuno",274,229;
-		callfunc "F_KafEnd",0,1;
+		callfunc "F_KafEnd",0,1,"in the city of Juno";
 }