* 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

7 files changed, 82 insertions, 85 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index f6a3e6642..207d9001a 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,7 @@
 Date		Added
 ======
 2007/11/02
+	* Rev. 11645 Some NPC and CONF file clean up. More duplicate removal. [L0ne_W0lf]
 	* Rev. 11643 Bug fixes in rogue skill quest resolved bugreport:351 [L0ne_W0lf]
 2007/11/01
 	* Rev. 11635 Fixed an incorrect answer in the blacksmith quiz. (Trojal) [L0ne_W0lf]
diff --git a/npc/custom/eAAC_Scripts/quest_warper.txt b/npc/custom/eAAC_Scripts/quest_warper.txt
index 01b165180..b0df91f67 100644
--- a/npc/custom/eAAC_Scripts/quest_warper.txt
+++ b/npc/custom/eAAC_Scripts/quest_warper.txt
@@ -4,7 +4,7 @@
 //= Old Warper 2 by Darkchild - Remade with quest format by DZeroX
 //= Huge Rewrite by Neouni
 //===== Current Version: ==========================================
-//= 2.0b
+//= 2.1
 //===== Compatible With: ==========================================
 //= Any eAthena Version
 //===== Description: ==============================================
@@ -72,6 +72,7 @@
 // - Old Dungeon fee system removed, all dungeon fees now set to 0
 //-2.0b
 // - Special warpname menu option name bug fixed
+//-2.1 Updated names to fall within retrictions. [L0ne_W0lf]
 //=================================================================
 
 //========================Function=&=Script========================
@@ -1867,274 +1868,274 @@ binget:
 }
 //============================Warpras==============================
 
-alb2trea,73,101,4	script	Warpra	113,{
+alb2trea,73,101,4	script	Warpra#1	113,{
 	callfunc "Q_Warpra",1;
 }
-ama_fild01,178,325,1	script	Warpra	113,{
+ama_fild01,178,325,1	script	Warpra#2	113,{
 	callfunc "Q_Warpra",1;
 }
-gef_fild10,71,339,4	script	Warpra	113,{
+gef_fild10,71,339,4	script	Warpra#3	113,{
 	callfunc "Q_Warpra",1;
 }
-izlu2dun,104,82,4	script	Warpra	113,{
+izlu2dun,104,82,4	script	Warpra#4	113,{
 	callfunc "Q_Warpra",1;
 }
-mjolnir_02,85,363,4	script	Warpra	113,{
+mjolnir_02,85,363,4	script	Warpra#5	113,{
 	callfunc "Q_Warpra",1;
 }
-moc_fild04,207,331,4	script	Warpra	113,{
+moc_fild04,207,331,4	script	Warpra#6	113,{
 	callfunc "Q_Warpra",1;
 }
-moc_fild19,106,97,4	script	Warpra	113,{
+moc_fild19,106,97,4	script	Warpra#7	113,{
 	callfunc "Q_Warpra",1;
 }
-moc_ruins,64,166,4	script	Warpra	113,{
+moc_ruins,64,166,4	script	Warpra#8	113,{
 	callfunc "Q_Warpra",1;
 }
-niflheim,197,192,3	script	Warpra	113,{
+niflheim,197,192,3	script	Warpra#9	113,{
 	callfunc "Q_Warpra",1;
 }
-pay_arche,39,135,4	script	Warpra	113,{
+pay_arche,39,135,4	script	Warpra#10	113,{
 	callfunc "Q_Warpra",1;
 }
-prt_fild05,273,215,4	script	Warpra	113,{
+prt_fild05,273,215,4	script	Warpra#11	113,{
 	callfunc "Q_Warpra",1;
 }
-tur_dun01,148,239,4	script	Warpra	113,{
+tur_dun01,148,239,4	script	Warpra#12	113,{
 	callfunc "Q_Warpra",1;
 }
