From e07326b0aa71a74cacd425e30745bb01a60b153f Mon Sep 17 00:00:00 2001 From: Playtester 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/events/custom/p_track/p_track_core.txt | 10 +++++----- npc/events/custom/p_track/p_track_warpers.txt | 12 ++++++------ npc/events/custom/valentinesdayexp.txt | 9 +++++---- npc/events/twintowers.txt | 5 +++-- 4 files changed, 19 insertions(+), 17 deletions(-) (limited to 'npc/events') diff --git a/npc/events/custom/p_track/p_track_core.txt b/npc/events/custom/p_track/p_track_core.txt index 691555ffb..c2fb27bd1 100644 --- a/npc/events/custom/p_track/p_track_core.txt +++ b/npc/events/custom/p_track/p_track_core.txt @@ -3,16 +3,16 @@ //===== By: ================================================== //= erKURITA //===== Current Version: ===================================== -//= 0.0000000000000001 +//= 0.0000000000000002 //===== Compatible With: ===================================== //= eAthena 1.0 //===== Description: ========================================= //= NPCs that has nothing to do with the race itself, but //= has important functions on the race itself. //===== Additional Comments: ================================= -//= +//= 0.0000000000000002 Removed Duplicates [Silent] //============================================================ -p_track01.gat,41,57,5 script Lady::P_track 845,{ +p_track01.gat,41,57,5 script Lady#track1::P_track 845,{ end; } @@ -36,8 +36,8 @@ p_track02.gat,42,49,3 script Asgahrd 733,{ end; } -p_track02.gat,67,33,1 script Blacksmith 726,{ +p_track02.gat,67,33,1 script Blacksmith#track1 726,{ end; } -p_track02.gat,41,57,5 duplicate(P_track) Lady 845 \ No newline at end of file +p_track02.gat,41,57,5 duplicate(P_track) Lady#track2 845 \ No newline at end of file diff --git a/npc/events/custom/p_track/p_track_warpers.txt b/npc/events/custom/p_track/p_track_warpers.txt index 4209f2cac..58154c3d2 100644 --- a/npc/events/custom/p_track/p_track_warpers.txt +++ b/npc/events/custom/p_track/p_track_warpers.txt @@ -3,21 +3,21 @@ //===== By: ================================================== //= erKURITA //===== Current Version: ===================================== -//= 0.0000000000000001 +//= 0.0000000000000002 //===== Compatible With: ===================================== //= eAthena 1.0 //===== Description: ========================================= //= NPC's for the City of Hugel. //===== Additional Comments: ================================= -//= +//= 0.0000000000000002 Removed Duplicates [Silent] //============================================================ //| Warp-in npcs -hugel.gat,58,72,5 script Yan 86,{ +hugel.gat,58,72,5 script Yan#track1 86,{ //callfunc "P_TrackEnt",npcname,map name; callfunc "P_TrackEnt","[Yan]","p_track01.gat"; end; } -hugel.gat,62,68,1 script Yalmire 86,{ +hugel.gat,62,68,1 script Yalmire#track1 86,{ //callfunc "P_TrackEnt",npcname,map name; callfunc "P_TrackEnt","[Yalmire]","p_track02.gat"; end; @@ -25,11 +25,11 @@ end; //| Warp-out npcs -p_track01.gat,76,36,2 script Yan 86,{ +p_track01.gat,76,36,2 script Yan#track2 86,{ end; } -p_track02.gat,76,36,2 script Yalmire 86,{ +p_track02.gat,76,36,2 script Yalmire#track2 86,{ end; } diff --git a/npc/events/custom/valentinesdayexp.txt b/npc/events/custom/valentinesdayexp.txt index 4992bf665..5a3a471e6 100644 --- a/npc/events/custom/valentinesdayexp.txt +++ b/npc/events/custom/valentinesdayexp.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Lupus (based on Muad_Dib's work) //===== Current Version: ===================================== -//= 1.02 +//= 1.1 //===== Compatible With: ===================================== //= Any Athena Version 45xx+ //===== Description: ========================================= @@ -13,6 +13,7 @@ //===== Additional Comments: ================================= //= WARNING!! To use this event, dicable original valentinesday.txt //= You can use this event from 12 till 16 February 8) [Lupus] +//= 1.1 Removed Duplicates [Silent] //============================================================ // Tine - Valentine Event Chocolate Even Guide ------------------ @@ -74,7 +75,7 @@ OnInit: } // Stephen - Valentine Event Chocolate seller ------------------ -alberta.gat,26,243,4 script Stephen 58,{ +alberta.gat,26,243,4 script Stephen#val1 58,{ mes "[Stephen]"; mes "Guess what I've got?"; mes "A tasty treat not easily found in Rune-Midgard...."; @@ -129,7 +130,7 @@ L_NOTENO: } // Jainie -- Gives information about Valentine Event ------------------------ -alberta.gat,29,243,4 script Jainie 53,{ +alberta.gat,29,243,4 script Jainie#val1 53,{ mes "[Jainie]"; mes "You know what? The chocolate that my boyfriend sells are from me!"; mes "I made them by myself. Now I need some Milk for my special White Chocolate."; @@ -197,7 +198,7 @@ L_NOMILK: } // Carl Orleans -- Valentine Event Chocolate maker ------------------ -prt_castle.gat,54,34,4 script Carl Orleans 47,{ +prt_castle.gat,54,34,4 script Carl Orleans#val1 47,{ mes "[Carl Orleans]"; mes "Yes? What can I cook for you?"; next; diff --git a/npc/events/twintowers.txt b/npc/events/twintowers.txt index a899b84d5..95e83d607 100644 --- a/npc/events/twintowers.txt +++ b/npc/events/twintowers.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= sEiKaN (1.0) //===== Current Version: ===================================== -//= 1.4 +//= 1.5 //===== Compatible With: ===================================== //= Any Athena Version; 0315+ //===== Description: ========================================= @@ -11,6 +11,7 @@ //===== Additional Comments: ================================= //= 1.2 by Akaru 1.3 by massdriller(Fixed typos) //= 1.4 fixed coords, according to off. src [Lupus] +//= 1.5 Removed Duplicates [Silent] //============================================================ prontera.gat,146,92,4 script Twin Towers#tt1::Twin-Towers 813,{ @@ -90,4 +91,4 @@ izlude.gat,134,92,4 duplicate(Twin-Towers) Twin Towers#tt4 812 alberta.gat,25,238,4 duplicate(Twin-Towers) Twin Towers#tt5 812 geffen.gat,120,60,4 duplicate(Twin-Towers) Twin Towers#tt6 812 aldebaran.gat,143,116,4 duplicate(Twin-Towers) Twin Towers#tt7 812 -comodo.gat,194,158,4 duplicate(Twin-Towers) Twin Towers#tt7 812 +comodo.gat,194,158,4 duplicate(Twin-Towers) Twin Towers#tt8 812 -- cgit v1.2.3-70-g09d2