- Massive EOL normalization & 'svn:eol-style native' flag setting for all txt/conf/h/c files.

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

12 files changed, 1428 insertions, 1428 deletions

diff --git a/npc/kafras/functions_kafras.txt b/npc/kafras/functions_kafras.txt
index 135eccd65..2b9d67bff 100644
--- a/npc/kafras/functions_kafras.txt
+++ b/npc/kafras/functions_kafras.txt
@@ -1,541 +1,541 @@
-//===== eAthena Script ======================================= 

-//= Kafra Functions

-//===== By: ================================================== 

-//= eAthena Dev Team

-//= Darlskies, Darkchild, Syrus22, Lupus, kobra_k88 (2.0)

-//===== Current Version: ===================================== 

-//= 5.4b

-//===== Compatible With: ===================================== 

-//= eAthena 1.0

-//===== Description: =========================================

-//= These functions handle save, storage, cart rental, teleport,

-//= and Free Teleport/Warp/Rent Cart options for all Kafra NPCs.

-//===== 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

-//=	Note: You can change '1337' value to another to raise password protection

-//= 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]

-//============================================================ 

-

-

-// 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.

-//==========================================================================

-function	script	F_Kafra	{

-	callfunc "F_ClearGarbage"; //Clear outdated, unused variables

-

-	mes "[Kafra]";

-	switch(getarg(0)){

-		default:

-		case 0:

-			mes "Welcome to Kafra Corp.  We will stay with you wherever you go.";

-			break;

-		//Niflheim

-		case 1:

-			mes "Welcome... Kafra Services.... Will be with you even if you die.....";

-			break;

-		//Guilds Castles

-		case 2:

-			mes "Welcome, ^5533FF" + GetGuildName(@GID) + "^000000 members.  We will stay with you wherever you go";

-			break;

-		//Amatsu

-		case 3:

-			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, Ayothaya

-		case 4:

-			mes "With our many Kafra";

-			mes "service locations, you're never";

-			mes "far from home.";

-			break;

-	}

-	next;

-

-	M_Menu:

-		cleararray @K_Menu0$[0],"",7;

-	switch(getarg(1)){

-		//only Save & Storage

-		case 1:

-			setarray @K_Menu0$[0],"-Save","-Use Storage","-Cancel";

-			break;

-		//only Storage

-		case 2:

-			setarray @K_Menu0$[0],"-Use Storage","-Cancel";

-			break;

-		//Common w/o teleport

-		case 3: 

-			setarray @K_Menu0$[0],"-Save","-Use Storage","-Rent a Cart","-Guide","-Other Information Check","-Cancel";

-			break;

-		//Case 4 is Einbroch no tele message.

-		//Common w/o save and teleport

-		case 5:

-			setarray @K_Menu0$[0],"-Use Storage","-Rent a Cart","-Other Information Check","-Guide","-Cancel";

-			break;

-		//Only storage and other info check

-		case 6:

-			setarray @K_Menu0$[0],"-Use Storage","-Guide","-Other Information Check","-Cancel";

-			break;

-		//Common Kafra

-		default:

-			setarray @K_Menu0$[0],"-Save","-Use Storage","-Use Teleport Service","-Rent a Cart","-Guide","-Other Information Check","-Cancel";

-			break;

-	}

-	if(getarg(0)==2) {

-	//Guilds Kafra (free Teleport, free Storage, Free Cart)

-		cleararray @K_Menu0$[0],"",7;

-		setarray @K_Menu0$[0],"-Use Storage","-Use Guild Storage","-Rent a Cart","-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"){

-			//Don't charge for a common Kafra Storage in your Castle

-			if(getarg(0) == 2) callfunc "F_KafStor",2;

-			else callfunc "F_KafStor",0;

-			next;

-			goto M_Menu;

-		}

-		if (@K_Menu0$[@num] == "-Use Teleport Service"){

-			if(getarg(1) == 4){				//Check for Einbroch Tele notice

-				mes "[Kafra]";

-				mes "Because of the ^FF0000Limited Transport Agreement^000000, the Kafra Corporation cannot provide Teleport Services in the Schwarzwald Republic.";

-				next;

-				mes "[Kafra]";

-				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 Cart"){

-			if(callfunc("F_KafCart",getarg(0)) == 1) next;

-			goto M_Menu;

-		}

-		if (@K_Menu0$[@num] == "-Guide"){

-			callfunc "F_KafGuide";

-			next;

-			goto M_Menu;

-		}

-		if (@K_Menu0$[@num] == "-Other Information Check"){

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

-			next;

-			goto M_Menu;

-		}

-

-}

-

-

-// Storage Function =======================================================

-function	script	F_KafStor	{

-	if(getarg(0) == 1){

-		if(guildopenstorage(0) == 1){

-			mes "[Kafra]";

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

-	}

-	if(basicskillcheck(0) && getskilllv(1) < 6){

-		mes "[Kafra]";

-		mes "I am sorry but you have to be at least Novice level 6 if you want to use the storage.";

-		return;

-	}

-	//don't charge for common storage in Castle

-	if(getarg(0) != 2){

-		//we'll use Free Ticket for Kafra Storage if available

-		if(countitem(7059)){

-			delitem 7059,1;

-		} else {

-			if(Zeny<40){

-				mes "[Kafra]";

-				mes "Dear you don't have enough money. The Storage fee is 40 Zeny.";

-				return;

-			}

-			set Zeny, Zeny-40;

-			set RESRVPTS, RESRVPTS + (40/5);

-		}

-	}

-	mes "[Kafra]";

-	mes "Close this window to open your storage.";

-	mes "We hope to see you again soon.";

-

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

-

-	close2;

-	openstorage;

-	cutin "", 255;

-	end;

-}

-

-

-// Teleport Function ==================================================

-function	script	F_KafTele	{

-	mes "[Kafra]";

-	mes "Please set 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;

-		// we'll use Free Ticket for Kafra Transportation if available

-		if(countitem(7060)){

-			delitem 7060,1;

-		} else {

-			if (Zeny<@wrpP[@num]){

-				mes "[Kafra]";

-				mes "Dear you don't have enough money. Please check your funds again.";

-				emotion e_cash;

-				close2;

-				cutin "", 255;

-				end;

-			}

-			set Zeny, Zeny-@wrpP[@num];

-			set RESRVPTS, RESRVPTS + (@wrpP[@num]/16);

-		}

-		if (@wrpD$[@num] == "Alberta") warp "alberta.gat", 117, 56;

-		if (@wrpD$[@num] == "Al De Baran") warp "aldebaran.gat",143,110;

-		if (@wrpD$[@num] == "Aldebaran") warp "aldebaran.gat",143,110;

-		if (@wrpD$[@num] == "Comodo") warp "comodo.gat", 207, 144;

-		if (@wrpD$[@num] == "Izlude") warp "izlude.gat", 91, 105;

-		if (@wrpD$[@num] == "Geffen") warp "geffen.gat", 120, 39;

-		if (@wrpD$[@num] == "Morroc") warp "morocc.gat", 156, 46;

-		if (@wrpD$[@num] == "Payon") warp "payon.gat", 168, 103;

-		if (@wrpD$[@num] == "Prontera") warp "prontera.gat", 116, 72;

-		if (@wrpD$[@num] == "Coal Mine(Dead Pit)") warp "mjolnir_02.gat", 82, 347;

-		if (@wrpD$[@num] == "Comodo Pharos Lighthouse") warp "cmd_fild07.gat", 127, 134;

-		if (@wrpD$[@num] == "Orc Dungeon") warp "gef_fild10.gat", 52, 326;

-		if (@wrpD$[@num] == "Umbala") warp "umbala.gat", 130, 130;

-		if (@wrpD$[@num] == "Yuno") warp "yuno.gat", 157, 123;

-		cutin "", 255;

-		end;

-}

-

-

-// Cart Function ========================================================

-function	script	F_KafCart	{

-	if(baseClass != Job_Merchant){

-		mes "[Kafra]";

-		mes "I'm sorry dear.  The Cart service is only provided for the Merchant and Blacksmith Class.";

-		return 1;

-	}

-	if(getskilllv(39)==0){

-		mes "[Kafra]";

-		mes "I'm sorry but you need the skill ^0000FF'Pushcart'^000000 to rent a cart.";

-		return 1;

-	}

-	if(checkcart(0) == 1){

-		mes "[Kafra]";

-		mes "Excuse me... but you already have a cart....";

-		emotion e_swt;

-		return 1;

-	}

-	//get Cart in Guild for free

-	if(getarg(0) == 2) goto L_FreeCart;

-	//use Free Ticket for the Cart Service if available

-	if(countitem(7061)){

-		delitem 7061,1;

-		goto L_FreeCart;

-	}

-	mes "[Kafra]";

-	mes "The Cart Fee is 800 Zeny.  Do you want to Rent a Cart?";

-	next;

-	menu "-Rent a Cart.",-, "-Cancel.",M_End;

-

-		if(Zeny<800){

-			mes "[Kafra]";

-			mes "Dear, you don't have enough Money. You need 800 Zeny.";

-			emotion e_cash;

-			return 1;

-		}

-		set Zeny,Zeny-800;

-		set RESRVPTS, RESRVPTS + 48;

-	L_FreeCart:

-		setcart;

-		mes "[Kafra]";

-		mes "Here is your cart.";

-		return 1;

-	M_End:

-		return 0;

-}

-

-

-// Pass Function ===============================================================

-function	script	F_KafGuide	{

-

-	mes "[Kafra]";

-	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 "-Special Reserve Check",sM_ResChk, "-Kafra Locations",sM_KafLoc, "-Cancel",sM_End;

-	if(getarg(0) == 0) menu "-Special Reserve Check",sM_ResChk, "-Storage Password Service",sM_KafCode, "-Kafra Locations",sM_KafLoc, "-Cancel",sM_End;

-

-	sM_ResChk:

-		mes "[Kafra]";

-		mes "Here is your current amount of special reserve points:";

-		mes "^0000ff"+RESRVPTS+"^000000.";

-		next;

-		mes "[Kafra]";

-		mes "Remember to continue using Kafra services such as Storage and Teleport, to earn more special reserve points.";

-		next;

-		mes "[Kafra]";

-		mes "You can trade them in at the Kafra Main Office in Al De Baran for useful items and cool prizes.";

-		next;

-		if(getarg(0) == 1) return;

-		goto sM_Menu;

-	sM_KafLoc:

-		mes "[Kafra]";

-		mes "The flashing signals on your mini-map point to the locations of all of the Kafra Agents in this city.";

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

-

-	sM_End:

-		return;

-}

-

-

-// End Function =====================================================

-//  arg(0): used to determine what message to display.

-//  arg(1): used to determine if save message is displayed.

-//===================================================================

-function	script	F_KafEnd	{

-	mes "[Kafra]";

-	if(getarg(1)==1) mes "Your respawn point has been saved.";		// only shown when a player uses save

-	if(getarg(0)!=1) mes "Thank you for using Kafra Services.  We hope to see you again soon.";

-	if(getarg(0)==1) mes "We, Kafra Corporation.... Will be with you.... whenever.... wherever... therefore.... please don't forget us.....";

-	close2;

-	cutin "", 255;

-	emotion e_thx;

-	close;

-	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-getcharid(3)-1337) {

-		dispbottom "Wrong storage password.";

-		close2;

-		cutin "",255;

-		end;

-	}

-	set @kafcode_try,0;

-	set @code_,0;

-	return;

-}

-

-// Set / Change / Clear Storage Password Function ====================

-function	script	F_SetKafCode	{

-	mes "[Kafra]";

-	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 "Kafra Services 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 "[Kafra]";

-	mes "At first, please enter your ^0000FFold password^000000.";

-	set @code,callfunc("F_EntKafCode");

-	if(@code==0 || @code != #kafra_code-getcharid(3)-1337) {

-		mes "Wrong password. You can't set a new password.";

-		emotion e_hmm;

-		goto M_END;

-	}

-	next;

-

-M_SET:

-	mes "[Kafra]";

-	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 "[Kafra]";

-	if(Zeny < 5000) goto L_ZENY;

-	set Zeny,Zeny-5000;

-	set RESRVPTS, RESRVPTS + (5000/50);

-

-	set #kafra_code,@code+getcharid(3)+1337;

-	mes "You've protected your storage with a secret password.";

-	mes "Thank you for using Kafra Services.";

-	emotion e_thx;

-	goto M_END;	

-

-M_CLEAR:

-	mes "[Kafra]";

-	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 "[Kafra]";

-	if(Zeny < 1000) goto L_ZENY;

-	set Zeny,Zeny-1000;

-	set RESRVPTS, RESRVPTS + (1000/50);

-	if(@code == #kafra_code-getcharid(3)-1337) {

-		set #kafra_code,0;

-		mes "You've successfully cleared your storage password.";

-		mes "Thank you for using Kafra Services.";

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

-	}

-	input @code_;

-	if(@code_<1000) {

-		mes "You shouldn't use such short password.";

-		return 0;

-	}

-	if(@code_>10000000) {

-		mes "You can't use such big password.";

-		return 0;

-	}

-	return @code_;

-}

+//===== eAthena Script ======================================= 
+//= Kafra Functions
+//===== By: ================================================== 
+//= eAthena Dev Team
+//= Darlskies, Darkchild, Syrus22, Lupus, kobra_k88 (2.0)
+//===== Current Version: ===================================== 
+//= 5.4b
+//===== Compatible With: ===================================== 
+//= eAthena 1.0
+//===== Description: =========================================
+//= These functions handle save, storage, cart rental, teleport,
+//= and Free Teleport/Warp/Rent Cart options for all Kafra NPCs.
+//===== 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
+//=	Note: You can change '1337' value to another to raise password protection
+//= 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]
+//============================================================ 
+
+
+// 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.
+//==========================================================================
+function	script	F_Kafra	{
+	callfunc "F_ClearGarbage"; //Clear outdated, unused variables
+
+	mes "[Kafra]";
+	switch(getarg(0)){
+		default:
+		case 0:
+			mes "Welcome to Kafra Corp.  We will stay with you wherever you go.";
+			break;
+		//Niflheim
+		case 1:
+			mes "Welcome... Kafra Services.... Will be with you even if you die.....";
+			break;
+		//Guilds Castles
+		case 2:
+			mes "Welcome, ^5533FF" + GetGuildName(@GID) + "^000000 members.  We will stay with you wherever you go";
+			break;
+		//Amatsu
+		case 3:
+			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, Ayothaya
+		case 4:
+			mes "With our many Kafra";
+			mes "service locations, you're never";
+			mes "far from home.";
+			break;
+	}
+	next;
+
+	M_Menu:
+		cleararray @K_Menu0$[0],"",7;
+	switch(getarg(1)){
+		//only Save & Storage
+		case 1:
+			setarray @K_Menu0$[0],"-Save","-Use Storage","-Cancel";
+			break;
+		//only Storage
+		case 2:
+			setarray @K_Menu0$[0],"-Use Storage","-Cancel";
+			break;
+		//Common w/o teleport
+		case 3: 
+			setarray @K_Menu0$[0],"-Save","-Use Storage","-Rent a Cart","-Guide","-Other Information Check","-Cancel";
+			break;
+		//Case 4 is Einbroch no tele message.
+		//Common w/o save and teleport
+		case 5:
+			setarray @K_Menu0$[0],"-Use Storage","-Rent a Cart","-Other Information Check","-Guide","-Cancel";
+			break;
+		//Only storage and other info check
+		case 6:
+			setarray @K_Menu0$[0],"-Use Storage","-Guide","-Other Information Check","-Cancel";
+			break;
+		//Common Kafra
+		default:
+			setarray @K_Menu0$[0],"-Save","-Use Storage","-Use Teleport Service","-Rent a Cart","-Guide","-Other Information Check","-Cancel";
+			break;
+	}
+	if(getarg(0)==2) {
+	//Guilds Kafra (free Teleport, free Storage, Free Cart)
+		cleararray @K_Menu0$[0],"",7;
+		setarray @K_Menu0$[0],"-Use Storage","-Use Guild Storage","-Rent a Cart","-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"){
+			//Don't charge for a common Kafra Storage in your Castle
+			if(getarg(0) == 2) callfunc "F_KafStor",2;
+			else callfunc "F_KafStor",0;
+			next;
+			goto M_Menu;
+		}
+		if (@K_Menu0$[@num] == "-Use Teleport Service"){
+			if(getarg(1) == 4){				//Check for Einbroch Tele notice
+				mes "[Kafra]";
+				mes "Because of the ^FF0000Limited Transport Agreement^000000, the Kafra Corporation cannot provide Teleport Services in the Schwarzwald Republic.";
+				next;
+				mes "[Kafra]";
+				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 Cart"){
+			if(callfunc("F_KafCart",getarg(0)) == 1) next;
+			goto M_Menu;
+		}
+		if (@K_Menu0$[@num] == "-Guide"){
+			callfunc "F_KafGuide";
+			next;
+			goto M_Menu;
+		}
+		if (@K_Menu0$[@num] == "-Other Information Check"){
+			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;
+			next;
+			goto M_Menu;
+		}
+
+}
+
+
+// Storage Function =======================================================
+function	script	F_KafStor	{
+	if(getarg(0) == 1){
+		if(guildopenstorage(0) == 1){
+			mes "[Kafra]";
+			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;
+	}
+	if(basicskillcheck(0) && getskilllv(1) < 6){
+		mes "[Kafra]";
+		mes "I am sorry but you have to be at least Novice level 6 if you want to use the storage.";
+		return;
+	}
+	//don't charge for common storage in Castle
+	if(getarg(0) != 2){
+		//we'll use Free Ticket for Kafra Storage if available
+		if(countitem(7059)){
+			delitem 7059,1;
+		} else {
+			if(Zeny<40){
+				mes "[Kafra]";
+				mes "Dear you don't have enough money. The Storage fee is 40 Zeny.";
+				return;
+			}
+			set Zeny, Zeny-40;
+			set RESRVPTS, RESRVPTS + (40/5);
+		}
+	}
+	mes "[Kafra]";
+	mes "Close this window to open your storage.";
+	mes "We hope to see you again soon.";
+
+	callfunc("F_CheckKafCode");	//check your storage password, if set
+
+	close2;
+	openstorage;
+	cutin "", 255;
+	end;
+}
+
+
+// Teleport Function ==================================================
+function	script	F_KafTele	{
+	mes "[Kafra]";
+	mes "Please set 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;
+		// we'll use Free Ticket for Kafra Transportation if available
+		if(countitem(7060)){
+			delitem 7060,1;
+		} else {
+			if (Zeny<@wrpP[@num]){
+				mes "[Kafra]";
+				mes "Dear you don't have enough money. Please check your funds again.";
+				emotion e_cash;
+				close2;
+				cutin "", 255;
+				end;
+			}
+			set Zeny, Zeny-@wrpP[@num];
+			set RESRVPTS, RESRVPTS + (@wrpP[@num]/16);
+		}
+		if (@wrpD$[@num] == "Alberta") warp "alberta.gat", 117, 56;
+		if (@wrpD$[@num] == "Al De Baran") warp "aldebaran.gat",143,110;
+		if (@wrpD$[@num] == "Aldebaran") warp "aldebaran.gat",143,110;
+		if (@wrpD$[@num] == "Comodo") warp "comodo.gat", 207, 144;
+		if (@wrpD$[@num] == "Izlude") warp "izlude.gat", 91, 105;
+		if (@wrpD$[@num] == "Geffen") warp "geffen.gat", 120, 39;
+		if (@wrpD$[@num] == "Morroc") warp "morocc.gat", 156, 46;
+		if (@wrpD$[@num] == "Payon") warp "payon.gat", 168, 103;
+		if (@wrpD$[@num] == "Prontera") warp "prontera.gat", 116, 72;
+		if (@wrpD$[@num] == "Coal Mine(Dead Pit)") warp "mjolnir_02.gat", 82, 347;
+		if (@wrpD$[@num] == "Comodo Pharos Lighthouse") warp "cmd_fild07.gat", 127, 134;
+		if (@wrpD$[@num] == "Orc Dungeon") warp "gef_fild10.gat", 52, 326;
+		if (@wrpD$[@num] == "Umbala") warp "umbala.gat", 130, 130;
+		if (@wrpD$[@num] == "Yuno") warp "yuno.gat", 157, 123;
+		cutin "", 255;
+		end;
+}
+
+
+// Cart Function ========================================================
+function	script	F_KafCart	{
+	if(baseClass != Job_Merchant){
+		mes "[Kafra]";
+		mes "I'm sorry dear.  The Cart service is only provided for the Merchant and Blacksmith Class.";
+		return 1;
+	}
+	if(getskilllv(39)==0){
+		mes "[Kafra]";
+		mes "I'm sorry but you need the skill ^0000FF'Pushcart'^000000 to rent a cart.";
+		return 1;
+	}
+	if(checkcart(0) == 1){
+		mes "[Kafra]";
+		mes "Excuse me... but you already have a cart....";
+		emotion e_swt;
+		return 1;
+	}
+	//get Cart in Guild for free
+	if(getarg(0) == 2) goto L_FreeCart;
+	//use Free Ticket for the Cart Service if available
+	if(countitem(7061)){
+		delitem 7061,1;
+		goto L_FreeCart;
+	}
+	mes "[Kafra]";
+	mes "The Cart Fee is 800 Zeny.  Do you want to Rent a Cart?";
+	next;
+	menu "-Rent a Cart.",-, "-Cancel.",M_End;
+
+		if(Zeny<800){
+			mes "[Kafra]";
+			mes "Dear, you don't have enough Money. You need 800 Zeny.";
+			emotion e_cash;
+			return 1;
+		}
+		set Zeny,Zeny-800;
+		set RESRVPTS, RESRVPTS + 48;
+	L_FreeCart:
+		setcart;
+		mes "[Kafra]";
+		mes "Here is your cart.";
+		return 1;
+	M_End:
+		return 0;
+}
+
+
+// Pass Function ===============================================================
+function	script	F_KafGuide	{
+
+	mes "[Kafra]";
+	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 "-Special Reserve Check",sM_ResChk, "-Kafra Locations",sM_KafLoc, "-Cancel",sM_End;
+	if(getarg(0) == 0) menu "-Special Reserve Check",sM_ResChk, "-Storage Password Service",sM_KafCode, "-Kafra Locations",sM_KafLoc, "-Cancel",sM_End;
+
+	sM_ResChk:
+		mes "[Kafra]";
+		mes "Here is your current amount of special reserve points:";
+		mes "^0000ff"+RESRVPTS+"^000000.";
+		next;
+		mes "[Kafra]";
+		mes "Remember to continue using Kafra services such as Storage and Teleport, to earn more special reserve points.";
+		next;
+		mes "[Kafra]";
+		mes "You can trade them in at the Kafra Main Office in Al De Baran for useful items and cool prizes.";
+		next;
+		if(getarg(0) == 1) return;
+		goto sM_Menu;
+	sM_KafLoc:
+		mes "[Kafra]";
+		mes "The flashing signals on your mini-map point to the locations of all of the Kafra Agents in this city.";
+		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");
+
+	sM_End:
+		return;
+}
+
+
+// End Function =====================================================
+//  arg(0): used to determine what message to display.
+//  arg(1): used to determine if save message is displayed.
+//===================================================================
+function	script	F_KafEnd	{
+	mes "[Kafra]";
+	if(getarg(1)==1) mes "Your respawn point has been saved.";		// only shown when a player uses save
+	if(getarg(0)!=1) mes "Thank you for using Kafra Services.  We hope to see you again soon.";
+	if(getarg(0)==1) mes "We, Kafra Corporation.... Will be with you.... whenever.... wherever... therefore.... please don't forget us.....";
+	close2;
+	cutin "", 255;
+	emotion e_thx;
+	close;
+	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-getcharid(3)-1337) {
+		dispbottom "Wrong storage password.";
+		close2;
+		cutin "",255;
+		end;
+	}
+	set @kafcode_try,0;
+	set @code_,0;
+	return;
+}
+
+// Set / Change / Clear Storage Password Function ====================
+function	script	F_SetKafCode	{
+	mes "[Kafra]";
+	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 "Kafra Services 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 "[Kafra]";
+	mes "At first, please enter your ^0000FFold password^000000.";
+	set @code,callfunc("F_EntKafCode");
+	if(@code==0 || @code != #kafra_code-getcharid(3)-1337) {
+		mes "Wrong password. You can't set a new password.";
+		emotion e_hmm;
+		goto M_END;
+	}
+	next;
+
+M_SET:
+	mes "[Kafra]";
+	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 "[Kafra]";
+	if(Zeny < 5000) goto L_ZENY;
+	set Zeny,Zeny-5000;
+	set RESRVPTS, RESRVPTS + (5000/50);
+
+	set #kafra_code,@code+getcharid(3)+1337;
+	mes "You've protected your storage with a secret password.";
+	mes "Thank you for using Kafra Services.";
+	emotion e_thx;
+	goto M_END;	
+
+M_CLEAR:
+	mes "[Kafra]";
+	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 "[Kafra]";
+	if(Zeny < 1000) goto L_ZENY;
+	set Zeny,Zeny-1000;
+	set RESRVPTS, RESRVPTS + (1000/50);
+	if(@code == #kafra_code-getcharid(3)-1337) {
+		set #kafra_code,0;
+		mes "You've successfully cleared your storage password.";
+		mes "Thank you for using Kafra Services.";
+		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.";
+	}
+	input @code_;
+	if(@code_<1000) {
+		mes "You shouldn't use such short password.";
+		return 0;
+	}
+	if(@code_>10000000) {
+		mes "You can't use such big password.";
+		return 0;
+	}
+	return @code_;
+}
diff --git a/npc/kafras/kafras_alb.txt b/npc/kafras/kafras_alb.txt
index c6eb00b21..3a9adad90 100644
--- a/npc/kafras/kafras_alb.txt
+++ b/npc/kafras/kafras_alb.txt
@@ -1,60 +1,60 @@
-//===== eAthena Script ============

-//= Alberta Kafras

-//===== By: =========================

-//= eAthena Dev Team

-//===== Current Version: ===================

-//= 2.3

-//===== Compatible With: =====================

-//= eAthena 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.

-//===== 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]

-//=====================================================================

-

-

-// NorthWest -----------------------------------------------------------------

-alberta.gat,28,229,8	script	Kafra::kaf_alberta	115,{

-	cutin "kafra_03",2;

-	callfunc "F_KafSetAlb";

-	callfunc "F_Kafra",0,0,0;

-

-	M_Save:

-		savepoint "alberta.gat",31,231;

-		callfunc "F_KafEnd",0,1;

-}

-

-// South ---------------------------------------------------------------------

-alberta.gat,113,60,5	script	Kafra::kaf_alberta2	112,{

-	cutin "kafra_06",2;

-	callfunc "F_KafSetAlb";

-	callfunc "F_Kafra",0,0,0;

-

-	M_Save:

-		savepoint "alberta.gat",117,57;

-		callfunc "F_KafEnd",0,1;

-}

-

-

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

-}

+//===== eAthena Script ============
+//= Alberta Kafras
+//===== By: =========================
+//= eAthena Dev Team
+//===== Current Version: ===================
+//= 2.3
+//===== Compatible With: =====================
+//= eAthena 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.
+//===== 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]
+//=====================================================================
+
+
+// NorthWest -----------------------------------------------------------------
+alberta.gat,28,229,8	script	Kafra::kaf_alberta	115,{
+	cutin "kafra_03",2;
+	callfunc "F_KafSetAlb";
+	callfunc "F_Kafra",0,0,0;
+
+	M_Save:
+		savepoint "alberta.gat",31,231;
+		callfunc "F_KafEnd",0,1;
+}
+
+// South ---------------------------------------------------------------------
+alberta.gat,113,60,5	script	Kafra::kaf_alberta2	112,{
+	cutin "kafra_06",2;
+	callfunc "F_KafSetAlb";
+	callfunc "F_Kafra",0,0,0;
+
+	M_Save:
+		savepoint "alberta.gat",117,57;
+		callfunc "F_KafEnd",0,1;
+}
+
+
+// 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/kafras/kafras_alde.txt b/npc/kafras/kafras_alde.txt
index 48914eac3..f50956ce9 100644
--- a/npc/kafras/kafras_alde.txt
+++ b/npc/kafras/kafras_alde.txt
@@ -1,51 +1,51 @@
-//===== eAthena Script =======================================

-//= Al De Baran Kafras

-//===== By: ============================

-//= eAthena Dev Team

-//===== Current Version: =======================

-//= 2.2

-//===== Compatible With: ============================

-//= eAthena 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.

-//===== 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]

-//=====================================================================

-

-

-// Kafra Main Office (Kafra Leilah) ------------------------------------

-aldeba_in.gat,96,181,4	script	Kafra Leilah	113,{

-	cutin "kafra_05",2;

-	callfunc "F_Kafra",0,2,1;

-

-	M_Save:

-		savepoint "aldeba_in.gat",96,179;

-		callfunc "F_KafEnd",0,1;

-

-}

-

-// South --------------------------------------------------

-aldebaran.gat,143,119,4	script	Kafra::kaf_aldebaran	113,{

-	cutin "kafra_05",2;

-	cleararray @wrpC$[0],"",getarraysize(@wrpC$);

-	setarray @wrpP[0], 1200, 1200, 1800, 1700;

-	setarray @wrpD$[0], "Geffen", "Yuno" , "Izlude", "Coal Mine(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";

-	callfunc "F_Kafra",0,0,1;

-

-	M_Save:

-		savepoint "aldebaran.gat",143,109;

-		callfunc "F_KafEnd",0,1;

-}

+//===== eAthena Script =======================================
+//= Al De Baran Kafras
+//===== By: ============================
+//= eAthena Dev Team
+//===== Current Version: =======================
+//= 2.2
+//===== Compatible With: ============================
+//= eAthena 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.
+//===== 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]
+//=====================================================================
+
+
+// Kafra Main Office (Kafra Leilah) ------------------------------------
+aldeba_in.gat,96,181,4	script	Kafra Leilah	113,{
+	cutin "kafra_05",2;
+	callfunc "F_Kafra",0,2,1;
+
+	M_Save:
+		savepoint "aldeba_in.gat",96,179;
+		callfunc "F_KafEnd",0,1;
+
+}
+
+// South --------------------------------------------------
+aldebaran.gat,143,119,4	script	Kafra::kaf_aldebaran	113,{
+	cutin "kafra_05",2;
+	cleararray @wrpC$[0],"",getarraysize(@wrpC$);
+	setarray @wrpP[0], 1200, 1200, 1800, 1700;
+	setarray @wrpD$[0], "Geffen", "Yuno" , "Izlude", "Coal Mine(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";
+	callfunc "F_Kafra",0,0,1;
+
+	M_Save:
+		savepoint "aldebaran.gat",143,109;
+		callfunc "F_KafEnd",0,1;
+}
diff --git a/npc/kafras/kafras_com.txt b/npc/kafras/kafras_com.txt
index 2044a0822..e60332627 100644
--- a/npc/kafras/kafras_com.txt
+++ b/npc/kafras/kafras_com.txt
@@ -1,57 +1,57 @@
-//===== eAthena Script ===============

-//= Comodo Kafras

-//===== By: ============================

-//= eAthena Dev Team

-//===== Current Version: =======================

-//= 2.21

-//===== Compatible With: ============================

-//= eAthena 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.

-//===== 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]

-//=====================================================================

-

-

-// In Town ==============================================>\\

-comodo.gat,200,148,4	script	Kafra::kaf_comodo	721,{

-	cutin "kafra_07",2;

-	cleararray @wrpC$[0],"",getarraysize(@wrpC$);

-	setarray @wrpD$[0], "Morroc", "Comodo Pharos Lighthouse", "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";

-	callfunc "F_Kafra",0,0,1;

-

-	M_Save:

-		savepoint "comodo.gat",204,143;

-		callfunc "F_KafEnd",0,1;

-}

-

-// Comodo Pharos Lighthouse (Beacon Island) ===================>\\

-cmd_fild07.gat,135,134,4	script	Kafra::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";

-	callfunc "F_Kafra",0,0,1;

-

-	M_Save:

-		savepoint "cmd_fild07.gat",127,134;

-		callfunc "F_KafEnd",0,1;

-}