-valkyrie,48,35,8	script	Warpra	113,{
+valkyrie,48,35,8	script	Warpra@13	113,{
 	callfunc "Q_Warpra",1;
 }
-yuno_fild03,37,135,4	script	Warpra	113,{
+yuno_fild03,37,135,4	script	Warpra#14	113,{
 	callfunc "Q_Warpra",1;
 }
 
-alberta,32,240,4	script	Warpra	113,{
+alberta,32,240,4	script	Warpra#15	113,{
 	callfunc "QWS_Town_Warpra",1,"Alberta Town";
 	close;
 }
-aldebaran,146,118,4	script	Warpra	113,{
+aldebaran,146,118,4	script	Warpra#16	113,{
 	callfunc "QWS_Town_Warpra",2,"Aldebaran Town";
 	close;
 }
-ayothaya,216,171,5	script	Warpra	113,{
+ayothaya,216,171,5	script	Warpra#17	113,{
 	callfunc "QWS_Town_Warpra",4,"Ayotaya Town";
 	close;
 }
-amatsu,193,81,1	script	Warpra	113,{
+amatsu,193,81,1	script	Warpra#18	113,{
 	callfunc "QWS_Town_Warpra",3,"Amatsu Town";
 	close;
 }
-comodo,195,158,4	script	Warpra	113,{
+comodo,195,158,4	script	Warpra#19	113,{
 	callfunc "QWS_Town_Warpra",5,"Comodo Town";
 	close;
 }
-einbroch,229,196,5	script	Warpra	113,{
+einbroch,229,196,5	script	Warpra#20	113,{
 	callfunc "QWS_Town_Warpra",7,"Einbroch Town";
 	close;
 }
-einbech,173,131,5	script	Warpra	113,{
+einbech,173,131,5	script	Warpra#21	113,{
 	callfunc "QWS_Town_Warpra",6,"Einbech Town";
 	close;
 }
-geffen,116,66,4	script	Warpra	113,{
+geffen,116,66,4	script	Warpra#22	113,{
 	callfunc "QWS_Town_Warpra",8,"Geffen Town";
 	close;
 }
-gonryun,152,130,4	script	Warpra	113,{
+gonryun,152,130,4	script	Warpra#23	113,{
 	callfunc "QWS_Town_Warpra",9,"Gonryun Town";
 	close;
 }
-hugel,90,127,5	script	Warpra	113,{
+hugel,90,127,5	script	Warpra#24	113,{
 	callfunc "QWS_Town_Warpra",10,"Hugel Town";
 	close;
 }
-jawaii,107,182,5	script	Warpra	113,{
+jawaii,107,182,5	script	Warpra#25	113,{
 	callfunc "QWS_Town_Warpra",12,"Jawaii Town";
 	close;
 }
-izlude,132,116,4	script	Warpra	113,{
+izlude,132,116,4	script	Warpra#26	113,{
 	callfunc "QWS_Town_Warpra",11,"Izlude Town";
 	close;
 }
-lighthalzen,153,100,5	script	Warpra	113,{
+lighthalzen,153,100,5	script	Warpra#27	113,{
 	callfunc "QWS_Town_Warpra",13,"Lighthalzen Town";
 	close;
 }
-louyang,211,106,4	script	Warpra	113,{
+louyang,211,106,4	script	Warpra#28	113,{
 	callfunc "QWS_Town_Warpra",14,"Louyang Town";
 	close;
 }
-morocc,157,95,4	script	Warpra	113,{
+morocc,157,95,4	script	Warpra#29	113,{
 	callfunc "QWS_Town_Warpra",16,"Morroc Town";
 	close;
 }
-nif_fild01,319,77,1	script	Warpra	113,{
+nif_fild01,319,77,1	script	Warpra#30	113,{
 	callfunc "QWS_Town_Warpra",17,"Niflheim Town";
 	close;
 }
-payon,183,110,4	script	Warpra	113,{
+payon,183,110,4	script	Warpra#31	113,{
 	callfunc "QWS_Town_Warpra",18,"Payon Town";
 	close;
 }
-prontera,147,172,5	script	Warpra	113,{
+prontera,147,172,5	script	Warpra#32	113,{
 	callfunc "QWS_Town_Warpra",0,"Prontera Town";
 	close;
 }
-umbala,133,130,4	script	Warpra	113,{
+umbala,133,130,4	script	Warpra#33	113,{
 	callfunc "QWS_Town_Warpra",19,"Umbala Town";
 	close;
 }
-xmas,151,136,4	script	Warpra	113,{
+xmas,151,136,4	script	Warpra#34	113,{
 	callfunc "QWS_Town_Warpra",15,"Lutie Town";
 	close;
 }
-yuno,138,162,4	script	Warpra	113,{
+yuno,138,162,4	script	Warpra#35	113,{
 	callfunc "QWS_Town_Warpra",20,"Yuno Town";
 	close;
 }
 
-abyss_02,274,266,1	script	Warpra	113,{
+abyss_02,274,266,1	script	Warpra#36	113,{
 	callfunc "QWS_Dungeon_Warpra",0,"Abyss Lake";
 	close;
 }
 
-ama_dun02,192,118,5	script	Warpra Helper	112,{
+ama_dun02,192,118,5	script	Warpra Helper#1	112,{
 	callfunc "QWS_Dungeon_Warpra",1,"Amatsu Dungeon";
 	close;
 }
 
-anthell02,170,165,3	script	Warpra Helper	112,{
+anthell02,170,165,3	script	Warpra Helper#2	112,{
 	callfunc "QWS_Dungeon_Warpra",2,"Ant Hell Dungeon";
 	close;
 }
 
-ayo_dun02,258,193,5	script	Warpra Helper	112,{
+ayo_dun02,258,193,5	script	Warpra Helper#3	112,{
 	callfunc "QWS_Dungeon_Warpra",3,"Ayotaya Dungeon";
 	close;
 }
 
-ein_dun02,292,282,1	script	Warpra Helper	112,{
+ein_dun02,292,282,1	script	Warpra Helper#4	112,{
 	callfunc "QWS_Dungeon_Warpra",8,"Einbech Dungeon";
 	close;
 }
 
-iz_dun03,202,47,2	script	Warpra Helper	112,{
+iz_dun03,202,47,2	script	Warpra Helper#5	112,{
 	callfunc "QWS_Dungeon_Warpra",4,"Byalan Dungeon";
 	close;
 }
 
-c_tower3,129,106,4	script	Warpra Helper	112,{
+c_tower3,129,106,4	script	Warpra Helper#6	112,{
 	callfunc "QWS_Dungeon_Warpra",5,"Clock Tower Dungeon";
 	close;
 }
 
-mjo_dun02,39,25,4	script	Warpra Helper	112,{
+mjo_dun02,39,25,4	script	Warpra Helper#7	112,{
 	callfunc "QWS_Dungeon_Warpra",6,"Coal Mine Dungeon";
 	close;
 }
 
-prt_sewb2,176,30,3	script	Warpra Helper	112,{
+prt_sewb2,176,30,3	script	Warpra Helper#8	112,{
 	callfunc "QWS_Dungeon_Warpra",7,"Culvert Dungeon";
 	close;
 }
 
-gefenia03,137,34,0	script	Warpra Helper	112,{
+gefenia03,137,34,0	script	Warpra Helper#9	112,{
 	callfunc "QWS_Dungeon_Warpra",9,"Gefenia Dungeon";
 	close;
 }
 
-gef_dun02,218,61,2	script	Warpra Helper	112,{
+gef_dun02,218,61,2	script	Warpra Helper#10	112,{
 	callfunc "QWS_Dungeon_Warpra",10,"Gefen Dungeon";
 	close;
 }
 
-glast_01,371,308,3	script	Warpra Helper	112,{
+glast_01,371,308,3	script	Warpra Helper#11	112,{
 	callfunc "QWS_Dungeon_Warpra",11,"Glast Heim Dungeon";
 	close;
 }
 
-gon_dun01,167,273,4	script	Warpra Helper	112,{
+gon_dun01,167,273,4	script	Warpra Helper#12	112,{
 	callfunc "QWS_Dungeon_Warpra",12,"Gonryun Dungeon";
 	close;
 }
 
-juperos_02,127,154,5	script	Warpra Helper	112,{
+juperos_02,127,154,5	script	Warpra Helper#13	112,{
 	callfunc "QWS_Dungeon_Warpra",14,"Juperos Cave";
 	close;
 }
 
-kh_dun01,14,224,3	script	Warpra Helper	112,{
+kh_dun01,14,224,3	script	Warpra Helper#14	112,{
 	callfunc "QWS_Dungeon_Warpra",28,"Kiel Dungeon";
 	close;
 }
 
-lhz_dun02,156,151,5	script	Warpra Helper	112,{
+lhz_dun02,156,151,5	script	Warpra Helper#15	112,{
 	callfunc "QWS_Dungeon_Warpra",15,"Lighthalzen Bio Lab";
 	close;
 }
 
-lou_dun02,168,264,4	script	Warpra Helper	112,{
+lou_dun02,168,264,4	script	Warpra Helper#16	112,{
 	callfunc "QWS_Dungeon_Warpra",16,"Louyang Dungeon";
 	close;
 }
 
-mag_dun02,46,41,3	script	Warpra Helper	112,{
+mag_dun02,46,41,3	script	Warpra Helper#17	112,{
 	callfunc "QWS_Dungeon_Warpra",17,"Magma Dungeon";
 	close;
 }
 
-odin_tem01,115,148,3	script	Warpra Helper	112,{
+odin_tem01,115,148,3	script	Warpra Helper#18	112,{
 	callfunc "QWS_Dungeon_Warpra",18,"Odin Temple";
 	close;
 }
 
-orcsdun01,185,11,3	script	Warpra Helper	112,{
+orcsdun01,185,11,3	script	Warpra Helper#19	112,{
 	callfunc "QWS_Dungeon_Warpra",19,"Orc Dungeon";
 	close;
 }
 
-pay_dun03,162,143,3	script	Warpra Helper	112,{
+pay_dun03,162,143,3	script	Warpra Helper#20	112,{
 	callfunc "QWS_Dungeon_Warpra",20,"Payon Dungeon";
 	close;
 }
 
-moc_pryd02,101,95,3	script	Warpra Helper	112,{
+moc_pryd02,101,95,3	script	Warpra Helper#21	112,{
 	callfunc "QWS_Dungeon_Warpra",21,"Pyramides Dungeon";
 	close;
 }
 
-in_sphinx2,274,268,1	script	Warpra Helper	112,{
+in_sphinx2,274,268,1	script	Warpra Helper#22	112,{
 	callfunc "QWS_Dungeon_Warpra",22,"Sphinx Dungeon";
 	close;
 }
 
-tha_t07,111,162,3	script	Warpra Helper	112,{
+tha_t07,111,162,3	script	Warpra Helper#23	112,{
 	callfunc "QWS_Dungeon_Warpra",24,"Thanatos Tower";
 	close;
 }
 
-treasure02,104,40,3	script	Warpra Helper	112,{
+treasure02,104,40,3	script	Warpra Helper#24	112,{
 	callfunc "QWS_Dungeon_Warpra",23,"Sunken Ship Dungeon";
 	close;
 }
 
-xmas_dun02,124,131,3	script	Warpra Helper	112,{
+xmas_dun02,124,131,3	script	Warpra Helper#25	112,{
 	callfunc "QWS_Dungeon_Warpra",25,"Toy Factory Dungeon";
 	close;
 }
 
-um_dun02,44,28,3	script	Warpra Helper	112,{
+um_dun02,44,28,3	script	Warpra Helper#26	112,{
 	callfunc "QWS_Dungeon_Warpra",27,"Umbala Dungeon";
 	close;
 }
 
-tur_dun02,162,23,3	script	Warpra Helper	112,{
+tur_dun02,162,23,3	script	Warpra Helper#27	112,{
 	callfunc "QWS_Dungeon_Warpra",26,"Turtle Island Dungeon";
 	close;
 }
-prt_maze02,102,69,4	script	Warpra Helper	112,{
+prt_maze02,102,69,4	script	Warpra Helper#28	112,{
 	callfunc "QWS_Dungeon_Warpra",13,"Hidden Dungeon";
 	close;
 }
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]";
diff --git a/npc/events/custom/2006_dogs_year.txt b/npc/events/custom/2006_dogs_year.txt
index d4f8d9d20..1be5be4ff 100644
--- a/npc/events/custom/2006_dogs_year.txt
+++ b/npc/events/custom/2006_dogs_year.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Lupus (1.0)
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= eAthena Version; 5xxx+ (with 'disguise' command)
 //===== Description: =========================================
