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

5 files changed, 64 insertions, 60 deletions

diff --git a/npc/other/books.txt b/npc/other/books.txt
index 5d23944e8..302b2019f 100644
--- a/npc/other/books.txt
+++ b/npc/other/books.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= Eathena SVN
 //===== Description: =========================================
@@ -11,12 +11,13 @@
 //= Various Books found in Prontera Library
 //===== Additional Comments: =================================
 //= 1.0 First Version, rescripted to Aegis 10.3 standard. [L0ne_W0lf]
+//= 1.1 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //============================================================
 
 // Prontera
 //============================================================
 
-prt_in,168,56,4	script	Monster Encyclopedia#pront	111,{
+prt_in,168,56,4	script	Monster Encyclopedia#prt	111,{
 	mes "^FF0000[Monster Encyclopedia]^000000";
 	mes "This is a Monster Encyclopedia";
 	mes "containing information on Water,";
@@ -396,7 +397,7 @@ prt_in,168,56,4	script	Monster Encyclopedia#pront	111,{
 	}
 }
 				
-prt_in,159,56,4	script	Monster Encyclopedia#2pront	111,{
+prt_in,159,56,4	script	Monster Encyclopedia#2pr	111,{
 	mes "^FF0000[Monster Encyclopedia]^000000";
 	mes "This is a Monster Encyclopedia";
 	mes "containing information on Earth,";
@@ -875,7 +876,7 @@ prt_in,159,56,4	script	Monster Encyclopedia#2pront	111,{
 	}
 }
 
-prt_in,161,50,4	script	Monster Encyclopedia#3pront	 111,{
+prt_in,161,50,4	script	Monster Encyclopedia#3pr	 111,{
 	mes "^FF0000[Monster Encyclopedia]^000000";
 	mes "This is a Monster Encyclopedia";
 	mes "containing information on Dark,";
@@ -1243,7 +1244,7 @@ prt_in,161,50,4	script	Monster Encyclopedia#3pront	 111,{
 	}
 }
 
-prt_in,172,96,4	script	Monster Encyclopedia#4pront	111,{
+prt_in,172,96,4	script	Monster Encyclopedia#4pr	111,{
 	mes "^FF0000[Dungeon Monster Encyclopedia]^000000";
 	mes "This is an Encyclopedia describing";
 	mes "monsters living in Dungeons.";
@@ -1725,7 +1726,7 @@ prt_in,172,96,4	script	Monster Encyclopedia#4pront	111,{
 }
 
 
-prt_in,164,96,4	script	Monster Encyclopedia#5pront	111,{
+prt_in,164,96,4	script	Monster Encyclopedia#5pr	111,{
 	mes "^FF0000[Dungeon Monster Encyclopedia]^000000";
 	mes "This is an Encyclopedia describing";
 	mes "Monsters living in Dungeons.";
@@ -2303,7 +2304,7 @@ prt_in,164,96,4	script	Monster Encyclopedia#5pront	111,{
 	}
 }
 
-prt_in,172,102,4	script	Monster Encyclopedia#6pront	111,{
+prt_in,172,102,4	script	Monster Encyclopedia#6pr	111,{
 	mes "^FF0000[Dungeon Monster Encyclopedia]^000000";
 	mes "This is an Encyclopedia describing";
 	mes "Monsters living in Dungeons.";
@@ -2811,7 +2812,7 @@ prt_in,172,102,4	script	Monster Encyclopedia#6pront	111,{
 	}
 }
 
-prt_in,164,102,4	script	Monster Encyclopedia#7pront	111,{
+prt_in,164,102,4	script	Monster Encyclopedia#7pr	111,{
 	mes "^FF0000[Dungeon Monster Encyclopedia]^000000";
 	mes "This is an Encyclopedia describing";
 	mes "Monsters living in Dungeons.";