+//===== eAthena Script ===============
+//= Comodo Kafras
+//===== By: ============================
+//= eAthena Dev Team
+//===== Current Version: =======================
+//= 2.21
+//===== Compatible With: ============================
+//= eAthena 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.
+//===== 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]
+//=====================================================================
+
+
+// In Town ==============================================>\\
+comodo.gat,200,148,4	script	Kafra::kaf_comodo	721,{
+	cutin "kafra_07",2;
+	cleararray @wrpC$[0],"",getarraysize(@wrpC$);
+	setarray @wrpD$[0], "Morroc", "Comodo Pharos Lighthouse", "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";
+	callfunc "F_Kafra",0,0,1;
+
+	M_Save:
+		savepoint "comodo.gat",204,143;
+		callfunc "F_KafEnd",0,1;
+}
+
+// Comodo Pharos Lighthouse (Beacon Island) ===================>\\
+cmd_fild07.gat,135,134,4	script	Kafra::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";
+	callfunc "F_Kafra",0,0,1;
+
+	M_Save:
+		savepoint "cmd_fild07.gat",127,134;
+		callfunc "F_KafEnd",0,1;
+}
diff --git a/npc/kafras/kafras_dungeons.txt b/npc/kafras/kafras_dungeons.txt
index 818cda95b..dcddfc753 100644
--- a/npc/kafras/kafras_dungeons.txt
+++ b/npc/kafras/kafras_dungeons.txt
@@ -1,117 +1,117 @@
-//===== eAthena Script ================

