* 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

4 files changed, 33 insertions, 29 deletions

diff --git a/npc/airports/airships.txt b/npc/airports/airships.txt
index 992013753..23c763608 100644
--- a/npc/airports/airships.txt
+++ b/npc/airports/airships.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 

 //= MasterOfMuppets

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

-//= 0.2

+//= 0.5

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

 //= eAthena SVN 3422+(Requires jA Script System)

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

@@ -16,6 +16,7 @@
 //= 0.2 Implemented some more airship NPCs, more are to come.

 //= 0.3 Implemented some more NPCs [MasterOfMuppets]

 //= 0.4 Implemented two mini games scripted by Dj-Yhn [MasterOfMuppets]

+//= 0.5 Removed Duplicates [Silent]

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

 

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

@@ -170,19 +171,19 @@ OnTimer260000:
 //= Some normal NPCS (airplane.gat)

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

 

-airplane.gat,240,64,5	script	Exit	857,{

+airplane.gat,240,64,5	script	Exit#01::Exit2	857,{

 

 end;

 

 }

 

-airplane.gat,247,64,5	duplicate(Exit)	Exit	857

+airplane.gat,247,64,5	duplicate(Exit2)	Exit#02	857

 

-airplane.gat,240,39,1	duplicate(Exit)	Exit	857

+airplane.gat,240,39,1	duplicate(Exit2)	Exit#03	857

 

-airplane.gat,247,39,1	duplicate(Exit)	Exit	857

+airplane.gat,247,39,1	duplicate(Exit2)	Exit#04	857

 

-airplane.gat,100,69,2	script	Airship Crew	852,{

+airplane.gat,100,69,2	script	Airship Crew#01::Airship Crew	852,{

 

 	mes "[Airship Crew]";

 	mes "If we've landed at";

@@ -654,23 +655,23 @@ OnTimer130000:
 //= Some normal NPCS (airplane_01.gat)

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

 

-airplane_01.gat,240,64,5	duplicate(Exit)	Exit	857

+airplane_01.gat,240,64,5	duplicate(Exit2)	Exit#05	857

 

-airplane_01.gat,247,64,5	duplicate(Exit)	Exit	857

+airplane_01.gat,247,64,5	duplicate(Exit2)	Exit#06	857

 

-airplane_01.gat,240,39,1	duplicate(Exit)	Exit	857

+airplane_01.gat,240,39,1	duplicate(Exit2)	Exit#07	857

 

-airplane_01.gat,247,39,1	duplicate(Exit)	Exit	857

+airplane_01.gat,247,39,1	duplicate(Exit2)	Exit#08	857

 

-airplane_01.gat,100,69,2	duplicate(Airship Crew)	Airship Crew	852

+airplane_01.gat,100,69,2	duplicate(Airship Crew)	Airship Crew#02	852

 

-airplane_01.gat,250,59,3	duplicate(AirshipInfo)	Airship Staff	67

+airplane_01.gat,250,59,3	duplicate(AirshipInfo)	Airship Staff#info	67

 

 airplane_01.gat,50,66,4	duplicate(AirshipApples)	Meltz	86

 

 airplane_01.gat,32,61,4	duplicate(TypingContest)	Nils	49	

 

-airplane_01.gat,83,61,2	script	Girl	72,{

+airplane_01.gat,83,61,2	script	Girl#10	72,{

 

 	mes "[Dianne]";

 	mes "It's so weird!";

@@ -683,7 +684,7 @@ airplane_01.gat,83,61,2	script	Girl	72,{
 

 }

 

-airplane_01.gat,69,63,2	script	Old Man	55,{

+airplane_01.gat,69,63,2	script	Old Man#06	55,{

 

 	mes "[Mendel]";

 	mes "As I expected, the";

diff --git a/npc/airports/einbroch.txt b/npc/airports/einbroch.txt
index 8a3787c22..07549dbe4 100644
--- a/npc/airports/einbroch.txt
+++ b/npc/airports/einbroch.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 

 //= L0ne_W0lf, Muad_Dib

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

-//= 1.1a

+//= 1.2

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

 //= eAthena Revision 3000+

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

@@ -11,10 +11,11 @@
 //===== Additional Comments: ================================= 

 //= Converted by Dr.Evil, 1.0b more typos and credits [Lupus]

 //= 1.1 Fixed wrong check, added extra condition [Justin84]

+//= 1.2 Removed Duplicates [Silent]

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

 

 

-airport.gat,126,43,4	script	Airport Staff#1::AirportE	90,{

+airport.gat,126,43,4	script	Airport Staff#01::AirportE	90,{

 	mes "[Airport Staff]";

 	mes "Welcome to the Airport.";

 	mes "How may I help you?";

@@ -53,14 +54,14 @@ airport.gat,126,43,4	script	Airport Staff#1::AirportE	90,{
 		close;

 }

 

-airport.gat,143,43,4	duplicate(AirportE)	Airport Staff#2	90,{

+airport.gat,143,43,4	duplicate(AirportE)	Airport Staff#02	90,{

 //	script Airport_Staff_In;

 }

-airport.gat,156,43,4	duplicate(AirportE)	Airport Staff#3	90,{

+airport.gat,156,43,4	duplicate(AirportE)	Airport Staff#03	90,{

 //	script Airport_Staff_In;

 }

 

