* 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, 26 insertions, 31 deletions

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];