30 files changed, 200 insertions, 150 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index f019a2f8c..df0109ffb 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,9 @@
 Date		Added
 ======
 2007/11/16
+	* Rev. 11742 Renamed several dungeon warp scripts [L0ne_W0lf]
+	  to match their map names, split up a couple files as well.
+	* Moved Ninja and Gunslinger warps to the proper file.
 	* Rev. 11740 Fixes bugreport:417 and bugreport:418 [L0ne_W0lf]
 	* Really fixed bugreport:407 [ultramage]
 2007/11/15
diff --git a/npc/scripts_warps.conf b/npc/scripts_warps.conf
index 64ccd79d0..90ca20906 100644
--- a/npc/scripts_warps.conf
+++ b/npc/scripts_warps.conf
@@ -42,36 +42,39 @@ npc: npc/warps/cities/veins.txt
 npc: npc/warps/cities/yggdrasil.txt
 npc: npc/warps/cities/yuno.txt
 // -------------------------- Dungeons --------------------------
-npc: npc/warps/dungeons/abbey_dun.txt
+npc: npc/warps/dungeons/abbey.txt
 npc: npc/warps/dungeons/abyss.txt
-npc: npc/warps/dungeons/alberta_duns.txt
-npc: npc/warps/dungeons/alde_ct.txt
-npc: npc/warps/dungeons/amatsu_dun.txt
-npc: npc/warps/dungeons/ant_hell.txt
+npc: npc/warps/dungeons/alde_dun.txt
+npc: npc/warps/dungeons/ama_dun.txt
+npc: npc/warps/dungeons/anthell.txt
 npc: npc/warps/dungeons/ayo_dun.txt
-npc: npc/warps/dungeons/coal_mine.txt
-npc: npc/warps/dungeons/com_dun.txt
+npc: npc/warps/dungeons/beach_dun.txt
+npc: npc/warps/dungeons/c_tower.txt
 npc: npc/warps/dungeons/ein_dun.txt
-npc: npc/warps/dungeons/geffen_dun.txt
+npc: npc/warps/dungeons/gef_dun.txt
 npc: npc/warps/dungeons/gon_dun.txt
 npc: npc/warps/dungeons/ice_dun.txt
-npc: npc/warps/dungeons/izlude_dun.txt
+npc: npc/warps/dungeons/in_sphinx.txt
+npc: npc/warps/dungeons/iz_dun.txt
 npc: npc/warps/dungeons/juperos.txt
-npc: npc/warps/dungeons/kiel_dun.txt
-npc: npc/warps/dungeons/lhalzen_dun.txt
-npc: npc/warps/dungeons/louyang_dun.txt
-npc: npc/warps/dungeons/lutie_dun.txt
-npc: npc/warps/dungeons/morroc_duns.txt
+npc: npc/warps/dungeons/kh_dun.txt
+npc: npc/warps/dungeons/lhz_dun.txt
+npc: npc/warps/dungeons/lou_dun.txt
+npc: npc/warps/dungeons/mag_dun.txt
+npc: npc/warps/dungeons/mjo_dun.txt
+npc: npc/warps/dungeons/moc_pryd.txt
 npc: npc/warps/dungeons/mosk_dun.txt
 npc: npc/warps/dungeons/odin.txt
-npc: npc/warps/dungeons/orc_dun.txt
-npc: npc/warps/dungeons/payon_dun.txt
-npc: npc/warps/dungeons/prt_dun.txt
-npc: npc/warps/dungeons/rachel_dun.txt
-npc: npc/warps/dungeons/thana_dun.txt
-npc: npc/warps/dungeons/thor_dun.txt
-npc: npc/warps/dungeons/umbala_dun.txt
-npc: npc/warps/dungeons/yuno_dun.txt
+npc: npc/warps/dungeons/orcsdun.txt
+npc: npc/warps/dungeons/pay_dun.txt
+npc: npc/warps/dungeons/prt_maze.txt
+npc: npc/warps/dungeons/ra_san.txt
+npc: npc/warps/dungeons/tha_t.txt
+npc: npc/warps/dungeons/thor_v.txt
+npc: npc/warps/dungeons/treasure.txt
+npc: npc/warps/dungeons/tur_dun.txt
+npc: npc/warps/dungeons/um_dun.txt
+npc: npc/warps/dungeons/xmas_dun.txt
 // --------------------------- Fields ---------------------------
 npc: npc/warps/fields/abyss_warper.txt
 npc: npc/warps/fields/amatsu_fild.txt
diff --git a/npc/warps/cities/amatsu.txt b/npc/warps/cities/amatsu.txt
index e995c8636..6a90860a6 100644
--- a/npc/warps/cities/amatsu.txt
+++ b/npc/warps/cities/amatsu.txt
@@ -4,7 +4,7 @@
 //= Athena (1.0)
 //= Nana (1.1)
 //===== Current Version: =====================================
-//= 1.5
+//= 1.6
 //===== Compatible With: =====================================
 //= Any Athena Version; RO Episode 6+
 //===== Description: =========================================
@@ -13,6 +13,7 @@
 //= 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 Movves Job Quest related warps to proper file. [L0ne_W0lf]
 //============================================================
 
 //= Amatsu ===================================================
