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

16 files changed, 92 insertions, 76 deletions

diff --git a/npc/quests/Kiel_Hyre_Quest.txt b/npc/quests/Kiel_Hyre_Quest.txt
index c8eb041d2..e117c6409 100644
--- a/npc/quests/Kiel_Hyre_Quest.txt
+++ b/npc/quests/Kiel_Hyre_Quest.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf (Script), DZeroX (Timer)
 //===== Current Version: ===================================== 
-//= 3.5
+//= 3.7
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -70,8 +70,9 @@
 //=		Note: There are many condition checks that should be omitted in the future fixed item names in item_db.txt / txt resources according the quest
 //=		for items, should be used bitwise methods in a single variable. So let's fix the rest possible bugs (if they exist) and then optimize ^_-		
 //= 3.5 Changed the way the Black Keycard distibuting NPCs work slighty. [L0ne_W0lf]
-//= 3.6 Keil Hyre remove3s ALL outstanding quest items when he is talked [L0ne_W0lf]
+//= 3.6 Keil Hyre removes ALL outstanding quest items when he is talked [L0ne_W0lf]
 //=	to after finishing the quest.
+//= 3.7 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //============================================================ 
 //============================================================================
 // Kiel Hyre Quest/Robotic Lab Dungeon
@@ -5347,7 +5348,7 @@ OnTouch:
 //----------------------------------------------------------------------------
 // Mysterious Woman "Mitchell Layla"
 //----------------------------------------------------------------------------
-kh_mansion,25,79,4	script	Mysterious Woman	727,3,3,{
+kh_mansion,25,79,4	script	Mysterious Woman#kh	727,3,3,{
 L_StartDialog:
 	if (KielHyreQuest == 50) {
 		mes "^3355FFYou awaken with your^000000";
@@ -6795,10 +6796,10 @@ kh_kiehl01,15,177,0	script	Robots#kh2::RobotsKHQ	111,{
 }
 kh_kiehl01,15,180,0	duplicate(RobotsKHQ)	Robots#kh3	111
 kh_kiehl01,15,182,0	duplicate(RobotsKHQ)	Robots#kh4	111
-kh_kiehl01,35,187,0	duplicate(RobotsKHQ)	Robots#kh1	111
-kh_kiehl01,37,187,0	duplicate(RobotsKHQ)	Robots#kh2	111
-kh_kiehl01,39,187,0	duplicate(RobotsKHQ)	Robots#kh3	111
-kh_kiehl01,41,187,0	duplicate(RobotsKHQ)	Robots#kh4	111
+kh_kiehl01,35,187,0	duplicate(RobotsKHQ)	Robots#kh5	111
+kh_kiehl01,37,187,0	duplicate(RobotsKHQ)	Robots#kh6	111
+kh_kiehl01,39,187,0	duplicate(RobotsKHQ)	Robots#kh7	111
+kh_kiehl01,41,187,0	duplicate(RobotsKHQ)	Robots#kh8	111
 
 //----------------------------------------------------------------------------
 // Kiehl's Room; Big Door, (Fifth, and final)
diff --git a/npc/quests/eye_of_hellion.txt b/npc/quests/eye_of_hellion.txt
index ced206819..5706bf434 100644
--- a/npc/quests/eye_of_hellion.txt
+++ b/npc/quests/eye_of_hellion.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= MasterOfMuppets
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= eAthena SVN 3422+(Requires jA Script System)
 //===== Description: =========================================
@@ -14,6 +14,7 @@
 //= 1.0 First version [MasterOfMuppets]
 //= 1.1 a ',' that should be ';' [FlavioJS]
 //= 1.2 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
+//= 1.3 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //============================================================
 
 geffen,110,200,3	script	Sage Welshyun	754,2,2,{
@@ -687,7 +688,7 @@ s_Sorry:
 
 }
 
-prontera,224,84,1	script	Training Dummy#HellionDummy	111,{
+prontera,224,84,1	script	Training Dummy#HelDummy	111,{
 
 	if(HELLIONQ == 2)goto s_Hellion;
 	mes "^3151FFIt's a training dummy";
@@ -727,7 +728,7 @@ s_Hellion:
 
 }
 
