- Merged and cleaned up Kafras. (kafras/kafras.txt)

- Added Warp Points / View Points Function. (kafras/functions_kafras.txt)
- Updated dialogue for Shadow Chaser Job Change Quest. (jobs/3-2/shadow_chaser.txt)

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16699 54d463be-8e91-2dee-dedb-b68131a5f0ec

18 files changed, 796 insertions, 1220 deletions

diff --git a/npc/kafras/dts_warper.txt b/npc/kafras/dts_warper.txt
index 96ada0887..4e373a3fc 100644
--- a/npc/kafras/dts_warper.txt
+++ b/npc/kafras/dts_warper.txt
@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Cool Event Corp NPCs vs. Kafra Dungeon Teleport Service and voting system.
 //= This is a special event on official servers where there's a
 //= big competition between Kafra Corp. and Cool Event Corp.
diff --git a/npc/kafras/functions_kafras.txt b/npc/kafras/functions_kafras.txt
index 78e086c55..c8ea55644 100644
--- a/npc/kafras/functions_kafras.txt
+++ b/npc/kafras/functions_kafras.txt
@@ -5,7 +5,7 @@
 //= Darlskies, Darkchild, Syrus22, Lupus, kobra_k88 (2.0)
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 6.5
+//= 6.6
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: =========================================
@@ -60,6 +60,7 @@
 //= 6.3 #kafra_code is now stored as is. [brianluau]
 //= 6.4 Removed unofficial Guide function. [Daegaladh]
 //= 6.5 Optimized. [Joseph]
+//= 6.6 Added Warp Points / View Points Function. [Joseph]
 //============================================================ 
 
 //=== Main Function ========================================================
@@ -186,7 +187,9 @@ function	script	F_Kafra	{
 	}
 }
 