-//= Kafras in Dungeons and Fields

-//===== By: ============================

-//= eAthena Dev Team

-//===== Current Version: =======================

-//= 2.5

-//===== Compatible With: ============================

-//= eAthena 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.

-//===== 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]

-//===============================================================

-

-

-//<============================= Ant Hell ==============================>\\

-// Mocfild04 -----------------------------------------

-moc_fild04.gat,230,329,3	script	Kafra::kaf_moc_fild04	115,{

-

-	cutin "kafra_03",2;

-	callfunc "F_Kafra",0,2,1;

-

-	M_Save:

-		savepoint "moc_fild04.gat",231,339;

-		callfunc "F_KafEnd",0,1;

-}

-

-// Mocfild15 --------------------------------------------

-moc_fild15.gat,264,260,3	script	Kafra::kaf_moc_fild15	115,{

-

-	cutin "kafra_03",2;

-	callfunc "F_Kafra",0,2,1;

-

-	M_Save:

-		savepoint "moc_fild15.gat",266,271;

-		callfunc "F_KafEnd",0,1;

-}

-

-//<============================= Byalan Island ============================>\\

-izlu2dun.gat,106,58,8	script	Kafra::kaf_izlu2dun	115,{

-

-	cutin "kafra_03",2;

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

-	callfunc "F_Kafra",0,2,1;

-

-	M_Save:

-		savepoint "izlu2dun.gat",87,170;

-		callfunc "F_KafEnd",0,1;

-}

