* Removed double tabs from mapflag/warp/script/function/duplicate declarations.

(avoid script errors in a future commit)

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

12 files changed, 135 insertions, 133 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 508f6d45f..aabbffe0c 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,7 @@
 Date		Added
 ======
+2007/12/08
+	* Removed double tabs from mapflag/warp/script/function/duplicate declarations. [FlavioJS]
 2007/12/02
 	* Rescripted Headgear Quests 1 (Comodo) to Aegis 10.3 Standards. [Samuray22]
 	* Corrected a little Typo error in the "Inn". (bugreport:536 & 537)
diff --git a/npc/merchants/ammo_boxes.txt b/npc/merchants/ammo_boxes.txt
index fa1b1d51f..0bd1cfdcc 100644
--- a/npc/merchants/ammo_boxes.txt
+++ b/npc/merchants/ammo_boxes.txt
@@ -58,7 +58,7 @@ que_ng,187,149,3	script	Magazine Dealer Kenny	83,{
 	close;
 }
 
-function	script		Func_Casing	{
+function	script	Func_Casing	{
 
 	mes "[Kenny]";
 	mes "Please input the amount you want.";
diff --git a/npc/merchants/socket_enchant.txt b/npc/merchants/socket_enchant.txt
index d3b5a6d02..266408697 100644
--- a/npc/merchants/socket_enchant.txt
+++ b/npc/merchants/socket_enchant.txt
@@ -22,7 +22,7 @@
 //= 1.4 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //============================================================
 
-payon,140,151,5		script	Seiyablem	84,{
+payon,140,151,5	script	Seiyablem	84,{
 
 	mes "[Seiyablem]";
 	mes "I'm an engineer that specializes in adding Slots to normal Weapons and Armor.";
@@ -402,8 +402,8 @@ function	script	Func_Socket	{
 }
 
 lhz_in02,281,35,5	duplicate(Seiyablem)	Seiyablem#lhz	84,0,0
-prt_in,33,70,5		duplicate(Seiyablem)	Seiyablem#prt	84,0,0
-morocc,51,41,5		duplicate(Seiyablem)	Seiyablem#moc	84,0,0
+prt_in,33,70,5	duplicate(Seiyablem)	Seiyablem#prt	84,0,0
+morocc,51,41,5	duplicate(Seiyablem)	Seiyablem#moc	84,0,0
 
 payon,143,143,7	script	Young Man#socket	97,{
 
@@ -424,5 +424,5 @@ payon,143,143,7	script	Young Man#socket	97,{
 }
 
 lhz_in02,269,33,5	duplicate(Young Man#socket)	Young Man#lhz	97,0,0
-prt_in,31,57,1		duplicate(Young Man#socket)	Young Man#prt	97,0,0
-morocc,60,42,3		duplicate(Young Man#socket)	Young Man#moc	97,0,0
+prt_in,31,57,1	duplicate(Young Man#socket)	Young Man#prt	97,0,0
+morocc,60,42,3	duplicate(Young Man#socket)	Young Man#moc	97,0,0
diff --git a/npc/quests/Kiel_Hyre_Quest.txt b/npc/quests/Kiel_Hyre_Quest.txt
index e117c6409..56cb53e59 100644
--- a/npc/quests/Kiel_Hyre_Quest.txt
+++ b/npc/quests/Kiel_Hyre_Quest.txt
@@ -3655,9 +3655,9 @@ kh_dun01,76,233,0	script	Heavy Door::HeavyDoorKHQ2	111,{
 kh_dun01,106,233,0	duplicate(HeavyDoorKHQ2)	Heavy Door::HeavyDoorKHQ3	111
 kh_dun01,6,164,0	duplicate(HeavyDoorKHQ2)	Heavy Door::HeavyDoorKHQ4	111
 kh_dun01,6,133,0	duplicate(HeavyDoorKHQ2)	Heavy Door::HeavyDoorKHQ5	111
-kh_dun01,6,60,0		duplicate(HeavyDoorKHQ2)	Heavy Door::HeavyDoorKHQ6	111
-kh_dun01,6,30,0		duplicate(HeavyDoorKHQ2)	Heavy Door::HeavyDoorKHQ7	111
-kh_dun01,6,18,0		duplicate(HeavyDoorKHQ2)	Heavy Door::HeavyDoorKHQ8	111
+kh_dun01,6,60,0	duplicate(HeavyDoorKHQ2)	Heavy Door::HeavyDoorKHQ6	111
+kh_dun01,6,30,0	duplicate(HeavyDoorKHQ2)	Heavy Door::HeavyDoorKHQ7	111
+kh_dun01,6,18,0	duplicate(HeavyDoorKHQ2)	Heavy Door::HeavyDoorKHQ8	111
 kh_dun01,235,70,0	duplicate(HeavyDoorKHQ2)	Heavy Door::HeavyDoorKHQ9	111
 kh_dun01,235,92,0	duplicate(HeavyDoorKHQ2)	Heavy Door::HeavyDoorKHQ10	111
 kh_dun01,235,114,0	duplicate(HeavyDoorKHQ2)	Heavy Door::HeavyDoorKHQ11	111
@@ -6201,7 +6201,7 @@ kh_rossi,149,288,0	script	Bookshelf::BookshelfKHQ2	111,{
 //----------------------------------------------------------------------------
 // Fisherman
 //----------------------------------------------------------------------------
-yuno_fild12,232,222,0	script		Old Fisherman	709,{
+yuno_fild12,232,222,0	script	Old Fisherman	709,{
 	if (KielHyreQuest < 60) {
 		mes "[Fisherman]";
 		mes "These days, it's much";
@@ -6319,7 +6319,7 @@ yuno_fild12,232,222,0	script		Old Fisherman	709,{
 //----------------------------------------------------------------------------
 // Kiel Hyre's hut; Wooden Board
 //----------------------------------------------------------------------------
-yuno_fild09,158,217,0	script		Wooden Board	111,{
+yuno_fild09,158,217,0	script	Wooden Board	111,{
 	if ((KielHyreQuest < 62) || (KielHyreQuest >= 64)) {
 		mes "^3355FFIt's a useless^000000";
 		mes "^3355FFwooden board^000000";
diff --git a/npc/quests/The_Sign_Quest.txt b/npc/quests/The_Sign_Quest.txt
index 8909b16e9..c834ed910 100644
--- a/npc/quests/The_Sign_Quest.txt
+++ b/npc/quests/The_Sign_Quest.txt
@@ -5123,7 +5123,7 @@ L_Cherish:
 
 }
 
-mjo_dun02,88,295,3		script	Flaming Spirit Man	85,{
+mjo_dun02,88,295,3	script	Flaming Spirit Man	85,{
     //get rid of some pieces, to let player reborn in future
     if (signquest > 22) delitem 7177,countitem(7177);
 
diff --git a/npc/quests/quests_airship.txt b/npc/quests/quests_airship.txt
index 7bfaf1108..39675b841 100644
--- a/npc/quests/quests_airship.txt
+++ b/npc/quests/quests_airship.txt
@@ -854,7 +854,7 @@ function	script	cherno	{
 
 //========Unidentified Machine #1 and #2=======================
 
-ein_in01,127,94,5	script	 Unidentified Machine#mac	111,{
+ein_in01,127,94,5	script	Unidentified Machine#mac	111,{
 	callfunc "Machine";
 }
 ein_in01,122,103,5	script	Unidentified Machine	111,{
@@ -1052,9 +1052,9 @@ ein_in01,117,80,5	script	Unidentified Machine#as	111,{
 	}
 }
 //===================Trees From Einbech==========================
-//Tree of the Diary			
+//Tree of the Diary
 einbech,36,100,5	duplicate(Tree)	Tree#t1-2	111
-einbech,44,90,5	duplicate(Tree)		Tree#t1-3	111
+einbech,44,90,5	duplicate(Tree)	Tree#t1-3	111
 einbech,53,94,5	duplicate(Tree)	Tree#t1-4	111
 
 //=======================================================================================================//
diff --git a/npc/quests/quests_juperos.txt b/npc/quests/quests_juperos.txt
index 83d915304..8b5a9eb70 100644
--- a/npc/quests/quests_juperos.txt
+++ b/npc/quests/quests_juperos.txt
@@ -614,7 +614,7 @@ yuno_in04,190,125,4	script	Scholar	700,{
 
 }
 
-function	script		Func_JupHist	{
+function	script	Func_JupHist	{
 
 	switch(yuno_hist)
 	{
diff --git a/npc/warps/cities/lutie.txt b/npc/warps/cities/lutie.txt
index 2679db67e..a86a7b111 100644
--- a/npc/warps/cities/lutie.txt
+++ b/npc/warps/cities/lutie.txt
@@ -12,27 +12,27 @@
 //= 1.2a Re-fixed endless warping loop
 //============================================================
 
-xmas,150,41,0		warp	xmas2-1		3,3,xmas_fild01,80,246
-xmas,120,131,0		warp	xmas3		3,3,xmas_in,41,33
-xmas_in,46,33,0		warp	xmas3-1		3,3,xmas,125,131
-xmas,120,161,0		warp	xmas4		3,3,xmas_in,33,91
-xmas_in,38,89,0		warp	xmas4-1		3,3,xmas,125,159
-xmas,175,132,0		warp	xmas5		3,3,xmas_in,158,31
-xmas_in,153,31,0		warp	xmas5-1		3,3,xmas,170,132
-xmas,174,161,0		warp	xmas6		3,3,xmas_in,166,98
-xmas_in,163,93,0		warp	xmas6-1		3,3,xmas,169,158
-xmas,182,169,0		warp	xmas7		3,3,xmas_in,174,108
-xmas_in,179,109,0		warp	xmas7-1		3,3,xmas,185,168
-xmas,142,240,0		warp	xmas8		3,3,xmas_in,95,87
-xmas_in,95,82,0		warp	xmas8-1		3,3,xmas,142,235
-xmas,149,240,0		warp	xmas9		3,3,xmas_in,105,87
-xmas_in,105,82,0		warp	xmas9-1		3,3,xmas,149,235
-xmas,149,256,0		warp	xmas10		3,3,xmas_in,105,112
-xmas_in,105,117,0		warp	xmas10-1	2,2,xmas,149,261
-xmas,142,256,0		warp	xmas11		3,3,xmas_in,96,114
-xmas_in,95,117,0		warp	xmas11-1	2,2,xmas,142,261
-xmas,104,290,0		warp	xmas12		3,3,xmas_in,30,166
-xmas_in,30,161,0		warp	xmas12-1	3,3,xmas,104,285
-xmas,189,279,0		warp	xmas13		3,3,xmas_in,168,166
-xmas_in,168,161,0		warp	xmas13-1	3,3,xmas,189,274
-xmas,143,313,0		warp	xmas14		3,3,xmas_dun01,205,17
+xmas,150,41,0	warp	xmas2-1	3,3,xmas_fild01,80,246
+xmas,120,131,0	warp	xmas3	3,3,xmas_in,41,33
+xmas_in,46,33,0	warp	xmas3-1	3,3,xmas,125,131
+xmas,120,161,0	warp	xmas4	3,3,xmas_in,33,91
+xmas_in,38,89,0	warp	xmas4-1	3,3,xmas,125,159
+xmas,175,132,0	warp	xmas5	3,3,xmas_in,158,31
+xmas_in,153,31,0	warp	xmas5-1	3,3,xmas,170,132
+xmas,174,161,0	warp	xmas6	3,3,xmas_in,166,98
+xmas_in,163,93,0	warp	xmas6-1	3,3,xmas,169,158
+xmas,182,169,0	warp	xmas7	3,3,xmas_in,174,108
+xmas_in,179,109,0	warp	xmas7-1	3,3,xmas,185,168
+xmas,142,240,0	warp	xmas8	3,3,xmas_in,95,87
+xmas_in,95,82,0	warp	xmas8-1	3,3,xmas,142,235
+xmas,149,240,0	warp	xmas9	3,3,xmas_in,105,87
+xmas_in,105,82,0	warp	xmas9-1	3,3,xmas,149,235
+xmas,149,256,0	warp	xmas10	3,3,xmas_in,105,112
+xmas_in,105,117,0	warp	xmas10-1	2,2,xmas,149,261
+xmas,142,256,0	warp	xmas11	3,3,xmas_in,96,114
+xmas_in,95,117,0	warp	xmas11-1	2,2,xmas,142,261
+xmas,104,290,0	warp	xmas12	3,3,xmas_in,30,166
+xmas_in,30,161,0	warp	xmas12-1	3,3,xmas,104,285
+xmas,189,279,0	warp	xmas13	3,3,xmas_in,168,166
+xmas_in,168,161,0	warp	xmas13-1	3,3,xmas,189,274
+xmas,143,313,0	warp	xmas14	3,3,xmas_dun01,205,17
diff --git a/npc/warps/cities/payon.txt b/npc/warps/cities/payon.txt
index 029300260..19f3009a3 100644
--- a/npc/warps/cities/payon.txt
+++ b/npc/warps/cities/payon.txt
@@ -22,118 +22,118 @@
 // == Official Warps From kRO Screenshots ==
 
 // -- Entrance / Exit --
-payon,16,142,0		warp	payonwarp001	1,1,pay_gld,370,149
-pay_gld,374,149,0		warp	payonwarp002	1,1,payon,20,142
-payon,122,27,0		warp	payonwarp003	5,3,pay_fild01,333,356
+payon,16,142,0	warp	payonwarp001	1,1,pay_gld,370,149
+pay_gld,374,149,0	warp	payonwarp002	1,1,payon,20,142
+payon,122,27,0	warp	payonwarp003	5,3,pay_fild01,333,356
 pay_fild01,333,360,0	warp	payonwarp004	5,3,payon,122,31
-payon,267,89,0		warp	payonwarp005	1,1,pay_fild08,20,74
-payon,228,330,0		warp	payonwarp007	4,2,pay_arche,81,22
-pay_arche,81,18,0		warp	payonwarp008	5,2,payon,228,326
+payon,267,89,0	warp	payonwarp005	1,1,pay_fild08,20,74
+payon,228,330,0	warp	payonwarp007	4,2,pay_arche,81,22
+pay_arche,81,18,0	warp	payonwarp008	5,2,payon,228,326
 
 // -- Inn --
-payon,223,117,0		warp	payonwarp009	2,2,payon_in01,175,11
-payon_in01,172,11,0		warp	payonwarp010	2,2,payon,219,117
-payon_in01,180,43,0		warp	payonwarp011	2,2,payon_in01,181,73
-payon_in01,181,70,0		warp	payonwarp012	2,2,payon_in01,180,40
-payon_in01,193,92,0		warp	payonwarp013	2,2,payon_in01,143,61
-payon_in01,146,61,0		warp	payonwarp014	2,2,payon_in01,193,89
-payon_in01,133,42,0		warp	payonwarp015	2,2,payon_in01,133,18
-payon_in01,133,21,0		warp	payonwarp016	2,2,payon_in01,133,45
+payon,223,117,0	warp	payonwarp009	2,2,payon_in01,175,11
+payon_in01,172,11,0	warp	payonwarp010	2,2,payon,219,117
+payon_in01,180,43,0	warp	payonwarp011	2,2,payon_in01,181,73
+payon_in01,181,70,0	warp	payonwarp012	2,2,payon_in01,180,40
+payon_in01,193,92,0	warp	payonwarp013	2,2,payon_in01,143,61
+payon_in01,146,61,0	warp	payonwarp014	2,2,payon_in01,193,89
+payon_in01,133,42,0	warp	payonwarp015	2,2,payon_in01,133,18
+payon_in01,133,21,0	warp	payonwarp016	2,2,payon_in01,133,45
 
 // -- Sort of Mill --
-payon,140,85,0		warp	payonwarp017	2,2,payon_in01,14,51
-payon_in01,17,51,0		warp	payonwarp018	2,2,payon,143,85
-payon_in01,10,59,0		warp	payonwarp019	2,2,payon_in01,10,83
-payon_in01,10,80,0		warp	payonwarp021	2,2,payon_in01,10,56
-payon_in01,10,38,0		warp	payonwarp022	2,2,payon_in01,10,14
-payon_in01,10,17,0		warp	payonwarp023	2,2,payon_in01,10,41
+payon,140,85,0	warp	payonwarp017	2,2,payon_in01,14,51
+payon_in01,17,51,0	warp	payonwarp018	2,2,payon,143,85
+payon_in01,10,59,0	warp	payonwarp019	2,2,payon_in01,10,83
+payon_in01,10,80,0	warp	payonwarp021	2,2,payon_in01,10,56
+payon_in01,10,38,0	warp	payonwarp022	2,2,payon_in01,10,14
+payon_in01,10,17,0	warp	payonwarp023	2,2,payon_in01,10,41
 
 // -- Weaponshop --
-payon,135,158,0		warp	payonwarp024	2,2,payon_in01,20,129
-payon_in01,23,129,0		warp	payonwarp025	2,2,payon,138,158
-payon,130,169,0		warp	payonwarp026	2,2,payon_in01,13,136
-payon_in01,13,139,0		warp	payonwarp027	2,2,payon,130,172
+payon,135,158,0	warp	payonwarp024	2,2,payon_in01,20,129
+payon_in01,23,129,0	warp	payonwarp025	2,2,payon,138,158
+payon,130,169,0	warp	payonwarp026	2,2,payon_in01,13,136
+payon_in01,13,139,0	warp	payonwarp027	2,2,payon,130,172
 
 // -- House --
-payon,151,127,0		warp	payonwarp028	2,2,payon_in01,56,53
-payon_in01,56,50,0		warp	payonwarp029	2,2,payon,151,124
+payon,151,127,0	warp	payonwarp028	2,2,payon_in01,56,53
+payon_in01,56,50,0	warp	payonwarp029	2,2,payon,151,124
 
 // -- Middle Castle --
-payon,155,248,0		warp	payonwarp030	4,1,payon_in03,98,117
-payon_in03,98,114,0		warp	payonwarp031	5,1,payon,155,245
-payon_in03,90,124,0		warp	payonwarp032	2,2,payon_in03,80,124
-payon_in03,83,124,0		warp	payonwarp033	2,2,payon_in03,93,124
-payon_in03,99,133,0		warp	payonwarp034	2,2,payon_in03,99,151
-payon_in03,99,148,0		warp	payonwarp035	2,2,payon_in03,99,130
+payon,155,248,0	warp	payonwarp030	4,1,payon_in03,98,117
+payon_in03,98,114,0	warp	payonwarp031	5,1,payon,155,245
+payon_in03,90,124,0	warp	payonwarp032	2,2,payon_in03,80,124
+payon_in03,83,124,0	warp	payonwarp033	2,2,payon_in03,93,124
+payon_in03,99,133,0	warp	payonwarp034	2,2,payon_in03,99,151
+payon_in03,99,148,0	warp	payonwarp035	2,2,payon_in03,99,130
 payon_in03,107,124,0	warp	payonwarp036	2,2,payon_in03,117,124
 payon_in03,114,124,0	warp	payonwarp037	2,2,payon_in03,104,124
 
 // -- Weapon Storage Building --
-payon,189,233,0		warp	payonwarp038	2,2,payon_in03,149,39
-payon_in03,146,39,0		warp	payonwarp039	2,2,payon,186,233
-payon_in03,158,32,0		warp	payonwarp040	2,2,payon_in03,130,14
-payon_in03,130,17,0		warp	payonwarp041	2,2,payon_in03,158,35
-payon_in03,172,32,0		warp	payonwarp042	2,2,payon_in03,160,14
-payon_in03,160,17,0		warp	payonwarp043	2,2,payon_in03,172,35
-payon_in03,186,32,0		warp	payonwarp044	2,2,payon_in03,190,13
-payon_in03,190,17,0		warp	payonwarp045	2,2,payon_in03,186,35
+payon,189,233,0	warp	payonwarp038	2,2,payon_in03,149,39
+payon_in03,146,39,0	warp	payonwarp039	2,2,payon,186,233
+payon_in03,158,32,0	warp	payonwarp040	2,2,payon_in03,130,14
+payon_in03,130,17,0	warp	payonwarp041	2,2,payon_in03,158,35
+payon_in03,172,32,0	warp	payonwarp042	2,2,payon_in03,160,14
+payon_in03,160,17,0	warp	payonwarp043	2,2,payon_in03,172,35
+payon_in03,186,32,0	warp	payonwarp044	2,2,payon_in03,190,13
+payon_in03,190,17,0	warp	payonwarp045	2,2,payon_in03,186,35
 
 // -- House --
-payon,256,285,0		warp	payonwarp046	2,2,payon_in01,45,11
-payon_in01,42,11,0		warp	payonwarp047	2,2,payon,253,285
+payon,256,285,0	warp	payonwarp046	2,2,payon_in01,45,11
+payon_in01,42,11,0	warp	payonwarp047	2,2,payon,253,285
 
 // -- Old Archer Village Warps --
-pay_arche,36,131,0		warp	payonwarp048	2,2,pay_dun00,21,183
-pay_arche,71,156,0		warp	payonwarp049	2,2,payon_in02,82,41
-pay_arche,92,170,0		warp	payonwarp050	2,2,payon_in02,50,7
-pay_arche,145,165,0		warp	payonwarp051	2,2,payon_in02,64,60
-payon_in02,10,25,0		warp	payonwarp052	2,2,payon_in02,72,67
-payon_in02,35,67,0		warp	payonwarp053	2,2,payon_in02,55,67
-payon_in02,50,4,0		warp	payonwarp054	3,1,pay_arche,92,166
-payon_in02,52,67,0		warp	payonwarp055	2,2,payon_in02,32,67
-payon_in02,61,33,0		warp	payonwarp056	2,2,payon_in02,73,33
-payon_in02,64,56,0		warp	payonwarp057	2,2,pay_arche,141,161
-payon_in02,70,33,0		warp	payonwarp058	2,2,payon_in02,58,33
-payon_in02,75,67,0		warp	payonwarp059	2,2,payon_in02,13,25
-payon_in02,82,45,0		warp	payonwarp060	2,2,pay_arche,74,153
+pay_arche,36,131,0	warp	payonwarp048	2,2,pay_dun00,21,183
+pay_arche,71,156,0	warp	payonwarp049	2,2,payon_in02,82,41
+pay_arche,92,170,0	warp	payonwarp050	2,2,payon_in02,50,7
+pay_arche,145,165,0	warp	payonwarp051	2,2,payon_in02,64,60
+payon_in02,10,25,0	warp	payonwarp052	2,2,payon_in02,72,67
+payon_in02,35,67,0	warp	payonwarp053	2,2,payon_in02,55,67
+payon_in02,50,4,0	warp	payonwarp054	3,1,pay_arche,92,166
+payon_in02,52,67,0	warp	payonwarp055	2,2,payon_in02,32,67
+payon_in02,61,33,0	warp	payonwarp056	2,2,payon_in02,73,33
+payon_in02,64,56,0	warp	payonwarp057	2,2,pay_arche,141,161
+payon_in02,70,33,0	warp	payonwarp058	2,2,payon_in02,58,33
+payon_in02,75,67,0	warp	payonwarp059	2,2,payon_in02,13,25
+payon_in02,82,45,0	warp	payonwarp060	2,2,pay_arche,74,153
 
 
 // == Self Made Warps, No Screen Availble ==
 
 // -- Large West House --
-payon,127,204,0		warp	payonwarp061	2,2,payon_in03,81,19
-payon_in03,85,19,0		warp	payonwarp062	2,2,payon,131,204
-payon_in03,74,18,0		warp	payonwarp063	2,2,payon_in03,62,18
-payon_in03,67,18,0		warp	payonwarp064	2,2,payon_in03,78,18
-payon_in03,46,18,0		warp	payonwarp065	2,2,payon_in03,35,18
-payon_in03,39,18,0		warp	payonwarp066	2,2,payon_in03,51,18
-payon_in03,28,18,0		warp	payonwarp067	2,2,payon_in03,17,18
-payon_in03,21,18,0		warp	payonwarp068	2,2,payon_in03,32,18
+payon,127,204,0	warp	payonwarp061	2,2,payon_in03,81,19
+payon_in03,85,19,0	warp	payonwarp062	2,2,payon,131,204
+payon_in03,74,18,0	warp	payonwarp063	2,2,payon_in03,62,18
+payon_in03,67,18,0	warp	payonwarp064	2,2,payon_in03,78,18
+payon_in03,46,18,0	warp	payonwarp065	2,2,payon_in03,35,18
+payon_in03,39,18,0	warp	payonwarp066	2,2,payon_in03,51,18
+payon_in03,28,18,0	warp	payonwarp067	2,2,payon_in03,17,18
+payon_in03,21,18,0	warp	payonwarp068	2,2,payon_in03,32,18
 
 // -- Big Kitchen --
-payon,155,327,0		warp	payonwarp069	2,2,payon_in03,165,143
+payon,155,327,0	warp	payonwarp069	2,2,payon_in03,165,143
 payon_in03,165,140,0	warp	payonwarp070	2,2,payon,155,324
 payon_in03,185,178,0	warp	payonwarp071	2,2,payon_in03,185,149
 payon_in03,185,153,0	warp	payonwarp072	2,2,payon_in03,185,182
 
 // -- Upper Castle --
-payon,107,327,0		warp	payonwarp073	2,2,payon_in03,19,64
-payon_in03,19,60,0		warp	payonwarp074	2,2,payon,107,323
-payon_in03,19,73,0		warp	payonwarp075	2,2,payon_in03,19,90
-payon_in03,19,86,0		warp	payonwarp076	2,2,payon_in03,19,69
-payon_in03,19,103,0		warp	payonwarp077	2,2,payon_in03,19,122
-payon_in03,19,118,0		warp	payonwarp078	2,2,payon_in03,19,99
-payon_in03,11,131,0		warp	payonwarp079	2,2,payon_in03,11,146
-payon_in03,11,142,0		warp	payonwarp080	2,2,payon_in03,11,127
-payon_in03,27,131,0		warp	payonwarp081	2,2,payon_in03,27,146
-payon_in03,27,142,0		warp	payonwarp082	2,2,payon_in03,27,127
-payon_in03,11,161,0		warp	payonwarp083	2,2,payon_in03,11,176
-payon_in03,11,172,0		warp	payonwarp084	2,2,payon_in03,11,157
-payon_in03,27,161,0		warp	payonwarp085	2,2,payon_in03,27,176
-payon_in03,27,172,0		warp	payonwarp086	2,2,payon_in03,27,157
+payon,107,327,0	warp	payonwarp073	2,2,payon_in03,19,64
+payon_in03,19,60,0	warp	payonwarp074	2,2,payon,107,323
+payon_in03,19,73,0	warp	payonwarp075	2,2,payon_in03,19,90
+payon_in03,19,86,0	warp	payonwarp076	2,2,payon_in03,19,69
+payon_in03,19,103,0	warp	payonwarp077	2,2,payon_in03,19,122
+payon_in03,19,118,0	warp	payonwarp078	2,2,payon_in03,19,99
+payon_in03,11,131,0	warp	payonwarp079	2,2,payon_in03,11,146
+payon_in03,11,142,0	warp	payonwarp080	2,2,payon_in03,11,127
+payon_in03,27,131,0	warp	payonwarp081	2,2,payon_in03,27,146
+payon_in03,27,142,0	warp	payonwarp082	2,2,payon_in03,27,127
+payon_in03,11,161,0	warp	payonwarp083	2,2,payon_in03,11,176
+payon_in03,11,172,0	warp	payonwarp084	2,2,payon_in03,11,157
+payon_in03,27,161,0	warp	payonwarp085	2,2,payon_in03,27,176
+payon_in03,27,172,0	warp	payonwarp086	2,2,payon_in03,27,157
 
 // -- House --
-payon_in01,86,9,0		warp	payonwarp087	2,2,payon,266,152
-payon,270,152,0		warp	payonwarp088	2,2,payon_in01,90,9
-payon_in01,107,71,0		warp	payonwarp089	2,2,payon_in01,96,37
-payon_in01,93,37,0		warp	payonwarp090	2,2,payon_in01,104,71
+payon_in01,86,9,0	warp	payonwarp087	2,2,payon,266,152
+payon,270,152,0	warp	payonwarp088	2,2,payon_in01,90,9
+payon_in01,107,71,0	warp	payonwarp089	2,2,payon_in01,96,37
+payon_in01,93,37,0	warp	payonwarp090	2,2,payon_in01,104,71
diff --git a/npc/warps/dungeons/tha_t.txt b/npc/warps/dungeons/tha_t.txt
index 36f8ab8cd..94af4b8f7 100644
--- a/npc/warps/dungeons/tha_t.txt
+++ b/npc/warps/dungeons/tha_t.txt
@@ -31,7 +31,7 @@ tha_t03,59,140,0	warp	WarpThana3a	1,1,tha_t04,60,142
 tha_t04,60,137,0	warp	WarpThana3b	1,1,tha_t03,59,135
 
 // Thanatos Tower Level 4 (tha_t04)
-tha_t04,81,36,0		warp	WarpThana4a	1,1,tha_t05,62,8
+tha_t04,81,36,0	warp	WarpThana4a	1,1,tha_t05,62,8
 
 // Thanatos Tower Level 5 (tha_t05)
 tha_t05,62,157,0	warp	WarpThana5a	1,1,tha_t05,213,97
@@ -54,7 +54,7 @@ tha_t10,170,138,0	warp	WarpThana10b	1,1,thana_step,14,73
 
 // Thanatos Tower Level 11 (tha_t11)
 thana_step,15,15,0	warp	WarpThana11a	1,1,tha_t11,50,17
-tha_t11,92,36,0		warp	WarpThana11b	1,1,thana_step,180,73
+tha_t11,92,36,0	warp	WarpThana11b	1,1,thana_step,180,73
 
 // Thanatos Tower Level 12 (tha_t12)
 thana_step,181,15,0	warp	WarpThana12a	1,1,tha_t12,115,16
diff --git a/npc/warps/other/jobquests.txt b/npc/warps/other/jobquests.txt
index db30f3bd6..4e257000a 100644
--- a/npc/warps/other/jobquests.txt
+++ b/npc/warps/other/jobquests.txt
@@ -96,7 +96,7 @@ in_rogue,247,122,0	warp	rogue03-fild07	1,1,cmd_fild07,349,285
 in_rogue,244,21,0	warp	rogue04-fild09	1,1,cmd_fild09,106,191
 in_rogue,172,34,0	warp	rogue05-fild09	1,1,cmd_fild09,341,143
 in_rogue,161,103,0	warp	rogue06-fild04	1,1,cmd_fild04,302,177
-in_rogue,8,9,0		warp	stair_to_ro	1,1,in_rogue,389,389
+in_rogue,8,9,0	warp	stair_to_ro	1,1,in_rogue,389,389
 
 //==============================================================================
 //Dancer
diff --git a/npc/warps/other/kiel.txt b/npc/warps/other/kiel.txt
index 8bfa968a4..e43b754dd 100644
--- a/npc/warps/other/kiel.txt
+++ b/npc/warps/other/kiel.txt
@@ -36,18 +36,18 @@ kh_school,71,74,0	warp	kh_school_06b	1,1,kh_school,35,184
 //============================================================
 // Kiel Hyre's Cottage (kh_vila)
 //============================================================
-kh_vila,79,11,0		warp	kh_vila_01	1,1,yuno_fild02,92,208
-kh_vila,71,38,0		warp	kh_vila_02a	1,1,kh_vila,42,38
-kh_vila,46,38,0		warp	kh_vila_02b	1,1,kh_vila,75,38
-kh_vila,71,54,0		warp	kh_vila_03a	1,1,kh_vila,42,54
-kh_vila,46,54,0		warp	kh_vila_03b	1,1,kh_vila,75,54
-kh_vila,34,66,0		warp	kh_vila_04a	1,1,kh_vila,20,108
+kh_vila,79,11,0	warp	kh_vila_01	1,1,yuno_fild02,92,208
+kh_vila,71,38,0	warp	kh_vila_02a	1,1,kh_vila,42,38
+kh_vila,46,38,0	warp	kh_vila_02b	1,1,kh_vila,75,38
+kh_vila,71,54,0	warp	kh_vila_03a	1,1,kh_vila,42,54
+kh_vila,46,54,0	warp	kh_vila_03b	1,1,kh_vila,75,54
+kh_vila,34,66,0	warp	kh_vila_04a	1,1,kh_vila,20,108
 kh_vila,20,103,0	warp	kh_vila_04b	1,1,kh_vila,34,61
-kh_vila,84,66,0		warp	kh_vila_05a	1,1,kh_vila,44,107
+kh_vila,84,66,0	warp	kh_vila_05a	1,1,kh_vila,44,107
 kh_vila,44,103,0	warp	kh_vila_05b	1,1,kh_vila,84,62
 kh_vila,32,128,0	warp	kh_vila_06a	1,1,kh_vila,23,171
 kh_vila,22,167,0	warp	kh_vila_06b	1,1,kh_vila,32,123
-kh_vila,90,47,0		warp	kh_vila_07a	1,1,kh_vila,119,47
+kh_vila,90,47,0	warp	kh_vila_07a	1,1,kh_vila,119,47
 kh_vila,115,47,0	warp	kh_vila_07b	1,1,kh_vila,85,47
 kh_vila,126,75,0	warp	kh_vila_08a	1,1,kh_vila,180,176
 kh_vila,180,171,0	warp	kh_vila_08b	1,1,kh_vila,126,70