-// === Storage Function ============================================================
+//===================================================
+// Storage Function
+//===================================================
 function	script	F_KafStor	{
 	// Unable to access Guild Storage (Busy)
 	if(getarg(0) == 1){
@@ -271,7 +274,9 @@ function	script	F_KafStor	{
 	end;
 }
 
-// === Teleport Function ==================================================
+//===================================================
+// Teleport Function
+//===================================================
 function	script	F_KafTele	{
 	mes "[Kafra Employee]";
 	mes "Please choose";
@@ -305,12 +310,7 @@ function	script	F_KafTele	{
 	else if (@wrpD$[.@j] == "Comodo") warp "comodo", 209, 143;
 	else if (@wrpD$[.@j] == "Comodo Pharos Beacon") warp "cmd_fild07", 127, 134;
 	else if (@wrpD$[.@j] == "Geffen") warp "geffen", 120, 39;
-	else if (@wrpD$[.@j] == "Izlude") {
-		if (checkre(0))
-			warp "izlude", 128, 98;
-		else
-			warp "izlude", 91, 105;
-	}
+	else if (@wrpD$[.@j] == "Izlude") { if (checkre(0)) warp "izlude", 128, 98; else warp "izlude", 91, 105; }
 	else if (@wrpD$[.@j] == "Juno") warp "yuno", 158, 125;
 	else if (@wrpD$[.@j] == "Mjolnir Dead Pit") warp "mjolnir_02", 99, 351;
 	else if (@wrpD$[.@j] == "Morroc") warp "morocc", 156, 46;
@@ -322,7 +322,9 @@ function	script	F_KafTele	{
 }
 
 
-// === Cart Function ========================================================
+//===================================================
+// Cart Function
+//===================================================
 function	script	F_KafCart	{
 	// Ensure that the class wanting to rent a pushcart is a merchant
 	if(baseClass != Job_Merchant){
@@ -369,7 +371,9 @@ function	script	F_KafCart	{
 	return 1;
 }
 
-// === Special Reserve Points Function =================================================================================
+//===================================================
+// Special Reserve Points Function
+//===================================================
 function	script	F_KafInfo	{
 	// Uncomment next line to block Kafra Storage Protection
 	//	set .@block, 1;
@@ -435,7 +439,9 @@ function	script	F_KafEnd	{
 	end;
 }
 
-// === Check Storage Password Function ===
+//===================================================
+// Check Storage Password Function
+//===================================================
 function	script	F_CheckKafCode	{
 	if(!#kafra_code) return;
 	mes "Enter your storage password:";
@@ -491,7 +497,6 @@ function	script	F_SetKafCode	{
 					break;
 				}
 				set Zeny,Zeny-1000;
-				//set RESRVPTS, RESRVPTS + (1000/50);	//hardcoded password doesn't add pts
 				if(@code == #kafra_code) {
 					set #kafra_code,0;
 					mes "You've successfully cleared your storage password.";
@@ -536,7 +541,6 @@ S_SET:
 		return;
 	}
 	set Zeny,Zeny-5000;
-	// set RESRVPTS, RESRVPTS + (5000/50);	//hardcoded password doesn't add pts
 	set #kafra_code,@code;
 	mes "You've protected your storage with a secret password.";
 	mes "Thank you for using "+getarg(1)+".";
@@ -544,7 +548,9 @@ S_SET:
 	return;
 }
 
-// === Basic Password Validation Function ====================
+//===================================================
+// Basic Password Validation Function
+//===================================================
 function	script	F_EntKafCode	{
 	mes "Enter a number 1000~10000000:";
 	set @code_,0;
@@ -562,4 +568,63 @@ function	script	F_EntKafCode	{
 		return 0;
 	}
 	return @code_;
-}
\ No newline at end of file
+}
+
+//===================================================
+// Warp Points / View Points Function
+//===================================================
+function	script	F_KafSet	{
+	cleararray @wrpC$[0],"",getarraysize(@wrpC$);
+	cleararray @wrpD$[0],"",getarraysize(@wrpD$);
+	cleararray @wrpP$[0],"",getarraysize(@wrpP$);
+	cleararray @viewpX[0],"",getarraysize(@viewpX);
+	cleararray @viewpY[0],"",getarraysize(@viewpY);
+	if (strnpcinfo(4) == "prontera") {
+		setarray @wrpD$[0], "Izlude", "Geffen", "Payon", "Morroc", "Orc Dungeon", "Alberta";
+		setarray @wrpP[0], 600, 1200, 1200, 1200, 1200, 1800;
+		setarray @viewpX[0], 151, 29, 282, 152;
+		setarray @viewpY[0], 29, 207, 200, 326;
+	} else if (strnpcinfo(4) == "alberta") {
+		setarray @wrpP[0], 1200, 1800, 1800;
+		setarray @wrpD$[0], "Payon", "Morroc", "Prontera";
+		setarray @viewpX[0], 28, 113, 0, 0;
+		setarray @viewpY[0], 229, 60, 0, 0;
+	} else if (strnpcinfo(4) == "aldebaran") {
+		setarray @wrpP[0], 1200, 1200, 1800, 1700;
+		setarray @wrpD$[0], "Geffen", "Juno" , "Izlude", "Mjolnir Dead Pit";
+	} else if (strnpcinfo(4) == "comodo" ) {
+		setarray @wrpD$[0], "Morroc", "Comodo Pharos Beacon", "Umbala";
+		setarray @wrpP[0], 1800, 1200, 1800;
+	} else if (strnpcinfo(4) == "cmd_fild07") {
+		setarray @wrpD$[0], "Comodo", "Morroc";
+		setarray @wrpP[0], 1200, 1200;
+	} else if (strnpcinfo(4) == "geffen") {
+		setarray @wrpD$[0], "Prontera", "Al De Baran", "Orc Dungeon", "Mjolnir Dead Pit";
+		setarray @wrpP[0], 1200, 1200, 1200, 1700;
+		setarray @viewpX[0], 120, 203;
+		setarray @viewpY[0], 62, 123;
+	} else if (strnpcinfo(4) == "izlude") {
+		setarray @wrpD$[0], "Geffen", "Payon", "Morroc", "Al De Baran";
+		setarray @wrpP[0], 1200, 1200, 1200, 1800;
+	} else if (strnpcinfo(4) == "morocc") {
+		setarray @wrpD$[0], "Prontera", "Payon", "Alberta", "Comodo", "Comodo Pharos Beacon";
+		setarray @wrpP[0], 1200, 1200, 1800, 1800, 1200;
+		setarray @viewpX[0], 156, 163, 28, 292;
+		setarray @viewpY[0], 97, 260, 167, 211;
+	} else if (strnpcinfo(4) == "umbala") {
+		setarray @wrpD$[0], "Comodo";
+		setarray @wrpP[0], 1800;
+	} else if (strnpcinfo(4) == "payon") {
+		setarray @wrpD$[0], "Prontera", "Alberta", "Morroc";
+		setarray @wrpP[0], 1200, 1200, 1200;
+	} else if (strnpcinfo(4) == "yuno") {
+		setarray @wrpD$[0], "Al De Baran";
+		setarray @wrpP[0], 1200;
+		setarray @viewpX[0], 328, 278, 153, 0;
+		setarray @viewpY[0], 108, 221, 187, 0;
+	}
+	for (set .@i, 0; .@i < getarraysize(@wrpD$); set .@i, .@i + 1)
+		setd "@wrpC$["+.@i+"]",getd("@wrpD$["+.@i+"]")+" -> "+getd("@wrpP["+.@i+"]");
+	setd "@wrpC$["+getarraysize(@wrpC$)+"]","Cancel";
+	return;
+}		
\ No newline at end of file
diff --git a/npc/kafras/kafras.txt b/npc/kafras/kafras.txt
new file mode 100644
index 000000000..c37cc7a83
--- /dev/null
+++ b/npc/kafras/kafras.txt
@@ -0,0 +1,701 @@
+//===== rAthena Script ======================================= 

+//= Kafras (Cities/Dungeons/Fields)

+//===== By: ================================================== 

+//= Joseph

+//===== Current Version: ===================================== 

+//= 1.0

+//===== Compatible With: ===================================== 

+//= rAthena SVN

+//===== Description: =========================================

+//= Argument settings for callfunc "F_Kafra":

+//=  arg(0): 0 - Default Kafra message

+//=          1 - Niflhiem Kafra message

+//=          2 - Guild Kafra message

+//=  arg(1): 1 - Disable teleport menu 

+//=  arg(2): 1 - Disable info menu

+//=  arg(3): Cost of Storage service

+//=  arg(4): Cost of Rent a Pushcart service

+//===== Additional Comments: ================================= 

+//= 0.x Previous Authors: 

+//=     - L0ne_W0lf, kobra_k88, Samuray22, Evera, Lupus

+//= 1.0 Merged and cleaned up Kafras. [Joseph]

+//============================================================ 

+

+//===================================================

+// Aldebaran 

+//===================================================

+aldeba_in,96,181,4	script	Kafra Service	113,{

+	cutin "kafra_05",2;

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

+		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...";

+			close;

+		}

+		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.";

+		callfunc("F_CheckKafCode");    //check your storage password, if set

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

+}

+

+aldebaran,143,119,4	script	Kafra Employee::kaf_aldebaran	113,{

+	cutin "kafra_05",2;

+	callfunc "F_KafSet";

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

+	savepoint "aldebaran",143,109;

+	callfunc "F_KafEnd",0,1,"in the city of Al De Baran";

+}

+

+//===================================================

+// Geffen

+//===================================================

+geffen,120,62,0	script	Kafra Employee::kaf_geffen	115,{

+	cutin "kafra_03",2;

+	callfunc "F_KafSet";

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

+	savepoint "geffen",119,40;

+	callfunc "F_KafEnd",0,1,"in the city of Geffen";

+}

+

+geffen,203,123,2	script	Kafra Employee::geffen2	114,{

+	cutin "kafra_04",2;

+	callfunc "F_KafSet";

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

+	savepoint "geffen",200,124;

+	callfunc "F_KafEnd",0,1,"in the city of Geffen";

+}

+

+//===================================================

+// Morocc

+//===================================================

+morocc,156,97,4	script	Kafra Employee::kaf_morocc	113,{

+	cutin "kafra_05",2;

+	callfunc "F_KafSet";

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

+	savepoint "morocc",156,46;

+	callfunc "F_KafEnd",0,1,"in the city of Morroc";

+}

+

+morocc,160,258,4	script	Kafra::kaf_morocc2	114,{

+	cutin "kafra_04",2;

+	callfunc "F_KafSet";

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

+	savepoint "morocc",157,272;

+	callfunc "F_KafEnd",0,1,"in the city of Morroc";

+}

+

+//===================================================

+// Payon

+//===================================================

+payon,181,104,4	script	Kafra Employee::kaf_payon	113,{

+	cutin "kafra_05",2;

+	callfunc "F_KafSet";

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

+	savepoint "payon",160,58;

+	callfunc "F_KafEnd",0,1,"in the city of Payon";

+}

+

+payon,175,226,4	script	Kafra Employee::kaf_payon2	116,{

+	cutin "kafra_02",2;

+	callfunc "F_KafSet";

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

+	savepoint "payon",257,242;

+	callfunc "F_KafEnd",0,1,"in the city of Payon";

+}

+

+pay_arche,55,123,0	script	Kafra Employee::kaf_payon3	115,{

+	cutin "kafra_03",2;

+	callfunc "F_KafSet";

+	mes "[Kafra Employee]";

+	mes "Welcome to the";

+	mes "Kafra Corporation.";

+	mes "The Kafra services";

+	mes "are always on your side.";

+	mes "How may I assist you?";

+	callfunc "F_Kafra",5,5,1,90,1200;

+	savepoint "pay_arche",49,144;

+	callfunc "F_KafEnd",0,1,"at the Payon Dungeon";

+}

+

+//===================================================

+// Prontera

+//===================================================

+prontera,152,326,3	script	Kafra Employee::kaf_prontera	112,{

+	cutin "kafra_06",2;

+	callfunc "F_KafSet";

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

+	savepoint "prontera",157,327;

+	callfunc "F_KafEnd",0,1,"in the city of Prontera";

+}

+

+prontera,151,29,0	script	Kafra Employee::kaf_prontera2	115,{

+	cutin "kafra_03",2;

+	callfunc "F_KafSet";

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

+	savepoint "prontera",150,33;

+	callfunc "F_KafEnd",0,1,"in the city of Prontera";

+}

+

+prontera,29,207,6	script	Kafra Employee::kaf_prontera3	113,{

+	cutin "kafra_05",2;

+	callfunc "F_KafSet";

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

+	savepoint "prontera",33,208;

+	callfunc "F_KafEnd",0,1,"in the city of Prontera";

+}

+

+prontera,282,200,2	script	Kafra Employee::kaf_prontera4	114,{

+	cutin "kafra_04",2;

+	callfunc "F_KafSet";

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

+	savepoint "prontera",281,203;

+	callfunc "F_KafEnd",0,1,"in the city of Prontera";

+}

+

+prontera,146,89,6	script	Kafra Employee::kaf_prontera5	117,{

+	cutin "kafra_01",2;

+	callfunc "F_KafSet";

+	mes "[Kafra Employee]";

+	mes "Welcome to the";

+	mes "Kafra Corporation.";

+	mes "The Kafra services";

+	mes "are always on your side.";

+	mes "How may I assist you?";

+	callfunc "F_Kafra",5,0,0,40,800;

+	savepoint "prontera",116,73;

+	callfunc "F_KafEnd",0,1,"in the city of Prontera";

+}

+

+//===================================================

+// Yuno

+//===================================================

+yuno,152,187,4	script	Kafra Employee::kaf_yuno	860,{

+	cutin "kafra_08",2;

+	callfunc "F_KafSet";

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

+	savepoint "yuno",158,125;

+	callfunc "F_KafEnd",0,1,"in the city of Juno";

+}

+

+yuno,327,108,4	script	Kafra Employee::kaf_yuno2	860,{

+	cutin "kafra_08",2;

+	callfunc "F_KafSet";

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

+	savepoint "yuno",328,101;

+	callfunc "F_KafEnd",0,1,"in the city of Juno";

+}

+

+yuno,277,221,4	script	Kafra Employee::kaf_yuno3	861,{

+	cutin "kafra_09",2;

+	callfunc "F_KafSetYun";

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

+	savepoint "yuno",274,229;

+	callfunc "F_KafEnd",0,1,"in the city of Juno";

+}

+

+//===================================================

+// Alberta

+//===================================================

+alberta,28,229,0	script	Kafra Employee::kaf_alberta	116,{

+	cutin "kafra_02",2;

+	callfunc "F_KafSet";

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

+	savepoint "alberta",31,231;

+	callfunc "F_KafEnd",0,1,"in the city of Alberta";

+}

+

+alberta,113,60,6	script	Kafra Employee::kaf_alberta2	112,{

+	cutin "kafra_06",2;

+	callfunc "F_KafSet";

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

+	savepoint "alberta",117,57;

+	callfunc "F_KafEnd",0,1,"in the city of Alberta";

+}

+

+//===================================================

+// Comodo

+//===================================================

+comodo,195,150,4	script	Kafra Employee::kaf_comodo	721,{

+	cutin "kafra_07",2;

+	callfunc "F_KafSet";

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

+	savepoint "comodo",204,143;

+	callfunc "F_KafEnd",0,1,"in the town of Comodo";

+}

+

+cmd_fild07,136,134,4	script	Kafra Employee::kaf_cmd_fild07	721,{

+	cutin "kafra_07",2;

+	callfunc "F_KafSet";

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

+	savepoint "cmd_fild07",127,134;

+	callfunc "F_KafEnd",0,1,"in Pyros Lighthouse";

+}

+

+//===================================================

+// Izlude

+//===================================================

+-	script	kaf_izlude	-1,{

+	cutin "kafra_01",2;

+	callfunc "F_KafSet";

+	mes "[Kafra Employee]";

+	mes "Welcome to the";

+	mes "Kafra Corporation.";

+	mes "The Kafra services";

+	mes "are always on your side.";

+	mes "How may I assist you?";

+	callfunc "F_Kafra",5,0,1,40,820;

+	savepoint "izlude",94,103;

+	callfunc "F_KafEnd",0,1,"in the city of Izlude";

+}

+

+//===================================================

+// Moscovia

+//===================================================

+moscovia,223,191,3	script	Kafra Employee::kaf_mosk	114,{

+	cutin "kafra_04",2;

+	callfunc "F_Kafra",0,3,0,80,700;

+	savepoint "moscovia",221,194;;

+	callfunc "F_KafEnd",0,3,"in the city of Moscovia";

+}

+

+//===================================================

+// Amatsu

+//===================================================

+amatsu,102,149,4	script	Kafra Employee::kaf_amatsu	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,3,1,50,700;

+	savepoint "amatsu",116,94;

+	callfunc "F_KafEnd",0,1,"in the city of Amatsu";

+}

+

+//===================================================

+// Ayothaya

+//===================================================

+ayothaya,212,169,5	script	Kafra Employee::kaf_ayothaya	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,3,1,50,700;

+	savepoint "ayothaya",149,69;

+	callfunc "F_KafEnd",0,1,"in the city of Ayotaya";

+}

+

+//===================================================

+// Einbech 

+//===================================================

+einbech,181,132,5	script	Kafra Employee#ein3::kaf_einbech	860,{

+	cutin "kafra_08",2;

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

+	savepoint "einbech",182,124;

+	callfunc "F_KafEnd",0,1,"in the town of Einbech";

+}

+

+//===================================================

+// Einbroch

+//===================================================

+einbroch,242,205,5	script	Kafra Employee#ein2::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;

+	savepoint "einbroch",238,198;

+	callfunc "F_KafEnd",0,1,"in the city of Einbroch";

+}

+

+einbroch,59,203,6	script	Kafra Employee#ein1::kaf_einbroch2	861,{

+	cutin "kafra_09",2;

+	mes "[Kafra Employee]";

+	mes "Welcome to the";

+	mes "Kafra Corporation.";

+	mes "The Kafra services";

+	mes "are always on your side.";

+	mes "How may I assist you?";

+	callfunc "F_Kafra",5,4,1,50,800;

+	savepoint "einbroch",240,197;

+	callfunc "F_KafEnd",0,1,"in the city of Einbroch";

+}

+

+//===================================================

+// Gonryun

+//===================================================

+gonryun,159,122,4	script	Kafra Employee::kaf_gonryun	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,3,1,50,700;

+	savepoint "gonryun",160,62;

+	callfunc "F_KafEnd",0,1,"in the city of Kunlun";

+}