-prt_in,128,79,0	script	Unknown Machine#HellionMchn	111,{
+prt_in,128,79,0	script	Unknown Machine#HelMchn	111,{
 	if(HELLIONQ == 6)goto s_Input2;
 	if(HELLIONQ == 5)goto s_Input;
 	mes "^3151FFIt's some sort of";
@@ -1233,7 +1234,7 @@ payon,101,191,1	script	#HellionStepAct	139,1,1,{
 
 }
 
-payon,82,109,1	script	Pile of Stones#HellionStones	111,{
+payon,82,109,1	script	Pile of Stones#HelStones	111,{
 	if(HELLIONQ != 11)end;
 	mes "[" + strcharinfo(0) + "]";
 	mes "Well, this is the place";
@@ -1302,7 +1303,7 @@ payon,240,161,1	script	Vat#HellionVat	111,{
 
 }
 
-payon,159,130,1	script	Wooden Floor#HellionFloor	111,{
+payon,159,130,1	script	Wooden Floor#HelFloor	111,{
 	if(HELLIONQ > 15)goto s_Slab;
 	if(HELLIONQ != 15)end;
 	mes "[" + strcharinfo(0) + "]";
@@ -1381,7 +1382,7 @@ s_Slab:
 
 }
 
-pay_arche,141,29,1	script	Buddha Statue#HellionStat	111,3,3,{
+pay_arche,141,29,1	script	Buddha Statue#HelStat	111,3,3,{
 	if(HELLIONQ != 17)end;
 	mes "[" + strcharinfo(0) + "]";
 	mes "Hey, there's a huge";
diff --git a/npc/quests/quests_airship.txt b/npc/quests/quests_airship.txt
index dae522872..7bfaf1108 100644
--- a/npc/quests/quests_airship.txt
+++ b/npc/quests/quests_airship.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 // Samuray22
 //===== Current Version: ===================================== 
-//= 1.2
+//= 1.3
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -18,6 +18,7 @@
 //= 1.1 Added Heart Fragment quest. [SinSloth]
 //= 1.2 Change the laboratory code text to make it easier to
 //= understand. [SinSloth]
+//= 1.3 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //============================================================ 
 
 //=======================================================================================================//