-

-

-//<============================ Culvert Sewers ============================>\\

-prt_fild05.gat,290,224,1	script	Kafra::prt_fild05	114,{

-	cutin "kafra_04",2;

-	callfunc "F_Kafra",0,1,1;

-

-	M_Save:

-		savepoint "prt_fild05.gat",274,243;

-		callfunc "F_KafEnd",0,1;

-}

-

-

-//<=========================== Coal Mine (Dead Pitt) =======================>\\

-mjolnir_02.gat,83,361,4	script	Kafra::kaf_mjolnir_02	114,{

-	cutin "kafra_04",2;

-	callfunc "F_Kafra",0,6,1;

-

-	M_Save:

-		savepoint "mjolnir_02.gat",98,352;

-		callfunc "F_KafEnd",0,1;

-}

-

-

-//<=============================== Morroc Ruins ============================>\\

-moc_ruins.gat,61,156,5	script	Kafra::moc_ruins	114,{

-	cutin "kafra_04",2;

-	callfunc "F_Kafra",0,2,1;

-

-	M_Save:

-		savepoint "moc_ruins.gat",41,141;

-		callfunc "F_KafEnd",0,1;

-}

-

-

-//<================================ Orc Dungeon ============================>\\

-gef_fild10.gat,73,340,4	script	Kafra::kaf_gef_fild10	115,{

-	cutin "kafra_03",2;

-	callfunc "F_Kafra",0,6,1;

-

-	M_Save:

-		savepoint "gef_fild10.gat",54,326;

-		callfunc "F_KafEnd",0,1;

-}

-

-//<============================== Treasure Island ==========================>\\

-alb2trea.gat,59,69,1	script	Kafra::kaf_alb2trea	117,{

-	cutin "kafra_01",2;

-	callfunc "F_Kafra",0,2,1;

-

-	M_Save:

-		savepoint "alb2trea.gat",92,64;

-		callfunc "F_KafEnd",0,1;

-}