+

+//===================================================

+// Lighthalzen

+//===================================================

+lighthalzen,164,100,4	script	Kafra Employee::kaf_lighthalzen	860,{

+	cutin "kafra_08",2;

+	mes "[Kafra Employee]";

+	mes "Welcome to the";

+	mes "Kafra Corporation.";

+	mes "The Kafra services";

+	mes "are always on your side.";

+	mes "How may I assist you?";

+	callfunc "F_Kafra",5,4,1,40,800;

+	savepoint "lighthalzen",158,94;

+	callfunc "F_KafEnd",0,1,"in the city of Lighthalzen";

+}

+

+lighthalzen,191,320,4	script	Kafra Employee::kaf_lighthalzen2	861,{

+	cutin "kafra_09",2;

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

+	savepoint "lighthalzen",194,313;

+	callfunc "F_KafEnd",0,1,"in the city of Lighthalzen";

+}

+

+lhz_in02,237,284,4	script	Kafra Employee::kaf_lhz_in02	861,{

+	cutin "kafra_09",2;

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

+	savepoint "lhz_in02",278,215;

+	callfunc "F_KafEnd",0,1,"in the city of Lighthalzen";

+}

+

+//===================================================

+// Louyang

+//===================================================

+louyang,210,104,5	script	Kafra Employee::kaf_louyang	117,{

+	cutin "kafra_01",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,3,1,50,700;

+	savepoint "louyang",217,92;

+	callfunc "F_KafEnd",0,1,"in the city of Louyang";

+}

