* 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, 17 insertions, 13 deletions

diff --git a/npc/warps/dungeons/alde_ct.txt b/npc/warps/dungeons/alde_ct.txt
index 2ec503dc2..b86949b49 100644
--- a/npc/warps/dungeons/alde_ct.txt
+++ b/npc/warps/dungeons/alde_ct.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================

 //= Nana (1.0)

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

-//= 1.3

+//= 1.4

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

 //= Any Athena Version; RO Episode 2+

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

@@ -11,6 +11,7 @@
 //===== Additional Comments: =================================

 //= Split off Aldebaran.txt 1.1 fixed clt007 warp

 //= 1.3 Optimized [Lupus]

+//= 1.4 Removed Duplicates [Silent]

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

 

 //= Al De Baran Clock Tower

@@ -163,7 +164,7 @@ alde_dun02.gat,122,169,0	warp	ald006	2,2,c_tower3.gat,47,41
 alde_dun02.gat,187,234,0	warp	ald007	2,2,c_tower3.gat,65,147

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

 //= Random B2 ================================================

-alde_dun02.gat,267,41,4	script	clt008r	45,1,1,{

+alde_dun02.gat,267,41,4	script	ald008r	45,1,1,{

 	if(rand(2)) {

 		warp "c_tower3.gat",168,252;

 	} else {

@@ -178,7 +179,7 @@ alde_dun03.gat,276,48,0	warp	ald012	2,2,c_tower1.gat,235,223
 //============================================================

 //7(npc)

 //= Random B3-1 ================================================

-alde_dun03.gat,130,125,4	script	clt014r	45,1,1,{

+alde_dun03.gat,130,125,4	script	ald014r	45,1,1,{

 	set @r,rand(3);

 	if(@r==1) goto w2;

 	if(@r==2) goto w3;

@@ -188,7 +189,7 @@ alde_dun03.gat,130,125,4	script	clt014r	45,1,1,{
 }

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

 //= Random 3-2 ===============================================

-alde_dun03.gat,171,127,4	script	clt015r	45,1,1,{

+alde_dun03.gat,171,127,4	script	ald015r	45,1,1,{

 	set @r,rand(4);

 	if(@r==1) goto w2;

 	if(@r==2) goto w3;

@@ -202,7 +203,7 @@ alde_dun04.gat,215,192,0	warp	ald018	1,1,c_tower2.gat,148,283
 alde_dun04.gat,32,74,0	warp	aldd19	1,1,alde_dun02.gat,187,239

 alde_dun04.gat,208,58,0	warp	aldd20	2,2,alde_dun04.gat,268,74

 alde_dun04.gat,272,74,0	warp	aldd021	2,2,alde_dun04.gat,204,62

-alde_dun04.gat,80,34,4	script	clt022r	45,1,1,{

+alde_dun04.gat,80,34,4	script	ald022r	45,1,1,{

 	set @r,rand(4);

 	if(@r==1) goto w2;

 	if(@r==2) goto w3;

diff --git a/npc/warps/dungeons/ant_hell.txt b/npc/warps/dungeons/ant_hell.txt
index 94d12ea1c..1fc483850 100644
--- a/npc/warps/dungeons/ant_hell.txt
+++ b/npc/warps/dungeons/ant_hell.txt
@@ -3,13 +3,14 @@
 //===== By: ==================================================

 //= Nana (1.0)

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

-//= 1.3

+//= 1.4

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

 //= Any Athena Version

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

 //= Warp Points for Ant Hell

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

 //= 1.3 Changed var anthell to @anthell. Optimized [Lupus]

+//= 1.4 Removed Duplicates [Silent]

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

 

 //= Ant Hell =================================================

@@ -21,7 +22,7 @@ anthell01.gat,35,267,0	script	ant001	45,1,1,{
 	}

 	end;

 }

-anthell02.gat,171,169,0	script	ant001	45,1,2,{

+anthell02.gat,171,169,0	script	ant002	45,1,2,{

 	if(@anthell) {

 		warp "moc_fild04.gat",213,327;

 	} else {

diff --git a/npc/warps/dungeons/odin.txt b/npc/warps/dungeons/odin.txt
index a4993f60a..4abbbbcad 100644
--- a/npc/warps/dungeons/odin.txt
+++ b/npc/warps/dungeons/odin.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================

 //= birkiczd  (1.0)

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

-//= 1.1

+//= 1.2

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

 //= Any Athena Version

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

@@ -11,6 +11,7 @@
 //===== Additional Comments: =================================

 //= 1.1 Move the Saylor from Hugel.txt here. [Poki#3]

 //=	Hako's Sprite, cords and price is official. The text is not.

+//= 1.2 Removed Duplicates [Silent]

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

 

 odin_tem01.gat,378,181,0	warp	odin01	1,1,odin_tem02.gat,22,181

@@ -22,7 +23,7 @@ odin_tem03.gat,122,48,0	warp	odin06	1,1,odin_tem02.gat,153,347
 odin_tem02.gat,259,374,0	warp	odin07	1,1,odin_tem03.gat,249,35

 odin_tem03.gat,249,33,0	warp	odin08	1,1,odin_tem02.gat,262,371

 

-hugel.gat,209,109,1	script	Sailor Hako	709,{

+hugel.gat,209,109,1	script	Sailor Hako#01	709,{

 	mes "[Sailor Hako]";

 	mes "Hello stranger. I'm the only person that offers a unique trip to the cursed Odin Islands.";

 	mes "One of the strongest monsters known to man live there, so no wonder. Ha, ha, ha~!";

@@ -50,7 +51,7 @@ L_No:
 	close;

 }

 

-odin_tem01.gat,93,146,3	script	Sailor Hako	709,{

+odin_tem01.gat,93,146,3	script	Sailor Hako#02	709,{

 	mes "[Sailor Hako]";

 	mes "So how is it? Not to hard for ya? Wanna to go back to Hugel?";

 	next;

diff --git a/npc/warps/fields/abyss_warper.txt b/npc/warps/fields/abyss_warper.txt
index 807c88fd2..502e05d0b 100644
--- a/npc/warps/fields/abyss_warper.txt
+++ b/npc/warps/fields/abyss_warper.txt
@@ -3,16 +3,17 @@
 //===== By: ==================================================

 //= erKURITA

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

-//= 1.0

+//= 1.1

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

 //= Any Athena Version

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

 //= Warper to Abyss Cave. and warper out

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

 //= 1.0 Added by Nexon [Nexon]

+//= 1.1 Removed Duplicates [Silent]

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

 

-hu_fild05.gat,168,303,0	script	Pillar	111,{

+hu_fild05.gat,168,303,0	script	Pillar#01	111,{

 	mes "[Ancient Voice]";

 	mes "So, you wish access to the Abyss Cave?";

 	mes "You have to bring me then 1 Dragon Canine, 1 Dragon Tail and 1 Dragon Scale";

@@ -58,7 +59,7 @@ OnInit:
 }

 

 

-hu_fild05.gat,171,212,0 script Pillar 111,{

+hu_fild05.gat,171,212,0 script Pillar#02 111,{

 	mes "[Ancient Voice]";

 	mes "Leave the island?";

 	next;