* 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

1 files changed, 9 insertions, 8 deletions

diff --git a/npc/cities/ayothaya.txt b/npc/cities/ayothaya.txt
index 54b298438..9e47f52c8 100644
--- a/npc/cities/ayothaya.txt
+++ b/npc/cities/ayothaya.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 

 //= MasterOfMuppets

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

-//= 1.2

+//= 1.3

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

 //= Any eAthena +

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

@@ -21,9 +21,10 @@
 //= 1.1 Missing delitem fixed by Poki#3 [Lupus]

 //= 1.1a Fixed a typo and clarified a comment at the bottom of the script [MasterOfMuppets]

 //= 1.2 Fixed exploits [Lupus]

+//= 1.3 Removed Duplicates [Silent]

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

 

-ayothaya.gat,152,68,1	script	Aibakthing	843,{

+ayothaya.gat,152,68,1	script	Aibakthing#01	843,{

 	mes "[Aibakthing]";

 	mes "Hoo! Hah! Hmm! Hah!";

 	mes "So, how did you like Ayothaya? Did you get a chance to try Tom Yum Goong? When you're ready, I shall take you back home.";

@@ -41,7 +42,7 @@ s_Cancel:
 	close;

 } 

 

-alberta.gat,247,42,3	script	Aibakthing	843,{

+alberta.gat,247,42,3	script	Aibakthing#02	843,{

 	mes "[Aibakthing]";

 	mes "Hoo! Hah! Hoo! Hah!";

 	mes "Let me take you away to a distant spiritual place, a land of exotic mystery, my hometown Ayothaya.";

@@ -262,7 +263,7 @@ s_Shrimp2:
 	close;

 }

 

-ayothaya.gat,143,102,5	script	Old Man	842,{

+ayothaya.gat,143,102,5	script	Old Man#01	842,{

 	mes "[Villager]";

 	mes "Ummm.";

 	mes "Hmmmmm...";

@@ -838,7 +839,7 @@ s_Yes:
 	end;

 }

 

-ayothaya.gat,193,171,3	script	Old Man	842,{

+ayothaya.gat,193,171,3	script	Old Man#02	842,{

 	mes "[Tham]";

 	mes "Ah~";

 	mes "I've got this craving for Ms. Mali the Spicy's food, especially her 'Tom Yum Goong.'";

@@ -1511,7 +1512,7 @@ s_Win2:
 	close;

 }

 

-ayothaya.gat,197,188,5	script	Young Man	841,{

+ayothaya.gat,197,188,5	script	Young Man#01	841,{

 	mes "[Kwan]";

 	mes "Phew, isn't it";

 	mes "soooo hot today?";

@@ -1535,7 +1536,7 @@ ayothaya.gat,197,188,5	script	Young Man	841,{
 	close;

 }

 

-ayothaya.gat,241,264,5	script	Young Man	843,{

+ayothaya.gat,241,264,5	script	Young Man#02	843,{

 

 	mes "[Eik]";

 	mes "Hey...";

@@ -1561,7 +1562,7 @@ s_Sure:
 	close;

 }

 

-ayothaya.gat,213,142,5	script	Young Man	843,{

+ayothaya.gat,213,142,5	script	Young Man#03	843,{

 	mes "[Detzi]";

 	mes "In Ayothaya, we have our own traditional martial arts. We, the young men of the village, practice our traditional martial arts in order to become strong.";

 	next;