diff --git a/npc/other/comodo_gambling.txt b/npc/other/comodo_gambling.txt
index 3209c9224..155e21031 100644
--- a/npc/other/comodo_gambling.txt
+++ b/npc/other/comodo_gambling.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Reddozen, Cypress, Zefris
 //===== Current Version: =====================================
-//= 1.0
+//= 1.2
 //===== Compatible With: =====================================
 //= eAthena SVN 6769+ (temporary npc variables)
 //===== Description: =========================================
@@ -20,6 +20,7 @@
 //=      Added comments to items so people know what the NPC is about
 //=      Added missing emotions and cutins
 //= 1.1- Updated prizes according to 11.1 NPC [Paradox924X]
+//= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //============================================================ 
 
 comodo,219,160,3	script	Kachua	91,{
@@ -499,7 +500,7 @@ comodo,204,148,7	script	Devellin	90,{
 	close;
 }
 
-comodo,210,154,4	script	Suspicious Guy	118,{
+comodo,210,154,4	script	Suspicious Guy#cmd	118,{
 
 	if (BaseClass == Job_Thief) {
 	
diff --git a/npc/other/msg_boards.txt b/npc/other/msg_boards.txt
index ed414b16e..afa6ec819 100644
--- a/npc/other/msg_boards.txt
+++ b/npc/other/msg_boards.txt
@@ -4,7 +4,7 @@
 //= kobra_k88
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.4
+//= 1.5
 //===== Compatible With: ===================================== 
 //= [Aegis Conversion]
 //= eAthena 7.15 +
@@ -22,11 +22,12 @@
 //= 1.3 Removed Duplicates [Silent]
 //= 1.4 Rescripted to Aegis 10.3 standard. [L0ne_W0lf]
 //= 1.5 Removed a duplicate related to the Sign Quest. [SinSloth]
+//= 1.5 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //============================================================
 
 // Prontera
 //============================================================
-prontera,158,213,1	script	Sign Post#PrtSign1	111,{
+prontera,158,213,1	script	Sign Post#Prt1	111,{
 	mes "^993300- The Sign Post Reads -^000000";
 	mes "North to Prontera Castle";
 	mes "North to Al De Baran";
@@ -40,7 +41,7 @@ prontera,158,213,1	script	Sign Post#PrtSign1	111,{
 	close;
 }
 
-prontera,156,197,1	script	Prontera Bulletin#PrtSign2	111,{
+prontera,156,197,1	script	Prontera Bulletin#Prt2	111,{
 	mes "^993300- The Prontera Bulletin Reads -^000000";
 	mes "Wanted: Two Clip Accessories";
 	mes "Please contact...";
@@ -53,19 +54,19 @@ prontera,156,197,1	script	Prontera Bulletin#PrtSign2	111,{
 	close;
 }
 
-prontera,278,212,1	script	Sign#PrtSign3	111,{
+prontera,278,212,1	script	Sign#Prt3	111,{
 	mes "^993300- The Sign Reads -^000000";
 	mes "Please help keep Prontera a clean place.";
 	close;
 }
 
-prontera,150,326,1	script	Sign#PrtSign4	111,{
+prontera,150,326,1	script	Sign#Prt4	111,{
 	mes "^993300- The Sign Reads -^000000";
 	mes "Citizens of Prontera are Welcomed in the Prontera Castle.";
 	close;
 }
 
-prontera,31,212,1	script	Billboard#PrtSign5	111,{
+prontera,31,212,1	script	Billboard#Prt5	111,{
 	mes "^993300- The Billboard Reads -^000000";
 	mes "~WANTED~";
 	mes "iROGM01";
@@ -77,13 +78,13 @@ prontera,31,212,1	script	Billboard#PrtSign5	111,{
 	close;
 }
 
-prontera,165,305,1	script	Billboard#PrtSign6	111,{
+prontera,165,305,1	script	Billboard#Prt6	111,{
 	mes "^993300- The Billboard Reads -^000000";
 	mes "We hope you enjoy your stay in Prontera.";
 	close;
 }
 
