* Commited Silent's Fix to the duplicate NPCs

- needs testing
- can't be fully fixed because of length limitation of names

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7200 54d463be-8e91-2dee-dedb-b68131a5f0ec

11 files changed, 57 insertions, 46 deletions

diff --git a/npc/guides/guides_alde.txt b/npc/guides/guides_alde.txt
index f0e891a80..be1cc3f35 100644
--- a/npc/guides/guides_alde.txt
+++ b/npc/guides/guides_alde.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 

 //= kobra_k88

 //===== Current Version: ===================================== 

-//= 1.4

+//= 1.5

 //===== Compatible With: ===================================== 

 //= eAthena 7.15 +

 //===== Description: ========================================= 

@@ -14,6 +14,7 @@
 //= 1.3 Updated the guide according to how it is on iRO, thanks [MasterOfMuppets]

 //=     to Muad_Dib

 //= 1.4 Fitted the many lines into 1 or 2, and corrected some typos [erKURITA]

+//= 1.5 Removed Duplicates [Silent]

 //============================================================

 

 

@@ -49,4 +50,4 @@ L_End:
 	close;

 }

 

-aldebaran.gat,241,136,4	duplicate(Alde_Guide)	Soldier	105

+aldebaran.gat,241,136,4	duplicate(Alde_Guide)	Soldier#Alde02	105

diff --git a/npc/guides/guides_ama.txt b/npc/guides/guides_ama.txt
index ebcd4b7d5..a8c5ac26e 100644
--- a/npc/guides/guides_ama.txt
+++ b/npc/guides/guides_ama.txt
@@ -3,16 +3,17 @@
 //===== By: ================================================== 

 //= MasterOfMuppets

 //===== Current Version: ===================================== 

-//= 1.0

+//= 1.1

 //===== Compatible With: ===================================== 

 //=

 //===== Description: ========================================= 

 //=

 //===== Additional Comments: ================================= 

 //= 1.0 First version [MasterOfMuppets]

+//= 1.1 Removed Duplicates [Silent]

 //============================================================

 

-amatsu.gat,207,89,3	script	Amatsu Guide	758,{

+amatsu.gat,207,89,3	script	Amatsu Guide#01	758,{

 

 	mes "[Amachang]";

 	mes "Welcome to Amatsu,";

@@ -71,7 +72,7 @@ s_Bar:
 

 }

 

-amatsu.gat,251,283,4	script	Amatsu Guide	767,{

+amatsu.gat,251,283,4	script	Amatsu Guide#02	767,{

 

 	mes "[Guide Man]";

 	mes "Welcome, tourist from";

diff --git a/npc/guides/guides_einbe.txt b/npc/guides/guides_einbe.txt
index 6d78ee793..0d50e01a3 100644
--- a/npc/guides/guides_einbe.txt
+++ b/npc/guides/guides_einbe.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 

 //= Muad_dib

 //===== Current Version: ===================================== 

-//= 1.3

+//= 1.4

 //===== Compatible With: ===================================== 

 //= eAthena 7.15 +

 //===== Description: ========================================= 

@@ -14,6 +14,7 @@
 //= 1.1 missing tabs [Lupus]

 //= 1.2 Optimized, updated common guide names [Lupus]

 //= 1.3 Fitted the many lines into 1 or 2, and corrected some typos [erKURITA]

+//= 1.4 Removed Duplicates [Silent]

 //============================================================

 einbech.gat,67,37,4 script Guide#1::Einbech_Guide 852,{

 	cutin "ein_soldier",2;

@@ -115,4 +116,4 @@ L_END:
 	close;

 }

 

-einbech.gat,48,214,4	duplicate(Einbech_Guide)	Guide#2	852
\ No newline at end of file
+einbech.gat,48,214,4	duplicate(Einbech_Guide)	Guide#Ein2	852
\ No newline at end of file
diff --git a/npc/guides/guides_einbr.txt b/npc/guides/guides_einbr.txt
index 38faaf026..c1652f268 100644
--- a/npc/guides/guides_einbr.txt
+++ b/npc/guides/guides_einbr.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 

 //= Reddozen

 //===== Current Version: ===================================== 