@@ -853,7 +854,7 @@ function	script	cherno	{
 
 //========Unidentified Machine #1 and #2=======================
 
-ein_in01,127,94,5	script	 Unidentified Machine#machine1	111,{
+ein_in01,127,94,5	script	 Unidentified Machine#mac	111,{
 	callfunc "Machine";
 }
 ein_in01,122,103,5	script	Unidentified Machine	111,{
@@ -1007,7 +1008,7 @@ function	script	diary	{
 
 //====================Expert Repairman=============================
 
-ein_in01,117,80,5	script	Unidentified Machine	111,{
+ein_in01,117,80,5	script	Unidentified Machine#as	111,{
 	if(kain_ticket > 12) {
 		mes "["+strcharinfo(0)+"]";
 		mes "This is the";
@@ -3122,6 +3123,6 @@ airplane_01,245,48,0	duplicate(boom)	boom#air-5	139
 airplane_01,235,39,0	duplicate(boom)	boom#air-6	139
 airplane_01,252,41,0	duplicate(boom)	boom#air-7	139
 airplane_01,252,63,0	duplicate(boom)	boom#air-8	139
-airplane_01,234,65,0	duplicate(boom)	boom#air-9::boom	139
-airplane_01,227,67,0	duplicate(boom)	boom#air-10::boom	139
-airplane_01,249,50,0	duplicate(boom)	boom#air-0::boom	139
+airplane_01,234,65,0	duplicate(boom)	boom#air-9	139
+airplane_01,227,67,0	duplicate(boom)	boom#air-10	139
+airplane_01,249,50,0	duplicate(boom)	boom#air-0	139
diff --git a/npc/quests/quests_ayothaya.txt b/npc/quests/quests_ayothaya.txt
index 96b3cc128..0a13ab861 100644
--- a/npc/quests/quests_ayothaya.txt
+++ b/npc/quests/quests_ayothaya.txt
@@ -3,7 +3,7 @@
 //===== By ===================================================
 //= Fredzilla, MasterOfMuppets
 //===== Version ==============================================
-//= 1.8
+//= 1.9
 //===== Compatible With ======================================
 //= eAthena 1.0
 //===== Description ==========================================
@@ -30,6 +30,7 @@
 //= Shrimp, Dungeon, Tom Yum Goong [Evera]
 //= 1.7 Updated the Ayothaya Ring quest to the official one [MasterOfMuppets]
 //= 1.8 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
+//= 1.9 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //============================================================
 
 //============================================================
@@ -2590,7 +2591,7 @@ s_Busy:
 	close;	
 }
 
-ayothaya,213,95,7	script	Merchant	841,{
+ayothaya,213,95,7	script	Merchant#chili	841,{
 	if(tomyumgoong == 4)goto s_Chili;
 s_JumpBack:
 	mes "[Merchant Thongdum]";
diff --git a/npc/quests/quests_comodo.txt b/npc/quests/quests_comodo.txt
index b86d8d692..1f0ecf1be 100644
--- a/npc/quests/quests_comodo.txt
+++ b/npc/quests/quests_comodo.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= kobra_k88; L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.3
+//= 1.4
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -23,6 +23,7 @@
 //= 1.2 Added more quest from cities/comodo.txt [Evera]
 //= 1.2a missing label [Lupus]
 //= 1.3 Doomed sword quest rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//= 1.4 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //============================================================ 
 
 // Headgear Quests 1
@@ -757,7 +758,7 @@ comodo,216,310,4	script	BBQ Papa#cmd::CmdFamily	50,{
 
 comodo,215,307,4	duplicate(CmdFamily)	BBQ Mama#cmd	74
 
-comodo,213,310,4	duplicate(CmdFamily)	BBQ Boy#cmd	706
+comodo,213,310,4	duplicate(CmdFamily)	BBQ Boy#cmd2	706
 
 cmd_in02,32,140,4	script	Chief#cmd	49,{
 	if (dmdswrd_Q > 4) {
diff --git a/npc/quests/quests_hugel.txt b/npc/quests/quests_hugel.txt
index d4a2611a6..574ffff16 100644
--- a/npc/quests/quests_hugel.txt
+++ b/npc/quests/quests_hugel.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= MasterOfMuppets & SinSloth
 //===== Current Version: =====================================
-//= 1.4
+//= 1.5
 //===== Compatible With: =====================================
 //= eAthena
 //===== Description: =========================================
@@ -16,6 +16,7 @@
 //= 1.3 Added a Missing "close;". [Samuray22]
 //=	-Thanks to Elfange
 //= 1.4 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
+//= 1.5 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //============================================================
 
 //-------------------------------------------------------------------------
@@ -3343,7 +3344,7 @@ lhz_in03,39,44,3	script	Enquro Carson	97,{
 	
 }
 
-hu_in01,310,380,5	script	Girl	891,{
+hu_in01,310,380,5	script	Girl#hugel	891,{
 
 	if(hg_tre < 47)
 	{
@@ -10466,7 +10467,7 @@ OnTouch:
 	}
 }
 
-hugel,209,109,2	script	Boatman	709,{
+hugel,209,109,2	script	Boatman#hugel	709,{
 
 	mes "[Boatman]";
 	mes "Ah, hello~";
diff --git a/npc/quests/quests_juperos.txt b/npc/quests/quests_juperos.txt
index 8cde9bbee..1a38aead7 100644
--- a/npc/quests/quests_juperos.txt
+++ b/npc/quests/quests_juperos.txt
@@ -3,7 +3,7 @@
 //===== By ===================================================
 //= MasterOfMuppets
 //===== Version ==============================================
-//= 1.1
+//= 1.2
 //===== Compatible With ======================================
 //= eAthena 1.0
 //===== Description ==========================================
@@ -12,6 +12,7 @@
 //= 1.0 First version, partly implemented [MasterOfMuppets]
 //= 1.1 Added official Juperos Ruins History Quest. Thanks
 //= to Keplerk for his first version. [SinSloth]
+//= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //============================================================
 
 yuno_in04,190,125,4	script	Scholar	700,{
@@ -1285,7 +1286,7 @@ yuno_in04,186,125,4	script	Bundle of Files	111,{
 	}
 }
 
-yuno_in04,188,118,4	script	Book	111,{
+yuno_in04,188,118,4	script	Book#juperos	111,{
 
 	if(yuno_hist > 7)
 	{
@@ -1347,7 +1348,7 @@ yuno_in04,188,118,4	script	Book	111,{
 
 // Bronze Statue - juperos_01 99 112
 
-juperos_01,99,112,4	script	Bronze Statue	844,{
+juperos_01,99,112,4	script	Bronze Statue#1	844,{
 
 	if(yuno_hist > 3)
 	{
@@ -1713,7 +1714,7 @@ juperos_01,123,92,4	script	Stone Statue	844,{
 	close;
 }
 
-juperos_01,99,71,4	script	Bronze Statue	844,{
+juperos_01,99,71,4	script	Bronze Statue#2	844,{
 
 	mes "^3355FFIt's an elaborate";
 	mes "bronze statue that";
diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt
index 01c063847..b4a6ac3f7 100644
--- a/npc/quests/quests_lighthalzen.txt
+++ b/npc/quests/quests_lighthalzen.txt
@@ -61,6 +61,7 @@
 //= 3.5 Touch-ups to the Friendship quest. Added EXP reward. [L0ne_W0lf]
 //=	Added cutins for "Maku" npc, and changed "set HP" to percentheal.
 //= 3.5a Adjusted EXP given by "Benkasttein" to be the same as that given by Maku. [L0ne_W0lf]
+//= 3.6 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //============================================================ 
 
 lighthalzen,1,1,7	script	sneakAddSuber	-1,{
@@ -747,7 +748,7 @@ L_DONE:
 
 //--------------------------Documents--------------------------
 
-lhz_cube,237,198,0	script	Documents	111,{
+lhz_cube,237,198,0	script	Documents#lhz	111,{
 	if (MISC_QUEST&512 || cubekey&2) goto L_DONE;
 	mes "There are tons of documents here.";
 	next;
@@ -2567,7 +2568,7 @@ s_Ask:
 
 }
 
-yuno_in04,168,117,1	script	Book	111,{
+yuno_in04,168,117,1	script	Book#lhz	111,{
 
 	if(friendship3 >= 3)goto Book2;
 	if(friendship3 == 2)goto Book;
@@ -4532,7 +4533,7 @@ L_History:
 	close;	
 }
 
-lhz_in01,27,247,5	script	Representative	71,{
+lhz_in01,27,247,5	script	Representative#lhz	71,{
 
 	if(lhz_curse > 6)
 	{
@@ -8409,7 +8410,7 @@ OnInit:
 	end;
 }
 
-lhz_in01,93,45,4	script	Researcher	865,{
+lhz_in01,93,45,4	script	Researcher#1	865,{
 
 	if(lhz_boss < 28)
 	{
@@ -8511,7 +8512,7 @@ lhz_in01,93,45,4	script	Researcher	865,{
 	}
 }
 
-lhz_in01,285,169,3	script	Researcher	865,{
+lhz_in01,285,169,3	script	Researcher#2	865,{
 
 	if(checkweight(7349,1) != 1)
 	{
diff --git a/npc/quests/quests_louyang.txt b/npc/quests/quests_louyang.txt
index 1011496d3..0728b30b9 100644
--- a/npc/quests/quests_louyang.txt
+++ b/npc/quests/quests_louyang.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Evera and The eAthena Dev Team
 //===== Current Version: ===================================== 
-//= 1.3
+//= 1.4
 //===== Compatible With: ===================================== 
 //= eAthena 1.0
 //===== Description: ========================================= 
@@ -14,6 +14,7 @@
 //= 1.1 Fixed double levelup bug [Lupus]
 //= 1.2 Added Revolution Quest. [SinSloth]
 //= 1.3 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
+//= 1.4 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //============================================================ 
 
 //============================================================
@@ -3587,7 +3588,7 @@ lou_in01,43,147,3	script	Gunpowder Expert	750,{
 	}
 }
 
-lou_in01,45,138,3	script	Soldier	825,{
+lou_in01,45,138,3	script	Soldier#1	825,{
 
 	if(countitem(7204))
 	{
@@ -3607,7 +3608,7 @@ lou_in01,45,138,3	script	Soldier	825,{
 	end;
 }
 
-lou_in01,82,139,7	script	Soldier	825,{
+lou_in01,82,139,7	script	Soldier#2	825,{
 
 	if(countitem(7068) || countitem(7096) || countitem(7004))
 	{
diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt
index 35dc8615d..f362a8098 100644
--- a/npc/quests/quests_morocc.txt
+++ b/npc/quests/quests_morocc.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= kobra_k88
 //===== Current Version: ===================================== 
-//= 1.8
+//= 1.9
 //===== Compatible With: ===================================== 
 //= eAthena 7.15 +
 //===== Description: ========================================= 
@@ -19,6 +19,7 @@
 //= 1.6a replaced item "names" with item id. [Lupus]
 //= 1.7 Fixed a bug with XP rewards. [SinSloth]
 //= 1.8 Fixed a bug which prevented reset of events. [SinSloth]
+//= 1.9 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //============================================================ 
 
 
@@ -72,7 +73,7 @@ morocc_in,142,100,4	script	Pierce	89,{
 //==================================================================================//
 //				Binoculars Quest
 //==================================================================================//
-morocc_in,76,163,4	script	Marius	64,5,5{
+morocc_in,76,163,4	script	Marius#binos	64,5,5{
 	mes "[Marius]";
 	mes "Ha! Ha! Ha! Another customer coming!";
 	mes "I know what you are gonna say.";
@@ -142,7 +143,7 @@ morocc_in,76,163,4	script	Marius	64,5,5{
 //			Dandelion's Request / Morocc Invasion quest
 //==================================================================================//
 
-izlude,103,106,3	script	Guildsman	48,3,3,{
+izlude,103,106,3	script	Guildsman#1	48,3,3,{
 
 	if(checkweight(7416,1) != 1)
 	{
@@ -572,7 +573,7 @@ OnTouch:
 	}
 }
 
-prontera,237,313,3	script	Nun	79,3,3,{
+prontera,237,313,3	script	Nun#moc	79,3,3,{
 
 	if(checkweight(7416,1) != 1)
 	{
@@ -767,7 +768,7 @@ OnTouch:
 	}
 }
 
-alberta,129,59,3	script	Guildsman	49,3,3,{
+alberta,129,59,3	script	Guildsman#2	49,3,3,{
 
 	if(checkweight(7416,1) != 1)
 	{
@@ -1750,7 +1751,7 @@ OnTouch:
 	}
 }
 
-payon,231,323,3	script	Guildsman	59,3,3,{
+payon,231,323,3	script	Guildsman#3	59,3,3,{
 
 	if(checkweight(7416,1) != 1)
 	{
@@ -2489,7 +2490,7 @@ OnTouch:
 	}
 }
 
-que_job01,65,50,1	script	#maobar4	45,2,2,{
+que_job01,65,50,1	script	#maobar4-2	45,2,2,{
 
 OnTouch:
 	warp "que_job01",84,77;
diff --git a/npc/quests/quests_prontera.txt b/npc/quests/quests_prontera.txt
index c4beb255e..ca1e81472 100644
--- a/npc/quests/quests_prontera.txt
+++ b/npc/quests/quests_prontera.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= kobra_k88; L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.9
+//= 2.0
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -33,6 +33,7 @@
 //= 1.7c replaced item "names" with item id. [Lupus]
 //= 1.8 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
 //= 1.9 Fixed "him" -> "her" in Ph.D hat quest. THansk to yyCC. [L0ne_W0lf]
+//= 2.0 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //============================================================ 
 
 // Prontera Culvert
@@ -1771,7 +1772,7 @@ mjolnir_01,313,269,5	script	Dazed Boy#prt	706,{
 	}
 }
 
-mjolnir_01,316,268,3	script	Exhausted-Looking Woman#prt	879,{
+mjolnir_01,316,268,3	script	Exhausted-Looking Woman	879,{
 	//var max_max_c1 = CheckMaxCount 1201 1
 	//if (max_max_c1 == 1) {
 	//	mes "^3355FFWait a second!";
@@ -3202,7 +3203,7 @@ prt_church,24,111,5	script	#prince3	887,{
 	}
 }
 
-moc_fild16,201,295,5	script	Assassin Guildsman#poison	884,{
+moc_fild16,201,295,5	script	Assassin Guildsman#poiso	884,{
 	if (prt_curse == 23) {
 		mes "[Assassin Guildsman]";
 		mes "What business";
diff --git a/npc/quests/quests_rachel.txt b/npc/quests/quests_rachel.txt
index bc12a3e02..7360c41d5 100644
--- a/npc/quests/quests_rachel.txt
+++ b/npc/quests/quests_rachel.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 2.0
+//= 2.1
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -49,6 +49,7 @@
 //=	the ontouch "key". Thanks to Gepard for pointing them out.
 //= 1.9 Fixed a misorder with variable checkings. [SinSloth]
 //= 2.0 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
+//= 2.1 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //============================================================ 
 
 // Lost Child Quest (Prerequisite to High Priest quest)
@@ -932,7 +933,7 @@ rachel,138,73,5	script	Idle Merchant#ra_in01	85,{
 
 }
 
-rachel,120,47,3	script	Idle Merchant#ra_in01	85,{
+rachel,120,47,3	script	Idle Merchant#ra_in01_2	85,{
 	if ((lost_boy < 5) || (lost_boy > 6)) {
 		mes "[Idle Merchant]";
 		mes "I'm thinking of quitting";
@@ -3871,7 +3872,7 @@ OnEnable:
 
 // Donation Lottery Quest/High Priest Quest
 //============================================================ 
-ra_temple,119,180,0	script	Temple Entrance#ra_temple	45,1,1,{
+ra_temple,119,180,0	script	Temple Entrance#ra_tem	45,1,1,{
 OnTouch:
 	if ($rachel_donate >= 10000) {
 		if (MISC_QUEST & 8192) { warp "ra_temin",169,23; end; }
@@ -4872,7 +4873,7 @@ que_rachel,180,37,0	duplicate(nemma01)	nemma03	-1,5,5
 que_rachel,165,37,0	duplicate(nemma01)	nemma04	-1,5,5
 que_rachel,160,37,0	duplicate(nemma01)	nemma05	-1,5,5
 
-que_rachel,169,18,0	script	Quest Temple Exit#ra_temple	45,2,2,{
+que_rachel,169,18,0	script	Quest Temple Exit#ra_tem	45,2,2,{
 	mes "^3355FFThe gate is closed.^000000";
 	next;
 
@@ -6522,7 +6523,7 @@ OnTimer120000:
 
 }
 
-rachel,163,152,0	script	imir3#rachel	-1,3,3,{
+rachel,163,152,0	script	imir3#rachel2	-1,3,3,{
 OnTouch:
 	if (ra_tem_q == 22) {
 		mes "^3355FFYou feel a slight headache";
diff --git a/npc/quests/seals/brisingamen_seal.txt b/npc/quests/seals/brisingamen_seal.txt
index 5a62ba799..2dabc6d71 100644
--- a/npc/quests/seals/brisingamen_seal.txt
+++ b/npc/quests/seals/brisingamen_seal.txt
@@ -3,14 +3,15 @@
 //===== By: ================================================== 
 //= SinSloth
 //===== Current Version: ===================================== 
-//= 1.0a
+//= 1.1
 //===== Compatible With: ===================================== 
 //= eAthena
 //===== Description: ========================================= 
 //= Quest for breaking the seal of Brisingamen.
 //===== Additional Comments: =================================
-// 1.0 First version. Thanks to SinSloth for scripting it. [MasterOfMuppets]
-// 1.0a Removed duplicates [Toms]
+//= 1.0 First version. Thanks to SinSloth for scripting it. [MasterOfMuppets]
+//= 1.0a Removed duplicates [Toms]
+//= 1.1 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //============================================================
 
 prt_fild08,175,374,3	script	Bard#brising	51,{
@@ -2832,7 +2833,7 @@ prt_church,113,103,1	script	Praying Man	798,{
 
 }
 
-prt_castle,80,52,0	script	Personnel Record#hiddenbook1	111,{
+prt_castle,80,52,0	script	Personnel Record#book1	111,{
 
 	if($God2 < 50)
 {
diff --git a/npc/quests/skills/bard_skills.txt b/npc/quests/skills/bard_skills.txt
index 88efc87f0..f6a7b964d 100644
--- a/npc/quests/skills/bard_skills.txt
+++ b/npc/quests/skills/bard_skills.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Lupus, Reddozen; L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.4a
+//= 1.5
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -22,6 +22,7 @@
 //= 1.3b Split into different files [DracoRPG]
 //= 1.4	Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //= 1.4a Checks the proper variable now. (bard_q -> gef_bard_q) [L0ne_W0lf]
+//= 1.5 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //============================================================
 
 prontera,174,328,3	script	Young Man#bard_q1	89,3,3,{
@@ -376,7 +377,7 @@ OnTouch:
 	end;
 }
 
-morocc_in,169,72,7	script	Spiteful-Looking Bard#skill_bard02	741,3,3,{
+morocc_in,169,72,7	script	Spiteful-Looking Bard#bs	741,3,3,{
 	if (BaseJob == Job_Bard) {
 		if (Class == Job_Clown && qskill_bard == 9) {
 			if (getskilllv(1010) != 0) {
diff --git a/npc/quests/skills/novice_skills.txt b/npc/quests/skills/novice_skills.txt
index f67ff249a..1e513be95 100644
--- a/npc/quests/skills/novice_skills.txt
+++ b/npc/quests/skills/novice_skills.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= kobra_k88
 //===== Current Version: ===================================== 
-//= 1.5
+//= 1.6
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -11,6 +11,7 @@
 //= Quest for skills: First Aid, Trick Dead
 //===== Additional Comments: ================================= 
 //= 1.5 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
+//= 1.6 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //============================================================ 
 
 prt_in,234,133,4	script	Nami#qsk_nv	66,{
@@ -365,7 +366,7 @@ prt_in,73,87,4	script	Chivalry Member#qsk_nv	65,{
 	}
 }
 
-prt_castle,175,146,4	script	Nursing Instructor#qsk_nv	50,{
+prt_castle,175,146,4	script	Nursing Instructor#qsk_n	50,{
 	mes "[Dread Lord]";
 	mes ". . . . . . . . . .";
 	mes ". . . . . . . . . .";
diff --git a/npc/quests/thana_quest.txt b/npc/quests/thana_quest.txt
index 138d3b276..2d3349ebe 100644
--- a/npc/quests/thana_quest.txt
+++ b/npc/quests/thana_quest.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= [Ishizu-chan]
 //===== Current Version: =====================================
-//= 1.7
+//= 1.8
 //===== Compatible With: =====================================
 //= Any eAthena Version i guess?
 //===== Description: =========================================
@@ -19,6 +19,7 @@
 //= 1.5 Fixed a bug in the number part of the quest. [SinSloth]
 //= 1.6 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
 //= 1.7 Fixed a minor bug with prevented code part from reseting properly. [SinSloth]
+//= 1.8 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //============================================================
 
 hu_fild01,140,163,5	script	Tower Keeper	852,3,3,{
@@ -420,7 +421,7 @@ L_Ask1:
 	close;
 }
 
-tha_t01,140,78,4	script	Guide	831,{
+tha_t01,140,78,4	script	Guide#thana	831,{
 
 	if(!thana_quest)
 	{
@@ -756,7 +757,7 @@ OnTimer30000:
 	end;
 }
 
-tha_t03,67,70,0	script	Machine Device	111,{
+tha_t03,67,70,0	script	Machine Device#thana1	111,{
 
 	if((countitem(7421)) || (countitem(7426)))
 	{
@@ -877,7 +878,7 @@ tha_t03,67,70,0	script	Machine Device	111,{
 	close;
 }
 
-tha_t04,195,195,0	script	Machine Device	111,{
+tha_t04,195,195,0	script	Machine Device#thana2	111,{
 
 	if((countitem(7422)) || (countitem(7427)))
 	{
@@ -1046,7 +1047,7 @@ L_Input:
 	goto L_Input;
 }
 
-tha_t05,101,37,0	script	Machine Device	111,{
+tha_t05,101,37,0	script	Machine Device#thana3	111,{
 
 	if((countitem(7423)) || (countitem(7428)))
 	{
@@ -1148,7 +1149,7 @@ tha_t05,101,37,0	script	Machine Device	111,{
 	}
 }
 
-tha_t06,43,152,0	script	Machine Device	111,{
+tha_t06,43,152,0	script	Machine Device#thana4	111,{
 
 	if((countitem(7424)) || (countitem(7429)))
 	{
@@ -1447,7 +1448,7 @@ tha_t09,19,158,0	script	Machine Device	111,{
 	close;
 }
 
-tha_t04,150,44,0	script	Seal	111,{
+tha_t04,150,44,0	script	Seal#thana1	111,{
 
 	if(!countitem(7423))
 	{
@@ -1522,7 +1523,7 @@ tha_t04,150,44,0	script	Seal	111,{
 	}
 }
 
-tha_t05,218,116,0	script	Seal	111,{
+tha_t05,218,116,0	script	Seal#thana2	111,{
 
 	if(!countitem(7421))
 	{
@@ -1597,7 +1598,7 @@ tha_t05,218,116,0	script	Seal	111,{
 	}
 }
 
-tha_t06,226,230,0	script	Seal	111,{
+tha_t06,226,230,0	script	Seal#thana3	111,{
 
 	if(!countitem(7425))
 	{
@@ -1673,7 +1674,7 @@ tha_t06,226,230,0	script	Seal	111,{
 	}
 }
 
-tha_t07,113,129,0	script	Seal	111,{
+tha_t07,113,129,0	script	Seal#thana4	111,{
 
 	if(!countitem(7422))
 	{
@@ -1837,7 +1838,7 @@ tha_t10,129,159,0	script	Seal	111,{
 	}
 }
 
-tha_t12,96,58,0	script	Stone Statue	111,{
+tha_t12,96,58,0	script	Stone Statue#thana1	111,{
 
 	if(!$@thana_summon)
 	{
@@ -1903,7 +1904,7 @@ tha_t12,96,58,0	script	Stone Statue	111,{
 	}
 }
 
-tha_t12,104,18,0	script	Stone Statue	111,{
+tha_t12,104,18,0	script	Stone Statue#thana2	111,{
 
 	if($@thana_summon == 2)
 	{
@@ -1961,7 +1962,7 @@ tha_t12,104,18,0	script	Stone Statue	111,{
 	}
 }
 
-tha_t12,128,86,0	script	Stone Statue	111,{
+tha_t12,128,86,0	script	Stone Statue#thana3	111,{
 
 	if($@thana_summon == 3)
 	{
@@ -2018,7 +2019,7 @@ tha_t12,128,86,0	script	Stone Statue	111,{
 	}
 }
 
-tha_t12,161,58,0	script	Stone Statue	111,{
+tha_t12,161,58,0	script	Stone Statue#thana4	111,{
 
 	if($@thana_summon == 1)
 	{
@@ -2076,7 +2077,7 @@ tha_t12,161,58,0	script	Stone Statue	111,{
 	}
 }
 
-tha_t12,154,18,0	script	Stone Statue	111,{
+tha_t12,154,18,0	script	Stone Statue#thana5	111,{
 
 	if($@thana_summon == 4)
 	{