summaryrefslogtreecommitdiff
path: root/npc/warps
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-10-18 22:04:47 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-10-18 22:04:47 +0000
commitac9ba3147b30c5af55884c135e552d61bcc042c3 (patch)
tree084bcd78d368145c49a180318db901a935998c00 /npc/warps
parentf26dbc30528f8627310fa03f46cefd940ee40588 (diff)
downloadhercules-ac9ba3147b30c5af55884c135e552d61bcc042c3.tar.gz
hercules-ac9ba3147b30c5af55884c135e552d61bcc042c3.tar.bz2
hercules-ac9ba3147b30c5af55884c135e552d61bcc042c3.tar.xz
hercules-ac9ba3147b30c5af55884c135e552d61bcc042c3.zip
Uncommented the ShowWarning and ShowDebug from rev. 11508, and cleaned up the warnings it produced.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11516 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/warps')
-rw-r--r--npc/warps/cities/amatsu.txt7
-rw-r--r--npc/warps/cities/nameless.txt5
-rw-r--r--npc/warps/cities/niflheim.txt11
-rw-r--r--npc/warps/cities/prontera.txt7
-rw-r--r--npc/warps/dungeons/alde_ct.txt7
-rw-r--r--npc/warps/dungeons/umbala_dun.txt8
-rw-r--r--npc/warps/fields/abyss_warper.txt7
-rw-r--r--npc/warps/fields/glastheim.txt7
-rw-r--r--npc/warps/fields/hugel_fild.txt7
-rw-r--r--npc/warps/fields/lhalzen_fild.txt9
-rw-r--r--npc/warps/fields/morroc_fild.txt5
-rw-r--r--npc/warps/fields/mtmjolnir.txt5
-rw-r--r--npc/warps/fields/rachel_fild.txt7
-rw-r--r--npc/warps/other/jobquests.txt7
14 files changed, 56 insertions, 43 deletions
diff --git a/npc/warps/cities/amatsu.txt b/npc/warps/cities/amatsu.txt
index 0a8858978..e995c8636 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.4
+//= 1.5
//===== Compatible With: =====================================
//= Any Athena Version; RO Episode 6+
//===== Description: =========================================
@@ -12,6 +12,7 @@
//===== Additional Comments: =================================
//= 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]
//============================================================
//= Amatsu ===================================================
@@ -27,10 +28,10 @@ ama_in01,77,177,0 warp warp1967 1,1,amatsu,246,160
ama_in01,86,23,0 warp warp2009 1,1,amatsu,129,117
ama_in01,88,94,0 warp warp2008 1,1,amatsu,52,145
ama_in02,127,163,0 warp warp1980 1,1,ama_in02,220,161
-ama_in02,195,44,0 warp warp1973 1,1,ama_in02,65,40
+ama_in02,195,44,0 warp warp1973a 1,1,ama_in02,65,40
ama_in02,215,150,0 warp warp1978 1,1,ama_in02,59,156
ama_in02,222,161,0 warp warp1979 1,1,ama_in02,130,163
-ama_in02,227,45,0 warp warp1973 1,1,amatsu,88,235
+ama_in02,227,45,0 warp warp1973b 1,1,amatsu,88,235
ama_in02,56,44,0 warp warp1975 1,1,ama_in02,59,144
ama_in02,59,142,0 warp warp1976 1,1,ama_in02,56,41
ama_in02,59,159,0 warp warp1977 1,1,ama_in02,215,152
diff --git a/npc/warps/cities/nameless.txt b/npc/warps/cities/nameless.txt
index d9590aaa5..d57c697b4 100644
--- a/npc/warps/cities/nameless.txt
+++ b/npc/warps/cities/nameless.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= $ephiroth
//===== Current Version: =====================================
-//= 1.1
+//= 1.2
//===== Compatible With: =====================================
//= Any Athena Version
//===== Description: =========================================
@@ -11,6 +11,7 @@
//===== Additional Comments: =================================
//= 1.0 Initial version [$ephiroth]
//= 1.1 Added SinSloth's warper to this file [Playtester]
+//= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
//============================================================
nameless_n,157,184,0 warp namelesswarp0401 1,1,abbey01,51,12
@@ -23,7 +24,7 @@ nameless_in,12,169,0 warp namelesswarp1006 1,1,nameless_i,82,256
nameless_i,78,94,0 warp namelesswarp1007 1,1,nameless_in,96,180
nameless_in,96,177,0 warp namelesswarp1008 1,1,nameless_i,81,96
-ve_fild07,128,131,3 script Desert Coast Man 943,{
+ve_fild07,128,131,3 script Desert Coast Man#na 943,{
mes "[Desert Coast Sailor]";
mes "Hey you! Yes, you!";
diff --git a/npc/warps/cities/niflheim.txt b/npc/warps/cities/niflheim.txt
index 58824938f..61dffb504 100644
--- a/npc/warps/cities/niflheim.txt
+++ b/npc/warps/cities/niflheim.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= PKGINGO (1.0)
//===== Current Version: =====================================
-//= 1.1
+//= 1.2
//===== Compatible With: =====================================
//= Any Athena Version; RO Episode 6+
//===== Description: =========================================
@@ -12,6 +12,7 @@
//= Extracted from Vidar -> Athena
//= V1.1: Added Inn and House warps needed for the Piano
//= Quest. [Skotlex
+//= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
//============================================================
//Niflheim Fields
@@ -31,12 +32,12 @@ niflheim,219,199,0 warp nwarp13 1,1,nif_in,136,14
nif_in,134,12,0 warp nwarp14 1,1,niflheim,218,197
//House
-niflheim,190,241,0 warp nwarp19 1,1,nif_in,81,77
-nif_in,78,74,0 warp nwarp20 1,1,niflheim,187,241
+niflheim,190,241,0 warp nwarp19a 1,1,nif_in,81,77
+nif_in,78,74,0 warp nwarp20a 1,1,niflheim,187,241
//Inn
-niflheim,189,211,0 warp nwarp21 1,1,nif_in,20,14
-nif_in,23,12,0 warp nwarp22 1,1,niflheim,189,207
+niflheim,189,211,0 warp nwarp21a 1,1,nif_in,20,14
+nif_in,23,12,0 warp nwarp22a 1,1,niflheim,189,207
nif_in,34,34,0 warp nwarp23 1,1,nif_in,88,31
nif_in,88,29,0 warp nwarp24 1,1,nif_in,34,31
diff --git a/npc/warps/cities/prontera.txt b/npc/warps/cities/prontera.txt
index eb1c1ff29..e22d27c39 100644
--- a/npc/warps/cities/prontera.txt
+++ b/npc/warps/cities/prontera.txt
@@ -4,7 +4,7 @@
//= Athena (1.0)
//= Nana (1.2)
//===== Current Version: =====================================
-//= 1.4
+//= 1.5
//===== Compatible With: =====================================
//= Any Athena Version
//===== Description: =========================================
@@ -12,6 +12,7 @@
//===== Additional Comments: =================================
//= 1.3 prt19 warp fix [shadow]
//= 1.4 Added warps for the sign quest [MasterOfMuppets]
+//= 1.5 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
//============================================================
//= Prontera City ============================================
@@ -60,11 +61,11 @@ prt_in,48,65,0 warp prt18-1 1,3,prt_in,34,65
prt_in,53,105,0 warp prt03-1 1,2,prontera,136,186
prt_in,60,77,0 warp prt06-1 2,1,prontera,175,188
prt_in,68,130,0 warp prt08-1 2,1,prontera,204,188
-prt_in,69,65,0 warp prt19 1,3,prt_in,84,65
+prt_in,69,65,0 warp prt19a 1,3,prt_in,84,65
prt_in,70,143,0 warp prt20 2,1,prt_in,70,165
prt_in,70,162,0 warp prt20-1 2,1,prt_in,70,140
prt_in,80,113,0 warp prt11-1 2,1,prontera,48,343
-prt_in,82,65,0 warp prt19 1,3,prt_in,66,65
+prt_in,82,65,0 warp prt19b 1,3,prt_in,66,65
prt_in,227,15,0 warp prt20-2 2,2,prontera,263,275
//= Prontera Church ==========================================
diff --git a/npc/warps/dungeons/alde_ct.txt b/npc/warps/dungeons/alde_ct.txt
index a8dcef359..c4c44ec53 100644
--- a/npc/warps/dungeons/alde_ct.txt
+++ b/npc/warps/dungeons/alde_ct.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Nana (1.0)
//===== Current Version: =====================================
-//= 1.4
+//= 1.5
//===== Compatible With: =====================================
//= Any Athena Version; RO Episode 2+
//===== Description: =========================================
@@ -12,6 +12,7 @@
//= 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]
//============================================================
//= Al De Baran Clock Tower
@@ -156,8 +157,8 @@ c_tower4,189,40,4 script clt031r 45,2,2,{
//============================================================
//============================================================
alde_dun01,292,306,0 warp aldd01 2,1,alde_dun02,43,24
-alde_dun01,167,158,0 warp ald002 2,2,c_tower2,148,283
-alde_dun01,302,25,0 warp ald003 2,2,c_tower1,125,22
+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
diff --git a/npc/warps/dungeons/umbala_dun.txt b/npc/warps/dungeons/umbala_dun.txt
index 9f3ce3000..e786b7a0e 100644
--- a/npc/warps/dungeons/umbala_dun.txt
+++ b/npc/warps/dungeons/umbala_dun.txt
@@ -3,13 +3,13 @@
//===== By: ==================================================
//= Darkchild (1.0vA); Athena (1.0vB)
//===== Current Version: =====================================
-//= 1.1 (Akaru)
+//= 1.2 (Akaru)
//===== Compatible With: =====================================
//= Any Athena Version; RO Episode 6+
//===== Description: =========================================
//= Warp Points for Umbala Dungeon (Yggdrasil Cave)
//===== Additional Comments: =================================
-//= No comment!
+//= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
//============================================================
//= Dungeon Level 1 ==========================================
@@ -26,8 +26,8 @@ um_dun02,216,77,0 warp umba0018 1,1,um_dun02,217,88
um_dun02,216,84,0 warp umba0017 1,1,um_dun02,214,74
um_dun02,222,259,0 warp umba0015 1,1,um_dun02,234,255
um_dun02,231,255,0 warp umba0016 1,1,um_dun02,219,260
-um_dun02,25,244,0 warp umba0022 1,1,um_dun02,35,251
+um_dun02,25,244,0 warp umba0022a 1,1,um_dun02,35,251
um_dun02,33,249,0 warp umba0021 1,1,um_dun02,23,242
-um_dun02,51,26,0 warp umba0022 1,1,um_dun01,153,201
+um_dun02,51,26,0 warp umba0022b 1,1,um_dun01,153,201
um_dun02,60,88,0 warp umba0023 1,1,um_dun02,66,77
um_dun02,63,80,0 warp umba0024 1,1,um_dun02,59,92
diff --git a/npc/warps/fields/abyss_warper.txt b/npc/warps/fields/abyss_warper.txt
index f927f8b22..d916d224a 100644
--- a/npc/warps/fields/abyss_warper.txt
+++ b/npc/warps/fields/abyss_warper.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= erKURITA
//===== Current Version: =====================================
-//= 1.3a
+//= 1.4
//===== Compatible With: =====================================
//= Any Athena Version
//===== Description: =========================================
@@ -14,9 +14,10 @@
//= 1.2 Fixed tab - missing pillar's appeared [Lupus]
//= 1.3 Updated Abyss Lake entrance based on official [SinSloth]
//= 1.3a Removed .GATs [Lupus]
+//= 1.4 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
//============================================================
-hu_fild05,168,304,0 script Column 111,{
+hu_fild05,168,304,0 script Column#abyss1 111,{
mes "^3355FFThere are 3 oddly";
mes "shaped grooves on";
@@ -85,7 +86,7 @@ hu_fild05,168,304,0 script Column 111,{
close;
}
-hu_fild05,171,211,0 script Column 111,1,1,{
+hu_fild05,171,211,0 script Column#abyss2 111,1,1,{
mes "^3355FFThis column looks";
mes "very similar to the";
diff --git a/npc/warps/fields/glastheim.txt b/npc/warps/fields/glastheim.txt
index adfcd9179..1564710da 100644
--- a/npc/warps/fields/glastheim.txt
+++ b/npc/warps/fields/glastheim.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Athena (1.0)
//===== Current Version: =====================================
-//= 1.3
+//= 1.4
//===== Compatible With: =====================================
//= Any Athena Version; RO Episode 2.x
//===== Description: =========================================
@@ -11,6 +11,7 @@
//===== Additional Comments: =================================
//= Split off npc_warp.txt, 1.1 added gl18-2 [Lupus]
//= optimized random warp [Lupus] fixed looped warps
+//= 1.4 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
//============================================================
//Glastheim
@@ -19,7 +20,7 @@ gl_cas01,135,40,0 warp gl01 1,1,gl_cas01,144,314
gl_cas01,149,314,0 warp gl02 1,1,gl_prison,14,70
gl_cas01,167,191,0 warp gl03 1,1,gl_prison,14,70
gl_cas01,185,236,0 warp gl06 1,1,gl_cas01,163,191
-gl_cas01,200,165,0 warp gl10 1,1,gl_cas02,104,25
+gl_cas01,200,165,0 warp gl10a 1,1,gl_cas02,104,25
gl_cas01,200,18,0 warp gl7-1 2,2,glast_01,200,294
gl_cas01,215,236,0 warp gl07 1,1,gl_cas01,238,192
gl_cas01,234,192,0 warp gl04 1,1,gl_prison,14,70
@@ -28,7 +29,7 @@ gl_cas01,372,39,0 warp gl08 1,1,gl_cas01,367,301
gl_cas02,104,15,0 warp gl10-1 1,1,gl_cas01,200,160
gl_cas02,104,193,0 warp gl8-1 1,1,glast_01,199,325
gl_church,156,4,0 warp gl9-1 1,1,glast_01,200,134
-gl_church,16,299,0 warp gl11 1,1,gl_chyard,147,284
+gl_church,16,299,0 warp gl11a 1,1,gl_chyard,147,284
gl_church,301,46,0 warp gl12 1,1,gl_chyard,147,15
gl_chyard,12,149,0 warp gl22 1,1,gl_sew02,29,270
gl_chyard,147,12,0 warp gl12-1 1,1,gl_church,295,46
diff --git a/npc/warps/fields/hugel_fild.txt b/npc/warps/fields/hugel_fild.txt
index 2b7053cca..d8d9d2e41 100644
--- a/npc/warps/fields/hugel_fild.txt
+++ b/npc/warps/fields/hugel_fild.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Sara-chan (1.0)
//===== Current Version: =====================================
-//= 1.1
+//= 1.2
//===== Compatible With: =====================================
//= Any Athena Version; RO Episode 10+
//===== Description: =========================================
@@ -11,6 +11,7 @@
//===== Additional Comments: =================================
//= Initial Release
//= 1.1 Official warps [Playtester]
+//= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
//============================================================
//= Hugel Field ==============================================
@@ -18,8 +19,8 @@ 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,yuno_fild04,38,280
-yuno_fild04,33,279,0 warp hugel003a 1,1,ein_fild02,350,250
+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
diff --git a/npc/warps/fields/lhalzen_fild.txt b/npc/warps/fields/lhalzen_fild.txt
index bf57ed914..aa2e87bbb 100644
--- a/npc/warps/fields/lhalzen_fild.txt
+++ b/npc/warps/fields/lhalzen_fild.txt
@@ -11,10 +11,11 @@
//===== Additional Comments: =================================
//= 1.1 Applied Poki#3's fix for lhz001 & lhz001a [DracoRPG]
//= 1.2 Updated the warp, according to korean eA site [Vicious]
+//= 1.3 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
//============================================================
-lhz_fild01,210,18,0 warp lhz043 1,1,lighthalzen,214,324
-lighthalzen,214,329,0 warp lhz043a 1,1,lhz_fild01,210,23
+lhz_fild01,210,18,0 warp lhz043-1 1,1,lighthalzen,214,324
+lighthalzen,214,329,0 warp lhz043a-1 1,1,lhz_fild01,210,23
-lhz_fild01,367,222,0 warp lhz044 1,1,lhz_fild02,36,221
-lhz_fild02,29,219,0 warp lhz044a 1,1,lhz_fild01,361,222
+lhz_fild01,367,222,0 warp lhz044-1 1,1,lhz_fild02,36,221
+lhz_fild02,29,219,0 warp lhz044a-1 1,1,lhz_fild01,361,222
diff --git a/npc/warps/fields/morroc_fild.txt b/npc/warps/fields/morroc_fild.txt
index 4d9fd13bc..8e36790a6 100644
--- a/npc/warps/fields/morroc_fild.txt
+++ b/npc/warps/fields/morroc_fild.txt
@@ -3,13 +3,14 @@
//===== By: ==================================================
//= Nana (1.0)
//===== Current Version: =====================================
-//= 1.1
+//= 1.2
//===== 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]
//============================================================
//= Sograt Dessert ===========================================
@@ -20,7 +21,7 @@ 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 moc007 3,2,prt_fild08,54,24
+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
diff --git a/npc/warps/fields/mtmjolnir.txt b/npc/warps/fields/mtmjolnir.txt
index 7523297cc..e95c0c97e 100644
--- a/npc/warps/fields/mtmjolnir.txt
+++ b/npc/warps/fields/mtmjolnir.txt
@@ -3,13 +3,14 @@
//===== By: ==================================================
//= Nana (1.0)
//===== Current Version: =====================================
-//= 1.1
+//= 1.2
//===== Compatible With: =====================================
//= Any Athena Version
//===== Description: =========================================
//= Warp Points for Mt. Mjolnir
//===== Additional Comments: =================================
//= 1.1 updating according to jA [Lupus]
+//= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
//============================================================
//= Mt. Mjolnir ==============================================
@@ -39,7 +40,7 @@ mjolnir_07,17,77,0 warp mjol11-1 2,4,mjolnir_06,380,74
mjolnir_07,214,383,0 warp mjol04-1 4,2,mjolnir_03,212,20
mjolnir_07,383,233,0 warp mjol12 2,4,mjolnir_08,33,234
mjolnir_07,383,362,0 warp mjol13 2,4,mjolnir_08,32,346
-mjolnir_08,159,373,0 warp mjol06 1,1,mjolnir_04,160,49
+mjolnir_08,159,373,0 warp mjol06a 1,1,mjolnir_04,160,49
mjolnir_08,185,28,0 warp mjol14 17,2,mjolnir_09,196,364
mjolnir_08,29,346,0 warp mjol13-1 2,4,mjolnir_07,380,362
mjolnir_08,30,234,0 warp mjol12-1 2,4,mjolnir_07,380,233
diff --git a/npc/warps/fields/rachel_fild.txt b/npc/warps/fields/rachel_fild.txt
index b61bff8eb..f53d21039 100644
--- a/npc/warps/fields/rachel_fild.txt
+++ b/npc/warps/fields/rachel_fild.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Playtester
//===== Current Version: =====================================
-//= 1.0
+//= 1.2
//===== Compatible With: =====================================
//= Any Athena Version
//===== Description: =========================================
@@ -11,6 +11,7 @@
//===== 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
@@ -38,8 +39,8 @@ 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 ra025 1,1,ra_fild07,215,32
-ra_fild07,215,27,0 warp ra025 1,1,ra_fild11,201,329
+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
diff --git a/npc/warps/other/jobquests.txt b/npc/warps/other/jobquests.txt
index 82d307fb0..395a881b2 100644
--- a/npc/warps/other/jobquests.txt
+++ b/npc/warps/other/jobquests.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Athena (1.0)
//===== Current Version: =====================================
-//= 1.7
+//= 1.8
//===== Compatible With: =====================================
//= Any Athena Version; RO Version Ep4+
//===== Description: =========================================
@@ -20,6 +20,7 @@
//= 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]
//============================================================
@@ -65,8 +66,8 @@ monk_test,298,127,0 warp monk20 1,1,monk_test,268,125
//==============================================================================
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,aldebaran,68,56
-alde_alche,42,171,0 warp alche#1 1,1,aldebaran,56,68
+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