-airport.gat,126,51,4	script	Airport Staff#4::AirportE2	90,{

+airport.gat,126,51,4	script	Airport Staff#04::AirportE2	90,{

 	mes "[Airport Staff]";

 	mes "Welcome~";

 	mes "Please head this";

@@ -90,10 +91,10 @@ airport.gat,126,51,4	script	Airport Staff#4::AirportE2	90,{
 		close;

 }

 

-airport.gat,143,51,4	duplicate(AirportE2)	Airport Staff#5	90,{

+airport.gat,143,51,4	duplicate(AirportE2)	Airport Staff#05	90,{

 }

 

-airport.gat,156,51,4	duplicate(AirportE2)	Airport Staff#6	90,{

+airport.gat,156,51,4	duplicate(AirportE2)	Airport Staff#06	90,{

 }

 

 einbroch.gat,94,267,4	script	Airship Staff	91,{

diff --git a/npc/airports/lighthalzen.txt b/npc/airports/lighthalzen.txt
index 8286778b9..1ae6a30ca 100644
--- a/npc/airports/lighthalzen.txt
+++ b/npc/airports/lighthalzen.txt
@@ -3,13 +3,14 @@
 //===== By: ================================================== 

 //= L0ne_W0lf, Muad_Dib

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

-//= 1.0

+//= 1.1

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

 //= eAthena Revision 3000+

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

 //= Lighthalzen Airport Staff

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

 //= 1.0 Cloned from einbroch.txt [Justin84]

+//= 1.1 Removed Duplicates [Silent]

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

 

 

diff --git a/npc/airports/yuno.txt b/npc/airports/yuno.txt
index 1924b4ea0..81245e170 100644
--- a/npc/airports/yuno.txt
+++ b/npc/airports/yuno.txt
@@ -3,17 +3,18 @@
 //===== By: ================================================== 

 //= L0ne_W0lf, Muad_Dib

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

-//= 1.0

+//= 1.1

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

 //= eAthena Revision 3000+

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

 //= Yuno Airport Staff

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

 //= 1.0 Cloned from Einbroch [Justin84]

+//= 1.1 Removed Duplicates [Silent]

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

 

 

-y_airport.gat,126,43,4	script	Airport Staff#1::AirportY	90,{

+y_airport.gat,126,43,4	script	Airport Staff#001::AirportY	90,{

 	mes "[Airport Staff]";

 	mes "Welcome to the Airport.";

 	mes "How may I help you?";

@@ -52,14 +53,14 @@ y_airport.gat,126,43,4	script	Airport Staff#1::AirportY	90,{
 		close;

 }

 

-y_airport.gat,143,43,4	duplicate(AirportY)	Airport Staff#2	90,{

+y_airport.gat,143,43,4	duplicate(AirportY)	Airport Staff#002	90,{

 // script Airport_Staff_In;

 }

-y_airport.gat,156,43,4	duplicate(AirportY)	Airport Staff#3	90,{

+y_airport.gat,156,43,4	duplicate(AirportY)	Airport Staff#003	90,{

 // script Airport_Staff_In;

 }

 

-y_airport.gat,126,51,4	script	Airport Staff#4::AirportY2	90,{

+y_airport.gat,126,51,4	script	Airport Staff#004::AirportY2	90,{

 	mes "[Airport Staff]";

 	mes "Welcome~";

 	mes "Please head this";

@@ -89,8 +90,8 @@ y_airport.gat,126,51,4	script	Airport Staff#4::AirportY2	90,{
 		close;

 }

 

-y_airport.gat,143,51,4	duplicate(AirportY2)	Airport Staff#5	90,{

+y_airport.gat,143,51,4	duplicate(AirportY2)	Airport Staff#005	90,{

 }

 

-y_airport.gat,156,51,4	duplicate(AirportY2)	Airport Staff#6	90,{

+y_airport.gat,156,51,4	duplicate(AirportY2)	Airport Staff#006	90,{

 }