-prontera,145,304,1	script	Sign#PrtSign7	111,{
+prontera,145,304,1	script	Sign#Prt7	111,{
 	mes "^993300- The Sign Reads -^000000";
 	mes "Note:";
 	mes "I lost my cart in Mt. Mjolnir, if someone finds it please tell me, my life was in that bucket of goods!";
@@ -92,21 +93,21 @@ prontera,145,304,1	script	Sign#PrtSign7	111,{
 
 // Morroc
 //============================================================
-morocc,144,84,1	script	Sign#MocSign1	111,{
+morocc,144,84,1	script	Sign#Moc1	111,{
 	mes "^993300- The Sign Reads -^000000";
 	mes "Wanted: Body guard to protect my shop from thieves";
 	mes "Please contact Butcher";
 	close;
 }
 
-morocc,145,83,1	script	Sign#MocSign2	111,{
+morocc,145,83,1	script	Sign#Moc2	111,{
 	mes "^993300- The Sign Reads -^000000";
 	mes "Selling, well groomed Peco Peco!";
 	mes "This beautiful specimen has only been ridden by myself, comes with a saddle, a harness and...";
 	close;
 }
 
-morocc,32,174,1	script	Bulletin#MocSign3	111,{
+morocc,32,174,1	script	Bulletin#Moc3	111,{
 	mes "^993300- The Bulletin Reads -^000000";
 	mes "^0099FFMorroc women up in arms!^000000";
 	mes "A recent study has shown that the majority of male citizens in";
@@ -124,13 +125,13 @@ morocc,32,174,1	script	Bulletin#MocSign3	111,{
 	close;
 }
 
-morocc,168,266,1	script	Sign#MocSign5	111,{
+morocc,168,266,1	script	Sign#Moc5	111,{
 	mes "^993300- The Sign Reads -^000000";
 	mes "Welcome to Morroc.";
 	close;
 }
 
-morocc,168,264,1	script	Billboard#MocSign6	111,{
+morocc,168,264,1	script	Billboard#Moc6	111,{
 	mes "^993300- The Billboard Reads -^000000";
 	mes "^CC0033Battle Royal!^000000";
 	mes "Do you have what it takes to battle someone in a no holds barred, player vs. player game of death!";
@@ -138,7 +139,7 @@ morocc,168,264,1	script	Billboard#MocSign6	111,{
 	close;
 }
 
-morocc,298,211,1	script	Sign#MocSign7	111,{
+morocc,298,211,1	script	Sign#Moc7	111,{
 	mes "^993300- The Sign Reads -^000000";
 	mes "Welcome to Morroc.";
 	close;
@@ -146,20 +147,20 @@ morocc,298,211,1	script	Sign#MocSign7	111,{
 
 // Geffen
 //============================================================
-geffen,116,58,1	script	Geffen Bulletin#GefSign1	111,{
+geffen,116,58,1	script	Geffen Bulletin#Gef1	111,{
 	mes "^993300- The Geffen Bulletin Reads -^000000";
 	mes "Remember Wizard's...It's not how many skills you know, it's the magic that counts!";
 	close;
 }
 
-geffen,61,174,1	script	Sign#GefSign2	111,{
+geffen,61,174,1	script	Sign#Gef2	111,{
 OnClick:
 	mes "^993300- The Sign Reads -^000000";
 	mes "- Seems to be written in a language unfamiliar to you -";
 	close;
 }
 
-geffen,113,104,1	script	Billboard#GefSign3	111,{
+geffen,113,104,1	script	Billboard#Gef3	111,{
 	mes "^993300- The Billboard Reads -^000000";
 	mes "Selling: Brand new Chon Chon Doll!";
 	mes "What a great gift to give to a loved one, contact me now!";
@@ -171,7 +172,7 @@ geffen,113,104,1	script	Billboard#GefSign3	111,{
 	close;
 }
 
