From e07326b0aa71a74cacd425e30745bb01a60b153f Mon Sep 17 00:00:00 2001
From: Playtester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Fri, 16 Jun 2006 10:02:18 +0000
Subject: * 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
---
 npc/merchants/hair_style.txt | 5 +++--
 npc/merchants/inn.txt        | 5 +++--
 npc/merchants/refine.txt     | 9 +++++----
 3 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'npc/merchants')

diff --git a/npc/merchants/hair_style.txt b/npc/merchants/hair_style.txt
index c2dada38e..4a4daff36 100644
--- a/npc/merchants/hair_style.txt
+++ b/npc/merchants/hair_style.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= [Muad_Dib] 1.0 (The Prometheus Project)
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= Any Athena Version; RO Episode 6+
 //===== Description: =========================================
@@ -15,9 +15,10 @@
 //= http://www.nattsumi.com/roquest/miscellaneousquest.html
 //= Fixed typos [Nexon]
 //= TODO: Fix exploits V_V [Lupus]
+//= 1.1 Removed Duplicates [Silent]
 //============================================================
 
-alberta.gat,137,37,6	script	Stylist	91,{
+alberta.gat,137,37,6	script	Stylist#01	91,{
 	mes "[Veronica]";
 	mes "Welcome~~Welcome~~";
 	mes "Welcome to the one of the best Hair shop, Veronicas Beauty Saloon!!";
diff --git a/npc/merchants/inn.txt b/npc/merchants/inn.txt
index 03663f7ff..218fc5d1b 100644
--- a/npc/merchants/inn.txt
+++ b/npc/merchants/inn.txt
@@ -4,7 +4,7 @@
 //= Darkchild (1.1)
 //= Playtester (1.2)
 //===== Current Version: ===================================== 
-//= 1.2
+//= 1.3
 //===== Compatible With: ===================================== 
 //= eAthena 1.0+
 //===== Description: ========================================= 
@@ -22,6 +22,7 @@
 //= 1.1a Minor bug fixes and optimizations. Switched from @variables 
 //= to arguments.[kobra_k88]
 //= 1.2 Rewrote inn script [Playtester]
+//= 1.3 Removed Duplicates [Silent]
 //============================================================ 
 
 
@@ -33,7 +34,7 @@ prt_in.gat,244,135,2	script	Inn Maid::Sammy	53,{
 	warp "prt_in.gat",237,102;
 }
 // East Side Inn ------------------
-prt_in.gat,61,141,2	script	Inn Maid::Ahlma	53,{
+prt_in.gat,61,141,2	script	Inn Maid::Ahlma#01	53,{
 
 	callfunc "F_InnMaid","[Ahlma]","East Inn","prt_in.gat",64,136;
 	warp "prt_in.gat",49,173;
diff --git a/npc/merchants/refine.txt b/npc/merchants/refine.txt
index e0f714bcf..1ea743dc3 100644
--- a/npc/merchants/refine.txt
+++ b/npc/merchants/refine.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Syrus22 (1.1) dafide18 (1.4) Skotlex (1.5)
 //===== Current Version: =====================================
-//= 2.0
+//= 2.1
 //===== Compatible With: =====================================
 //= Any Freya Version
 //===== Description: =========================================
@@ -37,6 +37,7 @@
 //= 2.0 - Fixed missed equppment presence check. Thx2 Coltaro [Lupus]
 //= 2.0a - Added weight checks thanks to Neouni [Playtester]
 //= 2.0b - Fixed the names of Lighthalzen and Einbroch refiners thanks to Maud_Dib [Kargha]
+//= 2.1 - Removed Duplicates [Silent]
 //============================================================
 
 
@@ -763,17 +764,17 @@ prt_in.gat,62,54,2	script	Grendal	84,{
 	end;
 }
 //Temp Spot, Not Sure Where To place
-payon.gat,149,182,2	script	Repairman	88,{
+payon.gat,149,182,2	script	Repairman#01	88,{
 	set @name$,"Repairman";
 	callfunc "repairmain";
 	end;
 }
-morocc_in.gat,71,40,2	script	Repairman	99,{
+morocc_in.gat,71,40,2	script	Repairman#02	99,{
 	set @name$,"Repairman";
 	callfunc "repairmain";
 	end;
 }
-lhz_in02.gat,284,14,3	script	Repairman	86,{
+lhz_in02.gat,284,14,3	script	Repairman#03	86,{
 	set @name$,"Repairman";
 	callfunc "repairmain";
 	end;
-- 
cgit v1.2.3-70-g09d2