* 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, 52 insertions, 18 deletions

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