@@ -45,14 +46,4 @@ amatsu,249,160,0	warp	warp1966	1,1,ama_in01,79,178
 amatsu,40,110,0	warp	warp1995	1,1,ama_in01,28,176
 amatsu,52,148,0	warp	warp1994	1,1,ama_in01,88,97
 amatsu,85,235,0	warp	warp1972	1,1,ama_in02,224,45
-//removed
-//amatsu,95,148,0	warp	warp1990	1,1,ama_in01,88,97
 amatsu,96,117,0	warp	warp1962	1,1,ama_in01,29,23
-
-//| Ninja quest warps
-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
diff --git a/npc/warps/cities/einbroch.txt b/npc/warps/cities/einbroch.txt
index 83ddec989..7518a4e65 100644
--- a/npc/warps/cities/einbroch.txt
+++ b/npc/warps/cities/einbroch.txt
@@ -103,14 +103,3 @@ 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
 
-//==========================================================================
-//Einbroch - Gunslinger Map Portion (Ninja's map is the same: que_ng)
-//==========================================================================
-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
-//This one seems to be wrong
-//einbroch,137,149,0	warp	gswarp7	1,1,que_ng,138,167
diff --git a/npc/warps/dungeons/abbey_dun.txt b/npc/warps/dungeons/abbey.txt
index 5ebef4d3a..5ebef4d3a 100644
--- a/npc/warps/dungeons/abbey_dun.txt
+++ b/npc/warps/dungeons/abbey.txt
diff --git a/npc/warps/dungeons/alde_dun.txt b/npc/warps/dungeons/alde_dun.txt
new file mode 100644
index 000000000..95ea751ce
--- /dev/null
+++ b/npc/warps/dungeons/alde_dun.txt
@@ -0,0 +1,80 @@
+//===== eAthena 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/warps/dungeons/amatsu_dun.txt b/npc/warps/dungeons/ama_dun.txt
index 68defa5e9..68defa5e9 100644
--- a/npc/warps/dungeons/amatsu_dun.txt
+++ b/npc/warps/dungeons/ama_dun.txt
diff --git a/npc/warps/dungeons/ant_hell.txt b/npc/warps/dungeons/anthell.txt
index dfc4e2a5c..dfc4e2a5c 100644
--- a/npc/warps/dungeons/ant_hell.txt
+++ b/npc/warps/dungeons/anthell.txt
diff --git a/npc/warps/dungeons/com_dun.txt b/npc/warps/dungeons/beach_dun.txt
index ba6e36989..ba6e36989 100644
--- a/npc/warps/dungeons/com_dun.txt
+++ b/npc/warps/dungeons/beach_dun.txt
diff --git a/npc/warps/dungeons/alde_ct.txt b/npc/warps/dungeons/c_tower.txt
index c4c44ec53..d6f849da1 100644
--- a/npc/warps/dungeons/alde_ct.txt
+++ b/npc/warps/dungeons/c_tower.txt
@@ -3,16 +3,13 @@
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
-//= 1.5
+//= 1.0
 //===== Compatible With: =====================================
 //= Any Athena Version; RO Episode 2+
 //===== Description: =========================================
 //= Warp Points for Clock Tower
 //===== 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.0 Split from combined warp file alberta_duns. [L0ne_W0lf]
 //============================================================
 
 //= Al De Baran Clock Tower
@@ -154,64 +151,3 @@ c_tower4,189,40,4	script	clt031r	45,2,2,{
 	w3:	warp "c_tower3",252,29; end;
 	w4:	warp "c_tower4",152,95; end;
 }
-//============================================================
-//============================================================
-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/warps/dungeons/geffen_dun.txt b/npc/warps/dungeons/gef_dun.txt
index 573032d0d..573032d0d 100644
--- a/npc/warps/dungeons/geffen_dun.txt
+++ b/npc/warps/dungeons/gef_dun.txt
diff --git a/npc/warps/dungeons/in_sphinx.txt b/npc/warps/dungeons/in_sphinx.txt
new file mode 100644
index 000000000..d403f45f2
--- /dev/null
+++ b/npc/warps/dungeons/in_sphinx.txt
@@ -0,0 +1,36 @@
+//===== eAthena 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/warps/dungeons/izlude_dun.txt b/npc/warps/dungeons/iz_dun.txt
index 199e35116..199e35116 100644
--- a/npc/warps/dungeons/izlude_dun.txt
+++ b/npc/warps/dungeons/iz_dun.txt
diff --git a/npc/warps/dungeons/kiel_dun.txt b/npc/warps/dungeons/kh_dun.txt
index ee2337871..ee2337871 100644
--- a/npc/warps/dungeons/kiel_dun.txt
+++ b/npc/warps/dungeons/kh_dun.txt
diff --git a/npc/warps/dungeons/lhalzen_dun.txt b/npc/warps/dungeons/lhz_dun.txt
index c91b04565..c91b04565 100644
--- a/npc/warps/dungeons/lhalzen_dun.txt
+++ b/npc/warps/dungeons/lhz_dun.txt
diff --git a/npc/warps/dungeons/louyang_dun.txt b/npc/warps/dungeons/lou_dun.txt
index 34462e45c..34462e45c 100644
--- a/npc/warps/dungeons/louyang_dun.txt
+++ b/npc/warps/dungeons/lou_dun.txt
diff --git a/npc/warps/dungeons/yuno_dun.txt b/npc/warps/dungeons/mag_dun.txt
index 2459241e2..2459241e2 100644
--- a/npc/warps/dungeons/yuno_dun.txt
+++ b/npc/warps/dungeons/mag_dun.txt
diff --git a/npc/warps/dungeons/coal_mine.txt b/npc/warps/dungeons/mjo_dun.txt
index 38d4f163d..38d4f163d 100644
--- a/npc/warps/dungeons/coal_mine.txt
+++ b/npc/warps/dungeons/mjo_dun.txt
diff --git a/npc/warps/dungeons/morroc_duns.txt b/npc/warps/dungeons/moc_pryd.txt
index c570d4a42..a8b8d2a35 100644
--- a/npc/warps/dungeons/morroc_duns.txt
+++ b/npc/warps/dungeons/moc_pryd.txt
@@ -1,40 +1,17 @@
 //===== eAthena Script =======================================