-geffen,119,190,1	script	Sign Post#GefSign4	111,{
+geffen,119,190,1	script	Sign Post#Gef4	111,{
 	mes "^993300- The Sign Post Reads -^000000";
 	mes "North to Geffen Fields";
 	mes "Northeast to Al De Baran";
@@ -185,13 +186,13 @@ geffen,119,190,1	script	Sign Post#GefSign4	111,{
 	close;
 }
 
-geffen,168,175,1	script	Sign#GefSign5	111,{
+geffen,168,175,1	script	Sign#Gef5	111,{
 	mes "^993300- The Sign Reads -^000000";
 	mes "''Your always welcomed in Geffen''";
 	close;
 }
 
-geffen,183,61,1	script	Sign#GefSign6	111,{
+geffen,183,61,1	script	Sign#Gef6	111,{
 	mes "^993300- The Sign Reads -^000000";
 	mes "Welcome.";
 	close;
@@ -199,7 +200,7 @@ geffen,183,61,1	script	Sign#GefSign6	111,{
 
 // Al De Baran
 //============================================================
-aldebaran,181,172,1	script	Billboard#AldeSign1	111,{
+aldebaran,181,172,1	script	Billboard#Alde1	111,{
 	mes "^993300- The Billboard Reads -^000000";
 	mes "In Search of:";
 	mes "I lost my Bongun pet, it wasn't my fault, it just ran away...";
@@ -207,13 +208,13 @@ aldebaran,181,172,1	script	Billboard#AldeSign1	111,{
 	close;
 }
 
-aldebaran,133,104,1	script	Al De Baran Bulletin#AldeSign2	111,{
+aldebaran,133,104,1	script	Al De Baran Bulletin#Al2	111,{
 	mes "^993300- The Al De Baran Bulletin Reads -^000000";
 	mes "''Enjoy your stay in Al De Baran''";
 	close;
 }
 
-aldebaran,54,223,1	script	Billboard#AldeSign3	111,{
+aldebaran,54,223,1	script	Billboard#Alde3	111,{
 	mes "^993300- The Billboard Reads -^000000";
 	mes "Help Wanted:";
 	mes "We are looking for young, strong and athletic people who are";
@@ -222,14 +223,14 @@ aldebaran,54,223,1	script	Billboard#AldeSign3	111,{
 	close;
 }
 
-aldebaran,197,228,1	script	#AldeSign4	-1,1,1,{
+aldebaran,197,228,1	script	#Alde4	-1,1,1,{
 OnTouch:
 	mes "[Home Owner]";
 	mes "Get off my roof you no good leecher!";
 	close;
 }
 
-aldebaran,217,222,1	script	Sign#AldeSign5	111,{
+aldebaran,217,222,1	script	Sign#Alde5	111,{
 	mes "^993300- The Sign Reads -^000000";
 	mes "I saw Santa Claus in Lutie!";
 	mes "- The rest looks like scribble -";
@@ -238,13 +239,13 @@ aldebaran,217,222,1	script	Sign#AldeSign5	111,{
 
 // Izlude
 //============================================================
-izlude,54,139,1	script	Sign#IzSign1	111,{
+izlude,54,139,1	script	Sign#Iz1	111,{
 	mes "^993300- The Sign Reads -^000000";
 	mes "Welcome to the Swordsman Academy.";
 	close;
 }
 
-izlude,144,148,1	script	Sign#IzSign2	111,{
+izlude,144,148,1	script	Sign#Iz2	111,{
 	mes "^993300- The Sign Reads -^000000";
 	mes "Welcome.";
 	close;
@@ -252,19 +253,19 @@ izlude,144,148,1	script	Sign#IzSign2	111,{
 
 // Alberta
 //============================================================
-alberta,35,241,1	script	Billboard#AlbSign1	111,{
+alberta,35,241,1	script	Billboard#Alb1	111,{
 	mes "^993300- The Billboard Reads -^000000";
 	mes "Welcome to Alberta, the Merchant's paradise.";
 	close;
 }
 