+//===== eAthena Script ================
+//= Kafras in Dungeons and Fields
+//===== By: ============================
+//= eAthena Dev Team
+//===== Current Version: =======================
+//= 2.5
+//===== Compatible With: ============================
+//= eAthena 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.
+//===== 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]
+//===============================================================
+
+
+//<============================= Ant Hell ==============================>\\
+// Mocfild04 -----------------------------------------
+moc_fild04.gat,230,329,3	script	Kafra::kaf_moc_fild04	115,{
+
+	cutin "kafra_03",2;
+	callfunc "F_Kafra",0,2,1;
+
+	M_Save:
+		savepoint "moc_fild04.gat",231,339;
+		callfunc "F_KafEnd",0,1;
+}
+
+// Mocfild15 --------------------------------------------
+moc_fild15.gat,264,260,3	script	Kafra::kaf_moc_fild15	115,{
+
+	cutin "kafra_03",2;
+	callfunc "F_Kafra",0,2,1;
+
+	M_Save:
+		savepoint "moc_fild15.gat",266,271;
+		callfunc "F_KafEnd",0,1;
+}
+
+//<============================= Byalan Island ============================>\\
+izlu2dun.gat,106,58,8	script	Kafra::kaf_izlu2dun	115,{
+
+	cutin "kafra_03",2;
+	if(BaseJob==Job_Novice && job_merchant_q3>0) callfunc "F_MercKafra";  //F_MercKafra found in merchant.txt
+	callfunc "F_Kafra",0,2,1;
+
+	M_Save:
+		savepoint "izlu2dun.gat",87,170;
+		callfunc "F_KafEnd",0,1;
+}
+
+
+//<============================ Culvert Sewers ============================>\\
+prt_fild05.gat,290,224,1	script	Kafra::prt_fild05	114,{
+	cutin "kafra_04",2;
+	callfunc "F_Kafra",0,1,1;
+
+	M_Save:
+		savepoint "prt_fild05.gat",274,243;
+		callfunc "F_KafEnd",0,1;
+}
+
+
+//<=========================== Coal Mine (Dead Pitt) =======================>\\
+mjolnir_02.gat,83,361,4	script	Kafra::kaf_mjolnir_02	114,{
+	cutin "kafra_04",2;
+	callfunc "F_Kafra",0,6,1;
+
+	M_Save:
+		savepoint "mjolnir_02.gat",98,352;
+		callfunc "F_KafEnd",0,1;
+}
+
+
+//<=============================== Morroc Ruins ============================>\\
+moc_ruins.gat,61,156,5	script	Kafra::moc_ruins	114,{
+	cutin "kafra_04",2;
+	callfunc "F_Kafra",0,2,1;
+
+	M_Save:
+		savepoint "moc_ruins.gat",41,141;
+		callfunc "F_KafEnd",0,1;
+}
+
+
+//<================================ Orc Dungeon ============================>\\
+gef_fild10.gat,73,340,4	script	Kafra::kaf_gef_fild10	115,{
+	cutin "kafra_03",2;
+	callfunc "F_Kafra",0,6,1;
+
+	M_Save:
+		savepoint "gef_fild10.gat",54,326;
+		callfunc "F_KafEnd",0,1;
+}
+
+//<============================== Treasure Island ==========================>\\
+alb2trea.gat,59,69,1	script	Kafra::kaf_alb2trea	117,{
+	cutin "kafra_01",2;
+	callfunc "F_Kafra",0,2,1;
+
+	M_Save:
+		savepoint "alb2trea.gat",92,64;
+		callfunc "F_KafEnd",0,1;
+}
diff --git a/npc/kafras/kafras_gef.txt b/npc/kafras/kafras_gef.txt
index 96225323f..cd3e8b522 100644
--- a/npc/kafras/kafras_gef.txt
+++ b/npc/kafras/kafras_gef.txt
@@ -1,83 +1,83 @@
-//===== eAthena Script =======================================

-//= Geffen Kafras

-//===== By: =========================

-//= eAthena Dev Team

-//===== Current Version: ===================

-//= 2.3

-//===== Compatible With: =====================

-//= eAthena 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.

-//===== 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]

-//=====================================================================

-

-

-// South =====================================

-geffen.gat,120,62,8	script	Kafra::kaf_geffen	115,{

-	cutin "kafra_03",2;

-	callfunc "F_KafSetGef";

-	callfunc "F_Kafra",0,0,0;

-

-	M_Save:

-		savepoint "geffen.gat",119,40;

-		callfunc "F_KafEnd",0,1;

-}

-

-// East ==============================================

-geffen.gat,203,123,3	script	Kafra::geffen2	114,{

-	cutin "kafra_04",2;

-	callfunc "F_KafSetGef";

-	callfunc "F_Kafra",0,0,0;

-

-	M_Save:

-		savepoint "geffen.gat",200,124;

-		callfunc "F_KafEnd",0,1;

-}

-

-// North ==============================================

-geffen.gat,116,202,3	script	Kafra::geffen3	116,{

-	cutin "kafra_02",2;

-	callfunc "F_KafSetGef";

-	callfunc "F_Kafra",0,0,0;

-

-	M_Save:

-		savepoint "geffen.gat",110,199;

-		callfunc "F_KafEnd",0,1;

-}

-

-// West =========================================

-geffen.gat,37,116,6	script	Kafra::geffen4	117,{

-	cutin "kafra_01",2;

-	callfunc "F_KafSetGef";

-	callfunc "F_Kafra",0,0,0;

-

-	M_Save:

-		savepoint "geffen.gat",43,108;

-		callfunc "F_KafEnd",0,1;

-}

-

-

-// Function: Sets variables for Geffen Kafras -------------------

-function	script	F_KafSetGef	{

-	cleararray @wrpC$[0],"",getarraysize(@wrpC$);

-	setarray @wrpD$[0], "Prontera", "Al De Baran", "Orc Dungeon", "Coal Mine(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, 116, 37;

-	setarray @viewpY[0], 62, 123, 202, 116;

-	return;

-}

+//===== eAthena Script =======================================
+//= Geffen Kafras
+//===== By: =========================
+//= eAthena Dev Team
+//===== Current Version: ===================
+//= 2.3
+//===== Compatible With: =====================
+//= eAthena 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.
+//===== 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]
+//=====================================================================
+
+
+// South =====================================
+geffen.gat,120,62,8	script	Kafra::kaf_geffen	115,{
+	cutin "kafra_03",2;
+	callfunc "F_KafSetGef";
+	callfunc "F_Kafra",0,0,0;
+
+	M_Save:
+		savepoint "geffen.gat",119,40;
+		callfunc "F_KafEnd",0,1;
+}
+
+// East ==============================================
+geffen.gat,203,123,3	script	Kafra::geffen2	114,{
+	cutin "kafra_04",2;
+	callfunc "F_KafSetGef";
+	callfunc "F_Kafra",0,0,0;
+
+	M_Save:
+		savepoint "geffen.gat",200,124;
+		callfunc "F_KafEnd",0,1;
+}
+
+// North ==============================================
+geffen.gat,116,202,3	script	Kafra::geffen3	116,{
+	cutin "kafra_02",2;
+	callfunc "F_KafSetGef";
+	callfunc "F_Kafra",0,0,0;
+
+	M_Save:
+		savepoint "geffen.gat",110,199;
+		callfunc "F_KafEnd",0,1;
+}
+
+// West =========================================
+geffen.gat,37,116,6	script	Kafra::geffen4	117,{
+	cutin "kafra_01",2;
+	callfunc "F_KafSetGef";
+	callfunc "F_Kafra",0,0,0;
+
+	M_Save:
+		savepoint "geffen.gat",43,108;
+		callfunc "F_KafEnd",0,1;
+}
+
+
+// Function: Sets variables for Geffen Kafras -------------------
+function	script	F_KafSetGef	{
+	cleararray @wrpC$[0],"",getarraysize(@wrpC$);
+	setarray @wrpD$[0], "Prontera", "Al De Baran", "Orc Dungeon", "Coal Mine(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, 116, 37;
+	setarray @viewpY[0], 62, 123, 202, 116;
+	return;
+}
diff --git a/npc/kafras/kafras_izl.txt b/npc/kafras/kafras_izl.txt
index cbbba5b0a..11fe45b6b 100644
--- a/npc/kafras/kafras_izl.txt
+++ b/npc/kafras/kafras_izl.txt
@@ -1,40 +1,40 @@
-//===== eAthena Script =======================================

-//= Izlude Kafras

-//===== By: =========================

-//= eAthena Dev Team

-//===== Current Version: ===================

-//= 2.21

-//===== Compatible With: =====================

-//= eAthena 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.

-//===== 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.21 Warps to Prontera rather than Payon now [Evera]

-//=====================================================================

-

-

-izlude.gat,134,87,3	script	Kafra::kaf_izlude	117,{

-	cutin "kafra_01",2;

-	cleararray @wrpC$[0],"",getarraysize(@wrpC$);

-	setarray @wrpD$[0], "Geffen", "Prontera", "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";

-	callfunc "F_Kafra",0,0,1;

-

-	M_Save:

-		savepoint "izlude.gat",96,107;

-		callfunc "F_KafEnd",0,1;

-}

