From 723561d0be4246977bcf3fea648af5e11e96eb89 Mon Sep 17 00:00:00 2001
From: L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Fri, 2 Nov 2007 22:02:39 +0000
Subject: * Some NPC and CONF file clean up. More duplicate removal.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11645 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 npc/custom/quests/bandit_beard.txt    | 11 ++++++-----
 npc/custom/quests/thq/THQS_Quests.txt |  5 +++--
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'npc/custom/quests')

diff --git a/npc/custom/quests/bandit_beard.txt b/npc/custom/quests/bandit_beard.txt
index 7ce9b8b69..cb38eff6d 100644
--- a/npc/custom/quests/bandit_beard.txt
+++ b/npc/custom/quests/bandit_beard.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Mega Man Expert & Lupus
 //===== Current Version: ===================================== 
-//= 1.2
+//= 1.3
 //===== Compatible With: ===================================== 
 //= eAthena 0.5.2 +
 //===== Description: ========================================= 
@@ -14,9 +14,10 @@
 //= 1.1 Fixed some exploits, bugs and typos. Optimized 8) [Lupus]
 //= 1.1b fixed some typos
 //= 1.2 fixed donpcevent label [Lupus]
+//= 1.3 Removed duplicates [L0ne_W0lf]
 //============================================================
 
-umbala,126,129,4	script	Bearded Man	120,{
+umbala,126,129,4	script	Bearded Man#bandit	120,{
 	if(BEARD_QUEST == 4 ) goto L_MAKE;
 	if(BEARD_QUEST >= 5 ) goto L_DONE;
 	if(BEARD_QUEST >= 1 ) goto L_THREAD;
@@ -101,7 +102,7 @@ L_NOITEMS:
 }  
 
 //Master Tailor----------
-izlude_in,123,175,4	script	Master Tailor	50,{
+izlude_in,123,175,4	script	Master Tailor#bandit	50,{
 	mes "[Master Tailor]";
 	mes "Good evening! I am the Master Tailor!";
 	if(BEARD_QUEST != 1 ) close;
@@ -118,7 +119,7 @@ izlude_in,123,175,4	script	Master Tailor	50,{
 	close;
 }
 // Karfa Thread Clerk---
-aldeba_in,70,179,5	script	Karfa Clerk	113,{
+aldeba_in,70,179,5	script	Karfa Clerk#bandit	113,{
 	mes "[Karfa Clerk]";
 	if(BEARD_QUEST == 3 ) goto L_REPEAT;
 	if(BEARD_QUEST > 3 ) goto L_DONE;
@@ -156,7 +157,7 @@ L_DONE:
 }
 
 //Thread Merchant ------
-alberta,65,123,6	script	Man	85,{
+alberta,65,123,6	script	Man#bandit	85,{
 	if(BEARD_QUEST == 3 && $@beardMobD) goto L_KILLED;
 	if(BEARD_QUEST > 3) goto L_DONE;
 
diff --git a/npc/custom/quests/thq/THQS_Quests.txt b/npc/custom/quests/thq/THQS_Quests.txt
index 950f5486c..154186e91 100644
--- a/npc/custom/quests/thq/THQS_Quests.txt
+++ b/npc/custom/quests/thq/THQS_Quests.txt
@@ -10,7 +10,7 @@
 //                    revised By Warlock                    //
 //////////////////////////////////////////////////////////////
 //===== Version ==============================================
-//= 1.3
+//= 1.4
 //===== Compatible With ======================================
 //= eAthena 1.0
 //===== Description ==========================================
@@ -21,6 +21,7 @@
 //= 1.0 - Straight conversionof Aegis NPC file
 //= 1.2 some bugfixes, typos [Lupus]
 //= 1.3 Removed Duplicates [Silent]
+//= 1.4 Further removed duplicates. [L0ne_W0lf]
 //============================================================
 
 
@@ -88,7 +89,7 @@ N_QuestStart:
 	close;
 }
 //1-4
-prontera,264,353,6	script	Old Lady	103,{
+prontera,264,353,6	script	Old Lady#thq	103,{
 	if (one_qset == 4 && countitem(934) > 14) goto N_QuestComp;
 	if (one_qset == 4) goto N_QuestStart;
 	mes "[Old Lady]";
-- 
cgit v1.2.3-60-g2f50