+

+//===================================================

+// Umbala

+//===================================================

+umbala,87,160,4	script	Kafra Employee::kaf_umbala	721,{

+	cutin "kafra_07",2;

+	callfunc "F_KafSet";

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

+	savepoint "umbala",126,131;

+	callfunc "F_KafEnd",0,1,"in the city of Umbala";

+}

+

+//===================================================

+// Niflheim 

+//===================================================

+niflheim,202,180,3	script	Kafra Employee::kaf_niflheim	791,{

+	callfunc "F_Kafra",1,2,1,150,0;

+	savepoint "niflheim",192,182;

+	callfunc "F_KafEnd",1,1,"in the city of Niflheim";

+}

+

+//===================================================

+// Dungeons and Fields

+//===================================================

+// - Byalan Island

+izlu2dun,106,58,8	script	Kafra Employee::kaf_izlu2dun	115,{

+	cutin "kafra_03",2;

+	if(BaseJob==Job_Novice && job_merchant_q2>0) callfunc "F_MercKafra";  //F_MercKafra found in merchant.txt

+	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,2,1,120,1200;

+	savepoint "izlu2dun",87,170;

+	callfunc "F_KafEnd",0,1,"at Byalan Island";

+}

+

+// - Culvert Sewers

+prt_fild05,290,224,3	script	Kafra Employee::prt_fild05	114,{

+	cutin "kafra_04",2;

+	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,1,1,40,0;

+

+	M_Save:

+		savepoint "prt_fild05",274,243;

+		callfunc "F_KafEnd",0,1, "at the Prontera Culverts";

+}

+

+// - Coal Mine (Dead Pitt)

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

+	savepoint "mjolnir_02",98,352;

+	callfunc "F_KafEnd",0,1,"at Mjolnir Dead Pit";

+}

+

+// - Morroc Ruins

+moc_ruins,59,157,5	script	Kafra Employee::moc_ruins	114,{

+	cutin "kafra_04",2;

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

+	savepoint "moc_ruins",41,141;

+	callfunc "F_KafEnd",0,1," at the Pyramids";

+}

+

+// - Orc Dungeon

+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",5,6,1,130,0;

+	savepoint "gef_fild10",54,326;

+	callfunc "F_KafEnd",0,1,"at the Orc Dungeon";

+}

+

+// - Treasure Island