-//= 1.3

+//= 1.4

 //===== Compatible With: ===================================== 

 //= eAthena 7.15 +

 //===== Description: ========================================= 

@@ -13,6 +13,7 @@
 //= 1.1 added 1 more Guide NPC, thanx to Justin84 [Lupus]

 //= 1.2 Optimized, updated common guide names [Lupus]

 //= 1.3 Fitted the many lines into 1 or 2, and corrected some typos [erKURITA]

+//= 1.4 Removed Duplicates [Silent]

 //============================================================

 

 

@@ -163,5 +164,5 @@ M_End:
 	close;

 }

 

-einbroch.gat,155,43,4	duplicate(Einbroch_Guide)	Guide#2	852

-einbroch.gat,162,317,4	duplicate(Einbroch_Guide)	Guide#3	852

+einbroch.gat,155,43,4	duplicate(Einbroch_Guide)	Guide#Einb2	852

+einbroch.gat,162,317,4	duplicate(Einbroch_Guide)	Guide#Einb3	852

diff --git a/npc/guides/guides_gef.txt b/npc/guides/guides_gef.txt
index 3dc2c1446..d71e13fb6 100644
--- a/npc/guides/guides_gef.txt
+++ b/npc/guides/guides_gef.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 

 //= kobra_k88

 //===== Current Version: ===================================== 

-//= 1.2

+//= 1.3

 //===== Compatible With: ===================================== 

 //= eAthena  0.5.2 +

 //===== Description: ========================================= 

@@ -13,6 +13,7 @@
 //= v1.1 Now using duplicate command.

 //= 1.2 Optimized, updated common guide names [Lupus]

 //= 1.2a Small note that the BS guild moved to Einbroch [Poki#3]

+//= 1.3 Removed Duplicates [Silent]

 //============================================================

 

 

@@ -122,8 +123,8 @@ M_Menu:
 }

 

 // South ------------------------------------------

-geffen.gat,118,62,0	duplicate(Gef_Guide)	Guide#2	705

+geffen.gat,118,62,0	duplicate(Gef_Guide)	Guide#Gef2	705

 // East -----------------------------------------------------

-geffen.gat,203,116,2	duplicate(Gef_Guide)	Guide#3	705

+geffen.gat,203,116,2	duplicate(Gef_Guide)	Guide#Gef3	705

 // West ----------------------------------------------

-geffen.gat,37,123,5	duplicate(Gef_Guide)	Guide#4	705

+geffen.gat,37,123,5	duplicate(Gef_Guide)	Guide#Gef4	705

diff --git a/npc/guides/guides_hu.txt b/npc/guides/guides_hu.txt
index 857d36fbe..359b28eba 100644
--- a/npc/guides/guides_hu.txt
+++ b/npc/guides/guides_hu.txt
@@ -3,17 +3,18 @@
 //===== By: ==================================================

 //= erKURITA

 //===== Current Version: =====================================

-//= 1.0a

+//= 1.1

 //===== Compatible With: =====================================

 //= eAthena 1.0

 //===== Description: =========================================

 //= Guard/Guide NPC of City of Hugel.

 //===== Additional Comments: =================================

 //= 1.0 Started the script. [erKURITA]

+//= 1.1 Removed Duplicates [Silent]

 //============================================================

 

 