+//===== eAthena Script =======================================
+//= Izlude Kafras
+//===== By: =========================
+//= eAthena Dev Team
+//===== Current Version: ===================
+//= 2.21
+//===== Compatible With: =====================
+//= eAthena 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.
+//===== 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.21 Warps to Prontera rather than Payon now [Evera]
+//=====================================================================
+
+
+izlude.gat,134,87,3	script	Kafra::kaf_izlude	117,{
+	cutin "kafra_01",2;
+	cleararray @wrpC$[0],"",getarraysize(@wrpC$);
+	setarray @wrpD$[0], "Geffen", "Prontera", "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";
+	callfunc "F_Kafra",0,0,1;
+
+	M_Save:
+		savepoint "izlude.gat",96,107;
+		callfunc "F_KafEnd",0,1;
+}
diff --git a/npc/kafras/kafras_mor.txt b/npc/kafras/kafras_mor.txt
index e1d22205c..83cd1dfe8 100644
--- a/npc/kafras/kafras_mor.txt
+++ b/npc/kafras/kafras_mor.txt
@@ -1,83 +1,83 @@
-//===== eAthena Script =======================================

-//= Morroc Kafras

-//===== By: =========================

-//= eAthena Dev Team

-//===== Current Version: ===================

-//= 2.3

-//===== Compatible With: =====================

-//= eAthena 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.

-//===== 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[

-//=====================================================================

-

-

-// South ================================

-morocc.gat,156,97,4	script	Kafra::kaf_morocc	115,{

-	cutin "kafra_03",2;

-	callfunc "F_KafSetMoc";

-	callfunc "F_Kafra",0,0,0;

-

-	M_Save:

-		savepoint "morocc.gat",156,46;

-		callfunc "F_KafEnd",0,1;

-}

-

-// North =================================

-morocc.gat,162,271,4	script	Kafra::kaf_morocc2	114,{

-	cutin "kafra_04",2;

-	callfunc "F_KafSetMoc";

-	callfunc "F_Kafra",0,0,0;

-

-	M_Save:

-		savepoint "morocc.gat",157,272;

-		callfunc "F_KafEnd",0,1;

-}

-

-// West  =================================

-morocc.gat,28,167,6	script	Kafra::kaf_morocc3	116,{

-	cutin "kafra_02",2;

-	callfunc "F_KafSetMoc";

-	callfunc "F_Kafra",0,0,0;

-

-	M_Save:

-		savepoint "morocc.gat",31,164;

-		callfunc "F_KafEnd",0,1;

-}

-

-// East =================================

-morocc.gat,292,211,4	script	Kafra::kaf_morocc4	112,{

-	cutin "kafra_06",2;

-	callfunc "F_KafSetMoc";

-	callfunc "F_Kafra",0,0,0;

-

-	M_Save:

-		savepoint "morocc.gat",294,207;

-		callfunc "F_KafEnd",0,1;

-}

-

-// Function: Sets variables for Morroc Kafras --------------------------------

-function	script	F_KafSetMoc	{

-	cleararray @wrpC$[0],"",getarraysize(@wrpC$);

-	setarray @wrpD$[0], "Prontera", "Payon", "Alberta", "Comodo", "Comodo Pharos Lighthouse";

-	setarray @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;

-}

+//===== eAthena Script =======================================
+//= Morroc Kafras
+//===== By: =========================
+//= eAthena Dev Team
+//===== Current Version: ===================
+//= 2.3
+//===== Compatible With: =====================
+//= eAthena 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.
+//===== 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[
+//=====================================================================
+
+
+// South ================================
+morocc.gat,156,97,4	script	Kafra::kaf_morocc	115,{
+	cutin "kafra_03",2;
+	callfunc "F_KafSetMoc";
+	callfunc "F_Kafra",0,0,0;
+
+	M_Save:
+		savepoint "morocc.gat",156,46;
+		callfunc "F_KafEnd",0,1;
+}
+
+// North =================================
+morocc.gat,162,271,4	script	Kafra::kaf_morocc2	114,{
+	cutin "kafra_04",2;
+	callfunc "F_KafSetMoc";
+	callfunc "F_Kafra",0,0,0;
+
+	M_Save:
+		savepoint "morocc.gat",157,272;
+		callfunc "F_KafEnd",0,1;
+}
+
+// West  =================================
+morocc.gat,28,167,6	script	Kafra::kaf_morocc3	116,{
+	cutin "kafra_02",2;
+	callfunc "F_KafSetMoc";
+	callfunc "F_Kafra",0,0,0;
+
+	M_Save:
+		savepoint "morocc.gat",31,164;
+		callfunc "F_KafEnd",0,1;
+}
+
+// East =================================
+morocc.gat,292,211,4	script	Kafra::kaf_morocc4	112,{
+	cutin "kafra_06",2;
+	callfunc "F_KafSetMoc";
+	callfunc "F_Kafra",0,0,0;
+
+	M_Save:
+		savepoint "morocc.gat",294,207;
+		callfunc "F_KafEnd",0,1;
+}
+
+// Function: Sets variables for Morroc Kafras --------------------------------
+function	script	F_KafSetMoc	{
+	cleararray @wrpC$[0],"",getarraysize(@wrpC$);
+	setarray @wrpD$[0], "Prontera", "Payon", "Alberta", "Comodo", "Comodo Pharos Lighthouse";
+	setarray @wrpP[0], 1200, 1200, 1800, 1800, 1200;
+	set @wrpC$[0], @wrpD$[0]+" -> "+@wrpP[0];
+	set @wrpC$[1], @wrpD$[1]+" -> "+@wrpP[1];
+	set @wrpC$[2], @wrpD$[2]+" -> "+@wrpP[2];
+	set @wrpC$[3], @wrpD$[3]+" -> "+@wrpP[3];
+	set @wrpC$[4], @wrpD$[4]+" -> "+@wrpP[4];
+	set @wrpC$[5], "Cancel";
+	setarray @viewpX[0], 156, 163, 28, 292;
+	setarray @viewpY[0], 97, 260, 167, 211;
+	return;
+}
diff --git a/npc/kafras/kafras_new.txt b/npc/kafras/kafras_new.txt
index 1936d4418..1e97b3bf2 100644
--- a/npc/kafras/kafras_new.txt
+++ b/npc/kafras/kafras_new.txt
@@ -1,158 +1,158 @@
-//===== eAthena Script ===========

-//= New Kafras

-//===== By: =========================

-//= eAthena Dev Team

-//===== Current Version: ===================

-//= 2.8

-//===== Compatible With: =====================

-//= eAthena 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.

-//===== 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.

-

-//==========================================================================

-

-// Amatsu ------------------------------------------------------------------

-amatsu.gat,102,149,4	script	Kafra::kaf_amatsu	116,{

-	cutin "kafra_02",2;

-	callfunc "F_Kafra",3,3,1;

-

-	M_Save:

-		savepoint "amatsu.gat",116,94;

-		callfunc "F_KafEnd",0,1;

-}

-

-// Ayothaya ----------------------------------------------------------------

-ayothaya.gat,212,169,5	script	Kafra::kaf_ayothaya	116,{

-	cutin "kafra_02",2;

-	callfunc "F_Kafra",4,3,1;

-

-	M_Save:

-		savepoint "ayothaya.gat",149,69;

-		callfunc "F_KafEnd",0,1;

-}

-

-// Einbech -----------------------------------------------------------------

-

-einbech.gat,181,132,4	script	Kafra::kaf_einbech	860,{

-	cutin "kafra_08",2;

-	callfunc "F_Kafra",0,4,1;

-

-	M_Save:

-		savepoint "einbech.gat",182,124;

-		callfunc "F_KafEnd",0,1;

-}

-

-// Einbroch (North-East) ---------------------------------------------------

-einbroch.gat,242,205,5	script	Kafra::kaf_einbroch	115,{

-	cutin "kafra_03",2;

-	callfunc "F_Kafra",0,4,1;

-

-	M_Save:

-		savepoint "einbroch.gat",238,198;

-		callfunc "F_KafEnd",0,1;

-}

-

-// Einbroch (East) ---------------------------------------------------------

-einbroch.gat,59,203,5	script	Kafra::kaf_einbroch2	117,{

-	cutin "kafra_01",2;

-	callfunc "F_Kafra",0,4,1;

-

-	M_Save:

-		savepoint "einbroch.gat",240,197;

-		callfunc "F_KafEnd",0,1;

-}

-

-// Gonryun -----------------------------------------------------------------

-gonryun.gat,159,122,4	script	Kafra::kaf_gonryun	116,{

-	cutin "kafra_02",2;

-	callfunc "F_Kafra",0,3,1;

-

-	M_Save:

-		savepoint "gonryun.gat",160,62;

-		callfunc "F_KafEnd",0,1;

-}

-

-// Lighthalzen--------------------------------------------------------------

-

-//Outside the hotel

-lighthalzen.gat,164,100,4	script	Kafra::kaf_lighthalzen	860,{

-	cutin "kafra_08",2;

-	callfunc "F_Kafra",0,4,1;

-

-	M_Save:

-		savepoint "lighthalzen.gat",158,94;

-		callfunc "F_KafEnd",0,1;

-}

-

-// Entrance

-lighthalzen.gat,191,320,4	script	Kafra::kaf_lighthalzen2	861,{

-	cutin "kafra_09",2;

-	callfunc "F_Kafra",0,4,1;

-

-	M_Save:

-		savepoint "lighthalzen.gat",194,313;

-		callfunc "F_KafEnd",0,1;

-}

-

-//Inside the hotel

-lhz_in02.gat,237,284,4	script	Kafra::kaf_lhz_in02	861,{

-	cutin "kafra_09",2;

-	callfunc "F_Kafra",0,4,1;

-

-	M_Save:

-		savepoint "lhz_in02.gat",278,215;

-		callfunc "F_KafEnd",0,1;

-}

