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

10 files changed, 552 insertions, 0 deletions

diff --git a/npc/re/warps/other/airplane.txt b/npc/re/warps/other/airplane.txt
new file mode 100644
index 000000000..83afc6893
--- /dev/null
+++ b/npc/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/re/warps/other/arena.txt b/npc/re/warps/other/arena.txt
new file mode 100644
index 000000000..f0bb7e8df
--- /dev/null
+++ b/npc/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/re/warps/other/bossnia.txt b/npc/re/warps/other/bossnia.txt
new file mode 100644
index 000000000..28cfda019
--- /dev/null
+++ b/npc/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/re/warps/other/god.txt b/npc/re/warps/other/god.txt
new file mode 100644
index 000000000..f649b7e57
--- /dev/null
+++ b/npc/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/re/warps/other/jobquests.txt b/npc/re/warps/other/jobquests.txt
new file mode 100644
index 000000000..fc922f819
--- /dev/null
+++ b/npc/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/re/warps/other/kiel.txt b/npc/re/warps/other/kiel.txt
new file mode 100644
index 000000000..76df1b28f
--- /dev/null
+++ b/npc/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/re/warps/other/other.txt b/npc/re/warps/other/other.txt
new file mode 100644
index 000000000..011494794
--- /dev/null
+++ b/npc/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/re/warps/other/paradise.txt b/npc/re/warps/other/paradise.txt
new file mode 100644
index 000000000..fec766ec4
--- /dev/null
+++ b/npc/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/re/warps/other/s_workshop.txt b/npc/re/warps/other/s_workshop.txt
new file mode 100644
index 000000000..884d77202
--- /dev/null
+++ b/npc/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/re/warps/other/sign.txt b/npc/re/warps/other/sign.txt
new file mode 100644
index 000000000..b4e3d370c
--- /dev/null
+++ b/npc/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