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

1 files changed, 8 insertions, 7 deletions

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;