-alberta,37,39,1	script	Billboard#AlbSign2	111,{
+alberta,37,39,1	script	Billboard#Alb2	111,{
 	mes "^993300- The Billboard Reads -^000000";
 	mes "Welcome.";
 	close;
 }
 
-alberta,99,151,1	script	Sign#AlbSign3	111,{
+alberta,99,151,1	script	Sign#Alb3	111,{
 	mes "^993300- The Sign Reads -^000000";
 	mes "Tools by the Cart full!";
 	mes "You need tools? We got'em!";
@@ -272,7 +273,7 @@ alberta,99,151,1	script	Sign#AlbSign3	111,{
 	close;
 }
 
-alberta,196,152,1	script	Sign#AlbSign4	111,{
+alberta,196,152,1	script	Sign#Alb4	111,{
 	mes "^993300- The Sign Reads -^000000";
 	mes "Docking and Shipment times very on load. For information regarding";
 	mes "Shipping and Receiving, please...";
@@ -280,7 +281,7 @@ alberta,196,152,1	script	Sign#AlbSign4	111,{
 	close;
 }
 
-alberta,149,54,1	script	Sign#AlbSign5	111,{
+alberta,149,54,1	script	Sign#Alb5	111,{
 	mes "^993300- The Sign Reads -^000000";
 	mes "Welcome.";
 	close;
diff --git a/npc/other/powernpc.txt b/npc/other/powernpc.txt
index 98479a8d2..230ca6cd9 100644
--- a/npc/other/powernpc.txt
+++ b/npc/other/powernpc.txt
@@ -3,11 +3,11 @@
 //===== By: ==================================================
 //= KarLaeda (Aegis script cnversion)
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= Athena SVN 9000+
 //===== Additional Comments: =================================
-//= 
+//= 1.1 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //============================================================
 
 
@@ -264,7 +264,7 @@ gon_test,42,89,4	script	Summoner#gnp	774,{
 	end;
 }
 
