Okie ladies and gentleman if this commit breaks anything it's jman's and maki's fault, yes, blame them.

Fixing pre-re / re npc support, moving /config/ folder to src root so other servers may also make use of the #define renewal dir and other stuff.

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

106 files changed, 6797 insertions, 0 deletions

diff --git a/npc/pre-re/warps/cities/alberta.txt b/npc/pre-re/warps/cities/alberta.txt
new file mode 100644
index 000000000..66e3ce6eb
--- /dev/null
+++ b/npc/pre-re/warps/cities/alberta.txt
@@ -0,0 +1,58 @@
+//===== rAthena Script =======================================
+//= Alberta Warp Script
+//===== By: ==================================================
+//= Athena (1.0)
+//= Nana (1.1)
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Alberta, Treasure Island & Turtle Island
+//===== Additional Comments: =================================
+//= No comment!
+//============================================================
+
+//Alberta City
+alberta,15,234,0	warp	alb001	2,5,pay_fild03,388,63
+alberta,117,38,0	warp	alb01	2,2,alberta_in,180,30
+alberta,134,38,0	warp	alb02	1,1,alberta_in,70,141
+alberta,170,170,0	warp	alb03	1,1,alb_ship,26,168
+alberta,178,165,0	warp	alb04	1,2,alb_ship,39,163
+alberta,209,173,0	warp	alb05	1,2,alb_ship,162,171
+alberta,33,42,0	warp	alb06	2,2,alberta_in,74,44
+alberta,65,233,0	warp	alb07	2,2,alberta_in,18,141
+alberta,93,205,0	warp	alb08	2,2,alberta_in,114,134
+alberta,98,153,0	warp	alb09	2,2,alberta_in,185,89
+alberta,99,221,0	warp	alb10	2,2,alberta_in,122,161
+alb_ship,26,166,0	warp	alb03-1	4,1,alberta,170,168
+alb_ship,41,163,0	warp	alb04-1	1,3,alberta,180,165
+alb_ship,160,171,0	warp	alb05-1	1,3,alberta,207,173
+alb_ship,37,174,0	warp	alb20	1,2,alb_ship,70,99
+alb_ship,68,99,0	warp	alb20-1	1,3,alb_ship,35,173
+alberta_in,189,89,0	warp	alb09-1	2,2,alberta,102,153
+alberta_in,114,130,0	warp	alb08-1	2,2,alberta,93,201
+alberta_in,14,141,0	warp	alb07-1	2,3,alberta,61,233
+alberta_in,180,34,0	warp	alb01-1	2,2,alberta,117,42
+alberta_in,73,141,0	warp	alb02-1	2,3,alberta,137,37
+alberta_in,78,44,0	warp	alb06-1	2,5,alberta,37,41
+alberta_in,125,161,0	warp	alb10-1	2,2,alberta,102,222
+alberta_in,114,183,0	warp	alb11	1,1,alberta_in,148,186
+alberta_in,152,186,0	warp	alb11-1	1,1,alberta_in,118,183
+alberta_in,114,49,0	warp	alb12	2,2,alberta_in,155,153
+alberta_in,159,153,0	warp	alb12-1	2,2,alberta_in,117,49
+alberta_in,114,97,0	warp	alb13	2,2,alberta_in,155,175
+alberta_in,159,175,0	warp	alb13-1	2,2,alberta_in,117,97
+alberta_in,22,113,0	warp	alb14	3,2,alberta_in,22,134
+alberta_in,22,130,0	warp	alb14-1	3,2,alberta_in,22,109
+alberta_in,22,153,0	warp	alb15	3,2,alberta_in,22,174
+alberta_in,22,170,0	warp	alb15-1	3,2,alberta_in,22,149
+alberta_in,24,33,0	warp	alb16	3,2,alberta_in,64,35
+alberta_in,64,31,0	warp	alb16-1	3,2,alberta_in,24,29
+alberta_in,24,54,0	warp	alb17	3,2,alberta_in,64,53
+alberta_in,64,57,0	warp	alb17-1	3,2,alberta_in,24,58
+alberta_in,66,113,0	warp	alb18	3,1,alberta_in,66,132
+alberta_in,66,130,0	warp	alb18-1	3,1,alberta_in,66,111
+alberta_in,66,153,0	warp	alb19	3,2,alberta_in,66,173
+alberta_in,66,170,0	warp	alb19-1	3,2,alberta_in,66,149
+alb2trea,88,111,0	warp	alb002	1,1,treasure01,69,24
diff --git a/npc/pre-re/warps/cities/aldebaran.txt b/npc/pre-re/warps/cities/aldebaran.txt
new file mode 100644
index 000000000..f1d6398af
--- /dev/null
+++ b/npc/pre-re/warps/cities/aldebaran.txt
@@ -0,0 +1,56 @@
+//===== rAthena Script =======================================
+//= Al de Baran Warp Script
+//===== By: ==================================================
+//= Athena (1.0)
+//= Nana (1.1)
+//===== Current Version: =====================================
+//= 1.3
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 2+
+//===== Description: =========================================
+//= Warp Points for Al de Baran
+//===== Additional Comments: =================================
+//= 1.2 Added Turbo Room Warps [Justin84]
+//= 1.3 Removed Turbo Track entrance. Scripted warp. [L0ne_W0lf]
+//= 1.4 Added missing warps. [L0ne_W0lf]
+//============================================================
+
+//===== Al De Baran Warps =====================================
+aldebaran,118,63,0	warp	ald01	1,1,aldeba_in,211,117
+aldebaran,139,34,0	warp	ald001	3,2,mjolnir_12,199,375
+aldebaran,197,70,0	warp	ald02	1,1,aldeba_in,94,41
+aldebaran,233,105,0	warp	ald04	1,1,aldeba_in,157,190
+aldebaran,51,218,0	warp	ald05	1,1,aldeba_in,24,227
+aldebaran,61,229,0	warp	ald06	1,1,aldeba_in,148,227
+aldebaran,72,197,0	warp	ald07	1,1,aldeba_in,27,37
+aldebaran,89,234,0	warp	ald08	1,1,aldeba_in,242,237
+aldeba_in,103,157,0	warp	ald09	2,2,aldeba_in,137,237
+aldeba_in,103,61,0	warp	ald10	2,2,aldeba_in,97,105
+aldeba_in,134,237,0	warp	ald09-1	2,2,aldeba_in,100,157
+aldeba_in,144,92,0	warp	ald11	2,2,aldeba_in,149,52
+aldeba_in,148,224,0	warp	ald06-1	2,2,aldebaran,63,227
+aldeba_in,149,55,0	warp	ald11-1	2,2,aldeba_in,144,95
+aldeba_in,157,193,0	warp	ald04-1	3,2,aldebaran,231,107
+aldeba_in,208,117,0	warp	ald01-1	2,2,aldebaran,116,63
+aldeba_in,217,131,0	warp	ald12	2,2,aldeba_in,217,163
+aldeba_in,217,160,0	warp	ald12-1	2,2,aldeba_in,217,128
+aldeba_in,217,71,0	warp	ald13-1	2,2,aldeba_in,218,107
+aldeba_in,218,104,0	warp	ald13	2,2,aldeba_in,218,68
+aldeba_in,24,224,0	warp	ald05-1	2,2,aldebaran,53,216
+aldeba_in,245,237,0	warp	ald08-1	2,2,aldebaran,91,234
+aldeba_in,27,102,0	warp	ald14-1	2,2,aldeba_in,27,68
+aldeba_in,27,34,0	warp	ald07-1	2,2,aldebaran,72,195
+aldeba_in,27,71,0	warp	ald14	2,2,aldeba_in,27,105
+aldeba_in,37,238,0	warp	ald15	2,2,aldeba_in,67,157
+aldeba_in,64,157,0	warp	ald15-1	2,2,aldeba_in,34,238
+aldeba_in,83,191,0	warp	ald16	2,2,aldeba_in,83,227
+aldeba_in,83,224,0	warp	ald16-1	2,2,aldeba_in,83,188
+aldeba_in,94,38,0	warp	ald02-1	3,2,aldebaran,197,68
+aldeba_in,97,102,0	warp	ald10-1	2,2,aldeba_in,103,58
+
+aldebaran,225,54	warp	aldeb_sign1-1	1,1,aldeba_in,149,120
+aldeba_in,149,123	warp	aldeb_sign1-2	3,2,aldebaran,223,56
+
+
+//Turbo Track Room
+turbo_room,100,62,0	warp	exit_turbo	1,1,alde_gld,183,198
diff --git a/npc/pre-re/warps/cities/amatsu.txt b/npc/pre-re/warps/cities/amatsu.txt
new file mode 100644
index 000000000..8614869d3
--- /dev/null
+++ b/npc/pre-re/warps/cities/amatsu.txt
@@ -0,0 +1,53 @@
+//===== rAthena Script =======================================
+//= Amatsu Warps Script
+//===== By: ==================================================
+//= Athena (1.0)
+//= Nana (1.1)
+//===== Current Version: =====================================
+//= 1.7
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 6+
+//===== Description: =========================================
+//= [Aegis COnversion]
+//= Warp Points for Amatsu
+//===== Additional Comments: =================================
+//= 1.7 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//=	Renamed warps for ease-of-reading.
+//============================================================
+
+amatsu,177,138,0	warp	ama_house1-1	1,1,ama_in01,28,176
+ama_in01,31,176,0	warp	ama_house1-2	1,1,amatsu,180,138
+amatsu,248,160,0	warp	ama_house2-1	1,1,ama_in01,79,178
+ama_in01,76,178,0	warp	ama_house2-2	1,1,amatsu,245,160
+amatsu,168,182,0	warp	ama_warrior1-1	1,1,ama_in01,34,99
+ama_in01,34,96,0	warp	ama_warrior1-2	1,1,amatsu,168,179
+amatsu,52,148,0	warp	ama_deluxe1-1	1,1,ama_in01,88,97
+ama_in01,88,94,0	warp	ama_deluxe1-2	1,1,amatsu,52,145
+amatsu,94,117,0	warp	ama_tools1-1	1,1,ama_in01,30,24
+ama_in01,33,24,0	warp	ama_tools1-2	1,1,amatsu,97,117
+amatsu,132,117,0	warp	ama_weapon1-1	1,1,ama_in01,89,23
+ama_in01,86,23,0	warp	ama_weapon1-2	1,1,amatsu,129,117
+amatsu,217,116,0	warp	ama_tavern1-1	1,1,ama_in01,162,25
+ama_in01,157,25,0	warp	ama_tavern1-2	1,1,amatsu,214,116
+ama_in01,166,73,0	warp	ama_inn1-1	1,1,ama_in01,162,31
+ama_in01,162,34,0	warp	ama_inn1-2	1,1,ama_in01,166,77
+
+amatsu,85,235,0	warp	ama_castle1-1	1,1,ama_in02,223,45
+ama_in02,226,45,0	warp	ama_castle1-2	1,1,amatsu,88,235
+ama_in02,65,37,0	warp	ama_castle2-1	1,1,ama_in02,195,41
+ama_in02,195,44,0	warp	ama_castle2-2	1,1,ama_in02,65,40
+ama_in02,59,141,0	warp	ama_castle3-1	1,1,ama_in02,56,41
+ama_in02,56,44,0	warp	ama_castle3-2	1,1,ama_in02,59,144
+ama_in02,215,149,0	warp	ama_castle4-1	1,1,ama_in02,59,156
+ama_in02,59,160,0	warp	ama_castle4-2	1,1,ama_in02,215,152
+ama_in02,126,164,0	warp	ama_castle5-1	1,1,ama_in02,219,161
+ama_in02,222,161,0	warp	ama_castle5-2	1,1,ama_in02,129,164
+
+//============================================================ 
+// Old changelog
+//============================================================ 
+//= 1.3 Fixed a warp-back [erKURITA]
+//= 1.4 Added Ninja's Warps. Thanks to RockmanEXE for the info. [erKURITA]
+//= 1.5 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
+//= 1.6 Moved Job Quest related warps to proper file. [L0ne_W0lf]
+//============================================================
diff --git a/npc/pre-re/warps/cities/ayothaya.txt b/npc/pre-re/warps/cities/ayothaya.txt
new file mode 100644
index 000000000..2d24763e8
--- /dev/null
+++ b/npc/pre-re/warps/cities/ayothaya.txt
@@ -0,0 +1,62 @@
+//===== rAthena Script =======================================
+//= Ayothaya Town Warps Script
+//===== By: ==================================================
+//= Muad_Dib, L0ne_W0lf (1.0)
+//===== Current Version: =====================================
+//= 1.5a
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 8+
+//===== Description: =========================================
+//= Warp Points for Ayothaya
+//===== Additional Comments: =================================
+//= 1.5 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//= 1.5a Cleared up a few misnamed warps. [L0ne_W0lf]
+//============================================================
+
+ayothaya,130,97,0	warp	ayo_tool1-1	1,1,ayo_in01,43,183
+ayo_in01,46,183,0	warp	ayo_tool1-2	1,1,ayothaya,132,99
+ayothaya,129,86,0	warp	ayo_tool2-1	1,1,ayo_in01,21,178
+ayo_in01,23,176,0	warp	ayo_tool2-2	1,1,ayothaya,132,86
+ayothaya,130,75,0	warp	ayo_tool3-1	1,1,ayo_in01,17,156
+ayo_in01,17,153,0	warp	ayo_tool3-2	1,1,ayothaya,132,73
+ayothaya,165,90,0	warp	ayo_weapon1-1	1,1,ayo_in01,77,174
+ayo_in01,73,174,0	warp	ayo_weapon1-2	1,1,ayothaya,162,90
+ayothaya,177,90,0	warp	ayo_weapon2-1	1,1,ayo_in01,95,175
+ayo_in01,98,175,0	warp	ayo_weapon2-2	1,1,ayothaya,180,90
+ayothaya,173,77,0	warp	ayo_weapon3-1	1,1,ayo_in01,85,152
+ayo_in01,85,149,0	warp	ayo_weapon3-2	1,1,ayothaya,173,74
+ayothaya,229,69,0	warp	ayo_pub1-1	1,1,ayo_in01,137,192
+ayo_in01,137,195,0	warp	ayo_pub1-2	1,1,ayothaya,229,72
+ayothaya,202,161,0	warp	ayo_inn1-1	1,1,ayo_in01,31,108
+ayo_in01,31,111,0	warp	ayo_inn1-2	1,1,ayothaya,202,164
+ayothaya,211,150,0	warp	ayo_inn2-1	1,1,ayo_in01,47,94
+ayo_in01,50,94,0	warp	ayo_inn2-2	1,1,ayothaya,214,150
+ayothaya,202,140,0	warp	ayo_inn3-1	1,1,ayo_in01,31,81
+ayo_in01,31,78,0	warp	ayo_inn3-2	1,1,ayothaya,202,137
+ayothaya,192,150,0	warp	ayo_inn4-1	1,1,ayo_in01,13,94
+ayo_in01,10,94,0	warp	ayo_inn4-2	1,1,ayothaya,189,150
+ayo_in01,13,107,0	warp	ayo_stairNW1-1	1,1,ayo_in01,132,27
+ayo_in01,135,27,0	warp	ayo_roomNW1-2	1,1,ayo_in01,17,107
+ayo_in01,48,107,0	warp	ayo_stairNE1-1	1,1,ayo_in01,179,27
+ayo_in01,176,27,0	warp	ayo_roomNE2-2	1,1,ayo_in01,45,107
+ayo_in01,13,82,0	warp	ayo_stairSW1-1	1,1,ayo_in01,18,14
+ayo_in01,21,14,0	warp	ayo_roomSW1-2	1,1,ayo_in01,17,82
+ayo_in01,48,82,0	warp	ayo_stairSE1-1	1,1,ayo_in01,63,14
+ayo_in01,60,14,0	warp	ayo_roomSE1-2	1,1,ayo_in01,45,82
+ayothaya,111,109,0	warp	ayo_house1_1-1	1,1,ayo_in01,180,129
+ayo_in01,177,129,0	warp	ayo_house1_1-2	1,1,ayothaya,111,106
+ayothaya,62,104,0	warp	ayo_house2_1-1	1,1,ayo_in01,191,183
+ayo_in01,194,183,0	warp	ayo_house2_1-2	1,1,ayothaya,65,104
+ayothaya,208,283,0	warp	ayo_shrine1-1	1,1,ayo_in02,100,152
+ayo_in02,100,148,0	warp	ayo_shrine1-2	1,1,ayothaya,208,280
+ayothaya,276,176,0	warp	ayo_fild1-1	1,1,ayo_fild01,37,241
+ayo_fild01,32,240,0	warp	ayo_fild1-2	1,1,ayothaya,273,176
+
+//============================================================ 
+// Old changelog
+//============================================================ 
+//= 1.1 Fixed Armory part by massdriller [Thanks to akusarujin]
+//= 1.2 Revised warps, due to official Ayothaya Town NPC [MasterOfMuppets]
+//= 1.3 Fixed swapped Inn Exits, thanks to Sir_Loon [Lupus]
+//= 1.4 Fixed a warp-back. [erKURITA]
+//============================================================
diff --git a/npc/pre-re/warps/cities/brasilis.txt b/npc/pre-re/warps/cities/brasilis.txt
new file mode 100644
index 000000000..b7181305c
--- /dev/null
+++ b/npc/pre-re/warps/cities/brasilis.txt
@@ -0,0 +1,35 @@
+//===== rAthena Script =======================================
+//= Brasilis Town Warps Script
+//===== By: ==================================================
+//= L0ne_W0lf
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 13.1+
+//===== Description: =========================================
+//= [Aegis 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]
+//============================================================
+brasilis,146,162,0	warp	brasilis_bra_in01	1,1,bra_in01,17,137
+brasilis,274,153,0	warp	brasilis_bra_in01#2	1,1,bra_in01,38,9
+brasilis,308,336,0	warp	brasilis_fild		1,1,bra_fild01,74,34
+bra_in01,17,134,0	warp	bra_in01_brasilis	1,1,brasilis,148,161
+bra_in01,39,7,0	warp	bra_in01_brasilis#2	1,1,brasilis,273,151
+bra_in01,50,145,0	warp	bra_in01_bra_in01#3	1,1,bra_in01,81,143
+bra_in01,79,142,0	warp	bra_in01_bra_in01#4	1,1,bra_in01,47,144
+bra_in01,50,171,0	warp	bra_in01_bra_in01#5	1,1,bra_in01,82,168
+bra_in01,79,169,0	warp	bra_in01_bra_in01#6	1,1,bra_in01,46,170
+bra_in01,52,27,0	warp	bra_in01_bra_in01#7	1,1,bra_in01,85,26
+bra_in01,83,27,0	warp	bra_in01_bra_in01#8	1,1,bra_in01,50,27
+bra_in01,9,67,0	warp	bra_in01_bra_in01#9	1,1,bra_in01,154,22
+bra_in01,156,23,0	warp	bra_in01_bra_in01#10	1,1,bra_in01,11,65
+bra_in01,52,67,0	warp	bra_in01_bra_in01#11	1,1,bra_in01,87,66
+bra_in01,85,67,0	warp	bra_in01_bra_in01#12	1,1,bra_in01,50,66
+bra_in01,31,29,0	warp	bra_in01_bra_in01#13	1,1,bra_in01,23,70
+bra_in01,25,70,0	warp	bra_in01_bra_in01#14	1,1,bra_in01,32,26
+bra_in01,31,74,0	warp	bra_in01_bra_in01#15	1,1,bra_in01,148,59
+bra_in01,148,57,0	warp	bra_in01_bra_in01#16	1,1,bra_in01,31,72
diff --git a/npc/pre-re/warps/cities/comodo.txt b/npc/pre-re/warps/cities/comodo.txt
new file mode 100644
index 000000000..8dfbc8198
--- /dev/null
+++ b/npc/pre-re/warps/cities/comodo.txt
@@ -0,0 +1,45 @@
+//===== rAthena Script =======================================
+//= Comodo Warp Script
+//===== By: ==================================================
+//= rAthena dev team
+//===== Current Version: =====================================
+//= 1.3
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= [Aegis Conversion]
+//= Warp Points Comodo city
+//===== Additional Comments: =================================
+//= 1.3 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//============================================================
+
+comodo,92,128,0	warp	cmd_tools1-1	1,1,cmd_in01,85,174
+cmd_in01,90,174,0	warp	cmd_tools1-2	1,1,comodo,97,128
+comodo,265,74,0	warp	cmd_weapon1-1	1,1,cmd_in01,123,180
+cmd_in01,123,186,0	warp	cmd_weapon1-2	1,1,comodo,265,79
+comodo,271,271,0	warp	cmd_house1-1	1,1,cmd_in01,113,125
+cmd_in01,109,125,0	warp	cmd_house1-2	1,1,comodo,269,273
+comodo,192,294,0	warp	cmd_house2-1	1,1,cmd_in01,177,123
+cmd_in01,183,123,0	warp	cmd_house2-2	1,1,comodo,195,294
+comodo,145,328,0	warp	cmd_house3-1	1,1,cmd_in01,120,71
+cmd_in01,120,67,0	warp	cmd_house3-2	1,1,comodo,145,324
+comodo,236,298,0	warp	cmd_house4-1	1,1,cmd_in01,179,81
+cmd_in01,183,81,0	warp	cmd_house4-2	1,1,comodo,239,296
+comodo,130,195,0	warp	cmd_KAFRA1-1	1,1,cmd_in02,143,173
+cmd_in02,139,169,0	warp	cmd_KAFRA1-2	1,1,comodo,127,191
+cmd_in02,208,206,0	warp	cmd_KAFRA2-1	1,1,cmd_in02,97,211
+cmd_in02,98,216,0	warp	cmd_KAFRA12-2	1,1,cmd_in02,207,210
+comodo,115,291,0	warp	cmd_chief1-1	1,1,cmd_in02,67,132
+cmd_in02,69,129,0	warp	cmd_chief1-2	1,1,comodo,115,288
+comodo,140,111,0	warp	cmd_casino1-1	1,1,cmd_in02,178,132
+cmd_in02,178,136,0	warp	cmd_casino1-2	1,1,comodo,140,115
+comodo,153,97,0	warp	cmd_casino2-1	1,1,cmd_in02,212,97
+cmd_in02,216,97,0	warp	cmd_casino2-2	1,1,comodo,157,97
+comodo,126,98,0	warp	cmd_casino3-1	1,1,cmd_in02,144,97
+cmd_in02,139,97,0	warp	cmd_casino3-2	1,1,comodo,122,98
+comodo,140,90,0	warp	cmd_casino4-1	1,1,cmd_in02,74,25
+cmd_in02,74,21,0	warp	cmd_casino4-2	1,1,comodo,140,86
+cmd_in02,168,113,0	warp	cmd_casino5-1	1,1,cmd_in02,63,73
+cmd_in02,58,74,0	warp	cmd_casino5-2	1,1,cmd_in02,166,116
+cmd_in02,187,78,0	warp	cmd_casino6-1	1,1,cmd_in02,84,37
+cmd_in02,90,37,0	warp	cmd_casino6-2	1,1,cmd_in02,191,77
diff --git a/npc/pre-re/warps/cities/dewata.txt b/npc/pre-re/warps/cities/dewata.txt
new file mode 100644
index 000000000..d5c0b7f93
--- /dev/null
+++ b/npc/pre-re/warps/cities/dewata.txt
@@ -0,0 +1,21 @@
+//===== rAthena Script =======================================
+//= Dewata Warp Script
+//===== By: ==================================================
+//= Chilly
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: =========================================
+//= Warp Points for Dewata
+//===== Additional Comments: =================================
+//= 1.0 First version
+//= 1.1 Disabled warps that clash with quest warps. [Euphy]
+//============================================================
+
+dewata,44,252,0	warp	dewata0001	1,1,dew_fild01,372,212
+dew_fild01,375,212,0	warp	dewata0002	1,1,dewata,47,252
+//dew_fild01,57,273,0	warp	dewata0003	1,1,dew_in01,16,34
+//dew_in01,16,31,0	warp	dewata0004	1,1,dew_fild01,60,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,51,65
diff --git a/npc/pre-re/warps/cities/dicastes.txt b/npc/pre-re/warps/cities/dicastes.txt
new file mode 100644
index 000000000..9ee6338fd
--- /dev/null
+++ b/npc/pre-re/warps/cities/dicastes.txt
@@ -0,0 +1,192 @@
+//===== rAthena Script =======================================
+//= El Dicastes Warp Script
+//===== By: ==================================================
+//= Chilly
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: =========================================
+//= Warp Points for El Dicastes
+//===== Additional Comments: =================================
+//= 1.0 First Version.
+//= 1.1 Added Elevators.
+//============================================================
+
+// Town Warps
+dicastes01,283,285,0	warp	eldicastes0001	1,1,dic_in01,45,31
+dic_in01,45,28,0	warp	eldicastes0002	1,1,dicastes01,281,283
+dicastes01,163,297,0	warp	eldicastes0003	1,1,dic_in01,372,102
+dic_in01,372,99,0	warp	eldicastes0004	1,1,dicastes01,163,294
+dicastes01,94,259,0	warp	eldicastes0005	1,1,dic_in01,390,52
+dic_in01,390,55,0	warp	eldicastes0006	1,1,dicastes01,96,257
+dicastes01,136,103,0	warp	eldicastes0007	1,1,dic_in01,26,99
+dic_in01,26,96,0	warp	eldicastes0008	1,1,dicastes01,136,106
+dicastes01,255,175,0	warp	eldicastes0009	1,1,dic_in01,345,271
+dic_in01,342,271,0	warp	eldicastes0010	1,1,dicastes01,255,172
+dicastes01,198,353,0	warp	eldicastes0011	1,1,dicastes02,120,81
+dicastes02,120,77,0	warp	eldicastes0012	1,1,dicastes01,198,349
+dicastes02,120,237,0	warp	eldicastes0013	1,1,dic_in01,45,247
+dic_in01,45,244,0	warp	eldicastes0014	1,1,dicastes02,120,234
+dic_in01,138,226,0	warp	eldicastes0015	1,1,dic_in01,242,177
+dic_in01,242,180,0	warp	eldicastes0016	1,1,dic_in01,138,223
+dic_in01,300,248,0	warp	eldicastes0017	1,1,dic_in01,262,191
+
+// Elevators
+dic_in01,46,288,4	script	Elevator#01	111,{
+	switch(select("Headquarters","Document Vault","General Command Room","Top Secret")) {
+	case 1:
+		warp "dic_in01",46,286;
+		end;
+	case 2:
+		warp "dic_in01",36,212;
+		end;
+	case 3:
+		warp "dic_in01",122,282;
+		end;
+	case 4:
+		warp "dic_in01",122,201;
+		end;
+	}
+}
+
+dic_in01,36,214,4	script	Elevator#02	111,{
+	switch(select("Headquarters","Document Vault","General Command Room","Top Secret")) {
+	case 1:
+		warp "dic_in01",46,286;
+		end;
+	case 2:
+		warp "dic_in01",36,212;
+		end;
+	case 3:
+		warp "dic_in01",122,282;
+		end;
+	case 4:
+		warp "dic_in01",122,201;
+		end;
+	}
+}
+
+dic_in01,122,284,4	script	Elevator#03	111,{
+	switch(select("Headquarters","Document Vault","General Command Room","Top Secret")) {
+	case 1:
+		warp "dic_in01",46,286;
+		end;
+	case 2:
+		warp "dic_in01",36,212;
+		end;
+	case 3:
+		warp "dic_in01",122,282;
+		end;
+	case 4:
+		warp "dic_in01",122,201;
+		end;
+	}
+}
+
+dic_in01,123,205,4	script	Elevator#04	111,{
+	switch(select("Headquarters","Document Vault","General Command Room","Top Secret")) {
+	case 1:
+		warp "dic_in01",46,286;
+		end;
+	case 2:
+		warp "dic_in01",36,212;
+		end;
+	case 3:
+		warp "dic_in01",122,282;
+		end;
+	case 4:
+		warp "dic_in01",122,202;
+		end;
+	}
+}
+
+dic_in01,44,116,4	script	Elevator#05	111,{
+	switch(select("1st Floor Residence","2nd Floor Residence","3rd Floor Residence","The Pub")) {
+	case 1:
+		warp "dic_in01",42,116;
+		end;
+	case 2:
+		warp "dic_in01",110,108;
+		end;
+	case 3:
+		warp "dic_in01",178,108;
+		end;
+	case 4:
+		warp "dic_in01",260,116;
+		end;
+	}
+}
+
+dic_in01,112,108,4	script	Elevator#06	111,{
+	switch(select("1st Floor Residence","2nd Floor Residence","3rd Floor Residence","The Pub")) {
+	case 1:
+		warp "dic_in01",42,116;
+		end;
+	case 2:
+		warp "dic_in01",110,108;
+		end;
+	case 3:
+		warp "dic_in01",178,108;
+		end;
+	case 4:
+		warp "dic_in01",260,116;
+		end;
+	}
+}
+
+dic_in01,180,108,4	script	Elevator#07	111,{
+	switch(select("1st Floor Residence","2nd Floor Residence","3rd Floor Residence","The Pub")) {
+	case 1:
+		warp "dic_in01",42,116;
+		end;
+	case 2:
+		warp "dic_in01",110,108;
+		end;
+	case 3:
+		warp "dic_in01",178,108;
+		end;
+	case 4:
+		warp "dic_in01",260,116;
+		end;
+	}
+}
+
+dic_in01,262,116,4	script	Elevator#08	111,{
+	switch(select("1st Floor Residence","2nd Floor Residence","3rd Floor Residence","The Pub")) {
+	case 1:
+		warp "dic_in01",42,116;
+		end;
+	case 2:
+		warp "dic_in01",110,108;
+		end;
+	case 3:
+		warp "dic_in01",178,108;
+		end;
+	case 4:
+		warp "dic_in01",260,116;
+		end;
+	}
+}
+
+dic_in01,388,272,4	script	Elevator#09	111,{
+	switch(select("Battle Room","Residence Area")) {
+	case 1:
+		warp "dic_in01",386,272;
+		end;
+	case 2:
+		warp "dic_in01",386,208;
+		end;
+	}
+}
+
+dic_in01,388,208,4	script	Elevator#10	111,{
+	switch(select("Battle Room","Residence Area")) {
+	case 1:
+		warp "dic_in01",386,272;
+		end;
+	case 2:
+		warp "dic_in01",386,208;
+		end;
+	}
+}
diff --git a/npc/pre-re/warps/cities/eclage.txt b/npc/pre-re/warps/cities/eclage.txt
new file mode 100644
index 000000000..c67bf202f
--- /dev/null
+++ b/npc/pre-re/warps/cities/eclage.txt
@@ -0,0 +1,33 @@
+//===== rAthena Script =======================================
+//= Eclage Warp Script
+//===== By: ==================================================
+//= Chilly
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: =========================================
+//= Warp Points for Eclage
+//===== Additional Comments: =================================
+//= 1.0 First Version.
+//============================================================
+
+// Town Warps
+bif_fild02,292,351,0	warp	eclage_field0001	1,1,ecl_fild01,205,74
+ecl_fild01,207,72,0	warp	eclage_field0002	1,1,bif_fild02,294,349
+ecl_fild01,97,320,0	warp	eclage_field0003	1,1,eclage,100,28
+eclage,98,26,0	warp	eclage_field0004	1,1,ecl_fild01,97,317
+eclage,299,309,0	warp	eclage_field0005	1,1,ecl_in01,47,11
+ecl_in01,47,8,0	warp	eclage_field0006	1,1,eclage,297,307
+ecl_in01,8,67,0	warp	eclage_field0007	1,1,ecl_hub01,38,94
+ecl_hub01,40,95,0	warp	eclage_field0008	1,1,ecl_in01,11,67
+ecl_hub01,22,109,0	warp	eclage_field0009	1,1,ecl_in02,98,7
+ecl_in02,98,4,0	warp	eclage_field0010	1,1,ecl_hub01,23,107
+ecl_in02,81,18,0	warp	eclage_field0011	1,1,ecl_in02,157,65
+ecl_in02,157,68,0	warp	eclage_field0012	1,1,ecl_in02,83,18
+ecl_in01,84,68,0	warp	eclage_field0013	1,1,ecl_hub01,107,107
+ecl_hub01,107,110,0	warp	eclage_field0014	1,1,ecl_in01,81,68
+ecl_hub01,127,95,0	warp	eclage_field0015	1,1,ecl_hub01,18,31
+ecl_hub01,18,34,0	warp	eclage_field0016	1,1,ecl_hub01,124,95
+ecl_hub01,40,14,0	warp	eclage_field0017	1,1,ecl_in03,144,17
+ecl_in03,144,14,0	warp	eclage_field0018	1,1,ecl_hub01,40,11
diff --git a/npc/pre-re/warps/cities/einbech.txt b/npc/pre-re/warps/cities/einbech.txt
new file mode 100644
index 000000000..fd4292fde
--- /dev/null
+++ b/npc/pre-re/warps/cities/einbech.txt
@@ -0,0 +1,45 @@
+//===== rAthena Script ======================================= 
+//= Einbech Warps
+//===== By: ================================================== 
+//= Muad Dib (1.0), SSUNNY@YOUNG(1.1)
+//===== Current Version: ===================================== 
+//= 1.1
+//===== Compatible With: ===================================== 
+//= Any rAthena Version
+//===== Description: ========================================= 
+//= Einbech Town warps
+//===== Additional Comments: ================================= 
+//= Made by Muad_Dib from Prometheus, all credit goes to him.
+//= 1.1 Updated Warps, work done by SSUNNY@YOUNG in Korean eA site [Vicious]
+//============================================================
+
+//==========================================================================
+//Einbech - Weapon shop
+//==========================================================================
+einbech,177,136,0	warp	eib_wp01	1,1,ein_in01,190,35
+ein_in01,190,38,0	warp	eib_wp01a	1,1,einbech,177,133
+
+
+//==========================================================================
+//Einbech - buildings
+//==========================================================================
+einbech,207,135,0	warp	eib_hu01	1,1,ein_in01,190,99
+ein_in01,187,99,0	warp	eib_hu01a	1,1,einbech,204,135
+einbech,214,121,0	warp	eib_hu02	1,1,ein_in01,205,86
+ein_in01,205,83,0	warp	eib_hu02a	1,1,einbech,214,118
+
+
+//==========================================================================
+//Einbech - Pub
+//==========================================================================
+einbech,154,106,0	warp	eib_b01	1,1,ein_in01,285,89
+ein_in01,288,89,0	warp	eib_b01a	1,1,einbech,157,106
+einbech,145,112,0	warp	eib_b02	1,1,ein_in01,268,104
+ein_in01,265,104,0	warp	eib_b02a	1,1,einbech,141,112
+
+
+//=========================================================================
+//Einbech - Swordman guild
+//=========================================================================
+einbech,256,109,0	warp	eib_js01	1,1,ein_in01,148,153
+ein_in01,144,153,0	warp	eib_js01a	1,1,einbech,253,109
diff --git a/npc/pre-re/warps/cities/einbroch.txt b/npc/pre-re/warps/cities/einbroch.txt
new file mode 100644
index 000000000..696e7fa00
--- /dev/null
+++ b/npc/pre-re/warps/cities/einbroch.txt
@@ -0,0 +1,105 @@
+//===== rAthena Script =======================================
+//= Einbroch Warp Script
+//===== By: ==================================================
+//= Sara-chan (1.3), SSUNNY@YOUNG(1.7), erKURITA (1.8)
+//===== Current Version: =====================================
+//= 1.8
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 8+
+//===== Description: =========================================
+//= Warp Points for Einbroch
+//===== Additional Comments: =================================
+//= 1.4 Moved all airports to Airplane Warps [Lupus]
+//= 1.5 Commented out some warps which are not in the official servers [MasterOfMuppets]
+//= 1.6	Removed some duplicate warps [MasterOfMuppets]
+//= 1.7 Updated Warps, work done by SSUNNY@YOUNG in Korean eA site [Vicious]
+//= 1.8 Added Gunslinger Map portion warps. Credits to RockmanEXE for the info [erKURITA]
+//============================================================
+
+//==========================================================================
+// Einbroch - Factory
+//==========================================================================
+einbroch,132,79,0	warp	ein_fa01	1,1,ein_in01,17,213
+ein_in01,13,213,0	warp	ein_fa01a	1,1,einbroch,129,79
+ein_in01,81,198,0	warp	ein_fa02	1,1,einbroch,179,70
+einbroch,179,73,0	warp	ein_fa02a	1,1,ein_in01,81,203
+
+
+//==========================================================================
+//Einbroch - Near Train station
+//==========================================================================
+einbroch,214,263,0	warp	ein_to01	1,1,einbroch,233,315
+einbroch,233,312,0	warp	ein_to01a	1,1,einbroch,214,260
+einbroch,250,263,0	warp	ein_to02	1,1,einbroch,269,315
+einbroch,269,312,0	warp	ein_to02a	1,1,einbroch,250,260
+
+
+//==========================================================================
+//Einbroch - Weapon shop
+//==========================================================================
+einbroch,216,214,0	warp	ein_wp01	1,1,ein_in01,108,17
+ein_in01,108,13,0	warp	ein_wp01a	1,1,einbroch,216,211
+
+
+//=========================================================================
+//Einbroch - Hotel
+//=========================================================================
+einbroch,257,199,0	warp	ein_h01	1,1,ein_in01,198,224
+ein_in01,195,224,0	warp	ein_h01a	1,1,einbroch,254,199
+ein_in01,211,216,0	warp	ein_h02	1,1,ein_in01,274,218
+ein_in01,271,218,0	warp	ein_h02a	1,1,ein_in01,208,216
+ein_in01,211,232,0	warp	ein_h03	1,1,ein_in01,274,232
+ein_in01,271,232,0	warp	ein_h03a	1,1,ein_in01,208,232
+ein_in01,274,246,0	warp	ein_h04	1,1,ein_in01,273,276
+ein_in01,273,273,0	warp	ein_h04a	1,1,ein_in01,274,243
+ein_in01,264,246,0	warp	ein_h05	1,1,ein_in01,231,276
+ein_in01,231,273,0	warp	ein_h05a	1,1,ein_in01,264,243
+ein_in01,274,203,0	warp	ein_h06	1,1,ein_in01,274,173
+ein_in01,274,176,0	warp	ein_h06a	1,1,ein_in01,274,206
+ein_in01,264,203,0	warp	ein_h07	1,1,ein_in01,232,173
+ein_in01,232,176,0	warp	ein_h07a	1,1,ein_in01,264,206
+ein_in01,284,224,0	warp	ein_h08	1,1,ein_in01,177,277
+ein_in01,180,277,0	warp	ein_h08a	1,1,ein_in01,280,224
+
+
+//==========================================================================
+//Einbroch - Building behind the hotel
+//==========================================================================
+einbroch,278,233,0	warp	ein_ho01	1,1,ein_in01,107,95
+ein_in01,103,95,0	warp	ein_ho01a	1,1,einbroch,275,233
+ein_in01,126,88,0	warp	ein_ho02	1,1,ein_in01,100,139
+ein_in01,100,142,0	warp	ein_ho02a	1,1,ein_in01,123,85
+einbroch,290,222,0	warp	ein_ho03	1,1,ein_in01,121,80
+ein_in01,121,77,0	warp	ein_ho03a	1,1,einbroch,290,219
+
+
+//==========================================================================
+//Einbroch - House of Kapetain
+//==========================================================================
+einbroch,129,229,0	warp	ein_kf01	1,1,ein_in01,14,147
+ein_in01,11,147,0	warp	ein_kf01a	1,1,einbroch,126,229
+
+
+//=========================================================================
+//Einbroch - Lab
+//=========================================================================
+ein_in01,286,25,0	warp	ein_lab	1,1,einbroch,54,52
+
+
+//=========================================================================
+//Einbroch - Blacksmith guild
+//=========================================================================
+einbroch,255,107,0	warp	ein_jb01	1,1,ein_in01,14,17
+ein_in01,14,14,0	warp	ein_jb01a	1,1,einbroch,255,110
+ein_in01,39,36,0	warp	ein_jb02	1,1,ein_in01,35,83
+ein_in01,39,85,0	warp	ein_jb02a	1,1,ein_in01,36,36
+
+
+//==========================================================================
+//Einbroch - Field related
+//==========================================================================
+einbroch,157,331,0	warp	ein_fd01	1,1,ein_fild04,184,31
+ein_fild04,184,26,0	warp	ein_fd01a	1,1,einbroch,157,327
+einbroch,150,25,0	warp	ein_fd02	1,1,ein_fild08,164,377
+ein_fild08,164,380,0	warp	ein_fd02a	1,1,einbroch,150,28
+
diff --git a/npc/pre-re/warps/cities/geffen.txt b/npc/pre-re/warps/cities/geffen.txt
new file mode 100644
index 000000000..77016fb7c
--- /dev/null
+++ b/npc/pre-re/warps/cities/geffen.txt
@@ -0,0 +1,50 @@
+//===== rAthena Script =======================================
+//= Geffen Warp Script
+//===== By: ==================================================
+//= Athena (1.0)
+//= Nana (1.1)
+//===== Current Version: =====================================
+//= 1.1a
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Geffen
+//===== Additional Comments: =================================
+//= 1.1a Corrected a broken warp point. (bugreport:497) [Samuray22]
+//============================================================
+
+//Geffen City
+geffen,119,213,0	warp	gef001	3,2,gef_fild04,187,42
+geffen,120,114,0	warp	gef002	3,1,gef_tower,52,177
+geffen,217,119,0	warp	gef003	2,4,gef_fild00,46,199
+geffen,26,119,0	warp	gef004	2,3,gef_fild07,336,187
+geffen,138,138,0	warp	gef01	1,1,geffen_in,28,110
+geffen,172,174,0	warp	gef02	2,2,geffen_in,70,52
+geffen,182,59,0	warp	gef03	2,2,geffen_in,106,177
+geffen,43,85,0	warp	gef04	2,2,geffen_in,70,138
+geffen,61,180,0	warp	gef05	3,3,geffen_in,162,97
+geffen,98,141,0	warp	gef06	2,2,geffen_in,28,160
+geffen_in,28,156,0	warp	gef06-1	3,1,geffen,101,138
+geffen_in,100,67,0	warp	gef07	2,3,geffen_in,84,65
+geffen_in,87,66,0	warp	gef07-1	2,3,geffen_in,103,67
+geffen_in,104,109,0	warp	gef08	2,2,geffen_in,76,107
+geffen_in,79,107,0	warp	gef08-1	2,2,geffen_in,107,109
+geffen_in,113,163,0	warp	gef09	2,2,geffen_in,139,169
+geffen_in,136,169,0	warp	gef09-1	2,2,geffen_in,110,163
+geffen_in,114,37,0	warp	gef10	1,1,geffen_in,114,63
+geffen_in,114,60,0	warp	gef10-1	1,2,geffen_in,114,34
+geffen_in,138,149,0	warp	gef11	2,2,geffen_in,138,165
+geffen_in,138,162,0	warp	gef11-1	2,2,geffen_in,138,146
+geffen_in,26,60,0	warp	gef12	1,2,geffen_in,26,34
+geffen_in,26,37,0	warp	gef12-1	1,1,geffen_in,26,63
+geffen_in,52,65,0	warp	gef13	2,3,geffen_in,38,67
+geffen_in,41,67,0	warp	gef13-1	2,3,geffen_in,55,65
+geffen_in,70,149,0	warp	gef14	3,2,geffen_in,70,161
+geffen_in,70,158,0	warp	gef14-1	3,2,geffen_in,70,146
+geffen_in,70,83,0	warp	gef15	3,2,geffen_in,72,101
+geffen_in,72,98,0	warp	gef15-1	3,2,geffen_in,70,80
+geffen_in,163,94,0	warp	gef05-1	4,2,geffen,65,176
+geffen_in,70,132,0	warp	gef04-1	3,1,geffen,46,88
+geffen_in,106,181,0	warp	gef03-1	2,2,geffen,179,59
+geffen_in,28,106,0	warp	gef01-1	1,3,geffen,136,136
+geffen_in,70,48,0	warp	gef02-1	3,2,geffen,168,170
diff --git a/npc/pre-re/warps/cities/gonryun.txt b/npc/pre-re/warps/cities/gonryun.txt
new file mode 100644
index 000000000..5a37ed0c7
--- /dev/null
+++ b/npc/pre-re/warps/cities/gonryun.txt
@@ -0,0 +1,35 @@
+//===== rAthena Script =======================================
+//= Kunlun Town Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 5+
+//===== Description: =========================================
+//= [Aegis Conversion]
+//= Warp Points for Kunlun
+//===== Additional Comments: =================================
+//= 1.1 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//============================================================
+
+gonryun,221,162,0	warp	gon_house1-1	1,1,gon_in,112,98
+gon_in,109,98,0	warp	gon_house1-2	1,1,gonryun,218,162
+gonryun,195,93,0	warp	gon_house2-1	1,1,gon_in,95,23
+gon_in,95,26,0	warp	gon_house2=2	1,1,gonryun,195,96
+gonryun,107,184,0	warp	gon_tea1-1	1,1,gon_in,72,70
+gon_in,72,67,0	warp	gon_tea2-1	1,1,gonryun,107,181
+gonryun,215,114,0	warp	gon_tavern1-1	1,1,gon_in,152,24
+gon_in,149,24,0	warp	gon_tavern1-2	1,1,gonryun,212,114
+gon_in,184,36,0	warp	gon_inn1-1	1,1,gon_in,189,107
+gon_in,186,107,0	warp	gon_inn1-2	1,1,gon_in,181,36
+gon_in,184,11,0	warp	gon_inn2-1	1,1,gon_in,189,85
+gon_in,186,85,0	warp	gon_inn2-2	1,1,gon_in,181,11
+gonryun,109,131,0	warp	gon_castle1-1	1,1,gon_in,44,24
+gon_in,47,24,0	warp	gon_castle1-2	1,1,gonryun,112,131
+gon_in,42,35,0	warp	gon_castle2-1	1,1,gon_in,34,97
+gon_in,31,97,0	warp	gon_castle2-2	1,1,gon_in,39,35
+gonryun,161,8,0	warp	gon_fild1-1	1,1,gon_fild01,191,261
+gon_fild01,192,265,0	warp	gon_fild1-2	1,1,gonryun,161,11
+
+
diff --git a/npc/pre-re/warps/cities/hugel.txt b/npc/pre-re/warps/cities/hugel.txt
new file mode 100644
index 000000000..0daa5219b
--- /dev/null
+++ b/npc/pre-re/warps/cities/hugel.txt
@@ -0,0 +1,117 @@
+//===== rAthena Script =======================================
+//= Garden City Hugel Warp Script
+//===== By: ==================================================
+//= Sara-chan (1.1)
+//===== Current Version: =====================================
+//= 1.7
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 10+
+//===== Description: =========================================
+//= Warp Points for Hugel
+//===== Additional Comments: =================================
+//= Initial Release
+//= 12/21/05 : Fixed 2 church warps and hunter house warps. [Muad_Dib]
+//= 1.2 fixed hugel10 [Lupus]
+//= 1.3 Rewrote all warps to relate houses, and fixed it to kRO. [Er_Maqui]
+//= 1.3a Replaced all spaces with TABs [Lupus]
+//= 1.4 Fixed an back warp on hu_in01,15,70 (walk to the warp, then warps you back) [erKURITA]
+//= 1.5 Added Bingo warps [erKURITA]
+//= 1.6 Some official warps [Playtester]
+//= 1.7 Updated warps regarding Odin Temple Excavation Quest. [SinSloth]
+//============================================================
+
+//= Hugel City ===============================================
+
+//Entrance
+hu_fild06,200,372,0	warp	hugel01	1,1,hugel,95,37
+hugel,95,33,0	warp	hugel02	1,1,hu_fild06,200,367
+
+//Church
+hugel,155,114,0	warp	hugel03	1,1,hu_in01,211,177
+hu_in01,211,173,0	warp	hugel04	1,1,hugel,159,114
+hu_in01,162,228,0	warp	hugel05	1,1,hu_in01,199,219
+hu_in01,195,219,0	warp	hugel06	1,1,hu_in01,159,228
+hu_in01,162,168,0	warp	hugel07	1,1,hu_in01,200,192
+hu_in01,195,192,0	warp	hugel08	1,1,hu_in01,158,168
+
+//House
+hugel,153,153,0	warp	hugel09	1,1,hu_in01,287,231
+hu_in01,287,227,0	warp	hugel10	1,1,hugel,153,149
+hu_in01,263,252,0	warp	hugel11	1,1,hu_in01,360,253
+hu_in01,365,253,0	warp	hugel12	1,1,hu_in01,268,252
+
+//House
+hugel,92,167,0	warp	hugel13	1,1,hu_in01,246,363
+hu_in01,246,359,0	warp	hugel14	1,1,hugel,92,163
+hu_in01,244,315,0	warp	hugel15	1,1,hu_in01,243,388
+hu_in01,248,388,0	warp	hugel16	1,1,hu_in01,250,315
+hu_in01,229,313,0	warp	hugel17	1,1,hu_in01,164,315
+hu_in01,168,315,0	warp	hugel18	1,1,hu_in01,234,313
+hu_in01,168,307,0	warp	hugel19	1,1,hu_in01,167,376
+hu_in01,168,379,0	warp	hugel20	1,1,hu_in01,168,311
+
+//House (Unofficial)
+hugel,85,181,0	warp	hugel21	1,1,hu_in01,231,303
+hu_in01,231,301,0	warp	hugel22	1,1,hugel,83,181
+
+//Weapon Shop
+hugel,70,157,0	warp	hugel23	1,1,hu_in01,110,373
+hu_in01,110,369,0	warp	hugel24	1,1,hugel,73,155
+hu_in01,108,390,0	warp	hugel25	1,1,hu_in01,107,322
+hu_in01,114,322,0	warp	hugel26	1,1,hu_in01,113,389
+
+//House
+hugel,91,104,0	warp	hugel27	1,1,hu_in01,30,304
+hu_in01,30,299,0	warp	hugel28	1,1,hugel,95,103
+hu_in01,34,318,0	warp	hugel29	1,1,hu_in01,34,251
+hu_in01,34,246,0	warp	hugel30	1,1,hu_in01,34,313
+
+//Inn
+hugel,104,79,0	warp	hugel31	1,1,hu_in01,235,107
+hu_in01,231,107,0	warp	hugel32	1,1,hugel,101,77
+hu_in01,268,123,0	warp	hugel33	1,1,hu_in01,265,36
+hu_in01,265,42,0	warp	hugel34	1,1,hu_in01,262,123
+
+//Library
+hu_in01,37,90,0	warp	hugel36	1,1,hugel,52,95
+hu_in01,15,70,0	warp	hugel37	1,1,hu_in01,15,25
+hu_in01,15,29,0	warp	hugel38	1,1,hu_in01,15,74
+hu_in01,15,151,0	warp	hugel40	1,1,hu_in01,15,104
+
+//Hunter Guild
+hugel,206,228,0	warp	hugel41	1,1,hu_in01,381,368
+hu_in01,381,363,0	warp	hugel42	1,1,hugel,209,224
+hu_in01,380,319,0	warp	hugel43	1,1,hu_in01,382,388
+hu_in01,388,388,0	warp	hugel44	1,1,hu_in01,385,319
+
+//Other
+hu_in01,177,90,0	warp	hugel45	1,1,hugel,52,95
+hu_in01,107,90,0	warp	hugel46	1,1,hugel,52,95
+hu_in01,85,108,0	warp	hugel47	1,1,hu_in01,85,155
+hu_in01,85,151,0	warp	hugel48	1,1,hu_in01,85,104
+hu_in01,85,70,0	warp	hugel49	1,1,hu_in01,85,25
+hu_in01,85,29,0	warp	hugel50	1,1,hu_in01,85,74
+
+//Pub
+hugel,129,66,0	warp	hugel51	1,1,hu_in01,350,107
+hu_in01,345,107,0	warp	hugel52	1,1,hugel,126,64
+hu_in01,381,118,0	warp	hugel53	1,1,hu_in01,379,173
+hu_in01,379,178,0	warp	hugel54	1,1,hu_in01,376,118
+
+//House
+hugel,153,216,0	warp	hugel55	1,1,hu_in01,305,379
+hu_in01,301,379,0	warp	hugel56	1,1,hugel,147,216
+hu_in01,314,386,0	warp	hugel57	1,1,hu_in01,312,322
+hu_in01,307,322,0	warp	hugel58	1,1,hu_in01,310,386
+
+//House (Unofficial)
+hugel,80,230,0	warp	hugel59	1,1,hu_in01,24,363
+hu_in01,24,361,0	warp	hugel60	1,1,hugel,82,230
+
+//Bingo
+hugel,55,208,0	warp	hugelwarp1051	1,1,que_bingo,49,9
+que_bingo,49,7,0	warp	hugelwarp1052	1,1,hugel,57,207
+que_bingo,39,34,0	warp	hugelwarp1053	1,1,que_bingo,34,109
+que_bingo,34,105,0	warp	hugelwarp1054	1,1,que_bingo,38,28
+que_bingo,53,34,0	warp	hugelwarp1055	1,1,que_bingo,49,71
+que_bingo,48,66,0	warp	hugelwarp1056	1,1,que_bingo,53,29
diff --git a/npc/pre-re/warps/cities/izlude.txt b/npc/pre-re/warps/cities/izlude.txt
new file mode 100644
index 000000000..f2f1b6aaa
--- /dev/null
+++ b/npc/pre-re/warps/cities/izlude.txt
@@ -0,0 +1,34 @@
+//===== rAthena Script =======================================
+//= Izlude Warp Script
+//===== By: ==================================================
+//= Athena (1.0), Nana (1.1)
+//===== Current Version: =====================================
+//= 1.4
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Izlude
+//===== Additional Comments: =================================
+//= 1.3 Added warps to Izlude Airship [Justin84]
+//= 1.4 Minor correction on airport warps
+//============================================================
+
+//= Izlude City ==============================================
+izlude,109,151,0	warp	iz01	3,3,izlude_in,65,87
+izlude,148,148,0	warp	iz02	2,2,izlude_in,116,49
+izlude,216,129,0	warp	iz03	3,2,izlude_in,151,127
+izlude,30,78,0	warp	iz001	3,3,prt_fild08,367,212
+izlude,52,140,0	warp	iz04	2,2,izlude_in,74,161
+izlude_in,108,169,0	warp	iz05	2,3,izlude_in,84,169
+izlude_in,116,46,0	warp	iz02-1	3,2,izlude,145,145
+izlude_in,148,127,0	warp	iz03-1	2,5,izlude,212,129
+izlude_in,171,97,0	warp	iz06	3,2,izlude_in,172,119
+izlude_in,172,116,0	warp	iz06-1	3,2,izlude_in,172,94
+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,43,169,0	warp	w219	2,3,izlude_in,64,169
+izlude_in,65,84,0	warp	iz01-1	5,2,izlude,113,147
+izlude_in,74,158,0	warp	iz04-1	3,2,izlude,52,136
+izlude_in,87,169,0	warp	iz05-1	2,3,izlude_in,111,169
+izlude,149,39,0	warp	izair1	1,1,izlude,182,56
+izlude,176,56,0	warp	lizair2	1,1,izlude,145,40
diff --git a/npc/pre-re/warps/cities/lighthalzen.txt b/npc/pre-re/warps/cities/lighthalzen.txt
new file mode 100644
index 000000000..04b9798c6
--- /dev/null
+++ b/npc/pre-re/warps/cities/lighthalzen.txt
@@ -0,0 +1,109 @@
+//===== rAthena Script =======================================
+//= Lighthalzen Warp Script
+//===== By: ==================================================
+//= Sara-chan (1.0)
+//===== Current Version: =====================================
+//= 1.9
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 8+
+//===== Description: =========================================
+//= Warp Points for Lighthalzen
+//===== Additional Comments: =================================
+//= 1.9 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//============================================================
+
+lighthalzen,101,248,0	warp	lhz_rekenber1-1	1,1,lhz_in01,111,126
+lhz_in01,111,121,0	warp	lhz_rekenber1-2	1,1,lighthalzen,101,243
+lighthalzen,106,248,0	warp	lhz_rekenber2-1	1,1,lhz_in01,116,126
+lhz_in01,116,121,0	warp	lhz_rekenber2-2	1,1,lighthalzen,106,243
+lhz_in01,88,215,0	warp	lhz_rekenber3-1	1,1,lhz_in01,106,18
+lhz_in01,106,15,0	warp	lhz_rekenber3-2	1,1,lhz_in01,88,211
+lhz_in01,140,215,0	warp	lhz_rekenber4-1	1,1,lhz_in01,158,18
+lhz_in01,158,15,0	warp	lhz_rekenber4-2	1,1,lhz_in01,140,211
+lhz_in01,149,179,0	warp	lhz_rekenber5-1	1,1,lhz_in01,15,24
+lhz_in01,11,24,0	warp	lhz_rekenber5-2	1,1,lhz_in01,145,178
+lhz_in01,76,254,0	warp	lhz_rekenber6-1	1,1,lhz_in01,100,52
+lhz_in01,98,55,0	warp	lhz_rekenber6-2	1,1,lhz_in01,76,250
+lhz_in01,188,254,0	warp	lhz_rekenber7-1	1,1,lhz_in01,191,52
+lhz_in01,194,55,0	warp	lhz_rekenber7-2	1,1,lhz_in01,188,250
+lhz_in01,231,226,0	warp	lhz_rekenber8-1	1,1,lhz_in01,257,226
+lhz_in01,251,226,0	warp	lhz_rekenber8-2	1,1,lhz_in01,225,226
+lhz_in01,40,224,0	warp	lhz_rekenber9-1	1,1,lhz_in01,19,129
+lhz_in01,15,129,0	warp	lhz_rekenber9-2	1,1,lhz_in01,34,224
+lhz_in01,43,144,0	warp	lhz_rekenber10-1	1,1,lhz_in01,278,161
+lhz_in01,278,157,0	warp	lhz_rekenber10-2	1,1,lhz_in01,43,139
+lhz_in01,58,129,0	warp	lhz_rekenber11-1	1,1,lhz_in01,196,127
+lhz_in01,191,127,0	warp	lhz_rekenber11-2	1,1,lhz_in01,53,129
+lighthalzen,198,257,0	warp	lhz_bank1-1	1,1,lhz_in02,39,28
+lhz_in02,44,28,0	warp	lhz_rekenberbank1-2	1,1,lighthalzen,203,257
+lighthalzen,236,276,0	warp	lhz_police1-1	1,1,lhz_in02,133,199
+lhz_in02,129,199,0	warp	lhz_police1-2	1,1,lighthalzen,232,275
+lighthalzen,238,220,0	warp	lhz_com1-1	1,1,lhz_in02,28,270
+lhz_in02,27,265,0	warp	lhz_com1-2	1,1,lighthalzen,238,217
+lhz_in02,13,284,0	warp	lhz_com2-1	1,1,lhz_in02,89,285
+lhz_in02,95,285,0	warp	lhz_com2-2	1,1,lhz_in02,18,284
+lhz_in02,114,272,0	warp	lhz_com3-1	1,1,lhz_in02,153,282
+lhz_in02,149,282,0	warp	lhz_com3-2	1,1,lhz_in02,109,272
+lighthalzen,93,110,0	warp	lhz_jewel1-1	1,1,lhz_in02,104,26
+lhz_in02,108,26,0	warp	lhz_jewel1-2	1,1,lighthalzen,96,110
+lighthalzen,197,36,0	warp	lhz_weapon1-1	1,1,lhz_in02,284,30
+lhz_in02,288,30,0	warp	lhz_weapon1-2	1,1,lighthalzen,194,35
+lighthalzen,196,46,0	warp	lhz_weapon2-1	1,1,lhz_in02,282,83
+lhz_in02,282,79,0	warp	lhz_weapon2-2	1,1,lighthalzen,194,48
+lhz_in02,265,14,0	warp	lhz_weapon3-1	1,1,lhz_in02,269,82
+lhz_in02,274,82,0	warp	lhz_weapon3-2	1,1,lhz_in02,270,14
+lighthalzen,159,133,0	warp	lhz_inn1-1	1,1,lhz_in02,232,265
+lhz_in02,232,261,0	warp	lhz_inn1-2	1,1,lighthalzen,158,129
+lhz_in02,210,284,0	warp	lhz_inn2-1	1,1,lhz_in02,241,219
+lhz_in02,236,219,0	warp	lhz_inn2-2	1,1,lhz_in02,206,284
+lhz_in02,250,278,0	warp	lhz_inn3-1	1,1,lhz_in02,265,278
+lhz_in02,261,278,0	warp	lhz_inn3-2	1,1,lhz_in02,246,278
+lhz_in02,254,212,0	warp	lhz_inn4-1	1,1,lhz_in02,273,212
+lhz_in02,269,212,0	warp	lhz_inn4-2	1,1,lhz_in02,250,212
+lhz_in02,238,169,0	warp	lhz_inn5-1	1,1,lhz_in02,238,150
+lhz_in02,238,154,0	warp	lhz_inn5-2	1,1,lhz_in02,238,173
+lhz_in02,231,182,0	warp	lhz_inn6-1	1,1,lhz_in02,212,182
+lhz_in02,216,182,0	warp	lhz_inn6-2	1,1,lhz_in02,235,182
+lhz_in02,231,200,0	warp	lhz_inn7-1	1,1,lhz_in02,212,200
+lhz_in02,216,200,0	warp	lhz_inn7-2	1,1,lhz_in02,235,200
+lighthalzen,198,163,0	warp	lhz_store1-1	1,1,lhz_in02,21,195
+lhz_in02,21,191,0	warp	lhz_store1-2	1,1,lighthalzen,202,160
+lhz_in02,39,204,0	warp	lhz_store2-1	1,1,lhz_in02,41,136
+lhz_in02,36,136,0	warp	lhz_store2-2	1,1,lhz_in02,34,204
+lhz_in02,13,155,0	warp	lhz_store3-1	1,1,lhz_in02,84,223
+lhz_in02,79,223,0	warp	lhz_store3-2	1,1,lhz_in02,17,155
+lhz_in02,49,154,0	warp	lhz_store4-1	1,1,lhz_in02,98,155
+lhz_in02,103,155,0	warp	lhz_store4-2	1,1,lhz_in02,44,154
+lhz_in02,94,212,0	warp	lhz_store5-1	1,1,lhz_in02,94,144
+lhz_in02,89,144,0	warp	lhz_store5-2	1,1,lhz_in02,89,212
+lighthalzen,324,301,0	warp	lhz_tool1-1	1,1,lhz_in03,241,100
+lhz_in03,237,100,0	warp	lhz_tool1-2	1,1,lighthalzen,322,296
+lhz_in03,257,83,0	warp	lhz_tool2-1	1,1,lhz_in03,255,14
+lhz_in03,250,14,0	warp	lhz_tool2-2	1,1,lhz_in03,252,83
+lighthalzen,347,261,0	warp	lhz_house1_1-1	1,1,lhz_in03,14,218
+lhz_in03,10,216,0	warp	lhz_house1_1-2	1,1,lighthalzen,341,261
+lighthalzen,345,231,0	warp	lhz_pub1-1	1,1,lhz_in03,188,15
+lhz_in03,188,11,0	warp	lhz_pub1-2	1,1,lighthalzen,344,227
+lhz_in03,191,35,0	warp	lhz_pub2-1	1,1,lhz_in03,191,103
+lhz_in03,190,100,0	warp	lhz_pub2-2	1,1,lhz_in03,190,31
+lighthalzen,50,86,0	warp	lhz_house2_1-1	1,1,lhz_in03,45,31
+lhz_in03,50,31,0	warp	lhz_house2_1-2	1,1,lighthalzen,55,86
+lhz_in03,13,31,0	warp	lhz_house2_2-1	1,1,lhz_in03,15,99
+lhz_in03,20,99,0	warp	lhz_house2_2-2	1,1,lhz_in03,17,31
+lighthalzen,251,299,0	warp	lhz_house3_1-1	1,1,lhz_in03,97,21
+lhz_in03,93,21,0	warp	lhz_house3_1-2	1,1,lighthalzen,247,299
+lhz_in03,134,14,0	warp	lhz_house3_2-1	1,1,lhz_in03,125,90
+lhz_in03,120,90,0	warp	lhz_house3_2-2	1,1,lhz_in03,130,14
+
+//============================================================ 
+// Old changelog
+//============================================================ 
+//= 1.3 Removed fields and dungeons warps from here [DracoRPG]
+//= 1.3a A small fix for a warp [MasterOfMuppets]
+//= 1.4 Lighthalzen warp, taken from korean eA site [Vicious]
+//= 1.4a Corrected warp for 'lhz013a' [Zephiris]
+//= 1.5 Added a few missing warps, thanks to Kargha [MasterOfMuppets]
+//= 1.6 Added a few more missing warps. [MasterOfMuppets]
+//= 1.7 Yet more missing warps implemented :P [MasterOfMuppets]
+//= 1.8 Added missing warps and moved some related to quests. [SinSloth]
+//============================================================
diff --git a/npc/pre-re/warps/cities/louyang.txt b/npc/pre-re/warps/cities/louyang.txt
new file mode 100644
index 000000000..11679d3b0
--- /dev/null
+++ b/npc/pre-re/warps/cities/louyang.txt
@@ -0,0 +1,56 @@
+//===== rAthena Script =======================================
+//= Lou Yang Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.5
+//===== Compatible With: =====================================
+//= Any Athena Version 6.0+
+//===== Description: =========================================
+//= [Aegis conversion]
+//= Warp Points for Louyang
+//===== Additional Comments: =================================
+//= 1.5 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//============================================================
+
+louyang,218,19,0	warp	lou_fild1-1	1,1,lou_fild01,233,353
+lou_fild01,233,356,0	warp	lou_fild1-2	1,1,louyang,218,22
+louyang,218,255,0	warp	lou_palace1-1	1,1,lou_in01,101,122
+lou_in01,101,119,0	warp	lou_palace1-2	1,1,louyang,218,252
+lou_in01,153,141,0	warp	lou_palace2-1	1,1,lou_in01,122,141
+lou_in01,125,141,0	warp	lou_palace2-2	1,1,lou_in01,156,141
+louyang,280,167,0	warp	lou_pub1-1	1,1,lou_in02,58,173
+lou_in02,58,170,0	warp	lou_pub1-2	1,1,louyang,280,164
+lou_in02,35,190,0	warp	lou_pub2-1	1,1,lou_in02,41,138
+lou_in02,44,138,0	warp	lou_pub2-2	1,1,lou_in02,37,190
+lou_in02,80,190,0	warp	lou_pub3-1	1,1,lou_in02,73,140
+lou_in02,71,140,0	warp	lou_pub3-2	1,1,lou_in02,77,190
+louyang,145,174,0	warp	lou_weapon1-1	1,1,lou_in02,126,168
+lou_in02,126,165,0	warp	lou_weapon1-2	1,1,louyang,145,171
+louyang,136,97,0	warp	lou_tool1-1	1,1,lou_in02,247,171
+lou_in02,249,173,0	warp	lou_tool1-2	1,1,louyang,136,99
+louyang,263,93,0	warp	lou_hospital1-1	1,1,lou_in02,245,59
+lou_in02,242,59,0	warp	lou_hospital1-2	1,1,louyang,260,93
+louyang,309,80,0	warp	lou_office1-1	1,1,lou_in02,189,77
+lou_in02,189,74,0	warp	lou_office1-2	1,1,louyang,309,77
+lou_in02,201,94,0	warp	lou_office2-1	1,1,lou_in02,173,46
+lou_in02,176,46,0	warp	lou_office2-2	1,1,lou_in02,203,94
+louyang,130,63,0	warp	lou_house11-1	1,1,lou_in02,72,31
+lou_in02,72,28,0	warp	lou_house11-2	1,1,louyang,130,60
+louyang,317,176,0	warp	lou_house21-1	1,1,lou_in02,121,31
+lou_in02,121,28,0	warp	lou_house21-2	1,1,louyang,317,173
+louyang,133,245,0	warp	lou_tower1-1	1,1,lou_in01,25,19
+lou_in01,28,19,0	warp	lou_tower1-2	1,1,louyang,136,245
+
+lou_in01,14,18,0	warp	lou_Towerexit	1,1,louyang,90,254
+
+//============================================================ 
+// Old changelog
+//============================================================ 
+//= 1.1 Added 2 escapes from 2 mountains 018,019 [Lupus]
+//=     Some players used to stuck there after warps
+//= 1.2 Added a few missing warps [MasterOfMuppets]
+//= 1.3 Fixed a few warp-back [erKURITA]
+//= 1.4 Moved some quest-related warps to proper file. [SinSloth]
+//= 1.4a Corrected some broken warp points. (bugreport:497) [Samuray22]
+//============================================================
diff --git a/npc/pre-re/warps/cities/lutie.txt b/npc/pre-re/warps/cities/lutie.txt
new file mode 100644
index 000000000..5f232974a
--- /dev/null
+++ b/npc/pre-re/warps/cities/lutie.txt
@@ -0,0 +1,39 @@
+//===== rAthena Script =======================================
+//= Lutie Warp Script
+//===== By: ==================================================
+//= Athena (1.0) Nana (1.1)
+//===== Current Version: =====================================
+//= 1.3
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 2+
+//===== Description: =========================================
+//= [Aegis Conversion]
+//= Warp Points for Lutie
+//===== Additional Comments: =================================
+//= 1.2a Re-fixed endless warping loop
+//= 1.3 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//============================================================
+
+xmas,149,41,0	warp	x_fild_out	8,1,xmas_fild01,80,248
+xmas,120,131,0	warp	xmas_tool1-1	1,1,xmas_in,43,33
+xmas_in,46,33,0	warp	xmas_tool1-2	1,1,xmas,123,131
+xmas,174,131,0	warp	xmas_gift1-1	1,1,xmas_in,155,32
+xmas_in,153,32,0	warp	xmas_gift1-2	1,1,xmas,172,131
+xmas,119,162,0	warp	xmas_house1-1	1,1,xmas_in,36,91
+xmas_in,38,89,0	warp	xmas_house1-2	1,1,xmas,122,159
+xmas,189,278,0	warp	xmas_house2-1	1,1,xmas_in,168,164
+xmas_in,168,160,0	warp	xmas_house2-2	1,1,xmas,189,275
+xmas,173,160,0	warp	xmas_weapon1-1	1,1,xmas_in,165,95
+xmas_in,163,93,0	warp	xmas_weapon1-2	1,1,xmas,172,158
+xmas,181,169,0	warp	xmas_weapon2-1	1,1,xmas_in,177,107
+xmas_in,179,109,0	warp	xmas_weapon2-2	1,1,xmas,184,168
+xmas,142,239,0	warp	xmas_santa1-1	1,1,xmas_in,94,85
+xmas_in,94,83,0	warp	xmas_santa1-2	1,1,xmas,142,237
+xmas,149,239,0	warp	xmas_santa2-1	1,1,xmas_in,104,85
+xmas_in,104,83,0	warp	xmas_santa2-2	1,1,xmas,149,237
+xmas,142,258,0	warp	xmas_santa3-1	1,1,xmas_in,94,115
+xmas_in,94,117,0	warp	xmas_santa3-2	1,1,xmas,142,260
+xmas,149,258,0	warp	xmas_santa4-1	1,1,xmas_in,104,115
+xmas_in,104,117,0	warp	xmas_santa4-2	1,1,xmas,149,260
+xmas,104,289,0	warp	xmas_church1-1	1,1,xmas_in,30,163
+xmas_in,30,161,0	warp	xmas_church2-2	1,1,xmas,104,286
diff --git a/npc/pre-re/warps/cities/malangdo.txt b/npc/pre-re/warps/cities/malangdo.txt
new file mode 100644
index 000000000..11810196b
--- /dev/null
+++ b/npc/pre-re/warps/cities/malangdo.txt
@@ -0,0 +1,63 @@
+//===== rAthena Script =======================================
+//= Malangdo Island Warp Script
+//===== By: ==================================================
+//= Chilly
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: =========================================
+//= Warp Points for Malangdo Island
+//===== Additional Comments: =================================
+//= 1.0 First version
+//============================================================
+
+// Town Warps
+malangdo,240,150,0	warp	malangdo0001	1,1,mal_in01,12,16
+mal_in01,9,16,0	warp	malangdo0002	1,1,malangdo,237,150
+mal_in01,20,15,0	warp	malangdo0003	1,1,mal_in01,67,9
+mal_in01,67,12,0	warp	malangdo0004	1,1,mal_in01,20,12
+malangdo,112,168,0	warp	malangdo0005	1,1,mal_in01,18,164
+mal_in01,18,161,0	warp	malangdo0006	1,1,malangdo,114,166
+mal_in01,18,173,0	warp	malangdo0007	1,1,mal_in01,72,174
+mal_in01,75,174,0	warp	malangdo0008	1,1,mal_in01,18,170
+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,27,119
+mal_in01,30,119,0	warp	malangdo0012	1,1,malangdo,116,151
+mal_in01,20,119,0	warp	malangdo0013	1,1,mal_in01,67,115
+mal_in01,67,118,0	warp	malangdo0014	1,1,mal_in01,20,116
+malangdo,119,137,0	warp	malangdo0015	1,1,mal_in01,35,217
+mal_in01,38,217,0	warp	malangdo0016	1,1,malangdo,122,137
+mal_in01,11,218,0	warp	malangdo0017	1,1,mal_in01,75,219
+mal_in01,75,222,0	warp	malangdo0018	1,1,mal_in01,11,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,79,216
+malangdo,135,109,0	warp	malangdo0021	1,1,mal_in01,18,75
+mal_in01,18,78,0	warp	malangdo0022	1,1,malangdo,135,112
+mal_in01,18,67,0	warp	malangdo0023	1,1,mal_in01,67,63
+mal_in01,67,66,0	warp	malangdo0024	1,1,mal_in01,21,67
+malangdo,135,276,0	warp	malangdo0025	1,1,mal_in01,163,16
+mal_in01,163,13,0	warp	malangdo0026	1,1,malangdo,135,273
+malangdo,73,239,0	warp	malangdo0027	1,1,mal_dun01,33,230
+mal_dun01,30,230,0	warp	malangdo0028	1,1,malangdo,75,237
+
+// Ship Warps
+malangdo,162,163,0	warp	malangdo_ship0001	1,1,mal_in02,57,61
+mal_in02,60,61,0	warp	malangdo_ship0002	1,1,malangdo,164,161
+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,54,60
+mal_in02,63,53,0	warp	malangdo_ship0005	1,1,mal_in02,63,32
+mal_in02,63,35,0	warp	malangdo_ship0006	1,1,mal_in02,63,56
+mal_in02,63,66,0	warp	malangdo_ship0007	1,1,mal_in02,64,90
+mal_in02,64,87,0	warp	malangdo_ship0008	1,1,mal_in02,63,63
+mal_in02,101,53,0	warp	malangdo_ship0009	1,1,mal_in02,101,32
+mal_in02,101,35,0	warp	malangdo_ship0010	1,1,mal_in02,101,56
+mal_in02,101,66,0	warp	malangdo_ship0011	1,1,mal_in02,102,90
+mal_in02,102,87,0	warp	malangdo_ship0012	1,1,mal_in02,101,63
+mal_in02,137,53,0	warp	malangdo_ship0013	1,1,mal_in02,139,32
+mal_in02,139,35,0	warp	malangdo_ship0014	1,1,mal_in02,137,56
+mal_in02,137,66,0	warp	malangdo_ship0015	1,1,mal_in02,140,90
+mal_in02,140,87,0	warp	malangdo_ship0016	1,1,mal_in02,137,63
+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,139,60
diff --git a/npc/pre-re/warps/cities/malaya.txt b/npc/pre-re/warps/cities/malaya.txt
new file mode 100644
index 000000000..3a8b1002e
--- /dev/null
+++ b/npc/pre-re/warps/cities/malaya.txt
@@ -0,0 +1,46 @@
+//===== rAthena Script =======================================
+//= Malaya Port Warp Script
+//===== By: ==================================================
+//= Chilly
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: =========================================
+//= Warp Points for Malaya Port
+//===== Additional Comments: =================================
+//= 1.0 First Version.
+//============================================================
+
+// Town Warps
+malaya,309,70,0	warp	malaya_field0001	1,1,ma_in01,108,92
+ma_in01,105,92,0	warp	malaya_field0002	1,1,malaya,310,67
+malaya,300,211,0	warp	malaya_field0003	1,1,ma_in01,36,152
+ma_in01,33,152,0	warp	malaya_field0004	1,1,malaya,297,211
+malaya,178,211,0	warp	malaya_field0005	1,1,ma_in01,24,80
+ma_in01,24,77,0	warp	malaya_field0006	1,1,malaya,178,208
+malaya,112,212,0	warp	malaya_field0007	1,1,ma_in01,83,16
+ma_in01,86,16,0	warp	malaya_field0008	1,1,malaya,115,212
+malaya,299,167,0	warp	malaya_field0009	1,1,ma_in01,12,24
+ma_in01,9,24,0	warp	malaya_field0010	1,1,malaya,296,167
+malaya,261,240,0	warp	malaya_field0011	1,1,ma_in01,126,20
+ma_in01,126,17,0	warp	malaya_field0012	1,1,malaya,261,237
+malaya,370,277,0	warp	malaya_field0013	1,1,ma_fild01,40,272
+ma_fild01,37,272,0	warp	malaya_field0014	1,1,malaya,367,277
+ma_fild01,266,359,0	warp	malaya_field0015	1,1,ma_fild02,248,36
+ma_fild02,248,33,0	warp	malaya_field0016	1,1,ma_fild01,266,356
+ma_fild01,251,190,0	warp	malaya_field0017	1,1,ma_in01,108,160
+ma_in01,105,160,0	warp	malaya_field0018	1,1,ma_fild01,249,192
+ma_fild01,288,52,0	warp	malaya_field0019	1,1,ma_scene01,142,78
+ma_scene01,140,80,0	warp	malaya_field0020	1,1,ma_fild01,288,55
+
+// Car Warps
+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/pre-re/warps/cities/manuk.txt b/npc/pre-re/warps/cities/manuk.txt
new file mode 100644
index 000000000..c7d63169c
--- /dev/null
+++ b/npc/pre-re/warps/cities/manuk.txt
@@ -0,0 +1,53 @@
+//===== rAthena Script =======================================
+//= Manuk warp points.
+//===== By: ==================================================
+//= L0ne_W0lf
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 13.2+
+//===== Description: =========================================
+//= [Aegis Conversion]
+//= Warp Points for Manuk
+//===== Additional Comments: =================================
+//= First version.
+//============================================================
+
+manuk,311,142,0	warp	manuk1-1	1,1,man_in01,277,41
+man_in01,275,41,0	warp	manuk1-2	1,1,manuk,309,142
+manuk,310,201,0	warp	manuk2-1	1,1,man_in01,358,121
+man_in01,358,119,0	warp	manuk2-2	1,1,manuk,310,199
+manuk,255,110,0	warp	manuk3-1	1,1,man_in01,7,61
+man_in01,5,61,0	warp	manuk3-2	1,1,manuk,253,110
+man_in01,318,17,0	warp	manuk3-4	1,1,man_in01,388,16
+man_in01,390,16,0	warp	manuk3-5	1,1,man_in01,316,17
+man_in01,328,141,0	warp	manuk3-6	1,1,man_in01,324,220
+man_in01,324,222,0	warp	manuk3-7	1,1,man_in01,328,139
+man_in01,11,19,0	warp	manuk3-8	1,1,man_in01,182,32
+man_in01,182,34,0	warp	manuk3-9	1,1,man_in01,11,21
+manuk,257,228,0	warp	manuk4-1	1,1,man_in01,130,267
+man_in01,130,265,0	warp	manuk4-2	1,1,manuk,258,226
+manuk,265,237,0	warp	manuk5-1	1,1,man_in01,180,267
+man_in01,180,265,0	warp	manuk5-2	1,1,manuk,267,235
+manuk,276,247,0	warp	manuk6-1	1,1,man_in01,230,267
+man_in01,230,265,0	warp	manuk6-2	1,1,manuk,276,245
+manuk,288,249,0	warp	manuk7-1	1,1,man_in01,280,267
+man_in01,280,265,0	warp	manuk7-2	1,1,manuk,289,247
+manuk,302,243,0	warp	manuk8-1	1,1,man_in01,330,267
+man_in01,330,265,0	warp	mauk8-2	1,1,manuk,300,241
+manuk,311,234,0	warp	manuk9-1	1,1,man_in01,380,267
+man_in01,380,265,0	warp	manuk9-2	1,1,manuk,309,232
+manuk,253,195,0	warp	manuk10-1	1,1,man_in01,24,284
+man_in01,26,284,0	warp	manuk10-2	1,1,manuk,255,195
+manuk,235,124,0	warp	manuk11-1	1,1,man_in01,70,171
+man_in01,70,169,0	warp	manuk11-2	1,1,manuk,235,122
+manuk,279,115,0	warp	manuk12-1	1,1,man_in01,123,224
+man_in01,123,226,0	warp	manuk12-2	1,1,manuk,278,117
+man_in01,5,275,0	warp	manuk12-3	1,1,man_in01,7,221
+man_in01,7,219,0	warp	manuk12-4	1,1,man_in01,7,276
+man_in01,22,275,0	warp	manuk12-5	1,1,man_in01,76,279
+man_in01,74,279,0	warp	manuk12-6	1,1,man_in01,20,275
+man_in01,61,190,0	warp	manuk12-7	1,1,man_in01,63,238
+man_in01,61,238,0	warp	manuk12-8	1,1,man_in01,61,188
+man_in01,61,173,0	warp	manuk12-9	1,1,man_in01,20,173
+man_in01,20,175,0	warp	manuk12-10	1,1,man_in01,61,175
diff --git a/npc/pre-re/warps/cities/mid_camp.txt b/npc/pre-re/warps/cities/mid_camp.txt
new file mode 100644
index 000000000..ed373f631
--- /dev/null
+++ b/npc/pre-re/warps/cities/mid_camp.txt
@@ -0,0 +1,47 @@
+//===== rAthena Script =======================================
+//= Another World Warp Script
+//===== By: ==================================================
+//= L0ne_W0lf
+//===== Current Version: =====================================
+//= 1.4
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= [Aegis Conversion]
+//= Warp Points for Another World
+//= Warp points to and from fild22b and mid_camp are temporary.
+//===== Additional Comments: =================================
+//= 1.0 First Version.
+//= 1.1 Fixed a small bug by brianlew, bugreport:1824 [Brainstorm]
+//= 1.2 Corrected the observatory warp portal, thanks to Ziu. [brianluau]
+//= 1.3 Added warps, and also Updated warp positions. [L0ne_W0lf]
+//= 1.4 Removed the warp from midgard camp to morroc field. [L0ne_W0lf]
+//============================================================
+
+mid_camp,205,211,0	warp	mid_weapon1-1	1,1,mid_campin,229,123
+mid_campin,232,123,0	warp	mid_weapon1-2	1,1,mid_camp,208,211
+mid_camp,196,204,0	warp	mid_weapon2-1	1,1,mid_campin,220,109
+mid_campin,223,109,0	warp	mid_weapon2-2	1,1,mid_camp,198,205
+mid_camp,214,249,0	warp	mid_meeting1-1	1,1,mid_campin,89,102
+mid_campin,89,99,0	warp	mid_meeting1-2	1,1,mid_camp,215,247
+mid_campin,66,114,0	warp	mid_meeting2-1	1,1,mid_campin,22,80
+mid_campin,25,80,0	warp	mid_meeting2-2	1,1,mid_campin,70,114
+mid_campin,66,120,0	warp	mid_meeting3-1	1,1,mid_campin,22,124
+mid_campin,25,124,0	warp	mid_meeting3-2	1,1,mid_campin,70,120
+mid_campin,68,128,0	warp	mid_meeting4-1	1,1,mid_campin,22,168
+mid_campin,25,168,0	warp	mid_meeting4-2	1,1,mid_campin,71,128
+mid_campin,86,141,0	warp	mid_meeting5-1	1,1,mid_campin,66,181
+mid_campin,65,178,0	warp	mid_meeting5-2	1,1,mid_campin,86,138
+mid_campin,94,141,0	warp	mid_meeting6-1	1,1,mid_campin,117,181
+mid_campin,117,178,0	warp	mid_meeting6-2	1,1,mid_campin,94,138
+mid_campin,111,128,0	warp	mid_meeting7-1	1,1,mid_campin,165,170
+mid_campin,162,170,0	warp	mid_meeting7-2	1,1,mid_campin,108,128
+mid_campin,113,120,0	warp	mid_meeting8-1	1,1,mid_campin,165,126
+mid_campin,162,126,0	warp	mid_meeting8-2	1,1,mid_campin,110,120
+mid_campin,113,114,0	warp	mid_meeting9-1	1,1,mid_campin,165,82
+mid_campin,162,82,0	warp	mid_meeting9-2	1,1,mid_campin,110,114
+mid_camp,266,260,0	warp	mid_house1-1	1,1,mid_campin,284,124
+mid_campin,282,124,0	warp	mid_house1-2	1,1,mid_camp,263,260
+mid_camp,163,231,0	warp	mid_house2-1	1,1,mid_campin,376,133
+mid_campin,376,136,0	warp	mid_house2-2	1,1,mid_camp,163,234
+
diff --git a/npc/pre-re/warps/cities/morroc.txt b/npc/pre-re/warps/cities/morroc.txt
new file mode 100644
index 000000000..8b95ed497
--- /dev/null
+++ b/npc/pre-re/warps/cities/morroc.txt
@@ -0,0 +1,110 @@
+//===== rAthena Script =======================================
+//= Morroc Warp Script
+//===== By: ==================================================
+//= Athena (1.0)
+//= Nana (1.2)
+//===== Current Version: =====================================
+//= 1.3
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Morroc and Assassin Guild
+//===== Additional Comments: =================================
+//= 1.3 Updated warps for episode 12.1 [L0ne_W0lf]
+//============================================================
+
+//= Morroc City ==============================================
+morocc,160,17,0	warp	moc001	2,2,moc_fild12,159,378
+//morocc,160,183,0	warp	moc002	2,1,moc_castle,94,181
+morocc,160,297,0	warp	moc003	2,2,moc_fild07,198,25
+morocc,197,66,0	warp	moc01	1,1,morocc_in,83,92
+//morocc,22,294,0	warp	moc02	2,5,moc_ruins,156,42
+morocc,27,294,0	warp	moc02	2,5,moc_ruins,156,42
+morocc,24,164,0	warp	moc004	1,2,moc_fild19,164,107
+morocc,253,56,0	warp	moc03	2,1,morocc_in,134,74
+//morocc,26,297,0	warp	moc02-1	5,2,moc_ruins,156,42
+morocc,274,269,0	warp	moc04	2,2,morocc_in,138,136
+morocc,283,170,0	warp	moc07	2,2,morocc_in,108,176
+//morocc,302,207,0	warp	moc005	2,2,moc_fild10,22,207
+morocc,299,207,0	warp	moc005	2,2,moc_fild20,36,177
+morocc,46,46,0	warp	moc05	2,1,morocc_in,68,72
+morocc,52,259,0	warp	moc06	1,2,morocc_in,180,65
+morocc,85,55,0	warp	moc08	2,2,morocc_in,44,149
+morocc,98,68,0	warp	moc09	1,1,morocc_in,44,175
+morocc_in,105,95,0	warp	moc10-1	1,3,morocc_in,90,95
+morocc_in,106,123,0	warp	moc11-1	1,3,morocc_in,90,123
+morocc_in,108,179,0	warp	moc07-1	2,2,morocc,283,173
+morocc_in,134,77,0	warp	moc03-1	3,1,morocc,251,59
+morocc_in,136,136,0	warp	moc04-1	1,4,morocc,271,269
+morocc_in,144,109,0	warp	moc12-1	3,1,morocc_in,144,125
+morocc_in,144,122,0	warp	moc12	3,1,morocc_in,144,106
+morocc_in,144,151,0	warp	moc13	3,1,morocc_in,144,169
+morocc_in,144,166,0	warp	moc13-1	3,1,morocc_in,144,148
+morocc_in,149,129,0	warp	moc14	1,2,morocc_in,169,129
+morocc_in,166,130,0	warp	moc14-1	1,3,morocc_in,146,130
+morocc_in,171,37,0	warp	moc15-1	4,1,morocc_in,171,52
+morocc_in,171,50,0	warp	moc15	4,1,morocc_in,171,35
+morocc_in,174,109,0	warp	moc22	3,1,morocc_in,174,125
+morocc_in,174,122,0	warp	moc22-1	3,1,morocc_in,174,106
+morocc_in,174,151,0	warp	moc16	3,1,morocc_in,174,169
+morocc_in,174,166,0	warp	moc16-1	3,1,morocc_in,174,148
+morocc_in,183,65,0	warp	moc06-1	2,3,morocc,55,259
+morocc_in,23,161,0	warp	moc17	1,2,morocc_in,37,161
+morocc_in,34,161,0	warp	moc17-1	1,2,morocc_in,20,161
+morocc_in,44,146,0	warp	moc08-1	3,2,morocc,82,52
+morocc_in,44,178,0	warp	moc09-1	2,2,morocc,100,70
+morocc_in,55,123,0	warp	moc18-1	1,3,morocc_in,71,123
+morocc_in,55,95,0	warp	moc19-1	1,3,morocc_in,71,95
+morocc_in,57,161,0	warp	moc20	1,3,morocc_in,73,161
+morocc_in,68,123,0	warp	moc18	1,3,morocc_in,52,123
+morocc_in,68,42,0	warp	moc21-1	2,1,morocc_in,68,65
+morocc_in,68,62,0	warp	moc21	2,1,morocc_in,68,38
+morocc_in,68,75,0	warp	moc05-1	2,1,morocc,49,49
+morocc_in,68,95,0	warp	moc19	1,3,morocc_in,52,95
+morocc_in,70,161,0	warp	moc20-1	1,3,morocc_in,54,161
+morocc_in,83,90,0	warp	moc01-1	4,1,morocc,199,64
+morocc_in,86,101,0	warp	moc23	2,1,morocc_in,86,120
+morocc_in,86,117,0	warp	moc23-1	3,1,morocc_in,86,98
+morocc_in,93,123,0	warp	moc11	1,3,morocc_in,109,123
+morocc_in,93,95,0	warp	moc10	1,3,morocc_in,109,95
+
+//= Morroc Ruins ============================================
+moc_ruins,159,39,0	warp	moc02-2	2,4,morocc,30,290
+//moc_ruins,161,40,0	warp	moc02-2	2,4,morocc,26,293
+//moc_ruins,157,37,0	warp	moc02-3	5,2,morocc,26,293
+moc_ruins,54,161,0	warp	moc006	2,3,moc_pryd01,192,9
+moc_ruins,71,16,0	warp	moc007	8,2,moc_fild19,71,167
+
+//= Morroc Castle ===========================================
+//moc_castle,94,183,0	warp	mocc001	2,1,morocc,160,185
+//moc_castle,107,163,0	warp	mocc01	2,3,moc_castle,124,163
+//moc_castle,120,163,0	warp	mocc01-1	2,3,moc_castle,103,163
+//moc_castle,120,75,0	warp	mocc02	2,3,moc_castle,56,33
+//moc_castle,59,34,0	warp	mocc02-1	2,3,moc_castle,124,75
+//moc_castle,134,101,0	warp	mocc03	1,1,moc_castle,134,128
+//moc_castle,134,124,0	warp	mocc-03	2,2,moc_castle,134,98
+//moc_castle,134,139,0	warp	mocc04	1,1,moc_castle,134,160
+//moc_castle,134,156,0	warp	mocc04-1	2,2,moc_castle,134,136
+//moc_castle,149,163,0	warp	mocc05	2,3,moc_castle,162,163
+//moc_castle,158,163,0	warp	mocc05-1	2,3,moc_castle,145,163
+//moc_castle,16,131,0	warp	mocc06	1,2,moc_castle,16,164
+//moc_castle,16,160,0	warp	mocc06-1	1,2,moc_castle,16,125
+//moc_castle,170,131,0	warp	mocc07	2,2,moc_castle,170,163
+//moc_castle,170,160,0	warp	mocc07-1	1,1,moc_castle,170,128
+//moc_castle,29,163,0	warp	mocc08	2,2,moc_castle,44,163
+//moc_castle,40,163,0	warp	mocc08-1	2,2,moc_castle,25,163
+//moc_castle,51,114,0	warp	mocc09	3,2,moc_castle,54,65
+//moc_castle,54,69,0	warp	mocc09-1	3,2,moc_castle,52,117
+//moc_castle,54,139,0	warp	mocc10	2,2,moc_castle,54,160
+//moc_castle,54,156,0	warp	mocc10-1	2,2,moc_castle,54,134
+//moc_castle,63,89,0	warp	mocc11	2,3,moc_castle,83,89
+//moc_castle,80,89,0	warp	mocc11-1	2,3,moc_castle,60,89
+//moc_castle,69,163,0	warp	mocc12	2,2,moc_castle,86,163
+//moc_castle,82,163,0	warp	mocc12-1	2,2,moc_castle,66,163
+//moc_castle,88,93,0	warp	mocc13	1,1,moc_castle,94,119
+//moc_castle,94,116,0	warp	mocc13-1	1,1,moc_castle,88,90
+//moc_castle,96,90,0	warp	mocc13-2	1,1,moc_castle,94,119
+//moc_castle,92,67,0	warp	mocc14	3,2,moc_castle,92,85
+//moc_castle,92,82,0	warp	mocc14-1	3,2,moc_castle,92,63
+//moc_castle,94,143,0	warp	mocc15	3,2,moc_castle,94,160
+//moc_castle,94,156,0	warp	mocc15-1	3,2,moc_castle,94,140
diff --git a/npc/pre-re/warps/cities/moscovia.txt b/npc/pre-re/warps/cities/moscovia.txt
new file mode 100644
index 000000000..408753e3a
--- /dev/null
+++ b/npc/pre-re/warps/cities/moscovia.txt
@@ -0,0 +1,45 @@
+//===== rAthena Script =======================================
+//= Moscovia City Warp Script
+//===== By: ==================================================
+//= $ephiroth
+//===== Current Version: =====================================
+//= 1.2
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Moscovia City
+//===== Additional Comments: =================================
+//= 1.0 Initial version [$ephiroth]
+//= 1.1 Fixed "Private House" Warps. [Samuray22]
+//	-Thanks to $ephiroth
+//= 1.2 Updated from jA
+//============================================================
+
+// ---[ Mansion ]--- 
+moscovia,256,138,0	warp	moskwarp1001	1,1,mosk_in,96,61
+mosk_in,93,61,0	warp	moskwarp1002	1,1,moscovia,255,140
+mosk_in,99,126,0	warp	moskwarp1003	1,1,mosk_in,21,116
+mosk_in,21,113,0	warp	moskwarp1004	1,1,mosk_in,99,123
+// ---[ Weapon House ]--- 
+moscovia,185,188,0	warp	moskwarp1005	1,1,mosk_in,15,179
+mosk_in,12,179,0	warp	moskwarp1006	1,1,moscovia,186,191
+moscovia,203,171,0	warp	moskwarp1007	1,1,mosk_in,86,180
+mosk_in,89,180,0	warp	moskwarp1008	1,1,moscovia,204,169
+// ---[ Instrument House / Tool Dealer ]--- 
+moscovia,223,174,0	warp	moskwarp1009	1,1,mosk_in,14,246
+mosk_in,11,246,0	warp	moskwarp1010	1,1,moscovia,222,176
+// ---[ Inn ]--- 
+moscovia,229,208,0	warp	moskwarp1011	1,1,mosk_in,142,178
+mosk_in,142,175,0	warp	moskwarp1012	1,1,moscovia,227,207
+mosk_in,150,192,0	warp	moskwarp1013	1,1,mosk_in,204,188
+mosk_in,202,188,0	warp	moskwarp1014	1,1,mosk_in,148,192
+// ---[ Mansion ]--- 
+moscovia,256,179,0	warp	moskwarp1015	1,1,mosk_in,211,114
+mosk_in,211,111,0	warp	moskwarp1016	1,1,moscovia,253,179
+mosk_in,222,128,0	warp	moskwarp1017	1,1,mosk_in,288,118
+mosk_in,288,116,0	warp	moskwarp1018	1,1,mosk_in,222,126
+// ---[ Private House ]--- 
+moscovia,205,98,0	warp	moskwarp1021	1,1,mosk_in,214,255
+mosk_in,214,252,0	warp	moskwarp1022	1,1,moscovia,203,96
+mosk_in,220,273,0	warp	moskwarp1023	1,1,mosk_in,152,275
+mosk_in,152,272,0	warp	moskwarp1024	1,1,mosk_in,220,270
diff --git a/npc/pre-re/warps/cities/nameless.txt b/npc/pre-re/warps/cities/nameless.txt
new file mode 100644
index 000000000..3c126e978
--- /dev/null
+++ b/npc/pre-re/warps/cities/nameless.txt
@@ -0,0 +1,24 @@
+//===== rAthena Script =======================================
+//= Nameless Island Warp Script
+//===== By: ==================================================
+//= $ephiroth
+//===== Current Version: =====================================
+//= 1.3
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Nameless Island
+//===== Additional Comments: =================================
+//= 1.0 Initial version [$ephiroth]
+//= 1.1 Added SinSloth's warper to this file [Playtester]
+//= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
+//= 1.3 Removed SinSloth's warper from this file [L0ne_W0lf]
+//============================================================
+
+nameless_n,157,184,0	warp	namelesswarp0401	1,1,abbey01,51,12
+nameless_i,252,130,0	warp	namelesswarp1003	1,1,nameless_in,26,128
+nameless_in,23,128,0	warp	namelesswarp1004	1,1,nameless_i,249,130
+nameless_i,79,256,0	warp	namelesswarp1005	1,1,nameless_in,12,172
+nameless_in,12,169,0	warp	namelesswarp1006	1,1,nameless_i,82,256
+nameless_i,78,94,0	warp	namelesswarp1007	1,1,nameless_in,96,180
+nameless_in,96,177,0	warp	namelesswarp1008	1,1,nameless_i,81,96
diff --git a/npc/pre-re/warps/cities/niflheim.txt b/npc/pre-re/warps/cities/niflheim.txt
new file mode 100644
index 000000000..62bc29ad2
--- /dev/null
+++ b/npc/pre-re/warps/cities/niflheim.txt
@@ -0,0 +1,53 @@
+//===== rAthena Script =======================================
+//= Niflheim Warp Script
+//===== By: ==================================================
+//= PKGINGO (1.0)
+//===== Current Version: =====================================
+//= 1.2
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 6+
+//===== Description: =========================================
+//= Warp Points for Niflheim
+//===== Additional Comments: =================================
+//= Extracted from Vidar -> Athena
+//= V1.1: Added Inn and House warps needed for the Piano
+//=       Quest. [Skotlex
+//= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
+//============================================================
+
+//Niflheim Fields
+nif_fild01,345,323,0	warp	nwarp7	1,1,nif_fild02,23,312
+nif_fild02,21,312,0	warp	nwarp8	1,1,nif_fild01,343,322
+nif_fild02,379,235,0	warp	nwarp9	1,1,niflheim,20,153
+niflheim,18,151,0	warp	nwarp10	1,1,nif_fild02,376,235
+
+//Niflheim Town
+
+//Weapon shop
+niflheim,220,169,0	warp	nwarp11	1,1,nif_in,14,88
+nif_in,11,88,0	warp	nwarp12	1,1,niflheim,218,170
+
+//Item shop: 134,12
+niflheim,219,199,0	warp	nwarp13	1,1,nif_in,136,14
+nif_in,134,12,0	warp	nwarp14	1,1,niflheim,218,197
+
+//House
+niflheim,190,241,0	warp	nwarp19a	1,1,nif_in,81,77
+nif_in,78,74,0	warp	nwarp20a	1,1,niflheim,187,241
+
+//Inn
+niflheim,189,211,0	warp	nwarp21a	1,1,nif_in,20,14
+nif_in,23,12,0	warp	nwarp22a	1,1,niflheim,189,207
+nif_in,34,34,0	warp	nwarp23	1,1,nif_in,88,31
+nif_in,88,29,0	warp	nwarp24	1,1,nif_in,34,31
+
+//House on the hill
+niflheim,255,194,0	warp	nwarp15	1,1,nif_in,20,156
+nif_in,18,154,0	warp	nwarp16	1,1,niflheim,254,192
+nif_in,65,168,0	warp	nwarp17	1,1,nif_in,141,174
+nif_in,140,171,0	warp	nwarp18	1,1,nif_in,65,165
+
+niflheim,165,162,0	warp	nwarp19	1,1,nif_in,156,80
+nif_in,169,82,0	warp	nwarp20	1,1,nif_in,189,105
+nif_in,186,105,0	warp	nwarp21	1,1,nif_in,167,82
+nif_in,154,78,0	warp	nwarp22	1,1,niflheim,167,161
diff --git a/npc/pre-re/warps/cities/payon.txt b/npc/pre-re/warps/cities/payon.txt
new file mode 100644
index 000000000..cd0d31f11
--- /dev/null
+++ b/npc/pre-re/warps/cities/payon.txt
@@ -0,0 +1,138 @@
+//===== rAthena Script ======================================= 
+//= Payon Warps
+//===== By: ================================================== 
+//= Muad Dib (1.0)
+//= Darkchild (1.1)
+//= Nana (1.3)
+//===== Current Version: ===================================== 
+//= 1.7
+//===== Compatible With: ===================================== 
+//= Any rAthena Mod
+//===== Description: ========================================= 
+//= Payon warps
+//===== Additional Comments: ================================= 
+//= Warps Done By Muad Dib, All Credits To Him
+//= 1.2 Removed Duplicated Warp
+//= 1.3 Separated and reorganized field and dungeons
+//= 1.4 Fixed warp payonwarp031 [Yor]
+//= 1.5 Removed Payonwarp006, it was a duplicate [MasterOfMuppets]
+//= 1.6 Changed trigger area of payon -> pay_fild08  warp. [L0ne_W0lf]
+//= 1.7 Moved Castle Map warps to warps/guild/guildcastles.txt. [Masao]
+//============================================================
+
+// == Official Warps From kRO Screenshots ==
+
+// -- Entrance / Exit --
+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
+
+// -- 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
+
+// -- 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
+
+// -- 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
+
+// -- 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
+
+// -- 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_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
+
+// -- 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
+
+// -- 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
+
+
+// == 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
+
+// -- Big Kitchen --
+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
+
+// -- 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
diff --git a/npc/pre-re/warps/cities/prontera.txt b/npc/pre-re/warps/cities/prontera.txt
new file mode 100644
index 000000000..93948e678
--- /dev/null
+++ b/npc/pre-re/warps/cities/prontera.txt
@@ -0,0 +1,106 @@
+//===== rAthena Script =======================================
+//= Prontera Warp Script
+//===== By: ==================================================
+//= Athena (1.0)
+//= Nana (1.2)
+//===== Current Version: =====================================
+//= 1.5
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Prontera
+//===== Additional Comments: =================================
+//= 1.3 prt19 warp fix [shadow]
+//= 1.4 Added warps for the sign quest [MasterOfMuppets]
+//= 1.5 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
+//============================================================
+
+//= Prontera City ============================================
+prontera,107,215,0	warp	prt01	2,2,prt_in,240,139
+prontera,120,267,0	warp	prt02	2,2,prt_in,180,97
+prontera,133,183,0	warp	prt03	2,2,prt_in,50,105
+prontera,134,221,0	warp	prt04	1,1,prt_in,131,71
+prontera,156,22,0	warp	prt001	3,2,prt_fild08,170,375
+prontera,156,360,0	warp	prt005	4,2,prt_castle,102,20
+prontera,177,221,0	warp	prt05	2,2,prt_in,168,128
+prontera,179,184,0	warp	prt06	2,2,prt_in,60,73
+prontera,192,267,0	warp	prt07	2,2,prt_in,178,55
+prontera,204,192,0	warp	prt08	2,2,prt_in,68,134
+prontera,208,154,0	warp	prt09	2,2,prt_in,172,29
+prontera,22,203,0	warp	prt002	2,3,prt_fild05,367,205
+prontera,237,317,0	warp	prt004	2,2,prt_church,100,60
+prontera,289,203,0	warp	prt003	2,3,prt_fild06,27,193
+prontera,42,67,0	warp	prt10	2,2,prt_in,44,29
+prontera,45,346,0	warp	prt11	2,2,prt_in,80,110
+prontera,73,100,0	warp	prt12	1,1,prt_in,208,176
+prontera,74,90,0	warp	prt13	2,2,prt_in,248,170
+prontera,84,89,0	warp	prt14-1	1,1,prt_in,282,176
+prontera,263,279,0	warp	prt15-2	2,2,prt_in,227,18
+prt_in,135,71,0	warp	prt04-1	1,2,prontera,136,219
+prt_in,168,124,0	warp	prt05-1	2,1,prontera,174,218
+prt_in,172,33,0	warp	prt09-1	2,1,prontera,205,157
+prt_in,181,55,0	warp	prt07-1	1,2,prontera,192,264
+prt_in,183,97,0	warp	prt02-1	1,2,prontera,120,264
+prt_in,208,179,0	warp	prt12-1	3,1,prontera,76,102
+prt_in,217,163,0	warp	prt15	1,3,prt_in,236,163
+prt_in,234,163,0	warp	prt15-1	1,3,prt_in,215,163
+prt_in,240,141,0	warp	prt01-1	3,1,prontera,107,218
+prt_in,248,173,0	warp	prt13-1	3,2,prontera,77,93
+prt_in,254,113,0	warp	prt16	3,2,prt_in,256,134
+prt_in,256,131,0	warp	prt16-1	2,2,prt_in,254,110
+prt_in,263,163,0	warp	prt17	1,3,prt_in,276,163
+prt_in,274,163,0	warp	prt17-1	1,3,prt_in,261,163
+//prt_in,280,68,0	warp	w472	6,6,prontera,147,287
+//prt_in,281,36,0	warp	w473	6,6,prontera,147,287
+//prt_in,282,100,0	warp	w471	6,6,prontera,147,287
+prt_in,282,179,0	warp	prt14	3,1,prontera,87,91
+//prt_in,285,130,0	warp	w470	6,6,prontera,147,287
+prt_in,37,65,0	warp	prt18	1,3,prt_in,51,65
+prt_in,47,29,0	warp	prt10-1	2,1,prontera,46,67
+prt_in,48,65,0	warp	prt18-1	1,3,prt_in,34,65
+prt_in,53,105,0	warp	prt03-1	1,2,prontera,136,186
+prt_in,60,77,0	warp	prt06-1	2,1,prontera,175,188
+prt_in,68,130,0	warp	prt08-1	2,1,prontera,204,188
+prt_in,69,65,0	warp	prt19a	1,3,prt_in,84,65
+prt_in,70,143,0	warp	prt20	2,1,prt_in,70,165
+prt_in,70,162,0	warp	prt20-1	2,1,prt_in,70,140
+prt_in,80,113,0	warp	prt11-1	2,1,prontera,48,343
+prt_in,82,65,0	warp	prt19b	1,3,prt_in,66,65
+prt_in,227,15,0	warp	prt20-2	2,2,prontera,263,275
+
+//= Prontera Church ==========================================
+prt_church,100,56,0	warp	prtch001	7,1,prontera,234,314
+prt_church,109,81,0	warp	prtch01	1,2,prt_church,172,19
+prt_church,168,19,0	warp	prtch01-1	1,2,prt_church,105,81
+prt_church,31,19,0	warp	prtch02	1,2,prt_church,94,81
+prt_church,90,81,0	warp	prtch02-1	1,2,prt_church,27,19
+
+
+
+//= Prontera Castle ===========================================
+prt_castle,102,129,0	warp	prtca01	3,2,prt_castle,102,143
+prt_castle,102,140,0	warp	prtca01-1	3,2,prt_castle,102,126
+prt_castle,102,16,0	warp	prtca001	6,2,prontera,156,356
+prt_castle,102,181,0	warp	prtca002	6,2,prt_gld,159,28
+prt_castle,102,73,0	warp	prtca02	3,2,prt_castle,102,91
+prt_castle,102,88,0	warp	prtca02-1	3,2,prt_castle,102,70
+prt_castle,113,107,0	warp	prtca03	2,3,prt_castle,134,107
+prt_castle,121,29,0	warp	prtca04	1,1,prt_castle,148,29
+prt_castle,130,107,0	warp	prtca03-1	2,3,prt_castle,110,107
+prt_castle,135,153,0	warp	prtca05	1,1,prt_castle,167,145
+prt_castle,144,29,0	warp	prtca04-1	2,2,prt_castle,117,29
+prt_castle,149,113,0	warp	prtca06	1,1,prt_castle,175,113
+prt_castle,164,145,0	warp	prtca05-1	1,1,prt_castle,132,153
+prt_castle,170,138,0	warp	prtca07	3,2,prt_castle,176,118
+prt_castle,172,113,0	warp	prtca06-1	1,1,prt_castle,146,113
+prt_castle,176,121,0	warp	prtca07-1	3,2,prt_castle,170,141
+prt_castle,28,121,0	warp	prtca08	2,2,prt_castle,40,141
+prt_castle,31,113,0	warp	prtca09	1,1,prt_castle,58,113
+prt_castle,40,138,0	warp	prtca08-1	3,2,prt_castle,28,118
+prt_castle,45,145,0	warp	prtca10	1,1,prt_castle,72,153
+prt_castle,54,113,0	warp	prtca09-1	1,1,prt_castle,27,113
+prt_castle,59,29,0	warp	prtca11	2,2,prt_castle,85,29
+prt_castle,68,153,0	warp	prtca10-1	1,1,prt_castle,42,145
+prt_castle,75,107,0	warp	prtca12	2,3,prt_castle,95,107
+prt_castle,82,29,0	warp	prtca11-1	1,1,prt_castle,56,29
+prt_castle,92,107,0	warp	prtca12-1	2,3,prt_castle,72,107
diff --git a/npc/pre-re/warps/cities/rachel.txt b/npc/pre-re/warps/cities/rachel.txt
new file mode 100644
index 000000000..8610fa3bf
--- /dev/null
+++ b/npc/pre-re/warps/cities/rachel.txt
@@ -0,0 +1,126 @@
+//===== rAthena Script =======================================
+//= Rachel Warp Script
+//===== By: ==================================================
+//= erKURITA & RockmanEXE
+//===== Current Version: =====================================
+//= 1.5
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== 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/pre-re/warps/cities/splendide.txt b/npc/pre-re/warps/cities/splendide.txt
new file mode 100644
index 000000000..4782f4c9f
--- /dev/null
+++ b/npc/pre-re/warps/cities/splendide.txt
@@ -0,0 +1,55 @@
+//===== rAthena Script =======================================
+//= Splendide warp points.
+//===== By: ==================================================
+//= L0ne_W0lf
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 13.2+
+//===== Description: =========================================
+//= [Aegis Conversion]
+//= Warp Points for Splendide
+//===== Additional Comments: =================================
+//= First version.
+//============================================================
+
+splendide,240,317,0	warp	splendide1-1	1,1,spl_in02,224,232
+spl_in02,222,232,0	warp	splendide1-2	1,1,splendide,238,317
+splendide,230,299,0	warp	splendide2-1	1,1,spl_in02,207,195
+spl_in02,207,193,0	warp	splendide2-2	1,1,splendide,228,299
+splendide,214,310,0	warp	splendide3-1	1,1,spl_in02,180,223
+spl_in02,180,221,0	warp	splendide3-2	1,1,splendide,214,308
+splendide,157,316,0	warp	splendide4-1	1,1,spl_in02,108,213
+spl_in02,108,211,0	warp	splendide4-2	1,1,splendide,157,314
+splendide,119,324,0	warp	splendide5-1	1,1,spl_in02,61,229
+spl_in02,62,227,0	warp	splendide5-2	1,1,splendide,119,322
+splendide,286,128,0	warp	splendide6-1	1,1,spl_in02,236,63
+spl_in02,234,64,0	warp	splendide6-2	1,1,splendide,284,129
+splendide,259,112,0	warp	splendide7-1	1,1,spl_in02,189,41
+spl_in02,187,42,0	warp	splendide7-2	1,1,splendide,259,114
+splendide,286,229,0	warp	splendide8-1	1,1,spl_in02,137,66
+spl_in02,135,66,0	warp	splendide8-2	1,1,splendide,284,228
+splendide,299,251,0	warp	splendide9-1	1,1,spl_in02,140,93
+spl_in02,139,91,0	warp	splendide9-2	1,1,splendide,297,250
+splendide,132,68,0	warp	splendide10-1	1,1,spl_in02,45,52
+spl_in02,44,54,0	warp	splendide10-2	1,1,splendide,133,70
+splendide,197,193,0	warp	splendide11-1	1,1,spl_in01,110,19
+spl_in01,110,17,0	warp	splendide11-2	1,1,splendide,197,191
+spl_in01,124,38,0	warp	splendide11-3	1,1,spl_in01,236,36
+spl_in01,238,36,0	warp	splendide11-4	1,1,spl_in01,126,38
+spl_in01,95,38,0	warp	splendide11-5	1,1,spl_in01,199,36
+spl_in01,197,36,0	warp	splendide11-6	1,1,spl_in01,93,38
+spl_in01,218,22,0	warp	splendide11-7	1,1,spl_in01,310,19
+spl_in01,310,17,0	warp	splendide11-8	1,1,spl_in01,218,20
+splendide,170,168,0	warp	splendide12-1	1,1,spl_in01,190,301
+spl_in01,190,299,0	warp	splendide12-2	1,1,splendide,170,166
+spl_in01,191,320,0	warp	splendide12-3	1,1,spl_in01,276,334
+spl_in01,276,336,0	warp	splendide12-4	1,1,spl_in01,190,322
+splendide,156,210,0	warp	splendide13-1	1,1,spl_in01,171,189
+spl_in01,171,187,0	warp	splendide13-2	1,1,splendide,156,208
+splendide,198,240,0	warp	splendide14-1	1,1,spl_in01,110,301
+spl_in01,110,299,0	warp	splendide14-2	1,1,splendide,198,238
+splendide,238,212,0	warp	splendide15-1	1,1,spl_in01,30,215
+spl_in01,30,213,0	warp	splendide15-2	1,1,splendide,237,210
+splendide,228,164,0	warp	splendide16-1	1,1,spl_in01,30,301
+spl_in01,30,299,0	warp	splendide16-2	1,1,splendide,228,162
diff --git a/npc/pre-re/warps/cities/umbala.txt b/npc/pre-re/warps/cities/umbala.txt
new file mode 100644
index 000000000..fee11e26a
--- /dev/null
+++ b/npc/pre-re/warps/cities/umbala.txt
@@ -0,0 +1,38 @@
+//===== rAthena Script =======================================
+//= Umbala Warp Script
+//===== By: ==================================================
+//= Darkchild (1.0v A) 
+//= Athena (1.0v B)
+//= 1.1 (Akaru)
+//= Nana (1.2)
+//===== Current Version: =====================================
+//= 1.2 
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 6+
+//===== Description: =========================================
+//= [Aegis COnversion]
+//= Warp Points for Umbala
+//===== Additional Comments: =================================
+//= 1.3 Rescripted to Aegis 10.3 Standards. [L0nE_W0lf]
+//============================================================
+
+umbala,68,253,0	warp	um_chief1-1	1,1,um_in,38,113
+um_in,38,110,0	warp	um_chief1-2	1,1,umbala,66,250
+umbala,138,129,0	warp	um_tool1-1	1,1,um_in,99,114
+um_in,99,111,0	warp	um_tool1-2	1,1,umbala,136,127
+umbala,125,157,0	warp	um_weapon1-1	1,1,um_in,155,114
+um_in,155,111,0	warp	um_weapon1-2	1,1,umbala,126,154
+umbala,94,186,0	warp	um_houseA1-1	1,1,um_in,141,42
+um_in,141,39,0	warp	um_houseA1-2	1,1,umbala,94,183
+umbala,100,203,0	warp	um_houseA2-1	1,1,um_in,163,69
+um_in,166,69,0	warp	um_houseA2-2	1,1,umbala,102,205
+umbala,107,130,0	warp	um_houseB1-1	1,1,um_in,99,66
+um_in,99,63,0	warp	um_houseB1-2	1,1,umbala,108,127
+umbala,220,189,0	script	um_shaman1-1	45,1,1,{
+OnTouch:
+	if (event_umbala == 7) {
+		warp "um_in",32,71;
+	}
+	end;
+}
+um_in,29,71,0	warp	um_shaman2-1	1,1,umbala,217,186
diff --git a/npc/pre-re/warps/cities/veins.txt b/npc/pre-re/warps/cities/veins.txt
new file mode 100644
index 000000000..251b0d14c
--- /dev/null
+++ b/npc/pre-re/warps/cities/veins.txt
@@ -0,0 +1,58 @@
+//===== rAthena Script =======================================
+//= Veins City Warp Script
+//===== By: ==================================================
+//= $ephiroth
+//===== Current Version: =====================================
+//= 1.4
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= [Aegis COnversion]
+//= Warp Points for Veins
+//===== Additional Comments: =================================
+//= 1.4 Rescripted to Aegis 11.2 Standards. [L0ne_W0lf]
+//= 1.5 Removed duplicated Veins warps [Zephyrus]
+//============================================================
+
+veins,230,166,0	warp	ve_Tool1-1	1,1,ve_in,251,287
+ve_in,251,283,0	warp	ve_Tool1-2	1,1,veins,230,161
+ve_in,261,315,0	warp	ve_Tool2-1	1,1,ve_in,177,297
+ve_in,177,293,0	warp	ve_Tool2-2	1,1,ve_in,261,311
+veins,150,179,0	warp	ve_Weapon1-1	1,1,ve_in,349,223
+ve_in,349,219,0	warp	ve_Weapon1-2	1,1,veins,150,175
+ve_in,347,250,0	warp	ve_Weapon2-1	1,1,ve_in,282,223
+ve_in,286,223,0	warp	ve_Weapon2-2	1,1,ve_in,352,250
+veins,114,278,0	warp	ve_Inn1-1	1,1,ve_in,183,207
+ve_in,183,203,0	warp	ve_Inn1-2	1,1,veins,110,278
+veins,128,270,0	warp	ve_Inn2-1	1,1,ve_in,201,211
+ve_in,206,211,0	warp	ve_Inn2-2	1,1,veins,128,266
+veins,130,238,0	warp	ve_Inn3-1	1,1,ve_in,99,219
+ve_in,99,215,0	warp	ve_Inn3-2	1,1,veins,127,235
+ve_in,76,229,0	warp	ve_Inn4-1	1,1,ve_in,75,160
+ve_in,71,160,0	warp	ve_Inn4-2	1,1,ve_in,72,229
+veins,148,220,0	warp	ve_Bar1-1	1,1,ve_in,252,127
+ve_in,256,127,0	warp	ve_Bar1-2	1,1,veins,150,215
+ve_in,224,115,0	warp	ve_Bar2-1	1,1,ve_in,313,114
+ve_in,309,114,0	warp	ve_Bar2-2	1,1,ve_in,220,115
+veins,197,260,0	warp	ve_Church1-1	1,1,ve_in,351,321
+ve_in,351,317,0	warp	ve_Church1-2	1,1,veins,197,255
+veins,88,173,0	warp	ve_House1_1-1	1,1,ve_in,77,295
+ve_in,77,291,0	warp	ve_House1_1-2	1,1,veins,88,168
+ve_in,98,299,0	warp	ve_House1_2-1	1,1,ve_in,124,372
+ve_in,128,372,0	warp	ve_House1_2-2	1,1,ve_in,102,299
+veins,337,231,0	warp	ve_House2_1-1	1,1,ve_in,194,374
+ve_in,194,369,0	warp	ve_House2_1-2	1,1,veins,331,231
+veins,267,230,0	warp	ve_factory1-1	1,1,ve_in02,17,19
+ve_in02,13,19,0	warp	ve_factory1-2	1,1,veins,269,225
+veins,143,25,0	warp	veins1-1	1,1,ve_fild07,147,366
+veins,218,361,0	warp	veins2-1	1,1,ve_fild06,148,225
+
+//============================================================ 
+// Old changelog
+//============================================================ 
+//= 1.0 Initial version [$ephiroth]
+//= 1.1 Removed Rachel City warp [Playtester]
+//= 1.2 Updated veins warp based on jA info [$ephiroth]
+//= 1.3 Update some missing warps [$ephiroth]
+//= 1.3a Update some missing warps [$ephiroth]
+//============================================================
diff --git a/npc/pre-re/warps/cities/yggdrasil.txt b/npc/pre-re/warps/cities/yggdrasil.txt
new file mode 100644
index 000000000..92f084372
--- /dev/null
+++ b/npc/pre-re/warps/cities/yggdrasil.txt
@@ -0,0 +1,27 @@
+//===== rAthena Script =======================================
+//= Yggdrasil Tree Warp Script
+//===== By: ==================================================
+//= PKGINGO (1.0)
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 6+
+//===== 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
diff --git a/npc/pre-re/warps/cities/yuno.txt b/npc/pre-re/warps/cities/yuno.txt
new file mode 100644
index 000000000..6503091ce
--- /dev/null
+++ b/npc/pre-re/warps/cities/yuno.txt
@@ -0,0 +1,217 @@
+//===== rAthena Script =======================================
+//= Yuno Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//= Sara-chan (1.1)
+//===== Current Version: =====================================
+//= 1.9
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 5+
+//===== Description: =========================================
+//= Warp Points for Yuno
+//===== Additional Comments: =================================
+//= 1.1 - Added Yuno Airport warps
+//= 1.2 Moved all airports to Airplane Warps [Lupus]
+//= 1.3 Dr.Evil's yuno_05 warps update [Lupus]
+//= 1.4 optimized [Lupus]
+//= 1.5 Added Missing Juno warps [musashiden]
+//= 1.6 Corrected duplicate warps [Musashiden]
+//= 1.7 Yet another missing warp [Musashiden]
+//= 1.8 Added Yuno Government Buildings warps
+//= 1.9 Updated Yuno Government Buildings warps according
+//= to Schwartzvalt Trilogy quest. [SinSloth]
+//============================================================
+
+//= Yuno City ================================================
+yuno,158,15,0	warp	yun-yunfild	1,1,yuno_fild04,231,284
+yuno,117,135,0	warp	yun01	1,1,yuno_in01,116,37
+yuno_in01,116,40,0	warp	yun02	1,1,yuno,120,138
+yuno,48,105,0	warp	yun03	1,1,yuno_in01,37,176
+yuno_in01,40,176,0	warp	yun04	1,1,yuno,51,105
+yuno_in01,32,182,0	warp	yun05	1,1,yuno_in01,86,164
+yuno_in01,82,164,0	warp	yun06	1,1,yuno_in01,28,182
+yuno,48,151,0	warp	yun07	1,1,yuno_in01,30,100
+yuno_in01,34,100,0	warp	yun08	1,1,yuno,51,151
+yuno,93,180,0	warp	yun09	1,1,yuno_in04,33,127
+yuno_in04,33,130,0	warp	yun10	1,1,yuno,95,184
+yuno,196,138,0	warp	yun11	1,1,yuno_in01,32,33
+yuno_in01,32,36,0	warp	yun12	1,1,yuno,193,142
+yuno,264,87,0	warp	yun13	1,1,yuno_in01,168,101
+yuno_in01,168,104,0	warp	yun14	1,1,yuno,264,90
+yuno,341,203,0	warp	yun15	1,1,yuno_in04,32,58
+yuno_in04,29,58,0	warp	yun16	1,1,yuno,338,203
+yuno_in04,52,58,0	warp	yun17	1,1,yuno_in04,97,58
+yuno_in04,95,58,0	warp	yun18	1,1,yuno_in04,50,58
+yuno_in04,103,64,0	warp	yun19	1,1,yuno_in04,103,95
+yuno_in04,103,93,0	warp	yun20	1,1,yuno_in04,103,62
+yuno_in04,115,64,0	warp	yun21	1,1,yuno_in04,115,95
+yuno_in04,115,93,0	warp	yun22	1,1,yuno_in04,115,62
+yuno_in04,115,51,0	warp	yun23	1,1,yuno_in04,115,20
+yuno_in04,115,22,0	warp	yun24	1,1,yuno_in04,115,53
+yuno_in04,103,51,0	warp	yun25	1,1,yuno_in04,103,20
+yuno_in04,103,22,0	warp	yun26	1,1,yuno_in04,103,53
+yuno_in04,122,57,0	warp	yun27	1,1,yuno_in04,164,110
+yuno_in04,161,110,0	warp	yun28	1,1,yuno_in04,120,57
+yuno,323,284,0	warp	yun29	1,1,yuno_in03,167,22
+yuno_in03,167,19,0	warp	yun30	1,1,yuno,323,280
+yuno_in03,167,72,0	warp	yun31	1,1,yuno_in03,179,113
+yuno_in03,179,109,0	warp	yun32	1,1,yuno_in03,167,69
+yuno_in03,186,119,0	warp	yun33	1,1,yuno_in03,163,174
+yuno_in03,159,174,0	warp	yun34	1,1,yuno_in03,183,119
+yuno_in03,186,131,0	warp	yun35	1,1,yuno_in03,163,187
+yuno_in03,159,187,0	warp	yun36	1,1,yuno_in03,183,131
+yuno_in03,172,118,0	warp	yun37	1,1,yuno_in03,120,178
+yuno_in03,124,178,0	warp	yun38	1,1,yuno_in03,176,118
+yuno_in03,111,192,0	warp	yun39	1,1,yuno_in03,162,132
+yuno_in03,162,129,0	warp	yun40	1,1,yuno_in03,111,189
+yuno_in03,153,134,0	warp	yun41	1,1,yuno_in03,62,186
+yuno_in03,66,186,0	warp	yun42	1,1,yuno_in03,155,134
+yuno,278,293,0	warp	yun43	1,1,yuno_in03,25,15
+yuno_in03,25,11,0	warp	yun44	1,1,yuno,278,290
+yuno_in03,32,89,0	warp	yun45	1,1,yuno_in03,25,53
+yuno_in03,25,56,0	warp	yun46	1,1,yuno_in03,32,92
+yuno,284,366,0	warp	yun47	1,1,yuno_in03,224,23
+yuno_in03,224,19,0	warp	yun48	1,1,yuno,284,363
+yuno_in03,219,50,0	warp	yun49	1,1,yuno_in03,104,118
+yuno_in03,104,115,0	warp	yun50	1,1,yuno_in03,219,47
+yuno_in03,244,52,0	warp	yun51	1,1,yuno_in03,235,94
+yuno_in03,235,91,0	warp	yun52	1,1,yuno_in03,244,49
+yuno_in03,231,61,0	warp	yun53	1,1,yuno_in03,239,144
+yuno_in03,239,141,0	warp	yun54	1,1,yuno_in03,231,57
+yuno_in03,223,167,0	warp	yun55	1,1,yuno_in03,96,54
+yuno_in03,96,58,0	warp	yun56	1,1,yuno_in03,223,170
+yuno,87,321,0	warp	yun57	1,1,yuno_in02,168,61
+yuno_in02,172,61,0	warp	yun58	1,1,yuno,90,321
+yuno_in01,88,36,0	warp	yun59	1,1,yuno_in01,173,34
+yuno_in01,176,34,0	warp	yun60	1,1,yuno_in01,91,36
+yuno_in02,82,14,0	warp	yun61	1,1,yuno_in05,192,194
+yuno_in05,196,194,0	warp	yun62	1,1,yuno_in02,85,14
+yuno,245,147,0	warp	yun65	1,1,yuno_in01,101,88
+yuno_in01,101,85,0	warp	yun66	1,1,yuno,245,144
+
+// Yuno In05 (Entering Random Warps) -------------------------------------------
+yuno_in05,153,141,0	script	#yun63	45,1,1,{
+	if(rand(2)){
+		warp "yuno_in05",192,102;
+	} else {
+		warp "yuno_in05",145,82;
+	}
+	end;
+}
+// Yuno In05 (Random Warps - Cross Shaped) -------------------------------------
+yuno_in05,196,102,0	script	#yun64	45,1,1,{
+	set @warp0,rand(3);
+	if(@warp0==1) goto w2;
+	if(@warp0==2) goto w3;
+	warp "yuno_in05",169,102; end;
+w2:	warp "yuno_in05",128,82;  end;
+w3:	warp "yuno_in05",156,141; end;
+}
+yuno_in05,181,116,0	script	#yun65	45,1,1,{
+	set @warp0,rand(3);
+	if(@warp0==1) goto w2;
+	if(@warp0==2) goto w3;
+	warp "yuno_in05",181,94; end;
+w2:	warp "yuno_in05",176,13; end;
+w3:	warp "yuno_in05",136,75; end;
+}
+yuno_in05,165,102,0	script	#yun66	45,1,1,{
+	if(rand(2)){
+		warp "yuno_in05",192,102;
+	} else {
+		warp "yuno_in05",145,82;
+	}
+	end;
+}
+yuno_in05,181,91,0	script	#yun67	45,1,1,{
+	if(rand(2)){
+		warp "yuno_in05",181,112;
+	} else {
+		warp "yuno_in05",176,48;
+	}
+	end;
+}
+// Yuno In05 (Random Warps - T-Shaped) -----------------------------------------
+yuno_in05,148,82,0	script	#yun68	45,1,1,{
+	set @warp0,rand(3);
+	if(@warp0==1) goto w2;
+	if(@warp0==2) goto w3;
+	warp "yuno_in05",169,102; end;
+w2:	warp "yuno_in05",128,82;  end;
+w3:	warp "yuno_in05",156,141; end;
+}
+yuno_in05,125,82,0	script	#yun69	45,1,1,{
+	if(rand(2)){
+		warp "yuno_in05",192,102;
+	} else {
+		warp "yuno_in05",145,82;
+	}
+	end;
+}
+yuno_in05,136,71,0	script	#yun70	45,1,1,{
+	set @warp0,rand(3);
+	if(@warp0==1) goto w2;
+	if(@warp0==2) goto w3;
+	warp "yuno_in05",181,112; end;
+w2:	warp "yuno_in05",16,185;  end;
+w3:	warp "yuno_in05",176,48;  end;
+}
+// Yuno In05 (Random Warps - Other) --------------------------------------------
+yuno_in05,16,188,0	script	#yun71	45,1,1,{
+	set @warp0,rand(3);
+	if(@warp0==1) goto w2;
+	if(@warp0==2) goto w3;
+	warp "yuno_in05",181,94; end;
+w2:	warp "yuno_in05",176,13; end;
+w3:	warp "yuno_in05",136,75; end;
+}
+yuno_in05,176,9,0	script	#yun72	45,1,1,{
+	if(rand(2)){
+		warp "yuno_in05",181,112;
+	} else {
+		warp "yuno_in05",176,48;
+	}
+	end;
+}
+yuno_in05,176,52,0	script	#yun73	45,1,1,{
+	set @warp0,rand(3);
+	if(@warp0==1) goto w2;
+	if(@warp0==2) goto w3;
+	warp "yuno_in05",181,94; end;
+w2:	warp "yuno_in05",176,13; end;
+w3:	warp "yuno_in05",136,75; end;
+}
+// Yuno In05 (Destination - Room) ----------------------------------------------
+yuno_in05,40,178,0	script	#yun74	45,1,1,{
+	set @warp0,rand(3);
+	if(@warp0==1) goto w2;
+	if(@warp0==2) goto w3;
+	warp "yuno_in05",181,94; end;
+w2:	warp "yuno_in05",176,13; end;
+w3:	warp "yuno_in05",136,75; end;
+}
+yuno_in05,47,186,0	script	#yun75	45,1,1,{
+	set @warp0,rand(3);
+	if(@warp0==1) goto w2;
+	if(@warp0==2) goto w3;
+	warp "yuno_in05",181,94; end;
+w2:	warp "yuno_in05",176,13; end;
+w3:	warp "yuno_in05",136,75; end;
+}
+// Yuno In05 (Destination - Escaped Random Warps) ------------------------------
+yuno_in05,31,167,0	warp	yun76	1,1,yuno_in05,50,85
+yuno_in05,50,88,0	warp	yun77	1,1,yuno_in02,85,14
+
+// Yuno Government Buildings ---------------------------------------------------
+yuno_pre,52,22,0	warp	yungvn01	1,1,yuno_pre,37,23
+yuno_pre,87,22,0	warp	yungvn02	1,1,yuno_pre,102,22
+yuno_pre,41,23,0	warp	yungvn03	1,1,yuno_pre,56,22
+yuno_pre,18,35,0	warp	yungvn04	1,1,yuno_pre,18,53
+yuno_pre,98,22,0	warp	yungvn05	1,1,yuno_pre,83,22
+yuno_pre,18,48,0	warp	yungvn06	1,1,yuno_pre,18,31
+yuno_pre,18,77,0	warp	yungvn07	1,1,yuno_pre,18,96
+yuno_pre,113,48,0	warp	yungvn08	1,1,yuno_pre,84,22
+yuno_pre,81,68,0	warp	yungvn09	1,1,yuno_pre,95,68
+yuno_pre,18,92,0	warp	yungvn10	1,1,yuno_pre,18,73
+yuno,157,322,0	warp	yungvn11	1,1,yuno_pre,69,13
+yuno_pre,69,10,0	warp	yungvn12	1,1,yuno,157,317
diff --git a/npc/pre-re/warps/dungeons/abbey.txt b/npc/pre-re/warps/dungeons/abbey.txt
new file mode 100644
index 000000000..437290a7d
--- /dev/null
+++ b/npc/pre-re/warps/dungeons/abbey.txt
@@ -0,0 +1,22 @@
+//===== rAthena Script =======================================
+//= Abbey Dungeon Warp Script
+//===== By: ==================================================
+//= $ephiroth
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Abbey Dungeon
+//===== Additional Comments: =================================
+//= 1.0 Initial version [$ephiroth]
+//============================================================
+
+//= Abbey Dungeon ============================================
+abbey01,51,9,0	warp	namelesswarp0101	1,1,nameless_n,160,184
+abbey01,87,122,0	warp	namelesswarp4001	1,1,abbey01,13,201
+abbey01,13,204,0	warp	namelesswarp4002	1,1,abbey01,88,118
+abbey01,321,102,0	warp	namelesswarp4003	1,1,abbey02,149,11
+abbey02,149,8,0	warp	namelesswarp4004	1,1,abbey01,321,99
+abbey02,149,290,0	warp	namelesswarp4005	1,1,abbey03,119,8
+abbey03,119,5,0	warp	namelesswarp4006	1,1,abbey02,149,287
diff --git a/npc/pre-re/warps/dungeons/abyss.txt b/npc/pre-re/warps/dungeons/abyss.txt
new file mode 100644
index 000000000..b669a3226
--- /dev/null
+++ b/npc/pre-re/warps/dungeons/abyss.txt
@@ -0,0 +1,20 @@
+//===== rAthena Script =======================================
+//= Abyss Lake Dungeon Warp Script
+//===== By: ==================================================
+//= Muad-Dib (1.0)
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 10+
+//===== Description: =========================================
+//= Warp Points for Abyss Lake Dungeon
+//===== Additional Comments: =================================
+//= 1.0 Thanks to Muad-Dib for the temp warps [Lupus]
+//= 1.1 Corrected warp placements.
+//============================================================
+
+abyss_01,25,24,0	warp	abysslakedunwarp001	1,1,abyss_02,271,270
+abyss_02,145,280,0	warp	abysslakedunwarp002	1,1,abyss_03,115,30
+abyss_02,277,270,0	warp	abysslakedunwarp003	1,1,abyss_01,25,30
+abyss_03,115,25,0	warp	abysslakedunwarp004	1,1,abyss_02,145,275
+abyss_01,265,274,0	warp	abysslakedunwarp005	1,1,hu_fild05,177,211
diff --git a/npc/pre-re/warps/dungeons/alde_dun.txt b/npc/pre-re/warps/dungeons/alde_dun.txt
new file mode 100644
index 000000000..a51ccf413
--- /dev/null
+++ b/npc/pre-re/warps/dungeons/alde_dun.txt
@@ -0,0 +1,80 @@
+//===== rAthena Script =======================================
+//= Al de Baran Dungeon Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.6
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 2+
+//===== Description: =========================================
+//= Warp Points for Al De Baran Dungeon
+//===== Additional Comments: =================================
+//= Split off Aldebaran.txt
+//= 1.1 fixed clt007 warp
+//= 1.3 Optimized [Lupus]
+//= 1.4 Removed Duplicates [Silent]
+//= 1.5 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
+//= 1.6 Moved Clock Tower warps to unique file. [L0ne_W0lf]
+//============================================================
+
+//============================================================
+//============================================================
+alde_dun01,292,306,0	warp	aldd01	2,1,alde_dun02,43,24
+alde_dun01,167,158,0	warp	ald002a	2,2,c_tower2,148,283
+alde_dun01,302,25,0	warp	ald003a	2,2,c_tower1,125,22
+alde_dun02,43,20,0	warp	aldd04	1,1,alde_dun01,292,300
+alde_dun02,279,250,0	warp	aldd05	2,2,alde_dun03,18,267
+alde_dun02,122,169,0	warp	ald006	2,2,c_tower3,47,41
+alde_dun02,187,234,0	warp	ald007	2,2,c_tower3,65,147
+//============================================================
+//= Random B2 ================================================
+alde_dun02,267,41,4	script	ald008r	45,1,1,{
+	if(rand(2)) {
+		warp "c_tower3",168,252;
+	} else {
+		warp "alde_dun02",262,141;
+	}
+	end;
+}
+alde_dun03,12,267,0	warp	aldd09	2,2,alde_dun02,273,250
+alde_dun03,277,183,0	warp	ald010	2,2,c_tower2,27,27
+alde_dun03,191,31,0	warp	ald011	2,2,c_tower3,217,159
+alde_dun03,276,48,0	warp	ald012	2,2,c_tower1,235,223
+//============================================================
+//7(npc)
+//= Random B3-1 ================================================
+alde_dun03,130,125,4	script	ald014r	45,1,1,{
+	set @r,rand(3);
+	if(@r==1) goto w2;
+	if(@r==2) goto w3;
+		warp "c_tower2",228,267; end;
+	w2:	warp "alde_dun03",130,130; end;
+	w3:	warp "c_tower3",252,29; end;
+}
+//============================================================
+//= Random 3-2 ===============================================
+alde_dun03,171,127,4	script	ald015r	45,1,1,{
+	set @r,rand(4);
+	if(@r==1) goto w2;
+	if(@r==2) goto w3;
+		warp "c_tower2",13,282; end;
+	w2:	warp "alde_dun03",175,131; end;
+	w3:	warp "c_tower3",235,7; end;
+}
+alde_dun04,80,273,0	warp	aldd016	2,2,alde_dun03,263,26
+alde_dun04,207,225,0	warp	ald017	1,1,c_tower3,7,34
+alde_dun04,215,192,0	warp	ald018	1,1,c_tower2,148,283
+alde_dun04,32,74,0	warp	aldd19	1,1,alde_dun02,187,239
+alde_dun04,208,58,0	warp	aldd20	2,2,alde_dun04,268,74
+alde_dun04,272,74,0	warp	aldd021	2,2,alde_dun04,204,62
+alde_dun04,80,34,4	script	ald022r	45,1,1,{
+	set @r,rand(4);
+	if(@r==1) goto w2;
+	if(@r==2) goto w3;
+	if(@r==3) goto w4;
+		warp "c_tower2",13,282; end;
+	w2:	warp "alde_dun03",175,131; end;
+	w3:	warp "c_tower3",235,7; end;
+	w4:	warp "alde_dun04",84,36; end;
+}
+//============================================================
diff --git a/npc/pre-re/warps/dungeons/ama_dun.txt b/npc/pre-re/warps/dungeons/ama_dun.txt
new file mode 100644
index 000000000..a13422204
--- /dev/null
+++ b/npc/pre-re/warps/dungeons/ama_dun.txt
@@ -0,0 +1,19 @@
+//===== rAthena Script =======================================
+//= Amatsu Dungeon Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.2
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 6+
+//===== Description: =========================================
+//= [Aegis Conversion]
+//= Warp Points for Amatsu Dungeon
+//===== Additional Comments: =================================
+//= 1.2 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//============================================================
+
+ama_dun01,235,144,0	warp	ama_dun1-1	1,1,ama_dun02,33,40
+ama_dun02,30,40,0	warp	ama_dun1-2	1,1,ama_dun01,232,144
+ama_dun02,196,123,0	warp	ama_dun2-1	1,1,ama_dun03,120,12
+ama_dun03,120,9,0	warp	ama_dun2-2	1,1,ama_dun02,196,120
diff --git a/npc/pre-re/warps/dungeons/anthell.txt b/npc/pre-re/warps/dungeons/anthell.txt
new file mode 100644
index 000000000..d33b1e42c
--- /dev/null
+++ b/npc/pre-re/warps/dungeons/anthell.txt
@@ -0,0 +1,37 @@
+//===== rAthena Script =======================================
+//= Ant Hell Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.7
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Ant Hell
+//===== Additional Comments: =================================
+//= 1.3 Changed var anthell to @anthell. Optimized [Lupus]
+//= 1.4 Removed Duplicates [Silent]
+//= 1.5 Updated warps for episode 12.1 [L0ne_W0lf]
+//= 1.6 Renewal warp adjustments.
+//= 1.7 Fixed coordinates for pre-2010/06/09 maps (bugreport:3589)
+//=     Moved entrance to cmd_fild08 to match mapcache [Gepard]
+//============================================================
+
+//= Ant Hell =================================================
+
+/* Pre 2010-06-09adata_x1.gpf version
+ * Requires modified mapcache and client-side maps
+ */
+//moc_fild20,156,143,0	warp	moc_ant1-1	1,1,anthell01,35,263
+//anthell01,35,267,0	warp	moc_ant1-2	1,1,moc_fild20,161,144
+//moc_fild20,337,315,0	warp	moc_ant2-1	1,1,anthell02,168,170
+//anthell02,171,170,0	warp	moc_ant2-2	1,1,moc_fild20,333,315
+
+/* 2010-06-09 version */
+cmd_fild08,335,355,0	warp	moc_ant1-1	3,4,anthell01,35,262
+anthell01,35,267,0	warp	moc_ant1-2	1,1,cmd_fild08,330,355
+cmd_fild08,348,82,0	warp	moc_ant2-1	3,3,anthell02,168,170
+anthell02,172,169,0	warp	moc_ant2-2	1,1,cmd_fild08,344,82
+
+anthell01,253,32,0	warp	ant01	2,1,anthell02,34,263
+anthell02,32,267,0	warp	ant01-1	2,2,anthell01,253,35
diff --git a/npc/pre-re/warps/dungeons/ayo_dun.txt b/npc/pre-re/warps/dungeons/ayo_dun.txt
new file mode 100644
index 000000000..c1b013baf
--- /dev/null
+++ b/npc/pre-re/warps/dungeons/ayo_dun.txt
@@ -0,0 +1,25 @@
+//===== rAthena Script =======================================
+//= Ayothaya Dungeon Warp Script
+//===== By: ==================================================
+//= rAthena Team (1.0)
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 10+
+//===== Description: =========================================
+//= Warp Points for Ayothaya Dungeon
+//===== Additional Comments: =================================
+//= 1.1 Rescritped to Aegis 10.3 standards. [L0ne_W0lf]
+//============================================================
+
+ayo_fild02,285,149,0	warp	ayo_dun1-1	1,1,ayo_dun01,275,18
+ayo_dun01,274,14,0	warp	ayo_dun1-2	1,1,ayo_fild02,279,150
+ayo_dun02,24,22,0	warp	ayo_dun2-1	1,1,ayo_dun01,24,279
+ayo_dun02,276,22,0	warp	ayo_dun2-2	1,1,ayo_dun01,24,279
+
+//============================================================ 
+// Old changelog
+//============================================================ 
+//= 1.0 Splitted 2 files [Lupus]
+//= Should some warps be disabled due to Dungeon Quest?
+//============================================================
diff --git a/npc/pre-re/warps/dungeons/beach_dun.txt b/npc/pre-re/warps/dungeons/beach_dun.txt
new file mode 100644
index 000000000..13ba8b428
--- /dev/null
+++ b/npc/pre-re/warps/dungeons/beach_dun.txt
@@ -0,0 +1,23 @@
+//===== rAthena Script =======================================
+//= Comodo Dungeon Warp
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= [Aegis Conversion]
+//= Comodo Beach Dungeon warp script
+//===== Additional Comments: =================================
+//= 1.1 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//============================================================
+
+comodo,24,214,0	warp	cmd_beach_dun1-1	1,1,beach_dun,266,67
+beach_dun,276,67,0	warp	cmd_beach_dun1-2	1,1,comodo,31,215
+comodo,176,358,0	warp	cmd_beach_dun2-1	1,1,beach_dun2,154,25
+beach_dun2,154,13,0	warp	cmd_beach_dun2-2	2,1,comodo,176,353
+comodo,333,175,0	warp	cmd_beach_dun3-1	1,1,beach_dun3,23,260
+beach_dun3,17,265,0	warp	cmd_beach_dun3-2	1,1,comodo,328,175
+beach_dun3,286,57,0	warp	cmd_beach_dun4-1	1,1,cmd_fild01,30,317
+cmd_fild01,26,318,0	warp	cmd_beach_dun4-2	1,1,beach_dun3,281,56
diff --git a/npc/pre-re/warps/dungeons/bra_dun.txt b/npc/pre-re/warps/dungeons/bra_dun.txt
new file mode 100644
index 000000000..a151ed645
--- /dev/null
+++ b/npc/pre-re/warps/dungeons/bra_dun.txt
@@ -0,0 +1,17 @@
+//===== rAthena Script =======================================
+//= Brasilis Dungeon Warp
+//===== By: ==================================================
+//= L0ne_W0lf
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= [Aegis Conversion]
+//= Brasilis Dungeon warp script
+//===== Additional Comments: =================================
+//= 1.0 First version.
+//============================================================
+
+bra_dun01,199,35,0	warp	brad1tobrad2	1,1,bra_dun02,261,263
+bra_dun02,261,265,0	warp	brad2tobrad1	1,1,bra_dun01,199,37
diff --git a/npc/pre-re/warps/dungeons/c_tower.txt b/npc/pre-re/warps/dungeons/c_tower.txt
new file mode 100644
index 000000000..e75f8e449
--- /dev/null
+++ b/npc/pre-re/warps/dungeons/c_tower.txt
@@ -0,0 +1,153 @@
+//===== rAthena Script =======================================
+//= Al de Baran Clock Tower Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 2+
+//===== Description: =========================================
+//= Warp Points for Clock Tower
+//===== Additional Comments: =================================
+//= 1.0 Split from combined warp file alberta_duns. [L0ne_W0lf]
+//============================================================
+
+//= Al De Baran Clock Tower
+aldebaran,139,135,0	warp	ald002	1,1,c_tower1,199,159
+c_tower1,200,157,0	warp	ald003	1,1,aldebaran,139,131
+c_tower1,235,226,0	warp	clt001	1,1,c_tower2,268,26
+c_tower1,123,22,0	warp	clt002	1,1,alde_dun01,297,25
+c_tower2,142,283,0	warp	clt003	1,1,c_tower3,65,147
+c_tower2,24,24,0	warp	clt004	1,1,alde_dun03,277,178
+c_tower2,273,26,0	warp	clt005	1,1,c_tower1,235,223
+
+//============================================================
+//= Level 2 ==================================================
+//= Random 2-1 ===============================================
+c_tower2,13,288,4	script	clt006r	45,1,1,{
+	set @r,rand(3);
+	if(@r==1) goto w2;
+	if(@r==2) goto w3;
+		warp "c_tower2",13,282; end;
+	w2:	warp "alde_dun03",175,131; end;
+	w3:	warp "c_tower3",235,7; end;
+}
+//============================================================
+//= Random 2-2 ===============================================
+c_tower2,223,267,4	script	clt007r	45,1,1,{
+	set @r,rand(3);
+	if(@r==1) goto w2;
+	if(@r==2) goto w3;
+		warp "c_tower2",288,267; end;
+	w2:	warp "alde_dun03",130,130; end;
+	w3:	warp "c_tower3",252,29; end;
+}
+//============================================================
+//= Level 3 ==================================================
+c_tower3,60,147,0	warp	clt009	1,1,c_tower2,148,283
+c_tower3,212,159,0	warp	clt010	1,1,alde_dun03,276,53
+c_tower3,7,39,0	warp	clt011	1,1,alde_dun01,171,158
+c_tower3,42,41,0	warp	clt012	1,1,alde_dun02,127,169
+c_tower3,146,8,0	warp	clt013	1,1,c_tower1,235,223
+//============================================================
+//= Random 3-1 ===============================================
+c_tower3,163,252,4	script	clt014r	45,1,1,{
+	if(rand(2)) {
+		warp "c_tower3",168,252;
+	} else {
+		warp "alde_dun02",262,41;
+	}
+	end;
+}
+//============================================================
+//= Random 3-2 ===============================================
+c_tower3,240,7,4	script	clt015r	45,1,1,{
+	set @r,rand(3);
+	if(@r==1) goto w2;
+	if(@r==2) goto w3;
+		warp "c_tower2",13,282; end;
+	w2:	warp "alde_dun03",175,131; end;
+	w3:	warp "c_tower3",235,7; end;
+}
+//============================================================
+//= Random 3-3 ===============================================
+c_tower3,252,24,4	script	clt016r	45,1,1,{
+	set @r,rand(3);
+	if(@r==1) goto w2;
+	if(@r==2) goto w3;
+		warp "c_tower2",228,267; end;
+	w2:	warp "alde_dun03",130,130; end;
+	w3:	warp "c_tower3",252,29; end;
+}
+//============================================================
+//= Level 4 ==================================================
+c_tower4,37,70,0	warp	clt017	1,1,alde_dun03,277,54
+c_tower4,51,156,0	warp	clt018	1,1,alde_dun01,171,158
+c_tower4,68,46,0	warp	clt019	1,1,c_tower4,73,154
+c_tower4,70,19,0	warp	clt020	2,2,c_tower3,151,8
+c_tower4,79,49,0	warp	clt021	2,2,c_tower4,204,60
+c_tower4,133,202,0	warp	clt022	1,1,c_tower4,140,149
+c_tower4,153,107,0	warp	clt023	1,1,c_tower2,228,267
+c_tower4,171,179,0	warp	clt024	1,1,alde_dun03,276,53
+c_tower4,198,59,0	warp	clt025	1,1,c_tower4,152,98
+c_tower4,204,57,0	warp	clt026	1,1,c_tower4,65,77
+//============================================================
+//= Random 4-1 ===============================================
+c_tower4,75,156,4	script	clt027r	45,0,0,{
+	set @r,rand(4);
+	if(@r==1) goto w2;
+	if(@r==2) goto w3;
+	if(@r==3) goto w4;
+		warp "c_tower3",168,252; end;
+	w2:	warp "alde_dun02",262,41; end;
+	w3:	warp "c_tower4",73,154; end;
+	w4:	warp "c_tower4",140,149; end;
+}
+//============================================================
+//= Random 4-2 ===============================================
+c_tower4,68,79,4	script	clt028r	45,0,0,{
+	set @r,rand(4);
+	if(@r==1) goto w2;
+	if(@r==2) goto w3;
+	if(@r==3) goto w4;
+		warp "c_tower2",13,282; end;
+	w2:	warp "alde_dun03",175,131; end;
+	w3:	warp "c_tower3",235,7; end;
+	w4:	warp "c_tower4",65,77; end;
+}
+//============================================================
+//= Random 4-3 ===============================================
+c_tower4,142,151,4	script	clt029r	45,0,0,{
+	set @r,rand(4);
+	if(@r==1) goto w2;
+	if(@r==2) goto w3;
+	if(@r==3) goto w4;
+		warp "c_tower3",168,252; end;
+	w2:	warp "alde_dun02",262,41; end;
+	w3:	warp "c_tower4",73,154; end;
+	w4: warp "c_tower4",140,149; end;
+}
+//============================================================
+//= Random 4-4 ===============================================
+c_tower4,151,96,4	script	clt030r	45,0,0,{
+	set @r,rand(4);
+	if(@r==1) goto w2;
+	if(@r==2) goto w3;
+	if(@r==3) goto w4;
+		warp "c_tower2",228,267; end;
+	w2:	warp "alde_dun03",130,130; end;
+	w3:	warp "c_tower3",252,29; end;
+	w4:	warp "c_tower4",152,95; end;
+}
+//============================================================
+//= Random 4-5 ===============================================
+c_tower4,189,40,4	script	clt031r	45,2,2,{
+	set @r,rand(4);
+	if(@r==1) goto w2;
+	if(@r==2) goto w3;
+	if(@r==3) goto w4;
+		warp "c_tower2",228,267; end;
+	w2:	warp "alde_dun03",130,130; end;
+	w3:	warp "c_tower3",252,29; end;
+	w4:	warp "c_tower4",152,95; end;
+}
diff --git a/npc/pre-re/warps/dungeons/dic_dun.txt b/npc/pre-re/warps/dungeons/dic_dun.txt
new file mode 100644
index 000000000..63d5e8f0b
--- /dev/null
+++ b/npc/pre-re/warps/dungeons/dic_dun.txt
@@ -0,0 +1,24 @@
+//===== rAthena Script =======================================
+//= Scaraba Hole Warp Script
+//===== By: ==================================================
+//= Chilly
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: =========================================
+//= Warp Points for Scaraba Hole
+//===== Additional Comments: =================================
+//= 1.0 First Version.
+//============================================================
+
+dic_dun01,88,212,0	warp	scarabahole0001	1,1,dic_dun01,168,228
+dic_dun01,164,228,0	warp	scarabahole0002	1,1,dic_dun01,84,212
+dic_dun01,371,228,0	warp	scarabahole0003	1,1,dic_dun01,32,156
+dic_dun01,28,156,0	warp	scarabahole0004	1,1,dic_dun01,367,228
+dic_dun01,371,172,0	warp	scarabahole0005	1,1,dic_dun01,32,100
+dic_dun01,28,100,0	warp	scarabahole0006	1,1,dic_dun01,367,172
+dic_dun02,102,148,0	warp	scarabahole0007	1,1,dic_dun01,290,103
+dic_dun01,370,100,0	warp	scarabahole0008	1,1,dic_dun01,33,44
+dic_dun01,29,44,0	warp	scarabahole0009	1,1,dic_dun01,366,100
+dic_dun03,102,148,0	warp	scarabahole0010	1,1,dic_dun01,290,103
diff --git a/npc/pre-re/warps/dungeons/ecl_dun.txt b/npc/pre-re/warps/dungeons/ecl_dun.txt
new file mode 100644
index 000000000..6d6bb321a
--- /dev/null
+++ b/npc/pre-re/warps/dungeons/ecl_dun.txt
@@ -0,0 +1,24 @@
+//===== rAthena Script =======================================
+//= Eclage Dungeon Warp Script
+//===== By: ==================================================
+//= Chilly
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: =========================================
+//= Warp Points for Eclage Dungeon
+//===== Additional Comments: =================================
+//= 1.0 First Version.
+//============================================================
+
+ecl_fild01,182,82,0	warp	eclage_dun0001	1,1,ecl_tdun01,60,13
+ecl_tdun01,61,11,0	warp	eclage_dun0002	1,1,ecl_fild01,182,85
+ecl_tdun01,67,106,0	warp	eclage_dun0003	1,1,ecl_tdun02,60,88
+ecl_tdun02,60,90,0	warp	eclage_dun0004	1,1,ecl_tdun01,70,105
+ecl_tdun02,52,9,0	warp	eclage_dun0005	1,1,ecl_tdun03,47,13
+ecl_tdun03,49,11,0	warp	eclage_dun0006	1,1,ecl_tdun02,50,11
+ecl_tdun03,50,46,0	warp	eclage_dun0007	1,1,ecl_tdun04,26,23
+ecl_tdun04,26,26,0	warp	eclage_dun0008	1,1,ecl_tdun03,50,43
+ecl_tdun04,34,17,0	warp	eclage_dun0009	1,1,ecl_fild01,183,73
+ecl_fild01,183,70,0	warp	eclage_dun0010	1,1,ecl_tdun04,32,19
diff --git a/npc/pre-re/warps/dungeons/ein_dun.txt b/npc/pre-re/warps/dungeons/ein_dun.txt
new file mode 100644
index 000000000..c0b1f69be
--- /dev/null
+++ b/npc/pre-re/warps/dungeons/ein_dun.txt
@@ -0,0 +1,24 @@
+//===== rAthena Script =======================================
+//= Einbroch Warp Script
+//===== By: ==================================================
+//= Sara-chan (1.3), SSUNNY@YOUNG(1.4)
+//===== Current Version: =====================================
+//= 1.5
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 8+
+//===== Description: =========================================
+//= Warp Points for Einbroch
+//===== Additional Comments: =================================
+//= 1.4 Updated Warps, work done by SSUNNY@YOUNG in Korean eA site [Vicious]
+//= 1.5 Added missing warps, updated coordinates [Gepard]
+//============================================================
+
+//Dungeon Warps
+einbech,138,252,0	warp	eib_d01	1,1,ein_dun01,22,14
+ein_dun01,22,11,0	warp	eib_d01a	1,1,einbech,138,249
+ein_dun01,261,255,0	warp	ein012	1,1,ein_dun02,291,292
+ein_dun02,286,292,0	warp	ein012a	1,1,ein_dun01,261,258
+ein_dun02,216,210,0	warp	EinCave01A_EinCave01B	1,1,ein_dun02,208,228
+ein_dun02,228,109,0	warp	EinCave02A_EinCave02B	1,1,ein_dun02,191,130
+ein_dun02,210,225,0	warp	EinCave01B_EinCave01A	1,1,ein_dun02,216,207
+ein_dun02,195,130,0	warp	EinCave02B_EinCave02A	1,1,ein_dun02,233,109
diff --git a/npc/pre-re/warps/dungeons/gef_dun.txt b/npc/pre-re/warps/dungeons/gef_dun.txt
new file mode 100644
index 000000000..967c91c15
--- /dev/null
+++ b/npc/pre-re/warps/dungeons/gef_dun.txt
@@ -0,0 +1,46 @@
+//===== rAthena Script =======================================
+//= Geffen Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Geffen Tower
+//===== Additional Comments: =================================
+//= Removed the warp from gef_dun02 to gef_dun03, [MasterOfMuppets]
+//= gef_dun03 is just an event map...
+//============================================================
+
+//= Geffen Tower =============================================
+gef_tower,106,115,0	warp	geft01	1,1,gef_tower,106,72
+gef_tower,106,69,0	warp	geft01-1	1,1,gef_tower,106,112
+gef_tower,44,36,0	warp	geft02	1,1,gef_tower,106,162
+gef_tower,106,158,0	warp	geft02-1	1,1,gef_tower,44,33
+gef_tower,118,68,0	warp	geft03	1,1,gef_tower,116,28
+gef_tower,116,31,0	warp	geft03-1	1,1,gef_tower,118,71
+gef_tower,120,158,0	warp	geft04	1,1,gef_tower,118,111
+gef_tower,118,114,0	warp	geft04-1	1,1,gef_tower,120,161
+gef_tower,158,104,0	warp	geft05	2,2,gef_tower,156,90
+gef_tower,156,93,0	warp	geft05-1	2,2,gef_tower,158,107
+gef_tower,158,150,0	warp	geft06	1,2,gef_tower,158,124
+gef_tower,158,128,0	warp	geft06-1	2,1,gef_tower,158,153
+gef_tower,158,174,0	warp	geft07	2,1,gef_tower,52,140
+gef_tower,52,136,0	warp	geft07-1	2,1,gef_tower,158,169
+gef_tower,38,160,0	warp	geft08	2,1,gef_tower,42,90
+gef_tower,42,86,0	warp	geft08-1	1,1,gef_tower,38,157
+gef_tower,66,156,0	warp	geft08-2	2,1,gef_tower,42,90
+gef_tower,153,28,0	warp	gef005	4,2,gef_dun00,104,99
+gef_tower,52,181,0	warp	gef006	4,1,geffen,120,110
+gef_tower,60,32,0	warp	geft09	1,1,gef_tower,62,90
+gef_tower,62,87,0	warp	geft09-1	1,1,gef_tower,60,30
+
+//= Geffen Dungeon =============================================
+gef_dun00,104,103,0	warp	gef024	3,3,gef_tower,153,31
+gef_dun00,107,169,0	warp	gefd01	2,1,gef_dun01,115,236
+gef_dun01,115,240,0	warp	gefd01-1	2,2,gef_dun00,107,165
+gef_dun01,197,38,0	warp	gefd02	2,1,gef_dun02,106,132
+gef_dun02,106,134,0	warp	gefd02-1	2,1,gef_dun01,197,40
+//gef_dun02,215,67,0	warp	gefd03	2,1,gef_dun03,203,200
+gef_dun03,203,204,0	warp	gefd03-1	2,1,gef_dun02,215,63
diff --git a/npc/pre-re/warps/dungeons/gon_dun.txt b/npc/pre-re/warps/dungeons/gon_dun.txt
new file mode 100644
index 000000000..8e02b8a31
--- /dev/null
+++ b/npc/pre-re/warps/dungeons/gon_dun.txt
@@ -0,0 +1,41 @@
+//===== rAthena Script =======================================
+//= Kunlun Dungeon Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 5+
+//===== Description: =========================================
+//= [Aegis Conversion]
+//= Warp Points for Kunlun dungeon
+//===== Additional Comments: =================================
+//= 1.1 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//============================================================
+
+gonryun,159,201,0	warp	gon_dun1-1	1,1,gon_dun01,153,48
+gon_dun01,153,45,0	warp	gon_dun1-2	1,1,gonryun,159,198
+gon_dun01,162,273,0	warp	gon_dun2-1	1,1,gon_dun02,17,113
+gon_dun02,14,113,0	warp	gon_dun2-2	1,1,gon_dun01,162,270
+gon_dun02,44,213,0	warp	gon_dun3-1	1,1,gon_dun02,51,119
+gon_dun02,92,190,0	warp	gon_dun3-2	1,1,gon_dun02,199,20
+gon_dun02,44,166,0	warp	gon_dun3-3	1,1,gon_dun02,97,121
+gon_dun02,148,236,0	warp	gon_dun3-4	1,1,gon_dun02,234,194
+gon_dun02,171,258,0	warp	gon_dun3-5	1,1,gon_dun02,76,96
+gon_dun02,234,191,0	warp	gon_dun3-6	1,1,gon_dun02,145,233
+gon_dun02,165,189,0	warp	gon_dun3-7	1,1,gon_dun02,235,135
+gon_dun02,180,189,0	warp	gon_dun3-8	1,1,gon_dun02,170,164
+gon_dun02,170,161,0	warp	gon_dun3-9	1,1,gon_dun02,89,41
+gon_dun02,56,119,0	warp	gon_dun3-10	1,1,gon_dun02,47,210
+gon_dun02,94,118,0	warp	gon_dun3-11	1,1,gon_dun02,177,189
+gon_dun02,76,100,0	warp	gon_dun3-12	1,1,gon_dun02,145,62
+gon_dun02,63,66,0	warp	gon_dun3-14	1,1,gon_dun02,203,94
+gon_dun02,86,44,0	warp	gon_dun3-15	1,1,gon_dun02,145,233
+gon_dun02,168,92,0	warp	gon_dun3-16	1,1,gon_dun02,273,76
+gon_dun02,145,66,0	warp	gon_dun3-17	1,1,gon_dun02,199,20
+gon_dun02,235,138,0	warp	gon_dun3-18	1,1,gon_dun02,168,189
+gon_dun02,199,94,0	warp	gon_dun3-19	1,1,gon_dun02,60,70
+gon_dun02,276,76,0	warp	gon_dun3-20	1,1,gon_dun02,163,87
+gon_dun02,196,20,0	warp	gon_dun3-21	1,1,gon_dun02,95,190
+gon_dun02,251,268,0	warp	gon_dun4-1	1,1,gon_dun03,68,9
+gon_dun03,68,6,0	warp	gon_dun4-2	1,1,gon_dun02,251,265
diff --git a/npc/pre-re/warps/dungeons/ice_dun.txt b/npc/pre-re/warps/dungeons/ice_dun.txt
new file mode 100644
index 000000000..dc6983008
--- /dev/null
+++ b/npc/pre-re/warps/dungeons/ice_dun.txt
@@ -0,0 +1,24 @@
+//===== rAthena Script =======================================
+//= Ice Dungeon Warp Script
+//===== By: ==================================================
+//= Playtester
+//===== Current Version: =====================================
+//= 1.3
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Ice Dungeon
+//===== Additional Comments: =================================
+//= 1.0 Initial version [Playtester]
+//= 1.1 Official warps [Playtester]
+//= 1.2 Added quest warp. FLoor 4 to floor 3. [L0ne_W0lf]
+//= 1.3 Fixed the warp coords from floor 4 to 3. [L0ne_W0lf]
+//============================================================
+
+ice_dun01,157,10,0	warp	ice001	1,1,ra_fild01,233,327
+ice_dun01,146,161,0	warp	ice002	1,1,ice_dun02,151,139
+ice_dun02,151,145,0	warp	ice003	1,1,ice_dun01,146,157
+ice_dun02,150,285,0	warp	ice004	1,1,ice_dun03,149,24
+ice_dun03,149,19,0	warp	ice005	1,1,ice_dun02,150,280
+//Additional Warp (4th floor -> 3rd)
+ice_dun04,33,140,0	warp	ice006	1,1,ice_dun03,149,130
diff --git a/npc/pre-re/warps/dungeons/in_sphinx.txt b/npc/pre-re/warps/dungeons/in_sphinx.txt
new file mode 100644
index 000000000..70f1f63f8
--- /dev/null
+++ b/npc/pre-re/warps/dungeons/in_sphinx.txt
@@ -0,0 +1,36 @@
+//===== rAthena Script =======================================
+//= Morroc Sphinx Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Sphinx Dungeon
+//===== Additional Comments: =================================
+//= 1.0 Split from combined warp file morroc_duns. [L0ne_W0lf]
+//============================================================
+
+//= Morroc Sphinx ============================================
+in_sphinx1,288,6,0	warp	sphx001	5,1,moc_fild19,100,99
+in_sphinx1,80,191,0	warp	sphx01	2,1,in_sphinx2,149,81
+in_sphinx2,149,77,0	warp	sphx01-1	3,2,in_sphinx1,80,189
+in_sphinx2,276,272,0	warp	sphx02	1,3,in_sphinx3,210,54
+in_sphinx3,210,57,0	warp	sphx02-1	4,1,in_sphinx2,274,272
+in_sphinx3,35,227,0	warp	sphx03	2,4,in_sphinx3,62,227
+in_sphinx3,60,227,0	warp	sphx03-1	1,4,in_sphinx3,32,227
+in_sphinx3,70,111,0	warp	sphx04	1,1,in_sphinx3,70,81
+in_sphinx3,70,83,0	warp	sphx04-1	4,1,in_sphinx3,70,113
+in_sphinx3,12,69,0	warp	sphx05	4,1,in_sphinx4,10,222
+in_sphinx4,10,224,0	warp	sphx05-1	2,1,in_sphinx3,12,71
+in_sphinx4,120,113,0	warp	sphx06	4,2,in_sphinx5,100,99
+in_sphinx5,100,96,0	warp	sphx06-1	4,2,in_sphinx4,120,116
+in_sphinx5,11,16,0	warp	sphx07	3,1,in_sphinx5,189,181
+in_sphinx5,11,183,0	warp	sphx07-1	3,1,in_sphinx5,11,18
+in_sphinx5,189,16,0	warp	sphx08-1	3,1,in_sphinx5,11,181
+in_sphinx5,16,188,0	warp	sphx08-2	1,3,in_sphinx5,181,188
+in_sphinx5,16,10,0	warp	sphx08-3	1,3,in_sphinx5,181,10
+in_sphinx5,183,10,0	warp	sphx08-4	1,3,in_sphinx5,18,188
+in_sphinx5,183,188,0	warp	sphx08-5	1,3,in_sphinx5,18,10
+in_sphinx5,189,183,0	warp	sphx08-6	3,1,in_sphinx5,189,18
diff --git a/npc/pre-re/warps/dungeons/iz_dun.txt b/npc/pre-re/warps/dungeons/iz_dun.txt
new file mode 100644
index 000000000..ee31f73dd
--- /dev/null
+++ b/npc/pre-re/warps/dungeons/iz_dun.txt
@@ -0,0 +1,32 @@
+//===== rAthena Script =======================================
+//= Izlude Dungeon Warp Script
+//===== By: ==================================================
+//= Athena (1.0)
+//= Nana (1.1)
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Bibilyn Island & Undersea Cave
+//===== Additional Comments: =================================
+//= No comment!
+//============================================================
+
+//= Bibilyn Island ===========================================
+izlu2dun,108,83,0	warp	izd01	3,2,iz_dun00,168,168
+
+//= Undersea Cave ============================================
+iz_dun00,168,173,0	warp	izd01-1	3,3,izlu2dun,108,88
+iz_dun00,352,342,0	warp	izd02	5,2,iz_dun01,253,252
+iz_dun00,39,41,0	warp	izd03	5,2,iz_dun01,41,37
+iz_dun01,118,170,0	warp	izd04	5,2,iz_dun02,236,204
+iz_dun01,253,258,0	warp	izd02-1	2,2,iz_dun00,352,337
+iz_dun01,41,32,0	warp	izd03-1	2,2,iz_dun00,39,46
+iz_dun02,236,198,0	warp	izd04-1	5,3,iz_dun01,118,165
+iz_dun02,339,331,0	warp	izd05	2,2,iz_dun03,32,63
+iz_dun03,264,245,0	warp	izd06	1,2,iz_dun04,26,27
+iz_dun03,29,63,0	warp	izd05-1	2,2,iz_dun02,339,328
+iz_dun04,26,24,0	warp	izd06-1	2,2,iz_dun03,261,245
+iz_dun04,129,233,0	warp	izd07	2,2,iz_dun05,141,187
+iz_dun05,141,190,0	warp	izd07-1	2,2,iz_dun04,129,230
diff --git a/npc/pre-re/warps/dungeons/juperos.txt b/npc/pre-re/warps/dungeons/juperos.txt
new file mode 100644
index 000000000..900b79d86
--- /dev/null
+++ b/npc/pre-re/warps/dungeons/juperos.txt
@@ -0,0 +1,33 @@
+//===== rAthena Script =======================================
+//= Juperos Dungeon Warp Script
+//===== By: ==================================================
+//= Muad-Dib (1.0)
+//===== Current Version: =====================================
+//= 1.7
+//===== Compatible With: =====================================
+//= rAthena with independant npctimer support; RO Episode 8+
+//===== Description: =========================================
+//= Warp Points for Juperos Dungeon
+//===== Additional Comments: =================================
+//= 1.0 Converted by Dr.Evil [Lupus]
+//= 1.1 More temp warps to Juperos by Justin84 [Lupus]
+//= 1.2 Justin84's fixed elevator scripts
+//= 1.3 Fixed getting stuck when player relogs in. [Lance]
+//= 1.4 Added attachnpctimer to the initnpctimer calls. [Skotlex]
+//= 1.5 Implemented a part of the Juperos quest [MasterOfMuppets]
+//= 1.6 Removed area1 and area2 warps. These are event warps. [L0ne_W0lf]
+//=	Added static warps for gate -> area1/2/elevator.
+//= 1.6a COrrected new warps [L0ne_W0lf]
+//= 1.7 Removed duplicated quest warp portal [Brainstorm]
+//============================================================
+
+yuno_fild07,207,175,0	warp	jupwrp01	1,1,jupe_cave,143,52
+jupe_cave,148,52,0	warp	jupwrp02	1,1,yuno_fild07,212,175
+jupe_cave,26,52,0	warp	jupwrp03	1,1,juperos_01,53,247
+juperos_01,50,250,0	warp	jupwrp04	1,1,jupe_cave,29,52
+
+jupe_gate,28,145,0	warp	gate#left1	2,4,jupe_area1,100,222
+jupe_area1,103,222,0	warp	gate#left2	2,4,jupe_gate,31,145
+jupe_gate,71,145,0	warp	gate#right1	2,4,jupe_area2,63,222
+jupe_area2,60,222,0	warp	gate#right2	2,4,jupe_gate,68,145
+jupe_gate,49,55,0	warp	gate#ele	4,2,jupe_ele_r,49,30
diff --git a/npc/pre-re/warps/dungeons/kh_dun.txt b/npc/pre-re/warps/dungeons/kh_dun.txt
new file mode 100644
index 000000000..c19e324ca
--- /dev/null
+++ b/npc/pre-re/warps/dungeons/kh_dun.txt
@@ -0,0 +1,38 @@
+//===== rAthena Script =======================================
+//= Kiel Dungeon Warp Script
+//===== By: ==================================================
+//= Lost Kakashi
+//===== Current Version: =====================================
+//= 1.3
+//===== Compatible With: =====================================
+//= rAthena 1.0
+//===== Description: =========================================
+//= Warp Points for the Kiel Dungeon
+//===== Additional Comments: =================================
+//= 1.1 Added official Kiel Dungeon entrance [Playtester]
+//= 1.2 Changed warps because of Kiel quest [Playtester]
+//= 1.3 Added second floor exit. [L0ne_W0lf]
+//=	Corrected coordinated for some of the other warps.
+//============================================================
+
+//= Kiel Dungeon =============================================
+kh_dun01,3,234,0	warp	kh_dun_00	1,1,yuno_fild08,74,174
+
+//Factory Restricted Area Exit
+kh_dun01,232,226,0	warp	kh_dun_01	1,1,kh_dun01,13,12
+
+//Factory side warps
+kh_dun01,63,7,0	warp	kh_dun_02	1,1,kh_dun01,227,176
+kh_dun01,232,176,0	warp	kh_dun_03	1,1,kh_dun01,63,12
+
+//Second Floor -> First floor Random warp
+kh_dun02,43,195,0	script	kh_dun04	45,1,1,{
+OnTouch:
+	if (rand(1,2) == 1) {
+		warp "kh_dun01",41,206;
+	}
+	else {
+		warp "kh_dun01",32,199;
+	}
+
+}
diff --git a/npc/pre-re/warps/dungeons/lhz_dun.txt b/npc/pre-re/warps/dungeons/lhz_dun.txt
new file mode 100644
index 000000000..d8d0f7c5e
--- /dev/null
+++ b/npc/pre-re/warps/dungeons/lhz_dun.txt
@@ -0,0 +1,215 @@
+//===== rAthena Script =======================================
+//= Lighthalzen Dungeon Warp Script
+//===== By: ==================================================
+//= Sara-chan (1.0)
+//===== Current Version: =====================================
+//= 2.1b
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 8+
+//===== Description: =========================================
+//= Warp Points for Lighthalzen Dungeon
+//===== Additional Comments: =================================
+//= No Comment!
+//= 1.1 Added temp restriction by Azazel [Lupus]
+//= 1.2 Optimized [Lupus]
+//= and fixed 005 and 005a warps coords, thanks to Justin84 
+//= 1.3 Fixed entrance condition check, thanx2Daegaladh [Lupus]
+//= 1.4 Added coords of secret dungeon entrance, thanks to Justin84
+//= proved with screenshots [Lupus]
+//= 1.5a thx2 Justin84, some additions and fixes [Lupus]
+//= 1.5b re-enabled main entrance warp [Lupus] <-reverted 1.5c
+//= 1.6 Updated entrances, added Cube room warps, thanx 2 Justin84
+//= 1.6a Disabled the "Entrance" to lhz_dun01 [Poki#3]
+//= 1.6b Updated Sewer Pipe [Vicious]
+//= 1.7 Fixed a warp-back
+//= 1.8 Some small changes [MasterOfMuppets]
+//= 1.9 Removed duplicates [Toms]
+//= 2.0 Now use MISC_QUEST&512 instead of 'hzdun' [Lupus]
+//= 2.1 Updated all standard dungeon warps. [L0ne_W0lf]
+//=	Updated Sewer pipe dungeon entrance.
+//=	Removed dialog from level 3 entrance warp.
+//= 2.1a Updated 3rd floor warp. Again... [L0ne_W0lf]
+//= 2.1b Fixed reverse level requirement in 3rd floor warp. [L0ne_W0lf]
+//============================================================
+
+lhz_dun01,149,291,0	warp	lhz_dun1-1	1,1,lhz_in01,19,129
+lhz_dun01,281,150,0	warp	lhz_dun2-1	1,1,lhz_dun02,282,153
+lhz_dun02,282,161,0	warp	lhz_dun2-2	1,1,lhz_dun01,281,154
+lhz_dun01,149,9,0	warp	lhz_dun3-1	1,1,lhz_dun02,153,19
+lhz_dun02,146,19,0	warp	lhz_dun3-2	1,1,lhz_dun01,144,9
+lhz_dun01,18,145,0	warp	lhz_dun4-1	1,1,lhz_dun02,17,150
+lhz_dun02,17,156,0	warp	lhz_dun4-2	1,1,lhz_dun01,18,150
+lhz_dun02,149,149,4	script	lhz_dun5-1	45,2,2,{
+OnTouch:
+	if ((Upper != 1 && BaseLevel<95) || (Upper == 1 && BaseLevel<90)) {
+		warp "lhz_dun02",145,149;
+	}
+	else {
+		warp "lhz_dun03",140,133;
+	}
+	end;
+}
+lhz_dun03,139,137,0	warp	lhz_dun5-2	1,1,lhz_dun02,149,142
+
+//--------------------------Sewer Pipe--------------------------
+
+lighthalzen,313,301,0	script	Sewer Pipe#lt	111,{
+	if (MISC_QUEST&512) {
+		mes "^3355FFYou found some sort";
+		mes "of large sewage pipe.";
+		mes "Naturally, the stench";
+		mes "emanating from inside";
+		mes "the pipe is barely endurable.^000000";
+		next;
+		if (select("Enter:Cancel") == 1) {
+			warp "lhz_cube",231,17;
+			end;
+		}
+		close;
+	}
+	mes "^3355FFYou found some sort";
+	mes "of large sewage pipe.";
+	mes "Naturally, the stench";
+	mes "emanating from inside";
+	mes "the pipe is barely endurable.^000000";
+	close;
+}
+
+//--------------------------Warp--------------------------
+
+//Cube room <-> Organism test laboratory level 2
+lhz_cube,231,96,0	warp	lhzcube1	1,1,lhz_dun02,220,6
+lhz_dun02,224,6,0	warp	lhzcube2	1,1,lhz_cube,231,90
+
+//Cube room -> Lighthalzen
+lhz_cube,231,12,0	warp	lhzcube3	1,1,lighthalzen,310,302
+lhz_cube,177,96,0	warp	lhzcube4	1,1,lighthalzen,310,302
+
+//----------------- Cube Room Maze ---------------------------
+// -1 are warps facing east.
+// -2 the warps facing south.
+// -3 are warps facing west.
+// -4 are warps facing north.
+//----------------- Room 66 74 -------------------------------
+lhz_cube,74,74,0	script	cubew01-1	45,1,1,{
+	callfunc "randomw";
+	end;
+}
+lhz_cube,66,67,0	warp	cubew01-2	2,2,lhz_cube,10,18
+lhz_cube,59,74,0	script	cubew01-3	45,1,1,{
+	callfunc "randomw";
+	end;
+}
+lhz_cube,66,82,0	script	cubew01-4	45,1,1,{
+	callfunc "randomw";
+	end;
+}
+//----------------- Room 66 136 ------------------------------
+lhz_cube,74,136,0	warp	cubew02-1	2,2,lhz_cube,10,193
+lhz_cube,66,129,0	script	cubew02-2	45,1,1,{
+	callfunc "randomw";
+	end;
+}
+lhz_cube,59,136,0	script	cubew02-3	45,1,1,{
+	callfunc "randomw";
+	end;
+}
+lhz_cube,66,144,0	script	cubew02-4	45,1,1,{
+	callfunc "randomw";
+	end;
+}
+//----------------- Room 67 193 ------------------------------
+lhz_cube,74,192,0	script	cubew03-1	45,1,1,{
+	callfunc "randomw";
+	end;
+}
+lhz_cube,67,185,0	script	cubew03-2	45,1,1,{
+	callfunc "randomw";
+	end;
+}
+lhz_cube,59,192,0	script	cubew03-3	45,1,1,{
+	callfunc "randomw";
+	end;
+}
+lhz_cube,67,200,0	warp	cubew03-4	2,2,lhz_cube,10,136
+//----------------- Room 66 18 -------------------------------
+lhz_cube,74,18,0	script	cubew04-1	45,1,1,{
+	callfunc "randomw";
+	end;
+}
+lhz_cube,66,11,0	warp	cubew04-2	2,2,lhz_cube,10,18
+lhz_cube,59,18,0	script	cubew04-3	45,1,1,{
+	callfunc "randomw";
+	end;
+}
+lhz_cube,66,26,0	warp	cubew04-4	2,2,lhz_cube,123,18
+//----------------- Room 66 18 -------------------------------
+lhz_cube,18,18,0	warp	cubew05-1	2,2,lhz_cube,10,193
+lhz_cube,10,11,0	warp	cubew05-2	2,2,lhz_cube,123,18
+lhz_cube,3,18,0	script	cubew05-3	45,1,1,{
+	callfunc "randomw";
+	end;
+}
+lhz_cube,10,26,0	script	cubew05-4	45,1,1,{
+	callfunc "randomw";
+	end;
+}
+//----------------- Room 10 74 -------------------------------
+lhz_cube,18,74,0	script	cubew06-1	45,1,1,{
+	callfunc "randomw";
+	end;
+}
+lhz_cube,10,67,0	warp	cubew06-2	2,2,lhz_cube,123,18
+lhz_cube,3,74,0	warp	cubew06-3	2,2,lhz_cube,66,18
+lhz_cube,10,82,0	script	cubew06-4	45,1,1,{
+	callfunc "randomw";
+	end;
+}
+//----------------- Room 10 136 ------------------------------
+lhz_cube,18,136,0	warp	cubew07-1	2,2,lhz_cube,10,74
+lhz_cube,10,129,0	script	cubew07-2	45,1,1,{
+	callfunc "randomw";
+	end;
+}
+lhz_cube,3,136,0	script	cubew07-3	45,1,1,{
+	callfunc "randomw";
+	end;
+}
+lhz_cube,10,144,0	script	cubew07-4	45,1,1,{
+	callfunc "randomw";
+	end;
+}
+//----------------- Room 10 193 ------------------------------
+lhz_cube,18,192,0	script	cubew08-1	45,1,1,{
+	callfunc "randomw";
+	end;
+}
+lhz_cube,10,185,0	script	cubew08-2	45,1,1,{
+	callfunc "randomw";
+	end;
+}
+lhz_cube,3,192,0	warp	cubew08-3	2,2,lhz_cube,10,74
+lhz_cube,10,200,0	warp	cubew08-4	2,2,lhz_cube,66,18
+//----------------- Room 123 18 ------------------------------
+lhz_cube,130,18,0	script	cubew09-1	45,1,1,{
+	callfunc "randomw";
+	end;
+}
+lhz_cube,123,11,0	script	cubew09-2	45,1,1,{
+	callfunc "randomw";
+	end;
+}
+lhz_cube,115,18,0	warp	cubew09-3	2,2,lhz_cube,248,184
+lhz_cube,123,26,0	script	cubew09-4	45,1,1,{
+	callfunc "randomw";
+	end;
+}
+ 
+//----- Function for Random Warps ----------------------------
+function	script	randomw	{
+	switch(rand(3)) {
+	case 1: warp "lhz_cube",66,136; end;
+	case 2: warp "lhz_cube",66,74; end;
+ 	default: warp "lhz_cube",67,193; end;
+	}
+}
diff --git a/npc/pre-re/warps/dungeons/lou_dun.txt b/npc/pre-re/warps/dungeons/lou_dun.txt
new file mode 100644
index 000000000..dc4c4a0e7
--- /dev/null
+++ b/npc/pre-re/warps/dungeons/lou_dun.txt
@@ -0,0 +1,21 @@
+//===== rAthena Script =======================================
+//= Louyang Dungeon Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= Any Athena Version 6.0+
+//===== Description: =========================================
+//= [Aegis Conversion]
+//= Warp Points for Louyang
+//===== Additional Comments: =================================
+//= 1.1 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//============================================================
+
+louyang,37,271,0	warp	lou_dun1-1	1,1,lou_dun01,218,195
+lou_dun01,221,195,0	warp	lou_dun1-2	1,1,louyang,40,273
+lou_dun01,40,201,0	warp	lou_dun2-1	1,1,lou_dun02,285,18
+lou_dun02,288,18,0	warp	lou_dun2-2	1,1,lou_dun01,38,203
+lou_dun02,165,269,0	warp	lou_dun3-1	1,1,lou_dun03,165,38
+lou_dun03,165,35,0	warp	lou_dun3-2	1,1,lou_dun02,165,266
diff --git a/npc/pre-re/warps/dungeons/mag_dun.txt b/npc/pre-re/warps/dungeons/mag_dun.txt
new file mode 100644
index 000000000..b81bad620
--- /dev/null
+++ b/npc/pre-re/warps/dungeons/mag_dun.txt
@@ -0,0 +1,18 @@
+//===== rAthena Script =======================================
+//= Yuno Dungeon Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 5+
+//===== Description: =========================================
+//= Warp Points for Yuno Dungeon
+//===== Additional Comments: =================================
+//= No Comment!
+//============================================================
+
+//= Magma Dungeon ============================================
+mag_dun01,126,66,0	warp	mag01-yunfild	1,1,yuno_fild03,34,139
+mag_dun01,242,241,0	warp	mag01-02	1,1,mag_dun02,47,30
+mag_dun02,47,28,0	warp	mag02-01	1,1,mag_dun01,242,239
diff --git a/npc/pre-re/warps/dungeons/mjo_dun.txt b/npc/pre-re/warps/dungeons/mjo_dun.txt
new file mode 100644
index 000000000..1c23dc572
--- /dev/null
+++ b/npc/pre-re/warps/dungeons/mjo_dun.txt
@@ -0,0 +1,22 @@
+//===== rAthena Script =======================================
+//= Coal Mine Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Coal Mines
+//===== Additional Comments: =================================
+//= No Comment!
+//============================================================
+
+//= Coal Mine ================================================
+mjo_dun01,14,283,0	warp	mjod01	2,4,mjo_dun02,381,343
+mjo_dun01,52,14,0	warp	mjod001	4,2,mjolnir_02,79,363
+mjo_dun02,31,21,0	warp	mjod02	1,1,mjo_dun03,302,262
+mjo_dun02,384,343,0	warp	mjod01-1	2,4,mjo_dun01,17,283
+mjo_dun02,39,21,0	warp	mjod03	1,1,mjo_dun03,308,262
+mjo_dun03,302,264,0	warp	mjod02-1	1,1,mjo_dun02,31,23
+mjo_dun03,308,264,0	warp	mjod03-1	1,1,mjo_dun02,39,23
diff --git a/npc/pre-re/warps/dungeons/moc_pryd.txt b/npc/pre-re/warps/dungeons/moc_pryd.txt
new file mode 100644
index 000000000..fc50e2a14
--- /dev/null
+++ b/npc/pre-re/warps/dungeons/moc_pryd.txt
@@ -0,0 +1,40 @@
+//===== rAthena Script =======================================
+//= Morroc Pyramid Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Morroc Pyramid
+//===== Additional Comments: =================================
+//= 1.1 Moved Sphinx warps to unique file. [L0ne_W0lf]
+//============================================================
+
+//= Morroc Pyramid ===========================================
+moc_pryd01,10,195,0	warp	mocp01	5,2,moc_pryd02,10,192
+moc_pryd01,195,9,0	warp	mocp001	2,5,moc_ruins,60,161
+moc_pryd01,90,109,0	warp	mocp02	1,2,moc_prydb1,100,185
+moc_pryd02,10,195,0	warp	mocp01-1	5,2,moc_pryd01,10,192
+moc_pryd02,100,99,0	warp	mocp03	3,2,moc_pryd03,100,92
+moc_pryd03,100,97,0	warp	mocp03-1	3,2,moc_pryd02,100,92
+moc_pryd03,12,15,0	warp	mocp04	3,2,moc_pryd04,12,18
+moc_pryd03,15,187,0	warp	mocp05	2,3,moc_pryd04,18,187
+moc_pryd03,184,11,0	warp	mocp06	2,3,moc_pryd04,181,11
+moc_pryd03,188,184,0	warp	mocp07	3,2,moc_pryd04,188,181
+moc_pryd04,12,15,0	warp	mocp04-1	3,2,moc_pryd03,12,18
+moc_pryd04,15,187,0	warp	mocp05-1	2,3,moc_pryd03,18,187
+moc_pryd04,184,11,0	warp	mocp06-1	2,3,moc_pryd03,181,11
+moc_pryd04,188,184,0	warp	mocp07-1	3,2,moc_pryd03,188,181
+moc_pryd05,223,9,0	warp	mocp08	2,2,moc_pryd06,192,10
+moc_pryd05,94,98,0	warp	mocp09	2,1,moc_prydb1,100,57
+moc_pryd06,197,10,0	warp	mocp08-1	2,3,moc_pryd05,220,9
+moc_prydb1,100,104,0	warp	mocp10	5,2,moc_prydb1,100,74
+moc_prydb1,100,191,0	warp	moco02-1	2,2,moc_pryd01,90,105
+moc_prydb1,100,55,0	warp	mocp09-1	2,1,moc_pryd05,94,96
+moc_prydb1,100,77,0	warp	mocp10-1	5,2,moc_prydb1,100,107
+moc_prydb1,111,115,0	warp	mocp11	2,6,moc_prydb1,145,115
+moc_prydb1,142,115,0	warp	mocp11-1	2,6,moc_prydb1,108,115
+moc_prydb1,59,115,0	warp	mocp12	2,6,moc_prydb1,90,115
+moc_prydb1,87,115,0	warp	mocp12-1	2,6,moc_prydb1,56,115
diff --git a/npc/pre-re/warps/dungeons/mosk_dun.txt b/npc/pre-re/warps/dungeons/mosk_dun.txt
new file mode 100644
index 000000000..30dc257e7
--- /dev/null
+++ b/npc/pre-re/warps/dungeons/mosk_dun.txt
@@ -0,0 +1,290 @@
+//===== rAthena Script =======================================
+//= Moscovia Dungeon Warp Script
+//===== By: ==================================================
+//= Kisuka, $ephiroth
+//===== Current Version: =====================================
+//= 1.4
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Moscovia Dungeon
+//===== Additional Comments: =================================
+//= 1.0 Initial version [$ephiroth]
+//= 1.1, 1.2 Updated from jA [$ephiroth]
+//= 1.3 Added warp npcs. Removed place holder warps. [Kisuka]
+//= 1.4 Fixed cords on milestone 1-3. [Kisuka]
+//============================================================
+
+mosk_fild02,190,257,0	warp	moscoviawarp0401	1,1,mosk_dun01,189,45
+mosk_dun01,189,42,0	warp	moscoviawarp0501	1,1,mosk_fild02,190,254
+mosk_in,215,36,0	warp	babayagaout		1,1,mosk_dun02,53,217
+
+mosk_dun02,53,220,4	script	#babayagain	45,1,1,{
+	end;
+OnTouch:
+	if (mos_nowinter == 11) {
+		donpcevent "Soldier1#mos::OnEnable";
+		donpcevent "Soldier2#mos::OnEnable";
+		donpcevent "Soldier3#mos::OnEnable";
+		mes "[Soldier]";
+		mes "Halt right there!";
+		next;
+		mes "[Soldier]";
+		mes "We have information";
+		mes "that you've been secretly";
+		mes "communicating with";
+		mes "Baba Yaga, the Horrible.";
+		next;
+		mes "[Soldier]";
+		mes "If you have something to say,";
+		mes "speak to the Csar.";
+		mes "Come with us.";
+		close2;
+		donpcevent "Soldier1#mos::OnInit";
+		donpcevent "Soldier2#mos::OnInit";
+		donpcevent "Soldier3#mos::OnInit";
+		set mos_nowinter,12;
+		warp "mosk_in",125,92;
+		end;
+	}
+	else if (mos_nowinter == 12) {
+		donpcevent "Soldier1#mos::OnEnable";
+		donpcevent "Soldier2#mos::OnEnable";
+		donpcevent "Soldier3#mos::OnEnable";
+		mes "[Soldier]";
+		mes "We expected";
+		mes "that you would appear again.";
+		mes "What is your business with the Csar?";
+		next;
+		if(select("Run away.:Explain the situation.") == 1) {
+			mes "["+strcharinfo(0)+"]";
+			mes "I should get out of here...";
+			close2;
+			warp "mosk_dun02",100,100;
+			donpcevent "Soldier1#mos::OnInit";
+			donpcevent "Soldier2#mos::OnInit";
+			donpcevent "Soldier3#mos::OnInit";
+			end;
+		}
+		mes "-I explain what happend until now.-";
+		next;
+		mes "[Soldier]";
+		mes "If you have something to say, speak";
+		mes "to the Csar.";
+		mes "If you leave to this place,";
+		mes "you will be considered as our enemy.";
+		close2;
+		donpcevent "Soldier1#mos::OnInit";
+		donpcevent "Soldier2#mos::OnInit";
+		donpcevent "Soldier3#mos::OnInit";
+		end;
+	}
+	else if (mos_nowinter == 13) {
+		donpcevent "Soldier1#mos::OnEnable";
+		donpcevent "Soldier2#mos::OnEnable";
+		donpcevent "Soldier3#mos::OnEnable";
+		mes "[Soldier]";
+		mes "We expected";
+		mes "that you would appear again.";
+		mes "What is your business with the Csar?";
+		next;
+		if(select("Run away.:Explain the situation.") == 1) {
+			mes "["+strcharinfo(0)+"]";
+			mes "I should get out of here...";
+			close2;
+			warp "mosk_dun02",100,100;
+			donpcevent "Soldier1#mos::OnInit";
+			donpcevent "Soldier2#mos::OnInit";
+			donpcevent "Soldier3#mos::OnInit";
+			end;
+		}
+		mes "-I explain what happend until now.-";
+		next;
+		mes "[Soldier]";
+		mes "If you have something to say, speak";
+		mes "to the Csar.";
+		mes "If you leave to this place,";
+		mes "you will be considered as our enemy.";
+		close2;
+		donpcevent "Soldier1#mos::OnInit";
+		donpcevent "Soldier2#mos::OnInit";
+		donpcevent "Soldier3#mos::OnInit";
+		end;
+	}
+	else {
+		warp "mosk_in",215,41;
+		end;
+	}
+}
+
+mosk_dun02,53,215,3	script	Soldier1#mos	966,{
+	mes "[Soldier]";
+	mes "We're the Csar's soldiers.";
+	mes "We're called out for emergencies,";
+	mes "don't disturb us anymore.";
+	close;
+	
+OnInit:
+	hideonnpc "Soldier1#mos";
+	end;
+
+OnEnable:
+	hideoffnpc "Soldier1#mos";
+	end;
+}
+
+mosk_dun02,50,217,3	script	Soldier2#mos	966,{
+	mes "[Soldier]";
+	mes "We're the Csar's soldiers.";
+	mes "We're called out for emergencies,";
+	mes "don't disturb us anymore.";
+	close;
+	
+OnInit:
+	hideonnpc "Soldier2#mos";
+	end;
+
+OnEnable:
+	hideoffnpc "Soldier2#mos";
+	end;
+}
+
+
+mosk_dun02,56,217,5	script	Soldier3#mos	966,{
+	mes "[Soldier]";
+	mes "We're the Csar's soldiers.";
+	mes "We're called out for emergencies,";
+	mes "don't disturb us anymore.";
+	close;
+	
+OnInit:
+	hideonnpc "Soldier3#mos";
+	end;
+
+OnEnable:
+	hideoffnpc "Soldier3#mos";
+	end;
+}
+
+mosk_dun01,170,164,3	script	Milestone#1	111,{
+	mes "- There is writing on a big rock. -";
+	next;
+	mes "^3131FF- Those who serve the Sun will die, Go to the North. -^000000";
+	close;
+}
+
+mosk_dun01,207,276,3	script	Milestone#1-2	111,{
+	mes "- There is writing on a big rock. -";
+	next;
+	mes "^3131FF- Those who advance may get hurt but are courageous of heart and those who move back will remain safe.";
+	mes "If you have courage, step forward. Otherwise, step backward. -^000000";
+	next;
+	if(select("Step forward.:Stay.") == 1) {
+		mes "- You follow the way before you. -";
+		close2;
+		warp "mosk_dun02",165,30;
+		end;
+	}
+	mes "- You won't advance. -";
+	close;
+}
+
+mosk_dun01,264,191,3	script	Milestone#1-3	111,{
+	mes "- There is writing on a big rock. -";
+	next;
+	mes "^3131FF- Those who advance may get hurt but are brave of heart and those who move back will remain safe.";
+	mes "If you are brave, then take a step forward. Otherwise, step back. -^000000";
+	next;
+	if(select("Step forward.:Stay.") == 1) {
+		mes "- You follow the way before you. -";
+		close2;
+		warp "mosk_dun03",117,36;
+		end;
+	}
+	mes "- You decide to stay. -";
+	close;
+}
+
+mosk_dun02,168,28,3	script	Milestone#2-1	111,{
+	mes "- There is writing on a big rock. -";
+	next;
+	mes "^3131FF- Those who advance may get hurt but are valorous of heart and those who move back will remain safe.";
+	mes "If you valorous, then take a step forward. Otherwise, step back. -^000000";
+	next;
+	if(select("Go back.:Stay.") == 1) {
+		mes "- You sense danger and decide to go back -";
+		close2;
+		warp "mosk_dun01",201,269;
+		end;
+	}
+	mes "- You decided to stay. -";
+	close;
+}
+
+mosk_dun02,268,117,3	script	Milestone#2-3	111,{
+	mes "- There is writing on a big rock. -";
+	next;
+	mes "^3131FF- Those who step forward will gain honor but may die, those who step backward will have courage but may still get hurt.";
+	mes "If you are truly brave, step forward. Otherwise, step back -^000000";
+	next;
+	if(select("Step forward.:Stay.") == 1) {
+		mes "- You bravely step forward. -";
+		close2;
+		warp "mosk_dun03",32,135;
+		end;
+	}
+	mes "- You decided to stay. -";
+	close;
+}
+
+mosk_dun03,27,131,3	script	Milestone#3-2	111,{
+	mes "- There is writing on a big rock. -";
+	next;
+	mes "^3131FF- Those who stay may die but will gain honor, those who go back may get hurt but will gain courage.";
+	mes "Those who have courage will go back, otherwise step forward and stay. -^000000";
+	next;
+	if(select("Go back.:Stay.") == 1) {
+		mes "- You sense danger and decide to go back -";
+		close2;
+		warp "mosk_dun02",262,118;
+		end;
+	}
+	mes "- You decide to stay. -";
+	close;
+}
+
+mosk_dun03,119,46,3	script	Milestone#3-1	111,{
+	mes "There is writing on a big rock.";
+	next;
+	mes "^3131FF- Those who stay may die but will gain honor, those who go back may get hurt but will gain courage.";
+	mes "Those who are afraid of the death will go back, otherwise step forward and stay. -^000000";
+	next;
+	if(select("Go back.:Stay.") == 1) {
+		mes "- You sense danger and decide to go back -";
+		close2;
+		warp "mosk_dun01",257,190;
+		end;
+	}
+	mes "- You decided to stay. -";
+	close;
+}
+
+mosk_dun01,194,43,3	script	Milestone#1-1	111,{
+	mes "- There is writing on a big rock. -";
+	next;
+	mes "- If you want to protect your life, go back -";
+	close;
+}
+
+mosk_fild02,198,53,3	script	Ship#mos_dun	111,{
+	mes "- You find a ship at anchor. -";
+	next;
+	if(select("Take the ship and go back to the village.:Explore more.") == 1) {
+		mes "- You board the ship and pull at the oars. -";
+		close2;
+		warp "moscovia",140,54;
+		end;
+	}
+	mes "- That unknown area arouses your interest. -";
+	close;
+}
diff --git a/npc/pre-re/warps/dungeons/odin.txt b/npc/pre-re/warps/dungeons/odin.txt
new file mode 100644
index 000000000..b87aa430f
--- /dev/null
+++ b/npc/pre-re/warps/dungeons/odin.txt
@@ -0,0 +1,27 @@
+//===== rAthena Script =======================================
+//= Odin Temple Warp Script
+//===== By: ==================================================
+//= birkiczd  (1.0)
+//===== Current Version: =====================================
+//= 1.4
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Odin Temple
+//===== Additional Comments: =================================
+//= 1.1 Move the Saylor from Hugel.txt here. [Poki#3]
+//=	Hako's Sprite, cords and price is official. The text is not.
+//= 1.2 Removed Duplicates [Silent]
+//= 1.3 Official warps [Playtester]
+//= 1.4 Moved Sailor to Hugel quest file since he's part of
+//= Odin's Excavation Quest. [SinSloth]
+//============================================================
+
+odin_tem01,378,182,0	warp	odin01	1,1,odin_tem02,28,180
+odin_tem02,21,180,0	warp	odin02	1,1,odin_tem01,373,182
+odin_tem01,383,334,0	warp	odin03	1,1,odin_tem02,27,334
+odin_tem02,21,334,0	warp	odin04	1,1,odin_tem01,379,334
+odin_tem02,153,349,0	warp	odin05	1,1,odin_tem03,120,54
+odin_tem03,121,49,0	warp	odin06	1,1,odin_tem02,154,345
+odin_tem02,261,377,0	warp	odin07	1,1,odin_tem03,247,40
+odin_tem03,247,34,0	warp	odin08	1,1,odin_tem02,263,372
diff --git a/npc/pre-re/warps/dungeons/orcsdun.txt b/npc/pre-re/warps/dungeons/orcsdun.txt
new file mode 100644
index 000000000..4f067f6c2
--- /dev/null
+++ b/npc/pre-re/warps/dungeons/orcsdun.txt
@@ -0,0 +1,26 @@
+//===== rAthena Script =======================================
+//= Orc Dungeon Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Orc Dungeon
+//===== Additional Comments: =================================
+//= No comment!
+//============================================================
+
+//= Orc Dungeon ==============================================
+in_orcs01,108,86,0	warp	orc001	3,2,gef_fild10,223,203
+in_orcs01,124,171,0	warp	orc002	1,3,gef_fild10,138,329
+in_orcs01,162,55,0	warp	orc003	4,1,gef_fild10,214,53
+in_orcs01,29,116,0	warp	orc004	4,1,gef_fild10,137,286
+in_orcs01,30,154,0	warp	orc005	3,2,gef_fild10,65,335
+in_orcs01,30,182,0	warp	orc01	2,1,orcsdun01,32,170
+orcsdun01,32,172,0	warp	orc01-1	3,1,in_orcs01,30,180
+in_orcs01,108,114,0	warp	orc02	2,1,orcsdun02,180,17
+orcsdun02,180,15,0	warp	orc02-1	2,1,in_orcs01,108,112
+orcsdun01,183,8,0	warp	orc03	4,2,orcsdun02,21,185
+orcsdun02,21,188,0	warp	orc03-1	8,2,orcsdun01,183,11
diff --git a/npc/pre-re/warps/dungeons/pay_dun.txt b/npc/pre-re/warps/dungeons/pay_dun.txt
new file mode 100644
index 000000000..5f513e899
--- /dev/null
+++ b/npc/pre-re/warps/dungeons/pay_dun.txt
@@ -0,0 +1,36 @@
+//===== rAthena Script ======================================= 
+//= Payon Cave Warps
+//===== By: ================================================== 
+//= Nana (1.0)
+//===== Current Version: ===================================== 
+//= 1.2
+//===== Compatible With: ===================================== 
+//= Any rAthena Mod
+//===== Description: ========================================= 
+//= Payon Dungeon Warps
+//===== Additional Comments: ================================= 
+//= 1.1a Fixed 'payd04r' warping players to a non-existant tile [MasterOfMuppets]
+//============================================================ 
+
+//= Payon Cave ===============================================
+pay_dun00,184,33,0	warp	payd01	2,7,pay_dun01,19,33
+pay_dun00,21,186,0	warp	pay005	2,2,pay_arche,39,131
+pay_dun01,15,33,0	warp	payd01-1	2,6,pay_dun00,181,33
+pay_dun01,286,25,0	warp	payd02	2,7,pay_dun02,19,63
+pay_dun02,137,128,0	warp	payd03	4,1,pay_dun03,155,159
+pay_dun02,16,63,0	warp	payd02-1	2,7,pay_dun01,283,28
+pay_dun03,155,161,0	warp	payd03-1	2,1,pay_dun02,137,126
+pay_dun03,127,62,4	script	payd04r	45,2,2,{
+	set @r,rand(4);
+	if(@r==1) goto w2;
+	if(@r==2) goto w3;
+	if(@r==3) goto w4;
+		warp "pay_dun04",201,204; end;
+	w2:	warp "pay_dun04",189,43; end;
+	w3:	warp "pay_dun04",43,40; end;
+	w4:	warp "pay_dun04",34,202; end;
+}
+pay_dun04,191,41,0	warp	payd04-2	1,1,pay_dun03,124,62
+pay_dun04,202,206,0	warp	payd04-3	1,1,pay_dun03,124,62
+pay_dun04,32,204,0	warp	payd04-4	2,1,pay_dun03,124,62
+pay_dun04,40,37,0	warp	payd04-1	2,2,pay_dun03,124,62
diff --git a/npc/pre-re/warps/dungeons/prt_maze.txt b/npc/pre-re/warps/dungeons/prt_maze.txt
new file mode 100644
index 000000000..6cfd23abd
--- /dev/null
+++ b/npc/pre-re/warps/dungeons/prt_maze.txt
@@ -0,0 +1,242 @@
+//===== rAthena Script =======================================
+//= Prontera Dungeons Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Prontera Dungeons
+//===== Additional Comments: =================================
+//= 1.1 updating according to jA. Optimized scripts [Lupus]
+//============================================================
+
+//= Hidden Temple ============================================
+// ----- (1st Floor No.03)(1st Floor No.16)(1st Floor No.20)
+// 1st Floor No.01 -------------------------------------------------------------
+prt_maze01,22,194,0	warp	mazewarp5101	1,1,prt_maze01,16,31	/*To No.1-21*/
+prt_maze01,5,186,0	warp	mazewarp5102	1,1,prt_maze01,182,88	/*To No.1-15*/
+// 1st Floor No.02
+prt_maze01,58,194,0	warp	mazewarp5103	1,1,prt_maze01,23,128	/*To No.1-6*/
+// 1st Floor No.03
+prt_maze01,102,165,0	warp	mazewarp5104	1,1,prt_maze01,99,31	/*To No.1-23*/
+prt_maze01,85,174,0	warp	mazewarp5105	1,1,prt_maze02,93,20
+// 1st Floor No.04
+prt_maze01,154,181,0	warp	mazewarp5106	1,1,prt_maze01,191,175	/*To No.1-5*/
+prt_maze01,125,171,0	warp	mazewarp5107	1,1,prt_maze01,8,186	/*To No.1-1*/
+// 1st Floor No.05
+prt_maze01,175,165,0	warp	mazewarp5108	1,1,prt_maze01,48,104	/*To No.1-12*/
+prt_maze01,194,175,0	warp	mazewarp5109	1,1,prt_maze01,23,128	/*To No.1-6*/
+// 1st Floor No.06
+prt_maze01,18,154,0	warp	mazewarp5110	1,1,prt_maze01,177,71	/*To No.1-20*/
+prt_maze01,23,125,0	warp	mazewarp5111	1,1,prt_maze01,151,22	/*To No.1-24*/
+prt_maze01,5,140,0	warp	mazewarp5112	1,1,prt_maze01,58,48	/*To No.1-17*/
+// 1st Floor No.07
+prt_maze01,54,154,0	warp	mazewarp5113	1,1,prt_maze01,191,175	/*To No.1-5*/
+prt_maze01,63,125,0	warp	mazewarp5114	1,1,prt_maze01,182,88	/*To No.1-15*/
+// 1st Floor No.08
+prt_maze01,98,154,0	warp	mazewarp5115	1,1,prt_maze01,102,168	/*To No.1-3*/
+prt_maze01,114,145,0	warp	mazewarp5116	1,1,prt_maze01,23,128	/*To No.1-6*/
+prt_maze01,85,146,0	warp	mazewarp5117	1,1,prt_maze01,142,111	/*To No.1-14*/
+// 1st Floor No.09
+prt_maze01,137,125,0	warp	mazewarp5118	1,1,prt_maze01,191,139	/*To No.1-10*/
+prt_maze01,154,134,0	warp	mazewarp5119	1,1,prt_maze01,58,191	/*To No.1-2*/
+// 1st Floor No.10
+prt_maze01,194,139,0	warp	mazewarp5120	1,1,prt_maze01,22,88	/*To No.1-11*/
+prt_maze01,166,139,0	warp	mazewarp5121	1,1,prt_maze01,128,173	/*To No.1-4*/
+// 1st Floor No.11
+prt_maze01,17,114,0	warp	mazewarp5122	1,1,prt_maze01,8,186	/*To No.1-1*/
+prt_maze01,22,85,0	warp	mazewarp5123	1,1,prt_maze01,137,128	/*To No.1-9*/
+// 1st Floor No.12
+prt_maze01,63,114,0	warp	mazewarp5124	1,1,prt_maze01,111,56	/*To No.1-18*/
+prt_maze01,63,85,0	warp	mazewarp5125	1,1,prt_maze01,151,22	/*To No.1-24*/
+prt_maze01,74,97,0	warp	mazewarp5126	1,1,prt_maze01,71,11	/*To No.1-22*/
+prt_maze01,45,104,0	warp	mazewarp5127	1,1,prt_maze01,63,128	/*To No.1-7*/
+// 1st Floor No.13
+prt_maze01,105,114,0	warp	mazewarp5128	1,1,prt_maze01,111,145	/*To No.1-8?*/
+prt_maze01,114,95,0	warp	mazewarp5129	1,1,prt_maze01,14,48	/*To No.1-16*/
+prt_maze01,85,97,0	warp	mazewarp5130	1,1,prt_maze01,63,128	/*To No.1-7*/
+// 1st Floor No.14
+prt_maze01,142,114,0	warp	mazewarp5131	1,1,prt_maze01,23,128	/*To No.1-6*/
+prt_maze01,125,105,0	warp	mazewarp5132	1,1,prt_maze01,14,48	/*To No.1-16*/
+// 1st Floor No.15
+prt_maze01,182,85,0	warp	mazewarp5133	1,1,prt_maze01,58,48	/*To No.1-17*/
+prt_maze01,194,94,0	warp	mazewarp5134	1,1,prt_maze01,58,191	/*To No.1-2*/
+prt_maze01,168,94,0	warp	mazewarp5135	1,1,prt_maze01,191,139	/*To No.1-10*/
+// 1st Floor No.16
+prt_maze01,14,74,0	warp	mazewarp5136	1,1,prt_maze01,151,22	/*To No.1-24*/
+prt_maze01,14,45,0	warp	mazewarp5137	1,1,mjolnir_12,44,21
+prt_maze01,5,58,0	warp	mazewarp5138	1,1,prt_maze01,48,104	/*To No.1-12*/
+// 1st Floor No.17
+prt_maze01,74,74,0	warp	mazewarp5139	1,1,prt_maze01,58,191	/*To No.1-2*/
+prt_maze01,52,45,0	warp	mazewarp5140	1,1,prt_maze01,139,48	/*To No.1-19*/
+// 1st Floor No.18
+prt_maze01,104,74,0	warp	mazewarp5141	1,1,prt_maze01,14,48	/*To No.1-16*/
+prt_maze01,96,45,0	warp	mazewarp5142	1,1,prt_maze01,63,128	/*To No.1-7*/
+prt_maze01,114,56,0	warp	mazewarp5143	1,1,prt_maze01,176,8	/*To No.1-25*/
+prt_maze01,85,56,0	warp	mazewarp5144	1,1,prt_maze01,105,111	/*To No.1-13*/
+// 1st Floor No.19
+prt_maze01,137,74,0	warp	mazewarp5145	1,1,prt_maze01,182,88	/*To No.1-15*/
+prt_maze01,139,45,0	warp	mazewarp5146	1,1,prt_maze01,71,11	/*To No.1-22*/
+// 1st Floor No.20
+prt_maze01,177,74,0	warp	mazewarp5147	1,1,prt_fild01,136,368
+prt_maze01,175,45,0	warp	mazewarp5148	1,1,prt_maze01,58,48	/*To No.1-17*/
+prt_maze01,194,54,0	warp	mazewarp5149	1,1,prt_maze01,99,31	/*To No.1-23*/
+// 1st Floor No.21
+prt_maze01,16,34,0	warp	mazewarp5150	1,1,prt_maze01,128,173	/*To No.1-4*/
+prt_maze01,23,5,0	warp	mazewarp5151	1,1,prt_maze01,176,8	/*To No.1-25*/
+// 1st Floor No.22
+prt_maze01,54,5,0	warp	mazewarp5152	1,1,prt_maze01,128,173	/*To No.1-4*/
+prt_maze01,74,12,0	warp	mazewarp5153	1,1,prt_maze01,58,48	/*To No.1-17*/
+prt_maze01,45,21,0	warp	mazewarp5154	1,1,prt_maze01,142,111	/*To No.1-14*/
+// 1st Floor No.23
+prt_maze01,99,34,0	warp	mazewarp5155	1,1,prt_maze01,137,128	/*To No.1-9*/
+prt_maze01,114,22,0	warp	mazewarp5156	1,1,prt_maze01,177,71	/*To No.1-20*/
+prt_maze01,85,13,0	warp	mazewarp5157	1,1,prt_maze01,22,88	/*To No.1-11*/
+//1st Floor No.24
+prt_maze01,154,22,0	warp	mazewarp5158	1,1,prt_maze01,139,48	/*To No.1-19*/
+// 1st Floor No.25
+prt_maze01,176,34,0	warp	mazewarp5159	1,1,prt_maze01,8,186	/*To No.1-1*/
+prt_maze01,176,5,0	warp	mazewarp5160	1,1,prt_maze01,137,128	/*To No.1-9*/
+prt_maze01,194,15,0	warp	mazewarp5161	1,1,prt_maze01,52,48	/*To No.1-17*/
+prt_maze01,165,22,0	warp	mazewarp5162	1,1,prt_maze01,63,128	/*To No.1-7*/
+// 2nd Floor -------------------------------------------------------------------
+prt_maze02,93,16,0	warp	mazewarp5201	1,1,prt_maze01,102,168	/*To No.1-3*/
+prt_maze02,100,182,0	warp	mazewarp5202	1,1,prt_maze03,182,88	/*To No.3-15*/
+// 3rd Floor No.01	-------------------------------------------------------------
+prt_maze03,22,194,0	warp	mazewarp5301	1,1,prt_maze03,175,48	/*To No.3-20*/
+prt_maze03,5,186,0	warp	mazewarp5302	1,1,prt_maze03,151,134	/*To No.3-9*/
+//3rd Floor No.02
+prt_maze03,58,194,0	script	#mazewarp5303	45,1,1,{
+	set	@w,rand(4);
+	if(@w==1)goto w2;
+	if(@w==2)goto w3;
+	if(@w==3)goto w4;
+		warp "prt_maze03",98,151; end;	/*To No.3-8*/
+	w2:	warp "prt_maze03",137,128; end;	/*To No.3-9*/
+	w3:	warp "prt_maze03",14,71; end;	/*To No.3-16*/
+	w4:	warp "prt_maze03",54,8; end;	/*To No.3-22*/
+}
+// 3rd Floor No.03
+prt_maze03,102,165,0	warp	mazewarp5304	1,1,prt_maze03,137,71	/*To No.3-19*/
+prt_maze03,85,174,0	warp	mazewarp5305	1,1,prt_maze03,14,47	/*To No.3-16*/
+// 3rd Floor No.04
+prt_maze03,154,181,0	warp	mazewarp5306	1,1,prt_maze03,139,48	/*To No.3-19*/
+prt_maze03,125,171,0	warp	mazewarp5307	1,1,prt_maze03,105,111	/*To No.3-13*/
+// 3rd Floor No.05
+prt_maze03,175,165,0	warp	mazewarp5308	1,1,prt_maze03,71,12	/*To No.3-22*/
+prt_maze03,194,175,0	warp	mazewarp5309	1,1,prt_maze03,191,139	/*To No.3-10*/
+// 3rd Floor No.06
+prt_maze03,18,154,0	warp	mazewarp5310	1,1,prt_maze03,48,21	/*To No.3-22*/
+prt_maze03,23,125,0	warp	mazewarp5311	1,1,prt_maze03,177,71	/*To No.3-20*/
+prt_maze03,5,140,0	warp	mazewarp5312	1,1,prt_maze03,111,56	/*To No.3-18*/
+// 3rd Floor No.07
+prt_maze03,54,154,0	warp	mazewarp5313	1,1,prt_maze03,142,111	/*To No.3-14*/
+prt_maze03,63,125,0	warp	mazewarp5314	1,1,prt_maze03,88,97	/*To No.3-13*/
+// 3rd Floor No.08
+prt_maze03,98,154,0	warp	mazewarp5315	1,1,prt_maze03,99,31	/*To No.3-23*/
+prt_maze03,114,145,0	warp	mazewarp5316	1,1,prt_maze03,168,22	/*To No.3-25*/
+prt_maze03,85,146,0	warp	mazewarp5317	1,1,prt_maze03,22,88	/*To No.3-11*/
+// 3rd Floor No.09
+prt_maze03,137,125,0	warp	mazewarp5318	1,1,prt_maze03,71,71	/*To No.3-17*/
+prt_maze03,154,134,0	warp	mazewarp5319	1,1,prt_maze03,8,186	/*To No.3-1*/
+// 3rd Floor No.10
+prt_maze03,194,139,0	warp	mazewarp5320	1,1,prt_maze03,191,175	/*To No.3-5*/
+prt_maze03,166,139,0	warp	mazewarp5321	1,1,prt_maze03,63,88	/*To No.3-12*/
+// 3rd Floor No.11
+prt_maze03,17,114,0	warp	mazewarp5322	1,1,prt_maze03,128,105	/*To No.3-14*/
+prt_maze03,22,85,0	warp	mazewarp5323	1,1,prt_maze03,88,146	/*To No.3-8*/
+// 3rd Floor No.12
+prt_maze03,63,114,0	warp	mazewarp5324	1,1,prt_maze03,14,71	/*To No.3-16*/
+prt_maze03,63,85,0	warp	mazewarp5325	1,1,prt_maze03,169,139	/*To No.3-10*/
+prt_maze03,74,97,0	warp	mazewarp5326	1,1,prt_maze03,54,8	/*To No.3-22*/
+prt_maze03,45,104,0	warp	mazewarp5327	1,1,prt_maze03,96,48	/*To No.3-18*/
+// 3rd Floor No.13
+prt_maze03,105,114,0	warp	mazewarp5328	1,1,prt_maze03,128,171	/*To No.3-4*/
+prt_maze03,114,95,0	warp	mazewarp5329	1,1,prt_maze03,176,8	/*To No.3-25*/
+prt_maze03,85,97,0	warp	mazewarp5330	1,1,prt_maze03,63,128	/*To No.3-7*/
+// 3rd Floor No.14
+prt_maze03,142,114,0	warp	mazewarp5331	1,1,prt_maze03,54,151	/*To No.3-7*/
+prt_maze03,125,105,0	warp	mazewarp5332	1,1,prt_maze03,58,191	/*To No.3-2*/
+// 3rd Floor No.15
+prt_maze03,182,85,0	warp	mazewarp5333	1,1,prt_maze02,100,179
+prt_maze03,194,94,0	warp	mazewarp5334	1,1,prt_maze03,151,22	/*To No.3-24*/
+prt_maze03,168,94,0	warp	mazewarp5335	1,1,prt_maze03,191,54	/*To No.3-20*/
+// 3rd Floor No.16
+prt_maze03,14,74,0	warp	mazewarp5336	1,1,prt_maze03,63,111	/*To No.3-12*/
+prt_maze03,14,45,0	warp	mazewarp5337	1,1,prt_maze03,88,174	/*To No.3-3*/
+prt_maze03,5,58,0	warp	mazewarp5338	1,1,prt_maze03,191,15	/*To No.3-25*/
+// 3rd Floor No.17
+prt_maze03,74,74,0	script	#mazewarp5339	45,1,1,{
+set	@w,rand(4);
+	if(@w==1)goto w2;
+	if(@w==2)goto w3;
+	if(@w==3)goto w4;
+		warp "prt_maze03",98,151; end;	/*To No.3-8*/
+	w2:	warp "prt_maze03",137,128; end;	/*To No.3-9*/
+	w3:	warp "prt_maze03",14,71; end;	/*To No.3-16*/
+	w4:	warp "prt_maze03",54,8; end;	/*To No.3-22*/
+}
+prt_maze03,52,45,0	warp	mazewarp5340	1,1,prt_maze03,16,31	/*To No.3-21*/
+// 3rd Floor No.18
+prt_maze03,104,74,0	warp	mazewarp5341	1,1,prt_maze03,111,22	/*To No.3-23*/
+prt_maze03,96,45,0	warp	mazewarp5342	1,1,prt_maze03,48,104	/*To No.3-12*/
+prt_maze03,114,56,0	warp	mazewarp5343	1,1,prt_maze03,8,140	/*To No.3-6*/
+prt_maze03,85,56,0	warp	mazewarp5344	1,1,prt_maze03,176,31	/*To No.3-25*/
+// 3rd Floor No.19
+prt_maze03,137,74,0	warp	mazewarp5345	1,1,prt_maze03,102,168	/*To No.3-3*/
+prt_maze03,139,45,0	script	#mazewarp5346	45,1,1,{
+	set	@w,rand(4);
+	if(@w==1)goto w2;
+	if(@w==2)goto w3;
+	if(@w==3)goto w4;
+		warp "prt_maze03",98,151; end;	/*To No.3-8*/
+	w2:	warp "prt_maze03",137,128; end;	/*To No.3-9*/
+	w3:	warp "prt_maze03",14,71; end;	/*To No.3-16*/
+	w4:	warp "prt_maze03",54,8; end;	/*To No.3-22*/
+}
+// 3rd Floor No.20
+prt_maze03,177,74,0	warp	mazewarp5347	1,1,prt_maze03,23,128	/*To No.3-6*/
+prt_maze03,175,45,0	warp	mazewarp5348	1,1,prt_maze03,22,191	/*To No.3-1*/
+prt_maze03,194,54,0	warp	mazewarp5349	1,1,prt_maze03,171,94	/*To No.3-15*/
+// 3rd Floor No.21
+prt_maze03,16,34,0	warp	mazewarp5350	1,1,prt_maze03,52,48	/*To No.3-17*/
+prt_maze03,23,5,0	warp	mazewarp5351	1,1,prt_maze03,88,13	/*To No.3-23*/
+// 3rd Floor No.22
+prt_maze03,54,5,0	warp	mazewarp5352	1,1,prt_maze03,71,97	/*To No.3-12*/
+prt_maze03,74,12,0	warp	mazewarp5353	1,1,prt_maze03,175,168	/*To No.3-5*/
+prt_maze03,45,21,0	warp	mazewarp5354	1,1,prt_maze03,18,151	/*To No.3-6*/
+// 3rd Floor No.23
+prt_maze03,99,34,0	warp	mazewarp5355	1,1,prt_maze03,98,151	/*To No.3-8*/
+prt_maze03,114,22,0	warp	mazewarp5356	1,1,prt_maze03,104,71	/*To No.3-18*/
+prt_maze03,85,13,0	warp	mazewarp5357	1,1,prt_maze03,23,8	/*To No.3-21*/
+// 3rd Floor No.24
+prt_maze03,154,22,0	script	#mazewarp5358	45,1,1,{
+	set	@w,rand(4);
+	if(@w==1)goto w2;
+	if(@w==2)goto w3;
+	if(@w==3)goto w4;
+		warp "prt_maze03",98,151; end;	/*To No.3-8*/
+	w2:	warp "prt_maze03",137,128; end;	/*To No.3-9*/
+	w3:	warp "prt_maze03",14,71; end;	/*To No.3-16*/
+	w4:	warp "prt_maze03",54,8; end;	/*To No.3-22*/
+}
+// 3rd Floor No.25
+prt_maze03,176,34,0	warp	mazewarp5359	1,1,prt_maze03,88,56	/*To No.3-18*/
+prt_maze03,176,5,0	warp	mazewarp5360	1,1,prt_maze03,111,95	/*To No.3-13*/
+prt_maze03,194,15,0	warp	mazewarp5361	1,1,prt_maze03,8,58	/*To No.3-16*/
+prt_maze03,165,22,0	warp	mazewarp5362	1,1,prt_maze03,111,145	/*To No.3-8*/
+
+//= Prontera Sewers ==============================================
+prt_sewb1,135,248,0	warp	prts001	2,2,prt_fild05,274,208
+prt_sewb1,188,247,0	warp	prts01	1,3,prt_sewb2,19,19
+prt_sewb2,100,176,0	warp	prts02	4,2,prt_sewb2,140,28
+prt_sewb2,140,24,0	warp	prts02-1	4,2,prt_sewb2,100,172
+prt_sewb2,180,24,0	warp	prts03	4,2,prt_sewb3,180,169
+prt_sewb2,19,12,0	warp	prts01-1	2,2,prt_sewb1,192,247
+prt_sewb2,19,175,0	warp	prts04	4,2,prt_sewb2,60,28
+prt_sewb2,60,24,0	warp	prts04-1	4,2,prt_sewb2,19,171
+prt_sewb3,180,173,0	warp	prts03-1	4,2,prt_sewb2,180,28
+prt_sewb3,20,185,0	warp	prts05	3,2,prt_sewb4,100,92
+prt_sewb4,100,96,0	warp	prts05-1	3,2,prt_sewb3,19,180
diff --git a/npc/pre-re/warps/dungeons/ra_san.txt b/npc/pre-re/warps/dungeons/ra_san.txt
new file mode 100644
index 000000000..6b9076b5f
--- /dev/null
+++ b/npc/pre-re/warps/dungeons/ra_san.txt
@@ -0,0 +1,43 @@
+//===== rAthena Script =======================================
+//= Rachel Sanctuary Dungeon Warp Script
+//===== By ===================================================
+//= Playtester
+//===== Current Version :=====================================
+//= 1.4
+//===== Compatible With :=====================================
+//= Any Athena Version
+//===== Description :=========================================
+//= Warp Points For Rachel Sanctuary Dungeon
+//===== Additional Comment:===================================
+//= 1.1 Added $ephiroth's warps [Playtester]
+//= 1.2 Replaced old versions with jAthena's [Playtester]
+//= 1.3 Official warps [Playtester]
+//= 1.4 Added quest map warp to random warp. [L0ne_W0lf]
+//=	Added Dungeon exit back into temple.
+//============================================================
+
+ra_san01,139,13,0	script	sanctuary01	45,1,1,{
+	if (ra_tem_q == 21) { warp "que_san04",119,110; end; }
+	switch(rand(3)) {
+		case 1:  warp "ra_san02",213,275; break;
+		case 2:  warp "ra_san03",119,283; break;
+		default: warp "ra_san04",119,110; break;
+	}
+}
+
+ra_san02,213,280,0	warp	sanctuary02	1,1,ra_san01,140,19
+ra_san03,123,283,0	warp	sanctuary03	1,1,ra_san01,140,19
+ra_san04,119,104,0	warp	sanctuary04	1,1,ra_san01,140,19
+ra_san03,279,21,0	warp	sanctuary05	1,1,ra_san05,282,149
+ra_san03,85,15,0	warp	sanctuary06	1,1,ra_san04,203,216
+ra_san04,203,221,0	warp	sanctuary07	1,1,ra_san03,85,20
+ra_san04,120,48,0	warp	sanctuary08	1,1,ra_san05,150,282
+ra_san05,150,7,0	warp	sanctuary09	1,1,ra_temple,119,153
+ra_san02,289,149,0	warp	sanctuary10	1,1,ra_san03,10,149
+ra_san03,5,149,0	warp	sanctuary11	1,1,ra_san02,284,149
+ra_san02,213,4,0	warp	sanctuary12	1,1,ra_san04,35,216
+ra_san04,35,221,0	warp	sanctuary13	1,1,ra_san02,213,9
+ra_san02,30,21,0	warp	sanctuary14	1,1,ra_san05,14,149
+
+//Additional Dungeon warp. (Exit)
+ra_san01,139,139,0	warp	sanctuary15	1,1,ra_temin,27,314
diff --git a/npc/pre-re/warps/dungeons/tha_t.txt b/npc/pre-re/warps/dungeons/tha_t.txt
new file mode 100644
index 000000000..ab707f62f
--- /dev/null
+++ b/npc/pre-re/warps/dungeons/tha_t.txt
@@ -0,0 +1,60 @@
+//===== rAthena Script =======================================
+//= Thanatos Tower Warps
+//===== By: ==================================================
+//= [Ishizu-chan]
+//===== Current Version: =====================================
+//= 1.1 Beta
+//===== Compatible With: =====================================
+//= Any rAthena Version i guess?
+//===== Description: =========================================
+//= It's the Thanatos Tower Warps...
+//===== Additional Comments: =================================
+//= 1.0 - First Release [Ishizu-chan]
+//= 1.1 - Added Entrance Warp Guard
+//= 1.2 - Updated warps to official and moved Entrance Guard
+//= to proper quest file. [SinSloth]
+//============================================================
+
+// Thanatos Scene (tha_scene01)
+tha_scene01,144,198,0	warp	WarpThana0a	1,1,tha_t01,149,38
+tha_t01,149,33,0	warp	WarpThana0b	1,1,hu_fild01,140,158
+
+// Thanatos Tower Level 1 (tha_t01)
+tha_t01,150,150,0	warp	WarpThana1a	1,1,tha_t02,149,130
+tha_t02,149,125,0	warp	WarpThana1b	1,1,tha_t01,150,145
+
+// Thanatos Tower Level 2 (tha_t02)
+tha_t03,217,165,0	warp	WarpThana2a	1,1,tha_t02,227,157
+
+// Thanatos Tower Level 3 (tha_t03)
+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
+
+// Thanatos Tower Level 5 (tha_t05)
+tha_t05,62,157,0	warp	WarpThana5a	1,1,tha_t05,213,97
+tha_t05,208,97,0	warp	WarpThana5b	1,1,tha_t05,62,162
+tha_t05,185,235,0	warp	WarpThana5c	1,1,tha_t06,206,11
+thana_step,174,288,0	warp	WarpThana6b	1,1,tha_t08,28,43
+thana_step,173,372,0	warp	WarpThana6c	1,1,tha_t07,30,166
+tha_t07,114,166,0	warp	WarpThana6d	1,1,thana_step,69,287
+
+// Thanatos Tower Level 8 (tha_t08)
+tha_t08,114,43,0	warp	WarpThana8a	1,1,thana_step,30,223
+thana_step,32,166,0	warp	WarpThana8b	1,1,tha_t09,20,96
+
+// Thanatos Tower Level 9 (tha_t09)
+tha_t09,92,146,0	warp	WarpThana9b	1,1,thana_step,180,223
+
+// Thanatos Tower Level 10 (tha_t10)
+thana_step,182,166,0	warp	WarpThana10a	1,1,tha_t10,155,100
+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
+
+// Thanatos Tower Level 12 (tha_t12)
+thana_step,181,15,0	warp	WarpThana12a	1,1,tha_t12,115,16
diff --git a/npc/pre-re/warps/dungeons/thor_v.txt b/npc/pre-re/warps/dungeons/thor_v.txt
new file mode 100644
index 000000000..342a8bc6d
--- /dev/null
+++ b/npc/pre-re/warps/dungeons/thor_v.txt
@@ -0,0 +1,28 @@
+//===== rAthena Script =======================================
+//= Thor's Volcano Dungeon Warp Script
+//===== By: ==================================================
+//= $ephiroth
+//===== Current Version: =====================================
+//= 1.3
+//===== Compatible With: =====================================
+//= Any Athena Version 
+//===== Description: =========================================
+//= Warp Points for Thor's Volcano Dungeon
+//===== Additional Comments: =================================
+//= 1.3 Rescripted to Aegis 11.2 Standards. [L0ne_W0lf
+//============================================================
+
+ve_fild03,168,240,0	warp	thor_v1-1	1,1,thor_v01,21,229
+thor_v01,21,224,0	warp	thor_v1-2	1,1,ve_fild03,168,235
+thor_v01,201,37,0	warp	thor_v2-1	1,1,thor_v02,78,203
+thor_v02,192,60,0	warp	thor_v2-2	1,1,thor_v03,35,262
+thor_v02,73,203,0	warp	thor_v3-1	1,1,thor_v01,196,37
+thor_v03,30,262,0	warp	thor_v3-2	1,1,thor_v02,187,58
+
+//============================================================ 
+// Old changelog
+//============================================================ 
+//= 1.0 Initial version [$ephiroth]
+//= 1.1 Updated warps, according to Japan site [$ephiroth]
+//= 1.2 Updated more warps to thor_camp [$ephiroth]
+//============================================================ 
diff --git a/npc/pre-re/warps/dungeons/treasure.txt b/npc/pre-re/warps/dungeons/treasure.txt
new file mode 100644
index 000000000..72d93c2eb
--- /dev/null
+++ b/npc/pre-re/warps/dungeons/treasure.txt
@@ -0,0 +1,49 @@
+//==== rAthena Script ========================================
+//= Treasure Island warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Treasure Island
+//===== Additional Comments: =================================
+//= Split of Alberta.txt
+//= 1.1 Moved Turtle Island warps to unique file. [L0ne_W0lf]
+//============================================================
+
+//Treasure Island Warp's
+treasure01,112,164,0	warp	tre01	1,4,treasure01,97,164
+treasure01,125,161,0	warp	tre02	1,3,treasure01,144,161
+treasure01,142,161,0	warp	tre02-1	1,3,treasure01,123,161
+treasure01,164,114,0	warp	tre03	3,1,treasure01,164,88
+treasure01,164,91,0	warp	tre03-1	5,1,treasure01,164,116
+treasure01,99,164,0	warp	tre01-1	1,4,treasure01,114,164
+treasure01,76,111,0	warp	tre10	1,3,treasure01,100,111
+treasure01,38,164,0	warp	tre04-1	1,4,treasure01,25,164
+treasure01,40,111,0	warp	tre05	1,3,treasure01,67,112
+treasure01,62,111,0	warp	tre05-1	1,3,treasure01,38,111
+treasure01,27,164,0	warp	tre04	1,4,treasure01,40,164
+treasure01,69,75,0	warp	tre07	2,1,treasure01,69,106
+treasure01,69,125,0	warp	tre08	4,1,treasure01,69,142
+treasure01,69,140,0	warp	tre08-1	4,1,treasure01,69,123
+treasure01,98,111,0	warp	tre10-1	1,3,treasure01,74,111
+treasure01,69,177,0	warp	tre002	3,1,treasure02,102,27
+treasure01,41,37,0	warp	tre06	1,3,treasure01,61,37
+treasure01,58,37,0	warp	tre06-1	1,3,treasure01,39,37
+treasure01,69,102,0	warp	tre07-1	2,1,treasure01,69,77
+treasure01,79,37,0	warp	tre09	1,3,treasure01,98,37
+treasure01,96,37,0	warp	tre09-1	1,3,treasure01,77,37
+treasure01,69,22,0	warp	tre001	4,1,alb2trea,85,107
+treasure02,102,103,0	warp	tre11	5,1,treasure02,102,120
+treasure02,102,118,0	warp	tre11-1	5,1,treasure02,102,101
+treasure02,155,128,0	warp	tre13-1	1,1,treasure02,155,97
+treasure02,155,99,0	warp	tre13	1,1,treasure02,155,130
+treasure02,49,99,0	warp	tre14-1	1,1,treasure02,49,130
+treasure02,102,24,0	warp	tre003	3,1,treasure01,69,179
+treasure02,123,72,0	warp	tre12	1,4,treasure02,140,72
+treasure02,138,72,0	warp	tre12-1	1,4,treasure02,121,72
+treasure02,49,128,0	warp	tre14	1,1,treasure02,49,97
+treasure02,65,72,0	warp	tre15	1,4,treasure02,82,72
+treasure02,80,72,0	warp	tre15-1	1,4,treasure02,63,72
diff --git a/npc/pre-re/warps/dungeons/tur_dun.txt b/npc/pre-re/warps/dungeons/tur_dun.txt
new file mode 100644
index 000000000..e61147e7d
--- /dev/null
+++ b/npc/pre-re/warps/dungeons/tur_dun.txt
@@ -0,0 +1,23 @@
+//==== rAthena Script ========================================
+//= Turtle Island warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Turtle Island
+//===== Additional Comments: =================================
+//= 1.0 Split from combined warp file alberta_duns. [L0ne_W0lf]
+//============================================================
+
+//Turtle Island Warp's
+tur_dun01,154,241,0	warp	ttl01	1,1,tur_dun02,148,264
+tur_dun02,148,268,0	warp	ttl01-1	1,1,tur_dun01,154,237
+tur_dun02,167,19,0	warp	ttl02	1,1,tur_dun03,132,189
+tur_dun03,132,193,0	warp	ttl02-1	1,1,tur_dun02,167,23
+tur_dun03,217,71,0	warp	ttl03	1,1,tur_dun04,100,192
+tur_dun04,100,196,0	warp	ttl03-1	1,1,tur_dun03,215,75
+tur_dun05,89,69,0	warp	ttl05	1,1,tur_dun02,148,264
+tur_dun05,9,45,0	warp	ttl06	1,1,tur_dun01,154,237
diff --git a/npc/pre-re/warps/dungeons/um_dun.txt b/npc/pre-re/warps/dungeons/um_dun.txt
new file mode 100644
index 000000000..4d453432e
--- /dev/null
+++ b/npc/pre-re/warps/dungeons/um_dun.txt
@@ -0,0 +1,32 @@
+//===== rAthena Script =======================================
+//= Umbala Dungeon (Yggdrasil Cave) Warp Script
+//===== By: ==================================================
+//= Darkchild (1.0vA); Athena (1.0vB)
+//===== Current Version: =====================================
+//= 1.3 (Akaru)
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 6+
+//===== Description: =========================================
+//= [Aegis Conversion]
+//= Warp Points for Umbala Dungeon (Yggdrasil Cave)
+//===== Additional Comments: =================================
+//= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
+//= 1.3 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//============================================================
+
+umbala,106,285,0	warp	um_dun1-1	1,1,um_dun01,42,30
+um_dun01,42,27,0	warp	um_dun1-2	1,1,umbala,109,284
+um_dun01,149,198,0	warp	um_dun2-1	1,1,um_dun02,52,22
+um_dun02,55,19,0	warp	um_dun2-2	1,1,um_dun01,152,198
+um_dun02,60,89,0	warp	um_dun3-1	1,1,um_dun02,215,74
+um_dun02,215,77,0	warp	um_dun3-2	1,1,um_dun02,60,92
+um_dun02,64,79,0	warp	um_dun4-1	1,1,um_dun02,219,261
+um_dun02,222,259,0	warp	um_dun4-2	1,1,um_dun02,67,77
+um_dun02,26,244,0	warp	um_dun5-1	1,1,um_dun02,233,253
+um_dun02,231,255,0	warp	um_dun5-2	1,1,um_dun02,25,241
+um_dun02,103,208,0	warp	um_dun6-1	1,1,um_dun02,180,38
+um_dun02,177,38,0	warp	um_dun6-2	1,1,um_dun02,100,208
+um_dun02,32,249,0	warp	um_dun7-1	1,1,um_dun02,117,208
+um_dun02,113,208,0	warp	um_dun7-2	1,1,um_dun02,35,252
+um_dun02,215,85,0	warp	um_dun8-1	1,1,um_dun02,166,38
+um_dun02,169,38,0	warp	um_dun8-2	1,1,um_dun02,215,88
diff --git a/npc/pre-re/warps/dungeons/xmas_dun.txt b/npc/pre-re/warps/dungeons/xmas_dun.txt
new file mode 100644
index 000000000..96374f412
--- /dev/null
+++ b/npc/pre-re/warps/dungeons/xmas_dun.txt
@@ -0,0 +1,19 @@
+//===== rAthena Script =======================================
+//= Lutie Dungeon (Toy Factory) Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.2
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 2+
+//===== Description: =========================================
+//= Warp Points for Toy Factory
+//===== Additional Comments: =================================
+//= 1.1 Fixed endless warping loop
+//= 1.2 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//============================================================
+
+xmas,143,314,0	warp	xmas_dun1-1	1,1,xmas_dun01,205,16
+xmas_dun01,205,13,0	warp	xmas_dun1-2	1,1,xmas,143,311
+xmas_dun01,129,130,0	warp	xmas_dun2-1	1,1,xmas_dun02,131,130
+xmas_dun02,129,130,0	warp	xmas_dun2-2	1,1,xmas_dun01,132,130
diff --git a/npc/pre-re/warps/fields/abyss_warper.txt b/npc/pre-re/warps/fields/abyss_warper.txt
new file mode 100644
index 000000000..8c4ea1e1c
--- /dev/null
+++ b/npc/pre-re/warps/fields/abyss_warper.txt
@@ -0,0 +1,168 @@
+//===== rAthena Script =======================================
+//= Abyss Cave Warper
+//===== By: ==================================================
+//= erKURITA
+//===== Current Version: =====================================
+//= 1.4
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warper to Abyss Cave. and warper out
+//===== Additional Comments: =================================
+//= 1.0 Added by Nexon [Nexon]
+//= 1.1 Removed Duplicates [Silent]
+//= 1.2 Fixed tab - missing pillar's appeared [Lupus]
+//= 1.3 Updated Abyss Lake entrance based on official [SinSloth]
+//= 1.3a Removed .GATs [Lupus]
+//= 1.4 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
+//============================================================
+
+hu_fild05,168,304,0	script	Column#abyss1	111,{
+
+	mes "^3355FFThere are 3 oddly";
+	mes "shaped grooves on";
+	mes "the surface of this";
+	mes "column. It seems that";
+	mes "certain dragon body parts";
+	mes "would fit perfectly into";
+	mes "the column grooves.^000000";
+	if((countitem(1035)) && (countitem(1036)) && (countitem(1037)))
+	{
+		next;
+		switch( select( "Insert Dragon Body Parts","Eat Dragon Body Parts" ) )
+		{
+			case 1:
+				mes "^3355FFYou carefully place a";
+				mes "Dragon Canine into one of";
+				mes "the grooves, and then you";
+				mes "hear a powerful rumbling";
+				mes "from within the column.^000000";
+				specialeffect EF_WINDHIT;
+				next;
+				mes "^3355FFYou slowly insert a";
+				mes "Dragon Scale into another";
+				mes "of the column's grooves,";
+				mes "trigerring another small";
+				mes "tremor from the column.^000000";
+				specialeffect EF_WINDHIT;
+				next;
+				mes "^3355FFYou cautiously insert";
+				mes "a Dragon Tail into the";
+				mes "final groove. Lights shine";
+				mes "forth from cracks in the";
+				mes "column's surface...^000000";
+				specialeffect EF_WINDHIT;
+				next;
+				mes "^3355FFThe ground beneath";
+				mes "your feet begins to";
+				mes "violently shake.^000000";
+				specialeffect EF_BOWLINGBASH;
+				donpcevent "AbyssWarp::OnWarp";
+				specialeffect2 EF_PORTAL;
+				delitem 1035,1;
+				delitem 1036,1;
+				delitem 1037,1;
+				close2;
+				warp "hu_fild05",184,204;
+				end;
+
+			case 2:
+				mes "^3355FFYou gingerly place a";
+				mes "Dragon's Canine, a Dragon";
+				mes "Scale, and a Dragon Tail into";
+				mes "your mouth and slowly begin";
+				mes "to chew. Nothing happens";
+				mes "and the taste of these items";
+				mes "is surprisingly putrid.^000000";
+				next;
+				emotion e_rice,1;
+				delitem 1035,1;
+				delitem 1036,1;
+				delitem 1037,1;
+				percentheal -10,0;
+				close;
+		}
+	}
+	close;
+}
+
+hu_fild05,171,211,0	script	Column#abyss2	111,1,1,{
+
+	mes "^3355FFThis column looks";
+	mes "very similar to the";
+	mes "one you've seen in";
+	mes "the lake. There is";
+	mes "a conspicious blue";
+	mes "groove on its surface.^000000";
+	next;
+	switch( select( "Touch the Groove","Remove Item from Groove" ) )
+	{
+		case 1:
+			mes "^3355FF*Clatter Clatter*^000000";
+			next;
+			mes "^3355FFThe light emanating from";
+			mes "the groove distorts and";
+			mes "the column starts to shake.";
+			mes "You hear a faint rumbling";
+			mes "from inside the column.^000000";
+			specialeffect EF_WINDHIT;
+			next;
+			mes "*Ggghhhhhzzzz!*";
+			mes "*BAM!*";
+			next;
+			mes "^3355FFThe light shining from";
+			mes "the column's groove grows";
+			mes "brighter as you feel the";
+			mes "ground beneath your feet";
+			mes "begin to slowly sink away...^000000";
+			next;
+			specialeffect EF_BOWLINGBASH;
+			specialeffect2 EF_PORTAL;
+			close2;
+			warp "hu_fild05",169,305;
+			end;
+
+		case 2:
+			mes "^3355FF*Ppppsssh!*";
+			mes "You accidentally";
+			mes "broke the item.^000000";
+			specialeffect EF_WINDHIT;
+			next;
+			mes "^3355FF*Gggggggghhhhhhhhzzzzzzjjjjhh!*^000000";
+			next;
+			mes "^3355FFThe light emanating from";
+			mes "the groove distorts and";
+			mes "the column starts to shake.";
+			mes "The tremors in the ground";
+			mes "make it difficult to stand";
+			mes "steadily, but suddently you";
+			mes "are warped somewhere else...^000000";
+			next;
+			specialeffect EF_BOWLINGBASH;
+			specialeffect2 EF_PORTAL;
+			close2;
+			warp "hu_fild05",157,284;
+			end;
+	}
+}
+
+hu_fild05,196,210,1	script	AbyssWarp	45,2,2,{
+
+OnInit:
+	disablenpc "AbyssWarp";
+	end;
+
+OnTouch:
+	warp "abyss_01",260,268;
+	end;
+
+OnWarp:
+	initnpctimer;
+	enablenpc "AbyssWarp";
+	end;
+
+OnTimer30000:
+	stopnpctimer;
+	disablenpc "AbyssWarp";
+	end;
+}
diff --git a/npc/pre-re/warps/fields/amatsu_fild.txt b/npc/pre-re/warps/fields/amatsu_fild.txt
new file mode 100644
index 000000000..37e94c3b8
--- /dev/null
+++ b/npc/pre-re/warps/fields/amatsu_fild.txt
@@ -0,0 +1,21 @@
+//===== rAthena Script =======================================
+//= Amatsu Field Warp's
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= [Aegis COnversion]
+//= Warp Points for Amatsu Field
+//===== Additional Comments: =================================
+//= 1.1 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//============================================================
+
+amatsu,248,292,0	warp	ama_fild1-1	1,1,ama_fild01,75,33
+ama_fild01,75,30,0	warp	ama_fild1-2	1,1,amatsu,248,289
+ama_fild01,174,331,0	warp	ama_shrine1-1	1,1,ama_in01,175,174
+ama_in01,175,171,0	warp	ama_shrine1.2	1,1,ama_fild01,174,328
+ama_fild01,330,141,0	warp	ama_craftsman1-1	1,1,ama_in01,174,124
+ama_in01,174,121,0	warp	ama_craftsman1.2	1,1,ama_fild01,330,138
diff --git a/npc/pre-re/warps/fields/bif_fild.txt b/npc/pre-re/warps/fields/bif_fild.txt
new file mode 100644
index 000000000..d6f6505e4
--- /dev/null
+++ b/npc/pre-re/warps/fields/bif_fild.txt
@@ -0,0 +1,22 @@
+//===== rAthena Script =======================================
+//= Bifrost Field Warp Script
+//===== By: ==================================================
+//= Chilly
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: =========================================
+//= Warp Points for Bifrost Field
+//===== Additional Comments: =================================
+//= 1.0 First Version.
+//============================================================
+
+splendide,275,390,0	warp	bifrost_field0001	1,1,bif_fild01,316,50
+bif_fild01,318,48,0	warp	bifrost_field0002	1,1,splendide,275,387
+bif_fild02,285,333,0	warp	bifrost_field0003	1,1,mora,179,74
+mora,182,74,0	warp	bifrost_field0004	1,1,bif_fild02,285,330
+bif_fild02,95,310,0	warp	bifrost_field0005	1,1,mora,22,157
+mora,20,159,0	warp	bifrost_field0006	1,1,bif_fild02,98,309
+bif_fild02,174,162,0	warp	bifrost_field0007	1,1,mora,58,27
+mora,56,25,0	warp	bifrost_field0008	1,1,bif_fild02,177,162
diff --git a/npc/pre-re/warps/fields/bra_fild.txt b/npc/pre-re/warps/fields/bra_fild.txt
new file mode 100644
index 000000000..1f0fe24ba
--- /dev/null
+++ b/npc/pre-re/warps/fields/bra_fild.txt
@@ -0,0 +1,16 @@
+//===== rAthena Script =======================================
+//= Brasilis Fild Warps Script
+//===== By: ==================================================
+//= Protimus
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= [Aegis Conversion]
+//= Warp Points for Brasilis
+//===== Additional Comments: =================================
+//= 1.0 First version.
+//============================================================
+bra_fild01,72,34,0	warp	bra_fild01_brasilis	1,1,brasilis,309,334
+brasilis,308,336,0	warp	brasilis_bra_fild01	1,1,bra_fild01,74,34
diff --git a/npc/pre-re/warps/fields/com_fild.txt b/npc/pre-re/warps/fields/com_fild.txt
new file mode 100644
index 000000000..765874af1
--- /dev/null
+++ b/npc/pre-re/warps/fields/com_fild.txt
@@ -0,0 +1,51 @@
+//===== rAthena Script =======================================
+//= Comodo Field Warp Script
+//===== By: ==================================================
+//= Nana
+//===== Current Version: =====================================
+//= 1.2
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= [Aegis Conversion]
+//= Warp Points for Comodo Fields
+//===== Additional Comments: =================================
+//= 1.1 Rescripted to Aegis 10.3 Standards. [L0ne_W0lf]
+//= 1.2 Renewal warp adjustments.
+//============================================================
+
+cmd_fild01,222,24,0	warp	cmd_fild01-1	1,1,cmd_fild02,222,372
+cmd_fild01,362,73,0	warp	cmd_fild01-2	1,1,cmd_fild03,27,68
+cmd_fild01,362,263,0	warp	cmd_fild01-3	1,1,cmd_fild03,27,269
+cmd_fild02,222,376,0	warp	cmd_fild02-1	1,1,cmd_fild01,222,30
+cmd_fild02,382,269,0	warp	cmd_fild02-2	1,1,cmd_fild04,25,275
+cmd_fild02,358,95,0	warp	cmd_fild02-3	1,1,cmd_fild04,35,94
+cmd_fild03,23,269,0	warp	cmd_fild03-1	1,1,cmd_fild01,359,260
+cmd_fild03,23,68,0	warp	cmd_fild03-2	1,1,cmd_fild01,359,76
+cmd_fild03,181,17,0	warp	cmd_fild03-3	1,1,cmd_fild04,181,367
+//cmd_fild03,384,165,0	warp	cmd_fild03-4	1,1,cmd_fild05,26,161
+cmd_fild04,21,275,0	warp	cmd_fild04-1	1,1,cmd_fild02,378,264
+cmd_fild04,31,92,0	warp	cmd_fild04-2	1,1,cmd_fild02,351,92
+cmd_fild04,376,287,0	warp	cmd_fild04-3	1,1,cmd_fild06,26,288
+cmd_fild04,180,372,0	warp	cmd_fild04-4	1,1,cmd_fild03,183,23
+//cmd_fild05,21,163,0	warp	cmd_fild05-1	1,1,cmd_fild03,377,167
+//cmd_fild05,148,19,0	warp	cmd_fild05-2	1,1,cmd_fild06,150,374
+//cmd_fild06,150,380,0	warp	cmd_fild06-3	1,1,cmd_fild05,146,27
+cmd_fild06,21,285,0	warp	cmd_fild06-4	1,1,cmd_fild04,371,288
+cmd_fild06,151,27,0	warp	cmd_fild06-5	1,1,cmd_fild07,147,370
+cmd_fild06,368,96,0	warp	cmd_fild06-6	1,1,cmd_fild08,25,102
+cmd_fild06,379,174,0	warp	cmd_fild06-7	1,1,cmd_fild08,28,166
+cmd_fild06,372,359,0	warp	cmd_fild06-8	1,1,cmd_fild08,31,359
+cmd_fild07,149,379,0	warp	cmd_fild07-1	10,1,cmd_fild06,147,36
+cmd_fild07,389,186,0	warp	cmd_fild07-2	1,3,cmd_fild09,18,170
+cmd_fild08,25,355,0	warp	cmd_fild08-1	1,1,cmd_fild06,366,359
+cmd_fild08,25,170,0	warp	cmd_fild08-2	1,1,cmd_fild06,374,167
+cmd_fild08,15,102,0	warp	cmd_fild08-3	1,1,cmd_fild06,361,96
+cmd_fild08,76,31,0	warp	cmd_fild08-4	2,1,cmd_fild09,76,375
+cmd_fild08,309,48,0	warp	cmd_fild08-5	2,1,cmd_fild09,307,374
+cmd_fild08,354,324,0	warp	cmd_fild08-6	1,1,moc_fild12,26,305
+cmd_fild09,12,170,0	warp	cmd_fild09-1	1,4,cmd_fild07,382,184
+cmd_fild09,369,164,0	warp	cmd_fild09-2	2,2,moc_fild18,55,170
+cmd_fild09,309,381,0	warp	cmd_fild09-3	2,1,cmd_fild08,309,60
+cmd_fild09,75,382,0	warp	cmd_fild09-4	2,1,cmd_fild08,75,42
+moc_fild18,51,170,0	warp	moc_fild18-1	1,3,cmd_fild09,363,164
diff --git a/npc/pre-re/warps/fields/dic_fild.txt b/npc/pre-re/warps/fields/dic_fild.txt
new file mode 100644
index 000000000..10c9a5635
--- /dev/null
+++ b/npc/pre-re/warps/fields/dic_fild.txt
@@ -0,0 +1,19 @@
+//===== rAthena Script =======================================
+//= El Dicastes Field Warp Script
+//===== By: ==================================================
+//= Chilly
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: =========================================
+//= Warp Points for El Dicastes Field
+//===== Additional Comments: =================================
+//= 1.0 First Version.
+//============================================================
+
+dic_dun01,371,44,0	warp	dic_field0001	1,1,dic_fild01,28,79
+dic_fild01,24,79,0	warp	dic_field0002	1,1,dic_dun01,367,44
+dic_fild01,69,23,0	warp	dic_field0003	1,1,dic_fild02,71,371
+dic_fild02,71,375,0	warp	dic_field0004	1,1,dic_fild01,69,27
+dicastes01,199,34,0	warp	dic_field0005	1,1,dic_fild01,150,277
diff --git a/npc/pre-re/warps/fields/ein_fild.txt b/npc/pre-re/warps/fields/ein_fild.txt
new file mode 100644
index 000000000..c83a13b1e
--- /dev/null
+++ b/npc/pre-re/warps/fields/ein_fild.txt
@@ -0,0 +1,53 @@
+//===== rAthena Script =======================================
+//= Einbroch Field Warp Script
+//===== By: ==================================================
+//= Sara-chan (1.0), SSUNNY@YOUNG(1.2)
+//===== Current Version: =====================================
+//= 1.2
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 8+
+//===== Description: =========================================
+//= Warp Points for Lighthalzen Field
+//===== Additional Comments: =================================
+// Field update - Einbroch and Lhztargen by Sara - Version 1.0
+// 1.1 moved field warps from town warps [Lupus]
+// 1.2 Updated Warps, work done by SSUNNY@YOUNG in Korean eA site [Vicious]
+//============================================================
+
+
+//Einbroch Field <-> Juno Field
+yuno_fild04,251,21,0	warp	ein001	1,1,ein_fild06,252,363
+ein_fild06,252,365,0	warp	ein001a	1,1,yuno_fild04,251,23
+yuno_fild07,73,219,0	warp	ein002	1,1,ein_fild06,338,170
+ein_fild06,340,170,0	warp	ein002a	1,1,yuno_fild07,75,219
+yuno_fild07,56,76,0	warp	ein003	1,1,ein_fild06,354,94
+ein_fild06,356,94,0	warp	ein003a	1,1,yuno_fild07,58,76
+yuno_fild11,28,266,0	warp	ein004	1,1,ein_fild07,380,263
+ein_fild07,382,263,0	warp	ein004a	1,1,yuno_fild11,30,266
+
+//Einbroch Field
+ein_fild06,135,35,0	warp	ein005	1,1,ein_fild07,147,360
+ein_fild07,145,362,0	warp	ein005a	1,1,ein_fild06,135,37
+ein_fild07,191,42,0	warp	ein006	1,1,ein_fild10,194,370
+ein_fild10,194,372,0	warp	ein006a	1,1,ein_fild07,191,44
+ein_fild10,24,331,0	warp	ein007	1,1,ein_fild09,327,346
+ein_fild09,329,346,0	warp	ein007a	1,1,ein_fild10,26,331
+ein_fild09,34,132,0	warp	ein008	1,1,ein_fild08,361,128
+ein_fild08,363,128,0	warp	ein008a	1,1,ein_fild09,36,132
+
+//Einbroch Field <-> Lighthalzen Field
+einbech,62,29,0	warp	ein_fd03	1,1,ein_fild09,74,350
+ein_fild09,71,352,0	warp	ein_fd03a	1,1,einbech,62,32
+
+ein_fild04,20,251,0	warp	ein046	1,1,ein_fild03,361,257
+ein_fild03,363,257,0	warp	ein046a	1,1,ein_fild04,22,251
+ein_fild04,14,215,0	warp	ein047	1,1,ein_fild03,359,219
+ein_fild03,361,219,0	warp	ein047a	1,1,ein_fild04,16,215
+ein_fild04,14,205,0	warp	ein048	1,1,ein_fild03,359,204
+ein_fild03,361,204,0	warp	ein048a	1,1,ein_fild04,16,205
+ein_fild03,142,32,0	warp	ein049	1,1,lhz_fild02,166,365
+lhz_fild02,166,367,0	warp	ein049a	1,1,ein_fild03,142,34
+lhz_fild02,164,37,0	warp	ein050	1,1,lhz_fild03,158,347
+lhz_fild03,158,349,0	warp	ein050a	1,1,lhz_fild02,164,39
+lhz_fild03,363,283,0	warp	ein051	1,1,ein_fild08,25,275
+ein_fild08,23,275,0	warp	ein051a	1,1,lhz_fild03,361,283
diff --git a/npc/pre-re/warps/fields/gefenia.txt b/npc/pre-re/warps/fields/gefenia.txt
new file mode 100644
index 000000000..832bdea74
--- /dev/null
+++ b/npc/pre-re/warps/fields/gefenia.txt
@@ -0,0 +1,29 @@
+//===== rAthena Script =======================================
+//= Gefenia Warp Script
+//===== By: ==================================================
+//= Muad Dib (1.0)
+//= Darkchild (1.1)
+//= Nana (1.2)
+//===== Current Version: =====================================
+//= 1.3
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 6+
+//===== Description: =========================================
+//= Warp Points for Gefenia
+//===== Additional Comments: =================================
+//= 1.3 fixed gefenia03,28,26 -> gefenia03,58,26
+//============================================================
+gefenia01,37,103,0	warp	gefeniawarp014	1,1,gefenia04,283,95
+gefenia01,199,269,0	warp	gefeniawarp001	1,1,gefenia02,203,34
+gefenia01,220,256,0	warp	gefeniawarp003	1,1,gefenia02,240,23
+gefenia02,17,175,0	warp	gefeniawarp005	1,1,gefenia03,266,168
+gefenia02,19,237,0	warp	gefeniawarp007	1,1,gefenia03,264,236
+gefenia02,203,31,0	warp	gefeniawarp002	1,1,gefenia01,199,266
+gefenia02,240,20,0	warp	gefeniawarp004	1,1,gefenia01,223,256
+gefenia03,58,26,0	warp	gefeniawarp011	1,1,gefenia04,33,270
+gefenia03,145,27,0	warp	gefeniawarp009	1,1,gefenia04,130,272
+gefenia03,267,236,0	warp	gefeniawarp008	1,1,gefenia02,22,237
+gefenia03,269,168,0	warp	gefeniawarp006	1,1,gefenia02,20,175
+gefenia04,130,275,0	warp	gefeniawarp010	1,1,gefenia03,145,30
+gefenia04,33,273,0	warp	gefeniawarp012	1,1,gefenia03,58,29
+gefenia04,287,95,0	warp	gefeniawarp013	1,1,gefenia01,40,103
diff --git a/npc/pre-re/warps/fields/geffen_fild.txt b/npc/pre-re/warps/fields/geffen_fild.txt
new file mode 100644
index 000000000..08b0e46e2
--- /dev/null
+++ b/npc/pre-re/warps/fields/geffen_fild.txt
@@ -0,0 +1,73 @@
+//===== rAthena Script =======================================
+//= Geffen Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Geffen Field's
+//===== Additional Comments: =================================
+//= No comment!
+//= 1.1 Renewal warp adjustments.
+//============================================================
+
+//= Geffen Field Warps =======================================
+gef_fild00,267,382,0	warp	gef007	4,2,mjolnir_06,265,32
+gef_fild00,381,137,0	warp	gef008	3,9,prt_fild00,24,125
+gef_fild00,40,199,0	warp	gef009	2,7,geffen,213,119
+gef_fild01,382,111,0	warp	gef010	2,9,prt_fild04,20,114
+gef_fild01,16,102,0	warp	geff01	2,4,gef_fild09,368,92
+gef_fild01,69,17,0	warp	geff02	4,2,gef_fild03,66,379
+gef_fild02,380,156,0	warp	gef011	3,7,prt_fild07,21,143
+gef_fild02,380,289,0	warp	gef012	3,12,prt_fild07,18,289
+gef_fild02,380,68,0	warp	gef013	3,10,prt_fild07,17,64
+gef_fild02,266,18,0	warp	gef026	5,2,prt_fild10,227,296
+gef_fild02,14,78,0	warp	geff03	2,4,gef_fild03,379,77
+gef_fild02,16,275,0	warp	geff04	2,4,gef_fild03,379,277
+gef_fild03,312,16,0	warp	gef014	5,2,prt_fild11,302,298
+gef_fild03,66,382,0	warp	geff02-1	4,2,gef_fild01,69,20
+gef_fild03,382,77,0	warp	geff03-1	2,4,gef_fild02,17,78
+gef_fild03,382,277,0	warp	geff04-1	2,4,gef_fild02,19,275
+gef_fild03,18,52,0	warp	geff05	2,4,gef_fild10,367,56
+gef_fild04,187,39,0	warp	gef015	4,2,geffen,119,210
+gef_fild04,261,362,0	warp	gef016	4,2,mjolnir_01,284,21
+gef_fild04,362,322,0	warp	gef017	2,4,mjolnir_06,21,331
+gef_fild04,16,309,0	warp	geff06	2,6,gef_fild05,361,309
+gef_fild05,364,309,0	warp	geff06-1	2,8,gef_fild04,19,309
+gef_fild05,15,201,0	warp	geff07	2,4,gef_fild06,379,211
+gef_fild05,64,15,0	warp	geff08	4,2,gef_fild07,64,360
+gef_fild06,382,211,0	warp	geff07-1	2,4,gef_fild05,18,201
+gef_fild06,218,17,0	warp	geff09	4,2,gef_fild08,200,352
+gef_fild07,339,187,0	warp	gef025	2,4,geffen,29,119
+gef_fild07,64,363,0	warp	geff08-1	4,2,gef_fild05,64,18
+gef_fild07,18,191,0	warp	geff10	2,4,gef_fild08,357,187
+gef_fild07,40,19,0	warp	geff13	1,1,gef_fild13,41,369
+gef_fild08,200,355,0	warp	geff09-1	4,2,gef_fild06,218,20
+gef_fild08,360,187,0	warp	geff10-1	2,4,gef_fild07,21,191
+//gef_fild08,215,18,0	warp	geff14	1,1,gef_fild12,221,369
+gef_fild09,23,56,0	warp	geff18-1	1,1,gef_fild13,376,56
+gef_fild09,225,25,0	warp	geff11	3,2,gef_fild10,251,368
+gef_fild09,368,95,0	warp	geff01-1	4,2,gef_fild01,19,102
+gef_fild10,251,371,0	warp	geff11-1	5,2,gef_fild09,225,28
+gef_fild10,104,21,0	warp	geff12	5,2,gef_fild11,114,360
+gef_fild10,370,56,0	warp	geff05-1	2,5,gef_fild03,21,52
+gef_fild10,136,331,0	warp	gef018	1,1,in_orcs01,122,171
+gef_fild10,138,284,0	warp	gef019	1,1,in_orcs01,29,114
+gef_fild10,215,51,0	warp	gef020	1,1,in_orcs01,162,53
+gef_fild10,223,205,0	warp	gef021	1,1,in_orcs01,108,89
+gef_fild10,63,337,0	warp	gef022	1,1,in_orcs01,30,157
+//gef_fild10,27,219,0	warp	geff19-1	1,1,gef_fild14,367,219
+gef_fild11,377,293,0	warp	gef023	2,4,prt_fild11,20,281
+gef_fild11,111,364,0	warp	geff12-1	6,3,gef_fild10,104,24
+//gef_fild12,221,374,0	warp	geff14-1	1,1,gef_fild08,215,25
+//gef_fild12,368,180,0	warp	geff15	1,1,gef_fild13,29,202
+//gef_fild12,372,50,0	warp	geff16	1,1,gef_fild13,29,59
+//gef_fild13,200,25,0	warp	geff17	1,1,gef_fild14,180,357
+//gef_fild13,25,202,0	warp	geff15-1	1,1,gef_fild12,364,180
+//gef_fild13,26,59,0	warp	geff16-1	1,1,gef_fild12,370,50
+gef_fild13,380,56,0	warp	geff18	1,1,gef_fild09,27,56
+gef_fild13,41,373,0	warp	geff13-1	1,1,gef_fild07,40,23
+//gef_fild14,180,360,0	warp	geff17-1	1,1,gef_fild13,200,29
+//gef_fild14,371,219,0	warp	geff19	1,1,gef_fild10,31,219
diff --git a/npc/pre-re/warps/fields/glastheim.txt b/npc/pre-re/warps/fields/glastheim.txt
new file mode 100644
index 000000000..e5d2d359b
--- /dev/null
+++ b/npc/pre-re/warps/fields/glastheim.txt
@@ -0,0 +1,85 @@
+//===== rAthena Script =======================================
+//= Glastheim Warp Script
+//===== By: ==================================================
+//= Athena (1.0)
+//===== Current Version: =====================================
+//= 1.4
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 2.x
+//===== Description: =========================================
+//= Warp Points for Glastheim
+//===== Additional Comments: =================================
+//= Split off npc_warp.txt, 1.1 added gl18-2 [Lupus]
+//= optimized random warp [Lupus] fixed looped warps
+//= 1.4 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
+//============================================================
+
+//Glastheim
+gef_fild06,20,304,0	warp	gef027	3,3,glast_01,370,304
+gl_cas01,135,40,0	warp	gl01	1,1,gl_cas01,144,314
+gl_cas01,149,314,0	warp	gl02	1,1,gl_prison,14,70
+gl_cas01,167,191,0	warp	gl03	1,1,gl_prison,14,70
+gl_cas01,185,236,0	warp	gl06	1,1,gl_cas01,163,191
+gl_cas01,200,165,0	warp	gl10a	1,1,gl_cas02,104,25
+gl_cas01,200,18,0	warp	gl7-1	2,2,glast_01,200,294
+gl_cas01,215,236,0	warp	gl07	1,1,gl_cas01,238,192
+gl_cas01,234,192,0	warp	gl04	1,1,gl_prison,14,70
+gl_cas01,371,301,0	warp	gl05	1,1,gl_prison,14,70
+gl_cas01,372,39,0	warp	gl08	1,1,gl_cas01,367,301
+gl_cas02,104,15,0	warp	gl10-1	1,1,gl_cas01,200,160
+gl_cas02,104,193,0	warp	gl8-1	1,1,glast_01,199,325
+gl_church,156,4,0	warp	gl9-1	1,1,glast_01,200,134
+gl_church,16,299,0	warp	gl11a	1,1,gl_chyard,147,284
+gl_church,301,46,0	warp	gl12	1,1,gl_chyard,147,15
+gl_chyard,12,149,0	warp	gl22	1,1,gl_sew02,29,270
+gl_chyard,147,12,0	warp	gl12-1	1,1,gl_church,295,46
+gl_chyard,147,287,0	warp	gl11-1	1,1,gl_church,16,295
+gl_dun01,133,277,0	warp	gl25-1	1,1,gl_sew04,101,78
+gl_dun01,225,18,0	warp	gl13	1,1,gl_dun02,224,274
+gl_dun02,224,277,0	warp	gl13-1	1,1,gl_dun01,225,22
+gl_in01,106,125,0	warp	gl5-1	1,1,glast_01,219,357
+gl_in01,118,59,0	warp	gl6-1	1,1,glast_01,234,330
+gl_in01,81,68,0	warp	gl3-1	1,1,glast_01,165,330
+gl_in01,83,174,0	warp	gl4-1	1,1,glast_01,181,357
+gl_knt01,104,204,0	warp	gl15	1,1,gl_knt01,123,292
+gl_knt01,12,148,0	warp	gl14	1,1,gl_knt02,15,140
+gl_knt01,128,292,0	warp	gl15-1	1,1,gl_knt01,104,199
+gl_knt01,150,291,0	warp	gl16	1,1,gl_knt02,157,287
+gl_knt01,150,6,0	warp	gl2-1	2,2,glast_01,74,193
+gl_knt01,231,197,0	warp	gl24-1	1,1,gl_sew02,296,22
+gl_knt01,287,144,0	warp	gl17	1,1,gl_knt02,283,140
+gl_knt02,10,138,0	warp	gl14-1	1,1,gl_knt01,7,148
+gl_knt02,157,292,0	warp	gl16-1	1,1,gl_knt01,150,286
+gl_knt02,289,138,0	warp	gl17-1	1,1,gl_knt01,292,144
+gl_prison,149,183,0	warp	gl18-1	1,1,gl_prison1,150,14
+gl_prison,10,70,4	script	gl18-2	45,1,1,{
+if(rand(2)==1) goto w2;
+	warp "gl_cas01",236,192; end;
+w2: warp "gl_cas01",164,191; end;
+}
+gl_prison1,150,10,0	warp	gl18	1,1,gl_prison,149,178
+gl_prison1,62,187,0	warp	gl10	1,1,gl_sew01,258,255
+gl_sew01,19,21,0	warp	gl19	1,1,gl_sew02,108,291
+gl_sew01,258,258,0	warp	gl09	1,1,gl_prison1,61,183
+gl_sew02,109,294,0	warp	gl19-1	1,1,gl_sew01,19,24
+gl_sew02,16,26,0	warp	gl11	1,1,gl_prison1,61,183
+gl_sew02,290,156,0	warp	gl23	1,1,gl_step,117,124
+gl_sew02,296,18,0	warp	gl24	1,1,gl_knt01,231,192
+gl_sew02,299,294,0	warp	gl20	1,1,gl_sew03,171,283
+gl_sew02,30,273,0	warp	gl22-1	1,1,gl_chyard,15,149
+gl_sew03,171,286,0	warp	gl20-1	1,1,gl_sew02,295,294
+gl_sew03,64,10,0	warp	gl21	1,1,gl_sew04,68,277
+gl_sew04,104,78,0	warp	gl25	1,1,gl_dun01,133,271
+gl_sew04,68,280,0	warp	gl21-1	1,1,gl_sew03,64,13
+gl_step,120,124,0	warp	gl23-1	1,1,gl_sew02,285,158
+gl_step,8,7,0	warp	gl1-1	1,1,glast_01,54,108
+glast_01,162,330,0	warp	gl3	1,1,gl_in01,77,68
+glast_01,179,360,0	warp	gl4	1,1,gl_in01,80,174
+glast_01,199,322,0	warp	gl8	1,1,gl_cas02,104,189
+glast_01,200,137,0	warp	gl9	1,1,gl_church,156,7
+glast_01,200,297,0	warp	gl7	1,1,gl_cas01,199,29
+glast_01,220,360,0	warp	gl5	1,1,gl_in01,110,125
+glast_01,237,330,0	warp	gl6	1,1,gl_in01,122,59
+glast_01,377,304,0	warp	glst001	3,3,gef_fild06,27,304
+glast_01,51,108,0	warp	gl1	1,1,gl_step,12,7
+glast_01,77,193,0	warp	gl2	1,1,gl_knt01,150,15
diff --git a/npc/pre-re/warps/fields/hugel_fild.txt b/npc/pre-re/warps/fields/hugel_fild.txt
new file mode 100644
index 000000000..8b5de97b2
--- /dev/null
+++ b/npc/pre-re/warps/fields/hugel_fild.txt
@@ -0,0 +1,53 @@
+//===== rAthena Script =======================================
+//= Hugel Field Warp Script
+//===== By: ==================================================
+//= Sara-chan (1.0)
+//===== Current Version: =====================================
+//= 1.3
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 10+
+//===== Description: =========================================
+//= Warp Points for Hugel Field
+//===== Additional Comments: =================================
+//= Initial Release
+//= 1.1 Official warps [Playtester]
+//= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
+//= 1.3 Renewal warp adjustments.
+//============================================================
+
+//= Hugel Field ==============================================
+ein_fild04,343,293,0	warp	hugel001	1,1,ein_fild05,80,294
+ein_fild05,76,294,0	warp	hugel001a	1,1,ein_fild04,336,292
+ein_fild05,376,183,0	warp	hugel002	1,1,ein_fild06,47,166
+ein_fild06,42,171,0	warp	hugel002a	1,1,ein_fild05,371,183
+//ein_fild02,357,251,0	warp	hugel003-1	1,1,yuno_fild04,38,280
+//yuno_fild04,33,279,0	warp	hugel003a-1	1,1,ein_fild02,350,250
+//ein_fild01,349,369,0	warp	hugel003	1,1,yuno_fild05,43,346
+//yuno_fild05,41,350,0	warp	hugel003a	1,1,ein_fild01,345,367
+//ein_fild01,106,34,0	warp	hugel004	1,1,ein_fild02,109,358
+//ein_fild02,108,364,0	warp	hugel004a	1,1,ein_fild01,106,40
+//ein_fild01,234,34,0	warp	hugel005	1,1,ein_fild02,258,343
+//ein_fild02,257,350,0	warp	hugel005a	1,1,ein_fild01,231,40
+//ein_fild02,170,29,0	warp	hugel006	1,1,ein_fild05,172,366
+//ein_fild05,172,371,0	warp	hugel006a	1,1,ein_fild02,170,37
+hu_fild01,366,185,0	warp	hugel007	1,1,hu_fild02,22,168
+hu_fild02,17,168,0	warp	hugel007a	1,1,hu_fild01,361,189
+hu_fild04,47,372,0	warp	hugel008	1,1,hu_fild02,40,27
+hu_fild02,40,22,0	warp	hugel008a	1,1,hu_fild04,48,368
+hu_fild04,294,379,0	warp	hugel009	1,1,hu_fild02,280,31
+hu_fild02,283,28,0	warp	hugel009a	1,1,hu_fild04,289,376
+//hu_fild05,284,356,0	warp	hugel010	1,1,hu_fild03,288,26
+//hu_fild03,288,19,0	warp	hugel010a	1,1,hu_fild05,276,346
+hu_fild05,353,126,0	warp	hugel011	1,1,hu_fild06,34,119
+hu_fild06,28,119,0	warp	hugel011a	1,1,hu_fild05,347,130
+hu_fild02,374,339,0	warp	hugel012	1,1,hu_fild03,24,337
+//hu_fild03,20,338,0	warp	hugel012a	1,1,hu_fild02,370,339
+hu_fild02,378,162,0	warp	hugel013	1,1,hu_fild03,30,163
+//hu_fild03,25,163,0	warp	hugel013a	1,1,hu_fild02,373,160
+//yuno_fild09,377,184,0	warp	hugel014	1,1,yuno_fild10,44,183
+//yuno_fild10,39,183,0	warp	hugel014a	1,1,yuno_fild09,371,184
+
+// RE Addon
+ein_fild01,106,34,0	warp	EinF01Dn01_EinF05Up01	1,1,ein_fild05,172,366
+ein_fild01,234,34,0	warp	EinF01Dn02_EinF05Up02	1,1,ein_fild05,172,366
+ein_fild05,172,371,0	warp	EinF05Up01_EinF01Dn01	1,1,ein_fild01,106,40
diff --git a/npc/pre-re/warps/fields/jawaii.txt b/npc/pre-re/warps/fields/jawaii.txt
new file mode 100644
index 000000000..024f97c1f
--- /dev/null
+++ b/npc/pre-re/warps/fields/jawaii.txt
@@ -0,0 +1,26 @@
+//===== rAthena Script =======================================
+//= Jawaii Warp Script
+//===== By: ==================================================
+//= Muad Dib (1.0)
+//= Darkchild (1.1)
+//= MasterOfMuppets (1.2)
+//===== Current Version: =====================================
+//= 1.2b
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 6+
+//===== Description: =========================================
+//= Warp Points for Jawaii
+//===== Additional Comments: =================================
+//= Split off npc_warp.txt
+//= 1.2a Added a missing warp, thanks to Zoc [MasterOfMuppets]
+//= 1.2b Added a missing warp [Komurka]
+//============================================================
+
+jawaii_in,90,78,0	warp	jawaiiwarp001	1,1,jawaii,115,172
+jawaii_in,113,61,0	warp	jawaiiwarp002	1,1,jawaii,138,202
+jawaii_in,133,107,0	warp	jawaiiwarp003	1,1,jawaii,111,199
+jawaii_in,88,117,0	warp	jawaiiwarp004	1,1,jawaii,109,186
+jawaii,192,215,0	warp	jawaiiwarp005	1,1,jawaii_in,28,94
+jawaii_in,27,91,4	script	jawaiiwarp006	45,1,1,{
+if (getpartnerid() > 0) warp "jawaii",192,218; else warp "jawaii_in",27,94;
+}
diff --git a/npc/pre-re/warps/fields/lhalzen_fild.txt b/npc/pre-re/warps/fields/lhalzen_fild.txt
new file mode 100644
index 000000000..10a5b5d7e
--- /dev/null
+++ b/npc/pre-re/warps/fields/lhalzen_fild.txt
@@ -0,0 +1,21 @@
+//===== rAthena Script =======================================
+//= Lighthalzen Field Warp Script
+//===== By: ==================================================
+//= Sara-chan (1.0)
+//===== Current Version: =====================================
+//= 1.2
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 8+
+//===== Description: =========================================
+//= Warp Points for Lighthalzen Field
+//===== Additional Comments: =================================
+//= 1.1 Applied Poki#3's fix for lhz001 & lhz001a [DracoRPG]
+//= 1.2 Updated the warp, according to korean eA site [Vicious]
+//= 1.3 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
+//============================================================
+
+lhz_fild01,210,18,0	warp	lhz043-1	1,1,lighthalzen,214,324
+lighthalzen,214,329,0	warp	lhz043a-1	1,1,lhz_fild01,210,23
+
+lhz_fild01,367,222,0	warp	lhz044-1	1,1,lhz_fild02,36,221
+lhz_fild02,29,219,0	warp	lhz044a-1	1,1,lhz_fild01,361,222
diff --git a/npc/pre-re/warps/fields/lutie_fild.txt b/npc/pre-re/warps/fields/lutie_fild.txt
new file mode 100644
index 000000000..8e944bd81
--- /dev/null
+++ b/npc/pre-re/warps/fields/lutie_fild.txt
@@ -0,0 +1,18 @@
+//===== rAthena Script =======================================
+//= Lutie Field Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 2+
+//===== Description: =========================================
+//= [Aegis Conversion]
+//= Warp Points for Lutie Field
+//===== Additional Comments: =================================
+//= 1.2 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//============================================================
+
+xmas_fild01,69,252,0	warp	xmas_fild1-1	10,2,xmas,149,44
+xmas_fild01,90,252,0	warp	xmax_fild1-2	10,2,xmas,149,44
+xmas_fild01,84,48,0	warp	xmas_fild2	10,2,aldebaran,140,234
diff --git a/npc/pre-re/warps/fields/man_fild.txt b/npc/pre-re/warps/fields/man_fild.txt
new file mode 100644
index 000000000..55e799a69
--- /dev/null
+++ b/npc/pre-re/warps/fields/man_fild.txt
@@ -0,0 +1,24 @@
+//===== rAthena Script =======================================
+//= Manuk Field Warp Script
+//===== By: ==================================================
+//= L0ne_W0lf
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= [Aegis Conversion]
+//= Warp Points for Manuk Field
+//===== Additional Comments: =================================
+//= 1.0 First Version.
+//= 1.1 Updated warps positions. [L0ne_W0lf]
+//============================================================
+
+man_fild01,35,232,0	warp	man_fild01-2	1,1,mid_camp,341,176
+man_fild01,103,55,0	warp	man_fild01-3	1,1,man_fild03,84,366
+man_fild03,84,369,0	warp	man_fild03-1	1,1,man_fild01,103,58
+
+man_fild01,372,230,0	warp	man_fild01-4	1,1,man_fild02,34,261
+man_fild02,32,261,0	warp	man_fild02-1	1,1,man_fild01,369,230
+man_fild02,139,41,0	warp	man_fild02-2	1,1,manuk,112,356
+manuk,114,357,0	warp	man_fild02-3	1,1,man_fild02,138,43
diff --git a/npc/pre-re/warps/fields/morroc_fild.txt b/npc/pre-re/warps/fields/morroc_fild.txt
new file mode 100644
index 000000000..6cd6c64b5
--- /dev/null
+++ b/npc/pre-re/warps/fields/morroc_fild.txt
@@ -0,0 +1,119 @@
+//===== rAthena Script =======================================
+//= Morroc Field Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.4b
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Morroc Fields
+//===== Additional Comments: =================================
+//= 1.1 changed 'anthell' to @anthell [Lupus]
+//= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
+//= 1.3 Updated warps for episode 12.1 [L0ne_W0lf]
+//= 1.4 Uncommented warp that shouldn't have been commented. [L0ne_W0lf]
+//= 1.4a Uncommented yet ANOTHER warp that was taken out. [L0ne_W0lf]
+//= 1.4b Uncommented ANOTHER warp! Yay! :D [L0ne_W0lf]
+//============================================================
+
+//= Sograt Dessert ===========================================
+//moc_fild01,101,16,0	warp	mocf01-1	15,3,moc_fild04,317,376
+moc_fild01,101,16,0	warp	mocf01-1	15,3,moc_fild20,210,342
+moc_fild01,22,242,0	warp	mocf005	2,2,prt_fild09,380,237
+moc_fild01,239,382,0	warp	mocf006	12,1,prt_fild08,233,20
+moc_fild01,301,16,0	warp	mocf02	10,1,moc_fild02,77,338
+moc_fild01,321,16,0	warp	mocf02-1	10,1,moc_fild02,77,338
+moc_fild01,341,16,0	warp	mocf02-2	10,1,moc_fild02,77,338
+moc_fild01,379,162,0	warp	mocf011	2,12,pay_fild04,20,165
+moc_fild01,56,384,0	warp	moc007a	3,2,prt_fild08,54,24
+//moc_fild01,68,16,0	warp	mocf01	15,3,moc_fild04,317,376
+moc_fild02,228,29,0	warp	mocf03	4,2,moc_fild13,298,367
+moc_fild02,332,19,0	warp	mocf04	5,3,moc_fild03,70,336
+moc_fild02,350,339,0	warp	mocf012	6,2,pay_fild04,194,20
+moc_fild02,67,342,0	warp	mocf02-3	11,3,moc_fild01,315,25
+moc_fild02,71,18,0	warp	mocf05	4,2,moc_fild13,146,365
+moc_fild02,92,342,0	warp	mocf02-4	11,3,moc_fild01,315,25
+moc_fild03,17,37,0	warp	mocf06	2,4,moc_fild13,305,49
+//moc_fild03,179,16,0	warp	mocf013	4,2,pay_fild11,38,327
+moc_fild03,303,170,0	warp	mocf014	2,7,pay_fild01,17,152
+moc_fild03,70,341,0	warp	mocf04-1	5,2,moc_fild02,332,23
+//moc_fild04,14,122,0	warp	mocf07-1	1,11,moc_fild05,378,119
+//moc_fild04,14,146,0	warp	mocf07-2	1,11,moc_fild05,378,119
+//moc_fild04,14,98,0	warp	mocf07	1,11,moc_fild05,378,119
+//moc_fild04,175,18,0	warp	mocf08	3,2,moc_fild08,170,380
+//moc_fild04,19,206,0	warp	mocf09	3,15,moc_fild05,373,208
+//moc_fild04,219,327,0	script	mocf016	45,3,4,{ set @anthell,0; warp "anthell01",35,262; }
+//moc_fild04,292,381,0	warp	mocf01-2	10,1,moc_fild01,76,25
+//moc_fild04,314,381,0	warp	mocf01-3	10,1,moc_fild01,76,25
+//moc_fild04,336,381,0	warp	mocf01-4	10,1,moc_fild01,76,25
+//moc_fild04,92,381,0	warp	mocf008	9,2,prt_fild09,246,19
+//moc_fild05,144,375,0	warp	mocf009	11,2,prt_fild10,263,23
+//moc_fild05,18,136,0	warp	mocf10	1,8,moc_fild06,367,317
+//moc_fild05,18,154,0	warp	mocf10-1	1,8,moc_fild06,367,317
+//moc_fild05,18,172,0	warp	mocf10-2	1,8,moc_fild06,367,317
+//moc_fild05,268,18,0	warp	mocf11	4,2,moc_fild09,267,368
+//moc_fild05,325,382,0	warp	mocf010	6,2,prt_fild09,95,19
+//moc_fild05,378,208,0	warp	mocf09-1	3,14,moc_fild04,26,206
+//moc_fild05,384,108,0	warp	mocf07-3	1,8,moc_fild04,22,123
+//moc_fild05,384,126,0	warp	mocf07-4	1,8,moc_fild04,22,123
+//moc_fild05,384,144,0	warp	mocf07-5	1,8,moc_fild04,22,123
+//moc_fild05,82,16,0	warp	mocf12	5,2,moc_fild09,80,366
+//moc_fild06,18,198,0	warp	mocf13	1,18,moc_fild07,378,201
+//moc_fild06,207,18,0	warp	mocf14	11,2,moc_fild10,208,295
+//moc_fild06,377,316,0	warp	mocf10-3	1,15,moc_fild05,24,153
+moc_fild07,198,21,0	warp	mocf001	2,2,morocc,160,294
+//moc_fild07,381,201,0	warp	mocf13-1	2,16,moc_fild06,28,201
+moc_fild07,380,201,0	warp	mocf13-1	2,16,moc_fild20,36,177
+//moc_fild08,16,207,0	warp	mocf15	2,4,moc_fild09,371,195
+//moc_fild08,170,383,0	warp	mocf08-1	3,2,moc_fild04,175,21
+//moc_fild08,204,16,0	warp	mocf16	4,2,moc_fild14,196,379
+//moc_fild08,383,211,0	warp	mocf17	2,4,moc_fild13,32,171
+//moc_fild09,126,20,0	warp	mocf18	4,2,moc_fild15,158,360
+//moc_fild09,267,371,0	warp	mocf11-1	4,2,moc_fild05,268,21
+//moc_fild09,30,162,0	warp	mocf19	2,3,moc_fild10,381,258
+//moc_fild09,374,195,0	warp	mocf15-1	2,8,moc_fild08,19,207
+//moc_fild09,80,369,0	warp	mocf12-1	7,2,moc_fild05,82,19
+//moc_fild10,189,23,0	warp	mocf20	3,2,moc_fild11,189,360
+//moc_fild10,19,207,0	warp	mocf002	2,2,morocc,299,207
+//moc_fild10,208,298,0	warp	mocf14-1	10,2,moc_fild06,207,21
+//moc_fild10,384,258,0	warp	mocf19-1	2,3,moc_fild09,33,162
+//moc_fild11,189,363,0	warp	mocf20-1	3,2,moc_fild10,189,26
+moc_fild11,189,360,0	warp	mocf20-1	3,2,moc_fild20,197,24
+moc_fild11,212,29,0	warp	mocf21	4,2,moc_fild17,218,366
+moc_fild11,26,161,0	warp	mocf22	2,10,moc_fild12,286,168
+//moc_fild11,379,197,0	warp	mocf23	2,6,moc_fild15,41,105
+moc_fild11,377,197,0	warp	mocf23	2,6,moc_fild20,36,177
+moc_fild12,118,30,0	warp	mocf24	4,2,moc_fild18,158,379
+moc_fild12,159,381,0	warp	mocf003	2,2,morocc,160,20
+moc_fild12,289,168,0	warp	mocf22-1	2,3,moc_fild11,29,161
+moc_fild13,146,368,0	warp	mocf05-1	5,2,moc_fild02,71,21
+//moc_fild13,29,171,0	warp	mocf17-1	2,4,moc_fild08,380,211
+moc_fild13,32,171,0	warp	mocf17-1	2,4,moc_fild20,349,179
+moc_fild13,298,370,0	warp	mocf03-1	4,2,moc_fild02,228,32
+moc_fild13,308,49,0	warp	mocf06-1	2,4,moc_fild03,20,37
+//moc_fild14,16,278,0	warp	mocf25	2,6,moc_fild15,364,276
+//moc_fild14,196,382,0	warp	mocf16-1	4,2,moc_fild08,204,19
+//moc_fild15,104,16,0	warp	mocf26	9,2,moc_fild16,125,380
+//moc_fild15,158,363,0	warp	mocf18-1	6,2,moc_fild09,126,23
+//moc_fild15,258,253,0	script	mocf017	45,3,3,{ set @anthell,1; warp "anthell01",35,262; }
+//moc_fild15,348,18,0	warp	mocf27	5,2,moc_fild16,334,379
+//moc_fild15,367,276,0	warp	mocf25-1	2,4,moc_fild14,19,278
+//moc_fild15,38,105,0	warp	mocf23-1	2,4,moc_fild11,376,197
+//moc_fild16,125,383,0	warp	mocf26-1	5,2,moc_fild15,104,19
+moc_fild16,124,381,0	warp	mocf26-1	5,2,moc_fild20,197,24
+moc_fild16,16,179,0	warp	mocf28	2,6,moc_fild17,366,272
+//moc_fild16,334,382,0	warp	mocf27-1	4,2,moc_fild15,348,21
+moc_fild16,333,380,0	warp	mocf27-1	4,2,moc_fild20,197,24
+moc_fild17,218,369,0	warp	mocf21-1	5,2,moc_fild11,212,32
+moc_fild17,30,300,0	warp	moc29	2,5,moc_fild18,379,305
+moc_fild17,369,272,0	warp	mocf28-1	2,3,moc_fild16,19,179
+moc_fild18,158,382,0	warp	mocf24-1	4,2,moc_fild12,118,33
+moc_fild18,382,305,0	warp	moc29-1	2,4,moc_fild17,33,300
+moc_fild19,169,107,0	warp	mocf004	1,4,morocc,27,164
+moc_fild19,71,170,0	warp	mocf018	8,2,moc_ruins,71,19
+moc_fild19,98,99,0	warp	mocf019	1,1,in_sphinx1,288,9
+
+// Satan Morroc Addition
+moc_fild21,26,196,0	warp	mocf020	1,1,moc_fild20,349,179
+moc_fild22,32,196,0	warp	mocf021	1,1,moc_fild20,349,179
diff --git a/npc/pre-re/warps/fields/mtmjolnir.txt b/npc/pre-re/warps/fields/mtmjolnir.txt
new file mode 100644
index 000000000..1c49ddc96
--- /dev/null
+++ b/npc/pre-re/warps/fields/mtmjolnir.txt
@@ -0,0 +1,63 @@
+//===== rAthena Script =======================================
+//= Mt. Mjolnir Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.2a
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Mt. Mjolnir
+//===== Additional Comments: =================================
+//= 1.1 updating according to jA [Lupus]
+//= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
+//= 1.2a Corrected a broken warp point. (bugreport:497) [Samuray22]
+//============================================================
+
+//= Mt. Mjolnir ==============================================
+mjolnir_01,284,18,0	warp	mjol001	4,2,gef_fild04,261,359
+mjolnir_01,378,256,0	warp	mjol01	2,2,mjolnir_02,31,258
+mjolnir_02,28,258,0	warp	mjol01-1	2,2,mjolnir_01,374,256
+mjolnir_02,326,289,0	warp	mjol02	1,1,mjolnir_03,24,258
+mjolnir_02,361,18,0	warp	mjol03	4,2,mjolnir_06,366,380
+mjolnir_02,79,365,0	warp	mjol013	2,1,mjo_dun01,52,17
+mjolnir_03,21,258,0	warp	mjol02-1	2,2,mjolnir_02,323,289
+mjolnir_03,212,17,0	warp	mjol04	4,2,mjolnir_07,214,380
+mjolnir_03,242,204,0	warp	mjol05	1,1,mjolnir_04,125,208
+mjolnir_04,122,208,0	warp	mjol05-1	1,1,mjolnir_03,239,204
+mjolnir_04,160,46,0	warp	mjol06	4,2,mjolnir_08,159,370
+mjolnir_04,387,174,0	warp	mjol07	2,2,mjolnir_05,19,171
+mjolnir_05,16,171,0	warp	mjol07-1	2,2,mjolnir_04,384,174
+mjolnir_05,220,382,0	warp	mjol08	4,2,mjolnir_12,220,29
+mjolnir_05,235,16,0	warp	mjol09	4,2,mjolnir_10,235,378
+mjolnir_06,18,331,0	warp	mjol002	2,4,gef_fild04,359,322
+mjolnir_06,265,29,0	warp	mjol003	2,2,gef_fild00,267,379
+mjolnir_06,366,383,0	warp	mjol03-1	4,2,mjolnir_02,361,21
+mjolnir_06,382,377,0	warp	mjol10	2,4,mjolnir_07,19,377
+mjolnir_06,383,74,0	warp	mjol11	2,4,mjolnir_07,20,77
+mjolnir_07,156,16,0	warp	mjol004	4,2,prt_fild00,159,380
+mjolnir_07,16,377,0	warp	mjol10-1	2,4,mjolnir_06,379,377
+mjolnir_07,17,77,0	warp	mjol11-1	2,4,mjolnir_06,380,74
+mjolnir_07,214,383,0	warp	mjol04-1	4,2,mjolnir_03,212,20
+mjolnir_07,383,233,0	warp	mjol12	2,4,mjolnir_08,33,234
+mjolnir_07,383,362,0	warp	mjol13	2,4,mjolnir_08,32,346
+mjolnir_08,159,373,0	warp	mjol06a	1,1,mjolnir_04,160,49
+mjolnir_08,185,28,0	warp	mjol14	17,2,mjolnir_09,196,364
+mjolnir_08,29,346,0	warp	mjol13-1	2,4,mjolnir_07,380,362
+mjolnir_08,30,234,0	warp	mjol12-1	2,4,mjolnir_07,380,233
+mjolnir_08,369,257,0	warp	mjol15	2,4,mjolnir_10,18,258
+mjolnir_09,106,28,0	warp	mjol005	4,2,prt_fild05,105,378
+mjolnir_09,194,367,0	warp	mjol14-1	8,2,mjolnir_08,185,31
+mjolnir_09,30,249,0	warp	mjol006	2,4,prt_fild00,380,249
+mjolnir_09,300,28,0	warp	mjol007	4,2,prt_fild05,292,382
+mjolnir_09,373,288,0	warp	mjol011	2,2,prt_fild01,23,292
+mjolnir_10,15,258,0	warp	mjol15-1	2,4,mjolnir_08,366,257
+mjolnir_10,235,381,0	warp	mjol09-1	4,2,mjolnir_05,235,19
+mjolnir_10,265,13,0	warp	mjol008	3,2,prt_fild01,261,370
+mjolnir_10,384,220,0	warp	mjol16	2,4,mjolnir_11,23,220
+mjolnir_10,66,15,0	warp	mjol009	4,2,prt_fild01,66,370
+mjolnir_11,174,20,0	warp	mjol010	4,2,prt_fild02,173,379
+mjolnir_11,20,220,0	warp	mjol16-1	2,4,mjolnir_10,381,220
+mjolnir_12,199,378,0	warp	mjol012	2,2,aldebaran,138,37
+mjolnir_12,220,26,0	warp	mjol08-1	3,2,mjolnir_05,220,379
+mjolnir_12,44,17,0	warp	mjol17	1,1,prt_maze01,17,111
diff --git a/npc/pre-re/warps/fields/payon_fild.txt b/npc/pre-re/warps/fields/payon_fild.txt
new file mode 100644
index 000000000..d991f2280
--- /dev/null
+++ b/npc/pre-re/warps/fields/payon_fild.txt
@@ -0,0 +1,50 @@
+//===== rAthena Script ======================================= 
+//= Payon Field Warps
+//===== By: ================================================== 
+//= Nana (1.0)
+//===== Current Version: ===================================== 
+//= 1.3
+//===== Compatible With: ===================================== 
+//= Any rAthena Mod
+//===== Description: ========================================= 
+//= Payon Field Warps
+//===== Additional Comments: ================================= 
+//= 1.1 Refixed payon field08 -> payon warp
+//= 1.2 Changed trigger area of pay_fild08 -> payon warp. [L0ne_W0lf]
+//= 1.3 Renewal warp adjustments.
+//============================================================ 
+
+//= Payon Field's ============================================
+pay_fild01,13,152,0	warp	payf001	2,7,moc_fild03,299,170
+pay_fild01,278,14,0	warp	payf01	13,2,pay_fild02,83,382
+pay_fild01,353,14,0	warp	payf02	20,3,pay_fild02,160,381
+pay_fild01,379,201,0	warp	payf03	2,6,pay_fild07,23,207
+//pay_fild02,134,16,0	warp	payf04	5,2,pay_fild05,127,375
+//pay_fild02,16,175,0	warp	payf06	2,4,pay_fild11,294,135
+pay_fild02,167,390,0	warp	payf02-1	20,3,pay_fild01,354,18
+pay_fild02,284,108,0	warp	payf07	2,7,pay_fild03,20,110
+pay_fild02,83,386,0	warp	payf01-1	13,2,pay_fild01,278,18
+pay_fild03,15,110,0	warp	payf07-1	2,10,pay_fild02,280,108
+pay_fild03,172,281,0	warp	payf08	5,2,pay_fild07,167,20
+pay_fild03,313,16,0	warp	payf09	4,2,pay_fild06,305,372
+pay_fild03,392,63,0	warp	payf005	2,7,alberta,19,233
+pay_fild04,17,165,0	warp	payf002	2,8,moc_fild01,376,162
+pay_fild04,194,17,0	warp	payf003	7,2,moc_fild02,350,336
+//pay_fild05,127,378,0	warp	payf04-1	4,2,pay_fild02,134,19
+//pay_fild05,271,284,0	warp	payf10	2,4,pay_fild06,31,288
+//pay_fild06,28,288,0	warp	payf10-1	2,2,pay_fild05,268,284
+pay_fild06,305,375,0	warp	payf09-1	6,2,pay_fild03,313,19
+pay_fild07,16,200,0	warp	payf03-1	3,3,pay_fild01,371,205
+pay_fild07,163,17,0	warp	payf08-1	5,2,pay_fild03,177,275
+pay_fild07,280,382,0	warp	payf11	4,2,pay_fild08,160,19
+pay_fild07,382,290,0	warp	payf12	2,5,pay_fild10,19,290
+pay_fild08,160,16,0	warp	payf11-1	4,2,pay_fild07,280,379
+pay_fild08,17,75,0	warp	payf006	1,1,payon,265,92
+pay_fild08,262,91,0	warp	payf13	2,4,pay_fild09,19,91
+pay_fild09,112,16,0	warp	pay14	4,2,pay_fild10,112,379
+pay_fild09,16,91,0	warp	payf13-1	2,4,pay_fild08,259,91
+pay_fild10,112,382,0	warp	pay14-1	3,2,pay_fild09,112,19
+pay_fild10,16,290,0	warp	payf12-1	2,5,pay_fild07,379,290
+pay_fild10,99,13,0	warp	w1034	1,1,pay_fild10,148,252
+//pay_fild11,297,135,0	warp	payf06-1	2,4,pay_fild02,19,175
+//pay_fild11,38,330,0	warp	payf004	4,2,moc_fild03,179,19
diff --git a/npc/pre-re/warps/fields/prontera_fild.txt b/npc/pre-re/warps/fields/prontera_fild.txt
new file mode 100644
index 000000000..e3461bb2a
--- /dev/null
+++ b/npc/pre-re/warps/fields/prontera_fild.txt
@@ -0,0 +1,105 @@
+//===== rAthena Script =======================================
+//= Prontera Field Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.2
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Prontera Field
+//===== Additional Comments: =================================
+//= 1.1 updating according to jA [Lupus]
+//= 1.2 Updated warps for episode 12.1 [L0ne_W0lf]
+//============================================================
+
+//= Prontera Fields ==========================================
+prt_fild00,159,383,0	warp	prtf007	4,2,mjolnir_07,156,19
+prt_fild00,165,18,0	warp	prtf01	9,3,prt_fild04,158,384
+prt_fild00,18,129,0	warp	prtf015	2,6,gef_fild00,376,140
+prt_fild00,317,18,0	warp	prtf02	8,2,prt_fild04,323,384
+prt_fild00,383,249,0	warp	prtf008	2,4,mjolnir_09,33,248
+prt_fild01,136,373,0	warp	prtf030	1,1,prt_maze01,99,31
+prt_fild01,199,24,0	warp	prtf001	3,2,prt_gld,159,295
+prt_fild01,20,292,0	warp	prtf009	2,3,mjolnir_09,370,288
+prt_fild01,261,373,0	warp	prtf010	6,2,mjolnir_10,265,16
+prt_fild01,380,243,0	warp	prtf03	2,5,prt_fild02,20,242
+prt_fild01,382,304,0	warp	prtf04	2,10,prt_fild02,20,305
+prt_fild01,382,351,0	warp	prtf05	2,8,prt_fild02,20,350
+prt_fild01,66,373,0	warp	prtf011	2,2,mjolnir_10,66,18
+prt_fild02,17,242,0	warp	prtf03-1	2,5,prt_fild01,377,243
+prt_fild02,17,305,0	warp	prtf04-1	2,5,prt_fild01,379,302
+prt_fild02,17,350,0	warp	prtf05-1	2,7,prt_fild01,379,351
+prt_fild02,173,382,0	warp	prtf012	4,2,mjolnir_11,174,23
+prt_fild02,305,17,0	warp	prtf06	10,2,prt_fild06,277,315
+prt_fild02,380,347,0	warp	prtf07	2,10,prt_fild03,23,249
+prt_fild03,16,249,0	warp	prtf07-1	2,10,prt_fild02,373,353
+prt_fild03,371,256,0	warp	prtf006	2,2,prt_monk,25,248
+prt_fild04,160,387,0	warp	prtf01-1	10,2,prt_fild00,164,24
+prt_fild04,17,114,0	warp	prtf016	2,10,gef_fild01,375,111
+prt_fild04,323,387,0	warp	prtf02-1	7,2,prt_fild00,315,21
+prt_fild04,378,72,0	warp	prtf08	2,6,prt_fild05,17,59
+prt_fild04,384,155,0	warp	prtf09	2,7,prt_fild05,20,134
+prt_fild04,384,334,0	warp	prtf10	2,6,prt_fild05,20,333
+prt_fild05,105,381,0	warp	prtf013	5,2,mjolnir_09,106,34
+prt_fild05,13,63,0	warp	prtf08-1	2,15,prt_fild04,374,73
+prt_fild05,134,14,0	warp	prtf11	14,3,prt_fild07,129,374
+prt_fild05,14,141,0	warp	prtf09-1	2,18,prt_fild04,380,158
+prt_fild05,15,333,0	warp	prtf10-1	2,8,prt_fild04,380,332
+prt_fild05,255,14,0	warp	prtf12	12,2,prt_fild07,248,369
+prt_fild05,292,385,0	warp	prtf014	4,2,mjolnir_09,305,33
+prt_fild05,373,205,0	warp	prtf002	3,3,prontera,26,203
+prt_fild06,23,193,0	warp	prtf003	2,3,prontera,285,203
+prt_fild06,277,320,0	warp	prtf06-1	10,2,prt_fild02,305,22
+prt_fild07,13,64,0	warp	prtf017	3,8,gef_fild02,376,69
+prt_fild07,132,381,0	warp	prtf11-1	9,3,prt_fild05,142,18
+prt_fild07,14,289,0	warp	prtf018	3,10,gef_fild02,375,292
+prt_fild07,17,145,0	warp	prtf019	3,12,gef_fild02,376,156
+prt_fild07,206,12,0	warp	prtf13	4,2,prt_fild09,224,377
+prt_fild07,248,376,0	warp	prtf12-1	8,2,prt_fild05,257,18
+prt_fild07,383,239,0	warp	prtf14	3,20,prt_fild08,20,239
+prt_fild07,385,186,0	warp	prtf15	3,20,prt_fild08,20,186
+prt_fild07,84,13,0	warp	prtf16	4,2,prt_fild09,87,377
+prt_fild08,16,187,0	warp	prtf15-1	3,17,prt_fild07,380,186
+prt_fild08,16,239,0	warp	prtf14-1	3,15,prt_fild07,379,239
+prt_fild08,170,378,0	warp	prtf004	3,2,prontera,156,26
+prt_fild08,233,16,0	warp	prtf023	12,1,moc_fild01,238,378
+prt_fild08,371,212,0	warp	prtf005	3,3,izlude,35,78
+prt_fild08,55,21,0	warp	prtf024	4,2,moc_fild01,56,380
+prt_fild09,14,124,0	warp	prtf17	2,6,prt_fild10,336,126
+prt_fild09,14,139,0	warp	prtf17-1	2,8,prt_fild10,336,126
+prt_fild09,224,380,0	warp	prtf13-1	4,2,prt_fild07,206,15
+//prt_fild09,246,16,0	warp	prtf025	7,2,moc_fild04,92,378
+prt_fild09,246,17,0	warp	prtf025	7,2,moc_fild20,209,333
+prt_fild09,383,223,0	warp	prtf026	2,15,moc_fild01,25,242
+prt_fild09,383,251,0	warp	prtf027	2,15,moc_fild01,25,242
+prt_fild09,87,380,0	warp	prtf16-1	5,2,prt_fild07,84,16
+//prt_fild09,95,16,0	warp	prtf028	7,2,moc_fild05,325,379
+prt_fild09,95,19,0	warp	prtf028	7,2,moc_fild20,209,333
+prt_fild10,20,122,0	warp	prtf19	2,4,prt_fild11,359,111
+prt_fild10,20,196,0	warp	prtf20	2,4,prt_fild11,358,184
+prt_fild10,227,299,0	warp	prtf020	5,2,gef_fild02,266,21
+//prt_fild10,263,20,0	warp	prtf029	6,2,moc_fild05,144,372
+prt_fild10,263,22,0	warp	prtf029	6,2,moc_fild20,209,333
+prt_fild10,339,126,0	warp	prtf17-2	2,8,prt_fild09,17,133
+prt_fild11,17,281,0	warp	prtf021	2,4,gef_fild11,374,293
+prt_fild11,302,301,0	warp	prtf022	5,2,gef_fild03,312,19
+prt_fild11,361,184,0	warp	prtf20-1	2,5,prt_fild10,23,196
+prt_fild11,362,111,0	warp	prtf19-1	2,6,prt_fild10,23,122
+
+//= St. Capitolina Abbey =====================================
+monk_in,128,46,0	warp	monk03	1,3,monk_in,161,38
+monk_in,128,84,0	warp	monk04	1,3,monk_in,161,90
+monk_in,159,38,0	warp	monk03-1	1,3,monk_in,126,46
+monk_in,159,90,0	warp	monk04-1	1,3,monk_in,126,84
+monk_in,40,38,0	warp	monk05	1,3,monk_in,71,46
+monk_in,40,92,0	warp	monk06	1,3,monk_in,71,84
+monk_in,69,46,0	warp	monk05-1	1,3,monk_in,38,38
+monk_in,69,84,0	warp	monk06-1	1,3,monk_in,38,92
+monk_in,98,186,0	warp	monk02-1	3,2,prt_monk,245,139
+monk_in,98,27,0	warp	monk01-1	5,2,prt_monk,245,104
+monk_in,99,102,0	warp	monk07	5,1,monk_in,99,143
+monk_in,99,141,0	warp	monk07-1	3,1,monk_in,99,100
+prt_monk,22,248,0	warp	monk001	2,2,prt_fild03,368,256
+prt_monk,245,106,0	warp	monk01	1,1,monk_in,98,30
+prt_monk,245,137,0	warp	monk02	1,1,monk_in,98,183
diff --git a/npc/pre-re/warps/fields/rachel_fild.txt b/npc/pre-re/warps/fields/rachel_fild.txt
new file mode 100644
index 000000000..475557200
--- /dev/null
+++ b/npc/pre-re/warps/fields/rachel_fild.txt
@@ -0,0 +1,48 @@
+//===== rAthena Script =======================================
+//= Rachel Field Warp Script
+//===== By: ==================================================
+//= Playtester
+//===== Current Version: =====================================
+//= 1.3
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Rachel Field
+//===== Additional Comments: =================================
+//= 1.0 Initial version [Playtester]
+//= 1.1 Official warps [Playtester]
+//= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
+//= 1.3 Renewal warp adjustments.
+//============================================================
+
+ra_fild01,233,333,0	warp	ra000	1,1,ice_dun01,157,15
+ra_fild01,306,38,0	warp	ra001	1,1,ra_fild04,322,371
+ra_fild04,322,378,0	warp	ra002	1,1,ra_fild01,306,43
+ra_fild04,362,351,0	warp	ra003	1,1,ra_fild05,39,353
+ra_fild05,33,353,0	warp	ra004	1,1,ra_fild04,356,351
+//ra_fild05,27,13,0	warp	ra005	1,1,ra_fild09,30,337
+//ra_fild09,29,343,0	warp	ra006	1,1,ra_fild05,31,17
+ra_fild04,263,54,0	warp	ra007	1,1,ra_fild08,287,365
+ra_fild08,287,370,0	warp	ra008	1,1,ra_fild04,263,60
+//ra_fild09,27,238,0	warp	ra009	1,1,ra_fild08,360,234
+//ra_fild08,368,234,0	warp	ra010	1,1,ra_fild09,35,238
+ra_fild04,23,176,0	warp	ra011	1,1,ra_fild03,370,172
+ra_fild03,374,168,0	warp	ra012	1,1,ra_fild04,29,176
+ra_fild05,348,274,0	warp	ra013	1,1,ra_fild06,24,277
+ra_fild06,19,277,0	warp	ra014	1,1,ra_fild05,341,273
+ra_fild06,294,21,0	warp	ra015	1,1,lhz_fild01,296,376
+lhz_fild01,296,382,0	warp	ra016	1,1,ra_fild06,298,25
+ra_fild12,36,225,0	warp	ra017	1,1,rachel,270,125
+ra_fild08,165,29,0	warp	ra018	1,1,ra_fild12,149,369
+ra_fild12,149,374,0	warp	ra019	1,1,ra_fild08,165,36
+//ra_fild12,303,27,0	warp	ra020	1,1,ra_fild13,295,341
+//ra_fild13,295,346,0	warp	ra021	1,1,ra_fild12,303,33
+//ra_fild11,360,226,0	warp	ra022	1,1,rachel,30,125
+//ra_fild11,21,290,0	warp	ra023	1,1,ra_fild10,379,283
+//ra_fild10,384,287,0	warp	ra024	1,1,ra_fild11,28,290
+//ra_fild11,202,335,0	warp	ra025a	1,1,ra_fild07,215,32
+//ra_fild07,215,27,0	warp	ra025b	1,1,ra_fild11,201,329
+//ra_fild07,168,353,0	warp	ra026	1,1,ra_fild02,171,45
+//ra_fild02,168,36,0	warp	ra027	1,1,ra_fild07,168,349
+//ra_fild02,373,275,0	warp	ra028	1,1,ra_fild03,28,294
+//ra_fild03,23,294,0	warp	ra029	1,1,ra_fild02,367,270
diff --git a/npc/pre-re/warps/fields/spl_fild.txt b/npc/pre-re/warps/fields/spl_fild.txt
new file mode 100644
index 000000000..1860636ff
--- /dev/null
+++ b/npc/pre-re/warps/fields/spl_fild.txt
@@ -0,0 +1,28 @@
+//===== rAthena Script =======================================
+//= Splendid Field Warp Script
+//===== By: ==================================================
+//= L0ne_W0lf
+//===== Current Version: =====================================
+//= 1.2
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= [Aegis Conversion]
+//= Warp Points for Splendide
+//===== Additional Comments: =================================
+//= 1.0 First Version.
+//= 1.1 Fixed misplaced warp. [L0ne_W0lf]
+//= 1.2 Updated warps positions. [L0ne_W0lf]
+//============================================================
+
+spl_fild02,382,143,0	warp	spl_fild02-2	1,1,mid_camp,16,143
+spl_fild02,383,216,0	warp	spl_fild02-4	1,1,mid_camp,12,215
+spl_fild02,310,10,0	warp	spl_fild02-5	1,1,spl_fild03,306,376
+spl_fild03,99,373,0	warp	spl_fild02-6	1,1,spl_fild02,102,32
+spl_fild03,306,379,0	warp	spl_fild03-1	1,1,spl_fild02,311,12
+spl_fild02,103,30,0	warp	spl_fild03-2	1,1,spl_fild03,99,370
+
+spl_fild01,289,28,0	warp	spl_fild01-1	1,1,spl_fild02,292,377
+spl_fild02,6,241,0	warp	spl_fild02-7	1,1,splendide,386,251
+splendide,388,252,0	warp	spl_fild02-8	1,1,spl_fild02,8,241
+spl_fild02,293,379,0	warp	spl_fild02-9	1,1,spl_fild01,289,30
diff --git a/npc/pre-re/warps/fields/umbala_fild.txt b/npc/pre-re/warps/fields/umbala_fild.txt
new file mode 100644
index 000000000..1282257e4
--- /dev/null
+++ b/npc/pre-re/warps/fields/umbala_fild.txt
@@ -0,0 +1,31 @@
+//===== rAthena Script =======================================
+//= Umbala Field Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 6+
+//===== Description: =========================================
+//= [Aegis Conversion]
+//= Warp Points for Umbala Field
+//===== Additional Comments: =================================
+//= 1.1 Rescripted to Aegis 10.3 Standards. [L0ne_W0lf]
+//============================================================
+
+cmd_fild01,77,366,0	warp	um_fild1-1	1,1,um_fild03,114,53
+cmd_fild01,178,370,0	warp	um_fild1-2	1,1,um_fild03,243,29
+um_fild01,31,274,0	warp	um_fild1-3	1,1,beach_dun2,254,244
+beach_dun2,258,244,0	warp	um_fild1-4	1,1,um_fild01,35,276
+um_fild01,369,277,0	warp	um_fild1-5	1,1,um_fild02,25,272
+um_fild02,22,272,0	warp	um_fild2-1	1,1,um_fild01,366,277
+um_fild02,188,374,0	warp	um_fild2-2	1,1,um_fild04,182,16
+um_fild02,373,329,0	warp	um_fild2-3	1,1,um_fild03,23,334
+um_fild02,373,148,0	warp	um_fild2-4	1,1,um_fild03,36,145
+um_fild03,19,334,0	warp	um_fild3-1	1,1,um_fild02,370,329
+um_fild03,32,145,0	warp	um_fild3-2	1,1,um_fild02,370,148
+um_fild03,114,50,0	warp	um_fild3-3	1,1,cmd_fild01,74,363
+um_fild03,243,26,0	warp	um_fild3-4	1,1,cmd_fild01,176,367
+um_fild04,182,13,0	warp	um_fild4-1	1,1,um_fild02,190,371
+um_fild04,215,339,0	warp	um_fild4-2	1,1,umbala,130,82
+umbala,130,79,0	warp	um_fild4-3	1,1,um_fild04,215,336
diff --git a/npc/pre-re/warps/fields/veins_fild.txt b/npc/pre-re/warps/fields/veins_fild.txt
new file mode 100644
index 000000000..ac05163ff
--- /dev/null
+++ b/npc/pre-re/warps/fields/veins_fild.txt
@@ -0,0 +1,55 @@
+//===== rAthena Script =======================================
+//= Veins Field Warp Script
+//===== By: ==================================================
+//= $ephiroth
+//===== Current Version: =====================================
+//= 1.5
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Veins Field
+//===== Additional Comments: =================================
+//= 1.4 Rescripted to Aegis 11.2 Standards. [L0ne_W0lf]
+//= 1.5 Renewal warp adjustments.
+//============================================================
+
+ve_fild01,366,267,0	warp	ve_fild1-1	1,1,ve_fild02,36,263
+ve_fild01,184,20,0	warp	ve_fild1-2	1,1,ve_fild04,174,334
+//ra_fild11,233,27,0	warp	ve_fild1-3	1,1,ve_fild01,243,363
+//ve_fild01,243,368,0	warp	ve_fild1-4	1,1,ra_fild11,232,32
+ve_fild01,350,92,0	warp	ve_fild1-5	1,1,ve_fild02,78,133
+//ra_fild13,29,308,0	warp	ve_fild2-1	1,1,ve_fild02,380,308
+//ve_fild02,385,308,0	warp	ve_fild2-2	1,1,ra_fild13,34,308
+ve_fild02,195,382,0	warp	ve_fild2-3	1,1,rachel,130,25
+ve_fild02,31,263,0	warp	ve_fild2-4	1,1,ve_fild01,361,267
+ve_fild02,73,133,0	warp	ve_fild2-5	1,1,ve_fild01,345,92
+ve_fild03,355,223,0	warp	ve_fild3-1	1,1,ve_fild04,49,249
+//ve_fild03,222,43,0	warp	ve_fild3-2	1,1,ve_fild05,200,325
+ve_fild04,174,339,0	warp	ve_fild4-1	1,1,ve_fild01,184,25
+ve_fild04,44,249,0	warp	ve_fild4-2	1,1,ve_fild03,350,220
+ve_fild04,115,50,0	warp	ve_fild4-3	1,1,ve_fild06,80,183
+//ve_fild05,200,330,0	warp	ve_fild5-1	1,1,ve_fild03,222,48
+//ve_fild05,359,192,0	warp	ve_fild5-2	1,1,ve_fild06,80,183
+ve_fild06,153,220,0	warp	ve_fild6-1	1,1,veins,218,355
+/*
+ve_fild06,81,177,0	script	ve_fild6-2	45,1,1,{
+	if (rand(2))
+		warp "ve_fild04",115,55;
+	else
+		warp "ve_fild05",354,191;
+	end;
+}
+*/
+ve_fild07,147,371,0	warp	ve_fild7-1	1,1,veins,146,28
+
+// Renewal Addon
+ve_fild06,81,177,0	warp	VeF06S_VeF04S	1,1,ve_fild04,115,55
+
+//============================================================ 
+// Old changelog
+//============================================================ 
+//= 1.0 Initial version [$ephiroth]
+//= 1.1 Updated more warps [$ephiroth]
+//= 1.2 Removed some unofficial warps [Playtester]
+//= 1.3 Added random Veins exit [Playtester]
+//============================================================
diff --git a/npc/pre-re/warps/fields/yuno_fild.txt b/npc/pre-re/warps/fields/yuno_fild.txt
new file mode 100644
index 000000000..32d1924f5
--- /dev/null
+++ b/npc/pre-re/warps/fields/yuno_fild.txt
@@ -0,0 +1,90 @@
+//===== rAthena Script =======================================
+//= Yuno Field Warp Script
+//===== By: ==================================================
+//= Nana (1.0), Sara
+//===== Current Version: =====================================
+//= 1.3
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 5+
+//===== Description: =========================================
+//= Warp Points for Yuno Field
+//===== Additional Comments: =================================
+//= 1.1 - Updated for the new Yuno Fields
+//= 1.2 New field update - Hugel Field by Sara - Version 1
+//= 1.3 Renewal warp adjustments.
+//============================================================
+
+//= Yuno Field ===============================================
+//yuno_fild01,286,368,0	warp	yunfild01	1,1,yuno_fild02,294,26
+//yuno_fild02,294,24,0	warp	yunfild01-1	1,1,yuno_fild01,286,366
+//yuno_fild01,70,378,0	warp	yunfild02	1,1,yuno_fild02,70,25
+//yuno_fild02,70,23,0	warp	yunfild02-1	1,1,yuno_fild01,70,376
+
+yuno_fild02,18,337,0	warp	yunfild03	1,1,yuno_fild03,381,331
+yuno_fild03,383,331,0	warp	yunfild03-1	1,1,yuno_fild02,20,337
+yuno_fild03,19,79,0	warp	yunfild04	1,1,yuno_fild04,373,84
+yuno_fild04,375,84,0	warp	yunfild04-1	1,1,yuno_fild03,21,79
+yuno_fild03,20,155,0	warp	yunfild05	1,1,yuno_fild04,373,150
+yuno_fild04,375,150,0	warp	yunfild05-1	1,1,yuno_fild03,22,155
+yuno_fild04,231,288,0	warp	yunfild-yun	1,1,yuno,158,17
+yuno_fild03,32,139,0	warp	yunfild-mag01	1,1,mag_dun01,126,68
+
+//= New Yuno Fields ==========================================
+yuno_fild01,26,246,0	warp	newjun01	1,1,yuno_fild12,373,239
+yuno_fild12,375,239,0	warp	newjun01a	1,1,yuno_fild01,28,246
+yuno_fild12,23,338,0	warp	newjun02	1,1,yuno_fild11,366,361
+yuno_fild11,368,361,0	warp	newjun02a	1,1,yuno_fild12,25,338
+yuno_fild12,24,225,0	warp	newjun03	1,1,yuno_fild11,363,218
+yuno_fild11,365,218,0	warp	newjun03a	1,1,yuno_fild12,24,227
+yuno_fild07,92,12,0	warp	newjun04	1,1,yuno_fild11,92,369
+yuno_fild11,92,371,0	warp	newjun04a	1,1,yuno_fild07,92,14
+yuno_fild12,193,371,0	warp	newjun05	1,1,yuno_fild08,143,21
+yuno_fild08,145,21,0	warp	newjun05a	1,1,yuno_fild12,195,371
+yuno_fild01,70,378,0	warp	newjun06	1,1,yuno_fild09,70,19
+yuno_fild09,70,17,0	warp	newjun06a	1,1,yuno_fild01,70,376
+yuno_fild01,286,368,0	warp	newjun07	1,1,yuno_fild09,280,30
+yuno_fild09,280,28,0	warp	newjun07a	1,1,yuno_fild01,286,366
+yuno_fild09,19,194,0	warp	newjun08	1,1,yuno_fild08,374,193
+yuno_fild08,376,193,0	warp	newjun08a	1,1,yuno_fild09,21,194
+yuno_fild08,20,278,0	warp	newjun09	1,1,yuno_fild07,352,291
+yuno_fild07,354,291,0	warp	newjun09a	1,1,yuno_fild08,22,278
+yuno_fild08,31,58,0	warp	newjun10	1,1,yuno_fild07,358,72
+yuno_fild07,360,72,0	warp	newjun10a	1,1,yuno_fild08,33,58
+
+//= (By speculation only) ====================================
+yuno_fild07,179,354,0	warp	newjun11	1,1,yuno_fild03,179,17
+yuno_fild03,179,15,0	warp	newjun11a	1,1,yuno_fild07,179,352
+yuno_fild08,74,376,0	warp	newjun12	1,1,yuno_fild02,70,25
+yuno_fild02,70,23,0	warp	newjun12a	1,1,yuno_fild08,74,374
+yuno_fild08,286,386,0	warp	newjun13	1,1,yuno_fild02,294,26
+yuno_fild02,294,24,0	warp	newjun13a	1,1,yuno_fild08,286,384
+//yuno_fild04,42,369,0	warp	newjun14	1,1,yuno_fild05,59,30
+//yuno_fild05,59,28,0	warp	newjun14a	1,1,yuno_fild04,42,367
+
+
+//= Al de Baran <-> Yuno Connection ==========================
+aldebaran,140,244,0	warp	alde-yunfild	1,1,yuno_fild01,208,19
+yuno_fild01,208,17,0	warp	yunfild-alde	1,1,aldebaran,140,242
+
+//= Hugel Field
+//= Version 1
+//yuno_fild05,370,321,0	warp	hu001	1,1,yuno_fild06,48,322
+//yuno_fild06,41,319,0	warp	hu001a	1,1,yuno_fild05,366,319
+yuno_fild06,214,27,0	warp	hu002	1,1,yuno_fild03,215,375
+yuno_fild03,215,382,0	warp	hu002a	1,1,yuno_fild06,218,33
+yuno_fild06,369,132,0	warp	hu003	1,1,hu_fild04,34,126
+hu_fild04,27,126,0	warp	hu003a	1,1,yuno_fild06,362,132
+hu_fild04,122,27,0	warp	hu004	1,1,yuno_fild02,114,370
+yuno_fild02,117,375,0	warp	hu004a	1,1,hu_fild04,122,35
+yuno_fild06,151,370,0	warp	hu005	1,1,hu_fild01,135,42
+hu_fild01,141,36,0	warp	hu005a	1,1,yuno_fild06,156,368
+hu_fild04,380,183,0	warp	hu006	1,1,hu_fild05,39,206
+hu_fild05,33,198,0	warp	hu006a	1,1,hu_fild04,373,181
+//hu_fild05,89,43,0	warp	hu007	1,1,hu_fild07,80,365
+//hu_fild07,81,370,0	warp	hu007a	1,1,hu_fild05,89,50
+//hu_fild07,36,352,0	warp	hu008	1,1,yuno_fild02,378,336
+//yuno_fild02,383,339,0	warp	hu008a	1,1,hu_fild07,42,351
+//hu_fild07,57,37,0	warp	hu009	1,1,yuno_fild09,48,370
+//yuno_fild09,48,376,0	warp	hu009a	1,1,hu_fild07,58,42
+//hu_fild07,226,38,0	warp	hu010	1,1,yuno_fild09,220,368
+//yuno_fild09,220,373,0	warp	hu010a	1,1,hu_fild07,224,43
diff --git a/npc/pre-re/warps/guild/guildcastles.txt b/npc/pre-re/warps/guild/guildcastles.txt
new file mode 100644
index 000000000..6b095c5ed
--- /dev/null
+++ b/npc/pre-re/warps/guild/guildcastles.txt
@@ -0,0 +1,533 @@
+//===== rAthena Script =======================================
+//= Guild Castles Warp Script
+//===== By: ==================================================
+//= Athena (1.0)
+//===== Current Version: =====================================
+//= 2.7
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Al de Baran, Payon, Prontera, Geffen,
+//= and Juno Guild Castles
+//===== Additional Comments: =================================
+//= Split off npc_warp.txt
+//= fixed aldg504-1 warp [Lupus]
+//= 2.0 Added Novice Guilds warps, optimized aldg408r warp [Lupus]
+//= 2.1 Fixed some warps positions [Yor]
+//= 2.2 Changed all breaks to end as per the new script engine. [Skotlex]
+//= 2.3 Removed 2nd entrance to Novice Castle Geffen [Lupus]
+//= 2.4 Added Warps between Juno and it's new Castle Satelite map. [L0ne_W0lf]
+//= 2.4a Added more warps between Juno Satellite and Castle Interiors. [L0ne_W0lf]
+//=	castle 1, 4 and 5 entrances are questionable, and will be updated
+//=	as I get more information.
+//= 2.4b Corrected Warp points for Juno castles 1, 4 and 5. [L0ne_W0lf]
+//= 2.5 Updated Schwaltzvalt warps and added Arunafeltz. [L0ne_W0lf]
+//= 2.6 Fixed warp position between Juno and Schwaltzvalt Realm. [Gepard]
+//= 2.7 Updated WoE:FE warps. [Masao]
+//============================================================
+
+
+//Prontera Castle Map
+prt_gld,159,298,0	warp	prtg01_NorthField	1,1,prt_fild01,199,30
+prt_gld,159,25,0	warp	prtg02_Castle	1,1,prt_castle,102,178
+prt_gld,129,65,0	warp	prtg-1_prtg-1-01	1,1,prtg_cas01,99,32
+prt_gld,240,124,0	warp	prtg-2_prtg-2	1,1,prtg_cas02,43,229
+prt_gld,153,141,0	warp	prtg-3_prtg-3	1,1,prtg_cas03,168,12
+prt_gld,107,240,0	warp	prtg-4_prtg-4	1,1,prtg_cas04,86,13
+prt_gld,212,240,0	warp	prtg-5_prtg-5	1,1,prtg_cas05,17,235
+
+//Inside Prontera Guild Castles
+prtg_cas01,103,32,0	warp	prtg-1-01_prtg-1	1,1,prt_gld,134,65
+prtg_cas01,57,19,0	warp	prtg-1-02_prtg-1-07	1,1,prtg_cas01,80,49
+prtg_cas01,41,34,0	warp	prtg-1-03_prtg-1-08	1,1,prtg_cas01,40,47
+prtg_cas01,37,54,0	warp	prtg-1-04_prtg-1-13	1,1,prtg_cas01,192,119
+prtg_cas01,71,54,0	warp	prtg-1-05_prtg-1-12	1,1,prtg_cas01,192,65
+prtg_cas01,51,70,0	warp	prtg-1-06_prtg-1-11	1,1,prtg_cas01,202,92
+prtg_cas01,84,49,0	warp	prtg-1-07_prtg-1-02	1,1,prtg_cas01,61,19
+prtg_cas01,37,47,0	warp	prtg-1-08_prtg-1-03	1,1,prtg_cas01,45,34
+prtg_cas01,62,34,0	warp	prtg-1-09_prtg-1-13	1,1,prtg_cas01,192,119
+prtg_cas01,84,19,0	warp	prtg-1-010_prtg-1-12	1,1,prtg_cas01,192,65
+prtg_cas01,206,92,0	warp	prtg-1-11_prtg-1-06	1,1,prtg_cas01,55,70
+prtg_cas01,196,65,0	warp	prtg-1-12_prtg-1-05	1,1,prtg_cas01,75,54
+prtg_cas01,196,119,0	warp	prtg-1-13_prtg-1-04	1,1,prtg_cas01,40,54
+prtg_cas01,147,120,0	warp	prtg-1-14_prtg-1-21	1,1,prtg_cas01,75,187
+prtg_cas01,75,183,0	warp	prtg-1-21_prtg-1-14	1,1,prtg_cas01,147,116
+prtg_cas01,109,163,0	warp	prtg-1-22_prtg-1-31	1,1,prtg_cas01,202,183
+prtg_cas01,206,183,0	warp	prtg-1-31_prtg-1-22	1,1,prtg_cas01,113,163
+prtg_cas02,43,233,0	warp	prtg-2-01_prtg-2	1,1,prt_gld,240,128
+prtg_cas02,88,215,0	warp	prtg-2-02_prtg-2-22	1,1,prtg_cas02,206,41
+prtg_cas02,53,202,0	warp	prtg-2-03_prtg-2-21	1,1,prtg_cas02,165,41
+prtg_cas02,64,164,0	warp	prtg-2-04_prtg-2-12	1,1,prtg_cas02,98,25
+prtg_cas02,35,183,0	warp	prtg-2-05_prtg-2-11	1,1,prtg_cas02,71,82
+prtg_cas02,71,86,0	warp	prtg-2-11_prtg-2-05	1,1,prtg_cas02,35,187
+prtg_cas02,98,21,0	warp	prtg-2-12_prtg-2-04	1,1,prtg_cas02,64,168
+prtg_cas02,45,21,0	warp	prtg-2-13_prtg-2-24	1,1,prtg_cas02,203,25
+prtg_cas02,161,41,0	warp	prtg-2-21_prtg-2-03	1,1,prtg_cas02,57,202
+prtg_cas02,210,41,0	warp	prtg-2-22_prtg-2-02	1,1,prtg_cas02,84,215
+prtg_cas02,184,44,0	warp	prtg-2-23_prtg-2-31	1,1,prtg_cas02,157,140
+prtg_cas02,203,21,0	warp	prtg-2-24_prtg-2-13	1,1,prtg_cas02,45,25
+prtg_cas02,157,135,0	warp	prtg-2-31_prtg-2-23	1,1,prtg_cas02,184,40
+prtg_cas03,178,85,0	warp	prtg-3-01_prtg-3-12	1,1,prtg_cas03,82,73
+prtg_cas03,191,55,0	warp	prtg-3-02_prtg-3-22	1,1,prtg_cas03,190,233
+prtg_cas03,168,8,0	warp	prtg-3-03_prtg-3	1,1,prt_gld,153,137
+prtg_cas03,172,44,0	warp	prtg-3-04_prtg-3-14	1,1,prtg_cas03,10,78
+prtg_cas03,165,59,0	warp	prtg-3-05_prtg-3-13	1,1,prtg_cas03,45,47
+prtg_cas03,45,120,0	warp	prtg-3-11_prtg-3-23	1,1,prtg_cas03,164,177
+prtg_cas03,86,73,0	warp	prtg-3-12_prtg-3-01	1,1,prtg_cas03,178,81
+prtg_cas03,45,43,0	warp	prtg-3-13_prtg-3-05	1,1,prtg_cas03,165,54
+prtg_cas03,6,78,0	warp	prtg-3-14_prtg-3-04	1,1,prtg_cas03,176,44
+prtg_cas03,169,235,0	warp	prtg-3-21_prtg-3-31	1,1,prtg_cas03,11,200
+prtg_cas03,194,233,0	warp	prtg-3-22_prtg-3-02	1,1,prtg_cas03,191,59
+prtg_cas03,164,173,0	warp	prtg-3-23_prtg-3-11	1,1,prtg_cas03,45,117
+prtg_cas03,7,200,0	warp	prtg-3-31_prtg-3-21	1,1,prtg_cas03,169,231
+prtg_cas04,48,48,0	warp	prtg-4-01_prtg-4-15	1,1,prtg_cas04,10,233
+prtg_cas04,63,30,0	warp	prtg-4-02_prtg-4-14	1,1,prtg_cas04,34,229
+prtg_cas04,86,9,0	warp	prtg-4-03_prtg-3	1,1,prt_gld,111,240
+prtg_cas04,32,28,0	warp	prtg-4-04_prtg-4-16	1,1,prtg_cas04,11,254
+prtg_cas04,42,13,0	warp	prtg-4-05_prtg-4-12	1,1,prtg_cas04,56,254
+prtg_cas04,54,25,0	warp	prtg-4-06_prtg-4-13	1,1,prtg_cas04,56,233
+prtg_cas04,34,290,0	warp	prtg-4-11_prtg-4-21	1,1,prtg_cas04,238,261
+prtg_cas04,60,254,0	warp	prtg-4-12_prtg-4-05	1,1,prtg_cas04,42,17
+prtg_cas04,56,229,0	warp	prtg-4-13_prtg-4-06	1,1,prtg_cas04,54,29
+prtg_cas04,34,225,0	warp	prtg-4-14_prtg-4-02	1,1,prtg_cas04,63,26
+prtg_cas04,10,229,0	warp	prtg-4-15_prtg-4-01	1,1,prtg_cas04,48,44
+prtg_cas04,7,254,0	warp	prtg-4-16_prtg-4-04	1,1,prtg_cas04,32,32
+prtg_cas04,238,257,0	warp	prtg-4-21_prtg-4-11	1,1,prtg_cas04,34,286
+prtg_cas04,247,258,0	warp	prtg-4-22_prtg-4-31	1,1,prtg_cas04,255,14
+prtg_cas04,251,14,0	warp	prtg-4-31_prtg-4-22	1,1,prtg_cas04,247,254
+prtg_cas05,38,250,0	warp	prtg-5-01_prtg-5-14	1,1,prtg_cas05,244,7
+prtg_cas05,76,242,0	warp	prtg-5-02_prtg-5-13	1,1,prtg_cas05,288,13
+prtg_cas05,66,225,0	warp	prtg-5-03_prtg-5-12	1,1,prtg_cas05,260,92
+prtg_cas05,17,231,0	warp	prtg-5-04_prtg-5	1,1,prt_gld,208,240
+prtg_cas05,53,246,0	warp	prtg-5-05_prtg-5-15	1,1,prtg_cas05,199,13
+prtg_cas05,228,96,0	warp	prtg-5-11_prtg-5-21	1,1,prtg_cas05,26,7
+prtg_cas05,260,96,0	warp	prtg-5-12_prtg-5-03	1,1,prtg_cas05,66,229
+prtg_cas05,292,13,0	warp	prtg-5-13_prtg-5-02	1,1,prtg_cas05,76,246
+prtg_cas05,244,3,0	warp	prtg-5-14_prtg-5-01	1,1,prtg_cas05,35,247
+prtg_cas05,195,13,0	warp	prtg-5-15_prtg-5-05	1,1,prtg_cas05,55,248
+prtg_cas05,26,3,0	warp	prtg-5-21_prtg-5-11	1,1,prtg_cas05,228,92
+prtg_cas05,58,7,0	warp	prtg-5-22_prtg-5-31	1,1,prtg_cas05,253,290
+prtg_cas05,253,294,0	warp	prtg-5-31_prtg-5-22	1,1,prtg_cas05,58,11
+
+//Geffen Castle Map
+gef_fild13,150,54,0	warp	gef-g1-0_gefg-1-07	1,1,gefg_cas01,34,140
+gef_fild13,210,75,0	warp	gef-g1-1_gefg-1-04	1,1,gefg_cas01,95,178
+gef_fild13,308,244,0	warp	gef-g2_gefg-2-07	1,1,gefg_cas02,70,143
+gef_fild13,77,284,0	warp	gef-g3-0_g-cas3-12	1,1,gefg_cas03,60,286
+gef_fild13,112,269,0	warp	gef-g3-1_g-cas3-13	1,1,gefg_cas03,100,280
+gef_fild13,139,240,0	warp	gef-g3-2_g-cas3-14	1,1,gefg_cas03,125,250
+gef_fild13,83,185,0	warp	gef-g3-3_g-cas3-15	1,1,gefg_cas03,89,159
+gef_fild13,196,281,0	warp	gef-g4_gefg-4-05	1,1,gefg_cas04,24,149
+gef_fild13,256,57,0	warp	gef-5-0_gefg-5-04	1,1,gefg_cas05,11,134
+gef_fild13,305,83,0	warp	gef-5-1_gefg-5-01	1,1,gefg_cas05,99,200
+
+//Inside Geffen Guild Castles
+gefg_cas01,39,196,0	warp	gefg-1-01_gefg-1-14	1,1,gefg_cas01,62,13
+gefg_cas01,58,185,0	warp	gefg-1-02_gefg-1-13	1,1,gefg_cas01,90,47
+gefg_cas01,59,170,0	warp	gefg-1-03_gefg-1-23	1,1,gefg_cas01,205,34
+gefg_cas01,99,178,0	warp	gefg-1-04_gef-g1-1	1,1,gef_fild13,214,75
+gefg_cas01,31,185,0	warp	gefg-1-05_gefg-1-12	1,1,gefg_cas01,33,47
+gefg_cas01,34,167,0	warp	gefg-1-06_gefg-1-22	1,1,gefg_cas01,174,34
+gefg_cas01,34,136,0	warp	gefg-1-07_gef-g1-0	1,1,gef_fild13,150,50
+gefg_cas01,54,84,0	warp	gefg-1-11_gefg-1-24	1,1,gefg_cas01,174,14
+gefg_cas01,33,51,0	warp	gefg-1-12_gefg-1-05	1,1,gefg_cas01,35,185
+gefg_cas01,90,51,0	warp	gefg-1-13_gefg-1-02	1,1,gefg_cas01,54,185
+gefg_cas01,62,9,0	warp	gefg-1-14_gefg-1-01	1,1,gefg_cas01,39,192
+gefg_cas01,181,52,0	warp	gefg-1-21_gefg-1-31	1,1,gefg_cas01,198,160
+gefg_cas01,170,34,0	warp	gefg-1-22_gefg-1-06	1,1,gefg_cas01,30,167
+gefg_cas01,209,34,0	warp	gefg-1-23_gefg-1-03	1,1,gefg_cas01,56,170
+gefg_cas01,170,14,0	warp	gefg-1-24_gefg-1-11	1,1,gefg_cas01,50,84
+gefg_cas01,202,160,0	warp	gefg-1-31_gefg-1-21	1,1,gefg_cas01,185,52
+gefg_cas02,35,173,0	warp	gefg-2-01_gefg-2-12	1,1,gefg_cas02,76,42
+gefg_cas02,46,175,0	warp	gefg-2-02_gefg-2-11	1,1,gefg_cas02,34,64
+gefg_cas02,22,160,0	warp	gefg-2-03_gefg-2-13	1,1,gefg_cas02,34,17
+gefg_cas02,48,159,0	warp	gefg-2-04_gefg-2-22	1,1,gefg_cas02,184,41
+gefg_cas02,34,152,0	warp	gefg-2-05_gefg-2-23	1,1,gefg_cas02,153,18
+gefg_cas02,57,136,0	warp	gefg-2-06_gefg-2-24	1,1,gefg_cas02,180,18
+gefg_cas02,70,147,0	warp	gefg-2-07_gef-g2	1,1,gef_fild13,308,240
+gefg_cas02,34,68,0	warp	gefg-2-11_gefg-2-02	1,1,gefg_cas02,50,175
+gefg_cas02,80,42,0	warp	gefg-2-12_gefg-2-01	1,1,gefg_cas02,39,173
+gefg_cas02,34,13,0	warp	gefg-2-13_gefg-2-03	1,1,gefg_cas02,22,156
+gefg_cas02,25,13,0	warp	gefg-2-14_gefg-2-25	1,1,gefg_cas02,170,11
+gefg_cas02,150,36,0	warp	gefg-2-21_gefg-2-31	1,1,gefg_cas02,152,186
+gefg_cas02,184,36,0	warp	gefg-2-22_gefg-2-04	1,1,gefg_cas02,48,155
+gefg_cas02,148,18,0	warp	gefg-2-23_gefg-2-05	1,1,gefg_cas02,35,150
+gefg_cas02,185,18,0	warp	gefg-2-24_gefg-2-06	1,1,gefg_cas02,53,136
+gefg_cas02,174,11,0	warp	gefg-2-25_gefg-2-14	1,1,gefg_cas02,21,13
+gefg_cas02,152,190,0	warp	gefg-2-31_gefg-2-21	1,1,gefg_cas02,150,41
+gefg_cas03,66,223,0	warp	g3-cas3_g3-in3	1,1,gefg_cas03,96,53
+gefg_cas03,34,286,0	warp	g-cas3-1_g-in3-1	1,1,gefg_cas03,131,92
+gefg_cas03,47,271,0	warp	g-cas3-1-1_g-cas3-3	1,1,gefg_cas03,38,255
+gefg_cas03,63,255,0	warp	g-cas3-2_g-in3-3	1,1,gefg_cas03,156,92
+gefg_cas03,50,248,0	warp	g-cas3-2-1_g-cas3-8	1,1,gefg_cas03,54,229
+gefg_cas03,38,259,0	warp	g-cas3-3_g-cas3-1-1	1,1,gefg_cas03,43,271
+gefg_cas03,38,243,0	warp	g-cas3-3-1_g-cas3-8-1	1,1,gefg_cas03,29,219
+gefg_cas03,106,217,0	warp	g-cas3-4_g-in3-2	1,1,gefg_cas03,131,15
+gefg_cas03,115,210,0	warp	g-cas3-4-1_g-cas3-6	1,1,gefg_cas03,92,215
+gefg_cas03,42,175,0	warp	g-cas3-5_g-in3-4	1,1,gefg_cas03,266,43
+gefg_cas03,70,182,0	warp	g-cas3-5-1_g-cas3-7-1	1,1,gefg_cas03,39,191
+gefg_cas03,90,218,0	warp	g-cas3-6_g-cas3-4-1	1,1,gefg_cas03,111,210
+gefg_cas03,93,209,0	warp	g-cas3-6-1_g-cas3-10	1,1,gefg_cas03,92,250
+gefg_cas03,17,206,0	warp	g-cas3-7_g-cas3-8-1	1,1,gefg_cas03,29,219
+gefg_cas03,43,191,0	warp	g-cas3-7-1_g-cas3-5-1	1,1,gefg_cas03,70,185
+gefg_cas03,58,232,0	warp	g-cas3-8_g-cas3-9	1,1,gefg_cas03,62,213
+gefg_cas03,27,215,0	warp	g-cas3-8-1_g-cas3-7	1,1,gefg_cas03,17,202
+gefg_cas03,65,215,0	warp	g-cas3-9_g-in3-5	1,1,gefg_cas03,233,74
+gefg_cas03,95,251,0	warp	g-cas3-10_g-cas3-6-1	1,1,gefg_cas03,91,209
+gefg_cas03,88,248,0	warp	g-cas3-10-1_g-cas3-11	1,1,gefg_cas03,76,242
+gefg_cas03,79,244,0	warp	g-cas3-11_g-cas3-10-1	1,1,gefg_cas03,91,250
+gefg_cas03,68,290,0	warp	g-cas3-12_gef-g3-0	1,1,gef_fild13,74,287
+gefg_cas03,103,283,0	warp	g-cas3-13_gef-g3-1	1,1,gef_fild13,117,273
+gefg_cas03,130,250,0	warp	g-cas3-14_gef-g3-2	1,1,gef_fild13,143,240
+gefg_cas03,93,159,0	warp	g-cas3-15_gef-g3-3	1,1,gef_fild13,83,181
+gefg_cas03,92,53,0	warp	g3-in_g3_cas3	1,1,gefg_cas03,62,223
+gefg_cas03,154,16,0	warp	g3-in3-01_g3-in3-02	1,1,gefg_cas03,252,11
+gefg_cas03,256,11,0	warp	g3-in3-02_g3-in3-01	1,1,gefg_cas03,159,16
+gefg_cas03,212,46,0	warp	g3-in3-03_g3-in3-04	1,1,gefg_cas03,225,158
+gefg_cas03,225,154,0	warp	g3-in3-04_g3-in3-03	1,1,gefg_cas03,212,42
+gefg_cas03,135,92,0	warp	g-in3-1_g-cas3-1	1,1,gefg_cas03,34,282
+gefg_cas03,135,15,0	warp	g-in3-2_g-cas3-4	1,1,gefg_cas03,110,217
+gefg_cas03,152,92,0	warp	g-in3-3_g-cas3-2	1,1,gefg_cas03,59,255
+gefg_cas03,266,47,0	warp	g-in3-4_g-cas3-5	1,1,gefg_cas03,45,175
+gefg_cas03,237,74,0	warp	g-in3-5_g-cas3-9	1,1,gefg_cas03,62,213
+gefg_cas04,34,211,0	warp	gefg-4-01_gefg-4-11	1,1,gefg_cas04,18,78
+gefg_cas04,57,224,0	warp	gefg-4-02_gefg-4-15	1,1,gefg_cas04,18,13
+gefg_cas04,53,196,0	warp	gefg-4-03_gefg-4-23	1,1,gefg_cas04,170,36
+gefg_cas04,27,180,0	warp	gefg-4-04_gefg-4-21	1,1,gefg_cas04,142,59
+gefg_cas04,24,145,0	warp	gefg-4-05_gef-g4	1,1,gef_fild13,193,278
+gefg_cas04,18,82,0	warp	gefg-4-11_gefg-4-01	1,1,gefg_cas04,34,215
+gefg_cas04,42,81,0	warp	gefg-4-12_gefg-4-14	1,1,gefg_cas04,42,13
+gefg_cas04,52,25,0	warp	gefg-4-13_gefg-4-24	1,1,gefg_cas04,142,37
+gefg_cas04,42,9,0	warp	gefg-4-14_gefg-4-12	1,1,gefg_cas04,42,77
+gefg_cas04,18,9,0	warp	gefg-4-15_gefg-4-02	1,1,gefg_cas04,57,220
+gefg_cas04,142,55,0	warp	gefg-4-21_gefg-4-04	1,1,gefg_cas04,32,180
+gefg_cas04,178,57,0	warp	gefg-4-22_gefg-4-31	1,1,gefg_cas04,143,166
+gefg_cas04,174,36,0	warp	gefg-4-23_gefg-4-03	1,1,gefg_cas04,53,192
+gefg_cas04,142,33,0	warp	gefg-4-24_gefg-4-13	1,1,gefg_cas04,52,21
+gefg_cas04,140,168,0	warp	gefg-4-31_gefg-4-22	1,1,gefg_cas04,178,61
+gefg_cas05,99,204,0	warp	gefg-5-01_gef-g5-1	1,1,gef_fild13,305,87
+gefg_cas05,50,165,0	warp	gefg-5-02_gefg-5-23	1,1,gefg_cas05,178,68
+gefg_cas05,87,165,0	warp	gefg-5-03_gefg-5-13	1,1,gefg_cas05,84,62
+gefg_cas05,7,134,0	warp	gefg-5-04_gef-g5-0	1,1,gef_fild13,252,57
+gefg_cas05,44,143,0	warp	gefg-5-05_gefg-5-08	1,1,gefg_cas05,70,155
+gefg_cas05,83,152,0	warp	gefg-5-06_gefg-5-11	1,1,gefg_cas05,66,72
+gefg_cas05,74,138,0	warp	gefg-5-07_gefg-5-12	1,1,gefg_cas05,47,62
+gefg_cas05,68,150,0	warp	gefg-5-08_gefg-5-05	1,1,gefg_cas05,44,147
+gefg_cas05,66,76,0	warp	gefg-5-11_gefg-5-06	1,1,gefg_cas05,80,155
+gefg_cas05,43,62,0	warp	gefg-5-12_gefg-5-07	1,1,gefg_cas05,78,138
+gefg_cas05,88,62,0	warp	gefg-5-13_gefg-5-03	1,1,gefg_cas05,83,165
+gefg_cas05,37,16,0	warp	gefg-5-14_gefg-5-21	1,1,gefg_cas05,153,44
+gefg_cas05,93,16,0	warp	gefg-5-15_gefg-5-22	1,1,gefg_cas05,202,44
+gefg_cas05,149,44,0	warp	gefg-5-21_gefg-5-14	1,1,gefg_cas05,37,20
+gefg_cas05,206,44,0	warp	gefg-5-22_gefg-5-15	1,1,gefg_cas05,93,20
+gefg_cas05,178,72,0	warp	gefg-5-23_gefg-5-02	1,1,gefg_cas05,46,165
+gefg_cas05,190,20,0	warp	gefg-5-24_gefg-5-31	1,1,gefg_cas05,194,151
+gefg_cas05,194,147,0	warp	gefg-5-31_gefg-5-24	1,1,gefg_cas05,190,16
+
+//Payon Castle Map
+payon,16,143,0	warp	payon-a_payg01	1,1,pay_gld,370,149
+moc_fild02,378,272,0	warp	moc02a_payg02	1,1,pay_gld,20,276
+pay_gld,374,149,0	warp	payg01_payon-a	1,1,payon,19,143
+pay_gld,16,276,0	warp	payg02_moc02a	1,1,moc_fild02,374,272
+pay_gld,121,238,0	warp	payg-1_payg-1-06	1,1,payg_cas01,214,48
+pay_gld,291,116,0	warp	payg-2_payg-2-02	1,1,payg_cas02,272,57
+pay_gld,323,293,0	warp	payg-3_payg-3-07	1,1,payg_cas03,226,26
+pay_gld,140,156,0	warp	payg-4_payg-4-01	1,1,payg_cas04,252,271
+pay_gld,204,270,0	warp	payg-5_payg-5-03	1,1,payg_cas05,62,227
+
+//Inside Payon Guild Castles
+payg_cas01,201,126,0	warp	payg-1-01_payg-1-12	1,1,payg_cas01,102,21
+payg_cas01,222,130,0	warp	payg-1-02_payg-1-11	1,1,payg_cas01,130,43
+payg_cas01,218,112,0	warp	payg-1-03_payg-1-04	1,1,payg_cas01,230,94
+payg_cas01,230,98,0	warp	payg-1-04_payg-1-03	1,1,payg_cas01,222,112
+payg_cas01,213,76,0	warp	payg-1-05_payg-1-07	1,1,payg_cas01,201,118
+payg_cas01,214,44,0	warp	payg-1-06_payg-1	1,1,pay_gld,121,233
+payg_cas01,201,114,0	warp	payg-1-07_payg-1-05	1,1,payg_cas01,213,72
+payg_cas01,134,43,0	warp	payg-1-11_payg-1-02	1,1,payg_cas01,226,130
+payg_cas01,102,17,0	warp	payg-1-12_payg-1-01	1,1,payg_cas01,201,121
+payg_cas01,84,15,0	warp	payg-1-13_payg-1-22	1,1,payg_cas01,15,115
+payg_cas01,53,111,0	warp	payg-1-21_payg-1-31	1,1,payg_cas01,115,147
+payg_cas01,11,115,0	warp	payg-1-22_payg-1-13	1,1,payg_cas01,81,15
+payg_cas01,115,151,0	warp	payg-1-31_payg-1-21	1,1,payg_cas01,53,115
+payg_cas02,232,72,0	warp	payg-2-01_payg-2-14	1,1,payg_cas02,28,289
+payg_cas02,276,61,0	warp	payg-2-02_payg-2	1,1,pay_gld,295,116
+payg_cas02,236,59,0	warp	payg-2-03_payg-2-01	1,1,payg_cas02,229,72
+payg_cas02,222,26,0	warp	payg-2-04_payg-2-12	1,1,payg_cas02,80,240
+payg_cas02,215,31,0	warp	payg-2-05_payg-2-11	1,1,payg_cas02,65,288
+payg_cas02,65,292,0	warp	payg-2-11_payg-2-05	1,1,payg_cas02,215,35
+payg_cas02,84,240,0	warp	payg-2-12_payg-2-04	1,1,payg_cas02,224,30
+payg_cas02,47,223,0	warp	payg-2-13_payg-2-21	1,1,payg_cas02,280,287
+payg_cas02,28,293,0	warp	payg-2-14_payg-2-01	1,1,payg_cas02,229,72
+payg_cas02,280,291,0	warp	payg-2-21_payg-2-13	1,1,payg_cas02,47,227
+payg_cas02,254,241,0	warp	payg-2-22_payg-2-31	1,1,payg_cas02,13,38
+payg_cas02,13,42,0	warp	payg-2-31_payg-2-22	1,1,payg_cas02,254,245
+payg_cas03,255,76,0	warp	payg-3-01_payg-3-14	1,1,payg_cas03,24,19
+payg_cas03,269,79,0	warp	payg-3-02_payg-3-12	1,1,payg_cas03,53,19
+payg_cas03,255,64,0	warp	payg-3-03_payg-3-08	1,1,payg_cas03,245,37
+payg_cas03,262,71,0	warp	payg-3-04_payg-3-13	1,1,payg_cas03,39,9
+payg_cas03,272,68,0	warp	payg-3-05_payg-3-06	1,1,payg_cas03,261,38
+payg_cas03,261,34,0	warp	payg-3-06_payg-3-05	1,1,payg_cas03,270,66
+payg_cas03,226,22,0	warp	payg-3-07_payg-3	1,1,pay_gld,319,293
+payg_cas03,245,41,0	warp	payg-3-08_payg-3-03	1,1,payg_cas03,255,68
+payg_cas03,39,84,0	warp	payg-3-11_payg-3-22	1,1,payg_cas03,29,249
+payg_cas03,57,19,0	warp	payg-3-12_payg-3-02	1,1,payg_cas03,269,75
+payg_cas03,39,5,0	warp	payg-3-13_payg-3-04	1,1,payg_cas03,263,66
+payg_cas03,20,19,0	warp	payg-3-14_payg-3-01	1,1,payg_cas03,255,72
+payg_cas03,29,269,0	warp	payg-3-21_payg-3-31	1,1,payg_cas03,269,287
+payg_cas03,29,245,0	warp	payg-3-22_payg-3-11	1,1,payg_cas03,39,80
+payg_cas03,269,290,0	warp	payg-3-31_payg-3-21	1,1,payg_cas03,29,273
+payg_cas04,252,275,0	warp	payg-4-01_payg-4	1,1,pay_gld,140,160
+payg_cas04,260,212,0	warp	payg-4-02_payg-4-13	1,1,payg_cas04,70,240
+payg_cas04,232,189,0	warp	payg-4-03_payg-4-12	1,1,payg_cas04,74,261
+payg_cas04,229,208,0	warp	payg-4-04_payg-4-11	1,1,payg_cas04,70,282
+payg_cas04,74,282,0	warp	payg-4-11_payg-4-04	1,1,payg_cas04,225,208
+payg_cas04,78,261,0	warp	payg-4-12_payg-4-03	1,1,payg_cas04,236,189
+payg_cas04,74,240,0	warp	payg-4-13_payg-4-02	1,1,payg_cas04,256,212
+payg_cas04,7,261,0	warp	payg-4-14_payg-4-21	1,1,payg_cas04,55,30
+payg_cas04,59,30,0	warp	payg-4-21_payg-4-14	1,1,payg_cas04,11,261
+payg_cas04,28,31,0	warp	payg-4-22_payg-4-31	1,1,payg_cas04,251,42
+payg_cas04,254,45,0	warp	payg-4-31_payg-4-22	1,1,payg_cas04,24,31
+payg_cas05,23,283,0	warp	payg-5-01_payg-5-11	1,1,payg_cas05,237,282
+payg_cas05,56,255,0	warp	payg-5-02_payg-5-14	1,1,payg_cas05,223,256
+payg_cas05,62,223,0	warp	payg-5-03_payg-5	1,1,pay_gld,198,264
+payg_cas05,39,264,0	warp	payg-5-04_payg-5-13	1,1,payg_cas05,237,231
+payg_cas05,237,286,0	warp	payg-5-11_payg-5-01	1,1,payg_cas05,19,282
+payg_cas05,283,256,0	warp	payg-5-12_payg-5-22	1,1,payg_cas05,286,43
+payg_cas05,237,227,0	warp	payg-5-13_payg-5-04	1,1,payg_cas05,40,260
+payg_cas05,219,256,0	warp	payg-5-14_payg-5-02	1,1,payg_cas05,52,255
+payg_cas05,242,41,0	warp	payg-5-21_payg-5-31	1,1,payg_cas05,18,18
+payg_cas05,290,43,0	warp	payg-5-22_payg-5-12	1,1,payg_cas05,287,256
+payg_cas05,14,14,0	warp	payg-5-31_payg-5-21	1,1,payg_cas05,246,41
+
+//Al De Baran Castle Map
+aldebaran,35,140,0	warp	alde-a_aldeg01	1,1,alde_gld,280,160
+alde_gld,284,160,0	warp	aldeg01_alde-a	1,1,aldebaran,39,140
+alde_gld,48,79,0	warp	aldeg-1_aldeg-1-1	1,1,aldeg_cas01,34,248
+alde_gld,95,253,0	warp	aldeg-2_aldeg-2-1	1,1,aldeg_cas02,88,163
+alde_gld,142,81,0	warp	aldeg-3_aldeg-3-1	1,1,aldeg_cas03,114,286
+alde_gld,243,242,0	warp	aldeg-4_aldeg-4-1	1,1,aldeg_cas04,149,17
+alde_gld,259,90,0	warp	aldeg-5_aldeg-5-1	1,1,aldeg_cas05,216,103
+
+//Inside Al De Baran Guild Castles
+aldeg_cas01,34,252,0	warp	aldeg-1-1_aldeg-1	1,1,alde_gld,48,83
+aldeg_cas01,50,222,0	warp	aldeg-1-2_aldeg-1-6	1,1,aldeg_cas01,104,108
+aldeg_cas01,66,191,0	warp	aldeg-1-3_aldeg-1-7	1,1,aldeg_cas01,122,61
+aldeg_cas01,26,188,0	warp	aldeg-1-4_aldeg-1-10	1,1,aldeg_cas01,50,70
+aldeg_cas01,70,112,0	warp	aldeg-1-5_aldeg-1-18	1,1,aldeg_cas01,42,225
+aldeg_cas01,104,112,0	warp	aldeg-1-6_aldeg-1-2	1,1,aldeg_cas01,45,224
+aldeg_cas01,126,61,0	warp	aldeg-1-7_aldeg-1-3	1,1,aldeg_cas01,62,191
+aldeg_cas01,89,23,0	warp	aldeg-1-8_aldeg-1-13	1,1,aldeg_cas01,207,132
+aldeg_cas01,54,27,0	warp	aldeg-1-9_aldeg-1-3	1,1,aldeg_cas01,62,191
+aldeg_cas01,46,70,0	warp	aldeg-1-10_aldeg-1-4	1,1,aldeg_cas01,24,188
+aldeg_cas01,206,188,0	warp	aldeg-1-11_aldeg-1-15	1,1,aldeg_cas01,216,50
+aldeg_cas01,232,186,0	warp	aldeg-1-12_aldeg-1-16	1,1,aldeg_cas01,42,197
+aldeg_cas01,207,128,0	warp	aldeg-1-13_aldeg-1-8	1,1,aldeg_cas01,89,27
+aldeg_cas01,171,175,0	warp	aldeg-1-14_aldeg-1-17	1,1,aldeg_cas01,35,197
+aldeg_cas01,216,54,0	warp	aldeg-1-15_aldeg-1-11	1,1,aldeg_cas01,206,184
+aldeg_cas01,46,197,0	warp	aldeg-1-16_aldeg-1-12	1,1,aldeg_cas01,232,182
+aldeg_cas01,31,197,0	warp	aldeg-1-17_aldeg-1-14	1,1,aldeg_cas01,175,175
+aldeg_cas01,39,222,0	warp	aldeg-1-18_aldeg-1-5	1,1,aldeg_cas01,70,108
+aldeg_cas02,88,159,0	warp	aldeg-2-1_aldeg-2	1,1,alde_gld,95,249
+aldeg_cas02,84,208,0	warp	aldeg-2-2_aldeg-2-10	1,1,aldeg_cas02,105,84
+aldeg_cas02,50,185,0	warp	aldeg-2-3_aldeg-2-12	1,1,aldeg_cas02,192,192
+aldeg_cas02,33,174,0	warp	aldeg-2-4_aldeg-2-8	1,1,aldeg_cas02,126,61
+aldeg_cas02,22,194,0	warp	aldeg-2-5_aldeg-2-6	1,1,aldeg_cas02,88,13
+aldeg_cas02,88,9,0	warp	aldeg-2-6_aldeg-2-5	1,1,aldeg_cas02,22,190
+aldeg_cas02,45,39,0	warp	aldeg-2-7_aldeg-2-2	1,1,aldeg_cas02,79,208
+aldeg_cas02,130,61,0	warp	aldeg-2-8_aldeg-2-4	1,1,aldeg_cas02,33,179
+aldeg_cas02,121,88,0	warp	aldeg-2-9_aldeg-2-11	1,1,aldeg_cas02,177,135
+aldeg_cas02,105,88,0	warp	aldeg-2-10_aldeg-2-2	1,1,aldeg_cas02,79,208
+aldeg_cas02,177,131,0	warp	aldeg-2-11_aldeg-2-9	1,1,aldeg_cas02,121,84
+aldeg_cas02,192,196,0	warp	aldeg-2-12_aldeg-2-3	1,1,aldeg_cas02,50,180
+aldeg_cas02,206,196,0	warp	aldeg-2-13_aldeg-2-14	1,1,aldeg_cas02,197,13
+aldeg_cas02,197,9,0	warp	aldeg-2-14_aldeg-2-13	1,1,aldeg_cas02,206,192
+aldeg_cas03,114,290,0	warp	aldeg-3-1_aldeg-3	1,1,alde_gld,142,85
+aldeg_cas03,92,217,0	warp	aldeg-3-2_aldeg-3-6	1,1,aldeg_cas03,127,90
+aldeg_cas03,87,247,0	warp	aldeg-3-3_aldeg-3-7	1,1,aldeg_cas03,54,90
+aldeg_cas03,44,222,0	warp	aldeg-3-4_aldeg-3-13	1,1,aldeg_cas03,213,182
+aldeg_cas03,91,57,0	warp	aldeg-3-5_aldeg-3-14	1,1,aldeg_cas03,60,236
+aldeg_cas03,130,90,0	warp	aldeg-3-6_aldeg-3-2	1,1,aldeg_cas03,96,215
+aldeg_cas03,51,90,0	warp	aldeg-3-7_aldeg-3-3	1,1,aldeg_cas03,87,251
+aldeg_cas03,93,124,0	warp	aldeg-3-8_aldeg-3-3	1,1,aldeg_cas03,87,251
+aldeg_cas03,79,130,0	warp	aldeg-3-9_aldeg-3-10	1,1,aldeg_cas03,201,149
+aldeg_cas03,201,145,0	warp	aldeg-3-10_aldeg-3-9	1,1,aldeg_cas03,79,126
+aldeg_cas03,199,190,0	warp	aldeg-3-11_aldeg-3-12	1,1,aldeg_cas03,195,51
+aldeg_cas03,195,54,0	warp	aldeg-3-12_aldeg-3-11	1,1,aldeg_cas03,199,186
+aldeg_cas03,214,186,0	warp	aldeg-3-13_aldeg-3-4	1,1,aldeg_cas03,49,222
+aldeg_cas03,60,241,0	warp	aldeg-3-14_aldeg-3-5	1,1,aldeg_cas03,91,61
+aldeg_cas04,145,17,0	warp	aldeg-4-1_aldeg-4	1,1,alde_gld,239,242
+aldeg_cas04,197,40,0	warp	aldeg-4-2_aldeg-4-9	1,1,aldeg_cas04,26,88
+aldeg_cas04,175,54,0	warp	aldeg-4-3_aldeg-4-8	1,1,aldeg_cas04,74,88
+aldeg_cas04,185,87,0	warp	aldeg-4-4_aldeg-4-14	1,1,aldeg_cas04,111,210
+aldeg_cas04,171,100,0	warp	aldeg-4-5_aldeg-4-13	1,1,aldeg_cas04,152,210
+aldeg_cas04,196,86,0	warp	aldeg-4-6_aldeg-4-7	1,1,aldeg_cas04,49,57
+aldeg_cas04,49,53,0	warp	aldeg-4-7_aldeg-4-6	1,1,aldeg_cas04,196,82
+aldeg_cas04,78,88,0	warp	aldeg-4-8_aldeg-4-3	1,1,aldeg_cas04,174,58
+aldeg_cas04,22,88,0	warp	aldeg-4-9_aldeg-4-2	1,1,aldeg_cas04,192,41
+aldeg_cas04,50,132,0	warp	aldeg-4-10_aldeg-4-8	1,1,aldeg_cas04,74,88
+aldeg_cas04,21,123,0	warp	aldeg-4-11_aldeg-4-12	1,1,aldeg_cas04,125,168
+aldeg_cas04,121,168,0	warp	aldeg-4-12_aldeg-4-11	1,1,aldeg_cas04,25,123
+aldeg_cas04,156,210,0	warp	aldeg-4-13_aldeg-4-5	1,1,aldeg_cas04,169,97
+aldeg_cas04,108,210,0	warp	aldeg-4-14_aldeg-4-4	1,1,aldeg_cas04,186,92
+aldeg_cas04,132,231,0	script	aldeg-4-15_aldeg-4-	45,1,1,{
+
+OnTouch:
+	switch (rand(1,5)) {
+		case 1:	warp "aldeg_cas04",152,210; end;
+		case 2:	warp "aldeg_cas04",111,210; end;
+		case 3:	warp "aldeg_cas04",129,212; end;
+		case 4:	warp "aldeg_cas04",129,212; end;
+		case 5:	warp "aldeg_cas04",14,196; end;
+	}
+	end;
+}
+aldeg_cas04,132,209,0	warp	aldeg-4-16_aldeg-4-17	1,1,aldeg_cas04,14,196
+aldeg_cas04,17,196,0	warp	aldeg-4-17_aldeg-4-15	1,1,aldeg_cas04,132,228
+aldeg_cas05,216,107,0	warp	aldeg-5-1_aldeg-5	1,1,alde_gld,264,90
+aldeg_cas05,194,71,0	warp	aldeg-5-3_aldeg-5-13	1,1,aldeg_cas05,129,194
+aldeg_cas05,164,86,0	warp	aldeg-5-4_aldeg-5-10	1,1,aldeg_cas05,66,189
+aldeg_cas05,150,67,0	warp	aldeg-5-5_aldeg-5-9	1,1,aldeg_cas05,9,187
+aldeg_cas05,188,49,0	warp	aldeg-5-6_aldeg-5-14	1,1,aldeg_cas05,165,228
+aldeg_cas05,195,42,0	warp	aldeg-5-7_aldeg-5-8	1,1,aldeg_cas05,19,227
+aldeg_cas05,15,227,0	warp	aldeg-5-8_aldeg-5-7	1,1,aldeg_cas05,195,46
+aldeg_cas05,5,187,0	warp	aldeg-5-9_aldeg-5-5	1,1,aldeg_cas05,151,62
+aldeg_cas05,70,189,0	warp	aldeg-5-10_aldeg-5-4	1,1,aldeg_cas05,166,81
+aldeg_cas05,13,175,0	warp	aldeg-5-11_aldeg-5-12	1,1,aldeg_cas05,162,194
+aldeg_cas05,166,194,0	warp	aldeg-5-12_aldeg-5-11	1,1,aldeg_cas05,13,179
+aldeg_cas05,125,194,0	warp	aldeg-5-13_aldeg-5-3	1,1,aldeg_cas05,199,70
+aldeg_cas05,165,232,0	warp	aldeg-5-14_aldeg-5-6	1,1,aldeg_cas05,193,49
+aldeg_cas05,156,231,0	warp	aldeg-5-15_aldeg-5-16	1,1,aldeg_cas05,18,88
+aldeg_cas05,14,88,0	warp	aldeg-5-16_aldeg-5-15	1,1,aldeg_cas05,156,227
+
+// Episode 12: WoE:SE
+// Schwaltzvalt Guild Castles Map Connection
+yuno,13,126,0	warp	schg001	1,1,sch_gld,351,89
+sch_gld,354,89,0	warp	schg002	1,1,yuno,16,126
+
+// Schwaltzvalt Castle Maps
+schg_cas01,119,4,0	warp	schg101	1,1,sch_gld,293,100
+sch_gld,293,90,0	warp	schg102	1,1,schg_cas01,119,8
+schg_cas01,275,240,0	warp	schg103	1,1,schg_cas01,120,7
+schg_cas02,339,73,0	warp	schg201	1,1,sch_gld,288,252
+sch_gld,288,258,0	warp	schg202	1,1,schg_cas02,339,78
+schg_cas02,101,301,0	warp	schg203	1,1,schg_cas02,340,78
+schg_cas03,337,336,0	warp	schg301	1,1,sch_gld,97,196
+sch_gld,97,183,0	warp	schg302	1,1,schg_cas03,337,330
+schg_cas03,57,9,0	warp	schg303	1,1,schg_cas03,337,330
+schg_cas04,119,4,0	warp	schg401	1,1,sch_gld,137,90
+sch_gld,137,98,0	warp	schg402	1,1,schg_cas04,119,8
+schg_cas04,275,240,0	warp	schg403	1,1,schg_cas04,120,7
+schg_cas05,119,4,0	warp	schg501	1,1,sch_gld,71,315
+sch_gld,65,315,0	warp	schg502	1,1,schg_cas05,119,8
+schg_cas05,275,240,0	warp	schg503	1,1,schg_cas05,120,7
+
+// Arunafeltz Map Guild Castles Map Connection
+ve_fild02,191,21,0	warp	arug001	1,1,aru_gld,195,360
+aru_gld,195,363,0	warp	arug002	1,1,ve_fild02,191,24
+
+// Arunafeltz Castle Maps
+arug_cas01,281,93,0	warp	arug101	1,1,aru_gld,158,272
+aru_gld,155,274,0	warp	arug102	1,1,arug_cas01,275,93
+arug_cas01,127,357,0	warp	arug103	1,1,arug_cas01,275,93
+arug_cas02,139,25,0	warp	arug201	1,1,aru_gld,83,47
+aru_gld,78,47,0	warp	arug202	1,1,arug_cas02,139,31
+arug_cas02,393,324,0	warp	arug203	1,1,arug_cas02,139,31
+arug_cas03,141,40,0	warp	arug301	1,1,aru_gld,68,155
+aru_gld,68,150,0	warp	arug302	1,1,arug_cas03,141,45
+arug_cas03,321,52,0	warp	arug303	1,1,arug_cas03,141,45
+arug_cas04,141,40,0	warp	arug401	1,1,aru_gld,299,345
+aru_gld,289,347,0	warp	arug402	1,1,arug_cas04,141,45
+arug_cas04,321,52,0	warp	arug403	1,1,arug_cas04,141,45
+arug_cas05,141,40,0	warp	arug501	1,1,aru_gld,292,107
+aru_gld,287,107,0	warp	arug502	1,1,arug_cas05,141,45
+arug_cas05,321,52,0	warp	arug503	1,1,arug_cas05,141,45
+
+//==================  4 Novices Guild Castles =============================
+//Novices Guild: Al de Baran Guild Castles Map
+n_castle,184,16,0	warp	naldg01	1,1,nguild_alde,34,248
+nguild_alde,34,252,0	warp	naldg01-1	1,1,n_castle,187,16
+
+nguild_alde,50,222,0	warp	naldg101	1,1,nguild_alde,104,108
+nguild_alde,104,112,0	warp	naldg101-1	1,1,nguild_alde,45,224
+nguild_alde,66,191,0	warp	naldg102	1,1,nguild_alde,122,61
+nguild_alde,126,61,0	warp	naldg102-1	1,1,nguild_alde,62,191
+nguild_alde,54,27,0	warp	naldg102-2	1,1,nguild_alde,62,191
+nguild_alde,26,188,0	warp	naldg103	1,1,nguild_alde,50,70
+nguild_alde,46,70,0	warp	naldg103-1	1,1,nguild_alde,24,188
+nguild_alde,70,112,0	warp	naldg104	1,1,nguild_alde,42,225
+nguild_alde,39,222,0	warp	naldg104-1	1,1,nguild_alde,70,108
+nguild_alde,89,23,0	warp	naldg105	1,1,nguild_alde,207,132
+nguild_alde,207,128,0	warp	naldg105-1	1,1,nguild_alde,89,27
+nguild_alde,206,188,0	warp	naldg106	1,1,nguild_alde,216,50
+nguild_alde,216,54,0	warp	naldg106-1	1,1,nguild_alde,206,184
+nguild_alde,232,186,0	warp	naldg107	1,1,nguild_alde,42,197
+nguild_alde,46,197,0	warp	naldg107-1	1,1,nguild_alde,232,182
+nguild_alde,171,175,0	warp	naldg108	1,1,nguild_alde,35,197
+nguild_alde,31,197,0	warp	naldg108-1	1,1,nguild_alde,175,175
+
+//Novices Guild: Geffen Castles Map
+n_castle,183,183,0	warp	ngefg01	1,1,nguild_gef,34,140
+nguild_gef,34,136,0	warp	ngefg01-1	1,1,n_castle,183,180
+nguild_gef,99,178,0	warp	ngefg02-1	1,1,n_castle,183,180
+
+nguild_gef,170,14,0	warp	ngefg106-1	1,1,nguild_gef,50,84
+nguild_gef,170,34,0	warp	ngefg105-1	1,1,nguild_gef,30,167
+nguild_gef,181,52,0	warp	ngefg107	1,1,nguild_gef,198,160
+nguild_gef,202,160,0	warp	ngefg107-1	1,1,nguild_gef,185,52
+nguild_gef,209,34,0	warp	ngefg103-1	1,1,nguild_gef,56,170
+nguild_gef,31,185,0	warp	ngefg104	1,1,nguild_gef,33,47
+nguild_gef,33,51,0	warp	ngefg104-1	1,1,nguild_gef,35,185
+nguild_gef,34,167,0	warp	ngefg105	1,1,nguild_gef,174,34
+nguild_gef,39,196,0	warp	ngefg101	1,1,nguild_gef,62,13
+nguild_gef,54,84,0	warp	ngefg106	1,1,nguild_gef,174,14
+nguild_gef,58,185,0	warp	ngefg102	1,1,nguild_gef,90,47
+nguild_gef,59,170,0	warp	ngefg103	1,1,nguild_gef,205,34
+nguild_gef,62,9,0	warp	ngefg101-1	1,1,nguild_gef,39,192
+nguild_gef,90,51,0	warp	ngefg102-1	1,1,nguild_gef,54,185
+
+//Novices Guild: Payon Guild Castles Map
+n_castle,18,181,0	warp	npayg01	1,1,nguild_pay,214,48
+nguild_pay,214,44,0	warp	npayg01-1	1,1,n_castle,18,178
+
+nguild_pay,201,125,0	warp	npayg101	1,1,nguild_pay,102,19
+nguild_pay,102,16,0	warp	npayg101-1	3,1,nguild_pay,201,122
+nguild_pay,222,130,0	warp	npayg102	1,1,nguild_pay,130,43
+nguild_pay,134,43,0	warp	npayg102-1	1,1,nguild_pay,226,130
+nguild_pay,218,112,0	warp	npayg103	1,1,nguild_pay,230,94
+nguild_pay,230,98,0	warp	npayg103-1	1,1,nguild_pay,222,112
+nguild_pay,213,76,0	warp	npayg104	1,1,nguild_pay,201,118
+nguild_pay,201,114,0	warp	npayg104-1	1,1,nguild_pay,213,72
+nguild_pay,84,15,0	warp	npayg105	1,1,nguild_pay,15,115
+nguild_pay,11,115,0	warp	npayg105-1	1,1,nguild_pay,81,15
+nguild_pay,53,111,0	warp	npayg106	1,1,nguild_pay,115,147
+nguild_pay,115,151,0	warp	npayg106-1	1,1,nguild_pay,53,115
+
+//Novices Guild: Prontera Castles Map
+n_castle,16,14,0	warp	nprtg01	1,1,nguild_prt,99,32
+nguild_prt,103,32,0	warp	nprtg01-1	1,1,n_castle,19,14
+
+nguild_prt,109,163,0	warp	nprtg107	1,1,nguild_prt,202,183
+nguild_prt,147,120,0	warp	nprtg106	1,1,nguild_prt,75,187
+nguild_prt,196,119,0	warp	nprtg103-1	1,1,nguild_prt,40,54
+nguild_prt,196,65,0	warp	nprtg104-1	1,1,nguild_prt,75,54
+nguild_prt,206,183,0	warp	nprtg107-1	1,1,nguild_prt,113,163
+nguild_prt,206,92,0	warp	nprtg105-1	1,1,nguild_prt,55,70
+nguild_prt,37,47,0	warp	nprtg102-1	1,1,nguild_prt,45,34
+nguild_prt,37,54,0	warp	nprtg103	1,1,nguild_prt,192,119
+nguild_prt,41,34,0	warp	nprtg102	1,1,nguild_prt,40,47
+nguild_prt,51,70,0	warp	nprtg105	1,1,nguild_prt,202,92
+nguild_prt,57,19,0	warp	nprtg101	1,1,nguild_prt,80,49
+nguild_prt,62,34,0	warp	nprtg108	1,1,nguild_prt,192,119
+nguild_prt,71,54,0	warp	nprtg104	1,1,nguild_prt,192,65
+nguild_prt,75,183,0	warp	nprtg106-1	1,1,nguild_prt,147,116
+nguild_prt,84,19,0	warp	nprtg109	1,1,nguild_prt,192,65
+nguild_prt,84,49,0	warp	nprtg101-1	1,1,nguild_prt,61,19
+
+//Guild Dungeons
+gld_dun03,238,274,0	warp	gdun03a_prtg	1,1,prt_gld,252,247
+gld_dun03,42,30,0	warp	gdun03b_prtg	1,1,prt_gld,63,66
+gld_dun02,20,160,0	warp	gdun02a_aldega	1,1,alde_gld,229,185
+gld_dun02,180,112,0	warp	gdun02b_aldegb	1,1,alde_gld,242,121
+gld_dun01,119,14,0	warp	gdun01_payg	1,1,pay_gld,53,141
+gld_dun04,37,230,0	warp	gdun04_g13a	1,1,gef_fild13,42,331
+gld_dun04,110,20,0	warp	gdun04_g13b	1,1,gef_fild13,373,62
diff --git a/npc/pre-re/warps/other/airplane.txt b/npc/pre-re/warps/other/airplane.txt
new file mode 100644
index 000000000..83afc6893
--- /dev/null
+++ b/npc/pre-re/warps/other/airplane.txt
@@ -0,0 +1,79 @@
+//===== rAthena Script =======================================
+//= Airports & Airplanes Warp Script
+//===== By: ==================================================
+//= Sara-chan (1.0), SSUNNY@YOUNG(1.6)
+//===== Current Version: =====================================
+//= 1.7
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 8+
+//===== Description: =========================================
+//= Warp Points for All Airplanes and Airports
+//===== Additional Comments: =================================
+//= Not really sure where this belongs, feel free to move
+//= it to wherever suits the script better ^^; [Celest]
+//= 1.3 Removed warps dupes from other files.
+//= disabled direct warp to airplane [Lupus]
+//= 1.4 added some warps as recomended by Justin84 [Skotlex]
+//= (those commented are direct warps into the airplanes, left here
+//= temporarily since the NPC isn't quite there yet)
+//= 1.5 Uncomented the airplane warps and remove two unnecessary ones [MasterOfMuppets]
+//= 1.6 Updated Warps, work done by SSUNNY@YOUNG in Korean eA site [Vicious]
+//= 1.61 Corrected the first einbroch warp [Zephiris]
+//= 1.7 Corrected Juno's Aiport entrance locations. [Musashiden]
+//============================================================
+
+//==========================================================================
+//Einbroch - Airport
+//==========================================================================
+einbroch,92,281,0	warp	ein_ap01	1,1,airplane,224,64
+einbroch,64,234,0	warp	ein_ap02	1,1,airport,138,51
+airport,142,61,0	warp	ein_ap02a	1,1,einbroch,62,246
+airport,124,13,0	warp	ein_ap03	1,1,airport,19,21
+airport,19,18,0	warp	ein_ap03a	1,1,airport,122,16
+airport,161,13,0	warp	ein_ap04	1,1,airport,47,21
+airport,47,18,0	warp	ein_ap04a	1,1,airport,163,16
+airport,143,14,0	warp	ein_ap05	1,1,einbroch,64,204
+einbroch,64,207,0	warp	ein_ap05a	1,1,airport,143,17
+
+
+// -Lighthalzen Airport-
+lhz_airport,125,14,0	warp	lairp1	1,1,lhz_airport,19,20
+lhz_airport,19,18,0	warp	lairp1a	1,1,lhz_airport,123,14
+lhz_airport,160,14,0	warp	lairp2	1,1,lhz_airport,48,20
+lhz_airport,48,18,0	warp	lairp2a	1,1,lhz_airport,162,14
+lighthalzen,267,76,0	warp	lairp3	1,1,lhz_airport,143,15
+lhz_airport,143,13,0	warp	lairp3a	1,1,lighthalzen,265,76
+lhz_airport,142,60,0	warp	lairp4	1,1,lighthalzen,296,76
+lighthalzen,294,76,0	warp	lairp4a	1,1,lhz_airport,143,53
+lighthalzen,308,76,0	warp	lairp5	1,1,airplane,224,58
+
+
+// -Juno Airport-
+y_airport,125,14,0	warp	jairp1	1,1,y_airport,19,20
+y_airport,19,18,0	warp	jairp1a	1,1,y_airport,123,14
+y_airport,160,14,0	warp	jairp2	1,1,y_airport,48,20
+y_airport,48,18,0	warp	jairp2a	1,1,y_airport,162,14
+yuno,53,214,0	warp	jairp3	1,1,y_airport,143,23
+y_airport,143,16,0	warp	jairp3a	1,1,yuno,52,207
+yuno,47,240,0	warp	jairp4a	1,1,y_airport,143,54
+yuno,59,240,0	warp	jairp5a	1,1,y_airport,143,54
+yuno,6,261,0	warp	jairp6	1,1,airplane_01,244,58
+yuno,96,261,0	warp	jairp7	1,1,airplane,244,58
+
+
+//=========================================================================
+//Airplane
+//=========================================================================
+airplane,254,54,0	warp	air_1wp01	1,1,airplane,91,67
+airplane,87,67,0	warp	air_1wp01a	1,1,airplane,250,54
+airplane,208,53,0	warp	air_1wp02	1,1,airplane,239,160
+airplane,245,160,0	warp	air_1wp02a	1,1,airplane,214,54
+
+airplane_01,254,54,0	warp	air_2wp01	1,1,airplane_01,91,67
+airplane_01,87,67,0	warp	air_2wp01a	1,1,airplane_01,250,54
+airplane_01,208,53,0	warp	air_2wp02	1,1,airplane_01,239,160
+airplane_01,245,160,0	warp	air_2wp02a	1,1,airplane_01,214,54
+airplane_01,104,199,0	warp	air_2wp03	1,1,airplane_01,105,72
+airplane_01,103,72,0	warp	air_2wp03a	1,1,airplane_01,102,199
+airplane_01,104,176,0	warp	air_2wp04	1,1,airplane_01,105,52
+airplane_01,103,52,0	warp	air_2wp04a	1,1,airplane_01,102,176
diff --git a/npc/pre-re/warps/other/arena.txt b/npc/pre-re/warps/other/arena.txt
new file mode 100644
index 000000000..f0bb7e8df
--- /dev/null
+++ b/npc/pre-re/warps/other/arena.txt
@@ -0,0 +1,72 @@
+//===== rAthena Script =======================================
+//= Arena Warps
+//===== By: ==================================================
+//= SinSloth
+//===== Current Version: =====================================
+//= 1.2
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points related to Izlude Arena && Control Panel
+//===== Additional Comments: =================================
+//= 1.0 First version, done by SinSloth. [MasterOfMuppets]
+//= 1.1 updated welcome_arena warp coords (was 128,126) [Lupus]
+//= 1.2 Made some updates due to Izlude Battle Arena release. [SinSloth]
+//============================================================
+
+izlude,128,226,0	warp	welcome_arena	1,1,arena_room,100,30
+arena_room,99,24,0	warp	bye_arena	2,2,izlude,128,220
+arena_room,84,103,0	warp	arn_room_11_1	1,1,arena_room,63,130
+arena_room,63,126,0	warp	arn_room_11_2	1,1,arena_room,87,100
+arena_room,76,87,0	warp	arn_room_9_1	1,1,arena_room,46,87
+arena_room,49,87,0	warp	arn_room_9_2	1,1,arena_room,78,87
+arena_room,84,71,0	warp	arn_room_7_1	1,1,arena_room,60,50
+arena_room,63,53,0	warp	arn_room_7_2	1,1,arena_room,86,74
+arena_room,115,71,0	warp	arn_room_5_1	1,1,arena_room,139,50
+arena_room,136,53,0	warp	arn_room_5_2	1,1,arena_room,113,74
+arena_room,123,88,0	warp	arn_room_3_1	1,1,arena_room,153,87
+arena_room,150,87,0	warp	arn_room_3_2	1,1,arena_room,120,87
+prt_are_in,54,13,0	warp	toarn_room	1,1,arena_room,100,77
+
+sec_in02,79,180,3	script	#arenacontrol	81,{
+
+DLGTEMP:
+	input @input_arena;
+	if (@input_arena < 0 || @input_arena > 2000) goto DLGTEMP;	//CHECK
+	if (@input_arena == 0)
+	{
+		mes "Error!";
+		close;
+	}
+	else if (@input_arena == 1357)
+	{
+		mes "Opening Control Panel";
+		mes "' A - R - E - N - A '";
+		next;
+		mes "Please select a";
+		mes "state for the arena.";
+		next;
+		switch( select( "Open.","Closed.") )
+		{
+			case 1:
+				mes "Currently";
+				mes "opening arena.";
+				misceffect EF_ENHANCE;	//CHECK
+				enablenpc "welcome_arena";
+				next;
+				break;
+			case 2:
+				mes "Currently";
+				mes "closing arena.";
+				misceffect EF_EXIT;	//CHECK
+				disablenpc "welcome_arena";
+				next;
+				break;
+		}
+	}
+	else
+	{
+		mes "Closing control panel.";
+		close;
+	}
+}
diff --git a/npc/pre-re/warps/other/bossnia.txt b/npc/pre-re/warps/other/bossnia.txt
new file mode 100644
index 000000000..28cfda019
--- /dev/null
+++ b/npc/pre-re/warps/other/bossnia.txt
@@ -0,0 +1,18 @@
+//===== rAthena Script =======================================
+//= Bossnia Warps
+//===== By: ==================================================
+//= Masao
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any rAthena Version
+//===== Description: =========================================
+//= Back Warp Points related to the Bossnia event.
+//===== Additional Comments: =================================
+//= 1.0 First Version.
+//============================================================
+
+bossnia_01,204,204,0	warp	bossnia01	1,1,prontera,155,180
+bossnia_02,204,204,0	warp	bossnia02	1,1,prontera,155,180
+bossnia_03,204,204,0	warp	bossnia03	1,1,prontera,155,180
+bossnia_04,204,204,0	warp	bossnia04	1,1,prontera,155,180
diff --git a/npc/pre-re/warps/other/god.txt b/npc/pre-re/warps/other/god.txt
new file mode 100644
index 000000000..f649b7e57
--- /dev/null
+++ b/npc/pre-re/warps/other/god.txt
@@ -0,0 +1,21 @@
+//===== rAthena Script =======================================
+//= God Seal Quest Warps
+//===== By: ==================================================
+//= MasterOfMuppets && SinSloth
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//=
+//===== Description: =========================================
+//= Warp Points related to the God Seal Quest.
+//===== Additional Comments: =================================
+//= 1.0 Added some warps of the Sleipnir part [SinSloth]
+//============================================================
+
+yuno,218,180,0	warp	yuno_god01	1,1,que_god01,99,84
+que_god01,99,81,0	warp	god01_yuno	1,1,yuno,218,177
+que_god01,63,88,0	warp	god_sl_w0-1	1,1,que_god01,87,92
+que_god01,62,116,0	warp	god_sl_w1-1	1,1,que_god01,46,94
+que_god01,12,116,0	warp	god_sl_w2-1	1,1,que_god01,16,94
+que_god01,12,55,0	warp	god_sl_w3-1	1,1,que_god01,17,83
+que_god01,50,55,0	warp	god_sl_w4-1	1,1,que_god01,47,83
diff --git a/npc/pre-re/warps/other/jobquests.txt b/npc/pre-re/warps/other/jobquests.txt
new file mode 100644
index 000000000..fc922f819
--- /dev/null
+++ b/npc/pre-re/warps/other/jobquests.txt
@@ -0,0 +1,131 @@
+//===== rAthena Script =======================================
+//= Job Quest Warp Script
+//===== By: ==================================================
+//= Athena (1.0)
+//===== Current Version: =====================================
+//= 2.1
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Version Ep4+
+//===== Description: =========================================
+//= Warp Points for Job Quest Maps
+//===== Additional Comments: =================================
+//= Split off npc_warp.txt
+//= Commented some warps because new Job quests have correct
+//= ones! Added missing warps for Thief/Hunter/Swordman [Lupus]
+//= 1.3 Added missing warps Swordman [Lupus]
+//= Reorganized.  Added complete rogue quest warps.
+//= Removed unused, duplicate warps. [kobra_k88]
+//= 1.3b activated Dancer JQ warp [Lupus]
+//= 1.4 Imported damn noobie warps from jAthena (because it's broken since last year)
+//= 1.5 Replaced clone maps with the real ones [Lupus]
+//= 1.6 removed swordman quest map warps. They are now contained in the swordman quest. [L0ne_W0lf]
+//= 1.7 Updated some 2-2 job quest related warps. [L0ne_W0lf]
+//= 1.8 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
+//= 1.9 Added Gungslinger and Ninja warps. [L0ne_W0lf]
+//= 2.0 Updated Novice warps to use correct maps. [L0ne_W0lf]
+//= 2.1 Added one Shadow Chaser job warp. [Euphy]
+//============================================================
+
+
+//==============================================================================
+//Novice
+//==============================================================================
+new_1-1,148,112,0	warp	newwarp6001	2,2,new_1-2,100,9
+new_1-2,100,6,0	warp	newwarp6002	2,2,new_1-1,144,112
+new_1-2,126,106,0	warp	newwarp6003	2,2,new_1-2,160,171
+new_1-2,156,171,0	warp	newwarp6004	2,2,new_1-2,123,106
+new_1-2,73,106,0	warp	newwarp6005	2,2,new_1-2,41,172
+new_1-2,46,172,0	warp	newwarp6006	2,2,new_1-2,78,106
+
+//==============================================================================
+//Thief
+//==============================================================================
+job_thief1,180,15,0	warp	jthf	7,1,moc_ruins,145,117
+
+
+//==============================================================================
+// Assassin
+//==============================================================================
+in_moc_16,18,8,0	warp	guild_to_16	2,2,moc_fild16,205,291
+moc_fild16,205,296,0	warp	16_to_guild	2,2,in_moc_16,18,11
+
+//==============================================================================
+// Hunter
+//==============================================================================
+in_hunter,100,15,0	warp	jhun01	0,0,pay_fild10,143,250
+
+//==============================================================================
+// Monk (St. Capitolina Abbey)
+//==============================================================================
+prt_monk,192,172,0	warp	monk15	1,1,monk_test,329,50
+monk_test,329,47,0	warp	monk16	1,1,prt_monk,193,166
+monk_test,329,76,0	warp	monk17	1,1,monk_test,259,118
+monk_test,259,115,0	warp	monk18	1,1,monk_test,329,71
+monk_test,272,125,0	warp	monk19	1,1,monk_test,301,127
+monk_test,298,127,0	warp	monk20	1,1,monk_test,268,125
+
+//==============================================================================
+//Alchemist
+//==============================================================================
+aldebaran,65,53,0	warp	alche#1	1,1,alde_alche,20,175
+aldebaran,53,65,0	warp	alche#2	1,1,alde_alche,42,175
+alde_alche,19,171,0	warp	alche#1-1	1,1,aldebaran,68,56
+alde_alche,42,171,0	warp	alche#1-2	1,1,aldebaran,56,68
+alde_alche,41,186,0	warp	alche#1F_2F	1,1,alde_alche,113,178
+alde_alche,114,183,0	warp	alche#2F_1F	1,1,alde_alche,42,182
+alde_alche,13,184,0	warp	alche#1F_B1	1,1,alde_alche,88,113
+alde_alche,88,117,0	warp	alche#B1_1F	1,1,alde_alche,13,181
+alde_alche,46,104,0	warp	alche#B1_r1	1,1,alde_alche,157,17
+alde_alche,160,17,0	warp	alche#r1_b1	1,1,alde_alche,50,103
+alde_alche,46,77,0	warp	alche#B1_r2	1,1,alde_alche,88,17
+alde_alche,93,17,0	warp	alche#r2_b1	1,1,alde_alche,50,77
+alde_alche,89,62,0	warp	alche#B1_r3	1,1,alde_alche,17,23
+alde_alche,17,29,0	warp	alche#r3_b1	1,1,alde_alche,89,67
+alde_alche,133,77,0	warp	alche#B1_r4	1,1,alde_alche,162,107
+alde_alche,158,107,0	warp	alche#r4_b1	1,1,alde_alche,129,77
+alde_alche,133,103,0	warp	alche#B1_r5	1,1,alde_alche,164,164
+alde_alche,158,163,0	warp	alche#r5_b1	1,1,alde_alche,129,103
+
+//==============================================================================
+//Rogue
+//==============================================================================
+cmd_fild07,193,117,0	warp	fild07-rogue00	1,1,in_rogue,379,46
+in_rogue,375,46,0	warp	rogue00-fild07	1,1,cmd_fild07,196,117
+in_rogue,375,34,0	warp	rogue01-02	1,1,in_rogue,380,125
+in_rogue,375,125,0	warp	rogue02-01	1,1,in_rogue,379,33
+cmd_fild07,355,286,0	warp	fild07-rogue03	1,1,in_rogue,247,126
+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
+
+//==============================================================================
+//Dancer
+//==============================================================================
+job_duncer,69,43,0	warp	duncer1	1,1,comodo,185,156
+
+//==============================================================================
+//Gunslinger
+//==============================================================================
+einbroch,136,199,0	warp	gswarp1	1,1,que_ng,138,167
+que_ng,130,166,0	warp	gswarp2	1,1,einbroch,130,197
+que_ng,178,162,0	warp	gswarp3	1,1,que_ng,172,86
+que_ng,166,85,0	warp	gswarp4	1,1,que_ng,182,161
+que_ng,165,137,0	warp	gswarp5	1,1,que_ng,177,41
+que_ng,172,42,0	warp	gswarp6	1,1,que_ng,160,139
+
+//==============================================================================
+//Ninja
+//==============================================================================
+amatsu,149,140,0	warp	ninja01	1,1,que_ng,20,142
+que_ng,20,138,0	warp	ninja02	1,1,amatsu,147,136
+que_ng,10,183,0	warp	ninja03	1,1,que_ng,33,64
+que_ng,37,64,0	warp	ninja04	1,1,que_ng,15,182
+que_ng,30,37,0	warp	ninja05	1,1,que_ng,67,28
+que_ng,63,30,0	warp	ninja06	1,1,que_ng,25,37
+
+//==============================================================================
+//Shadow Chaser
+//==============================================================================
+job3_sha01,71,19,0	warp	shadowc1	1,1,tha_t01,149,224
\ No newline at end of file
diff --git a/npc/pre-re/warps/other/kiel.txt b/npc/pre-re/warps/other/kiel.txt
new file mode 100644
index 000000000..76df1b28f
--- /dev/null
+++ b/npc/pre-re/warps/other/kiel.txt
@@ -0,0 +1,101 @@
+//===== rAthena Script =======================================
+//= Kiel Warp Script (Kiel Buildings)
+//===== By: ==================================================
+//= Playtester; L0ne_W0lf
+//===== Current Version: =====================================
+//= 1.6
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 8+
+//===== Description: =========================================
+//= Warp Points for all Kiel Buildings
+//===== Additional Comments: =================================
+//= 1.0 Added Kiel warps thanks to Celestria [Playtester]
+//= 1.1 Added more warps thanks to Celestria [Playtester]
+//= 1.2 Added warps according to Kiel quest [Playtester]
+//= 1.3 Removed and altered exploitable warps for Kiel Hyre Quest. [L0ne_W0lf]
+//= 1.4 Removed FIELD entrance into Kiel Hyre's Villa. [L0ne_W0lf]
+//= 1.5 Rewrite of the warps. No more exploits/bugs should be present after this. [L0ne_W0lf]
+//= 1.6 Thanks Tsuyuki for pointing out that bug! Bah! [L0ne_W0lf]
+//============================================================
+
+//============================================================
+// Kiel Hyre Academy (kh_school)
+//============================================================
+kh_school,76,156,0	warp	kh_school_01	1,1,yuno_fild08,155,189
+kh_school,30,125,0	warp	kh_school_02a	1,1,kh_school,67,14
+kh_school,71,14,0	warp	kh_school_02b	1,1,kh_school,36,125
+kh_school,35,133,0	warp	kh_school_03a	1,1,kh_school,148,16
+kh_school,153,16,0	warp	kh_school_03b	1,1,kh_school,39,136
+kh_school,30,155,0	warp	kh_school_04a	1,1,kh_school,182,116
+kh_school,186,117,0	warp	kh_school_04b	1,1,kh_school,35,155
+kh_school,35,176,0	warp	kh_school_05a	1,1,kh_school,148,56
+kh_school,153,56,0	warp	kh_school_05b	1,1,kh_school,40,176
+kh_school,30,185,0	warp	kh_school_06a	1,1,kh_school,67,74
+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,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,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,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
+kh_vila,175,71,0	warp	kh_vila_09	1,1,kh_vila,136,64
+kh_vila,191,19,0	warp	kh_vila_10	1,1,yuno_fild02,74,215
+
+//============================================================
+// Kiel Hyre's Mansion (kh_mansion)
+//============================================================
+lighthalzen,188,204,0	warp	kh_mansion_01a	1,1,kh_mansion,84,49
+kh_mansion,88,50,0	warp	kh_mansion_01b	1,1,lighthalzen,188,199
+kh_mansion,21,11,0	warp	kh_mansion_02	1,1,kh_mansion,72,49
+
+//============================================================
+// Abandoned Rosimir Mansion (kh_rossi)
+//============================================================
+kh_rossi,15,92,0	warp	kh_rossi_01	1,1,yuno,270,139
+kh_rossi,35,87,0	warp	kh_rossi_02a	1,1,kh_rossi,27,37
+kh_rossi,27,42,0	warp	kh_rossi_02b	1,1,kh_rossi,35,91
+kh_rossi,63,87,0	warp	kh_rossi_03a	1,1,kh_rossi,99,38
+kh_rossi,99,42,0	warp	kh_rossi_03b	1,1,kh_rossi,63,91
+kh_rossi,90,87,0	warp	kh_rossi_04a	1,1,kh_rossi,168,30
+kh_rossi,168,34,0	warp	kh_rossi_04b	1,1,kh_rossi,90,90
+kh_rossi,35,98,0	warp	kh_rossi_05a	1,1,kh_rossi,27,147
+kh_rossi,27,143,0	warp	kh_rossi_01b	1,1,kh_rossi,35,94
+kh_rossi,90,101,0	warp	kh_rossi_06a	1,1,kh_rossi,282,64
+kh_rossi,42,26,0	warp	kh_rossi_06b	1,1,kh_rossi,92,25
+kh_rossi,87,25,0	warp	kh_rossi_07a	1,1,kh_rossi,36,26
+kh_rossi,282,60,0	warp	kh_rossi_07b	1,1,kh_rossi,90,96
+kh_rossi,222,68,0	warp	kh_rossi_08a	1,1,kh_rossi,22,277
+kh_rossi,22,273,0	warp	kh_rossi_08b	1,1,kh_rossi,222,64
+kh_rossi,248,68,0	warp	kh_rossi_09a	1,1,kh_rossi,88,277
+kh_rossi,88,273,0	warp	kh_rossi_09b	1,1,kh_rossi,248,64
+kh_rossi,222,25,0	warp	kh_rossi_10a	1,1,kh_rossi,22,219
+kh_rossi,22,222,0	warp	kh_rossi_10b	1,1,kh_rossi,222,29
+kh_rossi,248,25,0	warp	kh_rossi_11a	1,1,kh_rossi,88,217
+kh_rossi,88,222,0	warp	kh_rossi_11b	1,1,kh_rossi,248,29
+kh_rossi,259,46,0	warp	kh_rossi_12a	1,1,kh_rossi,224,234
+kh_rossi,228,234,0	warp	kh_rossi_12b	1,1,kh_rossi,263,46
+kh_rossi,220,231,0	warp	kh_rossi_13a	1,1,kh_rossi,260,186
+kh_rossi,260,190,0	warp	kh_rossi_13b	1,1,kh_rossi,220,234
+kh_rossi,204,231,0	warp	kh_rossi_14a	1,1,kh_rossi,204,186
+kh_rossi,204,190,0	warp	kh_rossi_14b	1,1,kh_rossi,204,234
+kh_rossi,188,231,0	warp	kh_rossi_15a	1,1,kh_rossi,148,186
+kh_rossi,148,190,0	warp	kh_rossi_15b	1,1,kh_rossi,188,234
+kh_rossi,188,238,0	warp	kh_rossi_16a	1,1,kh_rossi,148,283
+kh_rossi,148,279,0	warp	kh_rossi_16b	1,1,kh_rossi,188,235
+kh_rossi,204,238,0	warp	kh_rossi_17a	1,1,kh_rossi,204,283
+kh_rossi,204,279,0	warp	kh_rossi_17b	1,1,kh_rossi,204,235
+kh_rossi,220,238,0	warp	kh_rossi_18a	1,1,kh_rossi,261,283
+kh_rossi,260,279,0	warp	kh_rossi_18b	1,1,kh_rossi,220,235
diff --git a/npc/pre-re/warps/other/other.txt b/npc/pre-re/warps/other/other.txt
new file mode 100644
index 000000000..011494794
--- /dev/null
+++ b/npc/pre-re/warps/other/other.txt
@@ -0,0 +1,35 @@
+//===== rAthena Script =======================================
+//= Other Warp Script
+//===== By: ==================================================
+//= Athena (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version;
+//===== Description: =========================================
+//= Warp Points for Other Maps
+//===== Additional Comments: =================================
+//= Split off npc_warp.txt
+//============================================================
+
+//guild_room,0,0,0	warp	warp4	0,0,hoge,0,0
+//guild_vs1,0,0,0	warp	warp4	0,0,hoge,0,0
+//guild_vs1,0,0,0	warp	warp4	0,0,hoge,0,0
+//guild_vs1,0,0,0	warp	warp4	0,0,hoge,0,0
+//guild_vs1,0,0,0	warp	warp4	0,0,hoge,0,0
+//guild_vs2,50,88,0	warp	warp4	0,0,hoge,0,0
+//guild_vs2,0,0,0	warp	warp4	0,0,hoge,0,0
+//guild_vs2,0,0,0	warp	warp4	0,0,hoge,0,0
+//guild_vs2,0,0,0	warp	warp4	0,0,hoge,0,0
+//guild_vs3,0,0,0	warp	warp4	0,0,hoge,0,0
+//guild_vs3,0,0,0	warp	warp4	0,0,hoge,0,0
+//guild_vs3,0,0,0	warp	warp4	0,0,hoge,0,0
+//guild_vs3,0,0,0	warp	warp4	0,0,hoge,0,0
+//guild_vs4,7,50,0	warp	warp4	0,0,hoge,0,0
+//guild_vs4,50,7,0	warp	warp4	0,0,hoge,0,0
+//guild_vs4,92,50,0	warp	warp4	0,0,hoge,0,0
+//guild_vs4,50,92,0	warp	warp4	0,0,hoge,0,0
+//guild_vs5,0,0,0	warp	warp4	0,0,hoge,0,0
+//guild_vs5,0,0,0	warp	warp4	0,0,hoge,0,0
+//guild_vs5,0,0,0	warp	warp4	0,0,hoge,0,0
+//guild_vs5,0,0,0	warp	warp4	0,0,hoge,0,0
diff --git a/npc/pre-re/warps/other/paradise.txt b/npc/pre-re/warps/other/paradise.txt
new file mode 100644
index 000000000..fec766ec4
--- /dev/null
+++ b/npc/pre-re/warps/other/paradise.txt
@@ -0,0 +1,25 @@
+//===== rAthena Script =======================================
+//= Paradise Group Warp Script
+//===== By: ==================================================
+//= Chilly
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= rAthena SVN;
+//===== Description: =========================================
+//= Warp Points for Paradise Group
+//===== Additional Comments: =================================
+//= 1.0 First Release
+//============================================================
+
+moc_para01,57,27,0	warp	#warp_2_pub	1,1,moc_para01,162,26
+moc_para01,158,26,0	warp	#warp_2_din_1	1,1,moc_para01,55,27
+moc_para01,48,16,0	warp	#warp_2_2f	1,1,moc_para01,48,164
+moc_para01,47,161,0	warp	#warp_2_1f	1,1,moc_para01,47,18
+moc_para01,107,12,0	warp	#warp_2_din_2	1,1,moc_para01,47,37
+moc_para01,100,27,0	warp	#warp_2_gym	1,1,moc_para01,47,85
+moc_para01,49,86,0	warp	#warp_2_pass_1	1,1,moc_para01,103,27
+moc_para01,113,32,0	warp	#warp_2_ware	1,1,moc_para01,105,92
+moc_para01,102,92,0	warp	#warp_2_pass_2	1,1,moc_para01,109,33
+moc_para01,41,187,0	warp	#warp_2_room2	1,1,moc_para01,179,93
+moc_para01,179,90,0	warp	#warp_2_2fhall_3	1,1,moc_para01,41,185
diff --git a/npc/pre-re/warps/other/s_workshop.txt b/npc/pre-re/warps/other/s_workshop.txt
new file mode 100644
index 000000000..884d77202
--- /dev/null
+++ b/npc/pre-re/warps/other/s_workshop.txt
@@ -0,0 +1,31 @@
+//===== rAthena Script =======================================
+//= Shadow Workshop Warp Script
+//===== By: ==================================================
+//= Chilly
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: =========================================
+//= Warp Points for Shadow Workshop
+//===== Additional Comments: =================================
+//= 1.0 First Release
+//= 1.1 Added warps for Shadow Chaser job quest. [Euphy]
+//============================================================
+
+rachel,180,115,0	warp	s_atelier0001	1,1,s_atelier,131,72
+s_atelier,131,75,0	warp	s_atelier0002	1,1,rachel,180,118
+s_atelier,117,71,0	warp	s_atelier0003	1,1,s_atelier,169,72
+s_atelier,166,72,0	warp	s_atelier0004	1,1,s_atelier,117,68
+prontera,272,108,0	warp	s_atelier0005	1,1,s_atelier,13,119
+s_atelier,9,119,0	warp	s_atelier0006	1,1,prontera,269,108
+s_atelier,31,128,0	warp	s_atelier0007	1,1,s_atelier,76,125
+s_atelier,76,128,0	warp	s_atelier0008	1,1,s_atelier,28,128
+s_atelier,19,79,0	warp	s_atelier0009	1,1,lighthalzen,41,58
+lighthalzen,41,52,0	warp	s_atelier0010	1,1,s_atelier,18,72
+s_atelier,32,65,0	warp	s_atelier0011	1,1,s_atelier,80,59
+s_atelier,80,66,0	warp	s_atelier0012	1,1,s_atelier,32,56
+s_atelier,109,129,0	warp	s_atelier0013	1,1,s_atelier,159,125
+s_atelier,160,130,0	warp	s_atelier0014	1,1,s_atelier,114,129
+yuno,278,66,0	warp	s_atelier0015	1,1,s_atelier,111,122
+s_atelier,107,122,0	warp	s_atelier0016	1,1,yuno,274,66
\ No newline at end of file
diff --git a/npc/pre-re/warps/other/sign.txt b/npc/pre-re/warps/other/sign.txt
new file mode 100644
index 000000000..b4e3d370c
--- /dev/null
+++ b/npc/pre-re/warps/other/sign.txt
@@ -0,0 +1,39 @@
+//===== rAthena Script =======================================
+//= Sign Quest Warps
+//===== By: ==================================================
+//= MasterOfMuppets
+//===== Current Version: =====================================
+//= 1.3
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 8+
+//===== Description: =========================================
+//= Warp Points related to the Sign Quest will be put here
+//===== Additional Comments: =================================
+//= 1.0 A few warps.  [MasterOfMuppets]
+//= 1.1 A few more warps. [MasterOfMuppets]
+//= 1.2 Completed the warps [MasterOfMuppets]
+//= 1.3 Added Renewal Changes. [Kisuka]
+//= 1.3 Correct AEGIS Warps. [Kisuka]
+//============================================================
+
+cmd_in01,17,34,0	warp	sign01	1,1,comodo,187,164
+
+geffen,140,99,0	warp	sign02	1,1,geffen_in,165,50
+geffen_in,165,54,0	warp	sign02a	1,1,geffen,138,104
+
+himinn,49,6,0	warp	sign03	1,1,gef_fild07,179,241
+
+himinn,49,67,0	warp	sign04	1,1,himinn,49,75
+himinn,49,72,0	warp	sign04a	1,1,himinn,49,63
+
+um_in,33,18,0	warp	sign05	1,1,um_in,89,11
+um_in,89,9,0	warp	sign05a	1,1,um_in,33,16
+
+umbala,107,118,0	warp	sign06	1,1,um_in,15,20
+um_in,11,18,0	warp	sign06a	1,1,umbala,111,121
+
+que_sign01,113,132,0	warp	sign07	1,1,nif_in,117,173
+
+que_sign01,45,15,0	warp	sign08	1,1,niflheim,146,245
+
+que_sign02,22,313,0	warp	sign09	1,1,niflheim,30,156
diff --git a/npc/pre-re/warps/pvp/pvp.txt b/npc/pre-re/warps/pvp/pvp.txt
new file mode 100644
index 000000000..da82d6d09
--- /dev/null
+++ b/npc/pre-re/warps/pvp/pvp.txt
@@ -0,0 +1,184 @@
+//===== rAthena Script =======================================
+//= Prontera Arena & PvP Warp Script
+//===== By: ==================================================
+//= Athena (any)
+//===== Current Version: =====================================
+//= 1.3
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Prontera Arena and PvP Maps
+//===== Additional Comments: =================================
+//= Split off npc_warp.txt
+//= 1.1 Fixed Prontera Arena warp [Yor]
+//= 1.2 Added addition warps for PvP Nightmare Mode maps.
+//= 1.3 Fixed duplicate warp names [Timexy]
+//============================================================
+
+//Battle Ordeal Mode
+ordeal_1-1,100,150,0	warp	ord11-1	1,1,ordeal_1-1,128,150
+ordeal_1-1,123,150,0	warp	ord11-2	1,1,ordeal_1-1,95,150
+ordeal_1-1,114,183,0	warp	ord11-3	1,1,ordeal_1-1,135,163
+ordeal_1-1,130,168,0	warp	ord11-4	1,1,ordeal_1-1,109,188
+ordeal_1-1,115,115,0	warp	ord11-5	1,1,ordeal_1-1,136,136
+ordeal_1-1,131,131,0	warp	ord11-6	1,1,ordeal_1-1,110,110
+ordeal_1-1,148,176,0	warp	ord11-7	1,1,ordeal_1-1,149,204
+ordeal_1-1,149,199,0	warp	ord11-8	1,1,ordeal_1-1,148,171
+ordeal_1-1,149,99,0	warp	ord11-9	1,1,ordeal_1-1,151,129
+ordeal_1-1,151,124,0	warp	ord11-10	1,1,ordeal_1-1,151,94
+ordeal_1-1,168,168,0	warp	ord11-11	1,1,ordeal_1-1,189,189
+ordeal_1-1,184,184,0	warp	ord11-12	1,1,ordeal_1-1,163,163
+ordeal_1-1,169,131,0	warp	ord11-13	1,1,ordeal_1-1,188,111
+ordeal_1-1,183,116,0	warp	ord11-14	1,1,ordeal_1-1,164,136
+ordeal_1-1,176,150,0	warp	ord11-15	1,1,ordeal_1-1,204,150
+ordeal_1-1,199,150,0	warp	ord11-16	1,1,ordeal_1-1,171,150
+ordeal_1-2,128,154,0	warp	ord12-1	1,1,ordeal_1-2,24,154
+ordeal_1-2,136,136,0	warp	ord12-2	1,1,ordeal_1-2,24,24
+ordeal_1-2,136,172,0	warp	ord12-3	1,1,ordeal_1-2,24,284
+ordeal_1-2,153,128,0	warp	ord12-4	1,1,ordeal_1-2,153,23
+ordeal_1-2,153,180,0	warp	ord12-5	1,1,ordeal_1-2,144,284
+ordeal_1-2,172,135,0	warp	ord12-6	1,1,ordeal_1-2,284,24
+ordeal_1-2,172,172,0	warp	ord12-7	1,1,ordeal_1-2,284,284
+ordeal_1-2,180,154,0	warp	ord12-8	1,1,ordeal_1-2,284,164
+ordeal_1-3,100,150,0	warp	ord13-1	1,1,ordeal_1-3,128,150
+ordeal_1-3,114,183,0	warp	ord13-2	1,1,ordeal_1-3,135,163
+ordeal_1-3,115,115,0	warp	ord13-3	1,1,ordeal_1-3,136,136
+ordeal_1-3,123,150,0	warp	ord13-4	1,1,ordeal_1-3,95,150
+ordeal_1-3,130,168,0	warp	ord13-5	1,1,ordeal_1-3,109,188
+ordeal_1-3,131,131,0	warp	ord13-6	1,1,ordeal_1-3,110,110
+ordeal_1-3,148,176,0	warp	ord13-7	1,1,ordeal_1-3,149,204
+ordeal_1-3,149,99,0	warp	ord13-8	1,1,ordeal_1-3,151,129
+ordeal_1-3,149,199,0	warp	ord13-9	1,1,ordeal_1-3,148,171
+ordeal_1-3,151,124,0	warp	ord13-10	1,1,ordeal_1-3,151,94
+ordeal_1-3,168,168,0	warp	ord13-11	1,1,ordeal_1-3,189,189
+ordeal_1-3,169,131,0	warp	ord13-12	1,1,ordeal_1-3,188,111
+ordeal_1-3,176,150,0	warp	ord13-13	1,1,ordeal_1-3,204,150
+ordeal_1-3,183,116,0	warp	ord13-14	1,1,ordeal_1-3,164,136
+ordeal_1-3,184,184,0	warp	ord13-15	1,1,ordeal_1-3,163,163
+ordeal_1-3,199,150,0	warp	ord13-16	1,1,ordeal_1-3,171,150
+ordeal_1-4,128,154,0	warp	ord14-1	1,1,ordeal_1-4,24,154
+ordeal_1-4,136,136,0	warp	ord14-2	1,1,ordeal_1-4,24,24
+ordeal_1-4,136,172,0	warp	ord14-3	1,1,ordeal_1-4,24,284
+ordeal_1-4,153,128,0	warp	ord14-4	1,1,ordeal_1-4,153,23
+ordeal_1-4,153,180,0	warp	ord14-5	1,1,ordeal_1-4,144,284
+ordeal_1-4,172,135,0	warp	ord14-6	1,1,ordeal_1-4,284,24
+ordeal_1-4,172,172,0	warp	ord14-7	1,1,ordeal_1-4,284,284
+ordeal_1-4,180,154,0	warp	ord14-8	1,1,ordeal_1-4,284,164
+ordeal_2-1,100,150,0	warp	ord21-1	1,1,ordeal_2-1,128,150
+ordeal_2-1,123,150,0	warp	ord21-2	1,1,ordeal_2-1,95,150
+ordeal_2-1,114,183,0	warp	ord21-3	1,1,ordeal_2-1,135,163
+ordeal_2-1,130,168,0	warp	ord21-4	1,1,ordeal_2-1,109,188
+ordeal_2-1,115,115,0	warp	ord21-5	1,1,ordeal_2-1,136,136
+ordeal_2-1,131,131,0	warp	ord21-6	1,1,ordeal_2-1,110,110
+ordeal_2-1,148,176,0	warp	ord21-7	1,1,ordeal_2-1,149,204
+ordeal_2-1,149,199,0	warp	ord21-8	1,1,ordeal_2-1,148,171
+ordeal_2-1,149,99,0	warp	ord21-9	1,1,ordeal_2-1,151,129
+ordeal_2-1,151,124,0	warp	ord21-10	1,1,ordeal_2-1,151,94
+ordeal_2-1,168,168,0	warp	ord21-11	1,1,ordeal_2-1,189,189
+ordeal_2-1,184,184,0	warp	ord21-12	1,1,ordeal_2-1,163,163
+ordeal_2-1,169,131,0	warp	ord21-13	1,1,ordeal_2-1,188,111
+ordeal_2-1,183,116,0	warp	ord21-14	1,1,ordeal_2-1,164,136
+ordeal_2-1,176,150,0	warp	ord21-15	1,1,ordeal_2-1,204,150
+ordeal_2-1,199,150,0	warp	ord21-16	1,1,ordeal_2-1,171,150
+ordeal_2-2,128,154,0	warp	ord22-1	1,1,ordeal_2-2,24,154
+ordeal_2-2,136,136,0	warp	ord22-2	1,1,ordeal_2-2,24,24
+ordeal_2-2,136,172,0	warp	ord22-3	1,1,ordeal_2-2,24,284
+ordeal_2-2,153,128,0	warp	ord22-4	1,1,ordeal_2-2,153,23
+ordeal_2-2,153,180,0	warp	ord22-5	1,1,ordeal_2-2,144,284
+ordeal_2-2,172,135,0	warp	ord22-6	1,1,ordeal_2-2,284,24
+ordeal_2-2,172,172,0	warp	ord22-7	1,1,ordeal_2-2,284,284
+ordeal_2-2,180,154,0	warp	ord22-8	1,1,ordeal_2-2,284,164
+ordeal_2-3,100,150,0	warp	ord23-1	1,1,ordeal_2-3,128,150
+ordeal_2-3,114,183,0	warp	ord23-2	1,1,ordeal_2-3,135,163
+ordeal_2-3,115,115,0	warp	ord23-3	1,1,ordeal_2-3,136,136
+ordeal_2-3,123,150,0	warp	ord23-4	1,1,ordeal_2-3,95,150
+ordeal_2-3,130,168,0	warp	ord23-5	1,1,ordeal_2-3,109,188
+ordeal_2-3,131,131,0	warp	ord23-6	1,1,ordeal_2-3,110,110
+ordeal_2-3,148,176,0	warp	ord23-7	1,1,ordeal_2-3,149,204
+ordeal_2-3,149,99,0	warp	ord23-8	1,1,ordeal_2-3,151,129
+ordeal_2-3,149,199,0	warp	ord23-9	1,1,ordeal_2-3,148,171
+ordeal_2-3,151,124,0	warp	ord23-10	1,1,ordeal_2-3,151,94
+ordeal_2-3,168,168,0	warp	ord23-11	1,1,ordeal_2-3,189,189
+ordeal_2-3,169,131,0	warp	ord23-12	1,1,ordeal_2-3,188,111
+ordeal_2-3,176,150,0	warp	ord23-13	1,1,ordeal_2-3,204,150
+ordeal_2-3,183,116,0	warp	ord23-14	1,1,ordeal_2-3,164,136
+ordeal_2-3,184,184,0	warp	ord23-15	1,1,ordeal_2-3,163,163
+ordeal_2-3,199,150,0	warp	ord23-16	1,1,ordeal_2-3,171,150
+ordeal_2-4,128,154,0	warp	ord24-1	1,1,ordeal_2-4,24,154
+ordeal_2-4,136,136,0	warp	ord24-2	1,1,ordeal_2-4,24,24
+ordeal_2-4,136,172,0	warp	ord24-3	1,1,ordeal_2-4,24,284
+ordeal_2-4,153,128,0	warp	ord24-4	1,1,ordeal_2-4,153,23
+ordeal_2-4,153,180,0	warp	ord24-5	1,1,ordeal_2-4,144,284
+ordeal_2-4,172,135,0	warp	ord24-6	1,1,ordeal_2-4,284,24
+ordeal_2-4,172,172,0	warp	ord24-7	1,1,ordeal_2-4,284,284
+ordeal_2-4,180,154,0	warp	ord24-8	1,1,ordeal_2-4,284,164
+ordeal_3-1,100,150,0	warp	ord31-1	1,1,ordeal_3-1,128,150
+ordeal_3-1,123,150,0	warp	ord31-2	1,1,ordeal_3-1,95,150
+ordeal_3-1,114,183,0	warp	ord31-3	1,1,ordeal_3-1,135,163
+ordeal_3-1,130,168,0	warp	ord31-4	1,1,ordeal_3-1,109,188
+ordeal_3-1,115,115,0	warp	ord31-5	1,1,ordeal_3-1,136,136
+ordeal_3-1,131,131,0	warp	ord31-6	1,1,ordeal_3-1,110,110
+ordeal_3-1,148,176,0	warp	ord31-7	1,1,ordeal_3-1,149,204
+ordeal_3-1,149,199,0	warp	ord31-8	1,1,ordeal_3-1,148,171
+ordeal_3-1,149,99,0	warp	ord31-9	1,1,ordeal_3-1,151,129
+ordeal_3-1,151,124,0	warp	ord31-10	1,1,ordeal_3-1,151,94
+ordeal_3-1,168,168,0	warp	ord31-11	1,1,ordeal_3-1,189,189
+ordeal_3-1,184,184,0	warp	ord31-12	1,1,ordeal_3-1,163,163
+ordeal_3-1,169,131,0	warp	ord31-13	1,1,ordeal_3-1,188,111
+ordeal_3-1,183,116,0	warp	ord31-14	1,1,ordeal_3-1,164,136
+ordeal_3-1,176,150,0	warp	ord31-15	1,1,ordeal_3-1,204,150
+ordeal_3-1,199,150,0	warp	ord31-16	1,1,ordeal_3-1,171,150
+ordeal_3-2,128,154,0	warp	ord32-1	1,1,ordeal_3-2,24,154
+ordeal_3-2,136,136,0	warp	ord32-2	1,1,ordeal_3-2,24,24
+ordeal_3-2,136,172,0	warp	ord32-3	1,1,ordeal_3-2,24,284
+ordeal_3-2,153,128,0	warp	ord32-4	1,1,ordeal_3-2,153,23
+ordeal_3-2,153,180,0	warp	ord32-5	1,1,ordeal_3-2,144,284
+ordeal_3-2,172,135,0	warp	ord32-6	1,1,ordeal_3-2,284,24
+ordeal_3-2,172,172,0	warp	ord32-7	1,1,ordeal_3-2,284,284
+ordeal_3-2,180,154,0	warp	ord32-8	1,1,ordeal_3-2,284,164
+ordeal_3-3,100,150,0	warp	ord33-1	1,1,ordeal_3-3,128,150
+ordeal_3-3,114,183,0	warp	ord33-2	1,1,ordeal_3-3,135,163
+ordeal_3-3,115,115,0	warp	ord33-3	1,1,ordeal_3-3,136,136
+ordeal_3-3,123,150,0	warp	ord33-4	1,1,ordeal_3-3,95,150
+ordeal_3-3,130,168,0	warp	ord33-5	1,1,ordeal_3-3,109,188
+ordeal_3-3,131,131,0	warp	ord33-6	1,1,ordeal_3-3,110,110
+ordeal_3-3,148,176,0	warp	ord33-7	1,1,ordeal_3-3,149,204
+ordeal_3-3,149,99,0	warp	ord33-8	1,1,ordeal_3-3,151,129
+ordeal_3-3,149,199,0	warp	ord33-9	1,1,ordeal_3-3,148,171
+ordeal_3-3,151,124,0	warp	ord33-10	1,1,ordeal_3-3,151,94
+ordeal_3-3,168,168,0	warp	ord33-11	1,1,ordeal_3-3,189,189
+ordeal_3-3,169,131,0	warp	ord33-12	1,1,ordeal_3-3,188,111
+ordeal_3-3,176,150,0	warp	ord33-13	1,1,ordeal_3-3,204,150
+ordeal_3-3,183,116,0	warp	ord33-14	1,1,ordeal_3-3,164,136
+ordeal_3-3,184,184,0	warp	ord33-15	1,1,ordeal_3-3,163,163
+ordeal_3-3,199,150,0	warp	ord33-16	1,1,ordeal_3-3,171,150
+ordeal_3-4,128,154,0	warp	ord34-1	1,1,ordeal_3-4,24,154
+ordeal_3-4,136,136,0	warp	ord34-2	1,1,ordeal_3-4,24,24
+ordeal_3-4,136,172,0	warp	ord34-3	1,1,ordeal_3-4,24,284
+ordeal_3-4,153,128,0	warp	ord34-4	1,1,ordeal_3-4,153,23
+ordeal_3-4,153,180,0	warp	ord34-5	1,1,ordeal_3-4,144,284
+ordeal_3-4,172,135,0	warp	ord34-6	1,1,ordeal_3-4,284,24
+ordeal_3-4,172,172,0	warp	ord34-7	1,1,ordeal_3-4,284,284
+ordeal_3-4,180,154,0	warp	ord34-8	1,1,ordeal_3-4,284,164
+//This map doesn't even exists. Is it ordeal_a02 or ordea_la00?
+//ordeal_a04,128,154,0	warp	orda1	0,0,ordeal_a04,24,154
+//ordeal_a04,136,136,0	warp	orda2	0,0,ordeal_a04,24,24
+//ordeal_a04,136,172,0	warp	orda3	0,0,ordeal_a04,24,284
+//ordeal_a04,153,128,0	warp	orda4	0,0,ordeal_a04,153,23
+//ordeal_a04,153,180,0	warp	orda5	0,0,ordeal_a04,144,284
+//ordeal_a04,172,135,0	warp	orda6	0,0,ordeal_a04,284,24
+//ordeal_a04,172,172,0	warp	orda7	0,0,ordeal_a04,284,284
+//ordeal_a04,180,154,0	warp	orda8	0,0,ordeal_a04,284,164
+
+// PvP Nightmare More warps
+pvp_n_8-4,33,122,0	warp	Link#pt_link_1-11	0,2,pvp_n_8-4,0,0
+pvp_n_8-4,62,84,0	warp	Link#pt_link_1-12	1,1,pvp_n_8-4,0,0
+pvp_n_8-4,49,71,0	warp	Link#pt_link_1-21	1,1,pvp_n_8-4,0,0
+pvp_n_8-4,56,166,0	warp	Link#pt_link_1-22	1,1,pvp_n_8-4,0,0
+pvp_n_8-4,99,180,0	warp	Link#pt_link_1-31	2,1,pvp_n_8-4,0,0
+pvp_n_8-4,137,84,0	warp	Link#pt_link_1-32	1,1,pvp_n_8-4,0,0
+pvp_n_8-4,150,71,0	warp	Link#pt_link_1-41	1,1,pvp_n_8-4,0,0
+pvp_n_8-4,144,166,0	warp	Link#pt_link_1-42	1,1,pvp_n_8-4,0,0
+// Invalid Warp
+//pvp_n_8-5,30,30,0	warp	 a	3,3,pvp_n_8-5,100,100
+