Full npc folder reorganization. (I hope I didn't break anything D:)

-Now common scripts goes to the main npc folder, and pre-re-only/re-only ones goes to their respective folders.
-NPCs with practically the same script but little differences have been left in the main folder and uses the command checkre() for the differences.
-For those NPCs with different coordinates but same script, the script has been left in the main folder but the NPCs splitted as duplicates.
-All pre-renewal files has been reverted back to their pre-renewal behavior.

TODO:
-Correct pre-re quest rewards.
-Check for pre-re/re differences in mapflags.

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

16 files changed, 15 insertions, 3797 deletions

diff --git a/npc/pre-re/kafras/cool_event_corp.txt b/npc/pre-re/kafras/cool_event_corp.txt
deleted file mode 100644
index 24eae21ca..000000000
--- a/npc/pre-re/kafras/cool_event_corp.txt
+++ /dev/null
@@ -1,422 +0,0 @@
-//===== rAthena Script ======================================= 
-//= Cool Event Corp. Staff
-//===== By: ================================================== 
-//= Gepard
-//===== Current Version: ===================================== 
-//= 1.5
-//===== Compatible With: ===================================== 
-//= rAthena
-//===== Description: ========================================= 
-//= Cool Event Corp. Staff (Save, Storage & Pushcart Service)
-//= in Arunafeltz Region.
-//===== Additional Comments: ================================= 
-//= 1.0 First version, iRO Sakray X.4 [Gepard]
-//= 1.1 Optimized, fixed a conditional bug [Lupus]
-//= 1.1a Redo back. It wasn't a bug [Lupus]
-//= 1.2 Added Rachel Cool Event Corp. Staff [Playtester]
-//= 1.3 Added cutins, closed Kafra Password exploit
-//=	until we got a client/packet based password support [Lupus]
-//= 1.4 Added Veins Cool Event Corp. Staff. [L0ne_W0lf]
-//= 1.5 Cool Event Corp staff is now more iRO like. [L0ne_W0lf]
-//============================================================ 
-
-hugel,88,168,4	script	Cool Event Corp. Staff::CoolEventCorpStaffHugel	874,{
-	cutin "zonda_01",2;
-	mes "[Cool Event Corp. Staff]";
-	mes "Welcome to Cool Event Corp.";
-	mes "Our staff is always working";
-	mes "to surpass your expactations";
-	mes "for quality service. So how";
-	mes "may I assist you today?";
-	next;
-	switch(select("Save:Use Storage:Rent a Pushcart:Storage Password Service:Cancel")){
-	case 1:
-		mes "[Cool Event Corp. Staff]";
-		mes "Your Respawn Point";
-		mes "has been saved here";
-		mes "in the village of Hugel.";
-		mes "Thank you for using the";
-		mes "Cool Event Corp. service~";
-		savepoint "hugel",96,155;
-		close2;
-		break;
-	case 2:
-		mes "[Cool Event Corp. Staff]";
-		if(basicskillcheck() && getskilllv("NV_BASIC") < 6){
-			mes "I'm sorry, but you";
-			mes "need the Novice's";
-			mes "Basic Skill Level 6 to";
-			mes "use the Storage Service.";
-			close2;
-			break;
-		}
-		if(Zeny < 40){
-			mes "I'm sorry, but you don't";
-			mes "have enough Zeny to use";
-			mes "the Storage Service. Our";
-			mes "Storage access fee is 40 Zeny.";
-			close2;
-			break;
-		}
-		set Zeny, Zeny - 40;
-		mes "Let me open your personal";
-		mes "storage for you right away.";
-		mes "Thanks for supporting Cool";
-		mes "Event Corp. by using our";
-		mes "services. Have a good day~";
-		callfunc("F_CheckKafCode");	//check your storage password, if set
-		close2;
-		openstorage;
-		break;
-	case 3:
-		mes "[Cool Event Corp. Staff]";
-		if(BaseClass != Job_Merchant){
-			mes "I'm sorry, but the";
-			mes "Pushcart rental service";
-			mes "is only available to Merchants,";
-			mes "Blacksmiths, White Smiths,";
-			mes "Alchemists and Creators.";
-			close2;
-			break;
-		}
-		if(getskilllv("MC_PUSHCART") == 0){
-			mes "You can only rent a cart after";
-			mes "learning the Pushcart Skill.";
-			close2;
-			break;
-		}
-		if(checkcart() == 1){
-			mes "You already have";
-			mes "a Pushcart equipped.";
-			mes "Unfortunately, we can't";
-			mes "rent more than one to";
-			mes "each customer at a time.";
-			close2;
-			break;
-		}
-		if(countitem(7061)){
-			delitem 7061,1;
-			setcart;
-			close2;
-			break;
-		}
-		mes "The Pushcart rental";
-		mes "fee is 800 Zeny. Would";
-		mes "you like to rent a Pushcart?";
-		next;
-		if(select("Rent a Pushcart:Cancel") == 1){
-			if(Zeny < 800){
-				mes "[Cool Event Corp. Staff]";
-				mes "I'm sorry, but you";
-				mes "don't have enough";
-				mes "Zeny to pay the Pushcart";
-				mes "rental fee of 800 Zeny.";
-			} else {
-				set Zeny, Zeny - 800;
-				setcart;
-			}
-		}
-		close2;
-		break;
-	case 4:
-		callfunc("F_SetKafCode","[Cool Event Corp. Staff]","Cool Event Corp.");
-		//the function closes msg and remoes cutins
-	case 5:
-	default:
-		mes "[Cool Event Corp. Staff]";
-		mes "Cool Event Corp. is always";
-		mes "striving to provide the best";
-		mes "services for our customers.";
-		mes "Help us become the best by";
-		mes "providing us with your opinions";
-		mes "and honest feedback. Thank you.";
-		close2;
-	}
-	cutin "", 255;
-	end;
-}
-
-rachel,109,138,5	script	Cool Event Corp. Staff::CoolEventCorpStaffRachel	874,{
-	cutin "zonda_01",2;
-	mes "[Cool Event Corp. Staff]";
-	mes "Welcome to Cool Event Corp.";
-	mes "Our staff is always working";
-	mes "to surpass your expactations";
-	mes "for quality service. So how";
-	mes "may I assist you today?";
-	next;
-	switch(select("Save:Use Storage:Teleport Service:Rent a Pushcart:Storage Password Service:Cancel")){
-	case 1:
-		mes "[Cool Event Corp. Staff]";
-		mes "Your Respawn Point";
-		mes "has been saved here";
-		mes "in the town of Rachel.";
-		mes "Thank you for using the";
-		mes "Cool Event Corp. service~";
-		savepoint "rachel",113,137;
-		close2;
-		break;
-	case 2:
-		mes "[Cool Event Corp. Staff]";
-		if(basicskillcheck() && getskilllv("NV_BASIC") < 6){
-			mes "I'm sorry, but you";
-			mes "need the Novice's";
-			mes "Basic Skill Level 6 to";
-			mes "use the Storage Service.";
-			close2;
-			break;
-		}
-		if(Zeny < 40){
-			mes "I'm sorry, but you don't";
-			mes "have enough Zeny to use";
-			mes "the Storage Service. Our";
-			mes "Storage access fee is 40 Zeny.";
-			close2;
-			break;
-		}
-		set Zeny, Zeny - 40;
-		mes "Let me open your personal";
-		mes "storage for you right away.";
-		mes "Thanks for supporting Cool";
-		mes "Event Corp. by using our";
-		mes "services. Have a good day~";
-		callfunc("F_CheckKafCode");	//check your storage password, if set
-		close2;
-		openstorage;
-		break;
-	case 3:
-		mes "Please choose";
-		mes "your destination.";
-		next;
-		if (select("Veins -> 2200 z:Cancel") == 1) {
-			if ((countitem(7060) != 0) || (Zeny >= 2200)) {
-				if (countitem(7060) != 0) {
-					delitem 7060,1;
-				}
-				else {
-					set Zeny,Zeny-2200;
-				}
-				warp "veins",205,101;
-				cutin "",255;
-				end;
-			}
-			else {
-				mes "[Cool Event Corp. Staff]";
-				mes "I'm sorry, but you don't have";
-				mes "enough zeny for the Teleport";
-				mes "Service. The fee to teleport";
-				mes "to Rachel is 2200 zeny.";
-			}
-		}
-		close2;
-		break;
-	case 4:
-		mes "[Cool Event Corp. Staff]";
-		if(BaseClass != Job_Merchant){
-			mes "I'm sorry, but the";
-			mes "Pushcart rental service";
-			mes "is only available to Merchants,";
-			mes "Blacksmiths, White Smiths,";
-			mes "Alchemists and Creators.";
-			close2;
-			break;
-		}
-		if(getskilllv("MC_PUSHCART") == 0){
-			mes "You can only rent a cart after";
-			mes "learning the Pushcart Skill.";
-			close2;
-			break;
-		}
-		if(checkcart() == 1){
-			mes "You already have";
-			mes "a Pushcart equipped.";
-			mes "Unfortunately, we can't";
-			mes "rent more than one to";
-			mes "each customer at a time.";
-			close2;
-			break;
-		}
-		if(countitem(7061)){
-			delitem 7061,1;
-			setcart;
-			close2;
-			break;
-		}
-		mes "The Pushcart rental";
-		mes "fee is 800 Zeny. Would";
-		mes "you like to rent a Pushcart?";
-		next;
-		if(select("Rent a Pushcart:Cancel") == 1){
-			if(Zeny < 800){
-				mes "[Cool Event Corp. Staff]";
-				mes "I'm sorry, but you";
-				mes "don't have enough";
-				mes "Zeny to pay the Pushcart";
-				mes "rental fee of 800 Zeny.";
-			} else {
-				set Zeny, Zeny - 800;
-				setcart;
-			}
-		}
-		close2;
-		break;
-	case 5:
-		callfunc("F_SetKafCode","[Cool Event Corp. Staff]","Cool Event Corp.");
-		//the function closes msg and remoes cutins
-	case 6:
-	default:
-		mes "[Cool Event Corp. Staff]";
-		mes "Cool Event Corp. is always";
-		mes "striving to provide the best";
-		mes "services for our customers.";
-		mes "Help us become the best by";
-		mes "providing us with your opinions";
-		mes "and honest feedback. Thank you.";
-		close2;
-	}
-	cutin "", 255;
-	end;
-}
-
-veins,208,128,5	script	Cool Event Corp. Staff::CoolEventCorpStaffVeins	874,{
-	cutin "zonda_01",2;
-	mes "[Cool Event Corp. Staff]";
-	mes "Welcome to Cool Event Corp.";
-	mes "Our staff is always working";
-	mes "to surpass your expactations";
-	mes "for quality service. So how";
-	mes "may I assist you today?";
-	next;
-	switch(select("Save:Use Storage:Teleport Service:Rent a Pushcart:Storage Password Service:Cancel")){
-	case 1:
-		mes "[Cool Event Corp. Staff]";
-		mes "Your Respawn Point";
-		mes "has been saved here";
-		mes "in the town of Veins.";
-		mes "Thank you for using the";
-		mes "Cool Event Corp. service~";
-		savepoint "veins",204,103;
-		close2;
-		break;
-	case 2:
-		mes "[Cool Event Corp. Staff]";
-		if(basicskillcheck() && getskilllv("NV_BASIC") < 6){
-			mes "I'm sorry, but you";
-			mes "need the Novice's";
-			mes "Basic Skill Level 6 to";
-			mes "use the Storage Service.";
-			close2;
-			break;
-		}
-		if(Zeny < 40){
-			mes "I'm sorry, but you don't";
-			mes "have enough Zeny to use";
-			mes "the Storage Service. Our";
-			mes "Storage access fee is 40 Zeny.";
-			close2;
-			break;
-		}
-		set Zeny, Zeny - 40;
-		mes "Let me open your personal";
-		mes "storage for you right away.";
-		mes "Thanks for supporting Cool";
-		mes "Event Corp. by using our";
-		mes "services. Have a good day~";
-		callfunc("F_CheckKafCode");	//check your storage password, if set
-		close2;
-		openstorage;
-		break;
-	case 3:
-		mes "Please choose";
-		mes "your destination.";
-		next;
-		if (select("Rachel -> 2200 z:Cancel") == 1) {
-			if ((countitem(7060) != 0) || (Zeny >= 2200)) {
-				if (countitem(7060) != 0) {
-					delitem 7060,1;
-				}
-				else {
-					set Zeny,Zeny-2200;
-				}
-				warp "rachel",115,125;
-				cutin "",255;
-				end;
-			}
-			else {
-				mes "[Cool Event Corp. Staff]";
-				mes "I'm sorry, but you don't have";
-				mes "enough zeny for the Teleport";
-				mes "Service. The fee to teleport";
-				mes "to Rachel is 2200 zeny.";
-			}
-		}
-		close2;
-		break;
-	case 4:
-		mes "[Cool Event Corp. Staff]";
-		if(BaseClass != Job_Merchant){
-			mes "I'm sorry, but the";
-			mes "Pushcart rental service";
-			mes "is only available to Merchants,";
-			mes "Blacksmiths, White Smiths,";
-			mes "Alchemists and Creators.";
-			close2;
-			break;
-		}
-		if(getskilllv("MC_PUSHCART") == 0){
-			mes "You can only rent a cart after";
-			mes "learning the Pushcart Skill.";
-			close2;
-			break;
-		}
-		if(checkcart() == 1){
-			mes "You already have";
-			mes "a Pushcart equipped.";
-			mes "Unfortunately, we can't";
-			mes "rent more than one to";
-			mes "each customer at a time.";
-			close2;
-			break;
-		}
-		if(countitem(7061)){
-			delitem 7061,1;
-			setcart;
-			close2;
-			break;
-		}
-		mes "The Pushcart rental";
-		mes "fee is 800 Zeny. Would";
-		mes "you like to rent a Pushcart?";
-		next;
-		if(select("Rent a Pushcart:Cancel") == 1){
-			if(Zeny < 800){
-				mes "[Cool Event Corp. Staff]";
-				mes "I'm sorry, but you";
-				mes "don't have enough";
-				mes "Zeny to pay the Pushcart";
-				mes "rental fee of 800 Zeny.";
-				close2;
-			} else {
-				set Zeny, Zeny - 800;
-				setcart;
-			}
-		}
-		close2;
-		break;
-	case 5:
-		callfunc("F_SetKafCode","[Cool Event Corp. Staff]","Cool Event Corp.");
-		//the function closes msg and remoes cutins
-	case 6:
-	default:
-		mes "[Cool Event Corp. Staff]";
-		mes "Cool Event Corp. is always";
-		mes "striving to provide the best";
-		mes "services for our customers.";
-		mes "Help us become the best by";
-		mes "providing us with your opinions";
-		mes "and honest feedback. Thank you.";
-		close2;
-	}
-	cutin "", 255;
-	end;
-}
diff --git a/npc/pre-re/kafras/dts_warper.txt b/npc/pre-re/kafras/dts_warper.txt
deleted file mode 100644
index ad5a82ab5..000000000
--- a/npc/pre-re/kafras/dts_warper.txt
+++ /dev/null
@@ -1,1333 +0,0 @@
-//===== rAthena Script ======================================= 
-//= Dungeon Teleport Service
-//===== By: ================================================== 
-//= Evera
-//===== Current Version: ===================================== 
-//= 2.8
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: =========================================
-//= [Aegis 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.
-//= To warp to selected levels of certain dungeons.
-//
-// Global Variables in use:
-//	Voting Time check:		$DTS_Time
-//	Cool Event Corp. Vote Numbers:	$DTS_JondaVotes
-//	Kafra Vote Numbers:		$DTS_KafraVotes
-//	Winner:				$DTS_Result
-//	Teleport Service Period Check:	$DTS_PeriodCheck
-//	Kafra Points:			$DTS_KafraWins
-//	Cool Event Corp. Points:	$DTS_JondaWins
-//	Setitem Check:			$DTS_VoteCount
-// For Detailed information on what each varibale does, see
-// the "Vote Globalvar Girl#yuno" NPC at the end of the file.
-// Character Variable in use: lhz_vote (how many times player has voted, keeps htem from re-voting.)
-//===== Additional Comments: ================================= 
-//= 1.0	Initial release [Evera]
-//= 1.1	SVN release, removed from major town (found true info after research),
-//=	put more arg(2) parameters, fixed a few bugs [Evera]
-//= 1.2 Mushed some variables together, optimized a bit [Evera]
-//= 1.3 Removed selfconfig [Evera]
-//= 1.4 Changed global variables to read from 3 global variables, updated names,
-//= 	fixed array bug [Evera]
-//= 1.5 Mushed voting varialbes into 1 variable. [Evera]
-//= 1.6 Removed Duplicates [Silent]
-//= 1.7	Fixed bug of DTS_Admin not running by itself [Evera]
-//= 1.8	Changed requirement to lvl 60 [Evera]
-//= 1.9 Removed global eligibility option [Evera]
-//= 2.0 Fixed zeny bug [Evera]
-//= 2.1 Fixed headers with and updated with newer information [Evera]
-//= 2.2 Changed dtseligible 2 to MISC_QUEST|128, to clean up variable usage. [Evera]
-//=	Also added F_ClearGarbage function to the scripts. [Evera]
-//= 2.3	Changed dtseligible to be $dtsday when MISC_QUEST|128
-//=	Added $dtsday for vote session counter
-//=	Fixed bug that involved having both warpers enabled at the same time. [Evera]
-//=	New $dtsday system and bug fix[Evera]
-//= 2.3a fixed 2 bugs with comparision [Lupus]
-//= 2.3b corrected Glast warp coords [Lupus] 2.3c Bailand -> Bayalan
-//= 2.4 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
-//= 2.5 Converted from Aegis file. (11.3) [L0ne_W0lf]
-//= 2.6 Moved Morroc NPCs to Morroc Ruins. [L0ne_W0lf]
-//= 2.7 Fixed a typo, a - to a +. Not sure how that happened. [L0ne_w0lf]
-//= 2.8 Corrected another typo this time in a variable.
-//============================================================ 
-
-einbroch,246,70,0	script	Vote Timer#ein	-1,{
-OnInit:
-	if ($dts) {
-		set $dts,0;
-		set $dtsvote,0;
-		set $dtsday,0;
-	}
-	initnpctimer;
-	end;
-
-OnEnable:
-	initnpctimer;
-	end;
-
-OnTimer60000:
-	// A part that keeps the same status even after a server shut down
-	if ($DTS_Result == 1) {
-		if ($DTS_JondaWins == 0) {
-			donpcevent "Vote Timer2#ein::OnEnable";
-		}
-		else if ($DTS_JondaWins == 1) {
-			if ($DTS_KafraWins < 2) {
-				donpcevent "Vote Timer2#ein::OnEnable";
-			}
-			else {
-				donpcevent "Vote Timer3#ein::OnEnable";
-			}
-		}
-		else {
-			if ($DTS_KafraWins < 2) {
-				donpcevent "Vote Timer2#ein::OnEnable";
-			}
-			else {
-				donpcevent "Vote Timer3#ein::OnEnable";
-			}
-		}
-		stopnpctimer;
-	}
-	else if ($DTS_Result == 2) {
-		if ($DTS_JondaWins == 0) {
-			donpcevent "Vote Timer2#ein::OnEnable";
-		}
-		else if ($DTS_JondaWins == 1) {
-			if ($DTS_KafraWins < 2) {
-				donpcevent "Vote Timer2#ein::OnEnable";
-			}
-			else {
-				donpcevent "Vote Timer4#ein::OnEnable";
-			}
-		}
-		else {
-			if ($DTS_KafraWins < 2) {
-				donpcevent "Vote Timer2#ein::OnEnable";
-			}
-			else {
-				donpcevent "Vote Timer4#ein::OnEnable";
-			}
-		}
-		stopnpctimer;
-	}
-	else {
-		if ($DTS_Time == 1440) {
-			if (($DTS_JondaVotes >= 20) || ($DTS_KafraVotes >= 20)) {
-				if ($DTS_JondaVotes > $DTS_KafraVotes) {
-					if ($DTS_JondaWins == 0) {
-						if ($DTS_KafraWins < 2) {
-							set $DTS_KafraWins,$DTS_KafraWins+1;
-							set $DTS_Result,1;
-							set $DTS_Time,0;
-							donpcevent "Scrutiny Association#6::OnEnable";
-							donpcevent "Vote Timer2#ein::OnEnable";
-						}
-						else if ($DTS_KafraWins == 2) {
-							set $DTS_Result,1;
-							set $DTS_Time,0;
-							donpcevent "Scrutiny Association#6::OnEnable";
-							donpcevent "Vote Timer2#ein::OnEnable";
-						}
-					}
-					else if ($DTS_JondaWins == 1) {
-						if ($DTS_KafraWins < 2) {
-							set $DTS_KafraWins,$DTS_KafraWins+1;
-							set $DTS_Result,1;
-							set $DTS_Time,0;
-							donpcevent "Scrutiny Association#6::OnEnable";
-							donpcevent "Vote Timer2#ein::OnEnable";
-						}
-						else {
-							set $DTS_Time,0;
-							set $DTS_Result,1;
-							donpcevent "Scrutiny Association#6::OnEnable";
-							donpcevent "Vote Timer3#ein::OnEnable";
-						}
-					}
-					else {
-						if ($DTS_KafraWins < 2) {
-							set $DTS_KafraWins,$DTS_KafraWins+1;
-							set $DTS_Result,1;
-							set $DTS_Time,0;
-							donpcevent "Scrutiny Association#6::OnEnable";
-							donpcevent "Vote Timer2#ein::OnEnable";
-						}
-						else {
-							set $DTS_Result,1;
-							set $DTS_Time,0;
-							donpcevent "Scrutiny Association#6::OnEnable";
-							donpcevent "Vote Timer3#ein::OnEnable";
-						}
-					}
-				}
-				else {
-					if ($DTS_KafraWins == 0) {
-						if ($DTS_JondaWins < 2) {
-							set $DTS_JondaWins,$DTS_JondaWins+1;
-							set $DTS_Result,2;
-							set $DTS_Time,0;
-							donpcevent "Scrutiny Association#7::OnEnable";
-							donpcevent "Vote Timer2#ein::OnEnable";
-						}
-						else {
-							set $DTS_Result,2;
-							set $DTS_Time,0;
-							donpcevent "Scrutiny Association#7::OnEnable";
-							donpcevent "Vote Timer2#ein::OnEnable";
-						}
-					}
-					else if ($DTS_KafraWins == 1) {
-						if ($DTS_JondaWins < 2) {
-							set $DTS_JondaWins,$DTS_JondaWins+1;
-							set $DTS_Result,2;
-							set $DTS_Time,0;
-							donpcevent "Scrutiny Association#7::OnEnable";
-							donpcevent "Vote Timer2#ein::OnEnable";
-						}
-						else {
-							set $DTS_Result,2;
-							set $DTS_Time,0;
-							donpcevent "Scrutiny Association#7::OnEnable";
-							donpcevent "Vote Timer4#ein::OnEnable";
-						}
-					}
-					else {
-						if ($DTS_JondaWins < 2) {
-							set $DTS_JondaWins,$DTS_JondaWins+1;
-							set $DTS_Result,2;
-							set $DTS_Time,0;
-							donpcevent "Scrutiny Association#7::OnEnable";
-							donpcevent "Vote Timer2#ein::OnEnable";
-						}
-						else {
-							set $DTS_Result,2;
-							set $DTS_Time,0;
-							donpcevent "Scrutiny Association#7::OnEnable";
-							donpcevent "Vote Timer4#ein::OnEnable";
-						}
-					}
-				}
-			}
-			else {
-				set $DTS_Result,3;
-				set $DTS_Time,0;
-				donpcevent "Vote Timer#ein::OnEnable";
-			}
-		}
-		else {
-			set $DTS_Time,$DTS_Time+1;
-			donpcevent "Vote Timer#ein::OnEnable";
-		}
-	}
-	end;
-}
-
-einbroch,245,71,0	script	Vote Timer2#ein	-1,{
-OnEnable:
-	initnpctimer;
-	end;
-
-OnTimer60000:
-	stopnpctimer;
-	if ($DTS_PeriodCheck == 8640) {
-		set $DTS_PeriodCheck,0;
-		set $DTS_Result,0;
-		set $DTS_KafraVotes,0;
-		set $DTS_JondaVotes,0;
-		set $DTS_VoteCount,$DTS_VoteCount+1;
-		donpcevent "Vote Timer#ein::OnEnable";
-	}
-	else {
-		set $DTS_PeriodCheck,$DTS_PeriodCheck+1;
-		donpcevent "Vote Timer2#ein::OnEnable";
-	}
-	end;
-}
-
-einbroch,246,71,0	script	Vote Timer3#ein	-1,{
-OnEnable:
-	initnpctimer;
-	end;
-
-OnTimer60000:
-	stopnpctimer;
-	if ($DTS_PeriodCheck == 8640) {
-		set $DTS_PeriodCheck,0; //Global Variable
-		set $DTS_Result,0; //Global Variable
-		set $DTS_KafraVotes,0; //Global Variable
-		set $DTS_JondaVotes,0; //Global Variable
-		set $DTS_JondaWins,$DTS_JondaWins-1;
-		set $DTS_VoteCount,$DTS_VoteCount+1;
-		donpcevent "Vote Timer#ein::OnEnable";
-	}
-	else {
-		set $DTS_PeriodCheck,$DTS_PeriodCheck+1; //Global Variable
-		donpcevent "Vote Timer3#ein::OnEnable";
-	}
-	end;
-}
-
-einbroch,247,71,0	script	Vote Timer4#ein	-1,{
-OnEnable:
-	initnpctimer;
-	end;
-
-OnTimer60000:
-	stopnpctimer;
-	if ($DTS_PeriodCheck == 8640) {
-		set $DTS_PeriodCheck,0; //Global Variable
-		set $DTS_Result,0; //Global Variable
-		set $DTS_KafraVotes,0; //Global Variable
-		set $DTS_JondaVotes,0; //Global Variable
-		set $DTS_KafraWins,$DTS_KafraWins-1;
-		set $DTS_VoteCount,$DTS_VoteCount+1;
-		donpcevent "Vote Timer#ein::OnEnable";
-	}
-	else {
-		set $DTS_PeriodCheck,$DTS_PeriodCheck+1; //Global Variable
-		donpcevent "Vote Timer4#ein::OnEnable";
-	}
-	end;
-}
-
-// Voting Poll NPCs Kafras and Cool Corp.
-// Cool Event Staff should actually be Cool Event Voting Staff
-// names had to be shortened to keep them unique.
-function	script	F_VoteKafra	{
-	callfunc "F_ClearGarbage";				//Clear outdated, unused variables
-	switch(getarg(0)){
-	case 1: cutin "kafra_01",2; break;
-	case 2: cutin "kafra_02",2; break;
-	case 3: cutin "kafra_03",2; break;
-	case 4: cutin "kafra_04",2; break;
-	case 5: cutin "kafra_05",2; break;
-	case 6: cutin "kafra_06",2; break;
-	case 7: cutin "kafra_07",2; break;
-	case 8: cutin "kafra_08",2; break;
-	case 9: cutin "kafra_09",2; break;
-	}
-	mes "[Kafra Voting Staff]";
-	mes "Greetings, adventurer.";
-	mes "As you may be aware, we";
-	mes "are holding an election to";
-	mes "determine which company will";
-	mes "provide the Dungeon Teleport";
-	mes "Service. How may I help you?";
-	next;
-	switch(select("Reason for Election:Cast a Vote:Use Teleport Service:Cancel")) {
-	case 1:
-		mes "[Kafra Voting Staff]";
-		mes "Cool Event Corp and the";
-		mes "Kafra Corporation have both";
-		mes "been planning to provide a";
-		mes "Teleport Service to dungeons.";
-		next;
-		mes "[Kafra Voting Staff]";
-		mes "But due to technological";
-		mes "limitations, only one company";
-		mes "can serve as provider for this";
-		mes "Dungeon Teleport Service at a";
-		mes "time. There, both companies have agreed to hold special elections.";
-		next;
-		mes "[Kafra Voting Staff]";
-		mes "Each company has its own";
-		mes "policies and guarantees in";
-		mes "regards to the Dungeon Teleport Service, and in this election, the";
-		mes "customers will ultimately decide and choose what's best for them.";
-		next;
-		mes "[Kafra Voting Staff]";
-		mes "For now, the Dungeon";
-		mes "Teleport Service will be";
-		mes "provided in a series of trial periods. This way, customers can";
-		mes "see the benefits of both companies before making the final decision.";
-		next;
-		mes "[Kafra Voting Staff]";
-		mes "If you are qualified,";
-		mes "please vote in each election";
-		mes "to decide which company will";
-		mes "provide the Dungeon Teleport";
-		mes "Service for the next trial period. Thank you for your support~";
-		break;
-	case 2:
-		//if (lhz_boss < 17) {
-		//	mes "[Kafra Voting Staff]";
-		//	mes "Oh, I'm so sorry, but you";
-		//	mes "are currently not qualified to";
-		//	mes "vote. For voting qualification";
-		//	mes "information, please visit the";
-		//	mes "Al De Baran Kafra Headquarters.";
-		//	mes "Thank you and have a nice day.";
-		//	close2;
-		//	cutin "",255;
-		//	end;
-		//}
-		//else {
-			if ($DTS_Result == 0) {
-				if (lhz_vote <= $DTS_VoteCount) {
-					mes "[Kafra Voting Staff]";
-					mes "We, the Kafra Corporation,";
-					mes "are planning to provide the";
-					mes "Dungeon Teleport Service";
-					mes "to the following dungeons...";
-					next;
-					mes " ";
-					mes " ";
-					if ($DTS_KafraWins == 0) {
-						mes "^FF0000Toy Factory, Level 2^000000";
-					}
-					else if ($DTS_KafraWins == 1) {
-						mes "^FF0000Toy Factory, Level 2^000000";
-						mes "^FF0000Al De Baran Clock Tower, Level 3 ^000000";
-					}
-					else {
-						mes "^FF0000Toy Factory, Level 2^000000";
-						mes "^FF0000Al De Baran Clock Tower, Level 3 Lava Dungeon, Level 2^000000";
-					}
-					next;
-					mes "[Kafra Voting Staff]";
-					mes "If you are interested in";
-					mes "a Teleport Service to this";
-					mes "area, then please vote for";
-					mes "us. Would you like to vote";
-					mes "for the Kafra Corporation?";
-					next;
-					switch(select("No:Yes")) {
-					case 1:
-						mes "[Kafra Voting Staff]";
-						mes "I understand. But if you";
-						mes "happen to change your mind,";
-						mes "you are welcome to come back";
-						mes "at any time. Thank you and";
-						mes "have a good day, adventurer.";
-						break;
-					case 2:
-						set lhz_vote,$DTS_VoteCount+1;
-						set $DTS_KafraVotes,$DTS_KafraVotes+1;
-						mes "[Kafra Voting Staff]";
-						mes "Thanks for your vote!";
-						mes "We'll continue to do our best";
-						mes "to provide the highest quality";
-						mes "service to our customers. Have";
-						mes "a good day and remember that the Kafra service is on your side~";
-						break;
-					}
-				}
-				else {
-					mes "[Kafra Voting Staff]";
-					mes "I'm sorry, but you've ";
-					mes "already participated in";
-					mes "this election. When the next";
-					mes "election comes, you will be";
-					mes "able to vote once again.";
-					mes "Thank you for your support~";
-				}
-			}
-			else if ($DTS_Result == 3) {
-				if (lhz_vote <= $DTS_VoteCount) {
-					mes "[Kafra Voting Staff]";
-					mes "After totalling the number of";
-					mes "votes from the last election,";
-					mes "we have concluded that the";
-					mes "minimum voter participation";
-					mes "condition was not satisfied.";
-					next;
-					mes "[Kafra Voting Staff]";
-					mes "Therefore, another election to";
-					mes "determine which company will";
-					mes "provide the Dungeon Teleport";
-					mes "Service will be held. The Kafra";
-					mes "Corporation will teleport to";
-					mes "the following dungeons...";
-					next;
-					mes " ";
-					mes " ";
-					if ($DTS_KafraWins == 0) {
-						mes "FF0000Toy Factory, Level 2^000000";
-					}
-					else if ($DTS_KafraWins == 1) {
-						mes "^FF0000Toy Factory, Level 2^000000";
-						mes "^FF0000Al De Baran Clock Tower, Level 3 ^000000";
-					}
-					else {
-						mes "^FF0000Toy Factory, Level 2^000000";
-						mes "^FF0000Al De Baran Clock Tower, Level 3 Lava Dungeon, Level 2^000000";
-					}
-					next;
-					mes "[Kafra Voting Staff]";
-					mes "If you are interested in";
-					mes "a Teleport Service to these";
-					mes "areas, then please vote for";
-					mes "us. Would you like to vote";
-					mes "for the Kafra Corporation?";
-					next;
-					switch(select("No:Yes")) {
-					case 1:
-						mes "[Kafra Voting Staff]";
-						mes "I understand. But if you";
-						mes "happen to change your mind,";
-						mes "you are welcome to come back";
-						mes "at any time. Thank you and";
-						mes "have a good day, adventurer.";
-						break;
-					case 2:
-						set lhz_vote,$DTS_VoteCount+1;
-						set $DTS_KafraVotes,$DTS_KafraVotes+1;
-						mes "[Kafra Voting Staff]";
-						mes "Thanks for your vote!";
-						mes "We'll continue to do our best";
-						mes "to provide the highest quality";
-						mes "service to our customers. Have";
-						mes "a good day and remember that the Kafra service is on your side~";
-						break;
-					}
-				}
-				else {
-					mes "[Kafra Voting Staff]";
-					mes "After totalling the number of";
-					mes "votes from the last election,";
-					mes "we have concluded that the";
-					mes "minimum voter participation";
-					mes "condition was not satisfied.";
-					next;
-					mes "[Kafra Voting Staff]";
-					mes "Therefore, another election to";
-					mes "determine which company will";
-					mes "provide the Dungeon Teleport";
-					mes "Service will be held. However,";
-					mes "since you've already voted, you cannot vote again in this election.";
-					next;
-					mes "[Kafra Voting Staff]";
-					mes "Your participation in these";
-					mes "elections is much appreciated,";
-					mes "and we encourage you to vote";
-					mes "again during the next election.";
-					mes "Thank you and have a nice day~";
-				}
-			}
-			else {
-				mes "[Kafra Voting Staff]";
-				mes "I'm sorry, but there are";
-				mes "no elections taking place at";
-				mes "this time. When the polls are";
-				mes "open, we encourage you to take";
-				mes "part and voice your opinions.";
-				mes "Thank you for your support~";
-			}
-		//}
-		break;
-	case 3:
-		if ($DTS_Result == 2) {
-			mes "[Kafra Voting Staff]";
-			mes "Thank you for choosing the";
-			mes "Dungeon Teleport Service.";
-			mes "Please keep in mind that the";
-			mes "Free Warp Tickets and Kafra";
-			mes "Special Reserve Points do not";
-			mes "apply in this special service.";
-			next;
-			if ($DTS_KafraWins == 0) {
-				switch(select("Toy Factory, Level 2 -> 4,000 z:Cancel")) {
-				case 1:
-					if (Zeny >= 4000) {
-						cutin "",255;
-						set zeny,zeny-4000;
-						warp "xmas_dun02",130,123;
-						end;
-					}
-					else {
-						mes "[Kafra Voting Staff]";
-						mes "I'm sorry, but you don't";
-						mes "have enough money to pay";
-						mes "the 4,000 zeny fee to teleport";
-						mes "to the Toy Factory. Please";
-						mes "check your funds again.";
-					}
-					break;
-				case 2:
-					mes "[Kafra Voting Staff]";
-					mes "We, here at Kafra Corporation,";
-					mes "are always endeavoring to provide you with the best services. We hope that we meet your adventuring needs and standards of excellence.";
-					break;
-				}
-			}
-			else if ($DTS_KafraWins == 1) {
-				switch(select("Toy Factory, Level 2 -> 4,000 z:Clock Tower, Level 3 -> 4,000 z:Cancel")) {
-				case 1:
-					if (Zeny >= 4000) {
-						set zeny,zeny-4000;
-						cutin "kafra_09",255;
-						warp "xmas_dun02",130,123;
-						end;
-					}
-					else {
-						mes "[Kafra Voting Staff]";
-						mes "I'm sorry, but you don't";
-						mes "have enough money to pay";
-						mes "the 4,000 zeny fee to teleport";
-						mes "to the Toy Factory. Please";
-						mes "check your funds again.";
-					}
-					break;
-				case 2:
-					if (Zeny >= 4000) {
-						set zeny,zeny-4000;
-						cutin "kafra_09",255;
-						warp "alde_dun03",265,22;
-						end;
-					}
-					else {
-						mes "[Kafra Voting Staff]";
-						mes "I'm sorry, but you don't";
-						mes "have enough money to pay";
-						mes "the 4,000 zeny fee to teleport";
-						mes "to the Clock Tower. Please";
-						mes "check your funds again.";
-					}
-					break;
-				case 3:
-					mes "[Kafra Voting Staff]";
-					mes "We, here at Kafra Corporation,";
-					mes "are always endeavoring to provide you with the best services. We hope that we meet your adventuring needs and standards of excellence.";
-					break;
-				}
-			}
-			else {
-				switch(select("Toy Factory, Level 2 -> 4,000 z:Clock Tower, Level 3 -> 4,000 z:Lava Dungeon, Level 2 -> 4,000 z:Cancel")) {
-				case 1:
-					if (Zeny >= 4000) {
-						set zeny,zeny-4000;
-						cutin "kafra_09",255;
-						warp "xmas_dun02",130,123;
-						end;
-					}
-					else {
-						mes "[Kafra Voting Staff]";
-						mes "I'm sorry, but you don't";
-						mes "have enough money to pay";
-						mes "the 4,000 zeny fee to teleport";
-						mes "to the Toy Factory. Please";
-						mes "check your funds again.";
-					}
-					break;
-				case 2:
-					if (Zeny >= 4000) {
-						set zeny,zeny-4000;
-						cutin "kafra_09",255;
-						warp "alde_dun03",265,22;
-						end;
-					}
-					else {
-						mes "[Kafra Voting Staff]";
-						mes "I'm sorry, but you don't";
-						mes "have enough money to pay";
-						mes "the 4,000 zeny fee to teleport";
-						mes "to the Clock Tower. Please";
-						mes "check your funds again.";
-					}
-					break;
-				case 3:
-					if (Zeny >= 4000) {
-						set zeny,zeny-4000;
-						cutin "kafra_09",255;
-						warp "mag_dun02",47,40;
-						end;
-					}
-					else {
-						mes "[Kafra Voting Staff]";
-						mes "I'm sorry, but you don't";
-						mes "have enough money to pay";
-						mes "the 4,000 zeny fee to teleport";
-						mes "to the Lava Dungeon. Please";
-						mes "check your funds again.";
-					}
-					break;
-				case 4:
-					mes "[Kafra Voting Staff]";
-					mes "We, here at Kafra Corporation,";
-					mes "are always endeavoring to provide you with the best services. We hope that we meet your adventuring needs and standards of excellence.";
-					break;
-				}
-			}
-		}
-		else if ($DTS_Result == 1) {
-			mes "[Kafra Voting Staff]";
-			mes "I'm sorry, but because of";
-			mes "the results from the most";
-			mes "recent election, Cool Event";
-			mes "Corp. is currently handling";
-			mes "the Dungeon Teleport Service. We apologize for the inconvenience.";
-		}
-		else {
-			mes "[Kafra Voting Staff]";
-			mes "I'm sorry, but the";
-			mes "Dungeon Teleport Service";
-			mes "is not active during the voting";
-			mes "period. Once the election is";
-			mes "over, the Dungeon Teleport";
-			mes "Service will become available.";
-		}
-		break;
-	case 4:
-		mes "[Kafra Voting Staff]";
-		mes "We, here at Kafra Corporation,";
-		mes "are always endeavoring to provide you with the best services. We hope that we meet your adventuring needs and standards of excellence.";
-		break;
-	}
-	close2;
-	cutin "",255;
-	end;
-}
-
-yuno,162,191,4	script	Kafra Voting Staff#yuno	861,{
-	callfunc "F_VoteKafra",9;
-}
-prontera,164,125,4	script	Kafra Voting Staff#prt	116,{
-	callfunc "F_VoteKafra",2;
-}
-moc_ruins,97,133,4	script	Kafra Voting Staff#moc	116,{
-	callfunc "F_VoteKafra",2;
-}
-geffen,122,37,4	script	Kafra Voting Staff#gef	116,{
-	callfunc "F_VoteKafra",2;
-}
-payon,158,182,4	script	Kafra Voting Staff#pay	116,{
-	callfunc "F_VoteKafra",2;
-}
-alberta,119,70,4	script	Kafra Voting Staff#alb	116,{
-	callfunc "F_VoteKafra",2;
-}
-aldebaran,145,102,4	script	Kafra Voting Staff#alde	116,{
-	callfunc "F_VoteKafra",2;
-}
-lighthalzen,163,60,4	script	Kafra Voting Staff#lght	861,{
-	callfunc "F_VoteKafra",9;
-}
-
--	script	Cool Event Staff::VotingStaffCCE	874,{
-	callfunc "F_ClearGarbage";				//Clear outdated, unused variables
-	cutin "zonda_01",2;
-	mes "[Cool Event Corp. Voting Staff]";
-	mes "Hello! Don't forget to make";
-	mes "your voice be heard and make";
-	mes "sure you vote in the elections";
-	mes "between Cool Event Corp. and";
-	mes "Kafra Corporation for control of the Dungeon Teleport Service!";
-	next;
-	switch(select("Reason for Election:Cast a Vote:Use Teleport Service:Cancel")) {
-	case 1:
-		mes "[Cool Event Corp. Voting Staff]";
-		mes "Cool Event Corp. has been";
-		mes "planning to provide a new";
-		mes "Dungeon Teleport Service to";
-		mes "its customers, a service not";
-		mes "already provided by the Kafra";
-		mes "Corporation. However...";
-		next;
-		mes "[Cool Event Corp. Voting Staff]";
-		mes "Kafra Corporation, which";
-		mes "already monopolizes the";
-		mes "public teleportation market,";
-		mes "actually also had plans to";
-		mes "provide a similar service.";
-		next;
-		mes "[Cool Event Corp. Voting Staff]";
-		mes "Because of technological";
-		mes "limitations, only one company";
-		mes "can be chosen as the provider";
-		mes "of this Dungeon Teleport Service. Hence, we will let the customers";
-		mes "decide through these elections.";
-		next;
-		mes "[Cool Event Corp. Voting Staff]";
-		mes "Multiple elections will be";
-		mes "held so that our customers";
-		mes "can test out the special services of each company for themselves.";
-		mes "However, keep in mind that you must be eligible in order to vote.";
-		next;
-		mes "[Cool Event Corp. Voting Staff]";
-		mes "For voter eligibility";
-		mes "details, please visit our";
-		mes "headquarters in the city of";
-		mes "Lighthalzen located in the";
-		mes "Schwaltzvalt Republic.";
-		mes "Thank you for your time.";
-		break;
-	case 2:
-		//if (lhz_boss < 17) {
-		//	mes "[Cool Event Corp. Voting Staff]";
-		//	mes "I'm sorry, but you are not";
-		//	mes "eligible to vote at this time.";
-		//	mes "Please visit our headquarters";
-		//	mes "in Lighthalzen for information";
-		//	mes "related to acquiring voting rights. Thank you for your time.";
-		//	close2;
-		//	cutin "zonda_01",255;
-		//	end;
-		//}
-		//else {
-			if ($DTS_Result == 0) {
-				if (lhz_vote <= $DTS_VoteCount) {
-					mes "[Cool Event Corp. Voting Staff]";
-					mes "Cool Event Corp.,";
-					mes "if chosen to provide the";
-					mes "Dungeon Teleport Service,";
-					mes "will teleport adventurers to";
-					mes "the following dungeons...";
-					next;
-					mes " ";
-					mes " ";
-					if ($DTS_JondaWins == 0) {
-						mes "^FF0000Byalan Dungeon, Level 3^000000";
-					}
-					else if ($DTS_JondaWins == 1) {
-						mes "^FF0000Byalan Dungeon, Level 3^000000";
-						mes "^FF0000Clock Tower, 3rd Floor^000000";
-					}
-					else {
-						mes "^FF0000Byalan Dungeon, Level 3^000000";
-						mes "^FF0000Clock Tower, 3rd Floor^000000";
-						mes "^FF0000Glast Heim Entrance^000000";
-					}
-					next;
-					mes "[Cool Event Corp. Voting Staff]";
-					mes "If you are interested in";
-					mes "these destinations, then";
-					mes "it would be in your best";
-					mes "interest to vote for us.";
-					mes "Would you like to vote";
-					mes "for Cool Event Corp.?";
-					next;
-					switch(select("No:Yes")) {
-					case 1:
-						mes "[Cool Event Corp. Voting Staff]";
-						mes "Ah, I see... Well, if you";
-						mes "happen to change your mind,";
-						mes "feel free to come back and";
-						mes "cast your vote for Cool Event";
-						mes "Corp, alright? Have a nice day~";
-						break;
-					case 2:
-						set lhz_vote,$DTS_VoteCount+1;
-						set $DTS_JondaVotes,$DTS_JondaVotes+1;
-						mes "[Cool Event Corp. Voting Staff]";
-						mes "Thank you for your vote!";
-						mes "It's customers like you who";
-						mes "ensure the success and great";
-						mes "service that you have come to";
-						mes "expect from Cool Event Corp.";
-						mes "Thank you and have a nice day~";
-						break;
-					}
-				}
-				else {
-					mes "[Cool Event Corp. Voting Staff]";
-					mes "I'm sorry, but you've";
-					mes "already cast your vote";
-					mes "in this election. However,";
-					mes "please don't let that stop you";
-					mes "from voting for Cool Event";
-					mes "Corp. in the next election~";
-				}
-			}
-			else if ($DTS_Result == 3) {
-				if (lhz_vote <= $DTS_VoteCount) {
-					mes "[Cool Event Corp. Voting Staff]";
-					mes "Unfortunately, there wasn't";
-					mes "enough voter turnout in the";
-					mes "last election, so we're holding";
-					mes "another election to determine";
-					mes "which company will provide the";
-					mes "Dungeon Teleport Service.";
-					next;
-					mes "[Cool Event Corp. Voting Staff]";
-					mes "Cool Event Corp.,";
-					mes "if chosen to provide the";
-					mes "Dungeon Teleport Service,";
-					mes "will teleport adventurers to";
-					mes "the following dungeons...";
-					next;
-					mes " ";
-					mes " ";
-					if ($DTS_JondaWins == 0) {
-						mes "^FF0000Byalan Dungeon, Level 3^000000";
-					}
-					else if ($DTS_JondaWins == 1) {
-						mes "^FF0000Byalan Dungeon, Level 3^000000";
-						mes "^FF0000Clock Tower, 3rd Floor^000000";
-					}
-					else {
-						mes "^FF0000Byalan Dungeon, Level 3^000000";
-						mes "^FF0000Clock Tower, 3rd Floor^000000";
-						mes "^FF0000Glast Heim Entrance^000000";
-					}
-					next;
-					mes "[Cool Event Corp. Voting Staff]";
-					mes "If you are interested in";
-					mes "these destinations, then";
-					mes "it would be in your best";
-					mes "interest to vote for us.";
-					mes "Would you like to vote";
-					mes "for Cool Event Corp.?";
-					next;
-					switch(select("No:Yes")) {
-					case 1:
-						mes "[Cool Event Corp. Voting Staff]";
-						mes "Ah, I see... Well, if you";
-						mes "happen to change your mind,";
-						mes "feel free to come back and";
-						mes "cast your vote for Cool Event";
-						mes "Corp, alright? Have a nice day~";
-						break;
-					case 2:
-						set lhz_vote,$DTS_VoteCount+1;
-						set $DTS_JondaVotes,$DTS_JondaVotes+1;
-						mes "[Cool Event Corp. Voting Staff]";
-						mes "Thank you for your vote!";
-						mes "It's customers like you who";
-						mes "ensure the success and great";
-						mes "service that you have come to";
-						mes "expect from Cool Event Corp.";
-						mes "Thank you and have a nice day~";
-						break;
-					}
-				}
-				else {
-					mes "[Cool Event Corp. Voting Staff]";
-					mes "Unfortunately, there wasn't";
-					mes "enough voter turnout in the";
-					mes "last election, so we're holding";
-					mes "another election to determine";
-					mes "which company will provide the";
-					mes "Dungeon Teleport Service.";
-					next;
-					mes "[Cool Event Corp. Voting Staff]";
-					mes "We appreciate that";
-					mes "you've already participated";
-					mes "in this second election by";
-					mes "casting your vote. Thank";
-					mes "you for your support~";
-				}
-			}
-			else {
-				mes "[Cool Event Corp. Voting Staff]";
-				mes "I'm sorry, but an election is";
-				mes "not currently being held at this time. Please come and cast your";
-				mes "vote at the next election to decide which company will provide the";
-				mes "Dungeon Teleport Service.";
-			}
-		//}
-		break;
-	case 3:
-		if ($DTS_Result == 1) {
-			mes "[Cool Event Corp. Voting Staff]";
-			mes "Please remember that we";
-			mes "cannot accept Free Warp Tickets";
-			mes "or award Special Reserve Points";
-			mes "for this service. Now, please";
-			mes "choose your destination.";
-			next;
-			if ($DTS_JondaWins == 0) {
-				switch(select("Byalan Dungeon, Level 3 -> 4,000 z:Cancel")) {
-				case 1:
-					if (Zeny >= 4000) {
-						set zeny,zeny-4000;
-						cutin "zonda_01",255;
-						warp "iz_dun02",234,206;
-						end;
-					}
-					else {
-						mes "[Cool Event Corp. Voting Staff]";
-						mes "I'm sorry, but you do";
-						mes "not have enough zeny to";
-						mes "teleport to this destination.";
-						mes "The teleport fee is 4,000 zeny.";
-					}
-					break;
-				case 2:
-					mes "[Cool Event Corp. Voting Staff]";
-					mes "Always be assured that";
-					mes "Cool Event Corp. will do";
-					mes "everything in its power to";
-					mes "ensure the satisfaction of";
-					mes "its customers, young and old";
-					mes "and big and small. Thank you~";
-					break;
-				}
-			}
-			else if ($DTS_JondaWins == 1) {
-				switch(select("Byalan Dungeon, Level 3 -> 4,000 z:Clock Tower, 3rd Floor -> 4,000 z:Cancel")) {
-				case 1:
-					if (Zeny >= 4000) {
-						set zeny,zeny-4000;
-						cutin "zonda_01",255;
-						warp "iz_dun02",234,206;
-						end;
-					}
-					else {
-						mes "[Cool Event Corp. Voting Staff]";
-						mes "I'm sorry, but you do";
-						mes "not have enough zeny to";
-						mes "teleport to this destination.";
-						mes "The teleport fee is 4,000 zeny.";
-					}
-					break;
-				case 2:
-					if (Zeny >= 4000) {
-						set zeny,zeny-4000;
-						cutin "zonda_01",255;
-						warp "c_tower3",64,143;
-						end;
-					}
-					else {
-						mes "[Cool Event Corp. Voting Staff]";
-						mes "I'm sorry, but you do";
-						mes "not have enough zeny to";
-						mes "teleport to this destination.";
-						mes "The teleport fee is 4,000 zeny.";
-					}
-					break;
-				case 3:
-					mes "[Cool Event Corp. Voting Staff]";
-					mes "Always be assured that";
-					mes "Cool Event Corp. will do";
-					mes "everything in its power to";
-					mes "ensure the satisfaction of";
-					mes "its customers, young and old";
-					mes "and big and small. Thank you~";
-					break;
-				}
-			}
-			else {
-				mes "[Cool Event Corp. Voting Staff]";
-				mes "Please remember that we";
-				mes "cannot accept Free Warp Tickets";
-				mes "or award Special Reserve Points";
-				mes "for this service. Now, please";
-				mes "choose your destination.";
-				next;
-				switch(select("Byalan Dungeon, Level 3 -> 4,000 z:Clock Tower, 3rd Floor -> 4,000 z:Glast Heim Entrance -> 4,000 z:Cancel")) {
-				case 1:
-					if (Zeny >= 4000) {
-						set zeny,zeny-4000;
-						cutin "zonda_01",255;
-						warp "iz_dun02",234,206;
-						end;
-					}
-					else {
-						mes "[Cool Event Corp. Voting Staff]";
-						mes "I'm sorry, but you do";
-						mes "not have enough zeny to";
-						mes "teleport to this destination.";
-						mes "The teleport fee is 4,000 zeny.";
-					}
-					break;
-				case 2:
-					if (Zeny >= 4000) {
-						set zeny,zeny-4000;
-						cutin "zonda_01",255;
-						warp "c_tower3",64,143;
-						end;
-					}
-					else {
-						mes "[Cool Event Corp. Voting Staff]";
-						mes "I'm sorry, but you do";
-						mes "not have enough zeny to";
-						mes "teleport to this destination.";
-						mes "The teleport fee is 4,000 zeny.";
-					}
-					break;
-				case 3:
-					if (Zeny >= 4000) {
-						set zeny,zeny-4000;
-						cutin "zonda_01",255;
-						warp "glast_01",368,303;
-						end;
-					}
-					else {
-						mes "[Cool Event Corp. Voting Staff]";
-						mes "I'm sorry, but you do";
-						mes "not have enough zeny to";
-						mes "teleport to this destination.";
-						mes "The teleport fee is 4,000 zeny.";
-					}
-					break;
-				case 4:
-					mes "[Cool Event Corp. Voting Staff]";
-					mes "Always be assured that";
-					mes "Cool Event Corp. will do";
-					mes "everything in its power to";
-					mes "ensure the satisfaction of";
-					mes "its customers, young and old";
-					mes "and big and small. Thank you~";
-					break;
-				}
-			}
-		}
-		else if ($DTS_Result == 2) {
-			mes "[Cool Event Corp. Voting Staff]";
-			mes "I'm sorry, but Cool Event";
-			mes "Corp. does not currently offer";
-			mes "the Dungeon Teleport Service";
-			mes "due to the results of the last";
-			mes "election. Please vote for us";
-			mes "next time, alright? Good day~";
-		}
-		else {
-			mes "[Cool Event Corp. Voting Staff]";
-			mes "I'm sorry, but the";
-			mes "Dungeon Teleport Service is";
-			mes "unavailable during elections";
-			mes "and will be reactivated after the election results are announced.";
-			mes "Thank you and have a nice day.";
-		}
-		break;
-	case 4:
-		mes "[Cool Event Corp. Voting Staff]";
-		mes "Cool Event Corp. is always";
-		mes "working to make sure that";
-		mes "not only are our customers";
-		mes "satisfied, but that we also";
-		mes "exceed your utmost standards.";
-		mes "Thank you and have a good day.";
-		break;
-	}
-	close2;
-	cutin "zonda_01",255;
-	end;
-}
-
-yuno,153,191,6	duplicate(VotingStaffCCE)	Cool Event Staff#yuno	874
-prontera,147,125,6	duplicate(VotingStaffCCE)	Cool Event Staff#prt	874
-moc_ruins,104,133,6	duplicate(VotingStaffCCE)	Cool Event Staff#moc	874
-geffen,117,37,6	duplicate(VotingStaffCCE)	Cool Event Staff#gef	874
-payon,153,182,6	duplicate(VotingStaffCCE)	Cool Event Staff#pay	874
-alberta,114,70,6	duplicate(VotingStaffCCE)	Cool Event Staff#alb	874
-aldebaran,138,102,6	duplicate(VotingStaffCCE)	Cool Event Staff#alde	874
-lighthalzen,154,60,6	duplicate(VotingStaffCCE)	Cool Event Staff#lhz	874
-
-yuno,103,225,0	script	Scrutiny Association#5	-1,{
-OnInit:
-	initnpctimer;
-	end;
-
-OnEnable:
-	initnpctimer;
-	end;
-
-OnTimer7200000:
-	stopnpctimer;
-	if (($DTS_Result == 0) || ($DTS_Result == 3)) {
-		announce "Currently, the Dungeon Teleport Service Provider Election is being held in all major cities. Your participation is appreciated.",bc_all,"0x70dbdb";
-	}
-	donpcevent "Scrutiny Association#5::OnEnable";
-	end;
-}
-
-einbroch,248,71,0	script	Scrutiny Association#6	-1,{
-OnEnable:
-	initnpctimer;
-	end;
-
-OnTimer1000:
-	announce "All the votes for the Dungeon Teleport Service Provider Election have been received and counted.",bc_all,"0x70dbdb";
-	end;
-
-OnTimer5000:
-	announce "The results are now in...",bc_all,"0x70dbdb";
-	end;
-
-OnTimer10000:
-	announce "This time, Cool Event Corp. will be the Dungeon Teleport Service Provider.",bc_all,"0x70dbdb";
-	end;
-
-OnTimer15000:
-	announce "Many thanks to all of you who have voted and shown your support.",bc_all,"0x70dbdb";
-	stopnpctimer;
-	end;
-}
-
-einbroch,249,71,0	script	Scrutiny Association#7	-1,{
-OnEnable:
-	initnpctimer;
-	end;
-
-OnTimer1000:
-	announce "All the votes for the Dungeon Teleport Service Provider Election have been received and counted.",bc_all,"0x70dbdb";
-	end;
-
-OnTimer5000:
-	announce "The results are now in...",bc_all,"0x70dbdb";
-	end;
-
-OnTimer10000:
-	announce "This time, Kafra Corporation will be the Dungeon Teleport Service Provider.",bc_all,"0x70dbdb";
-	end;
-
-OnTimer15000:
-	announce "Many thanks to all of you who have voted and shown your support.",bc_all,"0x70dbdb";
-	stopnpctimer;
-	end;
-}
-
-/*
-// GM only NPC used for modifying values related to the DTS system.
-sec_in02,17,160,4	script	Vote Globalvar Girl#yuno	864,{
-	mes "[Christy's Maid]";
-	mes "Lady Christy!";
-	next;
-	input .@input,0,9000;
-	if (input == 1854) {
-		mes "[Christy's Maid]";
-		mes "I am Lady Christy's Maid.";
-		next;
-		switch(select("Globalvar Check:Setitem Zero:Change Glbalvar")) {
-		case 1:
-			mes "Current GlobalVar are";
-			next;
-			mes "[Christy's Maid]";
-			mes "Global 1 - Voting Time check : "+$DTS_Time+"";
-			mes "Global 2 - Cool Event Corp. Vote Numbers : "+$DTS_JondaVotes+"";
-			mes "Global 3 - Kafra Vote Numbers : "+$DTS_KafraVotes+"";
-			mes "Global 4 - Winner : "+$DTS_Result+"";
-			mes "Global 5 - Teleport Service Period Check: "+$DTS_PeriodCheck+"";
-			mes "Global 6 - Kafra Points : "+$DTS_KafraWins+"";
-			mes "Global 7 - Cool Event Corp. Points : "+$DTS_JondaWins+"";
-			mes "Global 8 - Setitem Check : "+$DTS_VoteCount+"";
-			next;
-			mes "[Christy's Maid]";
-			mes "Current Setitem value is "+lhz_vote+".";
-			close;
-		case 2:
-			set lhz_vote,0;
-			close;
-		case 3:
-			mes "[Christy's Maid]";
-			mes "Which Globalvar value would you like to change?";
-			next;
-			switch(select("1 - Voting Time:2 - Cool Event Corp. Vote Numbers:3 - Kafra Vote Numbers:4 - Winner:5 - Teleport Service Period:6 - Kafra Warp Number:7 - Cool Event Corp. Warp Number:8 - Setitem Value")) {
-			case 1:
-				mes "[Christy's Maid]";
-				mes "Please enter a number among 0 and 1000.";
-				next;
-				input .@input;
-				if ((.@input < 0) || (.@input > 1000)) {
-					mes "[Christy's Maid]";
-					mes "The value is incorrect.";
-					close;
-				}
-				set $DTS_Time,.@input;
-				mes "[Christy's Maid]";
-				mes "The value has been modified.";
-				close;
-			case 2:
-				mes "[Christy's Maid]";
-				mes "Please enter a number among 0 and 1000.";
-				next;
-				input .@input;
-				if ((.@input < 0) || (.@input > 1000)) {
-					mes "[Christy's Maid]";
-					mes "The value is incorrect.";
-					close;
-				}
-				set $DTS_JondaVotes,.@input;
-				mes "[Christy's Maid]";
-				mes "The value has been modified.";
-				close;
-			case 3:
-				mes "[Christy's Maid]";
-				mes "Please enter a number among 0 and 1000.";
-				next;
-				input .@input;
-				if ((.@input < 0) || (.@input > 1000)) {
-					mes "[Christy's Maid]";
-					mes "The value is incorrect.";
-					close;
-				}
-				set $DTS_KafraVotes,.@input;
-				mes "[Christy's Maid]";
-				mes "The value has been modified.";
-				close;
-			case 4:
-				mes "[Christy's Maid]";
-				mes "Please enter a number among 0 and 3.";
-				next;
-				input .@input;
-				if ((.@input < 0) || (.@input > 3)) {
-					mes "[Christy's Maid]";
-					mes "The value is incorrect.";
-					close;
-				}
-				set $DTS_Result,.@input;
-				mes "[Christy's Maid]";
-				mes "The value has been modified.";
-				close;
-			case 5:
-				mes "[Christy's Maid]";
-				mes "Please enter a number among 0 and 1000.";
-				next;
-				input .@input;
-				if ((.@input < 0) || (.@input > 1000)) {
-					mes "[Christy's Maid]";
-					mes "The value is incorrect.";
-					close;
-				}
-				set $DTS_PeriodCheck,.@input;
-				mes "[Christy's Maid]";
-				mes "The value has been modified.";
-				close;
-			case 6:
-				mes "[Christy's Maid]";
-				mes "Please enter a number among 0 and 2.";
-				next;
-				input .@input;
-				if ((.@input < 0) || (.@input > 2)) {
-					mes "[Christy's Maid]";
-					mes "The value is incorrect.";
-					close;
-				}
-				set $DTS_KafraWins,.@input;
-				mes "[Christy's Maid]";
-				mes "The value has been modified.";
-				close;
-			case 7:
-				mes "[Christy's Maid]";
-				mes "Please enter a number among 0 and 2.";
-				next;
-				input .@input;
-				if ((.@input < 0) || (.@input > 2)) {
-					mes "[Christy's Maid]";
-					mes "The value is incorrect.";
-					close;
-				}
-				set $DTS_JondaWins,.@input;
-				mes "[Christy's Maid]";
-				mes "The value has been modified.";
-				close;
-			case 8:
-				mes "[Christy's Maid]";
-				mes "Please enter a number among 0 and 10000.";
-				next;
-				input .@input;
-				if ((.@input < 0) || (.@input > 10000)) {
-					mes "[Christy's Maid]";
-					mes "The value is incorrect.";
-					close;
-				}
-				set $DTS_VoteCount,.@input;
-				mes "[Christy's Maid]";
-				mes "The value has been modified.";
-				close;
-			}
-		}
-	}
-	else {
-		mes "[Christy's Maid]";
-		mes "Lady Christy...";
-		close;
-	}
-}
-*/
diff --git a/npc/pre-re/kafras/functions_kafras.txt b/npc/pre-re/kafras/functions_kafras.txt
deleted file mode 100644
index a63f083e2..000000000
--- a/npc/pre-re/kafras/functions_kafras.txt
+++ /dev/null
@@ -1,677 +0,0 @@
-//===== rAthena Script ======================================= 
-//= Kafra Functions
-//===== By: ================================================== 
-//= rAthena Dev Team
-//= Darlskies, Darkchild, Syrus22, Lupus, kobra_k88 (2.0)
-//= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 6.3
-//===== Compatible With: ===================================== 
-//= rAthena 1.0
-//===== Description: =========================================
-//= These functions handle save, storage, cart rental, teleport,
-//= and Free Teleport/Warp/Rent Cart options for all Kafra NPCs.
-//=
-//= Kafra's will need a lot of work. The Welcome Message argument
-//= may become obsolete, as most kafras have a slightly differing
-//= Welcome message.
-//===== Additional Comments: ================================= 
-//= v1.1 Now using functions v2.1 Added Cart Rent for Classes: Whitesmith, Professor.
-//= Replaced checkoption(x) into checkcart(0) [Lupus] v2.1b Added Fix Kafra Pass Func [Kobra_k88]
-//= 2.2 Final fix of the Kafra Pass Exploit! [Lupus] a -Izlude[4] fix
-//= 2.2a Minor changes to function calls.  Using agruments. Added Guild options. [kobra_k88]
-//= 2.2b This version uses arrays for the teleport option. Rearranged next statements to make menu transitions smoother. [kobra_k88]
-//= 2.3 Removed SAVE from Niflheim. [Lupus]
-//= 2.3 removed "fix" by HawkMoon RTFM and check supernovice.txt . There's a SPECIAL Kafra which gives CARTS to SN for a special proce. [Lupus]
-//= 2.4 Added Baby Class Support (Baby Novice check) Removed annoying storage feature where u had to close dialog window to be able to use your storage [Lupus]
-//= 2.5 Added Louyang official Kafra, fixes some Kafras, not letting you to Save your position [Lupus]
-//= 2.6 Reverted Dungeons Kafras (they should offer only Storage). Added temp Ayothaya Kafra
-//= 2.7 Added correct Ayothaya, Louyang & Amatsu Kafras. [Lupus]
-//= 2.8 Fixed Amatsu Storage problems [Lupus] 2.9 Fixed spelling mistakes. [Nexon]
-//= 3.0 Added special "not working teleport menu" for Einbroch Kafras [Lupus]
-//= 3.1 Removed callfunc Is_####_Class in favor of baseClass [Silentdragon]
-//= 3.2 Fixed an exploit [Lupus]
-//= 4.0 Added Kafra storage password protection. [Lupus]
-//=	to block Kafra Password, read comments at 350 line
-//= 5.0 Fixed the close2;....close; end; lines. Who let them slip away? =/ [erKURITA]
-//=	  Also, the kafra upon warp was giving back the zeny. Removed. [erKURITA]
-//= 5.1 Optimized a little, added no tele/save arg's [Evera]
-//= 5.1a Temporary? Added F_ClearGarbage to clear unused/outdated variables [Lupus]
-//= 5.2 By default commented out custom Guilds Kafra's "Guild Storage". [Lupus]
-//= 5.3 uncommented Guild Storage. Confirmed kRO feature. [Lupus]
-//= 5.4 added -Guide option (Kafra shows you nearest Guide) Work in progress. 
-//=	Need all coords for all guides.. and somehow pass their coords to kafra.
-//=	Removed universal Kafra Pass, added 3 new Kafra Tickets [Lupus]
-//= 5.4b temporary moved "-Guide" from the 1st menu punct [Lupus]
-//= 5.5 Added proper Niflheim welcome message.	[L0ne_W0lf]
-//=	Cleaned up the menus a bit. Got rid of the proceeding "-" prefix.
-//= 5.5b Missed a preceeding hyphen, which was screwing up teleporting. [L0ne_W0lf]
-//= 5.6 Further dialog updates, added  dynamic costs for cart and storage use. [L0ne_W0lf]
-//=	Updated some functions to handle Guild Kafras the way they should. 
-//= 5.6a Corrected a few wrong names in the teleport function. [L0ne_W0lf]
-//= 5.7 Correced end message no longer displaying, and the duplicate names [L0ne_W0lf]
-//=	Thanks to Barron-Monster for pointing out the issues.
-//= 5.8 Fixed another double name being shown when "saving" [L0ne_W0lf]
-//= 5.9 Fixed the Kafra Welcome message for guilds. Thanks Barron-Monster. [L0ne_W0lf]
-//= 6.0 Closed Kafra Password exploit in Cool Event Corp. Storages until we got a client/packet based password support.
-//=		Added 2 args into F_SetKafCode to fit it in Cool Evnt Co. NPC [Lupus]
-//= 6.1 Added menu for Turbo Track Kafra Staff. [L0ne_W0lf]
-//= 6.2 Updated/Fixed warp cords. [Kisuka]
-//= 6.3 #kafra_code is now stored as is. [brianluau]
-//============================================================ 
-
-
-// Main Function ===========================================================
-//=   arg(0): Used to determine which welcome message to show.
-//=   arg(1): Used to determine which menu to display.
-//=   arg(2): Used to determine if the info menu is shown in F_KafInfo.
-//=   arg(3): Cost to use Storage
-//=   arg(4): Cost to Rent a Pushcart
-//==========================================================================
-function	script	F_Kafra	{
-	callfunc "F_ClearGarbage"; //Clear outdated, unused variables
-
-	//Display Kafra Welcome Message
-	switch(getarg(0)){
-		//Default message (obsolete)
-		default:
-		case 0:
-			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?";
-			break;
-
-		//Niflheim specific message
-		case 1:
-			mes "[Kafra Employee]";
-			mes "^666666W-weeeelc-c-come";
-			mes "to th-the K-kaaafrrrra";
-			mes "C-coorpoor-r-ratioooonn...^000000";
-			break;
-
-		//Guild Castle Kafra message
-		case 2:
-			set @GID,getcharid(2);
-			mes "[Kafra Employee]";
-	 		mes "Welcome. ^ff0000" + GetGuildName(@GID) + "^000000 Member.";
-			mes "The Kafra Coporation will stay with you wherever you go.";
-			break;
-
-		//Amatsu specific message (obsolete)
-		case 3:
-			mes "[Kafra Employee]";
-			mes "So, have you come from a faraway land to study our culture, or are you just sightseeing?";
-			mes "In either case, why not stay awhile?";
-			mes "The air is eternally heavy with the";
-			mes "scent of pleasant wildflowers.";
-			break;
-
-		//Louyang and Ayothaya specific message (obsolete)
-		case 4:
-			mes "[Kafra Employee]";
-			mes "With our many Kafra";
-			mes "service locations, you're never";
-			mes "far from home.";
-			break;
-
-		//NPC has it's own welcome message. (Display nothing)
-		case 5:
-			break;
-	}
-	next;
-
-	M_Menu:
-		cleararray @K_Menu0$[0],"",7;
-	switch(getarg(1)){
-		// Save and Storage only
-		case 1:
-			setarray @K_Menu0$[0],"Save","Use Storage","Cancel";
-			break;
-
-		// Storage only
-		case 2:
-			setarray @K_Menu0$[0],"Use Storage","Cancel";
-			break;
-
-		// No Teleport (Common)
-		case 3: 
-			setarray @K_Menu0$[0],"Save","Use Storage","Rent a Pushcart","Guide","Check Other Information","Cancel";
-			break;
-
-		// Case 4 is Einbroch no tele message.
-
-		// No save, or teleport. (Common)
-		case 5:
-			setarray @K_Menu0$[0],"Use Storage","Rent a Pushcart","Check Other Information","Guide","Cancel";
-			break;
-
-		// Storage and Check Other Information only.
-		case 6:
-			setarray @K_Menu0$[0],"Use Storage","Guide","Check Other Information","Cancel";
-			break;
-
-		// Save, Storage, and Pushcart only (Kafra Warehouse)
-		case 7:
-			setarray @K_Menu0$[0],"Save","Use Storage","Rent a Pushcart","Cancel";
-			break;
-
-		// Save, Storage, Other Check information. (Turbo track)
-		case 8:
-			setarray @K_Menu0$[0],"Save","Use Storage","Check Other Information","Cancel";
-			break;
-
-		// Common Kafra Employee
-		default:
-			setarray @K_Menu0$[0],"Save","Use Storage","Use Teleport Service","Rent a Pushcart","Guide","Check Other Information","Cancel";
-			break;
-	}
-
-	// Guild Kafra Menu override (free Teleport, free Storage, Free Cart)
-	if(getarg(0)==2) {
-		cleararray @K_Menu0$[0],"",7;
-		setarray @K_Menu0$[0],"Use Storage","Use Guild Storage","Rent a Pushcart","Use Teleport Service","Cancel";
-	}
-	menu 	@K_Menu0$[0],K_Menu0,@K_Menu0$[1],K_Menu1,@K_Menu0$[2],K_Menu2,
-		@K_Menu0$[3],K_Menu3,@K_Menu0$[4],K_Menu4,@K_Menu0$[5],K_Menu5,
-		@K_Menu0$[6],K_Menu6,@K_Menu0$[7],K_Menu7;
-	K_Menu0:
-		set @num,0;
-		goto K_Menuf;
-	K_Menu1:
-		set @num,1;
-		goto K_Menuf;
-	K_Menu2:
-		set @num,2;
-		goto K_Menuf;
-	K_Menu3:
-		set @num,3;
-		goto K_Menuf;
-	K_Menu4:
-		set @num,4;
-		goto K_Menuf;
-	K_Menu5:
-		set @num,5;
-		goto K_Menuf;
-	K_Menu6:
-		set @num,6;
-		goto K_Menuf;
-	K_Menu7:
-		set @num,7;
-	K_Menuf:
-		if (@K_Menu0$[@num] == "Save") return;
-		if (@K_Menu0$[@num] == "Use Storage"){
-			// Do not charge for Guild Storage
-			if(getarg(0) == 2) callfunc "F_KafStor",2,0,0;
-			else callfunc "F_KafStor",0,getarg(3),getarg(0);
-			next;
-			goto M_Menu;
-		}
-		if (@K_Menu0$[@num] == "Use Teleport Service"){
-			// Display Einbroch "No Teleport Service" notice.
-			if(getarg(1) == 4){
-				mes "[Kafra Employee]";
-				mes "Because of the ^FF0000Limited";
-				mes "Transport Agreement^000000, the";
-				mes "Kafra Corporation cannot";
-				mes "provide Teleport Services";
-				mes "in the Schwaltzvalt Republic.";
-				next;
-				mes "[Kafra Employee]";
-				mes "We ask that you please";
-				mes "use the Airship Service";
-				mes "instead. Thank you for your";
-				mes "understanding and cooperation.";
-				next;
-				goto M_Menu;
-			}
-			callfunc "F_KafTele",getarg(0);
-			goto M_Menu;
-		}
-		if (@K_Menu0$[@num] == "Rent a Pushcart"){
-			if(callfunc("F_KafCart",getarg(0),getarg(4)) == 1) next;
-			goto M_Menu;
-		}
-		if (@K_Menu0$[@num] == "Guide"){
-			callfunc "F_KafGuide";
-			next;
-			goto M_Menu;
-		}
-		if (@K_Menu0$[@num] == "Check Other Information"){
-			callfunc "F_KafInfo",getarg(2);
-			goto M_Menu;
-		}
-		if (@K_Menu0$[@num] == "Cancel"){
-			callfunc "F_KafEnd",getarg(0),0;
-			end;
-		}
-		if (@K_Menu0$[@num] == "Use Guild Storage"){
-			callfunc "F_KafStor",1,0;
-			next;
-			goto M_Menu;
-		}
-
-}
-
-
-// Storage Function =======================================================
-function	script	F_KafStor	{
-	// Unable to access Guild Storage (Busy)
-	if(getarg(0) == 1){
-		if(guildopenstorage() == 1){
-			mes "[Kafra Employee]";
-			mes "I'm sorry but another guild member is using the guild storage";
-			mes "right now.  Please wait until that person is finished.";
-			close2;
-			cutin "", 255;
-			end;
-		}
-		cutin "", 255;
-		close;
-	}
-
-	// Unable to access Normal Storage (Insufficient Basic Skills)
-	if(basicskillcheck() && getskilllv("NV_BASIC") < 6){
-		mes "[Kafra Employee]";
-		// Niflheim Specific Message
-		if (getarg(2) == 1) {
-			mes "^666666S-s-ssoooorry,";
-			mes "y-you're a-a-aaaa";
-			mes "Nooviiice... N-neeeds";
-			mes "B-basic sssskill l-level 6...^000000";
-			return;
-		}
-		mes "I'm sorry, but you";
-		mes "need the Novice's";
-		mes "Basic Skill Level 6 to";
-		mes "use the Storage Service.";
-		return;
-	}
-
-	// Accessing Normal Storage (Skipped if accessing Storage from Guild castle)
-	if(getarg(0) != 2){
-		// Consume "Free Ticket for Kafra Storage" if available.
-		if(countitem(7059)) delitem 7059,1;
-		else {
-			if(Zeny<getarg(1)){
-				mes "[Kafra Employee]";
-				// Niflheim Specific Message
-				if (getarg(2) == 1) {
-					percentheal -50,-50;
-					mes "^666666Zeeeeeny...";
-					mes "M-more z-zeny...!";
-					mes "N-neeed 150... zeny...";
-					mes "Ergh! T-taking bl-blood~!^000000";
-					return;
-				}
-				//Standard Message
-				mes "I'm sorry, but you don't";
-				mes "have enough zeny to use";
-				mes "the Storage Service. Our";
-				mes "Storage access fee is "+getarg(1)+" zeny.";
-				return;
-			}
-			set Zeny, Zeny-getarg(1);
-			set RESRVPTS, RESRVPTS + (getarg(1)/5);
-		}
-	}
-
-	// Surpress the "End" message if in guild castle.
-	if (getarg(0) != 2) {
-		// Niflheim specific Message
-		if (getarg(2) == 1) {
-			percentheal 0,-10;
-			mes "[Kafra Employee]";
-			mes "^666666Thank you.. for... using...";
-			mes "Thank you.. for... using...";
-			mes "Thank you.. for... using...";
-			mes "Thank you.. for... using...";
-			mes "Thank you.. for... using...^000000";
-		}
-		// Normal message
-		else {
-			mes "[Kafra Employee]";
-			mes "Here, let me open";
-			mes "your Storage for you.";
-			mes "Thank you for using";
-			mes "the Kafra Service.";
-		}
-	}
-	callfunc("F_CheckKafCode");	//check your storage password, if set
-
-	close2;
-	openstorage;
-	cutin "", 255;
-	end;
-}
-
-
-// Teleport Function ==================================================
-function	script	F_KafTele	{
-	mes "[Kafra Employee]";
-	mes "Please choose";
-	mes "your destination.";
-	next;
-
-	menu 	@wrpC$[0],M_Wrp0, @wrpC$[1],M_Wrp1, @wrpC$[2],M_Wrp2, @wrpC$[3],M_Wrp3, 
-		@wrpC$[4],M_Wrp4, @wrpC$[5],M_Wrp5, @wrpC$[6],M_Wrp6;
-
-	M_Wrp0:
-		set @num, 0;
-		goto L_Warp;
-	M_Wrp1:
-		set @num, 1;
-		goto L_Warp;
-	M_Wrp2:
-		set @num, 2;
-		goto L_Warp;
-	M_Wrp3:
-		set @num, 3;
-		goto L_Warp;
-	M_Wrp4:
-		set @num, 4;
-		goto L_Warp;
-	M_Wrp5:
-		set @num, 5;
-		goto L_Warp;
-	M_Wrp6:
-		set @num, 6;
-
-	L_Warp:
-		if (@wrpC$[@num] == "Cancel") return;
-		// Consume "Free Ticket for Kafra Transportation" if available.
-		// Do not consume if in Guild castle
-		if(countitem(7060) > 0 && getarg(0) != 2) delitem 7060,1;
-		else {
-			if (Zeny<@wrpP[@num]){
-				mes "[Kafra Employee]";
-				mes "I'm sorry, but you don't have";
-				mes "enough zeny for the Teleport";
-				mes "Service. The fee to teleport";
-				mes "to "+@wrpD$[@num]+" is "+@wrpP[@num]+" zeny.";
-				close2;
-				cutin "", 255;
-				end;
-			}
-			set Zeny, Zeny-@wrpP[@num];
-			set RESRVPTS, RESRVPTS + (@wrpP[@num]/16);
-		}
-		if (@wrpD$[@num] == "Alberta") warp "alberta", 117, 56;
-		if (@wrpD$[@num] == "Al De Baran") warp "aldebaran",168,112;
-		if (@wrpD$[@num] == "Aldebaran") warp "aldebaran",168,112;
-		if (@wrpD$[@num] == "Comodo") warp "comodo", 209, 143;
-		if (@wrpD$[@num] == "Izlude") warp "izlude", 91, 105;
-		if (@wrpD$[@num] == "Geffen") warp "geffen", 120, 39;
-		if (@wrpD$[@num] == "Morroc") warp "morocc", 156, 46;
-		if (@wrpD$[@num] == "Payon") warp "payon", 161, 58;
-		if (@wrpD$[@num] == "Prontera") warp "prontera", 116, 72;
-		if (@wrpD$[@num] == "Mjolnir Dead Pit") warp "mjolnir_02", 99, 351;
-		if (@wrpD$[@num] == "Comodo Pharos Beacon") warp "cmd_fild07", 127, 134;
-		if (@wrpD$[@num] == "Orc Dungeon") warp "gef_fild10", 52, 326;
-		if (@wrpD$[@num] == "Umbala") warp "umbala", 100, 154;
-		if (@wrpD$[@num] == "Juno") warp "yuno", 158, 125;
-		cutin "", 255;
-		end;
-}
-
-
-// Cart Function ========================================================
-function	script	F_KafCart	{
-	// Ensure that the class wanting to rent a pushcart is a merchant
-	if(baseClass != Job_Merchant){
-		mes "[Kafra Employee]";
-		mes "I'm sorry, but the";
-		mes "Pushcart rental service";
-		mes "is only available to Merchants,";
-		mes "Blacksmiths, Master Smiths,";
-		mes "Alchemists and Biochemists.";
-		return 1;
-	}
-	// Make sure the invoking character does not have a cart already
-	else if(checkcart() == 1){
-		mes "[Kafra Employee]";
-		mes "You already have";
-		mes "a Pushcart equipped.";
-		mes "Unfortunately, we can't";
-		mes "rent more than one to";
-		mes "each customer at a time.";
-		return 1;
-	}
-
-	// Consume "Free Ticket for the Cart Service" if available.
-	// Do not consume if in Guild castle.
-	if(countitem(7061) > 0 && getarg(0) != 2) delitem 7061,1;
-	else {
-		mes "[Kafra Employee]";
-		mes "The Pushcart rental";
-		mes "fee is "+getarg(1)+" zeny. Would";
-		mes "you like to rent a Pushcart?";
-		next;
-		menu "Rent a Pushcart.",-, "Cancel.",M_End;
-			if(Zeny<getarg(1)){
-				mes "[Kafra Employee]";
-				mes "I'm sorry, but you";
-				mes "don't have enough";
-				mes "zeny to pay the Pushcart";
-				mes "rental fee of "+getarg(1)+" zeny.";
-				return 1;
-			}
-			set Zeny,Zeny-getarg(1);
-			set RESRVPTS, RESRVPTS + 48;
-	}
-	setcart;
-	return 1;
-
-M_End:
-	return 0;
-}
-
-
-// Pass Function ===============================================================
-function	script	F_KafGuide	{
-	mes "[Kafra Employee]";
-	mes "WIP...";
-	return;
-}
-
-// Special Reserve Points Function ===========================================
-function	script	F_KafInfo	{
-
-	sM_Menu:
-//Uncomment next line to block Kafra Storage Protection
-//	if(getarg(0) == 0) menu "Check Special Reserve Points.",sM_ResChk, "Kafra Employee Locations",sM_KafLoc, "Cancel",sM_End;
-	if(getarg(0) == 0) menu "Check Special Reserve Points.",sM_ResChk, "Storage Password Service",sM_KafCode, "Kafra Employee Locations",sM_KafLoc, "Cancel",sM_End;
-
-	sM_ResChk:
-		mes "[Kafra Employee]";
-		mes "Let's see...";
-		mes strcharinfo(0) + "...";
-		mes "Ah, you have a total of";
-		mes RESRVPTS+ " Special Reserve Points.";
-		next;
-		mes "[Kafra Employee]";
-		mes "You can exchange your";
-		mes "Special Reserve Points for";
-		mes "rewards at the Kafra Main Office in Al De Baran. Please use our";
-		mes "convenient services to see the benefits of our rewards program.";
-		next;
-		if(getarg(0) == 1) return;
-		goto sM_Menu;
-
-	sM_KafLoc:
-		viewpoint 1,@viewpX[0],@viewpY[0],1,0xFF00FF;
-		viewpoint 1,@viewpX[1],@viewpY[1],2,0xFF00FF;
-		viewpoint 1,@viewpX[2],@viewpY[2],3,0xFF00FF;
-		viewpoint 1,@viewpX[3],@viewpY[3],4,0xFF00FF;
-		next;
-		viewpoint 2,@viewpX[0],@viewpY[0],1,0xFF00FF;
-		viewpoint 2,@viewpX[1],@viewpY[1],2,0xFF00FF;
-		viewpoint 2,@viewpX[2],@viewpY[2],3,0xFF00FF;
-		viewpoint 2,@viewpX[3],@viewpY[3],4,0xFF00FF;
-		goto sM_Menu;
-
-	sM_KafCode:
-		callfunc("F_SetKafCode","[Kafra Employee]","Kafra Services");
-
-	sM_End:
-		return;
-}
-
-
-// End Function =====================================================
-//  arg(0): used to determine what message to display.
-//  arg(1): used to determine if save message is displayed.
-//  arg(2): used to display the name of the area you're saving in.
-//===================================================================
-function	script	F_KafEnd	{
-	mes "[Kafra Employee]";
-	//Save
-	if(getarg(1)==1) {
-		mes "Your Respawn Point";
-		mes "has been saved here";
-		mes getarg(2)+".";
-		mes "Thank you for using";
-		mes "the Kafra Services.";
-	}
-
-	// Generic End
-	else if(getarg(0)==0 || getarg(0)==5) {
-		mes "We, here at Kafra Corporation,";
-		mes "are always endeavoring to provide you with the best services. We hope that we meet your adventuring needs and standards of excellence.";
-	}
-
-	// Niflheim End
-	else if(getarg(0)==1) {
-		percentheal 0,- 25;
-		mes "^666666Kaffffra n-never";
-		mes "diiiiiiiiiiiiiies. On...";
-		mes "On y-yooour siiiiide~^000000";
-	}
-
-	close2;
-	cutin "", 255;
-	end;
-}
-
-// Check Storage Password Function ====================
-function	script	F_CheckKafCode	{
-	if(#kafra_code==0) return;
-	mes "Enter your storage password:";
-	set @code_,0;
-	input @code_;
-	if(@code_ != #kafra_code) {
-		dispbottom "Wrong storage password.";
-		close2;
-		cutin "",255;
-		end;
-	}
-	set @kafcode_try,0;
-	set @code_,0;
-	return;
-}
-
-// Set / Change / Clear Storage Password Function ====================
-// getarg(0) = NPC Name, getarg(1) = Company Name
-function	script	F_SetKafCode	{
-	mes getarg(0);
-	if(#kafra_code) {
-		mes "Your storage is protected with a password. What would you do now?";
-		next;
-		menu "Change old password -> 5000z",-,
-		"Remove storage password -> 1000z",M_CLEAR,
-		"Cancel",M_END;
-	} else {
-		mes ""+getarg(1)+" proudly presents you a new service:";
-		mes "Additional storage protection with a password.";
-		next;
-		menu "Set new password -> 5000z",M_SET,
-		"Cancel",M_END;
-	}
-
-	mes getarg(0);
-	mes "At first, please enter your ^0000FFold password^000000.";
-	set @code,callfunc("F_EntKafCode");
-	if(@code==0 || @code != #kafra_code) {
-		mes "Wrong password. You can't set a new password.";
-		emotion e_hmm;
-		goto M_END;
-	}
-	next;
-
-M_SET:
-	mes getarg(0);
-	mes "Now enter your ^FF0000new password^000000 to protect your storage from thieves.";
-	set @code,callfunc("F_EntKafCode");
-	if(@code==0) {
-		mes "The password hasn't been changed.";
-		emotion e_hmm;
-		goto M_END;
-	}
-	next;
-	mes getarg(0);
-	if(Zeny < 5000) goto L_ZENY;
-	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)+".";
-	emotion e_thx;
-	goto M_END;
-
-M_CLEAR:
-	mes getarg(0);
-	mes "Please, enter your password before its removal.";
-	set @code,callfunc("F_EntKafCode");
-	if(@code==0) {
-		mes "The password hasn't been removed.";
-		emotion e_hmm;
-		goto M_END;
-	}
-	next;
-	mes getarg(0);
-	if(Zeny < 1000) goto L_ZENY;
-	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.";
-		mes "Thank you for using "+getarg(1)+".";
-		emotion e_thx;
-	} else {
-		mes "Wrong password. We won't return your 1000z.";
-		mes "Please, next time enter correct password.";
-		emotion e_sry;
-	}
-	goto M_END;
-
-L_ZENY:
-	mes "You don't have enough zeny.";
-	emotion e_cash;
-M_END:
-	close2;
-	cutin "",255;
-	end;
-}
-
-// Basic Password Validation Function ====================
-function	script	F_EntKafCode	{
-	mes "Enter a number 1000~10000000:";
-	set @code_,0;
-	set @kafcode_try,@kafcode_try+1;
-	if(@kafcode_try>10) {
-		set @kafcode_try,0;
-		logmes "Hack: Tried to fit storage password.";
-	}
-	if(input(@code_) == 1) {
-		mes "You can't use such big password.";
-		return 0;
-	}
-	if(@code_<1000) {
-		mes "You shouldn't use such short password.";
-		return 0;
-	}
-	return @code_;
-}
diff --git a/npc/pre-re/kafras/kafras_alb.txt b/npc/pre-re/kafras/kafras_alb.txt
deleted file mode 100644
index 6058ca40d..000000000
--- a/npc/pre-re/kafras/kafras_alb.txt
+++ /dev/null
@@ -1,77 +0,0 @@
-//===== rAthena Script ============
-//= Alberta Kafras
-//===== By: =========================
-//= rAthena Dev Team
-//===== Current Version: ===================
-//= 2.4
-//===== Compatible With: =====================
-//= rAthena 1.0
-//===== 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 Ablerta 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/pre-re/kafras/kafras_alde.txt b/npc/pre-re/kafras/kafras_alde.txt
deleted file mode 100644
index 39a88534c..000000000
--- a/npc/pre-re/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 1.0
-//===== 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/pre-re/kafras/kafras_brasilis.txt b/npc/pre-re/kafras/kafras_brasilis.txt
deleted file mode 100644
index ff5db0968..000000000
--- a/npc/pre-re/kafras/kafras_brasilis.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-//===== rAthena Script =======================================
-//= Brasilis Kafra
-//===== By: =========================
-//= L0ne_W0lf
-//===== Current Version: ===================
-//= 1.1
-//===== Compatible With: =====================
-//= rAthena 1.0
-//===== 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: ==========================================
-//= 1.0 First version.
-//- 1.1 Updated save point coordinates.
-//=====================================================================
-
-brasilis,197,221,4	script	Kafra Employee::kaf_bra	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,3,0,80,700;
-
-	M_Save:
-		savepoint "brasilis",195,259;
-		callfunc "F_KafEnd",0,1,"in the city of Brasilis";
-}
diff --git a/npc/pre-re/kafras/kafras_com.txt b/npc/pre-re/kafras/kafras_com.txt
deleted file mode 100644
index 44c8da63d..000000000
--- a/npc/pre-re/kafras/kafras_com.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-//===== rAthena Script ===============
-//= Comodo Kafras
-//===== By: ============================
-//= rAthena Dev Team
-//===== Current Version: =======================
-//= 2.3
-//===== Compatible With: ============================
-//= rAthena 1.0
-//===== 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/pre-re/kafras/kafras_dungeons.txt b/npc/pre-re/kafras/kafras_dungeons.txt
deleted file mode 100644
index e5c19bff4..000000000
--- a/npc/pre-re/kafras/kafras_dungeons.txt
+++ /dev/null
@@ -1,138 +0,0 @@
-//===== rAthena Script ================
-//= Kafras in Dungeons and Fields
-//===== By: ============================
-//= rAthena Dev Team
-//===== Current Version: =======================
-//= 2.7a
-//===== Compatible With: ============================
-//= rAthena 1.0
-//===== 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/pre-re/kafras/kafras_gef.txt b/npc/pre-re/kafras/kafras_gef.txt
deleted file mode 100644
index 2fe2365bd..000000000
--- a/npc/pre-re/kafras/kafras_gef.txt
+++ /dev/null
@@ -1,79 +0,0 @@
-//===== rAthena Script =======================================
-//= Geffen Kafras
-//===== By: =========================
-//= rAthena Dev Team
-//===== Current Version: ===================
-//= 2.5
-//===== Compatible With: =====================
-//= rAthena 1.0
-//===== 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/pre-re/kafras/kafras_izl.txt b/npc/pre-re/kafras/kafras_izl.txt
index eaf689c6a..0c4240fc1 100644
--- a/npc/pre-re/kafras/kafras_izl.txt
+++ b/npc/pre-re/kafras/kafras_izl.txt
@@ -1,50 +1,15 @@
-//===== rAthena Script =======================================
-//= Izlude Kafras
-//===== By: =========================
-//= rAthena Dev Team
-//===== Current Version: ===================
-//= 2.4
-//===== Compatible With: =====================
-//= rAthena 1.0
-//===== 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]
-//=====================================================================
-
-izlude,134,87,3	script	Kafra Employee::kaf_izlude	117,{
-	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";
-}
+//===== rAthena Script =======================================