@@ -12,6 +12,8 @@
 //= 1.0 Tested, fully working.[Lupus]
 //=		Add some national info in English if you can.
 //=	(Mine was in Russian, and it's damn hard to translate 8)
+//= 1.1 Commented out monster spawn as it is a custom mob and [L0ne_W0lf]
+//	not in the mob database.
 //============================================================
 
 
@@ -92,4 +94,5 @@ OnInit:
 	end;
 }
 
-prontera,0,0,0,0	monster	Fire Dog	1987,50,3600000,1800000,0
+// Requires custom monster.
+//prontera,0,0,0,0	monster	Fire Dog	1987,50,3600000,1800000,0
diff --git a/npc/scripts_custom.conf b/npc/scripts_custom.conf
index 42b720eda..19ba3f2d3 100644
--- a/npc/scripts_custom.conf
+++ b/npc/scripts_custom.conf
@@ -93,7 +93,6 @@ npc: npc/custom/adoption.txt
 //npc: npc/custom/Lance/FR_WeatherController.c
 //npc: npc/custom/Lance/FR_MailSystem.c
 //npc: npc/sample/npc_dynamic_shop.txt
-//npc: npc/sample/monster_controller.cpp
 //npc: npc/custom/Lance/Sentry.cpp
 // --------------------------------------------------------------
 