+alb2trea,59,69,5	script	Kafra Employee::kaf_alb2trea	117,{

+	cutin "kafra_01",2;

+	mes "[Kafra Employee]";

+	mes "Welcome to the";

+	mes "Kafra Corporation.";

+	mes "The Kafra services";

+	mes "are always on your side.";

+	mes "How may I assist you?";

+	callfunc "F_Kafra",5,2,1,50,0;

+	savepoint "alb2trea",92,64;

+	callfunc "F_KafEnd",0,1,0,"at Sunken Ship";

+}
\ No newline at end of file
diff --git a/npc/kafras/kafras_alb.txt b/npc/kafras/kafras_alb.txt
deleted file mode 100644
index faa42916e..000000000
--- a/npc/kafras/kafras_alb.txt
+++ /dev/null
@@ -1,75 +0,0 @@
-//===== rAthena Script ======================================= 
-//= Alberta Kafras
-//===== By: ================================================== 
-//= rAthena Dev Team
-//===== Current Version: ===================================== 
-//= 2.4
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: =========================================
-//= Description of argument settings for callfunc "F_Kafra".
-//=  arg(0): When set at 0 the default Kafra message is displayed.
-//=    When set to 1 the Niflhiem Kafra message is displayed.
-//=    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,0	script	Kafra Employee::kaf_alberta	116,{
-	cutin "kafra_02",2;
-	callfunc "F_KafSetAlb";
-	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,"in the city of Alberta";
-}
-
-// South ------------------------------------------------------------------
-alberta,113,60,6	script	Kafra Employee::kaf_alberta2	112,{
-	cutin "kafra_06",2;
-	callfunc "F_KafSetAlb";
-	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,"in the city of Alberta";
-}
-
-// Function: Sets variables for Alberta Kafras ----------------------------
-function	script	F_KafSetAlb	{
-	cleararray @wrpC$[0],"",getarraysize(@wrpC$);
-	setarray @wrpP[0], 1200, 1800, 1800;
-	setarray @wrpD$[0], "Payon", "Morroc", "Prontera";
-	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";
-	setarray @viewpX[0], 28, 113, 0, 0;
-	setarray @viewpY[0], 229, 60, 0, 0;
-	return;
-}
diff --git a/npc/kafras/kafras_alde.txt b/npc/kafras/kafras_alde.txt
deleted file mode 100644
index a4b892552..000000000
--- a/npc/kafras/kafras_alde.txt
+++ /dev/null
@@ -1,138 +0,0 @@
-//===== rAthena Script ======================================= 
-//= Al De Baran Kafras
-//===== By: ================================================== 
-//= rAthena Dev Team
-//===== Current Version: ===================================== 
-//= 2.3a
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: =========================================
-//= Description of argument settings for callfunc "F_Kafra".
-//=  arg(0): When set at 0 the default Kafra message is displayed.
-//=    When set to 1 the Niflhiem Kafra message is displayed.
-//=    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"
-//= 2.3a Added "callfunc("F_CheckKafCode")" when you open storage. (bugreport:515) [Samuray22]
-//============================================================ 
-
-// Kafra Main Office (Kafra Leilah) ---------------------------------------
-aldeba_in,96,181,4	script	Kafra Service	113,{
-	cutin "kafra_05",2;
-	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;
-		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...";
-			close;
-		}
-		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.";
-		callfunc("F_CheckKafCode");    //check your storage password, if set
-		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;
-}
-
-// 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", "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";
-	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,"in the city of Al De Baran";
-}
diff --git a/npc/kafras/kafras_com.txt b/npc/kafras/kafras_com.txt
deleted file mode 100644
index 9dcfe3daa..000000000
--- a/npc/kafras/kafras_com.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-//===== rAthena Script ======================================= 
-//= Comodo Kafras
-//===== By: ================================================== 
-//= rAthena Dev Team
-//===== Current Version: ===================================== 
-//= 2.3
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: =========================================
-//= Description of argument settings for callfunc "F_Kafra".
-//=  arg(0): When set at 0 the default Kafra message is displayed.
-//=  When set to 1 the Niflhiem Kafra message is displayed.
-//=  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]
-//= 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,195,150,4	script	Kafra Employee::kaf_comodo	721,{
-	cutin "kafra_07",2;
-	cleararray @wrpC$[0],"",getarraysize(@wrpC$);
-	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";
-	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,"in the town of Comodo";
-}
-
-// Comodo Pharos Lighthouse (Beacon Island) -------------------------------
-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";
-	setarray @wrpP[0], 1200, 1200;
-	set @wrpC$[0], @wrpD$[0]+" -> "+@wrpP[0];
-	set @wrpC$[1], @wrpD$[1]+" -> "+@wrpP[1];
-	set @wrpC$[2], "Cancel";
-	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,"in Pyros Lighthouse";
-}
diff --git a/npc/kafras/kafras_dungeons.txt b/npc/kafras/kafras_dungeons.txt
deleted file mode 100644
index 4735efb9b..000000000
--- a/npc/kafras/kafras_dungeons.txt
+++ /dev/null
@@ -1,133 +0,0 @@
-//===== rAthena Script ======================================= 
-//= Kafras in Dungeons and Fields
-//===== By: ==================================================
-//= rAthena Dev Team
-//===== Current Version: ===================================== 
-//= 2.7a
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: =========================================
-//= Description of argument settings for callfunc "F_Kafra".
-//=  arg(0): When set at 0 the default Kafra message is displayed.
-//=    When set to 1 the Niflhiem Kafra message is displayed.
-//=    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.
-//= v2.1 Fixed bug with Merc job quest kafra.[Lupus]
-//= v2.1b Minor changes to function calls.  Using arguments.
-//= Added ant hell kafras.  This version uses arrays .[kobra_k88]
-//= Fixed Kafras, not giving you Save menu [Lupus]
-//= 2.3 Removed SAVE menu from dungeons Kafras [Lupus]
-//= 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.
-//= 2.7 Merchant quest in the Biliban kafra. (Barron-Monster) [L0ne_W0lf]
-//= 2.7a Corrected a problem with Dobuel "Welcome Message". (bugreport:783) [Samuray22]
-//============================================================ 
-
-// Byalan Island ----------------------------------------------------------
-izlu2dun,106,58,8	script	Kafra Employee::kaf_izlu2dun	115,{
-	cutin "kafra_03",2;
-	if(BaseJob==Job_Novice && job_merchant_q2>0) callfunc "F_MercKafra";  //F_MercKafra found in merchant.txt
-	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,2,1,120,1200;
-
-	M_Save:
-		savepoint "izlu2dun",87,170;
-		callfunc "F_KafEnd",0,1,"at Byalan Island";
-}
-
-// Culvert Sewers ---------------------------------------------------------
-prt_fild05,290,224,3	script	Kafra Employee::prt_fild05	114,{
-	cutin "kafra_04",2;
-	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,1,1,40,0;
-
-	M_Save:
-		savepoint "prt_fild05",274,243;
-		callfunc "F_KafEnd",0,1, "at the Prontera Culverts";
-}
-
-// Coal Mine (Dead Pitt) --------------------------------------------------
-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,"at Mjolnir Dead Pit";
-}
-
-// Morroc Ruins -----------------------------------------------------------
-moc_ruins,59,157,5	script	Kafra Employee::moc_ruins	114,{
-	cutin "kafra_04",2;
-	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," at the Pyramids";
-}
-
-// Orc Dungeon ------------------------------------------------------------
-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",5,6,1,130,0;
-
-	M_Save:
-		savepoint "gef_fild10",54,326;
-		callfunc "F_KafEnd",0,1,"at the Orc Dungeon";
-}
-
-// Treasure Island --------------------------------------------------------
-alb2trea,59,69,5	script	Kafra Employee::kaf_alb2trea	117,{
-	cutin "kafra_01",2;
-	mes "[Kafra Employee]";
-	mes "Welcome to the";
-	mes "Kafra Corporation.";
-	mes "The Kafra services";
-	mes "are always on your side.";
-	mes "How may I assist you?";
-	callfunc "F_Kafra",5,2,1,50,0;
-
-	M_Save:
-		savepoint "alb2trea",92,64;
-		callfunc "F_KafEnd",0,1,0,"at Sunken Ship";
-}
diff --git a/npc/kafras/kafras_gef.txt b/npc/kafras/kafras_gef.txt
deleted file mode 100644
index f9a40c7e0..000000000
--- a/npc/kafras/kafras_gef.txt
+++ /dev/null
@@ -1,77 +0,0 @@
-//===== rAthena Script ======================================= 
-//= Geffen Kafras
-//===== By: ================================================== 
-//= rAthena Dev Team
-//===== Current Version: ===================================== 
-//= 2.5
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: =========================================
-//= Description of argument settings for callfunc "F_Kafra".
-//=  arg(0): When set at 0 the default Kafra message is displayed.
-//=    When set to 1 the Niflhiem Kafra message is displayed.
-//=    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
-//= 2.5 Fixed Kafra NPC names. [L0ne_W0lf]
-//============================================================ 
-
-// South ------------------------------------------------------------------
-geffen,120,62,0	script	Kafra Employee::kaf_geffen	115,{
-	cutin "kafra_03",2;
-	callfunc "F_KafSetGef";
-	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,"in the city of Geffen";
-}
-
-// East -------------------------------------------------------------------
-geffen,203,123,2	script	Kafra Employee::geffen2	114,{
-	cutin "kafra_04",2;
-	callfunc "F_KafSetGef";
-	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,"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", "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;
-	setarray @viewpY[0], 62, 123;
-	return;
-}
diff --git a/npc/kafras/kafras_izl.txt b/npc/kafras/kafras_izl.txt
deleted file mode 100644
index d7e52dd5d..000000000
--- a/npc/kafras/kafras_izl.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-//===== rAthena Script ======================================= 
-//= Izlude Kafras
-//===== By: ================================================== 
-//= rAthena Dev Team
-//===== Current Version: ===================================== 
-//= 2.4
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: =========================================
-//= Description of argument settings for callfunc "F_Kafra".
-//=  arg(0): When set at 0 the default Kafra message is displayed.
-//=    When set to 1 the Niflhiem Kafra message is displayed.
-//=    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.2a Warps to Prontera rather than Payon now [Evera]
-//= 2.3 Updated function calls with new arguments. [L0ne_W0lf]
-//=	Added unique Kafra Welcome message2.
-//= 2.4 Izlude Kafra doesn't warp to Prontera but to Payon. [Masao]
-//============================================================ 
-
--	script	kaf_izlude	-1,{
-	cutin "kafra_01",2;
-	cleararray @wrpC$[0],"",getarraysize(@wrpC$);
-	setarray @wrpD$[0], "Geffen", "Payon", "Morroc", "Al De Baran";
-	setarray @wrpP[0], 1200, 1200, 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], @wrpD$[3]+" -> "+@wrpP[3];
-	set @wrpC$[4], "Cancel";
-	mes "[Kafra Employee]";
-	mes "Welcome to the";
-	mes "Kafra Corporation.";
-	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",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
deleted file mode 100644
index be8187b61..000000000
--- a/npc/kafras/kafras_mor.txt
+++ /dev/null
@@ -1,77 +0,0 @@
-//===== rAthena Script ======================================= 
-//= Morroc Kafras
-//===== By: ================================================== 
-//= rAthena Dev Team
-//===== Current Version: =====================================
-//= 2.4
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: =========================================
-//= Description of argument settings for callfunc "F_Kafra".
-//=  arg(0): When set at 0 the default Kafra message is displayed.
-//=    When set to 1 the Niflhiem Kafra message is displayed.
-//=    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 Employee::kaf_morocc	113,{
-	cutin "kafra_05",2;
-	callfunc "F_KafSetMoc";
-	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,"in the city of Morroc";
-}
-
-// North ------------------------------------------------------------------
-morocc,160,258,4	script	Kafra::kaf_morocc2	114,{
-	cutin "kafra_04",2;
-	callfunc "F_KafSetMoc";
-	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,"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 Beacon";
-	setarray @wrpP[0], 1200, 1200, 1800, 1800, 1200;
-	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], @wrpD$[4]+" -> "+@wrpP[4];
-	set @wrpC$[5], "Cancel";
-	setarray @viewpX[0], 156, 163, 28, 292;
-	setarray @viewpY[0], 97, 260, 167, 211;
-	return;
-}
diff --git a/npc/kafras/kafras_mosk.txt b/npc/kafras/kafras_mosk.txt
deleted file mode 100644
index b49b84dd2..000000000
--- a/npc/kafras/kafras_mosk.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-//===== rAthena Script ======================================= 
-//= Moscovia Kafras
-//===== By: ================================================== 
-//= Kisuka, Daegaladh
-//===== Current Version: ===================================== 
-//= 1.1
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
-//= Kafras for the town of Moscovia.
-//===== Additional Comments: ================================= 
-//= 1.0 First Version. [Kisuka]
-//= 1.1 Rescripted to use the kafra functions. [Daegaladh]
-//============================================================ 
-
-moscovia,223,191,3	script	Kafra Employee::kaf_mosk	114,{
-	cutin "kafra_04",2;
-	callfunc "F_Kafra",0,3,0,80,700;
-
-	M_Save:
-		savepoint "moscovia",221,194;;
-		callfunc "F_KafEnd",0,3,"in the city of Moscovia";
-}
diff --git a/npc/kafras/kafras_new.txt b/npc/kafras/kafras_new.txt
deleted file mode 100644
index 27637ba35..000000000
--- a/npc/kafras/kafras_new.txt
+++ /dev/null
@@ -1,224 +0,0 @@
-//===== rAthena Script ======================================= 
-//= New Kafras
-//===== By: ================================================== 
-//= rAthena Dev Team
-//===== Current Version: ===================================== 
-//= 3.2
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: =========================================
-//= Description of argument settings for callfunc "F_Kafra".
-//=  arg(0): When set at 0 the default Kafra message is displayed.
-//=    When set to 1 the Niflhiem Kafra message is displayed.
-//=    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
-//= v2.1b Minor changes to function calls.  Using arguments.
-//= This version uses arrays .[kobra_k88]
-//= 2.2 Added Louyang Kafra, fixed other kafras not saving players coords [Lupus]
-//= 2.3 Added temp Amatsu + Ayothaya Kafra (wrong coords and sprite) [Lupus]
-//= 2.4 Added correct Ayothaya, Louyang & Amatsu Kafras. [Lupus]
-//= 2.5 Added 2 Einbroch Kafras. [Lupus]
-//= 2.6 Added the Einbech Kafra [MasterOfMuppets]
-//= 2.7 Added the Lighthalzen Kafras [MasterOfMuppets]
-//= 2.7b Chanced the Sprite of the Einbech Kafra. [Poki#3]
-//= 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.
-//= 3.1 Fixed one of Einbroch (east) kafras not displaying a name, bugreport:857 [Brainstorm]
-//= 3.2 Changed Umbala Kafra Position to official. [Masao]
-//============================================================ 
-
-// Amatsu -----------------------------------------------------------------
-amatsu,102,149,4	script	Kafra Employee::kaf_amatsu	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,3,1,50,700;
-
-	M_Save:
-		savepoint "amatsu",116,94;
-		callfunc "F_KafEnd",0,1,"in the city of Amatsu";
-}
-
-// Ayothaya ---------------------------------------------------------------
-ayothaya,212,169,5	script	Kafra Employee::kaf_ayothaya	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,3,1,50,700;
-
-	M_Save:
-		savepoint "ayothaya",149,69;
-		callfunc "F_KafEnd",0,1,"in the city of Ayotaya";
-}
-
-// Einbech ----------------------------------------------------------------
-einbech,181,132,5	script	Kafra Employee#ein3::kaf_einbech	860,{
-	cutin "kafra_08",2;
-	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,"in the town of Einbech";
-}
-
-// Einbroch (North-East) --------------------------------------------------
-einbroch,242,205,5	script	Kafra Employee#ein2::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,"in the city of Einbroch";
-}
-
-// Einbroch (East) --------------------------------------------------------
-einbroch,59,203,6	script	Kafra Employee#ein1::kaf_einbroch2	861,{
-	cutin "kafra_09",2;
-	mes "[Kafra Employee]";
-	mes "Welcome to the";
-	mes "Kafra Corporation.";
-	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,"in the city of Einbroch";
-}
-
-// Gonryun ----------------------------------------------------------------
-gonryun,159,122,4	script	Kafra Employee::kaf_gonryun	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,3,1,50,700;
-
-	M_Save:
-		savepoint "gonryun",160,62;
-		callfunc "F_KafEnd",0,1,"in the city of Kunlun";
-}
-
-// Lighthalzen-------------------------------------------------------------
-// Outside Hotel
-lighthalzen,164,100,4	script	Kafra Employee::kaf_lighthalzen	860,{
-	cutin "kafra_08",2;
-	mes "[Kafra Employee]";
-	mes "Welcome to the";
-	mes "Kafra Corporation.";
-	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,"in the city of Lighthalzen";
-}
-
-// Entrance
-lighthalzen,191,320,4	script	Kafra Employee::kaf_lighthalzen2	861,{
-	cutin "kafra_09",2;
-	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,"in the city of Lighthalzen";
-}
-
-// Inside Hotel
-lhz_in02,237,284,4	script	Kafra Employee::kaf_lhz_in02	861,{
-	cutin "kafra_09",2;
-	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,"in the city of Lighthalzen";
-}
-
-// Louyang ----------------------------------------------------------------
-louyang,210,104,5	script	Kafra Employee::kaf_louyang	117,{
-	cutin "kafra_01",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,3,1,50,700;
-
-	M_Save:
-		savepoint "louyang",217,92;
-		callfunc "F_KafEnd",0,1,"in the city of Louyang";
-}
-
-// Umbala -----------------------------------------------------------------
-umbala,87,160,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";
-	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,"in the city of Umbala";
-}
-
-// Niflheim ----------------------------------------------------------------
-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,"in the city of Niflheim";
-}
diff --git a/npc/kafras/kafras_pay.txt b/npc/kafras/kafras_pay.txt
deleted file mode 100644
index 09d1ebd19..000000000
--- a/npc/kafras/kafras_pay.txt
+++ /dev/null
@@ -1,92 +0,0 @@
-//===== rAthena Script ======================================= 
-//= Payon Kafras
-//===== By: ================================================== 
-//= rAthena Dev Team
-//===== Current Version: ===================================== 
-//= 2.5
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: =========================================
-//= Description of argument settings for callfunc "F_Kafra".
-//=  arg(0): When set at 0 the default Kafra message is displayed.
-//=    When set to 1 the Niflhiem Kafra message is displayed.
-//=    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]
-//= v2.2 New Payon Locations. [Darkchild]
-//= 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.
-//= 2.4b Updated the remaning names for the Kafras. [L0ne_W0lf]
-//= 2.5 Changed Order in the Warp menu to official. [Masao]
-//============================================================ 
-
-// Main Town, South -------------------------------------------------------
-payon,181,104,4	script	Kafra Employee::kaf_payon	113,{
-	cutin "kafra_05",2;
-	callfunc "F_KafSetPay";
-	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,"in the city of Payon";
-}
-
-// Main Town, Middle North ------------------------------------------------
-payon,175,226,4	script	Kafra Employee::kaf_payon2	116,{
-	cutin "kafra_02",2;
-	callfunc "F_KafSetPay";
-	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,"in the city of Payon";
-}
-
-// Archer Village ---------------------------------------------------------
-pay_arche,55,123,0	script	Kafra Employee::kaf_payon3	115,{
-	cutin "kafra_03",2;
-	callfunc "F_KafSetPay";
-	mes "[Kafra Employee]";
-	mes "Welcome to the";
-	mes "Kafra Corporation.";
-	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,"at the Payon Dungeon";
-}
-
-// Function: Sets variables for Payon Kafras ------------------------------
-function	script	F_KafSetPay	{
-	cleararray @wrpC$[0],"",getarraysize(@wrpC$);
-	setarray @wrpD$[0], "Prontera", "Alberta", "Morroc";
-	setarray @wrpP[0], 1200, 1200, 1200;
-	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";
-	return;
-}
diff --git a/npc/kafras/kafras_pron.txt b/npc/kafras/kafras_pron.txt
deleted file mode 100644
index a698a0e69..000000000
--- a/npc/kafras/kafras_pron.txt
+++ /dev/null
@@ -1,133 +0,0 @@
-//===== rAthena Script ======================================= 
-//= Prontera Kafras
-//===== By: ================================================== 
-//= rAthena Dev Team
-//===== Current Version: ===================================== 
-//= 2.7
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: =========================================
-//= Description of argument settings for callfunc "F_Kafra".
-//=  arg(0): When set at 0 the default Kafra message is displayed.
-//=    When set to 1 the Niflhiem Kafra message is displayed.
-//=    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 North Kafra allows you save your position
-//= 2.3 New Teleport list, new prices, 2.3a fixed Alberta Teleport [Lupus]
-//= 2.3b One Kafra's been moved to Prontera, thx to Vicious_Pucca [Lupus]
-//= 2.4 Updated Kafras locations for the mini-map [Lupus]
-//= 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,3	script	Kafra Employee::kaf_prontera	112,{
-	cutin "kafra_06",2;
-	callfunc "F_KafSetPront";
-	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,"in the city of Prontera";
-}
-
-// South ------------------------------------------------------------------
-prontera,151,29,0	script	Kafra Employee::kaf_prontera2	115,{
-	cutin "kafra_03",2;
-	callfunc "F_KafSetPront";
-	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,"in the city of Prontera";
-}
-
-// West -------------------------------------------------------------------
-prontera,29,207,6	script	Kafra Employee::kaf_prontera3	113,{
-	cutin "kafra_05",2;
-	callfunc "F_KafSetPront";
-	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,"in the city of Prontera";
-}
-
-// East -------------------------------------------------------------------
-prontera,282,200,2	script	Kafra Employee::kaf_prontera4	114,{
-	cutin "kafra_04",2;
-	callfunc "F_KafSetPront";
-	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,"in the city of Prontera";
-}
-
-// Center -----------------------------------------------------------------
-prontera,146,89,6	script	Kafra Employee::kaf_prontera5	117,{
-	cutin "kafra_01",2;
-	callfunc "F_KafSetPront";
-	mes "[Kafra Employee]";
-	mes "Welcome to the";
-	mes "Kafra Corporation.";
-	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,"in the city of Prontera";
-}
-
-// Function: Sets variables for Prontera Kafras ---------------------------
-function	script	F_KafSetPront	{
-	cleararray @wrpC$[0],"",getarraysize(@wrpC$);
-	setarray @wrpD$[0], "Izlude", "Geffen", "Payon", "Morroc", "Orc Dungeon", "Alberta";
-	setarray @wrpP[0], 600, 1200, 1200, 1200, 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], @wrpD$[3]+" -> "+@wrpP[3];
-	set @wrpC$[4], @wrpD$[4]+" -> "+@wrpP[4];
-	set @wrpC$[5], @wrpD$[5]+" -> "+@wrpP[5];
-	set @wrpC$[6], "Cancel";
-	setarray @viewpX[0], 151, 29, 282, 152;
-	setarray @viewpY[0], 29, 207, 200, 326;
-	return;
-}
diff --git a/npc/kafras/kafras_yun.txt b/npc/kafras/kafras_yun.txt
deleted file mode 100644
index fad97ac25..000000000
--- a/npc/kafras/kafras_yun.txt
+++ /dev/null
@@ -1,86 +0,0 @@
-//===== rAthena Script ======================================= 
-//= Yuno Kafras
-//===== By: ================================================== 
-//= rAthena Dev Team
-//===== Current Version: ===================================== 
-//= 2.4
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: =========================================
-//= Description of argument settings for callfunc "F_Kafra".
-//=  arg(0): When set at 0 the default Kafra message is displayed.
-//=    When set to 1 the Niflhiem Kafra message is displayed.
-//=    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 Employee::kaf_yuno	860,{
-	cutin "kafra_08",2;
-	callfunc "F_KafSetYun";
-	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,"in the city of Juno";
-}
-
-// South East -------------------------------------------------------------
-yuno,327,108,4	script	Kafra Employee::kaf_yuno2	860,{
-	cutin "kafra_08",2;
-	callfunc "F_KafSetYun";
-	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,"in the city of Juno";
-}
-
-// East -------------------------------------------------------------------
-yuno,277,221,4	script	Kafra Employee::kaf_yuno3	861,{
-	cutin "kafra_09",2;
-	callfunc "F_KafSetYun";
-	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,"in the city of Juno";
-}
-
-// Function: Sets variables for Yuno Kafras -------------------------------
-function	script	F_KafSetYun	{
-	cleararray @wrpC$[0],"",getarraysize(@wrpC$);
-	setarray @wrpD$[0], "Al De Baran";
-	setarray @wrpP[0], 1200;
-	set @wrpC$[0], @wrpD$[0]+" -> "+@wrpP[0];
-	set @wrpC$[1], "Cancel";
-	setarray @viewpX[0], 328, 278, 153, 0;
-	setarray @viewpY[0], 108, 221, 187, 0;
-	return;
-}
diff --git a/npc/re/jobs/3-2/shadow_chaser.txt b/npc/re/jobs/3-2/shadow_chaser.txt
index 796281466..b94de3395 100644
--- a/npc/re/jobs/3-2/shadow_chaser.txt
+++ b/npc/re/jobs/3-2/shadow_chaser.txt
@@ -1,10 +1,10 @@
 //===== rAthena Script ======================================= 