-//= Morroc Dungeons Warp Script
+//= Morroc Pyramid Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
-//= Warp Points for Morroc Dungeons
+//= Warp Points for Morroc Pyramid
 //===== Additional Comments: =================================
-//= No Comment!
+//= 1.1 Moved Sphinx warps to unique file. [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
-
 //= 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
diff --git a/npc/warps/dungeons/orc_dun.txt b/npc/warps/dungeons/orcsdun.txt
index debd6217c..debd6217c 100644
--- a/npc/warps/dungeons/orc_dun.txt
+++ b/npc/warps/dungeons/orcsdun.txt
diff --git a/npc/warps/dungeons/payon_dun.txt b/npc/warps/dungeons/pay_dun.txt
index fd9e196d4..fd9e196d4 100644
--- a/npc/warps/dungeons/payon_dun.txt
+++ b/npc/warps/dungeons/pay_dun.txt
diff --git a/npc/warps/dungeons/prt_dun.txt b/npc/warps/dungeons/prt_maze.txt
index fc038d31a..fc038d31a 100644
--- a/npc/warps/dungeons/prt_dun.txt
+++ b/npc/warps/dungeons/prt_maze.txt
diff --git a/npc/warps/dungeons/rachel_dun.txt b/npc/warps/dungeons/ra_san.txt
index 052f46529..052f46529 100644
--- a/npc/warps/dungeons/rachel_dun.txt
+++ b/npc/warps/dungeons/ra_san.txt
diff --git a/npc/warps/dungeons/thana_dun.txt b/npc/warps/dungeons/tha_t.txt
index 36f8ab8cd..36f8ab8cd 100644
--- a/npc/warps/dungeons/thana_dun.txt
+++ b/npc/warps/dungeons/tha_t.txt
diff --git a/npc/warps/dungeons/thor_dun.txt b/npc/warps/dungeons/thor_v.txt
index 97a7be547..97a7be547 100644
--- a/npc/warps/dungeons/thor_dun.txt
+++ b/npc/warps/dungeons/thor_v.txt
diff --git a/npc/warps/dungeons/alberta_duns.txt b/npc/warps/dungeons/treasure.txt
index 93d881914..217cd39c6 100644
--- a/npc/warps/dungeons/alberta_duns.txt
+++ b/npc/warps/dungeons/treasure.txt
@@ -1,15 +1,16 @@
 //==== eAthena Script ========================================
-//= Alberta Field's Script
+//= Treasure Island warp Script
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
-//= Warp Points for Treasure Island & Turtle Island
+//= 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
@@ -46,13 +47,3 @@ 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
-
-//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/warps/dungeons/tur_dun.txt b/npc/warps/dungeons/tur_dun.txt
new file mode 100644
index 000000000..f822cf6cc
--- /dev/null
+++ b/npc/warps/dungeons/tur_dun.txt
@@ -0,0 +1,23 @@
+//==== eAthena 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/warps/dungeons/umbala_dun.txt b/npc/warps/dungeons/um_dun.txt
index e786b7a0e..e786b7a0e 100644
--- a/npc/warps/dungeons/umbala_dun.txt
+++ b/npc/warps/dungeons/um_dun.txt
diff --git a/npc/warps/dungeons/lutie_dun.txt b/npc/warps/dungeons/xmas_dun.txt
index ff14558bb..ff14558bb 100644
--- a/npc/warps/dungeons/lutie_dun.txt
+++ b/npc/warps/dungeons/xmas_dun.txt
diff --git a/npc/warps/other/jobquests.txt b/npc/warps/other/jobquests.txt
index 395a881b2..db30f3bd6 100644
--- a/npc/warps/other/jobquests.txt
+++ b/npc/warps/other/jobquests.txt
@@ -21,6 +21,7 @@
 //= 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 Jungslinger and NInja warps. [L0ne_W0lf]
 //============================================================
 
 
@@ -101,3 +102,23 @@ 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