-

-// Louyang -----------------------------------------------------------------

-louyang.gat,210,104,5	script	Kafra::kaf_louyang	117,{

-	cutin "kafra_01",2;

-	callfunc "F_Kafra",4,3,1;

-

-	M_Save:

-		savepoint "louyang.gat",217,92;

-		callfunc "F_KafEnd",0,1;

-}

-

-// Umbala Kafra ------------------------------------------------------------

-umbala.gat,128,133,4	script	Kafra::kaf_umbala	115,{

-	cutin "kafra_03",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";

-	callfunc "F_Kafra",0,0,1;

-	M_Save:

-		savepoint "umbala.gat",126,131;

-		callfunc "F_KafEnd",0,1;

-}

-

-// Niflheim ----------------------------------------------------------------

-niflheim.gat,202,180,3	script	Kafra::kaf_niflheim	791,{

-	callfunc "F_Kafra",1,2,1;

-//this SAVE isn't used. Niflheim Kafra doesn't SAVE

-	M_Save:

-		savepoint "niflheim.gat",192,182;

-		callfunc "F_KafEnd",1,1;

-}

+//===== eAthena Script ===========
+//= New Kafras
+//===== By: =========================
+//= eAthena Dev Team
+//===== Current Version: ===================
+//= 2.8
+//===== Compatible With: =====================
+//= eAthena 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.
+//===== 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.
+
+//==========================================================================
+
+// Amatsu ------------------------------------------------------------------
+amatsu.gat,102,149,4	script	Kafra::kaf_amatsu	116,{
+	cutin "kafra_02",2;
+	callfunc "F_Kafra",3,3,1;
+
+	M_Save:
+		savepoint "amatsu.gat",116,94;
+		callfunc "F_KafEnd",0,1;
+}
+
+// Ayothaya ----------------------------------------------------------------
+ayothaya.gat,212,169,5	script	Kafra::kaf_ayothaya	116,{
+	cutin "kafra_02",2;
+	callfunc "F_Kafra",4,3,1;
+
+	M_Save:
+		savepoint "ayothaya.gat",149,69;
+		callfunc "F_KafEnd",0,1;
+}
+
+// Einbech -----------------------------------------------------------------
+
+einbech.gat,181,132,4	script	Kafra::kaf_einbech	860,{
+	cutin "kafra_08",2;
+	callfunc "F_Kafra",0,4,1;
+
+	M_Save:
+		savepoint "einbech.gat",182,124;
+		callfunc "F_KafEnd",0,1;
+}
+
+// Einbroch (North-East) ---------------------------------------------------
+einbroch.gat,242,205,5	script	Kafra::kaf_einbroch	115,{
+	cutin "kafra_03",2;
+	callfunc "F_Kafra",0,4,1;
+
+	M_Save:
+		savepoint "einbroch.gat",238,198;
+		callfunc "F_KafEnd",0,1;
+}
+
+// Einbroch (East) ---------------------------------------------------------
+einbroch.gat,59,203,5	script	Kafra::kaf_einbroch2	117,{
+	cutin "kafra_01",2;
+	callfunc "F_Kafra",0,4,1;
+
+	M_Save:
+		savepoint "einbroch.gat",240,197;
+		callfunc "F_KafEnd",0,1;
+}
+
+// Gonryun -----------------------------------------------------------------
+gonryun.gat,159,122,4	script	Kafra::kaf_gonryun	116,{
+	cutin "kafra_02",2;
+	callfunc "F_Kafra",0,3,1;
+
+	M_Save:
+		savepoint "gonryun.gat",160,62;
+		callfunc "F_KafEnd",0,1;
+}
+
+// Lighthalzen--------------------------------------------------------------
+
+//Outside the hotel
+lighthalzen.gat,164,100,4	script	Kafra::kaf_lighthalzen	860,{
+	cutin "kafra_08",2;
+	callfunc "F_Kafra",0,4,1;
+
+	M_Save:
+		savepoint "lighthalzen.gat",158,94;
+		callfunc "F_KafEnd",0,1;
+}
+
+// Entrance
+lighthalzen.gat,191,320,4	script	Kafra::kaf_lighthalzen2	861,{
+	cutin "kafra_09",2;
+	callfunc "F_Kafra",0,4,1;
+
+	M_Save:
+		savepoint "lighthalzen.gat",194,313;
+		callfunc "F_KafEnd",0,1;
+}
+
+//Inside the hotel
+lhz_in02.gat,237,284,4	script	Kafra::kaf_lhz_in02	861,{
+	cutin "kafra_09",2;
+	callfunc "F_Kafra",0,4,1;
+
+	M_Save:
+		savepoint "lhz_in02.gat",278,215;
+		callfunc "F_KafEnd",0,1;
+}
+
+// Louyang -----------------------------------------------------------------
+louyang.gat,210,104,5	script	Kafra::kaf_louyang	117,{
+	cutin "kafra_01",2;
+	callfunc "F_Kafra",4,3,1;
+
+	M_Save:
+		savepoint "louyang.gat",217,92;
+		callfunc "F_KafEnd",0,1;
+}
+
+// Umbala Kafra ------------------------------------------------------------
+umbala.gat,128,133,4	script	Kafra::kaf_umbala	115,{
+	cutin "kafra_03",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";
+	callfunc "F_Kafra",0,0,1;
+	M_Save:
+		savepoint "umbala.gat",126,131;
+		callfunc "F_KafEnd",0,1;
+}
+
+// Niflheim ----------------------------------------------------------------
+niflheim.gat,202,180,3	script	Kafra::kaf_niflheim	791,{
+	callfunc "F_Kafra",1,2,1;
+//this SAVE isn't used. Niflheim Kafra doesn't SAVE
+	M_Save:
+		savepoint "niflheim.gat",192,182;
+		callfunc "F_KafEnd",1,1;
+}
diff --git a/npc/kafras/kafras_pay.txt b/npc/kafras/kafras_pay.txt
index 738a41004..4380ec81e 100644
--- a/npc/kafras/kafras_pay.txt
+++ b/npc/kafras/kafras_pay.txt
@@ -1,70 +1,70 @@
-//===== eAthena Script =======================================

-//= Payon Kafras

-//===== By: =========================

-//= eAthena Dev Team

-//===== Current Version: ===================

-//= 2.31

-//===== Compatible With: =====================

-//= eAthena 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.

-//===== 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]

-//==========================================================================

-

-

-// Main Town, South ----------------------------------------------------------

-payon.gat,181,104,4	script	Kafra::kaf_payon	113,{

-	cutin "kafra_05",2;

-	callfunc "F_KafSetPay";

-	callfunc "F_Kafra",0,0,1;

-

-	M_Save:

-		savepoint "payon.gat",160,58;

-		callfunc "F_KafEnd",0,1;

-}

-

-// Main Town, Middle North --------------------------------------------------

-payon.gat,175,226,4	script	Kafra::kaf_payon2	116,{

-	cutin "kafra_02",2;

-	callfunc "F_KafSetPay";

-	callfunc "F_Kafra",0,0,1;

-

-	M_Save:

-		savepoint "payon.gat",257,242;

-		callfunc "F_KafEnd",0,1;

-}

-

-// Archer Village ------------------------------------------------------------

-pay_arche.gat,55,123,8	script	Kafra::kaf_payon3	115,{

-	cutin "kafra_03",2;

-	callfunc "F_KafSetPay";

-	callfunc "F_Kafra",0,5,1;

-

-	M_Save:

-		savepoint "pay_arche.gat",49,144;

-		callfunc "F_KafEnd",0,1;

-}

-

-

-// Function: Sets variables for Payon Kafras ---------------------------------

-function	script	F_KafSetPay	{

-	cleararray @wrpC$[0],"",getarraysize(@wrpC$);

-	setarray @wrpD$[0], "Alberta", "Prontera", "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;

-}

+//===== eAthena Script =======================================
+//= Payon Kafras
+//===== By: =========================
+//= eAthena Dev Team
+//===== Current Version: ===================
+//= 2.31
+//===== Compatible With: =====================
+//= eAthena 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.
+//===== 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]
+//==========================================================================
+
+
+// Main Town, South ----------------------------------------------------------
+payon.gat,181,104,4	script	Kafra::kaf_payon	113,{
+	cutin "kafra_05",2;
+	callfunc "F_KafSetPay";
+	callfunc "F_Kafra",0,0,1;
+
+	M_Save:
+		savepoint "payon.gat",160,58;
+		callfunc "F_KafEnd",0,1;
+}
+
+// Main Town, Middle North --------------------------------------------------
+payon.gat,175,226,4	script	Kafra::kaf_payon2	116,{
+	cutin "kafra_02",2;
+	callfunc "F_KafSetPay";
+	callfunc "F_Kafra",0,0,1;
+
+	M_Save:
+		savepoint "payon.gat",257,242;
+		callfunc "F_KafEnd",0,1;
+}
+
+// Archer Village ------------------------------------------------------------
+pay_arche.gat,55,123,8	script	Kafra::kaf_payon3	115,{
+	cutin "kafra_03",2;
+	callfunc "F_KafSetPay";
+	callfunc "F_Kafra",0,5,1;
+
+	M_Save:
+		savepoint "pay_arche.gat",49,144;
+		callfunc "F_KafEnd",0,1;
+}
+
+
+// Function: Sets variables for Payon Kafras ---------------------------------
+function	script	F_KafSetPay	{
+	cleararray @wrpC$[0],"",getarraysize(@wrpC$);
+	setarray @wrpD$[0], "Alberta", "Prontera", "Morroc";
+	setarray @wrpP[0], 1200, 1200, 1200;
+	set @wrpC$[0], @wrpD$[0]+" -> "+@wrpP[0];
+	set @wrpC$[1], @wrpD$[1]+" -> "+@wrpP[1];
+	set @wrpC$[2], @wrpD$[2]+" -> "+@wrpP[2];
+	set @wrpC$[3], "Cancel";
+	return;
+}
diff --git a/npc/kafras/kafras_pron.txt b/npc/kafras/kafras_pron.txt
index 83a330b9e..be51e22fe 100644
--- a/npc/kafras/kafras_pron.txt
+++ b/npc/kafras/kafras_pron.txt
@@ -1,99 +1,99 @@
-//===== eAthena Script =======================================

