* 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, 108 insertions, 42 deletions

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";
 }