-hugel.gat,98,57,3	script	Old Lady	863,{

+hugel.gat,98,57,3	script	Old Lady#hu1	863,{

 	mes "[Old Lady]";

 	mes "Welcome to Hugel, the Power Source City.";

 	next;

diff --git a/npc/guides/guides_lhz.txt b/npc/guides/guides_lhz.txt
index 209bc17ef..aae728380 100644
--- a/npc/guides/guides_lhz.txt
+++ b/npc/guides/guides_lhz.txt
@@ -3,13 +3,14 @@
 //===== By: ================================================== 

 //= MasterOfMuppets

 //===== Current Version: ===================================== 

-//= 1.0

+//= 1.1

 //===== Compatible With: ===================================== 

 //=

 //===== Description: ========================================= 

 //= Lighthalzen Guide NPCs

 //===== Additional Comments: ================================= 

 //= 1.0 First Version [MasterOfMuppets]

+//= 1.1 Removed Duplicates [Silent]

 //============================================================

 

 lighthalzen.gat,220,311,3	script	Guide::LhzSlum	852,{

@@ -356,6 +357,6 @@ s_Notice:
 

 }

 

-lighthalzen.gat,154,100,5	duplicate(LhzWest)	Guide	852

+lighthalzen.gat,154,100,5	duplicate(LhzWest)	Guide#lhz1	852

 

-lighthalzen.gat,319,243,5	duplicate(LhzSlum)	Guide	852

+lighthalzen.gat,319,243,5	duplicate(LhzSlum)	Guide#lhz2	852

diff --git a/npc/guides/guides_mor.txt b/npc/guides/guides_mor.txt
index 5033a6a24..e4890abca 100644
--- a/npc/guides/guides_mor.txt
+++ b/npc/guides/guides_mor.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 

 //= kobra_k88

 //===== Current Version: ===================================== 

-//= 1.2

+//= 1.3

 //===== Compatible With: ===================================== 

 //= eAthena  0.5.2 +

 //===== Description: ========================================= 

@@ -12,6 +12,7 @@
 //= Fully working.  Added a guide at every exit.

 //= v1.1 Now using duplicate command.

 //= 1.2 Optimized, updated common guide names [Lupus]

+//= 1.3 Removed Duplicates [Silent]

 //============================================================

 

 

@@ -109,8 +110,8 @@ M_Menu:
 }

 

 // South --------------------------------------------

-morocc.gat,162,97,6	duplicate(Mor_Guide)	Guide#2	707

+morocc.gat,162,97,6	duplicate(Mor_Guide)	Guide#Mor2	707

 // West --------------------------------------------

-morocc.gat,28,161,6	duplicate(Mor_Guide)	Guide#3	707

+morocc.gat,28,161,6	duplicate(Mor_Guide)	Guide#Mor3	707

 // East  --------------------------------------------

-morocc.gat,294,203,9	duplicate(Mor_Guide)	Guide#4	707

+morocc.gat,294,203,9	duplicate(Mor_Guide)	Guide#Mor4	707

diff --git a/npc/guides/guides_pay.txt b/npc/guides/guides_pay.txt
index ed1427547..522dc5238 100644
--- a/npc/guides/guides_pay.txt
+++ b/npc/guides/guides_pay.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 

 //= kobra_k88

 //===== Current Version: ===================================== 

-//= 1.4a

+//= 1.5

 //===== Compatible With: ===================================== 

 //= eAthena  0.5.2 +

 //===== Description: ========================================= 

@@ -17,10 +17,11 @@
 //= 1.3a Fixed some problems with duplicated text, thanks to muad_dib [MasterOfMuppets]

 //= 1.4 Fitted the many lines into 1 or 2, and corrected some typos [erKURITA]

 //= 1.4a Tixed Archer Village Guide [Lupus] 

+//= 1.5 Removed Duplicates [Silent]

 //============================================================

 

 

-payon.gat,162,67,4	script	Guide	708,{

+payon.gat,162,67,4	script	Guide#pay1	708,{

 	cutin "pay_soldier",2;

 	mes "[Payon Guide]";

 	mes "Welcome to the mountain city of Payon.";

@@ -144,7 +145,7 @@ L_END:
  	close;

 }

 