-gon_test,46,14,3	script	Guide of field of fight#gnp	770,{
+gon_test,46,14,3	script	Guide of field of fight	770,{
 	mes "[SongHeeYeon]";
 	mes ".....";
 	mes "Hi, there~";
diff --git a/npc/other/pvp.txt b/npc/other/pvp.txt
index 8623a80d8..05c56e2e5 100644
--- a/npc/other/pvp.txt
+++ b/npc/other/pvp.txt
@@ -3,9 +3,9 @@
 //===== By: ================================================== 
 //= kobra_k88; L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.3
+//= 1.4
 //===== Compatible With: ===================================== 
-//= eAthena 0.5.2 +
+//= eAthena SVN
 //===== Description: ========================================= 
 //= [Aegis Conversion]
 //= PvP NPCs that are found in the Inns in major cities.
@@ -25,6 +25,7 @@
 //=	Removed all receptioned for Yoyo mode, with the
 //=	exception of the "Free for all" mode.
 //=	Added PVP event NPCs.
+//= 1.4 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //============================================================ 
 
 // Morroc
@@ -148,7 +149,7 @@ payon_in01,140,53,4	duplicate(PVPGateKeeper)	Gate Keeper#pay	83
 
 // PVP Yoyo Mode Staff
 //============================================================ 
-pvp_y_room,86,85,4	script	Fight Square Reception Staff	105,{
+pvp_y_room,86,85,4	script	Fight Square Reception#1	105,{
 	set .@mapcount_1,getmapusers("pvp_y_8-1");
 	set .@mapcount_2,getmapusers("pvp_y_8-2");
 	set .@mapcount_3,getmapusers("pvp_y_8-3");
@@ -195,7 +196,7 @@ S_CheckPVPRoom:
 
 // PVP Nightmare Mode Staff
 //============================================================ 
-pvp_n_room,30,85,4	script	Fight Square Reception Staff	105,{
+pvp_n_room,30,85,4	script	Fight Square Reception#2	105,{
 	set .@mapcount_1,getmapusers("pvp_n_8-1");
 	set .@mapcount_2,getmapusers("pvp_n_8-2");
 	set .@mapcount_3,getmapusers("pvp_n_8-3");
@@ -391,7 +392,7 @@ function	script	F_PVPNarrator	{
 
 // Event Contestant Entrance
 //============================================================ 
-pvp_room,54,85,4	script	Combat Square Register Staff	105,{
+pvp_room,54,85,4	script	Registration Staff#1	105,{
 	if (countitem(7028) == 0) {
 		mes "[PVP Combat Square Register Staff]";
 		mes "Eh? How did you get in here?";
@@ -464,7 +465,7 @@ OnInit:
 
 // Spectator Entrance
 //============================================================ 
-pvp_room,62,85,4	script	Compete Square viewer's entrance::PVPSpectator	105,{
+pvp_room,62,85,4	script	Spectator's Entrance#1::PVPSpectator	105,{
 	if (countitem(7029) == 0) {
 		mes "[PVP Compete Square Register Staff]";
 		mes "This is the entrance for viewers.";
@@ -491,15 +492,15 @@ OnInit:
 	end;
 }
 
-pvp_room,70,85,4	duplicate(PVPSpectator)	Compete Square Register Staff	105
+pvp_room,70,85,4	duplicate(PVPSpectator)	Spectator's Entrance#2	105
 
-pvp_room,78,85,4	duplicate(PVPSpectator)	Combat Square Register Staff	105
+pvp_room,78,85,4	duplicate(PVPSpectator)	Spectator's Entrance#3	105
 
-pvp_room,86,85,4	duplicate(PVPSpectator)	Combat Square Register Staff	105
+pvp_room,86,85,4	duplicate(PVPSpectator)	Spectator's Entrance#4	105
 
 // Spectator Warps
 //============================================================ 
-pvp_2vs2,5,4,0	script	Combat Square Staff::PVPSpecWarp	45,1,1,{
+pvp_2vs2,5,4,0	script	Combat Square Staff#1::PVPSpecWarp	45,1,1,{
 OnTouch:
 	mes "[Combat Square Staff]";
 	mes "May I help you?";
@@ -511,13 +512,13 @@ OnTouch:
 	end;
 }
 
-pvp_2vs2,5,74,0	duplicate(PVPSpecWarp)	Combat Square Staff	45,1,1
+pvp_2vs2,5,74,0	duplicate(PVPSpecWarp)	Combat Square Staff#2	45,1,1
 
-pvp_2vs2,74,74,0	duplicate(PVPSpecWarp)	Combat Square Staff	45,1,1
+pvp_2vs2,74,74,0	duplicate(PVPSpecWarp)	Combat Square Staff#3	45,1,1
 
-pvp_2vs2,74,5,0	duplicate(PVPSpecWarp)	Combat Square Staff	45,1,1
+pvp_2vs2,74,5,0	duplicate(PVPSpecWarp)	Combat Square Staff#4	45,1,1
 
-pvp_2vs2,40,40,0	script	Combat Square Staff	45,1,1,{
+pvp_2vs2,40,40,0	script	Combat Square Staff#5	45,1,1,{
 	set mapmove,0;
 	mes "[Combat Square Staff]";
 	mes "May I help you?";
@@ -535,7 +536,7 @@ pvp_2vs2,40,40,0	script	Combat Square Staff	45,1,1,{
 
 // PVP Area Exit warp
 //============================================================ 
-pvp_room,51,19,0	script	out	45,4,2,{
+pvp_room,51,19,0	script	out#eventpvp	45,4,2,{
 OnTouch:
 	mes "[Combat Square Staff]";
 	mes "Did you have fun in Combat Square?";