9 files changed, 0 insertions, 636 deletions
diff --git a/npc/re/warps/cities/brasilis.txt b/npc/re/warps/cities/brasilis.txt
deleted file mode 100644
index 289ab235d..000000000
--- a/npc/re/warps/cities/brasilis.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-//===== Hercules Script ======================================
-//= Brasilis Town Warps Script
-//===== By: ==================================================
-//= L0ne_W0lf
-//===== Current Version: =====================================
-//= 1.2
-//===== Description: =========================================
-//= [Official Conversion]
-//= Warp Points for Brasilis
-//===== Additional Comments: =================================
-//= 1.0 First version.
-//= 1.1 Fixed warps according to official. [Protimus]
-//= 1.1a Added Field warp according to official. [Jguy]
-//= 1.2 Added missing warps & removed duplicated one. [Daegaladh]
-//============================================================
-
-//Museum
-brasilis,146,162,0	warp	brasilis_bra_in01	1,1,bra_in01,17,137
-bra_in01,17,134,0	warp	bra_in01_brasilis	1,1,brasilis,148,161
-bra_in01,50,145,0	warp	bra_in01_bra_in01#2	1,1,bra_in01,81,143
-bra_in01,79,142,0	warp	bra_in01_bra_in01#3	1,1,bra_in01,47,144
-bra_in01,50,171,0	warp	bra_in01_bra_in01#4	1,1,bra_in01,82,168
-bra_in01,79,169,0	warp	bra_in01_bra_in01#5	1,1,bra_in01,46,170
-bra_in01,138,174,0	warp	bra_in01_bra_in01#6	1,1,bra_in01,12,183
-bra_in01,206,98,0	warp	bra_in01_bra_in01#7	1,1,bra_in01,138,176
-
-//Inn
-brasilis,274,153,0	warp	brasilis_bra_in01#1	1,1,bra_in01,38,9
-bra_in01,39,7,0	warp	bra_in01_brasilis#1	1,1,brasilis,273,151
-bra_in01,52,27,0	warp	bra_in01_bra_in01#8	1,1,bra_in01,85,26
-bra_in01,83,27,0	warp	bra_in01_bra_in01#9	1,1,bra_in01,50,27
-bra_in01,9,67,0	warp	bra_in01_bra_in01#10	1,1,bra_in01,154,22
-bra_in01,156,23,0	warp	bra_in01_bra_in01#11	1,1,bra_in01,11,65
-bra_in01,52,67,0	warp	bra_in01_bra_in01#12	1,1,bra_in01,87,66
-bra_in01,85,67,0	warp	bra_in01_bra_in01#13	1,1,bra_in01,50,66
-bra_in01,31,29,0	warp	bra_in01_bra_in01#14	1,1,bra_in01,23,70
-bra_in01,25,70,0	warp	bra_in01_bra_in01#15	1,1,bra_in01,32,26
-bra_in01,31,74,0	warp	bra_in01_bra_in01#16	1,1,bra_in01,148,59
-bra_in01,148,57,0	warp	bra_in01_bra_in01#17	1,1,bra_in01,31,72
diff --git a/npc/re/warps/cities/dewata.txt b/npc/re/warps/cities/dewata.txt
deleted file mode 100644
index c134df537..000000000
--- a/npc/re/warps/cities/dewata.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-//===== Hercules Script ======================================
-//= Dewata Warp Script
-//===== By: ==================================================
-//= Chilly
-//===== Current Version: =====================================
-//= 1.2
-//===== Description: =========================================
-//= Warp Points for Dewata
-//===== Additional Comments: =================================
-//= 1.0 First version
-//= 1.1 Disabled warps that clash with quest warps. [Euphy]
-//= 1.2 Updated to match official scripts. [Lemongrass]
-//============================================================
-
-dewata,44,252,0	warp	dewata0001	1,1,dew_fild01,373,212
-dew_fild01,375,212,0	warp	dewata0002	1,1,dewata,46,251
-dew_fild01,57,273,0	warp	dewata0003	1,1,dew_in01,15,33
-dew_in01,16,31,0	warp	dewata0004	1,1,dew_fild01,59,273
-dew_fild01,48,65,0	warp	dewata0005	1,1,dew_dun02,302,30
-dew_dun02,305,30,0	warp	dewata0006	1,1,dew_fild01,50,65
diff --git a/npc/re/warps/cities/dicastes.txt b/npc/re/warps/cities/dicastes.txt
deleted file mode 100644
index 1d1476830..000000000
--- a/npc/re/warps/cities/dicastes.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-//===== Hercules Script ======================================
-//= El Dicastes Warp Script
-//===== By: ==================================================
-//= Chilly, Muad_Dib
-//===== Current Version: =====================================
-//= 1.3
-//===== File Encoding ========================================
-//= CP-949 (EUC-KR compatible). Do NOT read/save it as UTF-8.
-//===== Description: =========================================
-//= Warp Points for El Dicastes
-//===== Additional Comments: =================================
-//= 1.0 First Version.
-//= 1.1 Added Elevators.
-//= 1.2 Removed a warp. [Joseph]
-//= 1.3 Updated to match official script. [Joseph]
-//============================================================
-
-// Town Warps
-dicastes01,283,285,0	warp	eldicastes0001	1,1,dic_in01,45,30
-dic_in01,45,28,0	warp	eldicastes0002	1,1,dicastes01,281,284
-dicastes01,163,297,0	warp	eldicastes0003	1,1,dic_in01,371,101
-dic_in01,372,99,0	warp	eldicastes0004	1,1,dicastes01,163,295
-dicastes01,94,259,0	warp	eldicastes0005	1,1,dic_in01,390,53
-dic_in01,390,55,0	warp	eldicastes0006	1,1,dicastes01,95,257
-dicastes01,136,103,0	warp	eldicastes0007	1,1,dic_in01,26,98
-dic_in01,26,96,0	warp	eldicastes0008	1,1,dicastes01,137,106
-dicastes01,255,175,0	warp	eldicastes0009	1,1,dic_in01,344,272
-dic_in01,342,271,0	warp	eldicastes0010	1,1,dicastes01,255,173
-dicastes01,198,353,0	warp	eldicastes0011	1,1,dicastes02,120,80
-dicastes02,120,77,0	warp	eldicastes0012	1,1,dicastes01,197,351
-dicastes02,120,237,0	warp	eldicastes0013	1,1,dic_in01,45,246
-dic_in01,45,244,0	warp	eldicastes0014	1,1,dicastes02,119,235
-dic_in01,299,248,0	warp	eldicastes0015	1,1,dic_in01,262,191
-
-dic_in01,242,182,0	script	#eldicastes0016	CLEAR_NPC,{
-	if (isequipped(2782)) select("Administrative Office");
-	else select("������");
-	warp "dic_in01",138,221;
-	end;
-}
-
-// Elevators
--	script	Elevator#main	-1,{
-	.@n = atoi(strnpcinfo(2));
-	.@eq = (isequipped(2782))?1:0;
-	if (.@n <= 4) {
-		.@m$ = (.@eq)?"Civil Services:Archive Room:Situation Room:Administrative Office":"�����:����:������:������";
-		setarray .@xy, 45,286,36,212,122,282,121,201;
-	}
-	else if (.@n <= 11) {
-		.@m$ = (.@eq)?"Residential Zone 1:Residential Zone 2:Residential Zone 3:Pub Burman Flone":"������ �� :������ �� :��� �� :���С�";
-		setarray .@xy, 42,115,110,108,178,108,260,115;
-	}
-	else if (.@n <= 13) {
-		.@m$ = (.@eq)?"Battle Station:Galten Quarters":"������ �� :������ �� ";
-		setarray .@xy, 385,272,385,208;
-	}
-	.@m = select(.@m$) - 1;
-	warp "dic_in01",.@xy[.@m*2],.@xy[.@m*2+1];
-	end;
-}
-dic_in01,46,288,0	duplicate(Elevator#main)	Elevator#1	CLEAR_NPC
-dic_in01,122,284,0	duplicate(Elevator#main)	Elevator#2	CLEAR_NPC
-dic_in01,121,203,0	duplicate(Elevator#main)	Elevator#3	CLEAR_NPC
-dic_in01,35,214,0	duplicate(Elevator#main)	Elevator#4	CLEAR_NPC
-dic_in01,44,116,0	duplicate(Elevator#main)	Elevator#5	CLEAR_NPC
-dic_in01,112,108,0	duplicate(Elevator#main)	Elevator#6	CLEAR_NPC
-dic_in01,180,108,0	duplicate(Elevator#main)	Elevator#7	CLEAR_NPC
-dic_in01,261,115,0	duplicate(Elevator#main)	Elevator#8	CLEAR_NPC
-dic_in01,57,48,0	duplicate(Elevator#main)	Elevator#9	CLEAR_NPC
-dic_in01,137,46,0	duplicate(Elevator#main)	Elevator#10	CLEAR_NPC
-dic_in01,222,46,0	duplicate(Elevator#main)	Elevator#11	CLEAR_NPC
-dic_in01,388,272,0	duplicate(Elevator#main)	Elevator#12	CLEAR_NPC
-dic_in01,389,208,0	duplicate(Elevator#main)	Elevator#13	CLEAR_NPC
diff --git a/npc/re/warps/cities/eclage.txt b/npc/re/warps/cities/eclage.txt
deleted file mode 100644
index 715e51935..000000000
--- a/npc/re/warps/cities/eclage.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-//===== Hercules Script ======================================
-//= Eclage Warp Script
-//===== By: ==================================================
-//= Chilly
-//===== Current Version: =====================================
-//= 1.1
-//===== Description: =========================================
-//= Warp Points for Eclage
-//===== Additional Comments: =================================
-//= 1.0 First Version.
-//= 1.0a Disabled quest warp. [Euphy]
-//= 1.1 Warps corresponds to official co-ordinates and
-//=	Warp Portal official names. [Dastgir]
-//============================================================
-
-// Town Warps
-ecl_fild01,207,72,0	warp	fild01-1_biffild	1,1,bif_fild02,294,350
-bif_fild02,292,351,0	warp	biffild_fild01-1	1,1,ecl_fild01,205,76
-//ecl_fild01,97,320,0	warp	eclage_field0003	1,1,eclage,100,28
-eclage,98,26,0	warp	eclageS_EclEnter	1,1,ecl_fild01,99,317
-eclage,299,309,0	warp	eclageN_in01s	1,1,ecl_in01,47,11
-ecl_in01,47,8,0	warp	in01s_eclageN	1,1,eclage,297,307
-ecl_in01,8,67,0	warp	in01w_hub1-1	1,1,ecl_hub01,38,94
-ecl_hub01,40,95,0	warp	hub1-1_in01w	1,1,ecl_in01,11,67
-ecl_hub01,22,109,0	warp	hub1-2_in02-1	1,1,ecl_in02,99,7
-ecl_in02,98,4,0	warp	in02-1_hub1-2	1,1,ecl_hub01,23,107
-ecl_in02,80,18,0	warp	in02-2_in02-3	1,1,ecl_in02,157,66
-ecl_in02,157,68,0	warp	in02-3_in02-2	1,1,ecl_in02,83,18
-ecl_in01,84,68,0	script	in01e_hub2-1	WARPNPC,1,1,{
-	end;
-OnTouch:
-	if (ep14_2_mylord == 29) {
-		warp "ecl_hub01",106,31;
-	}
-	else {
-		warp "ecl_hub01",107,107;
-	}
-end;
-}
-ecl_hub01,107,110,0	warp	hub2-1_in01e	1,1,ecl_in01,82,68
-ecl_hub01,127,95,0	warp	hub2-2_hub3-1	1,1,ecl_hub01,18,32
-ecl_hub01,18,34,0	script	hub3-1_hub2-2	WARPNPC,1,1,{
-	end;
-OnTouch:
-	if (ep14_2_mylord == 29) {
-		warp "ecl_hub01",135,14;
-	}
-	else {
-		warp "ecl_hub01",125,94;
-	}
-end;
-}
-ecl_hub01,40,14,0	warp	hub3-2_in03	1,1,ecl_in03,144,17
-ecl_in03,144,14,0	warp	in03_hub3-2	1,1,ecl_hub01,40,11
-ecl_hub01,105,36,0	warp	hub4-1_in01e	1,1,ecl_in01,82,68
-ecl_hub01,138,17,0	warp	hub4-2_hub3-1	1,1,ecl_hub01,18,32
diff --git a/npc/re/warps/cities/izlude.txt b/npc/re/warps/cities/izlude.txt
deleted file mode 100644
index 8bf26e31d..000000000
--- a/npc/re/warps/cities/izlude.txt
+++ /dev/null
@@ -1,90 +0,0 @@
-//===== Hercules Script ======================================
-//= Izlude Warp Script
-//===== By: ==================================================
-//= Athena (1.0), Nana (1.1)
-//===== Current Version: =====================================
-//= 1.8
-//===== Description: =========================================
-//= Warp Points for Izlude
-//===== Additional Comments: =================================
-//= 1.3 Added warps to Izlude Airship [Justin84]
-//= 1.4 Minor correction on airport warps
-//= 1.5 Updated to match the new Izlude Map. [Masao]
-//= 1.6 Added new warps. [Streusel]
-//= 1.7 Updated to match the official scripts. [Euphy]
-//= 1.8 Added Izlude & Prontera Field 8 duplicates. [Euphy]
-//============================================================
-
-//= Izlude City ==============================================
-prt_fild08,371,212,0	warp	prtf005	3,3,izlude,24,98
-izlude,20,98,0	warp	iz001	3,3,prt_fild08,367,212
-izlude_in,116,46,0	warp	iz02-1	3,2,izlude,128,98
-izlude,110,182,0	warp	iz01	2,2,izlude_in,65,87
-izlude_in,65,84,0	warp	iz01-1	2,2,izlude,112,179
-izlude,52,172,0	warp	iz04	2,2,izlude_in,74,161
-izlude_in,74,158,0	warp	iz04-1	3,2,izlude,52,168
-izlude_in,43,169,0	warp	w219	2,3,izlude_in,63,169
-izlude_in,87,169,0	warp	iz05-1	2,3,izlude_in,111,169
-izlude_in,108,169,0	warp	iz05	2,3,izlude_in,84,169
-izlude_in,148,127,0	warp	iz03-1	2,5,izlude,210,161
-izlude_in,172,139,0	warp	iz07	3,2,izlude_in,172,161
-izlude_in,172,158,0	warp	iz07-1	3,2,izlude_in,172,136
-izlude_in,172,116,0	warp	iz06-1	3,2,izlude_in,172,94
-izlude_in,171,97,0	warp	iz06	3,2,izlude_in,172,119
-
-//= Izlude & Prontera Field 8 Duplicates =====================
-prt_fild08a,371,212,0	warp	prtf005_a	3,3,izlude_a,24,98
-prt_fild08b,371,212,0	warp	prtf005_b	3,3,izlude_b,24,98
-prt_fild08c,371,212,0	warp	prtf005_c	3,3,izlude_c,24,98
-prt_fild08d,371,212,0	warp	prtf005_d	3,3,izlude_d,24,98
-izlude_a,20,98,0	warp	iz001_a	3,3,prt_fild08a,367,212
-izlude_b,20,98,0	warp	iz001_b	3,3,prt_fild08b,367,212
-izlude_c,20,98,0	warp	iz001_c	3,3,prt_fild08c,367,212
-izlude_d,20,98,0	warp	iz001_d	3,3,prt_fild08d,367,212
-izlude_a,110,182,0	warp	iz01_a	2,2,izlude_in,65,87
-izlude_b,110,182,0	warp	iz01_b	2,2,izlude_in,65,87
-izlude_c,110,182,0	warp	iz01_c	2,2,izlude_in,65,87
-izlude_d,110,182,0	warp	iz01_d	2,2,izlude_in,65,87
-izlude_a,52,172,0	warp	iz04_a	2,2,izlude_in,74,161
-izlude_b,52,172,0	warp	iz04_b	2,2,izlude_in,74,161
-izlude_c,52,172,0	warp	iz04_c	2,2,izlude_in,74,161
-izlude_d,52,172,0	warp	iz04_d	2,2,izlude_in,74,161
-
-//= Izlude Academy ===========================================
-izlude,125,257,0	warp	#to_ac01	2,2,iz_ac01,99,29
-izlude,130,257,0	warp	#to_ac02	2,2,iz_ac01,99,29
-iz_ac01,100,24,0	warp	#to_ac01-1	2,2,izlude,127,253
-iz_ac01,78,25,0	warp	#to_ac2f01	2,2,iz_ac02,104,27
-iz_ac01,122,25,0	warp	#to_ac2f02	2,2,iz_ac02,104,27
-iz_ac02,94,27,0	warp	#to_ac1f01	2,2,iz_ac01,78,28
-iz_ac02,113,27,0	warp	#to_ac1f02	2,2,iz_ac01,122,28
-
-//= Izlude Academy Duplicates ================================
-izlude_a,125,257,0	warp	#to_ac01_a	2,2,iz_ac01_a,99,29
-izlude_b,125,257,0	warp	#to_bc01_b	2,2,iz_ac01_b,99,29
-izlude_c,125,257,0	warp	#to_cc01_c	2,2,iz_ac01_c,99,29
-izlude_d,125,257,0	warp	#to_dc01_d	2,2,iz_ac01_d,99,29
-izlude_a,130,257,0	warp	#to_ac02_a	2,2,iz_ac01_a,99,29
-izlude_b,130,257,0	warp	#to_bc02_b	2,2,iz_ac01_b,99,29
-izlude_c,130,257,0	warp	#to_cc02_c	2,2,iz_ac01_c,99,29
-izlude_d,130,257,0	warp	#to_dc02_d	2,2,iz_ac01_d,99,29
-iz_ac01_a,100,24,0	warp	#to_ac01-1_a	2,2,izlude_a,127,253
-iz_ac01_b,100,24,0	warp	#to_bc01-1_b	2,2,izlude_b,127,253
-iz_ac01_c,100,24,0	warp	#to_cc01-1_c	2,2,izlude_c,127,253
-iz_ac01_d,100,24,0	warp	#to_dc01-1_d	2,2,izlude_d,127,253
-iz_ac01_a,78,25,0	warp	#to_ac2f01_a	2,2,iz_ac02_a,104,27
-iz_ac01_b,78,25,0	warp	#to_bc2f01_b	2,2,iz_ac02_b,104,27
-iz_ac01_c,78,25,0	warp	#to_cc2f01_c	2,2,iz_ac02_c,104,27
-iz_ac01_d,78,25,0	warp	#to_dc2f01_d	2,2,iz_ac02_d,104,27
-iz_ac01_a,122,25,0	warp	#to_ac2f02_a	2,2,iz_ac02_a,104,27
-iz_ac01_b,122,25,0	warp	#to_bc2f02_b	2,2,iz_ac02_b,104,27
-iz_ac01_c,122,25,0	warp	#to_cc2f02_c	2,2,iz_ac02_c,104,27
-iz_ac01_d,122,25,0	warp	#to_dc2f02_d	2,2,iz_ac02_d,104,27
-iz_ac02_a,94,27,0	warp	#to_ac1f01_a	2,2,iz_ac01_a,78,28
-iz_ac02_b,94,27,0	warp	#to_bc1f01_b	2,2,iz_ac01_b,78,28
-iz_ac02_c,94,27,0	warp	#to_cc1f01_c	2,2,iz_ac01_c,78,28
-iz_ac02_d,94,27,0	warp	#to_dc1f01_d	2,2,iz_ac01_d,78,28
-iz_ac02_a,113,27,0	warp	#to_ac1f02_a	2,2,iz_ac01_a,122,28
-iz_ac02_b,113,27,0	warp	#to_bc1f02_b	2,2,iz_ac01_b,122,28
-iz_ac02_c,113,27,0	warp	#to_cc1f02_c	2,2,iz_ac01_c,122,28
-iz_ac02_d,113,27,0	warp	#to_dc1f02_d	2,2,iz_ac01_d,122,28
diff --git a/npc/re/warps/cities/malangdo.txt b/npc/re/warps/cities/malangdo.txt
deleted file mode 100644
index 501c9e85b..000000000
--- a/npc/re/warps/cities/malangdo.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-//===== Hercules Script =======================================
-//= Malangdo Island Warp Script
-//===== By: ==================================================
-//= Chilly
-//===== Current Version: =====================================
-//= 1.1
-//===== Description: =========================================
-//= Warp Points for Malangdo Island
-//===== Additional Comments: =================================
-//= 1.0 First version
-//= 1.1 Updated warps. [Euphy]
-//============================================================
-
-// Town Warps
-malangdo,240,150,0	warp	malangdo0001	1,1,mal_in01,11,17
-mal_in01,9,16,0	warp	malangdo0002	1,1,malangdo,238,149
-mal_in01,20,15,0	warp	malangdo0003	1,1,mal_in01,65,11
-mal_in01,67,12,0	warp	malangdo0004	1,1,mal_in01,20,13
-malangdo,112,167,0	warp	malangdo0005	1,1,mal_in01,17,163
-mal_in01,18,161,0	warp	malangdo0006	1,1,malangdo,115,166
-mal_in01,18,173,0	warp	malangdo0007	1,1,mal_in01,72,173
-mal_in01,75,174,0	warp	malangdo0008	1,1,mal_in01,18,171
-mal_in01,73,170,0	warp	malangdo0009	1,1,mal_in01,124,172
-mal_in01,124,175,0	warp	malangdo0010	1,1,mal_in01,70,170
-malangdo,113,151,0	warp	malangdo0011	1,1,mal_in01,28,118
-mal_in01,30,119,0	warp	malangdo0012	1,1,malangdo,115,150
-mal_in01,20,119,0	warp	malangdo0013	1,1,mal_in01,65,117
-mal_in01,67,118,0	warp	malangdo0014	1,1,mal_in01,20,117
-malangdo,119,137,0	warp	malangdo0015	1,1,mal_in01,36,216
-mal_in01,38,217,0	warp	malangdo0016	1,1,malangdo,121,138
-mal_in01,11,218,0	warp	malangdo0017	1,1,mal_in01,75,220
-mal_in01,75,222,0	warp	malangdo0018	1,1,mal_in01,12,221
-mal_in01,79,219,0	warp	malangdo0019	1,1,mal_in01,140,216
-mal_in01,140,213,0	warp	malangdo0020	1,1,mal_in01,80,216
-malangdo,135,109,0	warp	malangdo0021	1,1,mal_in01,19,76
-mal_in01,18,78,0	warp	malangdo0022	1,1,malangdo,135,111
-mal_in01,18,67,0	warp	malangdo0023	1,1,mal_in01,65,65
-mal_in01,67,66,0	warp	malangdo0024	1,1,mal_in01,20,67
-malangdo,135,276,0	warp	malangdo0025	1,1,mal_in01,164,15
-mal_in01,163,13,0	warp	malangdo0026	1,1,malangdo,135,274
-malangdo,73,239,0	warp	malangdo0027	1,1,mal_dun01,33,230
-mal_dun01,30,230,0	warp	malangdo0028	1,1,malangdo,75,236
-
-// Ship Warps
-malangdo,162,163,0	warp	malangdo_ship0001	1,1,mal_in02,58,61
-mal_in02,60,61,0	warp	malangdo_ship0002	1,1,malangdo,164,163
-mal_in02,51,60,0	warp	malangdo_ship0003	1,1,mal_in02,31,60
-mal_in02,34,60,0	warp	malangdo_ship0004	1,1,mal_in02,53,59
-mal_in02,63,53,0	warp	malangdo_ship0005	1,1,mal_in02,63,33
-mal_in02,63,35,0	warp	malangdo_ship0006	1,1,mal_in02,64,55
-mal_in02,63,66,0	warp	malangdo_ship0007	1,1,mal_in02,63,89
-mal_in02,64,87,0	warp	malangdo_ship0008	1,1,mal_in02,63,64
-mal_in02,101,53,0	warp	malangdo_ship0009	1,1,mal_in02,101,33
-mal_in02,101,35,0	warp	malangdo_ship0010	1,1,mal_in02,102,55
-mal_in02,101,66,0	warp	malangdo_ship0011	1,1,mal_in02,101,89
-mal_in02,102,87,0	warp	malangdo_ship0012	1,1,mal_in02,101,64
-mal_in02,137,53,0	warp	malangdo_ship0013	1,1,mal_in02,139,33
-mal_in02,139,35,0	warp	malangdo_ship0014	1,1,mal_in02,138,55
-mal_in02,137,66,0	warp	malangdo_ship0015	1,1,mal_in02,139,89
-mal_in02,140,87,0	warp	malangdo_ship0016	1,1,mal_in02,137,64
-mal_in02,142,60,0	warp	malangdo_ship0017	1,1,mal_in02,162,61
-mal_in02,159,61,0	warp	malangdo_ship0018	1,1,mal_in02,140,59
diff --git a/npc/re/warps/cities/malaya.txt b/npc/re/warps/cities/malaya.txt
deleted file mode 100644
index d6102dc48..000000000
--- a/npc/re/warps/cities/malaya.txt
+++ /dev/null
@@ -1,146 +0,0 @@
-//===== Hercules Script ======================================
-//= Port Malaya Warp Script
-//===== By: ==================================================
-//= Chilly
-//===== Current Version: =====================================
-//= 1.2
-//===== Description: =========================================
-//= Warp Points for Port Malaya
-//===== Additional Comments: =================================
-//= 1.0 First Version.
-//= 1.1 Updated to match official scripts. [Masao]
-//= 1.2 Added official Jeepney warp scripts. [Euphy]
-//============================================================
-
-// Town Warps
-//============================================================
-ma_in01,86,16,0	warp	mal_in_ws	1,1,malaya,115,212
-ma_in01,24,77,0	warp	mal_in_inn	1,1,malaya,178,208
-malaya,370,277,0	warp	malaya_mal_fild01	1,1,ma_fild01,40,272
-ma_fild01,37,272,0	warp	mal_fild01_malaya	1,1,malaya,367,277
-ma_in01,33,152,0	warp	mal_in_house01	1,1,malaya,52,75
-malaya,309,70,0	warp	malaya_ship_mal_in_ship	1,1,ma_in01,108,92
-ma_in01,105,92,0	warp	mal_in_ship_malaya_ship	1,1,malaya,310,67
-ma_fild01,266,359,0	warp	mafild01_to02	1,1,ma_fild02,248,36
-ma_fild02,248,33,0	warp	mafild02_to01	1,1,ma_fild01,266,356
-ma_fild01,288,52,0	warp	mafild01_tobknw	1,1,ma_scene01,142,78
-ma_scene01,140,80,0	warp	bknw_tofild01	1,1,ma_fild01,288,55
-ma_in01,9,24,0	warp	mal_in_ts	1,1,malaya,296,167
-ma_in01,126,17,0	warp	mal_in_shop_malaya_shop	1,1,malaya,261,237
-ma_fild01,251,190,0	warp	mf_minga_mf_in_minga	1,1,ma_in01,108,160
-ma_in01,105,160,0	warp	mf_in_minga_mf_minga	1,1,ma_fild01,248,190
-
-// Locked Warps
-//============================================================
-malaya,178,211,0	script	malaya_inn	WARPNPC,1,1,{
-	end;
-OnTouch:
-	if (malaya_hi < 10) {
-		mes "Door is closed. It seems to be keeping its eyes on you.";
-		close;
-	}
-	warp "ma_in01",24,80;
-	end;
-}
-
-malaya,112,212,0	script	malaya_ws	WARPNPC,1,1,{
-	end;
-OnTouch:
-	if (malaya_hi < 20) {
-		mes "Door is closed. It seems to be keeping its eyes on you.";
-		close;
-	}
-	warp "ma_in01",83,16;
-	end;
-}
-
-malaya,299,167,0	script	malaya_ts	WARPNPC,1,1,{
-	end;
-OnTouch:
-	if (malaya_hi < 20) {
-		mes "Door is closed. It seems to be keeping its eyes on you.";
-		close;
-	}
-	warp "ma_in01",12,24;
-	end;
-}
-
-malaya,261,240,0	script	malaya_shop	WARPNPC,1,1,{
-	end;
-OnTouch:
-	if (malaya_hi < 20) {
-		mes "Door is closed. It seems to be keeping its eyes on you.";
-		close;
-	}
-	warp "ma_in01",126,20;
-	end;
-}
-
-malaya,300,211,0	script	malaya_house01	WARPNPC,1,1,{
-	end;
-OnTouch:
-	if (malaya_hi < 10) {
-		mes "Door is closed. It seems to be keeping its eyes on you.";
-		close;
-	}
-	warp "ma_in01",36,152;
-	end;
-}
-
-// Jeepney Warps
-//============================================================
-function	script	F_Malaya_Warp	{
-	mes "Where would you like to go?";
-	next;
-	.@i$ = getarg(select("Back outside",getarg(1)+" Jeepney",getarg(2)+" Jeepney") - 1);
-	close2;
-	switch(getarg(3)) {
-	case 1: // 12 passenger
-		if (.@i$ == "Center")
-			warp "malaya",241,238;
-		if (.@i$ == "Southwest")
-			warp "malaya",71,43;
-		else if (.@i$ == "Southeast")
-			warp "malaya",284,129;
-		break;
-	case 2: // 30 passenger
-		if (.@i$ == "Northwest")
-			warp "malaya",134,247;
-		else if (.@i$ == "Southeast")
-			warp "malaya",341,150;
-		else if (.@i$ == "Northeast")
-			warp "malaya",294,293;
-		break;
-	case 3: // 60 passenger
-		if (.@i$ == "Center")
-			warp "malaya",239,221;
-		else if (.@i$ == "Northwest")
-			warp "malaya",59,246;
-		else if (.@i$ == "Southeast")
-			warp "malaya",254,68;
-		break;
-	}
-	end;
-}
-
-ma_zif01,30,22,0	script	Town Warp#zif01	WARPNPC,1,1,{ callfunc "F_Malaya_Warp","Center","Southwest","Southeast",1; }
-ma_zif02,30,22,0	script	Town Warp#zif02	WARPNPC,1,1,{ callfunc "F_Malaya_Warp","Southwest","Center","Southeast",1; }
-ma_zif03,30,22,0	script	Town Warp#zif03	WARPNPC,1,1,{ callfunc "F_Malaya_Warp","Southeast","Center","Southwest",1; }
-
-ma_zif04,30,22,0	script	Town Warp#zif04	WARPNPC,1,1,{ callfunc "F_Malaya_Warp","Northwest","Southeast","Northeast",2; }
-ma_zif05,30,22,0	script	Town Warp#zif05	WARPNPC,1,1,{ callfunc "F_Malaya_Warp","Southeast","Northwest","Northeast",2; }
-ma_zif06,30,22,0	script	Town Warp#zif06	WARPNPC,1,1,{ callfunc "F_Malaya_Warp","Northeast","Northwest","Southeast",2; }
-
-ma_zif07,30,22,0	script	Town Warp#zif07	WARPNPC,1,1,{ callfunc "F_Malaya_Warp","Center","Northwest","Southeast",3; }
-ma_zif08,30,22,0	script	Town Warp#zif08	WARPNPC,1,1,{ callfunc "F_Malaya_Warp","Northwest","Center","Southeast",3; }
-ma_zif09,30,22,0	script	Town Warp#zif09	WARPNPC,1,1,{ callfunc "F_Malaya_Warp","Southeast","Center","Northwest",3; }
-
-//ma_zif01,30,22,0	warp	malaya_car0001	1,1,malaya,241,238
-//ma_zif02,30,22,0	warp	malaya_car0002	1,1,malaya,71,43
-//ma_zif03,30,22,0	warp	malaya_car0003	1,1,malaya,284,129
-//ma_zif04,30,22,0	warp	malaya_car0004	1,1,malaya,134,247
-//ma_zif05,30,22,0	warp	malaya_car0005	1,1,malaya,341,150
-//ma_zif06,30,22,0	warp	malaya_car0006	1,1,malaya,294,293
-//ma_zif07,30,22,0	warp	malaya_car0007	1,1,malaya,239,221
-//ma_zif08,30,22,0	warp	malaya_car0008	1,1,malaya,59,246
-//ma_zif09,30,22,0	warp	malaya_car0009	1,1,malaya,254,68
diff --git a/npc/re/warps/cities/rachel.txt b/npc/re/warps/cities/rachel.txt
deleted file mode 100644
index 9ec33e229..000000000
--- a/npc/re/warps/cities/rachel.txt
+++ /dev/null
@@ -1,124 +0,0 @@
-//===== Hercules Script ======================================
-//= Rachel Warp Script
-//===== By: ==================================================
-//= erKURITA & RockmanEXE
-//===== Current Version: =====================================
-//= 1.5
-//===== Description: =========================================
-//= Warp Points for Rachel City, shops & other locations
-//===== Additional Comments: =================================
-//= 1.0 Added the official warps and commented out the
-//= 	  "custom duplicates" for future checkout. Special thanks
-//= 	  to RockmanEXE who provided all the info. [erKURITA]
-//= 1.1 Added warp to Veins Field [Playtester]
-//= 1.2 Fully official rachel warps [Playtester]
-//= 1.2a Added missing warp (Pope's office entryway -> temple) [L0ne_W0lf]
-//= 1.3 Updated Rachel -> Veins Field warp. [L0ne_W0lf]
-//= 1.4 Disabled rachel33, moved to quest_rachel.txt [L0ne_W0lf]
-//= 1.5 Renewal warp adjustments.
-//============================================================
-
-rachel,150,249,0	warp	rachel01	1,1,ra_temple,120,30
-
-rachel,81,33,0	warp	rachel02	1,1,ra_in01,237,198
-rachel,61,33,0	warp	rachel03	1,1,ra_in01,181,198
-rachel,217,55,0	warp	rachel04	1,1,ra_in01,250,34
-rachel,179,220,0	warp	rachel05	1,1,ra_in01,295,352
-rachel,103,240,0	warp	rachel06	1,1,ra_in01,343,193
-rachel,216,160,0	warp	rachel07	1,1,ra_in01,135,282
-rachel,42,87,0	warp	rachel08	1,1,ra_in01,171,359
-rachel,42,109,0	warp	rachel09	1,1,ra_in01,171,388
-rachel,83,78,0	warp	rachel10	1,1,ra_in01,249,266
-rachel,115,149,0	warp	rachel11	1,1,ra_in01,386,43
-rachel,90,189,0	warp	rachel12	1,1,ra_in01,192,148
-rachel,108,200,0	warp	rachel13	1,1,ra_in01,213,83
-
-ra_in01,188,189,0	warp	rachel14	1,1,ra_in01,263,144
-ra_in01,296,144,0	warp	rachel15	1,1,ra_in01,235,189
-ra_in01,175,189,0	warp	rachel16	1,1,ra_in01,132,189
-ra_in01,244,189,0	warp	rachel17	1,1,ra_in01,291,189
-ra_in01,235,21,0	warp	rachel18	1,1,ra_in01,187,31
-ra_in01,312,374,0	warp	rachel19	1,1,ra_in01,359,374
-ra_in01,291,371,0	warp	rachel20	1,1,ra_in01,225,380
-ra_in01,381,200,0	warp	rachel21	1,1,ra_in01,377,268
-ra_in01,367,255,0	warp	rachel22	1,1,ra_in01,326,296
-ra_in01,319,303,0	warp	rachel23	1,1,ra_in01,381,320
-ra_in01,178,370,0	warp	rachel24	1,1,ra_in01,113,385
-ra_in01,165,369,0	warp	rachel25	1,1,ra_in01,122,334
-ra_in01,241,299,0	warp	rachel26	1,1,ra_in01,193,312
-ra_in01,185,303,0	warp	rachel27	1,1,ra_in01,194,249
-ra_in01,357,61,0	warp	rachel28	1,1,ra_in01,310,62
-ra_in01,297,59,0	warp	rachel29	1,1,ra_in01,339,116
-
-ra_temin,130,93,0	warp	rachel30	1,1,ra_temin,239,258
-ra_temin,206,93,0	warp	rachel31	1,1,ra_temin,312,258
-ra_temin,275,332,0	warp	rachel32	1,1,ra_temin,27,305
-
-//ra_temin,275,226,0	warp	rachel33	1,1,ra_temsky,99,11
-
-ra_temsky,99,118,0	warp	rachel34	1,1,ra_temsky,99,140
-ra_temsky,112,143,0	warp	rachel35	1,1,ra_temsky,141,139
-ra_temsky,87,143,0	warp	rachel36	1,1,ra_temsky,58,139
-
-ra_temple,120,22,0	warp	rachel37	1,1,rachel,150,243
-
-ra_in01,237,202,0	warp	rachel38	1,1,rachel,81,38
-ra_in01,181,202,0	warp	rachel39	1,1,rachel,61,38
-ra_in01,250,38,0	warp	rachel40	1,1,rachel,217,60
-ra_in01,295,348,0	warp	rachel41	1,1,rachel,179,215
-ra_in01,339,193,0	warp	rachel42	1,1,rachel,98,238
-ra_in01,135,286,0	warp	rachel43	1,1,rachel,216,164
-ra_in01,171,355,0	warp	rachel44	1,1,rachel,42,82
-ra_in01,172,392,0	warp	rachel45	1,1,rachel,42,114
-ra_in01,249,262,0	warp	rachel46	1,1,rachel,83,73
-ra_in01,386,39,0	warp	rachel47	1,1,rachel,115,144
-ra_in01,192,152,0	warp	rachel48	1,1,rachel,90,193
-ra_in01,213,79,0	warp	rachel49	1,1,rachel,108,195
-
-ra_in01,259,144,0	warp	rachel50	1,1,ra_in01,184,189
-ra_in01,231,189,0	warp	rachel51	1,1,ra_in01,292,144
-ra_in01,136,189,0	warp	rachel52	1,1,ra_in01,179,189
-ra_in01,287,189,0	warp	rachel53	1,1,ra_in01,240,189
-ra_in01,183,31,0	warp	rachel54	1,1,ra_in01,239,21
-ra_in01,355,374,0	warp	rachel55	1,1,ra_in01,308,374
-ra_in01,221,380,0	warp	rachel56	1,1,ra_in01,287,371
-ra_in01,381,268,0	warp	rachel57	1,1,ra_in01,387,200
-ra_in01,330,296,0	warp	rachel58	1,1,ra_in01,371,255
-ra_in01,381,324,0	warp	rachel59	1,1,ra_in01,319,299
-ra_in01,109,385,0	warp	rachel60	1,1,ra_in01,174,370
-ra_in01,126,334,0	warp	rachel61	1,1,ra_in01,169,369
-ra_in01,197,312,0	warp	rachel62	1,1,ra_in01,245,299
-ra_in01,194,245,0	warp	rachel63	1,1,ra_in01,190,302
-ra_in01,314,62,0	warp	rachel64	1,1,ra_in01,361,61
-ra_in01,339,120,0	warp	rachel65	1,1,ra_in01,297,63
-
-ra_temin,169,18,0	warp	rachel66	1,1,ra_temple,119,175
-
-ra_temin,239,253,0	warp	rachel67	1,1,ra_temin,130,88
-ra_temin,312,253,0	warp	rachel68	1,1,ra_temin,206,88
-ra_temin,27,299,0	warp	rachel69	1,1,ra_temin,275,328
-
-ra_temsky,99,8,0	warp	rachel70	1,1,ra_temin,275,231
-
-ra_temsky,99,135,0	warp	rachel71	1,1,ra_temsky,99,113
-ra_temsky,137,139,0	warp	rachel72	1,1,ra_temsky,109,143
-ra_temsky,62,139,0	warp	rachel73	1,1,ra_temsky,91,143
-
-//rachel,25,125,0	warp	rachel74	1,1,ra_fild11,353,226
-rachel,275,125,0	warp	rachel75	1,1,ra_fild12,40,226
-rachel,130,21,0	warp	rachel76	1,1,ve_fild02,195,377
-
-que_rachel,130,93,0	warp	rachel77	1,1,que_rachel,239,258
-que_rachel,206,93,0	warp	rachel78	1,1,que_rachel,312,258
-que_rachel,275,332,0	warp	rachel79	1,1,que_rachel,27,305
-que_rachel,239,253,0	warp	rachel80	1,1,que_rachel,130,88
-que_rachel,312,253,0	warp	rachel81	1,1,que_rachel,206,88
-que_rachel,27,299,0	warp	rachel82	1,1,que_rachel,275,328
-
-ra_in01,309,70,0	warp	rachel83	1,1,rachel,108,175
-rachel,105,171,0	warp	rachel84	1,1,ra_in01,309,65
-ra_in01,375,109,0	warp	rachel85	1,1,rachel,116,154
-rachel,116,158,0	warp	rachel86	1,1,ra_in01,375,114
-
-//Additional Temple warp
-ra_temin,275,243,0	warp	rachel87	1,1,ra_temin,131,131
diff --git a/npc/re/warps/cities/yggdrasil.txt b/npc/re/warps/cities/yggdrasil.txt
deleted file mode 100644
index 72004882a..000000000
--- a/npc/re/warps/cities/yggdrasil.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-//===== Hercules Script ======================================
-//= Yggdrasil Tree Warp Script
-//===== By: ==================================================
-//= PKGINGO (1.0)
-//===== Current Version: =====================================
-//= 1.1
-//===== Description: =========================================
-//= Warp Points for Yggdrasil Tree
-//===== Additional Comments: =================================
-//= Extracted from Vidar -> Athena
-//= 1.1 Renewal warp adjustments.
-//============================================================
-
-//Umbala Entrance
-//um_dun02,125,163,0	warp	nwarp1	1,1,yggdrasil01,40,63
-
-// RE Yggdrasil Entrance
-umbala,106,285,1	warp	ygGate_yg1	1,1,yggdrasil01,39,63
-
-//Niflheim Exit
-yggdrasil01,249,262,0	warp	nwarp5	1,1,nif_fild01,315,66
-
-//Yggdrasil Tree
-yggdrasil01,271,51,0	warp	nwarp3	1,1,yggdrasil01,26,196
-yggdrasil01,26,193,0	warp	nwarp4	1,1,yggdrasil01,269,53