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/Changelog.txt | 4 + npc/airports/airships.txt | 29 +++--- npc/airports/einbroch.txt | 15 +-- npc/airports/lighthalzen.txt | 3 +- npc/airports/yuno.txt | 15 +-- npc/cities/alberta.txt | 11 ++- npc/cities/aldebaran.txt | 13 +-- npc/cities/amatsu.txt | 37 ++++---- npc/cities/ayothaya.txt | 17 ++-- npc/cities/comodo.txt | 13 +-- npc/cities/einbech.txt | 9 +- npc/cities/einbroch.txt | 29 +++--- npc/cities/geffen.txt | 17 ++-- npc/cities/gonryun.txt | 19 ++-- npc/cities/izlude.txt | 7 +- npc/cities/lighthalzen.txt | 43 +++++---- npc/cities/louyang.txt | 41 ++++---- npc/cities/morocc.txt | 7 +- npc/cities/niflheim.txt | 5 +- npc/cities/payon.txt | 17 ++-- npc/cities/prontera.txt | 5 +- npc/cities/valkyrie.txt | 5 +- npc/custom/MVP_arena/arena_mvp.txt | 65 ++++++------- npc/custom/airplane.txt | 49 +++++----- npc/custom/eAAC_Scripts/disguiser.txt | 15 +-- npc/custom/eAAC_Scripts/quest_warper.txt | 132 +++++++++++++------------- npc/custom/eAAC_Scripts/vendmachine.txt | 8 +- npc/custom/healers/heal_payment.txt | 35 +++---- npc/custom/morroc_raceway.txt | 31 +++--- npc/custom/mvm.txt | 11 ++- npc/custom/quests/thq/THQS_Quests.txt | 15 +-- npc/custom/warper/warper.txt | 87 ++++++++--------- 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 +- npc/guides/guides_alde.txt | 5 +- npc/guides/guides_ama.txt | 7 +- npc/guides/guides_einbe.txt | 5 +- npc/guides/guides_einbr.txt | 7 +- npc/guides/guides_gef.txt | 9 +- npc/guides/guides_hu.txt | 5 +- npc/guides/guides_lhz.txt | 7 +- npc/guides/guides_mor.txt | 9 +- npc/guides/guides_pay.txt | 7 +- npc/guides/guides_pron.txt | 23 ++--- npc/guides/guides_yun.txt | 19 ++-- npc/guild/aldeg/aldeg_managers.txt | 11 ++- npc/jobs/1-1/merchant.txt | 5 +- npc/jobs/1-1/swordman.txt | 23 ++--- npc/jobs/2-1/assassin.txt | 7 +- npc/jobs/2-1/blacksmith.txt | 5 +- npc/jobs/2-1/hunter.txt | 5 +- npc/jobs/2-2/monk.txt | 33 +++---- npc/jobs/2-2/rogue.txt | 15 +-- npc/jobs/novice/novice.txt | 27 +++--- npc/merchants/hair_style.txt | 5 +- npc/merchants/inn.txt | 5 +- npc/merchants/refine.txt | 9 +- npc/other/bulletin_boards.txt | 61 ++++++------ npc/other/dts_warper.txt | 17 ++-- npc/other/msg_boards.txt | 7 +- npc/quests/monstertamers.txt | 9 +- npc/quests/quests_aldebaran.txt | 5 +- npc/quests/quests_ayothaya.txt | 27 +++--- npc/quests/quests_geffen.txt | 5 +- npc/quests/quests_lighthalzen.txt | 11 ++- npc/quests/quests_payon.txt | 7 +- npc/quests/quests_prontera.txt | 5 +- npc/quests/skills/merchant_skills.txt | 4 +- npc/warps/dungeons/alde_ct.txt | 11 ++- npc/warps/dungeons/ant_hell.txt | 5 +- npc/warps/dungeons/odin.txt | 7 +- npc/warps/fields/abyss_warper.txt | 7 +- 74 files changed, 680 insertions(+), 606 deletions(-) (limited to 'npc') diff --git a/npc/Changelog.txt b/npc/Changelog.txt index eb8b5de77..fd197054f 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -36,6 +36,10 @@ Musashiden Date Added ====== +06/16 + * Commited Silent's Fix to the duplicate NPCs [Playtester] + - needs testing + - can't be fully fixed because of length limitation of names 06/15 * Juno's NPCs are now updated (unless i missed one) according to iRO! yay! [Musashiden] * Juno Update Process. 75% complete. [Musashiden] 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,{ } diff --git a/npc/cities/alberta.txt b/npc/cities/alberta.txt index 0930d9e7a..47cf01ca1 100644 --- a/npc/cities/alberta.txt +++ b/npc/cities/alberta.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== -//= 1.8 +//= 2.0 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -19,12 +19,13 @@ //= 1.7 Fixed Phelix bugs [Lupus] //= 1.8 Got rid of 2 useless variables, fixed Turtle Island Quest exploit [Lupus] //= 1.9 Added two NPCs shown at RO Magazine [Playtester] +//= 2.0 Removed Duplicates [Silent] //============================================================ //NewsPaper(?) alberta.gat,148,53,1 script Newspaper Girl 831,{end;} //??? -alberta.gat,148,60,3 script Man 833,{end;} +alberta.gat,148,60,3 script Man#03 833,{end;} // Young Man ----------------------------------------------------------- alberta_in.gat,20,183,6 script Young Man 49,{ @@ -34,7 +35,7 @@ alberta_in.gat,20,183,6 script Young Man 49,{ } // Merchant ------------------------------------------------- -alberta.gat,97,51,7 script Merchant 84,{ +alberta.gat,97,51,7 script Merchant#01 84,{ mes "[Merchant]"; mes "When you travel to many places like I do, you often here a lot of rumors. There is one rumor I heard that is really interesting."; next; @@ -48,7 +49,7 @@ alberta.gat,97,51,7 script Merchant 84,{ } // Merchant --------------------------------------------------------- -alberta.gat,53,39,8 script Merchant 74,{ +alberta.gat,53,39,8 script Merchant#02 74,{ mes "[Merchant]"; mes "Oh, you look like a stranger. Welcome to Alberta."; emotion e_gasp; @@ -67,7 +68,7 @@ alberta.gat,53,39,8 script Merchant 74,{ } // Merchant ------------------------------------------------- -alberta.gat,58,80,8 script Merchant 99,{ +alberta.gat,58,80,8 script Merchant#03 99,{ mes "[Merchant]"; if(rand(2)) goto R_1; mes "We merchants can open a roadside stand and do business. With the ^0000ffDiscount skill^000000 we can buy goods from stores for low prices."; diff --git a/npc/cities/aldebaran.txt b/npc/cities/aldebaran.txt index 2961a8a8c..f3314168c 100644 --- a/npc/cities/aldebaran.txt +++ b/npc/cities/aldebaran.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= eAthena dev team //===== Current Version: ===================================== -//= 1.7 +//= 1.8 //===== Compatible With: ===================================== //= eAthena 1.0 //===== Description: ========================================= @@ -20,6 +20,7 @@ //= also changed typo Orange Potions -> Red Potions [Lupus] //= 1.6 Fixed bug (missing label), optimized all menus [Lupus] //= 1.7 Fixed exploits [Lupus] +//= 1.8 Removed Duplicates [Silent] //============================================================ @@ -568,7 +569,7 @@ aldeba_in.gat,152,47,4 script Giddy Fellow 97,{ } // Master ---------------------------------------------------------- -aldeba_in.gat,156,179,4 script Master 61,{ +aldeba_in.gat,156,179,4 script Master#02 61,{ mes "[Master]"; if(sex==0) mes "Oh hello. Don't mind me, I'm just a perverted old man.... la di da......."; if(sex==0) close; @@ -817,7 +818,7 @@ aldeba_in.gat,24,245,4 script Kafra Jasmine 115,{ } // Special Reserve ---------------------------------------------- -aldeba_in.gat,79,161,6 script Kafra 115,{ +aldeba_in.gat,79,161,6 script Kafra#04 115,{ cutin "kafra_03",2; mes "[Kafra]"; mes "Welcome, ^6666FF" + strcharinfo(0) + "^000000. This is where you can trade in your special reserve points for useful items and cool prizes."; @@ -1004,7 +1005,7 @@ M_Menu: } // Special Reserve 2 ---------------------------------------------- -aldeba_in.gat,88,161,3 script Kafra 115,{ +aldeba_in.gat,88,161,3 script Kafra#05 115,{ cutin "kafra_03",2; mes "[Kafra]"; mes "Welcome ^5577FF"+strcharinfo(0)+"^000000. We are currently having a special event for our customers."; @@ -1356,7 +1357,7 @@ aldebaran.gat,143,136,4 script Clock Keeper 89,{ } // Gatekeeper Riku ------------------------------------------------------------------- -c_tower3.gat,10,249,4 script Gatekeeper 84,{ +c_tower3.gat,10,249,4 script Gatekeeper#01 84,{ mes "[Gatekeeper Riku]"; mes "Welcome to "; mes "Kinase - Blue Gallino"; @@ -1450,7 +1451,7 @@ c_tower3.gat,10,249,4 script Gatekeeper 84,{ } //<======================================== Al De Baran Dungeon ==========================================>\\ -alde_dun03.gat,264,16,4 script Gatekeeper 101,{ +alde_dun03.gat,264,16,4 script Gatekeeper#02 101,{ mes "[Gatekeeper Boy]"; mes "Welcome to"; mes "Kinase - Blue Gallino"; diff --git a/npc/cities/amatsu.txt b/npc/cities/amatsu.txt index 466c6b22b..24d4e7398 100644 --- a/npc/cities/amatsu.txt +++ b/npc/cities/amatsu.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Some people & eAthena Dev Team //===== Current Version: ===================================== -//= 1.07 +//= 1.08 //===== Compatible With: ===================================== //= Any eAthena Version; Niflheim Required //===== Description: ========================================= @@ -18,8 +18,9 @@ // 1.05 Changed all breaks to ends. [Skotlex] // 1.06 The Captain now uses iRO dialog [MasterOfMuppets] // 1.07 Implemented a missing NPC [MasterOfMuppets] +// 1.08 Removed Duplicates [Silent] //===================================================================== -alberta.gat,245,93,4 script Sea Captain 709,{ +alberta.gat,245,93,4 script Sea Captain#01 709,{ mes "[Walter Moers]"; mes "Hey, there."; mes "Have you ever heard that there"; @@ -138,7 +139,7 @@ alberta.gat,245,93,4 script Sea Captain 709,{ close; } //===================================================================== -amatsu.gat,194,79,4 script Sea Captain 709,{ +amatsu.gat,194,79,4 script Sea Captain#02 709,{ mes "[Walter Moers]"; mes "You came... Did you enjoy"; mes "your trip to Amatsu...?"; @@ -472,7 +473,7 @@ amatsu.gat,230,160,4 script Lady 757,{ close; } //===================================================================== -amatsu.gat,171,174,4 script Guard Soldier 767,{ +amatsu.gat,171,174,4 script Guard Soldier#01 767,{ if ((event_amatsu == 0) || (event_amatsu == 1)) goto L0; if (event_amatsu == 6) goto L1; if (event_amatsu == 7) goto L2; @@ -511,7 +512,7 @@ L2: close; } //===================================================================== -amatsu.gat,164,174,4 script Guard Soldier 767,{ +amatsu.gat,164,174,4 script Guard Soldier#02 767,{ if (event_amatsu == 0) goto LOnce; if ((event_amatsu >= 2) && (event_amatsu <= 5)) goto L2; if (event_amatsu == 6) goto L3; @@ -555,7 +556,7 @@ L4: close; } //===================================================================== -amatsu.gat,119,164,4 script Guard Soldier 767,{ +amatsu.gat,119,164,4 script Guard Soldier#03 767,{ mes "[Guard Soldier]"; mes "Are you from Rune-Midgard?"; mes "Welcome to the town of Amatsu."; @@ -571,7 +572,7 @@ amatsu.gat,119,164,4 script Guard Soldier 767,{ close; } //===================================================================== -amatsu.gat,112,164,4 script Guard Soldier 767,{ +amatsu.gat,112,164,4 script Guard Soldier#04 767,{ mes "[Guard Soldier]"; mes "This is the best castle in Amatsu,"; mes "called the East Lake Castle."; @@ -587,7 +588,7 @@ amatsu.gat,112,164,4 script Guard Soldier 767,{ } //===================================================================== -ama_in01.gat,22,111,0 script Old Lady 761,{ +ama_in01.gat,22,111,0 script Old Lady#01 761,{ if (event_amatsu == 5) goto LStart2; if (event_amatsu == 6) goto LStart3; if (event_amatsu == 7) goto LStart4; @@ -725,7 +726,7 @@ LStart4: } //===================================================================== -ama_in02.gat,207,40,6 script Guard Soldier 767,{ +ama_in02.gat,207,40,6 script Guard Soldier#05 767,{ mes "[Guard Soldier]"; mes "Welcome,"; mes "The Master specifically allowed"; @@ -737,7 +738,7 @@ ama_in02.gat,207,40,6 script Guard Soldier 767,{ close; } //===================================================================== -ama_in02.gat,207,49,6 script Guard Soldier 767,{ +ama_in02.gat,207,49,6 script Guard Soldier#06 767,{ mes "[Guard Soldier]"; mes "The master is really a great guy."; mes "Who would have thought that anyone could"; @@ -752,7 +753,7 @@ ama_in02.gat,207,49,6 script Guard Soldier 767,{ close; } //===================================================================== -ama_in02.gat,187,57,2 script Soldier 767,{ +ama_in02.gat,187,57,2 script Soldier#01 767,{ mes "[Ichiro]"; mes "Welcome, our master"; mes "has already prepared a place"; @@ -767,7 +768,7 @@ ama_in02.gat,187,57,2 script Soldier 767,{ close; } //===================================================================== -ama_in02.gat,170,62,4 script Soldier 767,{ +ama_in02.gat,170,62,4 script Soldier#02 767,{ mes "[Kyro]"; mes "My name is Kyro. In this town"; mes "I handle all the administrative work."; @@ -824,7 +825,7 @@ L3: } //===================================================================== -ama_in02.gat,37,157,4 script Soldier 767,{ +ama_in02.gat,37,157,4 script Soldier#03 767,{ mes "[Sbarro]"; mes "This is our soldier's"; mes "training ground."; @@ -872,7 +873,7 @@ ama_in02.gat,32,51,6 script Shiro 767,{ close; } //===================================================================== -ama_in02.gat,40,167,3 script Soldier 767,{ +ama_in02.gat,40,167,3 script Soldier#04 767,{ mes "[Kuro]"; mes "Shh... customer, please be quiet."; mes "I will tell you a story"; @@ -925,7 +926,7 @@ ama_in02.gat,32,167,5 script Kukuro 767,{ close; } //===================================================================== -ama_in02.gat,42,34,2 script Soldier 767,{ +ama_in02.gat,42,34,2 script Soldier#05 767,{ mes "[Hakiro]"; mes "Rest for a while before leaving,"; mes "master has already prepared"; @@ -943,7 +944,7 @@ ama_in02.gat,42,34,2 script Soldier 767,{ } //===================================================================== -ama_in02.gat,203,156,4 script Soldier 767,{ +ama_in02.gat,203,156,4 script Soldier#06 767,{ mes "[Hakiro]"; mes "Master is in there."; mes "If you want to go greet him,"; @@ -958,7 +959,7 @@ ama_in02.gat,203,156,4 script Soldier 767,{ } //===================================================================== -ama_in02.gat,195,156,4 script Soldier 767,{ +ama_in02.gat,195,156,4 script Soldier#07 767,{ mes "[Kuro]"; mes "Damn, maybe the master"; mes "is having a hard time right now."; @@ -1053,7 +1054,7 @@ Lnoflag: mes "I hope you have a good time..."; close; } -ama_dun01.gat,229,7,0 script Soldier 767,{ +ama_dun01.gat,229,7,0 script Soldier#08 767,{ mes "[Juro]"; mes "Ready to leave?"; next; 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; diff --git a/npc/cities/comodo.txt b/npc/cities/comodo.txt index 8a6e5f04e..a7bd795d5 100644 --- a/npc/cities/comodo.txt +++ b/npc/cities/comodo.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= eAthena dev team //===== Current Version: ===================================== -//= 1.4 +//= 1.5 //===== Compatible With: ===================================== //= eAthena 1.0 //===== Description: ========================================= @@ -15,6 +15,7 @@ //= 1.2b Added Baby Class support [Lupus] //= 1.3 Spell Checked and Fixed [massdriller] //= 1.4 Fixed typos [Nexon] +//= 1.5 Removed Duplicates [Silent] //============================================================ @@ -193,7 +194,7 @@ cmd_in02.gat,73,81,4 script Martine 48,{ } //============================================================= -cmd_in02.gat,64,43,4 script Roberto 709,{ +cmd_in02.gat,64,43,4 script Roberto#01 709,{ mes "[Roberto]"; mes "Muhahaha... What a stupid man! Now that's easy money! (~counts his money~)"; emotion e_gg; @@ -1226,7 +1227,7 @@ L_4: //============================================================================// //================================================== -cmd_fild07.gat,192,58,4 script Light House Guard 100,{ +cmd_fild07.gat,192,58,4 script Light House Guard#01 100,{ mes "[Rahasu]"; mes "Good morning, I am Rahasu, your guide to the"; mes "^3355FF`lighthouses'^000000"; @@ -1250,7 +1251,7 @@ cmd_fild07.gat,192,58,4 script Light House Guard 100,{ } //========================================================= -cmd_fild07.gat,52,280,4 script Light House Guard 100,{ +cmd_fild07.gat,52,280,4 script Light House Guard#02 100,{ mes "[Hallosu]"; mes "That's correct, this is one of the two lighthouses in this area."; mes "However, I can not let anyone go in yet because the lighthouse's interior is still under reconstruction."; @@ -1262,7 +1263,7 @@ cmd_fild07.gat,52,280,4 script Light House Guard 100,{ } //========================================================= -cmd_fild07.gat,299,83,4 script Sailor 100,{ +cmd_fild07.gat,299,83,4 script Sailor#01 100,{ mes "[Zain]"; mes "Hello my friend, where do you wish to go?"; next; @@ -1290,7 +1291,7 @@ cmd_fild07.gat,299,83,4 script Sailor 100,{ } //========================================================= -cmd_fild07.gat,94,134,4, script Sailor 100,{ +cmd_fild07.gat,94,134,4, script Sailor#02 100,{ mes "[Sarumane]"; mes "Hello my friend, where do you wish to go?"; next; diff --git a/npc/cities/einbech.txt b/npc/cities/einbech.txt index b0fd9fb80..b02a139ee 100644 --- a/npc/cities/einbech.txt +++ b/npc/cities/einbech.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Muad_dib //===== Current Version: ===================================== -//= 1.0 +//= 1.2 //===== Compatible With: ===================================== //= eAthena Revision 3000+ //===== Description: ========================================= @@ -19,6 +19,7 @@ //= all credits to muad_dib for scripting them. //= 1.1 Made some changes according to the Shinokas quest, [MasterOfMuppets] //= thanks to Dj-Yhn for scripting them. +//= 1.2 Removed Duplicates [Silent] //============================================================ @@ -383,7 +384,7 @@ einbech.gat,105,218,6 script Gushenmu 848,{ close; } -einbech.gat,57,210,4 script Young Man 854,{ +einbech.gat,57,210,4 script Young Man#04 854,{ mes "[Young Man]"; mes "Behind the pub,"; mes "you'll see this old man"; @@ -1425,7 +1426,7 @@ L_NNotify: close; } -ein_in01.gat,281,85,2 script Drunken Man 849,{ +ein_in01.gat,281,85,2 script Drunken Man#01 849,{ mes "[Drunken Man]"; mes "...*Hiccup*..."; mes "*Hiccup*..."; @@ -1512,7 +1513,7 @@ ein_in01.gat,279,92,2 script Tavern Lady 854,{ close; } -einbech.gat,197,139,4 script Young Man 855,{ +einbech.gat,197,139,4 script Young Man#05 855,{ mes "[Heinz]"; mes "Wow..."; mes "And adventurer from"; diff --git a/npc/cities/einbroch.txt b/npc/cities/einbroch.txt index e3e7b7e8b..eac1047b9 100644 --- a/npc/cities/einbroch.txt +++ b/npc/cities/einbroch.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Nexon //===== Current Version: ===================================== -//= 0.8 +//= 0.9 //===== Compatible With: ===================================== //= eAthena Revision 3000+ //===== Description: ========================================= @@ -20,16 +20,17 @@ //= 0.7 Implemented an inn NPC [MasterOfMuppets] //= 0.8 Implemented the Shinokas quest, thanks to [MasterOfMuppets] //= Dj-Yhn for scripting it. +//= 0.9 Removed Duplicates [Silent] //============================================================ //== some boards, signs ====================== -einbroch.gat,220,208,5 script Notice Board 858,{ +einbroch.gat,220,208,5 script Notice Board#01 858,{ mes "[Weapon Shop Entrance]"; close; } -einbroch.gat,183,174,5 script Bulletin Board 858,{ +einbroch.gat,183,174,5 script Bulletin Board#01 858,{ mes "East - Weapon Shop, Hotel"; mes "South - Factory"; mes "Southwest - Airship Repair Shop,"; @@ -38,19 +39,19 @@ einbroch.gat,183,174,5 script Bulletin Board 858,{ close; } -einbroch.gat,244,255,5 script Bulletin Board 858,{ +einbroch.gat,244,255,5 script Bulletin Board#02 858,{ mes " "; mes " Train Station"; close; } -einbroch.gat,68,206,5 script Bulletin Board 858,{ +einbroch.gat,68,206,5 script Bulletin Board#03 858,{ mes " "; mes " Airship Airport"; close; } -einbroch.gat,162,256,5 script Bulletin Board 858,{ +einbroch.gat,162,256,5 script Bulletin Board#04 858,{ mes "East - Train Station"; mes "Southeast - Hotel"; mes "South - Weapon Shop, Factory"; @@ -59,7 +60,7 @@ einbroch.gat,162,256,5 script Bulletin Board 858,{ close; } -einbroch.gat,235,141,5 script Bulletin Board 858,{ +einbroch.gat,235,141,5 script Bulletin Board#05 858,{ mes "Southwest- Airship Repair Shop,"; mes "Laboratory"; mes "Northwest- Airport"; @@ -273,7 +274,7 @@ einbroch.gat,259,327,5 script Leslie 846,{ close; } -einbroch.gat,232,272,3 script Train Station Staff::EinbrochTrain 852,{ +einbroch.gat,232,272,3 script Train Station Staff#01::EinbrochTrain 852,{ mes "[Staff]"; mes "Welcome to"; mes "the Train Station."; @@ -329,7 +330,7 @@ s_Enviroment: close; } -einbroch.gat,252,301,3 duplicate(EinbrochTrain) Train Station Staff 852 +einbroch.gat,252,301,3 duplicate(EinbrochTrain) Train Station Staff#02 852 einbroch.gat,228,121,5 script Little Toby 855,{ mes "[Little Toby]"; @@ -1444,7 +1445,7 @@ if(EinFactory == 5) } end; } -ein_in01.gat,47,197,4 script Conveyor 111,{ +ein_in01.gat,47,197,4 script Conveyor#01 111,{ if(EinFactory == 7) { @@ -1478,7 +1479,7 @@ if(EinFactory == 9) end; } -ein_in01.gat,95,238,4 script Conveyor 111,{ +ein_in01.gat,95,238,4 script Conveyor#02 111,{ if(EinFactory == 11) { @@ -2737,14 +2738,14 @@ L_SCFail: mes "check. Access denied."; close; } -einbroch.gat,51,56,6 script Laboratory Soldier 852,{ +einbroch.gat,51,56,6 script Laboratory Soldier#01 852,{ mes "[Laboratory Soldier]"; mes "This area is off limits."; mes "Please leave"; mes "immediately"; close; } -einbroch.gat,51,47,6 script Laboratory Soldier 852,{ +einbroch.gat,51,47,6 script Laboratory Soldier#02 852,{ mes "[Laboratory Soldier]"; mes "This area is off limits."; mes "Please leave"; @@ -2823,7 +2824,7 @@ ein_in01.gat,266,26,1 script Unknown Stuff 111,{ close; } -airplane.gat,31,77,4 script Drunken Man 853,{ +airplane.gat,31,77,4 script Drunken Man#03 853,{ if (ein_lab == 2) goto L_Done; mes "[Drunken Man]"; mes "Okay okay..."; diff --git a/npc/cities/geffen.txt b/npc/cities/geffen.txt index 9b7ff90ec..8dcf8887c 100644 --- a/npc/cities/geffen.txt +++ b/npc/cities/geffen.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== -//= 1.3 +//= 1.4 //===== Compatible With: ===================================== //= eAthena 7.15 + //===== Description: ========================================= @@ -13,11 +13,12 @@ //= 1.1 - Spell Checked [massdriller] //= 1.2 Fixed more typos [Nexon] //= 1.3 added a Level 4 weapon quest related NPC [MasterOfMuppets] +//= 1.4 Removed Duplicates [Silent] //============================================================ // Lady ------------------------------------------------------- -geffen.gat,59,143,8 script Lady 91,{ +geffen.gat,59,143,8 script Lady#01 91,{ mes "[Lady]"; mes "Oh, you must be a Stranger here."; next; @@ -82,7 +83,7 @@ geffen.gat,156,190,8 script Researcher 57,{ } // Young Man -------------------------------------------------------------------------- -geffen.gat,147,26,0 script "Young man" 97,{ +geffen.gat,147,26,0 script Young man#06 97,{ mes "[Young Man]"; mes "I heard that somewhere in this world, there is a rare staff which transforms its owner's psychic power into physical powers, and endows with destructive force also..."; mes "With this, everybody could be as strong as Hercules, despite their lack of muscles. Haw haw...I will take it."; @@ -95,7 +96,7 @@ geffen.gat,147,26,0 script "Young man" 97,{ } // Young Man ----------------------------------------------------------------------- -geffen_in.gat,34,170,0 script "Young man" 47,{ +geffen_in.gat,34,170,0 script Young man#07 47,{ mes "[Young Man]"; mes "Hello? Isn't it wonderful, today? I am a promising young Mage. Ahem."; mes "Nowadays, my mental anguish about magic things keeps me awake every night..sigh...Especially, about the weak point of magic, you know."; @@ -112,7 +113,7 @@ geffen_in.gat,34,170,0 script "Young man" 47,{ //<============================================ Inn =====================================================>\\ // Waitress --------------------------------------------------------------------------- -geffen_in.gat,70,67,5 script Waitress 80,{ +geffen_in.gat,70,67,5 script Waitress#01 80,{ mes "[Waitress]"; mes "Ugh!! SO annoying! Why would you drink here when you could drink at the pub!? This is an Inn, not a pub!!"; mes "That man!... every time he drinks... he gets like that! Ugh!!"; @@ -224,7 +225,7 @@ M_Menu: } // Drunkard ------------------------------------------------------------------- -geffen_in.gat,59,62,2 script Drunkard 120,{ +geffen_in.gat,59,62,2 script Drunkard#01 120,{ mes "[Drunkard]"; mes "Hmm... You're Joshua's friend too??"; next; @@ -285,7 +286,7 @@ geffen_in.gat,113,73,4 script Schubaltzwald Merchant 709,{ //<============================================== Pub ==================================================>\\ // Waitress ----------------------------------------------------------------- -geffen_in.gat,28,134,4 script Waitress 69,{ +geffen_in.gat,28,134,4 script Waitress#03 69,{ mes "[Waitress]"; mes "Meh! ALWAYS drinking and ALWAYS fighting..... HEY Mister! This is a place of BUSINESS!!"; emotion e_an; @@ -325,7 +326,7 @@ M_Menu: } // Drunkard ---------------------------------------------------------------------------- -geffen_in.gat,21,125,5 script Drunkard 52,{ +geffen_in.gat,21,125,5 script Drunkard#02 52,{ mes "[Drunkard]"; mes "You want to be an idiotic magician? Is that why you came here??"; emotion e_what; diff --git a/npc/cities/gonryun.txt b/npc/cities/gonryun.txt index c526894f9..150d095ff 100644 --- a/npc/cities/gonryun.txt +++ b/npc/cities/gonryun.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= edited by x[tsk] 4/30/04 //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= eAthena 1.0 //===== Description: ========================================= @@ -11,13 +11,14 @@ //===== Additional Comments: ================================= // May be missing npc's and dialogue. //= 1.1 Fixed Typos [Nexon] +//= 1.2 Removed Duplicates [Silent] //============================================================ //EventI -alberta.gat,245,69,4 script Gonryun Public Relations Official 776,{ +alberta.gat,245,69,4 script Gonryun Public Relations Official#01 776,{ mes "[Waba]"; mes "Hello there! I have traveled far from the Kingdom of Gonryun, my hometown."; mes "I invite all to visit and celebrate the diversity of Gonryun! We welcome all sorts of visitors."; @@ -57,7 +58,7 @@ alberta.gat,245,69,4 script Gonryun Public Relations Official 776,{ //=============================================================================== -gon_fild01.gat,255,79,6 script Gonryun Public Relations Official 776,{ +gon_fild01.gat,255,79,6 script Gonryun Public Relations Official#02 776,{ mes "[Waba]"; mes "We are ready to head back as soon as the conditions are favorable."; next; @@ -73,7 +74,7 @@ gon_fild01.gat,255,79,6 script Gonryun Public Relations Official 776,{ //=============================================================================== -gon_fild01.gat,187,239,4 script Gonryun Public Relations Official 776,{ +gon_fild01.gat,187,239,4 script Gonryun Public Relations Official#03 776,{ mes "[Choseryu]"; mes "The sacred pillar of light connects this island to Gonryun Kingdom. There's no time to idly chit chat now, be on your way."; mes "I hope you will have many fond memories of Gonryun before you leave."; @@ -82,7 +83,7 @@ gon_fild01.gat,187,239,4 script Gonryun Public Relations Official 776,{ //=============================================================================== -gonryun.gat,153,64,0 script Gonryun Public Relations Official 776,{ +gonryun.gat,153,64,0 script Gonryun Public Relations Official#04 776,{ mes "[Choseryu]"; mes "If you're ready to set sail I can send you back to the harbor."; next; @@ -148,7 +149,7 @@ gon_in.gat,165,16,4 script Drunkard 748,{ //=============================================================================== -gonryun.gat,139,142,6 script Girl 772,{ +gonryun.gat,139,142,6 script Girl#08 772,{ mes "[Sanfayon]"; mes "................"; mes "It's been great having new visitors come to the village, but........ ever since I was robbed by that Thief......."; @@ -161,7 +162,7 @@ gonryun.gat,139,142,6 script Girl 772,{ //=============================================================================== -gonryun.gat,113,135,6 script Guardsman 780,{ +gonryun.gat,113,135,6 script Guardsman#01 780,{ mes "[Guardsman]"; mes "Welcome to Gonryun. This is the home of our governor, Sayoumun."; next; @@ -175,7 +176,7 @@ gonryun.gat,113,135,6 script Guardsman 780,{ //=============================================================================== -gonryun.gat,113,127,6 script Guardsman 780,{ +gonryun.gat,113,127,6 script Guardsman#02 780,{ mes "[Guardsman]"; mes "Welcome to Gonryun. This is the home of our elder, Sayoumun. He rules all of Gonryun."; next; @@ -299,7 +300,7 @@ gonryun.gat,51,101,4 script Gaiysonchoru 778,{ //=============================================================================== -gonryun.gat,166,196,4 script Soldier 780,{ +gonryun.gat,166,196,4 script Soldier#17 780,{ mes "[Wagou]"; mes "Do you know what this is?"; next; diff --git a/npc/cities/izlude.txt b/npc/cities/izlude.txt index e30d29cc7..b58557dbe 100644 --- a/npc/cities/izlude.txt +++ b/npc/cities/izlude.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== -//= 1.5 +//= 1.6 //===== Compatible With: ===================================== //= eAthena 7.15 + //===== Description: ========================================= @@ -16,6 +16,7 @@ //= 1.4 Added a Jawaii related npc. 1.4a Fixed a small bug to //= the Jawaii warper, thanks to reddozen and Silent [MasterOfMuppets] //= 1.5 Replaced iz_move_alberta with MISC_QUEST & 16 [Lupus] +//= 1.6 Removed Duplicates [Silent] //============================================================ @@ -898,7 +899,7 @@ M_Menu: } //Sailor------------------------------------------------------------------------------------- -izlude.gat,201,181,2 script Sailor 100,{ +izlude.gat,201,181,2 script Sailor#06 100,{ mes "[Sailor]"; mes "Hey Everybody!"; mes "Attention, attention!"; @@ -931,7 +932,7 @@ izlude.gat,201,181,2 script Sailor 100,{ } //Sailor------------------------------------------------------------------------------------- -izlu2dun.gat,108,27,4 script Sailor 100,{ +izlu2dun.gat,108,27,4 script Sailor#07 100,{ mes "[Sailor]"; mes "Wanna"; mes "head back?"; diff --git a/npc/cities/lighthalzen.txt b/npc/cities/lighthalzen.txt index e61a8141a..3c55cfc8d 100644 --- a/npc/cities/lighthalzen.txt +++ b/npc/cities/lighthalzen.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= erKURITA //===== Current Version: ===================================== -//= 0.5 +//= 0.8 //===== Compatible With: ===================================== //= eAthena 1.0 //===== Description: ========================================= @@ -16,6 +16,7 @@ //= 0.5 Added a BIG load of Lighthalzen NPCs. [musashiden] //= 0.6 Fixed some typos+Coordinates. [Musashiden] //= 0.7 Implemented some more crap NPCs and the second entrance to biolabs [MasterOfMuppets] +//= 0.8 Removed Duplicates [Silent] //============================================================= lighthalzen.gat,198,285,5 script Jiwon 862,{ @@ -665,7 +666,7 @@ lighthalzen.gat,147,105,3 script Laqumet 869,{ } -lhz_in02.gat,230,284,4 script Hotel Employee 86,{ +lhz_in02.gat,230,284,4 script Hotel Employee#01 86,{ mes "[Hotel Employee]"; mes "Welcome to"; @@ -713,7 +714,7 @@ s_NEnoughZ: close; } -lhz_in02.gat,241,172,8 script Hotel Employee 868,{ +lhz_in02.gat,241,172,8 script Hotel Employee#02 868,{ mes "[Hotel Employee]"; mes "Please use the stairs"; @@ -766,7 +767,7 @@ lhz_in02.gat,201,181,6 script Safwat Fahmy 853,{ } -lhz_in02.gat,251,212,2 script Hotel Employee 868,{ +lhz_in02.gat,251,212,2 script Hotel Employee#03 868,{ mes "[Hotel Employee]"; mes "This is the Couple Suite."; @@ -834,7 +835,7 @@ lhz_in02.gat,221,276,4 script Harp 869,{ } -lhz_in02.gat,238,275,4 script Hotel Employee 869,{ +lhz_in02.gat,238,275,4 script Hotel Employee#04 869,{ mes "[Hotel Employee]"; mes "\"Hospitality with a smile"; @@ -847,7 +848,7 @@ lhz_in02.gat,238,275,4 script Hotel Employee 869,{ } -lhz_in02.gat,247,275,4 script Hotel Employee 868,{ +lhz_in02.gat,247,275,4 script Hotel Employee#05 868,{ mes "[Hotel Employee]"; mes "Welcome to the"; @@ -866,7 +867,7 @@ lhz_in02.gat,247,275,4 script Hotel Employee 868,{ } -lhz_in02.gat,271,281,2 script Citizen 47,{ +lhz_in02.gat,271,281,2 script Citizen#01 47,{ mes "[Hachi]"; mes "Oh yeah. I love-love-love"; @@ -898,7 +899,7 @@ lhz_in02.gat,277,285,4 script Bartender 61,{ } -lhz_in02.gat,281,280,6 script Customer 816,{ +lhz_in02.gat,281,280,6 script Customer#01 816,{ mes "[Rona]"; mes "I hate it when guys"; @@ -917,7 +918,7 @@ lhz_in02.gat,281,280,6 script Customer 816,{ } -lhz_in02.gat,287,282,4 script Customer 853,{ +lhz_in02.gat,287,282,4 script Customer#02 853,{ mes "[Greenfield]"; mes "I don't believe it..."; @@ -1449,7 +1450,7 @@ lhz_in01.gat,116,45,6 script Joshua 704,{ // --------------------------------------------------------------------------- -lhz_in01.gat,93,45,4 script Researcher 865,{ +lhz_in01.gat,93,45,4 script Researcher#02 865,{ mes "[Researcher]"; mes "You know what's weird?"; @@ -1614,7 +1615,7 @@ lhz_in03.gat,192,19,2 script Haggar 855,{ // --------------------------------------------------------------------------- -lhz_in03.gat,193,25,2 script Bartender 61,{ +lhz_in03.gat,193,25,2 script Bartender#01 61,{ mes "[Tony]"; mes "Hey man, I know this"; @@ -1709,7 +1710,7 @@ lhz_in03.gat,192,93,2 script City Girl#City_Girl 862,{ // --------------------------------------------------------------------------- -lhz_in03.gat,189,87,4 script Drunken Man#Drunken_Man 869,{ +lhz_in03.gat,189,87,4 script Drunken Man#04 869,{ mes "[Enku]"; mes "*Sob* I just got"; @@ -1731,7 +1732,7 @@ lhz_in03.gat,189,87,4 script Drunken Man#Drunken_Man 869,{ // --------------------------------------------------------------------------- -lhz_in03.gat,183,82,6 script Drunken Man#Drunken_Man2 870,{ +lhz_in03.gat,183,82,6 script Drunken Man#05 870,{ mes "[Linus]"; mes "After ten years"; @@ -1751,7 +1752,7 @@ lhz_in03.gat,183,82,6 script Drunken Man#Drunken_Man2 870,{ // --------------------------------------------------------------------------- -lhz_in03.gat,180,83,6 script Citizen 86,{ +lhz_in03.gat,180,83,6 script Citizen#02 86,{ mes "[Mitchell]"; mes "You know, everyone"; @@ -1894,7 +1895,7 @@ s_B: lhz_in01.gat,26,247,2 duplicate(LhzRep) Representative 71 -lhz_in01.gat,173,28,4 script Guard::LhzRekGuard 868,{ +lhz_in01.gat,173,28,4 script Guard#01::LhzRekGuard 868,{ mes "[Guard]"; mes "This is a"; @@ -1907,9 +1908,9 @@ lhz_in01.gat,173,28,4 script Guard::LhzRekGuard 868,{ } -lhz_in01.gat,180,28,4 duplicate(LhzRekGuard) Guard 868 +lhz_in01.gat,180,28,4 duplicate(LhzRekGuard) Guard#02 868 -lhz_in01.gat,72,209,4 script Guide 862,{ +lhz_in01.gat,72,209,4 script Guide#01 862,{ mes "[Lasoei]"; mes "Oh phooey."; @@ -1927,7 +1928,7 @@ lhz_in01.gat,72,209,4 script Guide 862,{ } -lhz_in01.gat,72,195,8 script Guide 90,{ +lhz_in01.gat,72,195,8 script Guide#02 90,{ mes "[Geonuii]"; mes "Greetings. This path"; @@ -1940,7 +1941,7 @@ lhz_in01.gat,72,195,8 script Guide 90,{ } -lhz_in01.gat,73,188,4 script Guide 862,{ +lhz_in01.gat,73,188,4 script Guide#03 862,{ mes "[Bonnie]"; mes "Oh no..."; @@ -1949,7 +1950,7 @@ lhz_in01.gat,73,188,4 script Guide 862,{ } -lhz_in01.gat,34,226,4 script Rekenber Guard 867,{ +lhz_in01.gat,34,226,4 script Rekenber Guard#01 867,{ if(getequipid(10) == 2241 && getequipid(9) == 2243)goto s_Staff; mes "[Rekenber Guard]"; @@ -2010,7 +2011,7 @@ s_Staff: lhz_in01.gat,23,137,0 duplicate(LhzTrig) LhzHiddenTrg2 -1,1,1 -lhz_in01.gat,24,131,2 duplicate(LhzTrig) Rekenber Guard 867 +lhz_in01.gat,24,131,2 duplicate(LhzTrig) Rekenber Guard#02 867 lhz_in01.gat,25,141,4 script Regenschirm Guard 868,{ diff --git a/npc/cities/louyang.txt b/npc/cities/louyang.txt index 37798a543..06209266a 100644 --- a/npc/cities/louyang.txt +++ b/npc/cities/louyang.txt @@ -7,7 +7,7 @@ //= Mass Zero (1.3) //= MasterOfMuppets (2.0) //===== Current Version: ===================================== -//= 2.4 +//= 2.6 //===== Compatible With: ===================================== //= Any eAthena Version //===== Description: ========================================= @@ -29,9 +29,10 @@ //= 2.3 A small fix, the code is so messy I can't believe I scripted it >.< [MasterOfMuppets] //= 2.4 Implemented a few more npcs, thanks to Prometheus for them. [MasterOfMuppets] //= 2.5 Implemented the Poison King quest, beware of potential bugs. [MasterOfMuppets] +//= 2.6 Removed Duplicates [Silent] //============================================================ -alberta.gat,245,45,4 script Girl 815,{ +alberta.gat,245,45,4 script Girl#02 815,{ mes "[Girl]"; mes "La la la la~"; mes "I feel so good today~"; @@ -108,7 +109,7 @@ M_CANCEL2: close; } -lou_fild01.gat,190,100,1 script Girl 815,{ +lou_fild01.gat,190,100,1 script Girl#03 815,{ mes "[Girl]"; mes "You'd like to go back to Alberta?"; next; @@ -133,7 +134,7 @@ M_CANCEL: close; } -louyang.gat,224,104,4 script Representative 818,{ +louyang.gat,224,104,4 script Representative#01 818,{ mes "[Representative]"; mes "Welcome to Louyang,"; mes "an ancient land with"; @@ -228,7 +229,7 @@ M_CANCEL: close; } -louyang.gat,213,214,4 script Soldier 825,{ +louyang.gat,213,214,4 script Soldier#10 825,{ mes "[Soldier]"; mes "Welcome to louyang, a city with a long and colorful history."; next; @@ -322,7 +323,7 @@ M_CANCEL: close; } -lou_fild01.gat,195,177,4 script Jiu Lian Bu 819,{ +lou_fild01.gat,195,177,4 script Jiu Lian Bu#01 819,{ if(QL_SOUP2) goto L_DONE; if(QL_SOUPQUEST)goto L_WHERE; if(QL_GOTFAKESOUP) goto L_FAKE; @@ -501,7 +502,7 @@ L_WHERE: end; } -lou_fild01.gat,175,174,4 script Jiu Lian Bu 819,{ +lou_fild01.gat,175,174,4 script Jiu Lian Bu#02 819,{ if(QL_SOUPQUEST < 1) goto L_DOQUEST; if(QL_SOUP2 < 1) goto L_1STTIME; mes "[Jiu Lian Bu]"; @@ -602,7 +603,7 @@ L_1STTIME: close; } -lou_in02.gat,61,175,2 script Employee 818,2,2{ +lou_in02.gat,61,175,2 script Employee#01 818,2,2{ mes "[Ya Hua]"; mes "^6A6A6A*Yawn...*"; close; @@ -630,13 +631,13 @@ S_CAUGHT: close; } -lou_in02.gat,54,174,6 script Employee 822,{ +lou_in02.gat,54,174,6 script Employee#02 822,{ mes "[Chang Pai]"; mes "^6A6A6A*Yawn...*"; close; } -lou_in02.gat,50,185,4 script Pot 111,{ +lou_in02.gat,50,185,4 script Pot#01 111,{ if(QL_SOUPQUEST == 1) goto L_EMPTY; if(QL_ACCEPTSOUP < 1) goto L_NORMAL; mes "^3131FFBeneath the shadows, you find a large pot filled with dark, red liquid. What do you want to do?"; @@ -674,7 +675,7 @@ L_EMPTY: close; } -lou_in02.gat,49,185,4 script Pot 111,{ +lou_in02.gat,49,185,4 script Pot#02 111,{ if(QL_SOUPQUEST == 1) goto L_EMPTY; if(QL_ACCEPTSOUP < 1) goto L_NORMAL; mes "^3131FFBeneath the shadows, you find a large pot filled with dark, red liquid. What do you want to do?"; @@ -844,7 +845,7 @@ lou_in02.gat,43,169,8 script Jiang Rong 827,{ close; } -lou_in02.gat,76,181,2 script Employee 822,{ +lou_in02.gat,76,181,2 script Employee#03 822,{ mes "[Huang Jia Xian]"; mes "Ehhhh..."; mes "Forgive me..."; @@ -1731,7 +1732,7 @@ L_NOTENOUGH: goto L_INGREDIENT; } -lou_fild01.gat,224,348,7 script Lady 817,{ +lou_fild01.gat,224,348,7 script Lady#04 817,{ emotion 30; mes "[Lady]"; @@ -1924,7 +1925,7 @@ s_Journal: } -lou_in01.gat,111,151,4 script Soldier 825,{ +lou_in01.gat,111,151,4 script Soldier#11 825,{ mes "[Soldier]"; mes "*Yawn* It's so boring here"; mes "nowadays. Although, I hear that"; @@ -1940,7 +1941,7 @@ lou_in01.gat,111,151,4 script Soldier 825,{ close; } -lou_in01.gat,91,151,4 script Soldier 825,{ +lou_in01.gat,91,151,4 script Soldier#12 825,{ mes "[Soldier]"; mes "....z..Z..z..."; next; @@ -1964,7 +1965,7 @@ lou_in01.gat,91,151,4 script Soldier 825,{ close; } -lou_in01.gat,82,139,6 script Soldier 825,{ +lou_in01.gat,82,139,6 script Soldier#13 825,{ mes "[Soldier]"; mes "There is nothing much, but if you"; mes "wish to look around this room,"; @@ -1972,7 +1973,7 @@ lou_in01.gat,82,139,6 script Soldier 825,{ close; } -lou_in01.gat,45,138,4 script Soldier 825,{ +lou_in01.gat,45,138,4 script Soldier#14 825,{ mes "[Soldier]"; mes "It's strange to see outsiders in"; mes "this kind of place. We don't have"; @@ -1981,7 +1982,7 @@ lou_in01.gat,45,138,4 script Soldier 825,{ close; } -lou_in01.gat,102,144,4 script Soldier 825,{ +lou_in01.gat,102,144,4 script Soldier#15 825,{ mes "[Soldier]"; mes "People have been"; mes "saying that there's"; @@ -1996,7 +1997,7 @@ lou_in01.gat,102,144,4 script Soldier 825,{ close; } -lou_in01.gat,99,144,4 script Soldier 825,{ +lou_in01.gat,99,144,4 script Soldier#16 825,{ mes "[Soldier]"; mes "Ah, don't bother"; mes "to listen to this"; @@ -2087,7 +2088,7 @@ lou_in02.gat,272,55,1 script Familiar-Looking Patient 86,{ close; } -lou_in02.gat,253,45,4 script Employee 822,{ +lou_in02.gat,253,45,4 script Employee#04 822,{ if(QL_POISONKING == 30)goto s_NoGoodIdea; if(QL_POISONKING == 18)goto s_Busy; diff --git a/npc/cities/morocc.txt b/npc/cities/morocc.txt index 2f329318d..c46a13ee9 100644 --- a/npc/cities/morocc.txt +++ b/npc/cities/morocc.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== -//= 1.6 +//= 1.7 //===== Compatible With: ===================================== //= eAthena 7.15 + //===== Description: ========================================= @@ -17,6 +17,7 @@ //= 1.4 Fixed typos [Nexon] //= 1.5 Added a lvl 4 weapon quest related NPC [MasterOfMuppets] //= 1.6 Added Bartender NPC, made by Persian69 [Vicious_Pucca] +//= 1.7 Removed Duplicates [Silent] //============================================================ @@ -362,7 +363,7 @@ M_Menu: } //Bartender -morocc_in.gat,166,76,3 script Bartender 46,{ +morocc_in.gat,166,76,3 script Bartender#02 46,{ mes "[Bartender]"; mes "What are you going to order?"; next; @@ -401,7 +402,7 @@ Nomoney: // Lvl 4 weapon quest related NPC ================================ -morocc.gat,289,230,3 script Citizen 92, { +morocc.gat,289,230,3 script Citizen#06 92, { mes "[Citizen]"; mes "Meeting a dead man is basically"; mes "impossible."; diff --git a/npc/cities/niflheim.txt b/npc/cities/niflheim.txt index 45c768c75..a60b4f701 100644 --- a/npc/cities/niflheim.txt +++ b/npc/cities/niflheim.txt @@ -4,7 +4,7 @@ //= Fyrien, Dizzy, PKGINGO //= Official NPCs translated and re-edited by Celest //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= Any eAthena Version; Niflheim Required //===== Description: ========================================= @@ -20,6 +20,7 @@ //= 1.08 Commented "Traveler" out as it is not official & we have correct Bungee quest in. //= Also removed TODO, as they are already done. [Vicious_Pucca] //= 1.1 Replaced nif_q_done with MISC_QUEST & 32. nif_t -> @nif_t [Lupus] +//= 1.2 Removed Duplicates [Silent] //============================================================ //prontera.gat,164,161,4 script Traveler::NifTrav 68,{ @@ -71,7 +72,7 @@ niflheim.gat,130,176,0 duplicate(spirits) Spirit#7 802 niflheim.gat,173,110,0 duplicate(spirits) Spirit#8 802 niflheim.gat,182,167,0 duplicate(spirits) Spirit#9 802 -niflheim.gat,184,199,5 script Little Girl 793,{ +niflheim.gat,184,199,5 script Little Girl#02 793,{ mes "[Sairin]"; if(niflheimlost2 == 1) goto L_thanks; if(niflheimlost == 1) goto L_foundhim; diff --git a/npc/cities/payon.txt b/npc/cities/payon.txt index 50225e69a..16499fd55 100644 --- a/npc/cities/payon.txt +++ b/npc/cities/payon.txt @@ -4,7 +4,7 @@ //= Muad Dib (1.0) Darkchild (1.1) Muad Dib (1.2) //= Darkchild (1.3) DracoRPG (1.5) //===== Current Version: ===================================== -//= 1.7 +//= 1.8 //===== Compatible With: ===================================== //= Any eAthena Mod //===== Description: ========================================= @@ -18,9 +18,10 @@ //= 1.5b2 added adv.classes/baby classes support [Lupus] //= 1.6 Fixed typos [Nexon] //= 1.7 Fixed bugs and exploits V__V [Lupus] +//= 1.8 Removed Duplicates [Silent] //============================================================ -payon.gat,190,115,0 script Lady 90,{ +payon.gat,190,115,0 script Lady#05 90,{ mes "[Lady]"; mes "Did you know that in the past Payon was not as prosperous as it is now? Back then we had difficulty making a living for ourselves."; emotion e_gasp; @@ -45,7 +46,7 @@ payon.gat,190,115,0 script Lady 90,{ mes "It is a very tragic situation, for those zombies were at one time beloved members of the Payon community."; close; } -payon_in01.gat,177,91,5 script Young Man 88,{ +payon_in01.gat,177,91,5 script Young Man#06 88,{ mes "[Young Man]"; mes "I can see you are a stranger from the appearance of your traveling outfit. You must be a well-experienced fighter otherwise you couldn't successfully arrive at this steep place with all tough those creatures outside."; mes "However you miss something important for fights. You can't defeat those monsters only with might."; @@ -56,7 +57,7 @@ payon_in01.gat,177,91,5 script Young Man 88,{ close; } -payon.gat,104,62,5 script Young Man 88,{ +payon.gat,104,62,5 script Young Man#07 88,{ mes "[Young Man]"; mes "I still remember the story my grandfather told me long ago about the Amulet that possessed an Evil Power within it."; next; @@ -154,7 +155,7 @@ L_Menu4: close; } -payon.gat,193,116,1 script Woman 66,{ +payon.gat,193,116,1 script Woman#05 66,{ mes "[Woman]"; mes "Welcome to Payon. You must have had a hard time getting through the thick forest? I hope you didn't run into too much trouble?"; next; @@ -211,7 +212,7 @@ L_Menu3: close; } -payon.gat,190,119,5 script Woman 66,{ +payon.gat,190,119,5 script Woman#06 66,{ mes "[Jim's Mother]"; mes "Oh boy there she goes again. She is a confirmed gossip. Please don't mistake her for being a typical Payon citizen."; emotion e_dots; @@ -646,7 +647,7 @@ payon_in03.gat,96,117,4 script PayonGuard2TriggerArea 139,3,2,{ close; } -payon_in03.gat,102,185,4 script Guard 708,{ +payon_in03.gat,102,185,4 script Guard#06 708,{ mes "[Guard]"; mes "Hey...!"; mes "You're not"; @@ -737,7 +738,7 @@ payon.gat,160,185,0 script Billboard 111,{ close; } -payon.gat,173,238,5 script Jade 754,{ +payon.gat,173,238,5 script Jade#01 754,{ mes "[Jade]"; mes "Bring me two"; mes "Gemstones of the"; diff --git a/npc/cities/prontera.txt b/npc/cities/prontera.txt index 22701b18b..77d06a5f5 100644 --- a/npc/cities/prontera.txt +++ b/npc/cities/prontera.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== -//= 1.6 +//= 1.7 //===== Compatible With: ===================================== //= eAthena 7.15 + //===== Description: ========================================= @@ -15,6 +15,7 @@ //= 1.4 Optimized. Novices > 20 BaseJob can go to Culvert, too [Lupus] //= 1.5a Added a Jawaii related npc [MasterOfMuppets] //= 1.6 Replaced sewer_prt with (MISC_QUEST & 8) [Lupus] +//= 1.7 Removed Duplicates [Silent] //============================================================ @@ -460,7 +461,7 @@ prt_in.gat,173,24,2 script Shevild 85,{ } // Bartender --------------------------------------------------------- -prt_in.gat,181,21,2 script Bartender 61,{ +prt_in.gat,181,21,2 script Bartender#03 61,{ mes "[Bartender]"; mes "Phew~ more and more people a crawling in these days."; mes "I am getting more and more tired everyday, though business has never been better..."; diff --git a/npc/cities/valkyrie.txt b/npc/cities/valkyrie.txt index c80f76c9e..0aee061cb 100644 --- a/npc/cities/valkyrie.txt +++ b/npc/cities/valkyrie.txt @@ -4,7 +4,7 @@ //= Nana, fixes by Poki //= finished, optimized and tested by Lupus //===== Current Version: ===================================== -//= 2.2 +//= 2.3 //===== Compatible With: ===================================== //= eAthena 1.0 + //===== Description: ========================================= @@ -27,6 +27,7 @@ //= 2.0b Fixed. TODO: add new Quest Skills [Lupus] //= 2.1 Changed all numbers into constants. [Vicious] //= 2.2 Now ALL quests skills are saved/restored [Lupus] +//= 2.3 Removed Duplicates [Silent] //============================================================ @@ -141,7 +142,7 @@ yuno_in05.gat,50,44,0 script Heart of Ymir 111,{ } // -== Researcher of the Book of Ymir ==- -yuno_in02.gat,90,77,4 script Researcher 744,{ +yuno_in02.gat,90,77,4 script Researcher#06 744,{ mes "[Researcher]"; mes "Argh, where is it!?"; mes "They said that it would be around here somewhere..."; diff --git a/npc/custom/MVP_arena/arena_mvp.txt b/npc/custom/MVP_arena/arena_mvp.txt index 147a22b51..bb19d6a23 100644 --- a/npc/custom/MVP_arena/arena_mvp.txt +++ b/npc/custom/MVP_arena/arena_mvp.txt @@ -1,6 +1,7 @@ // ---- MVP ARENA!!!!!! By Darkchild with 16 diff MVP's inside // -- Optimised The MVP arena!!!! By massdriller // - NPC in prontera +// - Removed Duplicates [Silent] prontera.gat,154,197,3 script MVP Warper 768,{ mes "[ ^0065DFMVP Warper^000000 ]"; @@ -333,7 +334,7 @@ close; // ---- Inside MVP-Arena NPC's // --- Alpha-MVP #1 -pvp_n_1-2.gat,100,100,4 script MVP-Protector 727,{ +pvp_n_1-2.gat,100,100,4 script MVP-Protector#01 727,{ mes "[ ^0065DFMVP-Protector^000000 ]"; callfunc "Ramvp_M"; @@ -344,7 +345,7 @@ pvp_n_1-2.gat,100,100,4 script MVP-Protector 727,{ } // --- Alpha-MVP #2 -pvp_n_2-2.gat,100,100,4 script MVP-Protector 727,{ +pvp_n_2-2.gat,100,100,4 script MVP-Protector#02 727,{ mes "[ ^0065DFMVP-Protector^000000 ]"; callfunc "Ramvp_M"; @@ -354,7 +355,7 @@ pvp_n_2-2.gat,100,100,4 script MVP-Protector 727,{ } // --- Alpha-MVP #3 -pvp_n_3-2.gat,100,100,4 script MVP-Protector 727,{ +pvp_n_3-2.gat,100,100,4 script MVP-Protector#03 727,{ mes "[ ^0065DFMVP-Protector^000000 ]"; callfunc "Ramvp_M"; @@ -364,7 +365,7 @@ pvp_n_3-2.gat,100,100,4 script MVP-Protector 727,{ } // --- Alpha-MVP #4 -pvp_n_4-2.gat,100,100,4 script MVP-Protector 727,{ +pvp_n_4-2.gat,100,100,4 script MVP-Protector#04 727,{ mes "[ ^0065DFMVP-Protector^000000 ]"; callfunc "Ramvp_M"; @@ -374,7 +375,7 @@ pvp_n_4-2.gat,100,100,4 script MVP-Protector 727,{ } // --- Alpha-MVP #5 -pvp_n_5-2.gat,100,100,4 script MVP-Protector 727,{ +pvp_n_5-2.gat,100,100,4 script MVP-Protector#05 727,{ mes "[ ^0065DFMVP-Protector^000000 ]"; callfunc "Ramvp_M"; @@ -384,7 +385,7 @@ pvp_n_5-2.gat,100,100,4 script MVP-Protector 727,{ } // --- Alpha-MVP #6 -pvp_n_6-2.gat,100,100,4 script MVP-Protector 727,{ +pvp_n_6-2.gat,100,100,4 script MVP-Protector#06 727,{ mes "[ ^0065DFMVP-Protector^000000 ]"; callfunc "Ramvp_M"; @@ -394,7 +395,7 @@ pvp_n_6-2.gat,100,100,4 script MVP-Protector 727,{ } // --- Alpha-MVP #7 -pvp_n_7-2.gat,100,100,4 script MVP-Protector 727,{ +pvp_n_7-2.gat,100,100,4 script MVP-Protector#07 727,{ mes "[ ^0065DFMVP-Protector^000000 ]"; callfunc "Ramvp_M"; @@ -403,12 +404,12 @@ pvp_n_7-2.gat,100,100,4 script MVP-Protector 727,{ close; } // --- Alpha-MVP #8 -pvp_n_8-2.gat,100,100,4 script MVP-Protector 727,{ +pvp_n_8-2.gat,100,100,4 script MVP-Protector#08 727,{ mes "[ ^0065DFMVP-Protector^000000 ]"; callfunc "Ramvp_M2"; } // --- Beta-MVP #1 -pvp_n_1-3.gat,100,100,4 script MVP-Protector 727,{ +pvp_n_1-3.gat,100,100,4 script MVP-Protector#09 727,{ mes "[ ^0065DFMVP-Protector^000000 ]"; callfunc "Ramvp_M"; @@ -419,7 +420,7 @@ pvp_n_1-3.gat,100,100,4 script MVP-Protector 727,{ } // --- Beta-MVP #2 -pvp_n_2-3.gat,100,100,4 script MVP-Protector 727,{ +pvp_n_2-3.gat,100,100,4 script MVP-Protector#10 727,{ mes "[ ^0065DFMVP-Protector^000000 ]"; callfunc "Ramvp_M"; @@ -429,7 +430,7 @@ pvp_n_2-3.gat,100,100,4 script MVP-Protector 727,{ } // --- Beta-MVP #3 -pvp_n_3-3.gat,100,100,4 script MVP-Protector 727,{ +pvp_n_3-3.gat,100,100,4 script MVP-Protector#11 727,{ mes "[ ^0065DFMVP-Protector^000000 ]"; callfunc "Ramvp_M"; @@ -439,7 +440,7 @@ pvp_n_3-3.gat,100,100,4 script MVP-Protector 727,{ } // --- Beta-MVP #4 -pvp_n_4-3.gat,100,100,4 script MVP-Protector 727,{ +pvp_n_4-3.gat,100,100,4 script MVP-Protector#12 727,{ mes "[ ^0065DFMVP-Protector^000000 ]"; callfunc "Ramvp_M"; @@ -449,7 +450,7 @@ pvp_n_4-3.gat,100,100,4 script MVP-Protector 727,{ } // --- Beta-MVP #5 -pvp_n_5-3.gat,100,100,4 script MVP-Protector 727,{ +pvp_n_5-3.gat,100,100,4 script MVP-Protector#13 727,{ mes "[ ^0065DFMVP-Protector^000000 ]"; callfunc "Ramvp_M"; @@ -459,7 +460,7 @@ pvp_n_5-3.gat,100,100,4 script MVP-Protector 727,{ } // --- Beta-MVP #6 -pvp_n_6-3.gat,100,100,4 script MVP-Protector 727,{ +pvp_n_6-3.gat,100,100,4 script MVP-Protector#14 727,{ mes "[ ^0065DFMVP-Protector^000000 ]"; callfunc "Ramvp_M"; @@ -469,7 +470,7 @@ pvp_n_6-3.gat,100,100,4 script MVP-Protector 727,{ } // --- Beta-MVP #7 -pvp_n_7-3.gat,100,100,4 script MVP-Protector 727,{ +pvp_n_7-3.gat,100,100,4 script MVP-Protector#15 727,{ mes "[ ^0065DFMVP-Protector^000000 ]"; callfunc "Ramvp_M"; @@ -479,12 +480,12 @@ pvp_n_7-3.gat,100,100,4 script MVP-Protector 727,{ } // --- Beta-MVP #8 -pvp_n_8-3.gat,100,100,4 script MVP-Protector 727,{ +pvp_n_8-3.gat,100,100,4 script MVP-Protector#16 727,{ mes "[ ^0065DFMVP-Protector^000000 ]"; callfunc "Ramvp_M2"; } // --- Theta-MVP #1 -pvp_n_1-4.gat,100,100,4 script MVP-Protector 727,{ +pvp_n_1-4.gat,100,100,4 script MVP-Protector#17 727,{ mes "[ ^0065DFMVP-Protector^000000 ]"; callfunc "Ramvp_M"; @@ -495,7 +496,7 @@ pvp_n_1-4.gat,100,100,4 script MVP-Protector 727,{ } // --- Theta-MVP #2 -pvp_n_2-4.gat,100,100,4 script MVP-Protector 727,{ +pvp_n_2-4.gat,100,100,4 script MVP-Protector#18 727,{ mes "[ ^0065DFMVP-Protector^000000 ]"; callfunc "Ramvp_M"; @@ -505,7 +506,7 @@ pvp_n_2-4.gat,100,100,4 script MVP-Protector 727,{ } // --- Theta-MVP #3 -pvp_n_3-4.gat,100,100,4 script MVP-Protector 727,{ +pvp_n_3-4.gat,100,100,4 script MVP-Protector#19 727,{ mes "[ ^0065DFMVP-Protector^000000 ]"; callfunc "Ramvp_M"; @@ -515,7 +516,7 @@ pvp_n_3-4.gat,100,100,4 script MVP-Protector 727,{ } // --- Theta-MVP #4 -pvp_n_4-4.gat,100,100,4 script MVP-Protector 727,{ +pvp_n_4-4.gat,100,100,4 script MVP-Protector#20 727,{ mes "[ ^0065DFMVP-Protector^000000 ]"; callfunc "Ramvp_M"; @@ -525,7 +526,7 @@ pvp_n_4-4.gat,100,100,4 script MVP-Protector 727,{ } // --- Theta-MVP #5 -pvp_n_5-4.gat,100,100,4 script MVP-Protector 727,{ +pvp_n_5-4.gat,100,100,4 script MVP-Protector#21 727,{ mes "[ ^0065DFMVP-Protector^000000 ]"; callfunc "Ramvp_M"; @@ -535,7 +536,7 @@ pvp_n_5-4.gat,100,100,4 script MVP-Protector 727,{ } // --- Theta-MVP #6 -pvp_n_6-4.gat,100,100,4 script MVP-Protector 727,{ +pvp_n_6-4.gat,100,100,4 script MVP-Protector#22 727,{ mes "[ ^0065DFMVP-Protector^000000 ]"; callfunc "Ramvp_M"; @@ -545,7 +546,7 @@ pvp_n_6-4.gat,100,100,4 script MVP-Protector 727,{ } // --- Theta-MVP #7 -pvp_n_7-4.gat,100,100,4 script MVP-Protector 727,{ +pvp_n_7-4.gat,100,100,4 script MVP-Protector#23 727,{ mes "[ ^0065DFMVP-Protector^000000 ]"; callfunc "Ramvp_M"; @@ -555,12 +556,12 @@ pvp_n_7-4.gat,100,100,4 script MVP-Protector 727,{ } // --- Theta-MVP #8 -pvp_n_8-4.gat,100,100,4 script MVP-Protector 727,{ +pvp_n_8-4.gat,100,100,4 script MVP-Protector#24 727,{ mes "[ ^0065DFMVP-Protector^000000 ]"; callfunc "Ramvp_M2"; } // --- Epsilon-MVP #1 -pvp_n_1-5.gat,100,100,4 script MVP-Protector 727,{ +pvp_n_1-5.gat,100,100,4 script MVP-Protector#25 727,{ mes "[ ^0065DFMVP-Protector^000000 ]"; callfunc "Ramvp_M"; @@ -571,7 +572,7 @@ pvp_n_1-5.gat,100,100,4 script MVP-Protector 727,{ } // --- Epsilon-MVP #2 -pvp_n_2-5.gat,100,100,4 script MVP-Protector 727,{ +pvp_n_2-5.gat,100,100,4 script MVP-Protector#26 727,{ mes "[ ^0065DFMVP-Protector^000000 ]"; callfunc "Ramvp_M"; @@ -581,7 +582,7 @@ pvp_n_2-5.gat,100,100,4 script MVP-Protector 727,{ } // --- Epsilon-MVP #3 -pvp_n_3-5.gat,100,100,4 script MVP-Protector 727,{ +pvp_n_3-5.gat,100,100,4 script MVP-Protector#27 727,{ mes "[ ^0065DFMVP-Protector^000000 ]"; callfunc "Ramvp_M"; @@ -591,7 +592,7 @@ pvp_n_3-5.gat,100,100,4 script MVP-Protector 727,{ } // --- Epsilon-MVP #4 -pvp_n_4-5.gat,100,100,4 script MVP-Protector 727,{ +pvp_n_4-5.gat,100,100,4 script MVP-Protector#28 727,{ mes "[ ^0065DFMVP-Protector^000000 ]"; callfunc "Ramvp_M"; @@ -601,7 +602,7 @@ pvp_n_4-5.gat,100,100,4 script MVP-Protector 727,{ } // --- Epsilon-MVP #5 -pvp_n_5-5.gat,100,100,4 script MVP-Protector 727,{ +pvp_n_5-5.gat,100,100,4 script MVP-Protector#29 727,{ mes "[ ^0065DFMVP-Protector^000000 ]"; callfunc "Ramvp_M"; @@ -611,7 +612,7 @@ pvp_n_5-5.gat,100,100,4 script MVP-Protector 727,{ } // --- Epsilon-MVP #6 -pvp_n_6-5.gat,100,100,4 script MVP-Protector 727,{ +pvp_n_6-5.gat,100,100,4 script MVP-Protector#30 727,{ mes "[ ^0065DFMVP-Protector^000000 ]"; callfunc "Ramvp_M"; @@ -621,7 +622,7 @@ pvp_n_6-5.gat,100,100,4 script MVP-Protector 727,{ } // --- Epsilon-MVP #7 -pvp_n_7-5.gat,100,100,4 script MVP-Protector 727,{ +pvp_n_7-5.gat,100,100,4 script MVP-Protector#31 727,{ mes "[ ^0065DFMVP-Protector^000000 ]"; callfunc "Ramvp_M"; @@ -630,7 +631,7 @@ pvp_n_7-5.gat,100,100,4 script MVP-Protector 727,{ close; } // --- Epsilon-MVP #8 -pvp_n_8-5.gat,100,100,4 script MVP-Protector 727,{ +pvp_n_8-5.gat,100,100,4 script MVP-Protector#32 727,{ mes "[ ^0065DFMVP-Protector^000000 ]"; callfunc "Ramvp_M2"; } diff --git a/npc/custom/airplane.txt b/npc/custom/airplane.txt index 854ba98ee..0e599ff04 100644 --- a/npc/custom/airplane.txt +++ b/npc/custom/airplane.txt @@ -4,7 +4,7 @@ //= Edited And removed irrelevent comments by eAthena Dev Team //= Draike\Bluto\Hephaestus //===== Current Version: ===================================== -//= 2.0 eAthena Release +//= 2.1 eAthena Release //===== Compatible With: ===================================== //= eAthena SVN 02/05/2005 + //===== Description: ========================================= @@ -12,6 +12,7 @@ //===== Additional Comments: ================================= //= ALWAYS HAVE AT LEAST TWELVE (12) LOCATIONS AS THE MINIMUM. This is unless you modify to OnMinutes and change the schedule around. //= If you have "airplane.gat,103,72,0 warp airs02a 1,1,airplane.gat,102,200" as a warp, remove it. Where it's supposed to go, I have no clue. +//= 2.1 Removed Duplicates [Silent] //============================================================ payon.gat,153,43,5 script itinsetter -1,{ @@ -265,73 +266,73 @@ callfunc "F_Itin"; airport.gat,153,43,5 script Airport Porter 774,{ callfunc "F_Porter",0; } -prt_fild08.gat,206,279,5 script Porter 774,{ +prt_fild08.gat,206,279,5 script Porter#01 774,{ callfunc "F_Porter",1; } -gef_fild00.gat,50,364,5 script Porter 774,{ +gef_fild00.gat,50,364,5 script Porter#02 774,{ callfunc "F_Porter",5; } -moc_fild10.gat,163,173,5 script Porter 774,{ +moc_fild10.gat,163,173,5 script Porter#03 774,{ callfunc "F_Porter",6; } -mjolnir_12.gat,61,380,5 script Porter 774,{ +mjolnir_12.gat,61,380,5 script Porter#04 774,{ callfunc "F_Porter",3; } -pay_fild08.gat,159,91,5 script Porter 774,{ +pay_fild08.gat,159,91,5 script Porter#05 774,{ callfunc "F_Porter",2; } -pay_fild03.gat,194,181,5 script Porter 774,{ +pay_fild03.gat,194,181,5 script Porter#06 774,{ callfunc "F_Porter",4; } -glast_01.gat,196,326,1 script Porter 774,{ +glast_01.gat,196,326,1 script Porter#07 774,{ callfunc "F_Porter",7; } -umbala.gat,188,98,3 script Porter 774,{ +umbala.gat,188,98,3 script Porter#08 774,{ callfunc "F_Porter",8; } -comodo.gat,203,75,8 script Porter 774,{ +comodo.gat,203,75,8 script Porter#09 774,{ callfunc "F_Porter",9; } -amatsu.gat,115,78,8 script Porter 774,{ +amatsu.gat,115,78,8 script Porter#10 774,{ callfunc "F_Porter",10; } -niflheim.gat,132,242,5 script Porter 774,{ +niflheim.gat,132,242,5 script Porter#11 774,{ callfunc "F_Porter",11; } -xmas.gat,232,309,5 script Porter 774,{ +xmas.gat,232,309,5 script Porter#12 774,{ callfunc "F_Porter",12; } -louyang.gat,35,279,8 script Porter 774,{ +louyang.gat,35,279,8 script Porter#13 774,{ callfunc "F_Porter",13; } -gonryun.gat,82,95,7 script Porter 774,{ +gonryun.gat,82,95,7 script Porter#14 774,{ callfunc "F_Porter",14; } -yuno.gat,58,195,4 script Porter 774,{ +yuno.gat,58,195,4 script Porter#15 774,{ callfunc "F_Porter",15; } -moc_fild04.gat,210,326,2 script Porter 774,{ +moc_fild04.gat,210,326,2 script Porter#16 774,{ callfunc "F_Porter",16; } -jawaii.gat,247,174,7 script Porter 774,{ +jawaii.gat,247,174,7 script Porter#17 774,{ callfunc "F_Porter",17; } -gef_fild10.gat,159,95,2 script Porter 774,{ +gef_fild10.gat,159,95,2 script Porter#18 774,{ callfunc "F_Porter",18; } -mjolnir_02.gat,76,364,5 script Porter 774,{ +mjolnir_02.gat,76,364,5 script Porter#19 774,{ callfunc "F_Porter",19; } -gefenia01.gat,97,22,6 script Porter 774,{ +gefenia01.gat,97,22,6 script Porter#20 774,{ callfunc "F_Porter",20; } -ayothaya.gat,182,105,5 script Porter 774,{ +ayothaya.gat,182,105,5 script Porter#21 774,{ callfunc "F_Porter",21; } -lighthalzen.gat,99,241,4 script Porter 774,{ +lighthalzen.gat,99,241,4 script Porter#22 774,{ callfunc "F_Porter",22; } -jupe_gate.gat,46,18,7 script Porter 774,{ +jupe_gate.gat,46,18,7 script Porter#23 774,{ callfunc "F_Porter",23; } airport.gat,141,43,5 script Itinerary Schedule 837,{ diff --git a/npc/custom/eAAC_Scripts/disguiser.txt b/npc/custom/eAAC_Scripts/disguiser.txt index 218de0196..1bce6f677 100644 --- a/npc/custom/eAAC_Scripts/disguiser.txt +++ b/npc/custom/eAAC_Scripts/disguiser.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= PalasX (http://cashaan.dontexist.org) //===== Current Version: ===================================== -//= v1.20 Unified +//= v1.21 Unified //===== Compatible With: ===================================== //= SVN 5690+ (getmonsterinfo) //===== Description: ========================================= @@ -16,37 +16,38 @@ //= Uses GetMonsterInfo to pull monster names from server, but //= without sql_query, the mob IDs are set statically //= Went crazy with the functions, the script is TINY now :) +//= 1.21 Removed Duplicates [Silent] //============================================================ ////////////////////////// //Places all of our NPCs// ////////////////////////// -prt_fild05.gat,277,226,5 script Dullahan Master 736,{ +prt_fild05.gat,277,226,5 script Dullahan Master#01 736,{ callfunc "PXC_Disguiser",0,quest_disguise; Close; } -moc_fild10.gat,34,283,4 script Dullahan Master 736,{ +moc_fild10.gat,34,283,4 script Dullahan Master#02 736,{ callfunc "PXC_Disguiser",1,quest_disguise; close; } -gef_fild00.gat,97,123,4 script Dullahan Master 736,{ +gef_fild00.gat,97,123,4 script Dullahan Master#03 736,{ callfunc "PXC_Disguiser",2,quest_disguise; close; } -pay_fild01.gat,369,305,4 script Dullahan Master 736,{ +pay_fild01.gat,369,305,4 script Dullahan Master#04 736,{ callfunc "PXC_Disguiser",3,quest_disguise; close; } -pay_fild03.gat,313,40,4 script Dullahan Master 736,{ +pay_fild03.gat,313,40,4 script Dullahan Master#05 736,{ callfunc "PXC_Disguiser",4,quest_disguise; close; } -prt_fild08.gat,362,185,4 script Dullahan Master 736,{ +prt_fild08.gat,362,185,4 script Dullahan Master#06 736,{ callfunc "PXC_Disguiser",5,quest_disguise; close; diff --git a/npc/custom/eAAC_Scripts/quest_warper.txt b/npc/custom/eAAC_Scripts/quest_warper.txt index 2fbc252f7..a72306e89 100644 --- a/npc/custom/eAAC_Scripts/quest_warper.txt +++ b/npc/custom/eAAC_Scripts/quest_warper.txt @@ -4,7 +4,7 @@ //= Old Warper 2 by Darkchild - Remade with quest format by DZeroX //= Huge Rewrite by Neouni //===== Current Version: ========================================== -//= 2.0b +//= 2.1 //===== Compatible With: ========================================== //= Any eAthena Version //===== Description: ============================================== @@ -72,6 +72,8 @@ // - Old Dungeon fee system removed, all dungeon fees now set to 0 //-2.0b // - Special warpname menu option name bug fixed +//-2.1 +// - Removed Duplicates [Silent] //================================================================= //========================Function=&=Script======================== @@ -1867,274 +1869,274 @@ binget: } //============================Warpras============================== -alb2trea.gat,73,101,4 script Warpra 113,{ +alb2trea.gat,73,101,4 script Warpra#01 113,{ callfunc "Q_Warpra",1; } -ama_fild01.gat,178,325,1 script Warpra 113,{ +ama_fild01.gat,178,325,1 script Warpra#02 113,{ callfunc "Q_Warpra",1; } -gef_fild10.gat,71,339,4 script Warpra 113,{ +gef_fild10.gat,71,339,4 script Warpra#03 113,{ callfunc "Q_Warpra",1; } -izlu2dun.gat,104,82,4 script Warpra 113,{ +izlu2dun.gat,104,82,4 script Warpra#04 113,{ callfunc "Q_Warpra",1; } -mjolnir_02.gat,85,363,4 script Warpra 113,{ +mjolnir_02.gat,85,363,4 script Warpra#05 113,{ callfunc "Q_Warpra",1; } -moc_fild04.gat,207,331,4 script Warpra 113,{ +moc_fild04.gat,207,331,4 script Warpra#06 113,{ callfunc "Q_Warpra",1; } -moc_fild19.gat,106,97,4 script Warpra 113,{ +moc_fild19.gat,106,97,4 script Warpra#07 113,{ callfunc "Q_Warpra",1; } -moc_ruins.gat,64,166,4 script Warpra 113,{ +moc_ruins.gat,64,166,4 script Warpra#08 113,{ callfunc "Q_Warpra",1; } -niflheim.gat,197,192,3 script Warpra 113,{ +niflheim.gat,197,192,3 script Warpra#09 113,{ callfunc "Q_Warpra",1; } -pay_arche.gat,39,135,4 script Warpra 113,{ +pay_arche.gat,39,135,4 script Warpra#10 113,{ callfunc "Q_Warpra",1; } -prt_fild05.gat,273,215,4 script Warpra 113,{ +prt_fild05.gat,273,215,4 script Warpra#11 113,{ callfunc "Q_Warpra",1; } -tur_dun01.gat,148,239,4 script Warpra 113,{ +tur_dun01.gat,148,239,4 script Warpra#12 113,{ callfunc "Q_Warpra",1; } -valkyrie.gat,48,35,8 script Warpra 113,{ +valkyrie.gat,48,35,8 script Warpra#13 113,{ callfunc "Q_Warpra",1; } -yuno_fild03.gat,37,135,4 script Warpra 113,{ +yuno_fild03.gat,37,135,4 script Warpra#14 113,{ callfunc "Q_Warpra",1; } -alberta.gat,32,240,4 script Warpra 113,{ +alberta.gat,32,240,4 script Warpra#15 113,{ callfunc "QWS_Town_Warpra",1,"Alberta Town"; close; } -aldebaran.gat,146,118,4 script Warpra 113,{ +aldebaran.gat,146,118,4 script Warpra#16 113,{ callfunc "QWS_Town_Warpra",2,"Aldebaran Town"; close; } -ayothaya.gat,216,171,5 script Warpra 113,{ +ayothaya.gat,216,171,5 script Warpra#17 113,{ callfunc "QWS_Town_Warpra",4,"Ayotaya Town"; close; } -amatsu.gat,193,81,1 script Warpra 113,{ +amatsu.gat,193,81,1 script Warpra#18 113,{ callfunc "QWS_Town_Warpra",3,"Amatsu Town"; close; } -comodo.gat,195,158,4 script Warpra 113,{ +comodo.gat,195,158,4 script Warpra#19 113,{ callfunc "QWS_Town_Warpra",5,"Comodo Town"; close; } -einbroch.gat,229,196,5 script Warpra 113,{ +einbroch.gat,229,196,5 script Warpra#20 113,{ callfunc "QWS_Town_Warpra",7,"Einbroch Town"; close; } -einbech.gat,173,131,5 script Warpra 113,{ +einbech.gat,173,131,5 script Warpra#21 113,{ callfunc "QWS_Town_Warpra",6,"Einbech Town"; close; } -geffen.gat,116,66,4 script Warpra 113,{ +geffen.gat,116,66,4 script Warpra#22 113,{ callfunc "QWS_Town_Warpra",8,"Geffen Town"; close; } -gonryun.gat,152,130,4 script Warpra 113,{ +gonryun.gat,152,130,4 script Warpra#23 113,{ callfunc "QWS_Town_Warpra",9,"Gonryun Town"; close; } -hugel.gat,90,127,5 script Warpra 113,{ +hugel.gat,90,127,5 script Warpra#24 113,{ callfunc "QWS_Town_Warpra",10,"Hugel Town"; close; } -jawaii.gat,107,182,5 script Warpra 113,{ +jawaii.gat,107,182,5 script Warpra#25 113,{ callfunc "QWS_Town_Warpra",12,"Jawaii Town"; close; } -izlude.gat,132,116,4 script Warpra 113,{ +izlude.gat,132,116,4 script Warpra#26 113,{ callfunc "QWS_Town_Warpra",11,"Izlude Town"; close; } -lighthalzen.gat,153,100,5 script Warpra 113,{ +lighthalzen.gat,153,100,5 script Warpra#27 113,{ callfunc "QWS_Town_Warpra",13,"Lighthalzen Town"; close; } -louyang.gat,211,106,4 script Warpra 113,{ +louyang.gat,211,106,4 script Warpra#28 113,{ callfunc "QWS_Town_Warpra",14,"Louyang Town"; close; } -morocc.gat,157,95,4 script Warpra 113,{ +morocc.gat,157,95,4 script Warpra#29 113,{ callfunc "QWS_Town_Warpra",16,"Morroc Town"; close; } -nif_fild01.gat,319,77,1 script Warpra 113,{ +nif_fild01.gat,319,77,1 script Warpra#30 113,{ callfunc "QWS_Town_Warpra",17,"Niflheim Town"; close; } -payon.gat,183,110,4 script Warpra 113,{ +payon.gat,183,110,4 script Warpra#31 113,{ callfunc "QWS_Town_Warpra",18,"Payon Town"; close; } -prontera.gat,147,172,5 script Warpra 113,{ +prontera.gat,147,172,5 script Warpra#32 113,{ callfunc "QWS_Town_Warpra",0,"Prontera Town"; close; } -umbala.gat,133,130,4 script Warpra 113,{ +umbala.gat,133,130,4 script Warpra#33 113,{ callfunc "QWS_Town_Warpra",19,"Umbala Town"; close; } -xmas.gat,151,136,4 script Warpra 113,{ +xmas.gat,151,136,4 script Warpra#34 113,{ callfunc "QWS_Town_Warpra",15,"Lutie Town"; close; } -yuno.gat,138,162,4 script Warpra 113,{ +yuno.gat,138,162,4 script Warpra#35 113,{ callfunc "QWS_Town_Warpra",20,"Yuno Town"; close; } -abyss_02.gat,274,266,1 script Warpra 113,{ +abyss_02.gat,274,266,1 script Warpra#36 113,{ callfunc "QWS_Dungeon_Warpra",0,"Abyss Lake"; close; } -ama_dun02.gat,192,118,5 script Warpra Helper 112,{ +ama_dun02.gat,192,118,5 script Warpra Helper#01 112,{ callfunc "QWS_Dungeon_Warpra",1,"Amatsu Dungeon"; close; } -anthell02.gat,170,165,3 script Warpra Helper 112,{ +anthell02.gat,170,165,3 script Warpra Helper#02 112,{ callfunc "QWS_Dungeon_Warpra",2,"Ant Hell Dungeon"; close; } -ayo_dun02.gat,258,193,5 script Warpra Helper 112,{ +ayo_dun02.gat,258,193,5 script Warpra Helper#03 112,{ callfunc "QWS_Dungeon_Warpra",3,"Ayotaya Dungeon"; close; } -ein_dun02.gat,292,282,1 script Warpra Helper 112,{ +ein_dun02.gat,292,282,1 script Warpra Helper#04 112,{ callfunc "QWS_Dungeon_Warpra",8,"Einbech Dungeon"; close; } -iz_dun03.gat,202,47,2 script Warpra Helper 112,{ +iz_dun03.gat,202,47,2 script Warpra Helper#05 112,{ callfunc "QWS_Dungeon_Warpra",4,"Byalan Dungeon"; close; } -c_tower3.gat,129,106,4 script Warpra Helper 112,{ +c_tower3.gat,129,106,4 script Warpra Helper#06 112,{ callfunc "QWS_Dungeon_Warpra",5,"Clock Tower Dungeon"; close; } -mjo_dun02.gat,39,25,4 script Warpra Helper 112,{ +mjo_dun02.gat,39,25,4 script Warpra Helper#07 112,{ callfunc "QWS_Dungeon_Warpra",6,"Coal Mine Dungeon"; close; } -prt_sewb2.gat,176,30,3 script Warpra Helper 112,{ +prt_sewb2.gat,176,30,3 script Warpra Helper#08 112,{ callfunc "QWS_Dungeon_Warpra",7,"Culvert Dungeon"; close; } -gefenia03.gat,137,34,0 script Warpra Helper 112,{ +gefenia03.gat,137,34,0 script Warpra Helper#09 112,{ callfunc "QWS_Dungeon_Warpra",9,"Gefenia Dungeon"; close; } -gef_dun02.gat,218,61,2 script Warpra Helper 112,{ +gef_dun02.gat,218,61,2 script Warpra Helper#10 112,{ callfunc "QWS_Dungeon_Warpra",10,"Gefen Dungeon"; close; } -glast_01.gat,371,308,3 script Warpra Helper 112,{ +glast_01.gat,371,308,3 script Warpra Helper#11 112,{ callfunc "QWS_Dungeon_Warpra",11,"Glast Heim Dungeon"; close; } -gon_dun01.gat,167,273,4 script Warpra Helper 112,{ +gon_dun01.gat,167,273,4 script Warpra Helper#12 112,{ callfunc "QWS_Dungeon_Warpra",12,"Gonryun Dungeon"; close; } -juperos_02.gat,127,154,5 script Warpra Helper 112,{ +juperos_02.gat,127,154,5 script Warpra Helper#13 112,{ callfunc "QWS_Dungeon_Warpra",14,"Juperos Cave"; close; } -kh_dun01.gat,14,224,3 script Warpra Helper 112,{ +kh_dun01.gat,14,224,3 script Warpra Helper#14 112,{ callfunc "QWS_Dungeon_Warpra",28,"Kiel Dungeon"; close; } -lhz_dun02.gat,156,151,5 script Warpra Helper 112,{ +lhz_dun02.gat,156,151,5 script Warpra Helper#15 112,{ callfunc "QWS_Dungeon_Warpra",15,"Lighthalzen Bio Lab"; close; } -lou_dun02.gat,168,264,4 script Warpra Helper 112,{ +lou_dun02.gat,168,264,4 script Warpra Helper#16 112,{ callfunc "QWS_Dungeon_Warpra",16,"Louyang Dungeon"; close; } -mag_dun02.gat,46,41,3 script Warpra Helper 112,{ +mag_dun02.gat,46,41,3 script Warpra Helper#17 112,{ callfunc "QWS_Dungeon_Warpra",17,"Magma Dungeon"; close; } -odin_tem01.gat,115,148,3 script Warpra Helper 112,{ +odin_tem01.gat,115,148,3 script Warpra Helper#18 112,{ callfunc "QWS_Dungeon_Warpra",18,"Odin Temple"; close; } -orcsdun01.gat,185,11,3 script Warpra Helper 112,{ +orcsdun01.gat,185,11,3 script Warpra Helper#19 112,{ callfunc "QWS_Dungeon_Warpra",19,"Orc Dungeon"; close; } -pay_dun03.gat,162,143,3 script Warpra Helper 112,{ +pay_dun03.gat,162,143,3 script Warpra Helper#20 112,{ callfunc "QWS_Dungeon_Warpra",20,"Payon Dungeon"; close; } -moc_pryd02.gat,101,95,3 script Warpra Helper 112,{ +moc_pryd02.gat,101,95,3 script Warpra Helper#21 112,{ callfunc "QWS_Dungeon_Warpra",21,"Pyramides Dungeon"; close; } -in_sphinx2.gat,274,268,1 script Warpra Helper 112,{ +in_sphinx2.gat,274,268,1 script Warpra Helper#22 112,{ callfunc "QWS_Dungeon_Warpra",22,"Sphinx Dungeon"; close; } -tha_t07.gat,111,162,3 script Warpra Helper 112,{ +tha_t07.gat,111,162,3 script Warpra Helper#23 112,{ callfunc "QWS_Dungeon_Warpra",24,"Thanatos Tower"; close; } -treasure02.gat,104,40,3 script Warpra Helper 112,{ +treasure02.gat,104,40,3 script Warpra Helper#24 112,{ callfunc "QWS_Dungeon_Warpra",23,"Sunken Ship Dungeon"; close; } -xmas_dun02.gat,124,131,3 script Warpra Helper 112,{ +xmas_dun02.gat,124,131,3 script Warpra Helper#25 112,{ callfunc "QWS_Dungeon_Warpra",25,"Toy Factory Dungeon"; close; } -um_dun02.gat,44,28,3 script Warpra Helper 112,{ +um_dun02.gat,44,28,3 script Warpra Helper#26 112,{ callfunc "QWS_Dungeon_Warpra",27,"Umbala Dungeon"; close; } -tur_dun02.gat,162,23,3 script Warpra Helper 112,{ +tur_dun02.gat,162,23,3 script Warpra Helper#27 112,{ callfunc "QWS_Dungeon_Warpra",26,"Turtle Island Dungeon"; close; } -prt_maze02.gat,102,69,4 script Warpra Helper 112,{ +prt_maze02.gat,102,69,4 script Warpra Helper#28 112,{ callfunc "QWS_Dungeon_Warpra",13,"Hidden Dungeon"; close; } diff --git a/npc/custom/eAAC_Scripts/vendmachine.txt b/npc/custom/eAAC_Scripts/vendmachine.txt index 807a14e28..92a542a21 100644 --- a/npc/custom/eAAC_Scripts/vendmachine.txt +++ b/npc/custom/eAAC_Scripts/vendmachine.txt @@ -1,10 +1,12 @@ //===================================== // Vending Machine Script -// v2.3 +// v2.4 //===================================== // by Celestria //===================================== // Changelog: +// 2.4 - Removed Duplicates [Silent] +// // 2.3 - Added in "Slam" feature, as well as admin ability to turn machine on and off. // - Added admin menu. Allows GMs to put machines in/out of service, and to clear // all jammed items. @@ -201,9 +203,7 @@ B_Cancel: close; B_StillJammed: - mes "You shake and punch the vending machine, but it appears no matter how much energy you exert, the dang item isn't - -going to come loose."; + mes "You shake and punch the vending machine, but it appears no matter how much energy you exert, the dang item isn't going to come loose."; next; mes "["+strcharinfo(0)+"]"; mes "DANG VENDING MACHINES!"; diff --git a/npc/custom/healers/heal_payment.txt b/npc/custom/healers/heal_payment.txt index bcb6d4e1e..2a64035d2 100644 --- a/npc/custom/healers/heal_payment.txt +++ b/npc/custom/healers/heal_payment.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Yor & abunch of other people //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= Any Athena Version //===== Description: ========================================= @@ -15,9 +15,10 @@ //= calculation is done at start of the script //= Added Duplicates And Correct payon Loc [Darkchild] //= Some modifications. Added NPC locations. [massdriller] +//= Removed Duplicates [Silent] //============================================================ -prontera.gat,150,184,5 script Healer#h1-1::Healer 742,{ +prontera.gat,150,184,5 script Healer#h2-1::Healer2 742,{ set @tempHp, MaxHp-Hp; set @tempSpReal, MaxSp-Sp; set @tempSp, ((MaxSp-Sp) * BaseLevel) / 5; @@ -89,18 +90,18 @@ prontera.gat,150,184,5 script Healer#h1-1::Healer 742,{ } -morocc.gat,159,96,5 duplicate(Healer) Healer#h2-2 742 -ayothaya.gat,155,111,5 duplicate(Healer) Healer#h2-3 742 -geffen.gat,121,61,5 duplicate(Healer) Healer#h2-4 742 -umbala.gat,94,162,5 duplicate(Healer) Healer#h2-5 742 -payon.gat,180,105,5 duplicate(Healer) Healer#h2-6 742 -alberta.gat,185,144,5 duplicate(Healer) Healer#h2-7 742 -aldebaran.gat,134,123,5 duplicate(Healer) Healer#h2-8 742 -izlude.gat,125,118,5 duplicate(Healer) Healer#h2-9 742 -xmas.gat,149,136,5 duplicate(Healer) Healer#h2-10 742 -comodo.gat,188,162,5 duplicate(Healer) Healer#h2-11 742 -amatsu.gat,200,80,5 duplicate(Healer) Healer#h2-12 742 -gonryun.gat,164,130,5 duplicate(Healer) Healer#h2-13 742 -yuno.gat,152,186,5 duplicate(Healer) Healer#h2-14 742 -niflheim.gat,188,180,5 duplicate(Healer) Healer#h2-15 742 -louyang.gat,225,103,5 duplicate(Healer) Healer#h2-16 742 \ No newline at end of file +morocc.gat,159,96,5 duplicate(Healer2) Healer#h2-2 742 +ayothaya.gat,155,111,5 duplicate(Healer2) Healer#h2-3 742 +geffen.gat,121,61,5 duplicate(Healer2) Healer#h2-4 742 +umbala.gat,94,162,5 duplicate(Healer2) Healer#h2-5 742 +payon.gat,180,105,5 duplicate(Healer2) Healer#h2-6 742 +alberta.gat,185,144,5 duplicate(Healer2) Healer#h2-7 742 +aldebaran.gat,134,123,5 duplicate(Healer2) Healer#h2-8 742 +izlude.gat,125,118,5 duplicate(Healer2) Healer#h2-9 742 +xmas.gat,149,136,5 duplicate(Healer2) Healer#h2-10 742 +comodo.gat,188,162,5 duplicate(Healer2) Healer#h2-11 742 +amatsu.gat,200,80,5 duplicate(Healer2) Healer#h2-12 742 +gonryun.gat,164,130,5 duplicate(Healer2) Healer#h2-13 742 +yuno.gat,152,186,5 duplicate(Healer2) Healer#h2-14 742 +niflheim.gat,188,180,5 duplicate(Healer2) Healer#h2-15 742 +louyang.gat,225,103,5 duplicate(Healer2) Healer#h2-16 742 \ No newline at end of file diff --git a/npc/custom/morroc_raceway.txt b/npc/custom/morroc_raceway.txt index 910cdc592..d0c21a09b 100644 --- a/npc/custom/morroc_raceway.txt +++ b/npc/custom/morroc_raceway.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= acky (god@acky.com) //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= Any eAthena Version //===== Description: ========================================= @@ -16,10 +16,11 @@ //= must finish before a new race can be started. //= //= Removed permanent global variables +//= 1.2 Removed Duplicates [Silent] //============================================================ //Warps you into race way -morocc.gat,166,105,6 script Race Girl 116,{ +morocc.gat,166,105,6 script Race Girl#01 116,{ mes "[Race Girl]"; mes "Would you like to visit ^0000FFMorroc Raceway^000000?"; next; @@ -34,7 +35,7 @@ close; } //Warps you out of raceway -pvp_y_1-5.gat,169,265,5 script Race Girl 116,{ +pvp_y_1-5.gat,169,265,5 script Race Girl#02 116,{ mes "[Race Girl]"; mes "Welcome to Morroc Raceway!"; next; @@ -207,39 +208,39 @@ close; } //Check Point Marker Flags -pvp_y_1-5.gat,144,267,4 script Check Point 1 722,{ +pvp_y_1-5.gat,144,267,4 script Check Point 1#01 722,{ end; } -pvp_y_1-5.gat,144,257,4 script Check Point 1 722,{ +pvp_y_1-5.gat,144,257,4 script Check Point 1#02 722,{ end; } -pvp_y_1-5.gat,70,252,3 script Check Point 2 722,{ +pvp_y_1-5.gat,70,252,3 script Check Point 2#01 722,{ end; } -pvp_y_1-5.gat,77,243,3 script Check Point 2 722,{ +pvp_y_1-5.gat,77,243,3 script Check Point 2#02 722,{ end; } -pvp_y_1-5.gat,81,48,1 script Check Point 3 722,{ +pvp_y_1-5.gat,81,48,1 script Check Point 3#01 722,{ end; } -pvp_y_1-5.gat,72,40,1 script Check Point 3 722,{ +pvp_y_1-5.gat,72,40,1 script Check Point 3#02 722,{ end; } -pvp_y_1-5.gat,244,65,7 script Check Point 4 722,{ +pvp_y_1-5.gat,244,65,7 script Check Point 4#01 722,{ end; } -pvp_y_1-5.gat,252,57,7 script Check Point 4 722,{ +pvp_y_1-5.gat,252,57,7 script Check Point 4#02 722,{ end; } -pvp_y_1-5.gat,259,260,5 script Check Point 5 722,{ +pvp_y_1-5.gat,259,260,5 script Check Point 5#01 722,{ end; } -pvp_y_1-5.gat,251,252,5 script Check Point 5 722,{ +pvp_y_1-5.gat,251,252,5 script Check Point 5#02 722,{ end; } -pvp_y_1-5.gat,174,249,4 script Finish Line 722,{ +pvp_y_1-5.gat,174,249,4 script Finish Line#01 722,{ end; } -pvp_y_1-5.gat,174,238,4 script Finish Line 722,{ +pvp_y_1-5.gat,174,238,4 script Finish Line#02 722,{ end; } \ No newline at end of file diff --git a/npc/custom/mvm.txt b/npc/custom/mvm.txt index 8059fcc30..6a2ae567d 100644 --- a/npc/custom/mvm.txt +++ b/npc/custom/mvm.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= acky - god@acky.com //===== Current Version: ===================================== -//= 1.1.2 +//= 1.1.3 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -16,6 +16,7 @@ //= Added Duel Room //= --------------------------------------------------------- //= Script is messy! Be careful! +//= 1.1.3 Removed Duplicate Names [Silent] //= 1.1.2 Changed all gmcommand to atcommand as Poki#3 suggested. [Vicious] //============================================================ @@ -191,7 +192,7 @@ mes "[Referee]"; mes "Alright"; close; } -gon_test.gat,56,91,6 duplicate(monsterreferee) Referee 61 +gon_test.gat,56,91,6 duplicate(monsterreferee) Referee#01 61 // Usher // @@ -767,7 +768,7 @@ end; } // Duel Arena // -gon_test.gat,58,103,5 script Duel Master 92,{ +gon_test.gat,58,103,5 script Duel Master#01 92,{ if ($@duelist1$ == "") set @duel,0; if ($@monster1 == "") set @duel,0; set @marena,1; @@ -859,7 +860,7 @@ close; } // Duel Exit // -gon_test.gat,42,8,5 script Duel Master 92,{ +gon_test.gat,42,8,5 script Duel Master#02 92,{ mes "[Duel Master]"; mes "Would you like to return?"; menu "Yes",L_Leave,"No",-; @@ -892,4 +893,4 @@ close; } gon_test.gat,49,5,5 duplicate(SummonPad) Summon Pad 4 111,2,2 -gon_test.gat,55,8,6 duplicate(monsterreferee) Referee 61 \ No newline at end of file +gon_test.gat,55,8,6 duplicate(monsterreferee) Referee#02 61 \ No newline at end of file diff --git a/npc/custom/quests/thq/THQS_Quests.txt b/npc/custom/quests/thq/THQS_Quests.txt index ca282164f..cc5eeb037 100644 --- a/npc/custom/quests/thq/THQS_Quests.txt +++ b/npc/custom/quests/thq/THQS_Quests.txt @@ -10,7 +10,7 @@ // revised By Warlock // /////////////////////////////////////////////////////////// //===== Version =========================================== -//= 1.2 +//= 1.3 //===== Compatible With =================================== //= eAthena 1.0 //===== Description ======================================= @@ -20,6 +20,7 @@ //= #Treasure_Token - used to keep track of tokens //= 1.0 - Straight conversionof Aegis NPC file //= 1.2 some bugfixes, typos [Lupus] +//= 1.3 Removed Duplicates [Silent] ////////////////////////////////////////////////////////// @@ -311,7 +312,7 @@ N_QuestStart2: close; } //3-4 -mjolnir_02.gat,87,357,6 script Man 51,{ +mjolnir_02.gat,87,357,6 script Man#01 51,{ if (three_qset == 4 && countitem(1041) > 49) goto N_QuestComp; if (three_qset == 4) goto N_QuestStart; mes "[Rudolfo]"; @@ -455,7 +456,7 @@ N_QuestStart: } ///////Job list 5/////// //5-1; -prt_maze01.gat,18,184,6 script Lithin 752,{ +prt_maze01.gat,18,184,6 script Lithin#01 752,{ if (five_qset == 1 && countitem(1028) > 14) goto N_QuestComp; if (five_qset == 1) goto N_QuestStart; mes "[Lithin]"; @@ -482,7 +483,7 @@ N_QuestStart: close; } //5-2 goes to 6-2 using callfunc; -moc_ruins.gat,75,167,6 script Lithin 87,{ +moc_ruins.gat,75,167,6 script Lithin#02 87,{ if (five_qset == 2 && countitem(932) > 29) goto N_QuestComp; if (five_qset == 2) goto N_QuestStart; if (six_qset == 2) goto N_QuestStart2; @@ -534,7 +535,7 @@ N_QuestStart: close; } //5-4; -gef_tower.gat,49,27,6 script Wizard 735,{ +gef_tower.gat,49,27,6 script Wizard#01 735,{ if (five_qset == 4 && countitem(1059) > 49) goto N_QuestComp; if (five_qset == 4) goto N_QuestStart; mes "[Wizard]"; @@ -631,7 +632,7 @@ N_QuestStart: close; } //6-4; -gef_tower.gat,52,87,6 script Wizard 735,{ +gef_tower.gat,52,87,6 script Wizard#02 735,{ if (six_qset == 4 && countitem(944) > 19) goto N_QuestComp; if (six_qset == 4) goto N_QuestStart; mes "[Zuuzuu]"; @@ -974,7 +975,7 @@ N_QuestStart: close; } //10-2; -pay_fild10.gat,145,252,6 script Man 122,{ +pay_fild10.gat,145,252,6 script Man#02 122,{ if (ten_qset == 2 && countitem(1029) > 0) goto N_QuestComp; if (ten_qset == 2) goto N_QuestStart; mes "[Man]"; diff --git a/npc/custom/warper/warper.txt b/npc/custom/warper/warper.txt index c9b74f1a1..c9858ceda 100644 --- a/npc/custom/warper/warper.txt +++ b/npc/custom/warper/warper.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Darkchild //===== Current Version: ===================================== -//= 1.7 +//= 1.8 //===== Compatible With: ===================================== //= Any eAthena Version; //===== Description: ========================================= @@ -21,13 +21,14 @@ //= 1.6 Rewrote a lot. Changed the sprite, some locations. [Poki#3] //= TODO Add an option for selecting the level of the dungeon. [Poki#3] //= 1.7 Temporary? Added F_ClearGarbage to clear unused/outdated variables [Lupus] +//= 1.8 Removed Duplicates [Silent] //============================================================ //============================================================ //= To allow selecting the Level of the Dungeon you want to //= Warp to set the @lvlselect variable to 1 (Not implemented yet!) //============================================================ -- script Warp Agent::warpra 859,{ +- script Warp Agent#01::warpra 859,{ // set @lvlselect,0; callfunc "F_ClearGarbage"; //Clear outdated, unused variables @@ -97,46 +98,46 @@ dturtle: warp "tur_dun01.gat", 149, 238; end; } //----------------Towns----------------\\ -alberta.gat,31,240,4 duplicate(warpra) Warp Agent 859 -aldebaran.gat,145,118,4 duplicate(warpra) Warp Agent 859 -amatsu.gat,192,81,1 duplicate(warpra) Warp Agent 859 -ayothaya.gat,144,117,6 duplicate(warpra) Warp Agent 859 -comodo.gat,194,158,4 duplicate(warpra) Warp Agent 859 -einbroch.gat,59,205,4 duplicate(warpra) Warp Agent 859 -einbroch.gat,243,189,2 duplicate(warpra) Warp Agent 859 -einbech.gat,135,249,4 duplicate(warpra) Warp Agent 859 -geffen.gat,115,66,4 duplicate(warpra) Warp Agent 859 -gonryun.gat,151,130,4 duplicate(warpra) Warp Agent 859 -izlude.gat,133,117,4 duplicate(warpra) Warp Agent 859 -hugel.gat,88,151,5 duplicate(warpra) Warp Agent 859 -lighthalzen.gat,155,79,6 duplicate(warpra) Warp Agent 859 -louyang.gat,210,106,4 duplicate(warpra) Warp Agent 859 -morocc.gat,156,95,4 duplicate(warpra) Warp Agent 859 -prontera.gat,161,192,4 duplicate(warpra) Warp Agent 859 -payon.gat,182,110,4 duplicate(warpra) Warp Agent 859 -umbala.gat,132,130,4 duplicate(warpra) Warp Agent 859 -xmas.gat,150,136,4 duplicate(warpra) Warp Agent 859 -yuno.gat,137,162,4 duplicate(warpra) Warp Agent 859 +alberta.gat,31,240,4 duplicate(warpra) Warp Agent#02 859 +aldebaran.gat,145,118,4 duplicate(warpra) Warp Agent#03 859 +amatsu.gat,192,81,1 duplicate(warpra) Warp Agent#04 859 +ayothaya.gat,144,117,6 duplicate(warpra) Warp Agent#05 859 +comodo.gat,194,158,4 duplicate(warpra) Warp Agent#06 859 +einbroch.gat,59,205,4 duplicate(warpra) Warp Agent#07 859 +einbroch.gat,243,189,2 duplicate(warpra) Warp Agent#08 859 +einbech.gat,135,249,4 duplicate(warpra) Warp Agent#09 859 +geffen.gat,115,66,4 duplicate(warpra) Warp Agent#10 859 +gonryun.gat,151,130,4 duplicate(warpra) Warp Agent#11 859 +izlude.gat,133,117,4 duplicate(warpra) Warp Agent#12 859 +hugel.gat,88,151,5 duplicate(warpra) Warp Agent#13 859 +lighthalzen.gat,155,79,6 duplicate(warpra) Warp Agent#14 859 +louyang.gat,210,106,4 duplicate(warpra) Warp Agent#15 859 +morocc.gat,156,95,4 duplicate(warpra) Warp Agent#16 859 +prontera.gat,161,192,4 duplicate(warpra) Warp Agent#17 859 +payon.gat,182,110,4 duplicate(warpra) Warp Agent#18 859 +umbala.gat,132,130,4 duplicate(warpra) Warp Agent#19 859 +xmas.gat,150,136,4 duplicate(warpra) Warp Agent#20 859 +yuno.gat,137,162,4 duplicate(warpra) Warp Agent#21 859 //----------------Dungeons----------------\\ -ama_dun01.gat,233,9,1 duplicate(warpra) Warp Agent 859 -moc_fild04.gat,207,331,4 duplicate(warpra) Warp Agent 859 -ayo_fild02.gat,279,154,4 duplicate(warpra) Warp Agent 859 -izlu2dun.gat,104,82,4 duplicate(warpra) Warp Agent 859 -prt_sewb1.gat,125,253,4 duplicate(warpra) Warp Agent 859 -mjolnir_02.gat,85,363,4 duplicate(warpra) Warp Agent 859 -einbech.gat,81,101,1 duplicate(warpra) Warp Agent 859 -glast_01.gat,370,308,4 duplicate(warpra) Warp Agent 859 -yuno_fild03.gat,37,135,4 duplicate(warpra) Warp Agent 859 -niflheim.gat,32,161,4 duplicate(warpra) Warp Agent 859 -gef_fild10.gat,71,339,4 duplicate(warpra) Warp Agent 859 -pay_arche.gat,39,135,4 duplicate(warpra) Warp Agent 859 -moc_ruins.gat,64,166,4 duplicate(warpra) Warp Agent 859 -moc_fild19.gat,106,97,4 duplicate(warpra) Warp Agent 859 -alb2trea.gat,73,101,4 duplicate(warpra) Warp Agent 859 -tur_dun01.gat,148,239,4 duplicate(warpra) Warp Agent 859 -lhz_dun01.gat,157,285,4 duplicate(warpra) Warp Agent 859 -hu_fild05.gat,186,210,4 duplicate(warpra) Warp Agent 859 -yuno_fild07.gat,221,179,4 duplicate(warpra) Warp Agent 859 -tha_scene01.gat,139,194,1 duplicate(warpra) Warp Agent 859 -odin_tem01.gat,96,149,4 duplicate(warpra) Warp Agent 859 +ama_dun01.gat,233,9,1 duplicate(warpra) Warp Agent#22 859 +moc_fild04.gat,207,331,4 duplicate(warpra) Warp Agent#23 859 +ayo_fild02.gat,279,154,4 duplicate(warpra) Warp Agent#24 859 +izlu2dun.gat,104,82,4 duplicate(warpra) Warp Agent#25 859 +prt_sewb1.gat,125,253,4 duplicate(warpra) Warp Agent#26 859 +mjolnir_02.gat,85,363,4 duplicate(warpra) Warp Agent#27 859 +einbech.gat,81,101,1 duplicate(warpra) Warp Agent#28 859 +glast_01.gat,370,308,4 duplicate(warpra) Warp Agent#29 859 +yuno_fild03.gat,37,135,4 duplicate(warpra) Warp Agent#30 859 +niflheim.gat,32,161,4 duplicate(warpra) Warp Agent#31 859 +gef_fild10.gat,71,339,4 duplicate(warpra) Warp Agent#32 859 +pay_arche.gat,39,135,4 duplicate(warpra) Warp Agent#33 859 +moc_ruins.gat,64,166,4 duplicate(warpra) Warp Agent#34 859 +moc_fild19.gat,106,97,4 duplicate(warpra) Warp Agent#35 859 +alb2trea.gat,73,101,4 duplicate(warpra) Warp Agent#36 859 +tur_dun01.gat,148,239,4 duplicate(warpra) Warp Agent#37 859 +lhz_dun01.gat,157,285,4 duplicate(warpra) Warp Agent#38 859 +hu_fild05.gat,186,210,4 duplicate(warpra) Warp Agent#39 859 +yuno_fild07.gat,221,179,4 duplicate(warpra) Warp Agent#40 859 +tha_scene01.gat,139,194,1 duplicate(warpra) Warp Agent#41 859 +odin_tem01.gat,96,149,4 duplicate(warpra) Warp Agent#42 859 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 diff --git a/npc/guides/guides_alde.txt b/npc/guides/guides_alde.txt index f0e891a80..be1cc3f35 100644 --- a/npc/guides/guides_alde.txt +++ b/npc/guides/guides_alde.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== -//= 1.4 +//= 1.5 //===== Compatible With: ===================================== //= eAthena 7.15 + //===== Description: ========================================= @@ -14,6 +14,7 @@ //= 1.3 Updated the guide according to how it is on iRO, thanks [MasterOfMuppets] //= to Muad_Dib //= 1.4 Fitted the many lines into 1 or 2, and corrected some typos [erKURITA] +//= 1.5 Removed Duplicates [Silent] //============================================================ @@ -49,4 +50,4 @@ L_End: close; } -aldebaran.gat,241,136,4 duplicate(Alde_Guide) Soldier 105 +aldebaran.gat,241,136,4 duplicate(Alde_Guide) Soldier#Alde02 105 diff --git a/npc/guides/guides_ama.txt b/npc/guides/guides_ama.txt index ebcd4b7d5..a8c5ac26e 100644 --- a/npc/guides/guides_ama.txt +++ b/npc/guides/guides_ama.txt @@ -3,16 +3,17 @@ //===== By: ================================================== //= MasterOfMuppets //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= //===== Description: ========================================= //= //===== Additional Comments: ================================= //= 1.0 First version [MasterOfMuppets] +//= 1.1 Removed Duplicates [Silent] //============================================================ -amatsu.gat,207,89,3 script Amatsu Guide 758,{ +amatsu.gat,207,89,3 script Amatsu Guide#01 758,{ mes "[Amachang]"; mes "Welcome to Amatsu,"; @@ -71,7 +72,7 @@ s_Bar: } -amatsu.gat,251,283,4 script Amatsu Guide 767,{ +amatsu.gat,251,283,4 script Amatsu Guide#02 767,{ mes "[Guide Man]"; mes "Welcome, tourist from"; diff --git a/npc/guides/guides_einbe.txt b/npc/guides/guides_einbe.txt index 6d78ee793..0d50e01a3 100644 --- a/npc/guides/guides_einbe.txt +++ b/npc/guides/guides_einbe.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Muad_dib //===== Current Version: ===================================== -//= 1.3 +//= 1.4 //===== Compatible With: ===================================== //= eAthena 7.15 + //===== Description: ========================================= @@ -14,6 +14,7 @@ //= 1.1 missing tabs [Lupus] //= 1.2 Optimized, updated common guide names [Lupus] //= 1.3 Fitted the many lines into 1 or 2, and corrected some typos [erKURITA] +//= 1.4 Removed Duplicates [Silent] //============================================================ einbech.gat,67,37,4 script Guide#1::Einbech_Guide 852,{ cutin "ein_soldier",2; @@ -115,4 +116,4 @@ L_END: close; } -einbech.gat,48,214,4 duplicate(Einbech_Guide) Guide#2 852 \ No newline at end of file +einbech.gat,48,214,4 duplicate(Einbech_Guide) Guide#Ein2 852 \ No newline at end of file diff --git a/npc/guides/guides_einbr.txt b/npc/guides/guides_einbr.txt index 38faaf026..c1652f268 100644 --- a/npc/guides/guides_einbr.txt +++ b/npc/guides/guides_einbr.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Reddozen //===== Current Version: ===================================== -//= 1.3 +//= 1.4 //===== Compatible With: ===================================== //= eAthena 7.15 + //===== Description: ========================================= @@ -13,6 +13,7 @@ //= 1.1 added 1 more Guide NPC, thanx to Justin84 [Lupus] //= 1.2 Optimized, updated common guide names [Lupus] //= 1.3 Fitted the many lines into 1 or 2, and corrected some typos [erKURITA] +//= 1.4 Removed Duplicates [Silent] //============================================================ @@ -163,5 +164,5 @@ M_End: close; } -einbroch.gat,155,43,4 duplicate(Einbroch_Guide) Guide#2 852 -einbroch.gat,162,317,4 duplicate(Einbroch_Guide) Guide#3 852 +einbroch.gat,155,43,4 duplicate(Einbroch_Guide) Guide#Einb2 852 +einbroch.gat,162,317,4 duplicate(Einbroch_Guide) Guide#Einb3 852 diff --git a/npc/guides/guides_gef.txt b/npc/guides/guides_gef.txt index 3dc2c1446..d71e13fb6 100644 --- a/npc/guides/guides_gef.txt +++ b/npc/guides/guides_gef.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= eAthena 0.5.2 + //===== Description: ========================================= @@ -13,6 +13,7 @@ //= v1.1 Now using duplicate command. //= 1.2 Optimized, updated common guide names [Lupus] //= 1.2a Small note that the BS guild moved to Einbroch [Poki#3] +//= 1.3 Removed Duplicates [Silent] //============================================================ @@ -122,8 +123,8 @@ M_Menu: } // South ------------------------------------------ -geffen.gat,118,62,0 duplicate(Gef_Guide) Guide#2 705 +geffen.gat,118,62,0 duplicate(Gef_Guide) Guide#Gef2 705 // East ----------------------------------------------------- -geffen.gat,203,116,2 duplicate(Gef_Guide) Guide#3 705 +geffen.gat,203,116,2 duplicate(Gef_Guide) Guide#Gef3 705 // West ---------------------------------------------- -geffen.gat,37,123,5 duplicate(Gef_Guide) Guide#4 705 +geffen.gat,37,123,5 duplicate(Gef_Guide) Guide#Gef4 705 diff --git a/npc/guides/guides_hu.txt b/npc/guides/guides_hu.txt index 857d36fbe..359b28eba 100644 --- a/npc/guides/guides_hu.txt +++ b/npc/guides/guides_hu.txt @@ -3,17 +3,18 @@ //===== By: ================================================== //= erKURITA //===== Current Version: ===================================== -//= 1.0a +//= 1.1 //===== Compatible With: ===================================== //= eAthena 1.0 //===== Description: ========================================= //= Guard/Guide NPC of City of Hugel. //===== Additional Comments: ================================= //= 1.0 Started the script. [erKURITA] +//= 1.1 Removed Duplicates [Silent] //============================================================ -hugel.gat,98,57,3 script Old Lady 863,{ +hugel.gat,98,57,3 script Old Lady#hu1 863,{ mes "[Old Lady]"; mes "Welcome to Hugel, the Power Source City."; next; diff --git a/npc/guides/guides_lhz.txt b/npc/guides/guides_lhz.txt index 209bc17ef..aae728380 100644 --- a/npc/guides/guides_lhz.txt +++ b/npc/guides/guides_lhz.txt @@ -3,13 +3,14 @@ //===== By: ================================================== //= MasterOfMuppets //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= //===== Description: ========================================= //= Lighthalzen Guide NPCs //===== Additional Comments: ================================= //= 1.0 First Version [MasterOfMuppets] +//= 1.1 Removed Duplicates [Silent] //============================================================ lighthalzen.gat,220,311,3 script Guide::LhzSlum 852,{ @@ -356,6 +357,6 @@ s_Notice: } -lighthalzen.gat,154,100,5 duplicate(LhzWest) Guide 852 +lighthalzen.gat,154,100,5 duplicate(LhzWest) Guide#lhz1 852 -lighthalzen.gat,319,243,5 duplicate(LhzSlum) Guide 852 +lighthalzen.gat,319,243,5 duplicate(LhzSlum) Guide#lhz2 852 diff --git a/npc/guides/guides_mor.txt b/npc/guides/guides_mor.txt index 5033a6a24..e4890abca 100644 --- a/npc/guides/guides_mor.txt +++ b/npc/guides/guides_mor.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= eAthena 0.5.2 + //===== Description: ========================================= @@ -12,6 +12,7 @@ //= Fully working. Added a guide at every exit. //= v1.1 Now using duplicate command. //= 1.2 Optimized, updated common guide names [Lupus] +//= 1.3 Removed Duplicates [Silent] //============================================================ @@ -109,8 +110,8 @@ M_Menu: } // South -------------------------------------------- -morocc.gat,162,97,6 duplicate(Mor_Guide) Guide#2 707 +morocc.gat,162,97,6 duplicate(Mor_Guide) Guide#Mor2 707 // West -------------------------------------------- -morocc.gat,28,161,6 duplicate(Mor_Guide) Guide#3 707 +morocc.gat,28,161,6 duplicate(Mor_Guide) Guide#Mor3 707 // East -------------------------------------------- -morocc.gat,294,203,9 duplicate(Mor_Guide) Guide#4 707 +morocc.gat,294,203,9 duplicate(Mor_Guide) Guide#Mor4 707 diff --git a/npc/guides/guides_pay.txt b/npc/guides/guides_pay.txt index ed1427547..522dc5238 100644 --- a/npc/guides/guides_pay.txt +++ b/npc/guides/guides_pay.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== -//= 1.4a +//= 1.5 //===== Compatible With: ===================================== //= eAthena 0.5.2 + //===== Description: ========================================= @@ -17,10 +17,11 @@ //= 1.3a Fixed some problems with duplicated text, thanks to muad_dib [MasterOfMuppets] //= 1.4 Fitted the many lines into 1 or 2, and corrected some typos [erKURITA] //= 1.4a Tixed Archer Village Guide [Lupus] +//= 1.5 Removed Duplicates [Silent] //============================================================ -payon.gat,162,67,4 script Guide 708,{ +payon.gat,162,67,4 script Guide#pay1 708,{ cutin "pay_soldier",2; mes "[Payon Guide]"; mes "Welcome to the mountain city of Payon."; @@ -144,7 +145,7 @@ L_END: close; } -pay_arche.gat,85,30,2 script Guide 708,{ +pay_arche.gat,85,30,2 script Guide#pay2 708,{ cutin "pay_soldier",2; mes "[Payon Guide]"; mes "Welcome to the Archer Village."; diff --git a/npc/guides/guides_pron.txt b/npc/guides/guides_pron.txt index edf592b2b..d5f14e928 100644 --- a/npc/guides/guides_pron.txt +++ b/npc/guides/guides_pron.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== -//= 1.4 +//= 1.5 //===== Compatible With: ===================================== //= eAthena 0.5.2 + //===== Description: ========================================= @@ -15,6 +15,7 @@ //= 1.3 Updated the guide according to how it is on iRO, thanks [MasterOfMuppets] //= to Muad_Dib //= 1.4 Fitted the many lines into 1 or 2, and corrected some typos [erKURITA] +//= 1.5 Removed Duplicates [Silent] //============================================================ @@ -172,13 +173,13 @@ L_END: } // East ---------------------------------------------------- -prontera.gat,282,208,2 duplicate(Prt_Guide) Guide#2 105 +prontera.gat,282,208,2 duplicate(Prt_Guide) Guide#prt2 105 //West -------------------------------------------------- -prontera.gat,29,200,6 duplicate(Prt_Guide) Guide#3 105 +prontera.gat,29,200,6 duplicate(Prt_Guide) Guide#prt3 105 // South ----------------------------------------------------- -prontera.gat,160,29,0 duplicate(Prt_Guide) Guide#4 105 +prontera.gat,160,29,0 duplicate(Prt_Guide) Guide#prt4 105 // North ----------------------------------------------- -prontera.gat,151,330,4 duplicate(Prt_Guide) Guide#5 105 +prontera.gat,151,330,4 duplicate(Prt_Guide) Guide#prt5 105 // Guard ----------------------------------------------------- @@ -188,20 +189,20 @@ prontera.gat,160,330,4 script Guard#1::Prt_Guard 105,{ close; } -prontera.gat,229,104,5 duplicate(Prt_Guard) Guard#2 105 -prontera.gat,223,98,8 duplicate(Prt_Guard) Guard#3 105 -prontera.gat,52,344,5 duplicate(Prt_Guard) Guard#4 105 -prontera.gat,47,339,5 duplicate(Prt_Guard) Guard#5 105 +prontera.gat,229,104,5 duplicate(Prt_Guard) Guard#prt2 105 +prontera.gat,223,98,8 duplicate(Prt_Guard) Guard#prt3 105 +prontera.gat,52,344,5 duplicate(Prt_Guard) Guard#prt4 105 +prontera.gat,47,339,5 duplicate(Prt_Guard) Guard#prt5 105 //---------------------------------------------------------------------------------------- Prontera Maze ----------------------------------------------------------------------------------\\ -prt_maze02.gat,100,69,4 script Guard 105,{ +prt_maze02.gat,100,69,4 script Guard#maz01 105,{ mes "[Guard]"; mes "Hey, I don't get your point but I say you should go home and rest rather than go inside the forest. Don't you know the 'Demon' lurks there?"; mes "Naturally, Nobody came back on the hoof so I am not sure whether it really exists or not... well, Do as you want, dude. I'm not your mother."; close; } -prt_maze02.gat,110,69,4 script Guard 105,{ +prt_maze02.gat,110,69,4 script Guard#maz02 105,{ mes "[Guard]"; mes "Phew...That geek who went inside last time never returned either."; mes "I tried to stop him so many times but he never took me seriously. He told me he needed herbs."; diff --git a/npc/guides/guides_yun.txt b/npc/guides/guides_yun.txt index 3972e5026..f5282d9d3 100644 --- a/npc/guides/guides_yun.txt +++ b/npc/guides/guides_yun.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= KitsuneStarwind, usul, kobra_k88 //===== Current Version: ===================================== -//= 1.4 +//= 1.5 //===== Compatible With: ===================================== //= eAthena 1.0 + //===== Description: ========================================= @@ -15,11 +15,12 @@ //= 1.2 Optimized, updated common guide names [Lupus] //= 1.3 Updated the mini map localization function. [Musashiden] //= 1.4 Juno Guides are now up to date according to iRO. [Musashiden] +//= 1.5 Removed Duplicates [Silent] //============================================================ //===================================================================================== -yuno.gat,153,47,4 script Juno Guide 700,{ +yuno.gat,153,47,4 script Juno Guide#yun1 700,{ mes "[Ms. Yoon]"; mes "A place that takes the vision of"; mes "the future, and gives it form in"; @@ -31,7 +32,7 @@ yuno.gat,153,47,4 script Juno Guide 700,{ } //===================================================================== -yuno.gat,334,182,4 script Juno Soldier 852,{ +yuno.gat,334,182,4 script Juno Soldier#yun1 852,{ mes "[Juno Soldier]"; mes "Welcome to Juno, the city of"; mes "noble-mindedness."; @@ -51,7 +52,7 @@ yuno.gat,334,182,4 script Juno Soldier 852,{ } //===================================================================== -yuno.gat,263,320,4 script Juno Soldier 105,{ +yuno.gat,263,320,4 script Juno Soldier#yun2 105,{ mes "[Juno Soldier]"; mes "Welcome to Juno, the city of"; mes "noble-mindedness."; @@ -71,7 +72,7 @@ yuno.gat,263,320,4 script Juno Soldier 105,{ } //===================================================================== -yuno.gat,227,292,4 script Juno Soldier 105,{ +yuno.gat,227,292,4 script Juno Soldier#yun3 105,{ mes "[Juno Soldier]"; mes "Welcome to Juno, the city of"; mes "noble-mindedness."; @@ -92,7 +93,7 @@ yuno.gat,227,292,4 script Juno Soldier 105,{ } //===================================================================== -yuno.gat,165,283,4 script Yuno Soldier 105,{ +yuno.gat,165,283,4 script Yuno Soldier#yun3 105,{ mes "[Juno Soldier]"; mes "Welcome to Juno, the city of"; mes "noble-mindedness."; @@ -118,7 +119,7 @@ yuno.gat,165,283,4 script Yuno Soldier 105,{ } //===================================================================== -yuno.gat,150,283,4 script Yuno Soldier 105,{ +yuno.gat,150,283,4 script Yuno Soldier#yun4 105,{ mes "[Juno Soldier]"; mes "Welcome to Juno, the city of"; mes "noble-mindedness."; @@ -146,7 +147,7 @@ yuno.gat,150,283,4 script Yuno Soldier 105,{ } //===================================================================== -yuno.gat,165,228,4 script Yuno Soldier 105,{ +yuno.gat,165,228,4 script Yuno Soldier#yun5 105,{ mes "[Juno Soldier]"; mes "Welcome to Juno, the city of"; mes "noble-mindedness."; @@ -171,7 +172,7 @@ yuno.gat,165,228,4 script Yuno Soldier 105,{ } //===================================================================== -yuno.gat,150,228,4 script Yuno Soldier 105,{ +yuno.gat,150,228,4 script Yuno Soldier#yun6 105,{ mes "[Juno Soldier]"; mes "Welcome to Juno, the city of"; mes "noble-mindedness."; diff --git a/npc/guild/aldeg/aldeg_managers.txt b/npc/guild/aldeg/aldeg_managers.txt index e0f2e65dd..96b0ab631 100644 --- a/npc/guild/aldeg/aldeg_managers.txt +++ b/npc/guild/aldeg/aldeg_managers.txt @@ -4,13 +4,14 @@ //= jAthena - kalen (1.0) //= 1.1 by Akaru, ho|yAnge|X, and Valaris //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= eAthena 0.1+; RO Episode 4+ //===== Description: ========================================= //= //===== Additional Comments: ================================= //= v1.2 Optimized with functions.[kobra_k88] +//= 1.3 Removed Duplicates [Silent] //============================================================ @@ -34,7 +35,7 @@ aldeg_cas01.gat,218,175,0 script Arl Fredo 55,{ // Castle 2 ================================================================================== -aldeg_cas02.gat,78,74,0 script Chen Lee 55,{ +aldeg_cas02.gat,78,74,0 script Chen Lee#01 55,{ if(callfunc("F_GldManager","Chen Lee","aldeg_cas02",135,231,"A02") == 0) close; @@ -53,7 +54,7 @@ aldeg_cas02.gat,78,74,0 script Chen Lee 55,{ // Castle 3 ================================================================================== -aldeg_cas03.gat,110,118,0 script Chen Lee 55,{ +aldeg_cas03.gat,110,118,0 script Chen Lee#02 55,{ if(callfunc("F_GldManager","Chen Lee","aldeg_cas03",225,269,"A03") == 0) close; @@ -72,7 +73,7 @@ aldeg_cas03.gat,110,118,0 script Chen Lee 55,{ // Castle 4 ================================================================================== -aldeg_cas04.gat,53,89,0 script Brimhemsen 55,{ +aldeg_cas04.gat,53,89,0 script Brimhemsen#01 55,{ //aldeg_cas04.gat,67,116,0 script Brimhemsen 55,{ if(callfunc("F_GldManager","Brimhemsen","aldeg_cas04",85,12,"A04") == 0) close; @@ -92,7 +93,7 @@ aldeg_cas04.gat,53,89,0 script Brimhemsen 55,{ // Castle 5 ================================================================================== -aldeg_cas05.gat,52,179,0 script Brimhemsen 55,{ +aldeg_cas05.gat,52,179,0 script Brimhemsen#02 55,{ if(callfunc("F_GldManager","Brimhemsen","aldeg_cas05",66,11,"A05") == 0) close; diff --git a/npc/jobs/1-1/merchant.txt b/npc/jobs/1-1/merchant.txt index cec41e4f3..9ad6b5a33 100644 --- a/npc/jobs/1-1/merchant.txt +++ b/npc/jobs/1-1/merchant.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== -//= 1.6 +//= 1.7 //===== Compatible With: ===================================== //= eAthena 1.0 + //===== Description: ========================================= @@ -15,6 +15,7 @@ //= v1.4 Optimised and moved first checker to Jfunc1-1 [massdriller] //= 1.5 Changed Prontera->Izlude teleport price to 600 [Lupus] //= 1.6 Now saves/restores all quest skills [Lupus] +//= 1.7 Removed Duplicates [Silent] //============================================================ @@ -687,7 +688,7 @@ L_WrongDest: } // -- Kafra(Prontera) -- -prontera.gat,248,42,8 script Kafra 115,{ +prontera.gat,248,42,8 script Kafra#01 115,{ cutin "kafra_03",2; if(BaseJob==Job_Novice && job_merchant_q3>0) goto L_Start; L_Other: diff --git a/npc/jobs/1-1/swordman.txt b/npc/jobs/1-1/swordman.txt index 76ec9d464..ec3cd7c42 100644 --- a/npc/jobs/1-1/swordman.txt +++ b/npc/jobs/1-1/swordman.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== -//= 1.7 +//= 1.8 //===== Compatible With: ===================================== //= eAthena 1.0 + //===== Description: ========================================= @@ -18,6 +18,7 @@ //= v1.5 Optimised and moved first checker to Jfunc1-1 [massdriller] //= 1.6 Fixed possible EXP abuse [Lupus] //= 1.7 Now saves/restores all quest skills [Lupus] +//= 1.8 Removed Duplicates [Silent] //============================================================ @@ -183,13 +184,13 @@ L_Done: } // -- Swordsman -- -izlude_in.gat,65,171,5 script Swordsman 85,{ +izlude_in.gat,65,171,5 script Swordsman#01 85,{ doevent "Swordsman::OnStart"; end; } // -- Hidden Npc -- -izlude_in.gat,65,171,5 script Swordsman -1,{ +izlude_in.gat,65,171,5 script Swordsman#02 -1,{ OnStart: mes "[Swordsman]"; @@ -323,7 +324,7 @@ sword_1-1.gat,1,1,0 script TimerSwrdmn -1,{ // -- Medic 1 -- -sword_1-1.gat,230,245,2 script Medic 105,{ +sword_1-1.gat,230,245,2 script Medic#01 105,{ mes "[Medic]"; mes "This is the 1st check point! You're doing great!"; percentheal 100, 100; @@ -331,7 +332,7 @@ sword_1-1.gat,230,245,2 script Medic 105,{ } // -- Test Hall Staff 2 -- -sword_1-1.gat,230,242,2 script Test Hall Staff 105,{ +sword_1-1.gat,230,242,2 script Test Hall Staff#01 105,{ mes "[Test Hall Staff]"; mes "Do you surrender?"; next; @@ -347,7 +348,7 @@ sword_1-1.gat,230,242,2 script Test Hall Staff 105,{ } // -- Medic 2 -- -sword_1-1.gat,230,207,2 script Medic 105,{ +sword_1-1.gat,230,207,2 script Medic#02 105,{ mes "[Medic]"; mes "This is the 2nd check point! Keep up the good work!"; percentheal 100, 100; @@ -355,7 +356,7 @@ sword_1-1.gat,230,207,2 script Medic 105,{ } // -- Test Hall Staff 3 -- -sword_1-1.gat,230,204,2 script Test Hall Staff 105,{ +sword_1-1.gat,230,204,2 script Test Hall Staff#02 105,{ mes "[Test Hall Staff]"; mes "Do you surrender?"; next; @@ -562,9 +563,9 @@ sword_1-1.gat,16,251,4 script 1_blank_1a#1::1_blank 139,0,1,{ // -- Duplicates -- sword_1-1.gat,19,251,4 duplicate(1_blank) 1_blank_1b 139,0,1 sword_1-1.gat,17,250,4 duplicate(1_blank) 1_blank_1c 139,1,0 -sword_1-1.gat,17,251,4 duplicate(1_blank) 1_blank_1a 139,1,1 -sword_1-1.gat,18,251,4 duplicate(1_blank) 1_blank_1b 139,1,1 -sword_1-1.gat,17,251,4 duplicate(1_blank) 1_blank_1c 139,1,1 +sword_1-1.gat,17,251,4 duplicate(1_blank) 1_blank_1d 139,1,1 +sword_1-1.gat,18,251,4 duplicate(1_blank) 1_blank_1e 139,1,1 +sword_1-1.gat,17,251,4 duplicate(1_blank) 1_blank_1f 139,1,1 sword_1-1.gat,16,238,4 duplicate(1_blank) 1_blank_2a 139,0,1 sword_1-1.gat,19,238,4 duplicate(1_blank) 1_blank_2b 139,0,1 sword_1-1.gat,17,239,4 duplicate(1_blank) 1_blank_2c 139,0,1 @@ -676,7 +677,7 @@ sword_1-1.gat,26,168,4 duplicate(3_blank) 3_blank_3_d 139,0,2 sword_1-1.gat,36,169,4 duplicate(3_blank) 3_blank_4_a 139,0,0 sword_1-1.gat,37,169,4 duplicate(3_blank) 3_blank_4_b 139,0,0 sword_1-1.gat,37,168,4 duplicate(3_blank) 3_blank_4_c 139,0,0 -sword_1-1.gat,36,168,4 duplicate(3_blank) 3_blank_4_c 139,0,0 +sword_1-1.gat,36,168,4 duplicate(3_blank) 3_blank_4_d 139,0,0 sword_1-1.gat,40,175,4 duplicate(3_blank) 3_blank_5_a 139,0,1 sword_1-1.gat,41,175,4 duplicate(3_blank) 3_blank_5_b 139,0,1 sword_1-1.gat,41,171,4 duplicate(3_blank) 3_blank_6_a 139,1,0 diff --git a/npc/jobs/2-1/assassin.txt b/npc/jobs/2-1/assassin.txt index 76dc4a00a..6b9596fd7 100644 --- a/npc/jobs/2-1/assassin.txt +++ b/npc/jobs/2-1/assassin.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== -//= 2.0 +//= 2.1 //===== Compatible With: ===================================== //= eAthena RC4 //===== Description: ========================================= @@ -26,6 +26,7 @@ //= 2nd Job Quests again. It also guides adv classes where //= to go. [Lupus] //= 2.0 Changed numbers to constants. [Vicious] +//= 2.1 Removed Duplicates [Silent] //============================================================ @@ -1432,7 +1433,7 @@ in_moc_16.gat,167,114,3 script guildmaster_Trig#0 139,4,0,{ } // Guild Master ----------------------------------------------------------------------------- -in_moc_16.gat,149,80,4 script Guild Master 106,1,1,{ +in_moc_16.gat,149,80,4 script Guild Master#01 106,1,1,{ end; OnTouch: @@ -1842,7 +1843,7 @@ in_moc_16.gat,186,107,0 script maze_trig#9 139,0,0,{ //================================================// // Decoy Chief //================================================// -in_moc_16.gat,186,81,0 script Guild Master#2 55,{ +in_moc_16.gat,186,81,0 script Guild Master#02 55,{ mes "[Guild Master Botogun]"; mes "I'm sorry but I am not the person in charge here."; mes "The real Guild Chief is on the other side."; diff --git a/npc/jobs/2-1/blacksmith.txt b/npc/jobs/2-1/blacksmith.txt index cbaae1c8c..ce76d0772 100644 --- a/npc/jobs/2-1/blacksmith.txt +++ b/npc/jobs/2-1/blacksmith.txt @@ -7,7 +7,7 @@ //= Optimized and further edited by kobra_k88. //= Further bugfixed and tested by Lupus //===== Current Version: ===================================== -//= 2.0 +//= 2.1 //===== Compatible With: ===================================== //= eAthena 1.0+ //===== Description: ========================================= @@ -25,6 +25,7 @@ //= 1.7 item quantity/ids typos fix //= 1.8 Moved the Quest to Einbroch [Poki#3] //= 2.0 Changed numbers to constants. [Vicious] +//= 2.1 Removed Duplicates [Silent] ============================================================== @@ -1415,7 +1416,7 @@ L_Result: //=========================== NPC that tells you, that the Guild moved //=========================== She's there on kRO, but the current text is custom ^^ -geffen_in.gat,110,169,4 script Guildsman 726,{ +geffen_in.gat,110,169,4 script Guildsman#01 726,{ mes "[Blacksmith Guildsman]"; mes "Welcome! We're the masters of the metal, blacksmiths!"; mes "Our skills in creating weapons, in a way, is almost an art form!."; diff --git a/npc/jobs/2-1/hunter.txt b/npc/jobs/2-1/hunter.txt index 19d4267a9..bb424fd66 100644 --- a/npc/jobs/2-1/hunter.txt +++ b/npc/jobs/2-1/hunter.txt @@ -5,7 +5,7 @@ //= Converted by kobra_k88 //= Further bugfixed and tested by Lupus //===== Current Version: ===================================== -//= 2.0 +//= 2.1 //===== Compatible With: ===================================== //= eAthena 1.0 //===== Description: ========================================= @@ -27,6 +27,7 @@ //= reported the bug) [Lupus] //= 1.7 Moved the Job QUest to Hugel [Poki#3] //= 2.0 Changed numbers to constants. [Vicious] +//= 2.1 Removed Duplicates [Silent] //============================================================ //<====================================== Job Changer ========================================>\\ @@ -488,7 +489,7 @@ L_Done: //<=============================== Guild Master: Last Test =================================>\\ -payon_in02.gat,21,31,1 script Guild Master 59,{ +payon_in02.gat,21,31,1 script Guild Master#03 59,{ if(BaseJob == Job_Archer) goto L_Archer; if(BaseJob == Job_Hunter) goto L_Hnt; diff --git a/npc/jobs/2-2/monk.txt b/npc/jobs/2-2/monk.txt index 8d52e1e14..8efb65fae 100644 --- a/npc/jobs/2-2/monk.txt +++ b/npc/jobs/2-2/monk.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Dino9021, Edited / Translated by Celest //===== Current Version: ===================================== -//= 2.0 +//= 2.1 //===== Compatible With: ===================================== //= eAthena 1.0 + //===== Description: ========================================= @@ -21,6 +21,7 @@ //= 1.9 Added a missing check in Fuhai and fixed a LOT of Engrish. [Zephiris] //= 1.9b Fixed another bug in Fuhai. [Zephiris] //= 2.0 Changed numbers to constants. [Vicious] +//= 2.1 Removed Duplicates [Silent] //============================================================ @@ -1458,10 +1459,10 @@ monk_test.gat,386,42,0 script monk2-1 139,0,0,{callfunc "MnkTraps";} monk_test.gat,386,43,0 script monk2-2 139,0,0,{callfunc "MnkTraps";} monk_test.gat,387,42,0 script monk2-3 139,0,0,{callfunc "MnkTraps";} monk_test.gat,387,43,0 script monk2-4 139,0,0,{callfunc "MnkTraps";} -monk_test.gat,388,42,0 script monk2-3 139,0,0,{callfunc "MnkTraps";} -monk_test.gat,388,43,0 script monk2-4 139,0,0,{callfunc "MnkTraps";} -monk_test.gat,389,42,0 script monk2-3 139,0,0,{callfunc "MnkTraps";} -monk_test.gat,389,43,0 script monk2-4 139,0,0,{callfunc "MnkTraps";} +monk_test.gat,388,42,0 script monk2-5 139,0,0,{callfunc "MnkTraps";} +monk_test.gat,388,43,0 script monk2-6 139,0,0,{callfunc "MnkTraps";} +monk_test.gat,389,42,0 script monk2-7 139,0,0,{callfunc "MnkTraps";} +monk_test.gat,389,43,0 script monk2-8 139,0,0,{callfunc "MnkTraps";} //--------------------- monk_test.gat,184,11,0 script monk3-1 139,0,3,{callfunc "MnkTraps";} monk_test.gat,185,11,0 script monk3-2 139,0,3,{callfunc "MnkTraps";} @@ -1517,13 +1518,13 @@ monk_test.gat,82,391,0 script monk8-2 139,0,0,{callfunc "MnkTraps";} monk_test.gat,83,390,0 script monk8-3 139,0,0,{callfunc "MnkTraps";} monk_test.gat,83,391,0 script monk8-4 139,0,0,{callfunc "MnkTraps";} //--------------------- -monk_test.gat,82,384,0 script monk8-1 139,0,0,{callfunc "MnkTraps";} -monk_test.gat,82,385,0 script monk8-2 139,0,0,{callfunc "MnkTraps";} -monk_test.gat,83,384,0 script monk8-3 139,0,0,{callfunc "MnkTraps";} -monk_test.gat,83,385,0 script monk8-4 139,0,0,{callfunc "MnkTraps";} +monk_test.gat,82,384,0 script monk9-1 139,0,0,{callfunc "MnkTraps";} +monk_test.gat,82,385,0 script monk9-2 139,0,0,{callfunc "MnkTraps";} +monk_test.gat,83,384,0 script monk9-3 139,0,0,{callfunc "MnkTraps";} +monk_test.gat,83,385,0 script monk9-4 139,0,0,{callfunc "MnkTraps";} //--------------------- -prt_monk.gat,225,179,4 script XuanWu 89,{ +prt_monk.gat,225,179,4 script XuanWu#01 89,{ mes "[XuanWu]"; mes "To see the growing of crops, I deeply appreciate the grace of God."; next; @@ -1545,7 +1546,7 @@ prt_monk.gat,225,179,4 script XuanWu 89,{ mes "The farmer is the root of world. That is quite true."; close; } -job_monk.gat,225,179,4 script XuanWu 89,{ +job_monk.gat,225,179,4 script XuanWu#02 89,{ if(MONK_Q == 8 ) goto Part2; if(@mission_start == 1 ) goto Part1; @@ -1709,7 +1710,7 @@ Part2: close; } -monk_test.gat,88,91,4 script Test Assistant 52,{ +monk_test.gat,88,91,4 script Test Assistant#01 52,{ mes "[Test Assistant]"; mes "Are you ready for training in the dispersement of evil?"; next; @@ -1757,7 +1758,7 @@ monk_test.gat,155,180,4 script monk_mob1_4 139,0,19,{ //~ disablenpc "monk_mob1_4"; end; } -monk_test.gat,165,179,4 script monk_mob3_warp 45,1,1,{ +monk_test.gat,165,179,4 script monk_mob3_warp#01 45,1,1,{ set MONK_Q, 9; mapannounce "monk_test.gat","Congratulations!!" + strcharinfo(0)+ " Passes!! Please go to [Daowen], he is deep inside the building.",8; killmonster "monk_test.gat","monk_mob1"; @@ -1769,7 +1770,7 @@ monk_test.gat,1,1,1 script monk_mob1 -1,{ end; } -monk_test.gat,95,85,4 script Test Assistant 79,{ +monk_test.gat,95,85,4 script Test Assistant#02 79,{ mes "[Test Assistant]"; mes "Are you ready for training in the dispersement of evil?"; next; @@ -1831,7 +1832,7 @@ monk_test.gat,1,1,1 script monk_mob2 -1,{ end; } -monk_test.gat,82,85,4 script Test Assistant 95,{ +monk_test.gat,82,85,4 script Test Assistant#03 95,{ mes "[Test Assistant]"; mes "Are you ready for training in the dispersement of evil?"; next; @@ -1881,7 +1882,7 @@ monk_test.gat,260,281,4 script monk_mob3_4 139,0,19,{ //~ disablenpc "monk_mob3_4"; end; } -monk_test.gat,269,279,4 script monk_mob3_warp 45,1,1,{ +monk_test.gat,269,279,4 script monk_mob3_warp#02 45,1,1,{ set MONK_Q, 9; mapannounce "monk_test.gat","Congratulations!!" + strcharinfo(0)+ " Passes!! Please go to [Daowen], he is deep inside the building.",8; killmonster "monk_test.gat","monk_mob3"; diff --git a/npc/jobs/2-2/rogue.txt b/npc/jobs/2-2/rogue.txt index 26b13e64e..e1f9f140d 100644 --- a/npc/jobs/2-2/rogue.txt +++ b/npc/jobs/2-2/rogue.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== -//= 2.0 +//= 2.1 //===== Compatible With: ===================================== //= eAthena 1.0 + //===== Description: ========================================= @@ -18,6 +18,7 @@ //= 2nd Job Quests again. It also guides adv classes where //= to go. [Lupus] //= 2.0 Changed numbers to constants. [Vicious] +//= 2.1 Removed Duplicates [Silent] //============================================================ @@ -438,17 +439,17 @@ in_rogue.gat,272,136,3 script Hermanthorn Jr. 85,{ } // -------------------------------------------------------------------------- -cmd_fild09.gat,106,195,0 script Aragham Junior 45,1,1,{ +cmd_fild09.gat,106,195,0 script Aragham Junior#01 45,1,1,{ callfunc "F_RogueTest3", 1, "Aragham", "never", "hoarded", "upgrade items.", 244, 24; } // ----------------------------------------------------------------------------- -cmd_fild09.gat,335,143,0 script Hollgrehen Junior 45,1,1,{ +cmd_fild09.gat,335,143,0 script Hollgrehen Junior#01 45,1,1,{ callfunc "F_RogueTest3", 2, "My father", "never", "hoarded", "upgrade items.", 168, 34; } // ------------------------------------------------------------------------------ -cmd_fild04.gat,304,179,0 script Antonio Junior 45,1,1,{ +cmd_fild04.gat,304,179,0 script Antonio Junior#01 45,1,1,{ callfunc "F_RogueTest3", 3, "Antonio", "doesn't like", "breaking", "refining materials.", 165, 104; } @@ -564,15 +565,15 @@ sF_Password: // Guildsman //=============================================== //--------------------------------------------------------------------------- -in_rogue.gat,244,39,4 script Aragham Junior 99,{ +in_rogue.gat,244,39,4 script Aragham Junior#02 99,{ callfunc "F_RogueTest4", "Aragham Junior", 245, 27; } //--------------------------------------------------------------------------- -in_rogue.gat,152,27,6 script Hollgrehen Junior 85,{ +in_rogue.gat,152,27,6 script Hollgrehen Junior#02 85,{ callfunc "F_RogueTest4", "Hollgrehen Junior", 160, 32; } //--------------------------------------------------------------------------- -in_rogue.gat,183,105,4 script Antonio Junior 88,{ +in_rogue.gat,183,105,4 script Antonio Junior#02 88,{ callfunc "F_RogueTest4", "Antonio Junior", 175, 107; } diff --git a/npc/jobs/novice/novice.txt b/npc/jobs/novice/novice.txt index e0d710a2a..8c06d6a47 100644 --- a/npc/jobs/novice/novice.txt +++ b/npc/jobs/novice/novice.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Dr.Evil & MasterOfMuppets //===== Current Version: ===================================== -//= 1.1b +//= 1.2 //===== Compatible With: ===================================== //= eAthena SVN 3422+(Requires jA Script System) //===== Description: ========================================= @@ -13,6 +13,7 @@ //= 1.0 Added the New Novice Training Grounds, a big thanks [MasterOfMuppets] //= to Dr.Evil who did 90% of the work =) //= 1.0b Temp measure to stop exploits. [Vicious] +//= 1.2 Removed Duplicates [Silent] //============================================================ //==================================================================== @@ -207,14 +208,14 @@ L_Fail: end; } -new_1-1.gat,144,116,2 script Guard 105,{ +new_1-1.gat,144,116,2 script Guard#01 105,{ mes "[Training Grounds Guard]"; mes "Welcome to the Training Grounds."; mes "You are now in the outer court yard. Please go inside the castle to begin your training."; close; } -new_1-1.gat,144,107,2 script Guard 105,{ +new_1-1.gat,144,107,2 script Guard#02 105,{ mes "[Training Grounds Guard]"; switch ( rand(2) ) { case 0: mes "Come in!"; @@ -2417,7 +2418,7 @@ function script training_personnel3 { return; } -new_1-3.gat,95,30,4 script Training Center Employee 84,{ +new_1-3.gat,95,30,4 script Training Center Employee#01 84,{ callfunc "training_personnel"; switch( select("I don't want a challenge~","I wanna fight tough monsters!","Cancel.") ) { case 1: callfunc "training_personnel2"; break; @@ -2425,7 +2426,7 @@ new_1-3.gat,95,30,4 script Training Center Employee 84,{ case 3: callfunc "training_personnel0"; } } -new_2-3.gat,95,30,4 script Training Center Employee 84,{ +new_2-3.gat,95,30,4 script Training Center Employee#02 84,{ callfunc "training_personnel"; switch( select("I don't want a challenge~","I wanna fight tough monsters!","Cancel.") ) { case 1: callfunc "training_personnel1"; break; @@ -2433,7 +2434,7 @@ new_2-3.gat,95,30,4 script Training Center Employee 84,{ case 3: callfunc "training_personnel0"; } } -new_3-3.gat,95,30,4 script Training Center Employee 84,{ +new_3-3.gat,95,30,4 script Training Center Employee#03 84,{ callfunc "training_personnel"; switch( select("I don't want a challenge~","I wanna fight tough monsters!","Cancel.") ) { case 1: callfunc "training_personnel1"; break; @@ -2441,7 +2442,7 @@ new_3-3.gat,95,30,4 script Training Center Employee 84,{ case 3: callfunc "training_personnel0"; } } -new_4-3.gat,95,30,4 script Training Center Employee 84,{ +new_4-3.gat,95,30,4 script Training Center Employee#04 84,{ callfunc "training_personnel"; switch( select("I don't want a challenge~","I wanna fight tough monsters!","Cancel.") ) { case 1: callfunc "training_personnel1"; break; @@ -2449,7 +2450,7 @@ new_4-3.gat,95,30,4 script Training Center Employee 84,{ case 3: callfunc "training_personnel0"; } } -new_5-3.gat,95,30,4 script Training Center Employee 84,{ +new_5-3.gat,95,30,4 script Training Center Employee#05 84,{ callfunc "training_personnel"; switch( select("I don't want a challenge~","I wanna fight tough monsters!","Cancel.") ) { case 1: callfunc "training_personnel1"; break; @@ -2475,11 +2476,11 @@ L2: mes "[Keyman]"; mes "So you want to stay here longer? Continue training, and train hard!"; close; } -new_1-3.gat,96,174,4 duplicate(supervision) Petugas Pemeriksa 85 -new_2-3.gat,96,174,4 duplicate(supervision) Petugas Pemeriksa 85 -new_3-3.gat,96,174,4 duplicate(supervision) Petugas Pemeriksa 85 -new_4-3.gat,96,174,4 duplicate(supervision) Petugas Pemeriksa 85 -new_5-3.gat,96,174,4 duplicate(supervision) Petugas Pemeriksa 85 +new_1-3.gat,96,174,4 duplicate(supervision) Petugas Pemeriksa#01 85 +new_2-3.gat,96,174,4 duplicate(supervision) Petugas Pemeriksa#02 85 +new_3-3.gat,96,174,4 duplicate(supervision) Petugas Pemeriksa#03 85 +new_4-3.gat,96,174,4 duplicate(supervision) Petugas Pemeriksa#04 85 +new_5-3.gat,96,174,4 duplicate(supervision) Petugas Pemeriksa#05 85 //Novice Instructor new_1-4.gat,91,22,4 script Novice Instructor 57,{ 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; diff --git a/npc/other/bulletin_boards.txt b/npc/other/bulletin_boards.txt index 0c63797b7..8fc639114 100644 --- a/npc/other/bulletin_boards.txt +++ b/npc/other/bulletin_boards.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= MasterOfMuppets //===== Current Version: ===================================== -//= 1.5 +//= 1.6 //===== Compatible With: ===================================== //= Any Athena Version //===== Additional Comments: ================================= @@ -17,9 +17,10 @@ //= 1.5 Added the last of the bulletin boards, I think... [MasterOfMuppets] //= 1.5a Fixed a small screw up with the color codes in the Glastheim BB [MasterOfMuppets] //= 1.5b Fixed another small screw up with the color codes in the Glastheim BB [Kayla] +//= 1.6 Removed Duplicates [Silent] //============================================================ -alberta.gat,111,59,5 script Bulletin Board 837,{ +alberta.gat,111,59,5 script Bulletin Board#1 837,{ mes "[Alberta: The Port City]"; mes "Welcome to Alberta, the Port City."; next; @@ -44,7 +45,7 @@ alberta.gat,111,59,5 script Bulletin Board 837,{ close; } -geffen.gat,124,65,5 script Bulletin Board 837,{ +geffen.gat,124,65,5 script Bulletin Board#2 837,{ mes "[Geffen: The City of Magic]"; mes "Welcome to Geffen, the City of Magic. Geffen is well known for its various legends related to magic."; next; @@ -62,7 +63,7 @@ geffen.gat,124,65,5 script Bulletin Board 837,{ close; } -gef_fild10.gat,69,340,5 script Bulletin Board 837,{ +gef_fild10.gat,69,340,5 script Bulletin Board#3 837,{ mes "[Orc Dungeon]"; mes "^6B1312Caution!^000000"; mes "The Orc Dungeon is comprised of 2 levels. Although not very strong individually, the monsters here attack in groups. Be careful."; @@ -78,7 +79,7 @@ gef_fild10.gat,69,340,5 script Bulletin Board 837,{ close; } -izlu2dun.gat,104,92,5 script Bulletin Board 837,{ +izlu2dun.gat,104,92,5 script Bulletin Board#4 837,{ mes "[Byalan Island]"; mes "^6B1312Caution!^000000"; mes "The Izlude dungeon is comprised of 5 levels. The first few levels are suited for newer adventurers."; @@ -91,7 +92,7 @@ izlu2dun.gat,104,92,5 script Bulletin Board 837,{ close; } -izlude.gat,131,116,4 script Bulletin Board 837,{ +izlude.gat,131,116,4 script Bulletin Board#5 837,{ mes "[Izlude: The Satellite City]"; mes "Welcome to Izlude, the satellite of Prontera. Izlude was built to support Prontera's defense and to accommodate its burgeoning population"; next; @@ -107,7 +108,7 @@ izlude.gat,131,116,4 script Bulletin Board 837,{ close; } -payon.gat,178,108,5 script Bulletin Board 837,{ +payon.gat,178,108,5 script Bulletin Board#06 837,{ mes "[Payon: The Mountain City]"; mes "Welcome to Payon, the mountain city. Payon has recently been renovated, so we hope you enjoy the clean, nice streets and buildings."; next; @@ -129,7 +130,7 @@ payon.gat,178,108,5 script Bulletin Board 837,{ close; } -pay_arche.gat,79,30,5 script Bulletin Board 837,{ +pay_arche.gat,79,30,5 script Bulletin Board#07 837,{ mes "[Archer Village]"; mes "Welcome to the Payon Archer Village where Novices can change their jobs to Archer."; next; @@ -141,7 +142,7 @@ pay_arche.gat,79,30,5 script Bulletin Board 837,{ close; } -pay_arche.gat,40,135,5 script Bulletin Board 837,{ +pay_arche.gat,40,135,5 script Bulletin Board#08 837,{ mes "[Payon Cave]"; mes "^6B1312Caution!^000000"; mes "Payon Cave consists of 5 levels full of Undead and Demon monsters. Beware of swarms of Hydra in the third and fourth levels."; @@ -151,7 +152,7 @@ pay_arche.gat,40,135,5 script Bulletin Board 837,{ close; } -prontera.gat,148,49,5 script Bulletin Board 837,{ +prontera.gat,148,49,5 script Bulletin Board#09 837,{ mes "[Prontera: Capital of the]"; mes "[Rune-Midgards Kingdom]"; mes "Welcome to Prontera, the capital city of Rune-Midgard."; @@ -183,7 +184,7 @@ prontera.gat,148,49,5 script Bulletin Board 837,{ close; } -mjolnir_02.gat,76,362,5 script Bulletin Board 837,{ +mjolnir_02.gat,76,362,5 script Bulletin Board#10 837,{ mes "[Coal Mine]"; mes "^6B1312Caution!^000000"; mes "The Coal Mine consists of a total of 3 levels. This dungeon is suited to both new and experienced adventurers, depending on the dungeon level."; @@ -193,7 +194,7 @@ mjolnir_02.gat,76,362,5 script Bulletin Board 837,{ close; } -morocc.gat,152,110,5 script Bulletin Board 837,{ +morocc.gat,152,110,5 script Bulletin Board#11 837,{ mes "[Morroc: The Frontier Town]"; mes "Welcome to Morroc, the City of the"; mes "Desert. Morroc was built on an"; @@ -224,7 +225,7 @@ morocc.gat,152,110,5 script Bulletin Board 837,{ close; } -comodo.gat,210,148,5 script Bulletin Board 837,{ +comodo.gat,210,148,5 script Bulletin Board#12 837,{ mes "[Comodo: The Beach City]"; mes "Welcome! This town of Comodo is"; mes "surrounded by many ancient relics"; @@ -268,7 +269,7 @@ comodo.gat,210,148,5 script Bulletin Board 837,{ close; } -umbala.gat,137,94,5 script Bulletin Board 837,{ +umbala.gat,137,94,5 script Bulletin Board#13 837,{ mes "[Umbala: The Utan Village]"; mes "Welcome to Umbala,"; mes "the village of the Utan tribe."; @@ -315,7 +316,7 @@ gef_fild09.gat,227,29,4 script Bulletin Board::OrcsBoard 835,{ close; } -gef_fild13.gat,202,31,5 duplicate(OrcsBoard) Bulletin Board 835 +gef_fild13.gat,202,31,5 duplicate(OrcsBoard) Bulletin Board#orc1 835 gef_fild13.gat,29,206,5 script Bulletin Board::KoboldsBoard 836,{ @@ -326,9 +327,9 @@ gef_fild13.gat,29,206,5 script Bulletin Board::KoboldsBoard 836,{ close; } -gef_fild08.gat,211,24,5 duplicate(KoboldsBoard) Bulletin Board 836 +gef_fild08.gat,211,24,5 duplicate(KoboldsBoard) Bulletin Board#kb1 836 -gef_fild10.gat,109,23,5 script Bulletin Board 836,{ +gef_fild10.gat,109,23,5 script Bulletin Board#15 836,{ mes "[Goblin Village]"; mes "^6B1312Caution!^000000"; @@ -337,7 +338,7 @@ gef_fild10.gat,109,23,5 script Bulletin Board 836,{ close; } -prt_fild05.gat,278,220,5 script Bulletin Board 837,{ +prt_fild05.gat,278,220,5 script Bulletin Board#16 837,{ mes "[Culvert]"; mes "Culvert is comprised of a total of"; mes "4 levels, and is a good training"; @@ -360,7 +361,7 @@ prt_fild05.gat,278,220,5 script Bulletin Board 837,{ close; } -yuno.gat,154,112,5 script Bulletin Board 837,{ +yuno.gat,154,112,5 script Bulletin Board#17 837,{ mes "[Juno: Capital of]"; mes "[The Schwartzwald Republic]"; mes "Welcome to Juno, the City of Sages."; @@ -403,7 +404,7 @@ yuno.gat,154,112,5 script Bulletin Board 837,{ close; } -aldebaran.gat,145,105,5 script Bulletin Board 837,{ +aldebaran.gat,145,105,5 script Bulletin Board#18 837,{ mes "[Al De Baran: The Border City]"; mes "Welcome to Al De Baran, the border"; mes "city of the Rune-Midgarts Kingdom."; @@ -434,7 +435,7 @@ aldebaran.gat,145,105,5 script Bulletin Board 837,{ close; } -aldebaran.gat,136,133,5 script Bulletin Board 837,{ +aldebaran.gat,136,133,5 script Bulletin Board#19 837,{ mes "[Clock Tower]"; mes "^6B1312Caution!^000000"; mes "Only well-experienced adventurers"; @@ -456,7 +457,7 @@ aldebaran.gat,136,133,5 script Bulletin Board 837,{ close; } -moc_fild19.gat,107,101,5 script Bulletin Board 837,{ +moc_fild19.gat,107,101,5 script Bulletin Board#20 837,{ mes "[Sphinx]"; mes "^6B1312Caution!^000000"; mes "The Sphinx consists of 5 levels."; @@ -477,7 +478,7 @@ moc_fild19.gat,107,101,5 script Bulletin Board 837,{ close; } -gef_tower.gat,55,142,5 script Bulletin Board 837,{ +gef_tower.gat,55,142,5 script Bulletin Board#21 837,{ mes "[Geffen Dungeon]"; mes "^6B1312Caution!^000000"; @@ -495,7 +496,7 @@ gef_tower.gat,55,142,5 script Bulletin Board 837,{ close; } -xmas_fild01.gat,75,80,5 script Bulletin Board 837,{ +xmas_fild01.gat,75,80,5 script Bulletin Board#22 837,{ mes "[Winter Town, Lutie]"; mes "Welcome to Lutie, the town of snowfall."; @@ -511,7 +512,7 @@ xmas_fild01.gat,75,80,5 script Bulletin Board 837,{ close; } -xmas.gat,147,311,5 script Bulletin Board 837,{ +xmas.gat,147,311,5 script Bulletin Board#23 837,{ mes "[Toy Factory]"; mes "^6B1312Caution!^000000"; @@ -527,7 +528,7 @@ xmas.gat,147,311,5 script Bulletin Board 837,{ close; } -yuno_fild03.gat,37,143,5 script Bulletin Board 837,{ +yuno_fild03.gat,37,143,5 script Bulletin Board#24 837,{ mes "[The Magma Dungeon, Nogg Road]"; mes "^6B1312Caution!^000000"; @@ -541,7 +542,7 @@ yuno_fild03.gat,37,143,5 script Bulletin Board 837,{ close; } -niflheim.gat,200,191,5 script Bulletin Board 837,{ +niflheim.gat,200,191,5 script Bulletin Board#25 837,{ mes "[City of the Dead, Nifflheim]"; mes "Welcome to Nifflheim, the City of the Dead."; @@ -566,7 +567,7 @@ niflheim.gat,200,191,5 script Bulletin Board 837,{ close; } -moc_fild15.gat,267,264,5 script Bulletin Board 837,{ +moc_fild15.gat,267,264,5 script Bulletin Board#26 837,{ mes "[Ant Hell]"; mes "^6B1312Caution!^000000"; @@ -582,7 +583,7 @@ moc_fild15.gat,267,264,5 script Bulletin Board 837,{ close; } -moc_ruins.gat,61,164,5 script Bulletin Board 837,{ +moc_ruins.gat,61,164,5 script Bulletin Board#27 837,{ mes "[Pyramids]"; mes "^6B1312Caution!^000000"; @@ -596,7 +597,7 @@ moc_ruins.gat,61,164,5 script Bulletin Board 837,{ close; } -glast_01.gat,369,308,5 script Bulletin Board 837,{ +glast_01.gat,369,308,5 script Bulletin Board#28 837,{ mes "[Glast Heim]"; mes "Glast Heim is an enormous dungeon with countless levels."; diff --git a/npc/other/dts_warper.txt b/npc/other/dts_warper.txt index b6fb0b7ad..080f7d05a 100644 --- a/npc/other/dts_warper.txt +++ b/npc/other/dts_warper.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Evera //===== Current Version: ===================================== -//= 1.5 +//= 1.6 //===== Compatible With: ===================================== //= eAthena //===== Description: ========================================= @@ -46,6 +46,7 @@ //= Gives 1/4 chance of being eligible. Real way to be eligible is through //= President's Quest, which isn't yet released. //===== Version History: ==================================== +//= 1.6 Removed Duplicates [Silent] //= 1.5 Mushed voting varialbes into 1 variable. [Evera] (5/29/06) //= 1.4 Changed global variables to read from 3 global variables, updated names, //= fixed array bug [Evera] (5/28/06) @@ -57,21 +58,21 @@ //============================================================ //Yuno -yuno.gat,153,191,4 script Cool Event Voting Staff 874,{ +yuno.gat,153,191,4 script Cool Event Voting Staff#01 874,{ callfunc "F_DTS_Warp",0,0; } -yuno.gat,162,191,6 script Kafra Voting Staff 861,{ +yuno.gat,162,191,6 script Kafra Voting Staff#01 861,{ callfunc "F_DTS_Warp",1,8; } //Lighthalzen -lighthalzen.gat,154,60,6 script Cool Event Voting Staff 874,{ +lighthalzen.gat,154,60,6 script Cool Event Voting Staff#02 874,{ callfunc "F_DTS_Warp",0,0; } //Prontera -prontera.gat,147,125,4 script Cool Event Voting Staff 874,{ +prontera.gat,147,125,4 script Cool Event Voting Staff#03 874,{ callfunc "F_DTS_Warp",0,0; } -prontera.gat,164,125,6 script Kafra Voting Staff 115,{ +prontera.gat,164,125,6 script Kafra Voting Staff#02 115,{ callfunc "F_DTS_Warp",1,3; } @@ -88,7 +89,7 @@ lhz_in02.gat,20,274,6 script Maintenance Guy 851,{ close; } //Cesuna (Zondaman at desk) -lhz_in02.gat,36,284,1 script Cool Event Staff 874,{ +lhz_in02.gat,36,284,1 script Cool Event Staff#01 874,{ mes "[Cesuna]"; mes "Ack! I'm totally"; mes "swamped with all this"; @@ -139,7 +140,7 @@ lhz_in02.gat,110,283,5 script Cool Event Manager 853,{ close; } //Saera (Secretary), contains GM menu -lhz_in02.gat,36,274,3 script Cool Event Staff 831,{ +lhz_in02.gat,36,274,3 script Cool Event Staff#02 831,{ if($dts == 0){ set $dts,$dts|(1<<0); //Sets NPCs to election mode if first time running set $dts,$dts|(1<<3); diff --git a/npc/other/msg_boards.txt b/npc/other/msg_boards.txt index 87021926e..01b264dbb 100644 --- a/npc/other/msg_boards.txt +++ b/npc/other/msg_boards.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= eAthena 7.15 + //===== Description: ========================================= @@ -11,6 +11,7 @@ //===== Additional Comments: ================================= //= Rearranged [Lupus] //= Fixed spelling mistakes. [Nexon] +//= 1.3 Removed Duplicates [Silent] //============================================================ @@ -84,7 +85,7 @@ geffen.gat,184,61,1 script Blacksmith Guild 111,{ } // Sign Post ----------------------------------------------------------- -geffen.gat,119,190,0 script Sign Post 111,{ +geffen.gat,119,190,0 script Sign Post#01 111,{ mes "~sign reads...~"; mes "North to Geffen Fields"; mes "Northeast to Al De Baran"; @@ -128,7 +129,7 @@ prontera.gat,156,197,1 script Welcome Sign::ws_prontera 111,{ } // Sign Post ---------------------------------------------------------------- -prontera.gat,158,213,1 script Sign Post 111,{ +prontera.gat,158,213,1 script Sign Post#02 111,{ mes "~ the sign post reads ~"; mes "North to Prontera Castle"; mes "Farther North to Al De Baran"; diff --git a/npc/quests/monstertamers.txt b/npc/quests/monstertamers.txt index 024762784..c965a7c99 100644 --- a/npc/quests/monstertamers.txt +++ b/npc/quests/monstertamers.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88, Darkchild, x[tsk] //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= eAthena 1.0 //===== Description: ========================================= @@ -11,11 +11,12 @@ //===== Additional Comments: ================================= //= May not have all of the Monster Tamers, but the ones here are fully working. //= 1.1 Fixed exploits [Lupus] +//= 1.2 Removed Duplicates [Silent] //============================================================ //<================================================= Alberta ===============================================>\\ -alberta_in.gat,173,77,3 script Monster Tamer 125,{ +alberta_in.gat,173,77,3 script Monster Tamer#01 125,{ mes "[Monster Tamer Iwado]"; mes "Monster taming has never been more popular than it is now! Why not join in on all of the excitement?...."; M_Menu: @@ -128,7 +129,7 @@ M_Menu: //<================================================= Al De Baran ===============================================>\\ -aldeba_in.gat,167,177,3 script Monster Tamer 125,{ +aldeba_in.gat,167,177,3 script Monster Tamer#02 125,{ mes "[Monster Tamer YuU]"; mes "You must be looking for some Taming Items.... When it comes to making Taming Items there is no one better than me here in Rune Midgard."; M_Menu: @@ -325,7 +326,7 @@ M_Menu: //<================================================= Izlude ===============================================>\\ -izlude_in.gat,128,64,3 script Monster Tamer 125,{ +izlude_in.gat,128,64,3 script Monster Tamer#03 125,{ mes "[Monster Tamer Shogo]"; mes "Are you pre-occupied with gathering items for your cute pets, and want a break? Then let us find those items for you....."; M_Menu: diff --git a/npc/quests/quests_aldebaran.txt b/npc/quests/quests_aldebaran.txt index 11a4016ea..781b48625 100644 --- a/npc/quests/quests_aldebaran.txt +++ b/npc/quests/quests_aldebaran.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= eAthena 7.15 + //===== Description: ========================================= @@ -11,13 +11,14 @@ //===== Additional Comments: ================================= //= Fully working //= 1.1 Fixed Doctor Band items [Lupus] +//= 1.2 Removed Duplicates [Silent] //============================================================ //=======================================================================================================// // 'Doctor Band', 'Feather Bonnet', 'Opera Masque', 'Sakkat Hat' Quest //=======================================================================================================// -aldeba_in.gat,152,166,4 script Trader 86,{ +aldeba_in.gat,152,166,4 script Trader#01 86,{ mes "[Trader]"; mes "Muhahaha! I am the Very Famous Enigmatic Dealer! I am always hustling and bustling in and out of Rune Midgard!"; mes "Take a look at my RARE and UNIQUE items from ALL OVER the WORLD!!"; diff --git a/npc/quests/quests_ayothaya.txt b/npc/quests/quests_ayothaya.txt index bd749c177..7fe9fdc0f 100644 --- a/npc/quests/quests_ayothaya.txt +++ b/npc/quests/quests_ayothaya.txt @@ -3,7 +3,7 @@ //===== By ================================================ //= Fredzilla //===== Version =========================================== -//= 1.4 +//= 1.5 //===== Compatible With =================================== //= eAthena 1.0 //===== Description ======================================= @@ -24,6 +24,7 @@ //= 1.3 - Fixed exploit [Lupus] //= 1.4 Updated, more close to the official. Thanks to birkiczd //= Also optimized it again, remove unused global variable [Lupus] +//= 1.5 Removed Duplicates [Silent] //========================================================= ayo_dun02.gat,277,178,1 script OBB 139,4,4,{ @@ -39,31 +40,31 @@ ayo_dun02.gat,277,178,1 script OBB 139,4,4,{ close; } //Dungeon 1 foot prints x 5 -ayo_dun01.gat,30,149,1 script Clue 139,5,5,{ +ayo_dun01.gat,30,149,1 script Clue#01 139,5,5,{ if(weddingring!=3) end; npctalk "There are some foot prints here, they head off to the East."; set @footprints1,1; close; } -ayo_dun01.gat,70,149,1 script Clue 139,5,5,{ +ayo_dun01.gat,70,149,1 script Clue#02 139,5,5,{ if(weddingring!=3) end; npctalk "There are some more foot prints, they are heading off to the East too!"; set @footprints2,1; close; } -ayo_dun01.gat,100,149,1 script Clue 139,5,5,{ +ayo_dun01.gat,100,149,1 script Clue#03 139,5,5,{ if(weddingring!=3) end; npctalk "More foot prints heading to the East, who do they belong too?"; set @footprints3,1; close; } -ayo_dun01.gat,190,149,1 script Clue 139,5,5,{ +ayo_dun01.gat,190,149,1 script Clue#04 139,5,5,{ if(weddingring!=3) end; npctalk "More foot prints, but these are going North."; set @footprints4,1; close; } -ayo_dun01.gat,261,263,1 script Clue 139,5,5,{ +ayo_dun01.gat,261,263,1 script Clue#05 139,5,5,{ if(weddingring!=3) end; npctalk "There are some foot prints, they seem to head into that hole there."; set @footprints5,1; @@ -71,32 +72,32 @@ ayo_dun01.gat,261,263,1 script Clue 139,5,5,{ } //Dungeon 2 foot prints x 4 + 1 fake -ayo_dun02.gat,222,204,1 script Clue 139,5,5,{ +ayo_dun02.gat,222,204,1 script Clue#06 139,5,5,{ if(weddingring!=3) end; npctalk "Yet more foot prints, they are either going South or West."; set @footprints6,1; close; } -ayo_dun02.gat,169,212,1 script Clue 139,5,5,{ +ayo_dun02.gat,169,212,1 script Clue#07 139,5,5,{ if(weddingring!=3) end; npctalk "Looks like there are foot print going to the West."; set @footprints7,1; close; } -ayo_dun02.gat,129,212,1 script Clue 139,5,5,{ +ayo_dun02.gat,129,212,1 script Clue#08 139,5,5,{ if(weddingring!=3) end; npctalk "Ok these foot prints are either going to the North or West."; set @footprints8,1; close; } -ayo_dun02.gat,79,212,1 script Clue 139,7,7,{ +ayo_dun02.gat,79,212,1 script Clue#09 139,7,7,{ if(weddingring!=3) end; npctalk "These are very new, they are going North."; set @footprints9,1; close; } //FAKE -ayo_dun02.gat,245,166,1 script Clue 139,7,7,{ +ayo_dun02.gat,245,166,1 script Clue#10 139,7,7,{ if(weddingring!=3) end; npctalk "Seems something came by this way, to the East."; close; @@ -182,7 +183,7 @@ L_QuestOver: close; } -ayothaya.gat,253,99,3 script Fisherman 843,{ +ayothaya.gat,253,99,3 script Fisherman#01 843,{ mes "[Dannai]"; mes "This place is known to be teeming with fish. The fish here tend to eat anything they find, so it's easy to catch them."; next; @@ -235,7 +236,7 @@ L_RingCheck: close; } -ayothaya.gat,192,171,4 script Old Man 824,{ +ayothaya.gat,192,171,4 script Old Man#10 824,{ mes "[Tham]"; if(weddingring==3) goto L_OnQ2; mes "What a nice day it is today, don't you agree?"; diff --git a/npc/quests/quests_geffen.txt b/npc/quests/quests_geffen.txt index afa4b310a..e1f5d3af5 100644 --- a/npc/quests/quests_geffen.txt +++ b/npc/quests/quests_geffen.txt @@ -3,13 +3,14 @@ //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= eAthena 7.15 + //===== Description: ========================================= //= Welding Mask and Headset Quests. //===== Additional Comments: ================================= //= 1.1 Fixed exploits [Lupus] +//= 1.2 Removed Duplicates [Silent] //============================================================ @@ -17,7 +18,7 @@ //==============================================================================================// // Blacksmith: 'Welding Mask' Quest //==============================================================================================// -geffen_in.gat,144,166,4 script Blacksmith 63,{ +geffen_in.gat,144,166,4 script Blacksmith#01 63,{ mes "[Blacksmith]"; mes "Who am I?!........"; emotion e_gasp; diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt index 9f8ab910f..4bd107081 100644 --- a/npc/quests/quests_lighthalzen.txt +++ b/npc/quests/quests_lighthalzen.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Persian, Vicious_Pucca, Completed by aoa00 //===== Current Version: ===================================== -//= 1.9 +//= 2.0 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -32,6 +32,7 @@ //= 1.8 Changed the name of the mobsters to Gangster, as it should be. [MasterOfMuppets] //= 1.9 Added extra input check on Biolab so that the first letter of the word could be //= capitalized or undercase. [Evera] +//= 2.0 Removed Duplicates [Silent] //============================================================ //= aoa's comment //= In future, Need for new monsters. No-Drop, No-Exp, Weak "Mobster","VENOMOUS","NOXIOUS" @@ -113,7 +114,7 @@ ChkEnd: end; } -lighthalzen.gat,267,200,3 script Security Guard 868,{ +lighthalzen.gat,267,200,3 script Security Guard#01 868,{ if(countitem(7350)>0) goto Lhzpass1; if($@lhz_alert == 1) goto Lhzstop; @@ -170,7 +171,7 @@ Lhzstop: close; } -lighthalzen.gat,294,223,7 script Security Guard 868,{ +lighthalzen.gat,294,223,7 script Security Guard#02 868,{ if(countitem(7350)>0) goto Lhzpass1; if($@lhz_alert == 1) goto Lhzstop; @@ -602,7 +603,7 @@ L_11: //--------------------------Box-------------------------- -lhz_cube.gat,248,179,0 script Box 111,{ +lhz_cube.gat,248,179,0 script Box#01 111,{ if (axe == 1) goto L_2; mes "There is an axe in the box."; next; @@ -1077,7 +1078,7 @@ L_3: //--------------------------Box-------------------------- -lhz_cube.gat,248,193,0 script Box 111,{ +lhz_cube.gat,248,193,0 script Box#02 111,{ if (countitem(2657) > 0 || @gotkey || hzdun) goto L_5; mes "There is a box with three holes."; next; diff --git a/npc/quests/quests_payon.txt b/npc/quests/quests_payon.txt index e5c330c54..1610a2c20 100644 --- a/npc/quests/quests_payon.txt +++ b/npc/quests/quests_payon.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== -//= 1.3 +//= 1.4 //===== Compatible With: ===================================== //= eAthena 7.15 + //===== Description: ========================================= @@ -13,6 +13,7 @@ //= 1.1 Helm of Angel bug fixed [Lupus] //= 1.2 Fixed skirt of virgin [Lupus] //= 1.3 Fixed exploits [Lupus] +//= 1.4 Removed Duplicates [Silent] //============================================================ @@ -131,7 +132,7 @@ payon_in01.gat,18,10,4 script Mystic Lady 75,{ //========================================================================================// // Oxygen Mask Quest //========================================================================================// -payon_in02.gat,25,71,4 script Young Man 86,{ +payon_in02.gat,25,71,4 script Young Man#11 86,{ mes "[Young Man]"; if(countitem(701) >= 5) goto L_GotOra; mes "Blahhhhhh! I... I... I JUST CAN'T take it anymore!! You little stinky, filthy, BASTARDS!!!"; @@ -225,7 +226,7 @@ L_GotOra: //========================================================================================// // Derivuchi Cap(Hat of Petite Diablo), Helm of Angel //========================================================================================// -payon_in01.gat,56,12,4 script Young Man 89,{ +payon_in01.gat,56,12,4 script Young Man#12 89,{ mes "[Young Man]"; mes "What is it?............"; next; diff --git a/npc/quests/quests_prontera.txt b/npc/quests/quests_prontera.txt index 41ba16fe9..f24eb904c 100644 --- a/npc/quests/quests_prontera.txt +++ b/npc/quests/quests_prontera.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= eAthena 7.15 + //===== Description: ========================================= @@ -11,11 +11,12 @@ //===== Additional Comments: ================================= //= Fixed flower name Dreamy -> Illusion //= 1.2 Fixed exploit [Lupus] +//= 1.3 Removed Duplicates [Silent] //============================================================ // Ph.D Hat Quest------------------------------------------------------- -prt_in.gat,38,108,4 script Teacher 53,{ +prt_in.gat,38,108,4 script Teacher#01 53,{ if(countitem(710) >= 1 && countitem(703) >= 1 && countitem(704) >= 1 && countitem(708) >= 1) goto L_Start;//Items: Illusion Flower, Hinalle, Aloe, Ment, mes "Don't you think.... ^4444FF'flowers'^000000 are pretty?"; next; diff --git a/npc/quests/skills/merchant_skills.txt b/npc/quests/skills/merchant_skills.txt index 534bba9c5..177e1a2eb 100644 --- a/npc/quests/skills/merchant_skills.txt +++ b/npc/quests/skills/merchant_skills.txt @@ -22,14 +22,14 @@ //--------------------------------------- Necko: Crazy Uproar--------------------------------\\ -alberta.gat,89,96,5 script Necko 139,0,4,{ +alberta.gat,89,96,5 script Necko#01 139,0,4,{ mes "[!?]"; mes "Muahahahahhhahahahahhahah!!"; mes "Pukakakakakkakakakakakakaka!!"; close; } -alberta.gat,83,96,5 script Necko 98,{ +alberta.gat,83,96,5 script Necko#02 98,{ mes "[Necko]"; if (baseClass == Job_Merchant) goto L_Start; 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; -- cgit v1.2.3-70-g09d2