-pay_arche.gat,85,30,2	script	Guide	708,{

+pay_arche.gat,85,30,2	script	Guide#pay2	708,{

 	cutin "pay_soldier",2;

 	mes "[Payon Guide]";

 	mes "Welcome to the Archer Village.";

diff --git a/npc/guides/guides_pron.txt b/npc/guides/guides_pron.txt
index edf592b2b..d5f14e928 100644
--- a/npc/guides/guides_pron.txt
+++ b/npc/guides/guides_pron.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 

 //= kobra_k88

 //===== Current Version: ===================================== 

-//= 1.4

+//= 1.5

 //===== Compatible With: ===================================== 

 //= eAthena  0.5.2 +

 //===== Description: ========================================= 

@@ -15,6 +15,7 @@
 //= 1.3 Updated the guide according to how it is on iRO, thanks [MasterOfMuppets]

 //=     to Muad_Dib

 //= 1.4 Fitted the many lines into 1 or 2, and corrected some typos [erKURITA]

+//= 1.5 Removed Duplicates [Silent]

 //============================================================

 

 

@@ -172,13 +173,13 @@ L_END:
 }

 

 // East ----------------------------------------------------

-prontera.gat,282,208,2	duplicate(Prt_Guide)	Guide#2	105

+prontera.gat,282,208,2	duplicate(Prt_Guide)	Guide#prt2	105

 //West --------------------------------------------------

-prontera.gat,29,200,6	duplicate(Prt_Guide)	Guide#3	105

+prontera.gat,29,200,6	duplicate(Prt_Guide)	Guide#prt3	105

 // South -----------------------------------------------------

-prontera.gat,160,29,0	duplicate(Prt_Guide)	Guide#4	105

+prontera.gat,160,29,0	duplicate(Prt_Guide)	Guide#prt4	105

 // North -----------------------------------------------

-prontera.gat,151,330,4	duplicate(Prt_Guide)	Guide#5	105

+prontera.gat,151,330,4	duplicate(Prt_Guide)	Guide#prt5	105

 

 

 // Guard -----------------------------------------------------

@@ -188,20 +189,20 @@ prontera.gat,160,330,4	script	Guard#1::Prt_Guard	105,{
 	close;

 }

 

-prontera.gat,229,104,5	duplicate(Prt_Guard)	Guard#2	105

-prontera.gat,223,98,8	duplicate(Prt_Guard)	Guard#3	105

-prontera.gat,52,344,5	duplicate(Prt_Guard)	Guard#4	105

-prontera.gat,47,339,5	duplicate(Prt_Guard)	Guard#5	105

+prontera.gat,229,104,5	duplicate(Prt_Guard)	Guard#prt2	105

+prontera.gat,223,98,8	duplicate(Prt_Guard)	Guard#prt3	105

+prontera.gat,52,344,5	duplicate(Prt_Guard)	Guard#prt4	105

+prontera.gat,47,339,5	duplicate(Prt_Guard)	Guard#prt5	105

 

 

 //---------------------------------------------------------------------------------------- Prontera Maze ----------------------------------------------------------------------------------\\

-prt_maze02.gat,100,69,4	script	Guard	105,{

+prt_maze02.gat,100,69,4	script	Guard#maz01	105,{

 	mes "[Guard]";

 	mes "Hey, I don't get your point but I say you should go home and rest rather than go inside the forest.  Don't you know the 'Demon' lurks there?";

 	mes "Naturally, Nobody came back on the hoof so I am not sure whether it really exists or not... well, Do as you want, dude.  I'm not your mother.";

 	close;

 }