@@ -124,9 +123,7 @@ npc: npc/custom/adoption.txt
 // Warning! It might break your server balance.
 //npc: npc/custom/quests/kaho_balmung.txt
 //npc: npc/custom/quests/kahohorn.txt
-// -- ?? Event
-//npc: npc/custom/tougijou.txt
-//Nice Custom thanatos Tower Statues Quest
+// Nice Custom thanatos Tower Statues Quest
 //npc: npc/custom/quests/tha_statues.txt
 // -- A quest for Jewel Case for 99 Level Players of any 2nd Class
 //npc: npc/custom/quests/lvl99_quest.txt
diff --git a/npc/scripts_eaac.conf b/npc/scripts_eaac.conf
index a06276a21..9369ab644 100644
--- a/npc/scripts_eaac.conf
+++ b/npc/scripts_eaac.conf
@@ -35,13 +35,6 @@
 //import: npc/custom/eAAC_Scripts/Kafra_Express_files.conf
 
 // --------------------------------------------------------------
-// -------------------- Disguiser Quest NPC ---------------------
-// Script made by palasx.
-// Forum topic for support:
-//| http://www.eathena.ws/board/index.php?showtopic=55584
-//npc: npc/custom/eAAC_Scripts/disguiser.txt
-
-// --------------------------------------------------------------
 // ---------------------- Roll A Dice NPC -----------------------
 // Script made by birkiczd.
 // Forum topic for support: