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

7 files changed, 27 insertions, 20 deletions

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