-//= Prontera Kafras

-//===== By: =========================

-//= eAthena Dev Team

-//===== Current Version: ===================

-//= 2.5

-//===== Compatible With: =====================

-//= eAthena 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.

-//===== 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]

-//=====================================================================

-

-

-// North ==================================

-prontera.gat,152,326,4	script	Kafra::kaf_prontera	112,{

-	cutin "kafra_06",2;

-	callfunc "F_Kafra",0,1,1;

-

-M_Save:

-	savepoint "prontera.gat",157,327;

-	callfunc "F_KafEnd",0,1;

-}

-

-// SOUTH ======================================

-prontera.gat,151,29,8	script	Kafra::kaf_prontera2	116,{

-	cutin "kafra_02",2;

-	callfunc "F_KafSetPront";

-	callfunc "F_Kafra",0,0,0;

-

-	M_Save:

-		savepoint "prontera.gat",150,33;

-		callfunc "F_KafEnd",0,1;

-}

-

-//WEST=========================================

-prontera.gat,29,207,6	script	Kafra::kaf_prontera3	113,{

-	cutin "kafra_05",2;

-	callfunc "F_KafSetPront";

-	callfunc "F_Kafra",0,0,0;

-

-	M_Save:

-		savepoint "prontera.gat",33,208;

-		callfunc "F_KafEnd",0,1;

-}

-

-// East ===========================================

-prontera.gat,282,200,4	script	Kafra::kaf_prontera4	115,{

-	cutin "kafra_03",2;

-	callfunc "F_KafSetPront";

-	callfunc "F_Kafra",0,0,0;

-

-	M_Save:

-		savepoint "prontera.gat",281,203;

-		callfunc "F_KafEnd",0,1;

-}

-

-// Center ===========================================

-prontera.gat,146,86,6	script	Kafra::kaf_prontera5	117,{

-	cutin "kafra_01",2;

-	callfunc "F_KafSetPront";

-	callfunc "F_Kafra",0,0,0;

-

-M_Save:

-	savepoint "prontera.gat",116,73;

-	callfunc "F_KafEnd",0,1;

-}

-

-

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

-}

+//===== eAthena Script =======================================
+//= Prontera Kafras
+//===== By: =========================
+//= eAthena Dev Team
+//===== Current Version: ===================
+//= 2.5
+//===== Compatible With: =====================
+//= eAthena 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.
+//===== 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]
+//=====================================================================
+
+
+// North ==================================
+prontera.gat,152,326,4	script	Kafra::kaf_prontera	112,{
+	cutin "kafra_06",2;
+	callfunc "F_Kafra",0,1,1;
+
+M_Save:
+	savepoint "prontera.gat",157,327;
+	callfunc "F_KafEnd",0,1;
+}
+
+// SOUTH ======================================
+prontera.gat,151,29,8	script	Kafra::kaf_prontera2	116,{
+	cutin "kafra_02",2;
+	callfunc "F_KafSetPront";
+	callfunc "F_Kafra",0,0,0;
+
+	M_Save:
+		savepoint "prontera.gat",150,33;
+		callfunc "F_KafEnd",0,1;
+}
+
+//WEST=========================================
+prontera.gat,29,207,6	script	Kafra::kaf_prontera3	113,{
+	cutin "kafra_05",2;
+	callfunc "F_KafSetPront";
+	callfunc "F_Kafra",0,0,0;
+
+	M_Save:
+		savepoint "prontera.gat",33,208;
+		callfunc "F_KafEnd",0,1;
+}
+
+// East ===========================================
+prontera.gat,282,200,4	script	Kafra::kaf_prontera4	115,{
+	cutin "kafra_03",2;
+	callfunc "F_KafSetPront";
+	callfunc "F_Kafra",0,0,0;
+
+	M_Save:
+		savepoint "prontera.gat",281,203;
+		callfunc "F_KafEnd",0,1;
+}
+
+// Center ===========================================
+prontera.gat,146,86,6	script	Kafra::kaf_prontera5	117,{
+	cutin "kafra_01",2;
+	callfunc "F_KafSetPront";
+	callfunc "F_Kafra",0,0,0;
+
+M_Save:
+	savepoint "prontera.gat",116,73;
+	callfunc "F_KafEnd",0,1;
+}
+
+
+// Function: Sets variables for Prontera Kafras ----------------------------
+function	script	F_KafSetPront	{
+	cleararray @wrpC$[0],"",getarraysize(@wrpC$);
+	setarray @wrpD$[0], "Izlude", "Geffen", "Payon", "Morroc", "Orc Dungeon", "Alberta";
+	setarray @wrpP[0], 600, 1200, 1200, 1200, 1200, 1800;
+	set @wrpC$[0], @wrpD$[0]+" -> "+@wrpP[0];
+	set @wrpC$[1], @wrpD$[1]+" -> "+@wrpP[1];
+	set @wrpC$[2], @wrpD$[2]+" -> "+@wrpP[2];
+	set @wrpC$[3], @wrpD$[3]+" -> "+@wrpP[3];
+	set @wrpC$[4], @wrpD$[4]+" -> "+@wrpP[4];
+	set @wrpC$[5], @wrpD$[5]+" -> "+@wrpP[5];
+	set @wrpC$[6], "Cancel";
+	setarray @viewpX[0], 151, 29, 282, 152;
+	setarray @viewpY[0], 29, 207, 200, 326;
+	return;
+}
diff --git a/npc/kafras/kafras_yun.txt b/npc/kafras/kafras_yun.txt
index 5e879bf6b..6b84cb74d 100644
--- a/npc/kafras/kafras_yun.txt
+++ b/npc/kafras/kafras_yun.txt
@@ -1,69 +1,69 @@
-//===== eAthena Script =======================================

-//= Yuno Kafras

-//===== By: =========================

-//= eAthena Dev Team

-//===== Current Version: ===================

-//= 2.3

-//===== Compatible With: =====================

-//= eAthena 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.

-//===== 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]

-//=====================================================================

-

-

-// Center ------------------------------------------------------------------

-yuno.gat,152,187,4	script	Kafra::kaf_yuno	113,{

-	cutin "kafra_05",2;

-	callfunc "F_KafSetYun";

-	callfunc "F_Kafra",0,0,0;

-

-	M_Save:

-		savepoint "yuno.gat",158,125;

-		callfunc "F_KafEnd",0,1;

-}

-

-// South East --------------------------------------------------------------

-yuno.gat,327,108,4	script	Kafra::kaf_yuno2	113,{

-	cutin "kafra_05",2;

-	callfunc "F_KafSetYun";

-	callfunc "F_Kafra",0,0,0;

-

-	M_Save:

-		savepoint "yuno.gat",328,101;

-		callfunc "F_KafEnd",0,1;

-}

-

-// East --------------------------------------------------------------------

-yuno.gat,277,221,4	script	Kafra::kaf_yuno3	117,{

-	cutin "kafra_01",2;

-	callfunc "F_KafSetYun";

-	callfunc "F_Kafra",0,0,0;

-

-	M_Save:

-		savepoint "yuno.gat",274,229;

-		callfunc "F_KafEnd",0,1;

-}

-

-

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

-}

+//===== eAthena Script =======================================
+//= Yuno Kafras
+//===== By: =========================
+//= eAthena Dev Team
+//===== Current Version: ===================
+//= 2.3
+//===== Compatible With: =====================
+//= eAthena 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.
+//===== 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]
+//=====================================================================
+
+
+// Center ------------------------------------------------------------------
+yuno.gat,152,187,4	script	Kafra::kaf_yuno	113,{
+	cutin "kafra_05",2;
+	callfunc "F_KafSetYun";
+	callfunc "F_Kafra",0,0,0;
+
+	M_Save:
+		savepoint "yuno.gat",158,125;
+		callfunc "F_KafEnd",0,1;
+}
+
+// South East --------------------------------------------------------------
+yuno.gat,327,108,4	script	Kafra::kaf_yuno2	113,{
+	cutin "kafra_05",2;
+	callfunc "F_KafSetYun";
+	callfunc "F_Kafra",0,0,0;
+
+	M_Save:
+		savepoint "yuno.gat",328,101;
+		callfunc "F_KafEnd",0,1;
+}
+
+// East --------------------------------------------------------------------
+yuno.gat,277,221,4	script	Kafra::kaf_yuno3	117,{
+	cutin "kafra_01",2;
+	callfunc "F_KafSetYun";
+	callfunc "F_Kafra",0,0,0;
+
+	M_Save:
+		savepoint "yuno.gat",274,229;
+		callfunc "F_KafEnd",0,1;
+}
+
+
+// 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;
+}