-// Shadow Chaser Job change Quest
+// Shadow Chaser Job Change Quest
 //===== By: ================================================== 
 //= ultragunner
 //= Credits: Oshinoke
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= rAthena
 //===== Description: ========================================= 
@@ -13,6 +13,7 @@
 //===== Additional Comments: ================================= 
 //= 1.0 First Version.
 //= 1.1 Standardized. [Euphy]
+//= 1.2 Updated dialogue. [Joseph]
 //============================================================
 
 morocc,156,70,3	script	Girl#H-1	93,{
@@ -806,9 +807,10 @@ L_icedun:
 		mes "I would look for it...";
 		close;
 	} else if (job_sha == 27) {
-		// Is this correct?
+		// Custom Translation
 		mes "[Paul]";
-		mes "Kkkkkkkkkkkkkkkk!";
+		mes "Hohohohehehehahaha.";
+		mes "Ouch! my stomach hurts.";
 		next;
 		mes "[Paul]";
 		mes "Now I almost guessed what would happen later...";
@@ -1449,7 +1451,8 @@ job3_sha01,25,28,5	script	????#H-23	844,{
 		}
 	}
 	// Custom Translation
-	mes "You don't have to stay in here.";
+	mes "The box engraved with mysterious pattern.";
+	mes "When you push the box, it opens a door leading outside.";
 	close2;
 	warp "ice_dun02",209,219;
 	end;