+//= Izlude Kafras

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

+//= Daegaladh

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

+//= 1.0

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

+//= rAthena SVN

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

+//= Izlude Kafras.

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

+//= 1.0 First version.

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

+

+izlude,134,87,3	duplicate(kaf_izlude)	Kafra Employee	117

diff --git a/npc/pre-re/kafras/kafras_mor.txt b/npc/pre-re/kafras/kafras_mor.txt
deleted file mode 100644
index 30358c61c..000000000
--- a/npc/pre-re/kafras/kafras_mor.txt
+++ /dev/null
@@ -1,78 +0,0 @@
-//===== rAthena Script =======================================
-//= Morroc Kafras
-//===== By: =========================
-//= rAthena Dev Team
-//===== Current Version: ===================
-//= 2.4
-//===== Compatible With: =====================
-//= rAthena 1.0
-//===== 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/pre-re/kafras/kafras_mosk.txt b/npc/pre-re/kafras/kafras_mosk.txt
deleted file mode 100644
index 644c56636..000000000
--- a/npc/pre-re/kafras/kafras_mosk.txt
+++ /dev/null
@@ -1,153 +0,0 @@
-//===== rAthena Script ======================================= 
-//= Moscovia Kafras
-//===== By: ================================================== 
-//= Kisuka
-//===== Current Version: ===================================== 
-//= 1.0
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
-//= Kafras for the town of Moscovia.
-//===== Additional Comments: ================================= 
-//= 1.0 First Version. [Kisuka]
-//============================================================ 
-
-moscovia,223,191,4	script	Kafra Staff#mosk	114,{
-	cutin "kafra_04",2;
-	mes "[Kafra Staff]";
-	mes "Welcome to the";
-	mes "Kafra Corporation.";
-	mes "The Kafra services";
-	mes "are always on your side.";
-	mes "How may I assist you?";
-	next;
-	switch(select("Save:Use Storage:Rent a Pushcart:Check Other Information:Cancel")) {
-		case 1:
-			mes "[Kafra Staff]";
-			mes "Your Respawn Point has";
-			mes "been saved in the city of";
-			mes "Moscovia. Thank you for";
-			mes "using the Kafra Service.";
-			savepoint "moscovia",221,194;
-			close2;
-			cutin "", 255;
-			end;
-		case 2:
-			if(basicskillcheck() && getskilllv("NV_BASIC") < 6){
-				mes "[Kafra Staff]";
-				mes "I'm sorry, but you";
-				mes "need the Novice's";
-				mes "Basic Skill Level 6 to";
-				mes "use the Storage Service.";
-				close2;
-				cutin "", 255;
-				end;
-			}
-			if(countitem(7059)) delitem 7059,1;
-			else {
-				if(Zeny<80){
-					mes "[Kafra Staff]";
-					mes "I'm sorry, but you don't";
-					mes "have enough zeny to use";
-					mes "the Storage Service. Our";
-					mes "Storage access fee is 80 zeny.";
-					close2;
-					cutin "", 255;
-					end;
-				}
-				set Zeny, Zeny-80;
-				set RESRVPTS, RESRVPTS + (80/5);
-			}
-			mes "[Kafra Staff]";
-			mes "Here, let me open";
-			mes "your Storage for you.";
-			mes "Thank you for using";
-			mes "the Kafra Service.";
-			
-			callfunc("F_CheckKafCode");	//check your storage password, if set
-			
-			close2;
-			openstorage;
-			cutin "", 255;
-			end;
-		case 3:
-			if(baseClass != Job_Merchant){
-				mes "[Kafra Staff]";
-				mes "I'm sorry, but the";
-				mes "Pushcart rental service";
-				mes "is only available to Merchants,";
-				mes "Blacksmiths, Master Smiths,";
-				mes "Alchemists and Biochemists.";
-				close2;
-				cutin "", 255;
-				end;
-			}
-
-			else if(checkcart() == 1){
-				mes "[Kafra Staff]";
-				mes "You already have";
-				mes "a Pushcart equipped.";
-				mes "Unfortunately, we can't";
-				mes "rent more than one to";
-				mes "each customer at a time.";
-				close2;
-				cutin "", 255;
-				end;
-			}
-
-			if(countitem(7061) > 0) delitem 7061,1;
-			else {
-				mes "[Kafra Staff]";
-				mes "The Pushcart rental";
-				mes "fee is 700 zeny. Would";
-				mes "you like to rent a Pushcart?";
-				next;
-				if(select("Rent a Pushcart.:Cancel.") == 1) {
-					if(Zeny<700){
-						mes "[Kafra Staff]";
-						mes "I'm sorry, but you";
-						mes "don't have enough";
-						mes "zeny to pay the Pushcart";
-						mes "rental fee of 700 zeny.";
-						close2;
-						cutin "", 255;
-						end;
-					}
-					set Zeny,Zeny-700;
-					set RESRVPTS, RESRVPTS + 48;
-				}else{
-					close2;
-					cutin "", 255;
-					end;
-				}
-			}
-			setcart;
-			close2;
-			cutin "", 255;
-			end;
-		case 4:
-			if(select("Check Special Reserve Points.:Cancel") == 2) {
-				cutin "", 255;
-				close;
-			}
-			mes "[Kafra Staff]";
-			mes strcharinfo(0) + ", you have a total of";
-			mes RESRVPTS+ " Special Reserve Points.";
-			next;
-			mes "[Kafra Staff]";
-			mes "You can exchange your";
-			mes "Special Reserve Points for";
-			mes "rewards at the Kafra Main Office in Al De Baran. Please use our";
-			mes "convenient services to see the benefits of our rewards program.";
-			close2;
-			cutin "", 255;
-			end;
-		case 5:
-			mes "[Kafra Staff]";
-			mes "We, here at Kafra Corporation,";
-			mes "are always endeavoring to provide you with the best services. We hope that we meet your adventuring needs and standards of excellence.";
-			close2;
-			cutin "", 255;
-			end;
-	}
-}
diff --git a/npc/pre-re/kafras/kafras_new.txt b/npc/pre-re/kafras/kafras_new.txt
deleted file mode 100644
index a7479115f..000000000
--- a/npc/pre-re/kafras/kafras_new.txt
+++ /dev/null
@@ -1,225 +0,0 @@
-//===== rAthena Script ===========
-//= New Kafras
-//===== By: =========================
-//= rAthena Dev Team
-//===== Current Version: ===================
-//= 3.1
-//===== Compatible With: =====================
-//= rAthena 1.0
-//===== 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]
-//==========================================================================
-
-// 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 the 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 the 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 Kafra ------------------------------------------------------------
-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/pre-re/kafras/kafras_pay.txt b/npc/pre-re/kafras/kafras_pay.txt
deleted file mode 100644
index b02aadd03..000000000
--- a/npc/pre-re/kafras/kafras_pay.txt
+++ /dev/null
@@ -1,94 +0,0 @@
-//===== rAthena Script =======================================
-//= Payon Kafras
-//===== By: =========================
-//= rAthena Dev Team
-//===== Current Version: ===================
-//= 2.5
-//===== Compatible With: =====================
-//= rAthena 1.0
-//===== 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/pre-re/kafras/kafras_pron.txt b/npc/pre-re/kafras/kafras_pron.txt
deleted file mode 100644
index 3de243c7b..000000000
--- a/npc/pre-re/kafras/kafras_pron.txt
+++ /dev/null
@@ -1,135 +0,0 @@
-//===== rAthena Script =======================================
-//= Prontera Kafras
-//===== By: =========================
-//= rAthena Dev Team
-//===== Current Version: ===================
-//= 2.7
-//===== Compatible With: =====================
-//= rAthena 1.0
-//===== 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/pre-re/kafras/kafras_yun.txt b/npc/pre-re/kafras/kafras_yun.txt
deleted file mode 100644
index 3f78529bf..000000000
--- a/npc/pre-re/kafras/kafras_yun.txt
+++ /dev/null
@@ -1,88 +0,0 @@
-//===== rAthena Script =======================================
-//= Yuno Kafras
-//===== By: =========================
-//= rAthena Dev Team
-//===== Current Version: ===================
-//= 2.4
-//===== Compatible With: =====================
-//= rAthena 1.0
-//===== 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;
-}