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

4 files changed, 17 insertions, 13 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 ==========================================