diff --git a/npc/re/jobs/3-2/wanderer.txt b/npc/re/jobs/3-2/wanderer.txt
index 1dcfdac90..f8eccb327 100644
--- a/npc/re/jobs/3-2/wanderer.txt
+++ b/npc/re/jobs/3-2/wanderer.txt
@@ -3,15 +3,15 @@
 //===== By: ================================================== 
 //= Muad_Dib, Meyraw
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.1
 //===== Compatible With: ===================================== 
-//= Any rAthena SVN
+//= rAthena SVN
 //===== Description: ========================================= 
 //= Official Script
 //= Job change Quest from Dancer / Gypsy -> Wanderer.
 //===== Additional Comments: ================================= 
 //= 1.0 First Version.
-//= 2.0 Updated dialogue to be more official / accurate. Huge thanks to Muad_Dib! [Masao]
+//= 1.1 Updated dialogue to be more official / accurate. Huge thanks to Muad_Dib! [Masao]
 //============================================================
 
 xmas,162,209,5	script	Aspiring Wanderer, Soy	714,{
@@ -38,9 +38,7 @@ xmas,162,209,5	script	Aspiring Wanderer, Soy	714,{
 		mes "[Mimi]";
 		mes "But I understand you.";
 		mes "Many people are looking forward to meeting the best Wanderer in the world.";
-		if ((Class != Job_Baby_Dancer) && (Class != Job_Dancer) && (Class != Job_Gypsy) && (BaseLevel != 99)) {
-			close;
-		}
+		if (Class != Job_Baby_Dancer && Class != Job_Dancer && Class != Job_Gypsy && BaseLevel != 99) close;
 		next;
 		select("Dancer Kim?:Wanderer?");
 		emotion e_omg;
diff --git a/npc/scripts_athena.conf b/npc/scripts_athena.conf
index 41dd72ee2..ab83fb7df 100644
--- a/npc/scripts_athena.conf
+++ b/npc/scripts_athena.conf
@@ -117,18 +117,7 @@ npc: npc/instances/NydhoggsNest.txt
 npc: npc/kafras/cool_event_corp.txt
 npc: npc/kafras/dts_warper.txt
 npc: npc/kafras/functions_kafras.txt
-npc: npc/kafras/kafras_alb.txt
-npc: npc/kafras/kafras_alde.txt
-npc: npc/kafras/kafras_com.txt
-npc: npc/kafras/kafras_dungeons.txt
-npc: npc/kafras/kafras_gef.txt
-npc: npc/kafras/kafras_izl.txt
-npc: npc/kafras/kafras_mor.txt
-npc: npc/kafras/kafras_mosk.txt
-npc: npc/kafras/kafras_new.txt
-npc: npc/kafras/kafras_pay.txt
-npc: npc/kafras/kafras_pron.txt
-npc: npc/kafras/kafras_yun.txt
+npc: npc/kafras/kafras.txt
 
 // -------------------------- Merchant --------------------------
 npc: npc/merchants/advanced_refiner.txt