-prt_maze02.gat,110,69,4	script	Guard	105,{

+prt_maze02.gat,110,69,4	script	Guard#maz02	105,{

 	mes "[Guard]";

 	mes "Phew...That geek who went inside last time never returned either.";

 	mes "I tried to stop him so many times but he never took me seriously.  He told me he needed herbs.";

diff --git a/npc/guides/guides_yun.txt b/npc/guides/guides_yun.txt
index 3972e5026..f5282d9d3 100644
--- a/npc/guides/guides_yun.txt
+++ b/npc/guides/guides_yun.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 

 //= KitsuneStarwind, usul, kobra_k88

 //===== Current Version: ===================================== 

-//= 1.4

+//= 1.5

 //===== Compatible With: ===================================== 

 //= eAthena 1.0 +

 //===== Description: ========================================= 

@@ -15,11 +15,12 @@
 //= 1.2 Optimized, updated common guide names [Lupus]

 //= 1.3 Updated the mini map localization function. [Musashiden]

 //= 1.4 Juno Guides are now up to date according to iRO. [Musashiden]

+//= 1.5 Removed Duplicates [Silent]

 //============================================================ 

 

 

 //=====================================================================================

-yuno.gat,153,47,4	script	Juno Guide	700,{ 

+yuno.gat,153,47,4	script	Juno Guide#yun1	700,{ 

 	mes "[Ms. Yoon]"; 

 	mes "A place that takes the vision of"; 

 	mes "the future, and gives it form in";

@@ -31,7 +32,7 @@ yuno.gat,153,47,4	script	Juno Guide	700,{
 }

 

 //=====================================================================

-yuno.gat,334,182,4	script	Juno Soldier	852,{

+yuno.gat,334,182,4	script	Juno Soldier#yun1	852,{

 	mes "[Juno Soldier]";

 	mes "Welcome to Juno, the city of";

 	mes "noble-mindedness.";

@@ -51,7 +52,7 @@ yuno.gat,334,182,4	script	Juno Soldier	852,{
 }

 

 //=====================================================================

-yuno.gat,263,320,4	script	Juno Soldier	105,{

+yuno.gat,263,320,4	script	Juno Soldier#yun2	105,{

 	mes "[Juno Soldier]";

 	mes "Welcome to Juno, the city of";

 	mes "noble-mindedness.";

@@ -71,7 +72,7 @@ yuno.gat,263,320,4	script	Juno Soldier	105,{
 }

 

 //=====================================================================

-yuno.gat,227,292,4	script	Juno Soldier	105,{

+yuno.gat,227,292,4	script	Juno Soldier#yun3	105,{

 	mes "[Juno Soldier]";

 	mes "Welcome to Juno, the city of";

 	mes "noble-mindedness.";

@@ -92,7 +93,7 @@ yuno.gat,227,292,4	script	Juno Soldier	105,{
 }

 

 //=====================================================================

-yuno.gat,165,283,4	script	Yuno Soldier	105,{

+yuno.gat,165,283,4	script	Yuno Soldier#yun3	105,{

 	mes "[Juno Soldier]";

 	mes "Welcome to Juno, the city of";

 	mes "noble-mindedness.";

@@ -118,7 +119,7 @@ yuno.gat,165,283,4	script	Yuno Soldier	105,{
 }

 

 //=====================================================================

-yuno.gat,150,283,4	script	Yuno Soldier	105,{

+yuno.gat,150,283,4	script	Yuno Soldier#yun4	105,{

 	mes "[Juno Soldier]";

 	mes "Welcome to Juno, the city of";

 	mes "noble-mindedness.";

@@ -146,7 +147,7 @@ yuno.gat,150,283,4	script	Yuno Soldier	105,{
 }

 

 //=====================================================================

-yuno.gat,165,228,4	script	Yuno Soldier	105,{

+yuno.gat,165,228,4	script	Yuno Soldier#yun5	105,{

 	mes "[Juno Soldier]";

 	mes "Welcome to Juno, the city of";

 	mes "noble-mindedness.";

@@ -171,7 +172,7 @@ yuno.gat,165,228,4	script	Yuno Soldier	105,{
 }

 

 //=====================================================================

-yuno.gat,150,228,4	script	Yuno Soldier	105,{

+yuno.gat,150,228,4	script	Yuno Soldier#yun6	105,{

 	mes "[Juno Soldier]";

 	mes "Welcome to Juno, the city of";

 	mes "noble-mindedness.";