14 files changed, 921 insertions, 0 deletions
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/rachel.txt b/npc/pre-re/warps/cities/rachel.txt
new file mode 100644
index 000000000..f5497f3ac
--- /dev/null
+++ b/npc/pre-re/warps/cities/rachel.txt
@@ -0,0 +1,125 @@
+//===== rAthena Script =======================================
+//= Rachel Warp Script
+//===== By: ==================================================
+//= erKURITA & RockmanEXE
+//===== Current Version: =====================================
+//= 1.4
+//===== 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] 
+//============================================================
+
+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/yggdrasil.txt b/npc/pre-re/warps/cities/yggdrasil.txt
new file mode 100644
index 000000000..bd4a74996
--- /dev/null
+++ b/npc/pre-re/warps/cities/yggdrasil.txt
@@ -0,0 +1,25 @@
+//===== 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 Moved Umbala warp to this file.
+//============================================================
+
+//Umbala Entrance
+umbala,106,285,0	warp	um_dun1-1	1,1,um_dun01,42,30
+um_dun02,125,163,0	warp	nwarp1	1,1,yggdrasil01,40,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/fields/com_fild.txt b/npc/pre-re/warps/fields/com_fild.txt
new file mode 100644
index 000000000..a28eace85
--- /dev/null
+++ b/npc/pre-re/warps/fields/com_fild.txt
@@ -0,0 +1,50 @@
+//===== rAthena Script =======================================
+//= Comodo Field Warp Script
+//===== By: ==================================================
+//= Nana
+//===== Current Version: =====================================
+//= 1.1
+//===== 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]
+//============================================================
+
+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/geffen_fild.txt b/npc/pre-re/warps/fields/geffen_fild.txt
new file mode 100644
index 000000000..fd4350fe6
--- /dev/null
+++ b/npc/pre-re/warps/fields/geffen_fild.txt
@@ -0,0 +1,72 @@
+//===== rAthena Script =======================================
+//= Geffen Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Geffen Field's
+//===== Additional Comments: =================================
+//= No comment!
+//============================================================
+
+//= 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/hugel_fild.txt b/npc/pre-re/warps/fields/hugel_fild.txt
new file mode 100644
index 000000000..c86980a98
--- /dev/null
+++ b/npc/pre-re/warps/fields/hugel_fild.txt
@@ -0,0 +1,47 @@
+//===== rAthena Script =======================================
+//= Hugel Field Warp Script
+//===== By: ==================================================
+//= Sara-chan (1.0)
+//===== Current Version: =====================================
+//= 1.2
+//===== 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]
+//============================================================
+
+//= 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
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..cce5d0b3d
--- /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/payon_fild.txt b/npc/pre-re/warps/fields/payon_fild.txt
new file mode 100644
index 000000000..07c7bcd4f
--- /dev/null
+++ b/npc/pre-re/warps/fields/payon_fild.txt
@@ -0,0 +1,49 @@
+//===== rAthena Script ======================================= 
+//= Payon Field Warps
+//===== By: ================================================== 
+//= Nana (1.0)
+//===== Current Version: ===================================== 
+//= 1.2
+//===== 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]
+//============================================================ 
+
+//= 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..677da8c5f
--- /dev/null
+++ b/npc/pre-re/warps/fields/prontera_fild.txt
@@ -0,0 +1,105 @@
+//===== eAthena 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..78a24465e
--- /dev/null
+++ b/npc/pre-re/warps/fields/rachel_fild.txt
@@ -0,0 +1,47 @@
+//===== rAthena Script =======================================
+//= Rachel Field Warp Script
+//===== By: ==================================================
+//= Playtester
+//===== Current Version: =====================================
+//= 1.2
+//===== 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]
+//============================================================
+
+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/veins_fild.txt b/npc/pre-re/warps/fields/veins_fild.txt
new file mode 100644
index 000000000..9664f1707
--- /dev/null
+++ b/npc/pre-re/warps/fields/veins_fild.txt
@@ -0,0 +1,49 @@
+//===== rAthena Script =======================================
+//= Veins Field Warp Script
+//===== By: ==================================================
+//= $ephiroth
+//===== Current Version: =====================================
+//= 1.4
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Veins Field
+//===== Additional Comments: =================================
+//= 1.4 Rescripted to Aegis 11.2 Standards. [L0ne_W0lf]
+//============================================================
+
+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
+
+//============================================================ 
+// 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..e78fbb3dc
--- /dev/null
+++ b/npc/pre-re/warps/fields/yuno_fild.txt
@@ -0,0 +1,89 @@
+//===== rAthena Script =======================================
+//= Yuno Field Warp Script
+//===== By: ==================================================
+//= Nana (1.0), Sara
+//===== Current Version: =====================================
+//= 1.2
+//===== 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
+//============================================================
+
+//= 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,372,325,0	warp	hu001	1,1,yuno_fild06,42,319
+yuno_fild06,40,319,0	warp	hu001a	1,1,yuno_fild05,370,325
+yuno_fild06,217,27,0	warp	hu002	1,1,yuno_fild03,214,381
+yuno_fild03,214,383,0	warp	hu002a	1,1,yuno_fild06,217,29
+yuno_fild06,369,136,0	warp	hu003	1,1,hu_fild04,28,126
+hu_fild04,26,126,0	warp	hu003a	1,1,yuno_fild06,367,136
+hu_fild04,121,26,0	warp	hu004	1,1,yuno_fild02,118,374
+yuno_fild02,118,376,0	warp	hu004a	1,1,hu_fild04,121,28
+yuno_fild06,149,369,0	warp	hu005	1,1,hu_fild01,139,37
+hu_fild01,139,35,0	warp	hu005a	1,1,yuno_fild06,151,369
+hu_fild04,381,187,0	warp	hu006	1,1,hu_fild05,34,202
+hu_fild05,32,202,0	warp	hu006a	1,1,hu_fild04,379,187
+hu_fild05,91,42,0	warp	hu007	1,1,hu_fild07,80,369
+hu_fild07,80,371,0	warp	hu007a	1,1,hu_fild05,91,44
+hu_fild07,35,351,0	warp	hu008	1,1,yuno_fild02,384,338
+yuno_fild02,384,340,0	warp	hu008a	1,1,hu_fild07,37,351
+hu_fild07,56,36,0	warp	hu009	1,1,yuno_fild09,47,375
+yuno_fild09,47,377,0	warp	hu009a	1,1,hu_fild07,56,38
+hu_fild07,226,36,0	warp	hu010	1,1,yuno_fild09,220,372
+yuno_fild09,220,374,0	warp	hu010a	1,1,hu_fild07,226,38
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/sign.txt b/npc/pre-re/warps/other/sign.txt
new file mode 100644
index 000000000..5a18a99e8
--- /dev/null
+++ b/npc/pre-re/warps/other/sign.txt
@@ -0,0 +1,38 @@
+//===== 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 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
+
+um_dun01,132,91,0	warp	sign06	1,1,um_in,15,20
+um_in,11,18,0	warp	sign06a	1,1,um_dun01,129,90
+
+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