* 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, 64 insertions, 45 deletions

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