From ac9ba3147b30c5af55884c135e552d61bcc042c3 Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Thu, 18 Oct 2007 22:04:47 +0000 Subject: Uncommented the ShowWarning and ShowDebug from rev. 11508, and cleaned up the warnings it produced. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11516 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 1 + npc/Changelog.txt | 2 + npc/airports/einbroch.txt | 2 +- npc/cities/aldebaran.txt | 13 +- npc/cities/lighthalzen.txt | 9 +- npc/custom/adoption.txt | 2 +- npc/guides/guides_louyang.txt | 5 +- npc/jobs/1-1/swordman.txt | 37 ++-- npc/jobs/1-1e/ninja.txt | 2 +- npc/jobs/2-1/assassin.txt | 11 +- npc/jobs/2-1/hunter.txt | 5 +- npc/jobs/2-2/monk.txt | 7 +- npc/jobs/2-2/sage.txt | 10 +- npc/jobs/novice/novice.txt | 2 +- npc/jobs/valkyrie.txt | 7 +- npc/kafras/dts_warper.txt | 5 +- npc/merchants/gemstone.txt | 5 +- npc/merchants/inn.txt | 27 +-- npc/merchants/refine.txt | 7 +- npc/merchants/renters.txt | 6 +- npc/merchants/shops.txt | 323 +++++++++++++++++----------------- npc/merchants/socket_enchant.txt | 15 +- npc/other/books.txt | 17 +- npc/other/comodo_gambling.txt | 5 +- npc/other/msg_boards.txt | 65 +++---- npc/other/powernpc.txt | 6 +- npc/other/pvp.txt | 31 ++-- npc/quests/Kiel_Hyre_Quest.txt | 15 +- npc/quests/eye_of_hellion.txt | 13 +- npc/quests/quests_airship.txt | 13 +- npc/quests/quests_ayothaya.txt | 5 +- npc/quests/quests_comodo.txt | 5 +- npc/quests/quests_hugel.txt | 7 +- npc/quests/quests_juperos.txt | 9 +- npc/quests/quests_lighthalzen.txt | 11 +- npc/quests/quests_louyang.txt | 7 +- npc/quests/quests_morocc.txt | 15 +- npc/quests/quests_prontera.txt | 7 +- npc/quests/quests_rachel.txt | 11 +- npc/quests/seals/brisingamen_seal.txt | 9 +- npc/quests/skills/bard_skills.txt | 5 +- npc/quests/skills/novice_skills.txt | 5 +- npc/quests/thana_quest.txt | 31 ++-- npc/warps/cities/amatsu.txt | 7 +- npc/warps/cities/nameless.txt | 5 +- npc/warps/cities/niflheim.txt | 11 +- npc/warps/cities/prontera.txt | 7 +- npc/warps/dungeons/alde_ct.txt | 7 +- npc/warps/dungeons/umbala_dun.txt | 8 +- npc/warps/fields/abyss_warper.txt | 7 +- npc/warps/fields/glastheim.txt | 7 +- npc/warps/fields/hugel_fild.txt | 7 +- npc/warps/fields/lhalzen_fild.txt | 9 +- npc/warps/fields/morroc_fild.txt | 5 +- npc/warps/fields/mtmjolnir.txt | 5 +- npc/warps/fields/rachel_fild.txt | 7 +- npc/warps/other/jobquests.txt | 7 +- src/map/npc.c | 10 +- 58 files changed, 471 insertions(+), 433 deletions(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 0a65b06ad..63d6cc450 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 2007/10/18 + * Rev. 11516 Uncommented the showwarning and showdebug from 11508. [L0ne_W0lf] * Fixed the incorrect map names on the debug messages (mapid->mapindex mishap from r11508). * Fixed the incorrect reporting of npc names being too long when the the diff --git a/npc/Changelog.txt b/npc/Changelog.txt index 1b6028c8c..a13cce0b2 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,5 +1,7 @@ Date Added ====== +2007/10/18 + * Rev. 11516 Cleaned up several duplicates and NPC names. [L0ne_W0lf] 2007/10/16 * Rev. 11496 Missed one. :> And thanks for Jetvictor for pointing it out. bugreport:239 [L0ne_W0lf] * Rev. 11495 Added a return at the end of several scripts. [L0ne_W0lf] diff --git a/npc/airports/einbroch.txt b/npc/airports/einbroch.txt index cd77fca4c..8aa8222c6 100644 --- a/npc/airports/einbroch.txt +++ b/npc/airports/einbroch.txt @@ -91,7 +91,7 @@ airport,126,51,4 script Airport Staff#04::AirportE2 90,{ airport,143,51,4 duplicate(AirportE2) Airport Staff#05 90 airport,156,51,4 duplicate(AirportE2) Airport Staff#06 90 -einbroch,94,267,4 script Airship Staff 91,{ +einbroch,94,267,4 script Airship Staff#07 91,{ mes "[Airship Staff]"; mes "Welcome to the"; mes "Einbroch Airport."; diff --git a/npc/cities/aldebaran.txt b/npc/cities/aldebaran.txt index c604c1f10..47a6bfc69 100644 --- a/npc/cities/aldebaran.txt +++ b/npc/cities/aldebaran.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= eAthena dev team; L0ne_W0lf //===== Current Version: ===================================== -//= 2.1 +//= 2.2 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -27,6 +27,7 @@ //= Kafra and Clock Tower NPCs pending remake. [DZeroX] //= 2.01 removed all .GATs [Lupus] //= 2.1 Rescripted most NPCs to Aegis 10.3 standards. [L0ne_W0lf] +//= 2.2 Corrected NPC names to fall within proper resctrictions. [L0ne_W0lf] //============================================================ // Al De Baran @@ -90,7 +91,7 @@ aldebaran,49,93,4 script Young Man#alde 83,{ close; } -aldebaran,81,61,4 script Shell Gathering Lady#alde 101,{ +aldebaran,81,61,4 script Shell Gathering Lady#ald 101,{ mes "[Joanne]"; mes "I enjoy gathering shells from the sea. It's really fun and relaxing~"; next; @@ -580,7 +581,7 @@ aldeba_in,232,241,4 script RS125#alde 48,{ close; } -aldeba_in,223,121,4 script Threatening-Looking Man#alde 63,{ +aldeba_in,223,121,4 script Threatening-Looking Man 63,{ mes "[Threatening-Looking Man]"; mes "Hey, you don't come inside someone else's house without permission."; mes "This is ridiculous!"; @@ -626,7 +627,7 @@ aldeba_in,223,121,4 script Threatening-Looking Man#alde 63,{ close; } -aldeba_in,219,61,4 script Friendly-Looking Man#alde 109,{ +aldeba_in,219,61,4 script Friendly-Looking Man#ald 109,{ mes "[Friendly-Looking Man]"; mes "You don't have to listen to a guy right next to my room."; mes "Two years ago, he was in a mercenary training center and fell off from a tree"; @@ -1376,12 +1377,12 @@ sF_Spin: // Inside Clock Tower //============================================================ -c_tower3,10,249,4 script Gatekeeper 84,{ +c_tower3,10,249,4 script Gatekeeper#ct 84,{ //Key_Of_Clock_Tower callfunc "F_ClockTowerGate","4th",7026,"c_tower4",185,44; } -alde_dun03,264,16,4 script Gatekeeper 101,{ +alde_dun03,264,16,4 script Gatekeeper#ct1 101,{ //Underground_Key callfunc "F_ClockTowerGate","B4th",7027,"alde_dun04",79,267; } diff --git a/npc/cities/lighthalzen.txt b/npc/cities/lighthalzen.txt index c2b09d19a..978c03da1 100644 --- a/npc/cities/lighthalzen.txt +++ b/npc/cities/lighthalzen.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= erKURITA, Au{R}oN (Translated by Alan), $ephiroth //===== Current Version: ===================================== -//= 1.3 +//= 1.4 //===== Compatible With: ===================================== //= eAthena 1.0 //===== Description: ========================================= @@ -25,6 +25,7 @@ //= from npc\other\lighthalzen_???.txt [Lupus] //= 1.2 Moved some NPCs to Lighthalzen quests. [SinSloth] //= 1.3 Moved some other NPCs for quests purposes. [SinSloth] +//= 1.4 Corrected NPC names to fall within proper resctrictions. [L0ne_W0lf] //============================================================= lighthalzen,198,285,5 script Jiwon 862,{ @@ -1195,7 +1196,7 @@ lhz_in03,26,167,4 script Shayna 850,{ // --------------------------------------------------------------------------- -lhz_in01,134,45,2 script Cenku Dekdam#Cenku_Dekdam 869,{ +lhz_in01,134,45,2 script Cenku Dekdam#Cenku 869,{ mes "[Cenku Dekdam]"; mes "Man, if you were"; @@ -1355,7 +1356,7 @@ lhz_in01,124,28,2 script Ellette 66,{ // --------------------------------------------------------------------------- -lhz_in01,125,40,2 script Dowbow Ryuei#Dowbow_Ryuei 843,{ +lhz_in01,125,40,2 script Dowbow Ryuei#Dowbow 843,{ mes "[Dowbow Ryuei]"; mes "Just out of, oh I dunno,"; @@ -1419,7 +1420,7 @@ lhz_in01,116,53,6 script Ninjose 841,{ // --------------------------------------------------------------------------- -lhz_in01,116,39,6 script Kejulle Rekenber#Kejulle_Rekenber 822,{ +lhz_in01,116,39,6 script Kejulle Rekenber#Kejulle 822,{ mes "[Kejulle Rekenber]"; mes "Hm? Sure, my last name"; diff --git a/npc/custom/adoption.txt b/npc/custom/adoption.txt index 2a63922b7..18d942e7e 100644 --- a/npc/custom/adoption.txt +++ b/npc/custom/adoption.txt @@ -473,7 +473,7 @@ function script AdoptReset { return; } -prt_church,165,166,6 script Teacher 97,{ +prt_church,165,166,6 script Teacher#adopt 97,{ mes "[Mario]"; if (Upper==2 && (getskilllv(408)<=0 || getskilllv(409)<=0)) goto L_Teach; if (Upper==2) mes "Hello, baby! How are you?"; diff --git a/npc/guides/guides_louyang.txt b/npc/guides/guides_louyang.txt index 597c8539f..991822f43 100644 --- a/npc/guides/guides_louyang.txt +++ b/npc/guides/guides_louyang.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= jAthena/Tsuyuki; L0ne_W0lf //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -13,6 +13,7 @@ //= 0.5 Added first, Japanese version [Tsuyuki] //= 1.0 Translated to English from iRO NPC Dialogue (100% Official) [Tsuyuki] //= 1.1 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] +//= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ louyang,213,213,3 script Soldier#BA::LouGuide 825,{ @@ -127,7 +128,7 @@ louyang,213,213,3 script Soldier#BA::LouGuide 825,{ louyang,160,175,3 duplicate(LouGuide) Soldier#BB 825 -louyang,224,104,3 script Representative 818,{ +louyang,224,104,3 script Representative#lou 818,{ mes "[Representative]"; mes "Welcome to Louyang,"; mes "an ancient land with"; diff --git a/npc/jobs/1-1/swordman.txt b/npc/jobs/1-1/swordman.txt index d66971121..11390c6de 100644 --- a/npc/jobs/1-1/swordman.txt +++ b/npc/jobs/1-1/swordman.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88; L0ne_W0lf //===== Current Version: ===================================== -//= 1.9b +//= 2.0 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -32,9 +32,10 @@ //= No longer uses function "F_ToHigh" //= 1.9 Dialog is official, but the Script is now custom as far as maps go. [L0ne_W0lf] //= 1.9b Fixed usage of wrong jobchange func messing up baby classes [ultramage] +//= 2.0 Corrected NPC names to fall within proper resctrictions. [L0ne_W0lf] //============================================================ -izlude_in,74,172,4 script Swordman 119,{ +izlude_in,74,172,4 script Swordman#swd_1 119,{ if (Upper == 1) { if (Class == Job_Novice_High && ADVJOB == Job_Lord_Knight || ADVJOB == Job_Paladin) { mes "[Swordman]"; @@ -198,7 +199,7 @@ izlude_in,74,172,4 script Swordman 119,{ } } -izlude_in,62,170,6 script Swordman 85,{ +izlude_in,62,170,6 script Swordman#swd_2 85,{ mes "[Swordman]"; if (BaseJob == Job_Swordman) { mes "Sorry guy, but I can only allow Novices to enter the Test Hall."; @@ -230,7 +231,7 @@ izlude_in,62,170,6 script Swordman 85,{ } } -izlude_in,30,175,4 script Swordman 92,{ +izlude_in,30,175,4 script Swordman#swd_3 92,{ mes "[Swordman]"; mes "I will tell you about the Test! Listen carefully, I won't repeat myself."; next; @@ -257,7 +258,7 @@ izlude_in,30,175,4 script Swordman 92,{ close; } -izlude_in,30,163,0 script Test Hall Staff 105,{ +izlude_in,30,163,0 script Test Hall Staff#swd_1 105,{ mes "[Test Hall Staff]"; if (BaseJob == Job_Swordman) { mes "Hm? How did you get inside? You're not supposed to be in here, so please leave now."; @@ -296,13 +297,13 @@ izlude_in,30,163,0 script Test Hall Staff 105,{ job_sword1,230,245,2 script Medic#swd_1 105,{ callfunc "F_JobSwdMedic","1st"; } -job_sword1,230,242,2 script Test Hall Staff#swd_1 105,{ +job_sword1,230,242,2 script Test Hall Staff#swd_2 105,{ callfunc "F_JobSwdStaff",1; } -job_sword1,230,207,2 script Medic#2swd_1 105,{ +job_sword1,230,207,2 script Medic#2swd_2 105,{ callfunc "F_JobSwdMedic","2nd"; } -job_sword1,230,204,2 script Test Hall Staff#2swd_1 105,{ +job_sword1,230,204,2 script Test Hall Staff#2swd_3 105,{ callfunc "F_JobSwdStaff",1; } job_sword1,223,167,2 script Mae#swd_1_success 92,{ @@ -362,38 +363,38 @@ OnTouch: // Examination Course 1 //============================================================ -job_sword1,223,243,0 warp checkp1-2 1,1,job_sword1,11,206; -job_sword1,223,205,0 warp checkp2-3 1,1,job_sword1,11,168; +job_sword1,223,243,0 warp checkp1-2#swd_1 1,1,job_sword1,11,206; +job_sword1,223,205,0 warp checkp2-3#swd_1 1,1,job_sword1,11,168; -job_sword1,7,245,0 script Test Hall Staff 45,1,3,{ +job_sword1,7,245,0 script Test Hall Staff#swd_4 45,1,3,{ callfunc "F_JobSwdTestStaff",10,245; } -job_sword1,8,207,0 script Test Hall Staff 45,1,6,{ +job_sword1,8,207,0 script Test Hall Staff#swd_5 45,1,6,{ callfunc "F_JobSwdTestStaff",11,207; } -job_sword1,8,169,0 script Test Hall Staff 45,1,6,{ +job_sword1,8,169,0 script Test Hall Staff#swd_6 45,1,6,{ callfunc "F_JobSwdTestStaff",11,169; } -job_sword1,192,244,0 script Test Hall Staff 45,1,3,{ +job_sword1,192,244,0 script Test Hall Staff#swd_7 45,1,3,{ callfunc "F_JobSwdTestStaff2","1st",215,244; } -job_sword1,193,207,0 script Test Hall Staff 45,1,3,{ +job_sword1,193,207,0 script Test Hall Staff#swd_8 45,1,3,{ callfunc "F_JobSwdTestStaff2","2nd",215,205; warp "job_sword1",215,205; } -job_sword1,193,168,0 script Test Hall Staff 45,1,3,{ +job_sword1,193,168,0 script Test Hall Staff#swd_9 45,1,3,{ callfunc "F_JobSwdTestStaff2","3rd",215,167; } // Pitfalls (Set 1) //============================================================ job_sword1,65,117,0 warp 함정01-01 1,1,job_sword1,10,245; -job_sword1,98,27,0 warp 함정02-01 1,1,job_sword1,11,207; +job_sword1,98,27,0 warp 함정02-01 1,1,job_sword1,11,207; job_sword1,161,27,0 warp 함정02-02 1,1,job_sword1,11,207; job_sword1,239,117,0 warp 함정03-01 1,1,job_sword1,11,169; @@ -523,7 +524,7 @@ job_sword1,26,168,0 duplicate(SwdTrap3) 3_blank_3_d -1,0,2 job_sword1,36,169,0 duplicate(SwdTrap3) 3_blank_4_a -1,0,0 job_sword1,37,169,0 duplicate(SwdTrap3) 3_blank_4_b -1,0,0 job_sword1,37,168,0 duplicate(SwdTrap3) 3_blank_4_c -1,0,0 -job_sword1,36,168,0 duplicate(SwdTrap3) 3_blank_4_c -1,0,0 +job_sword1,36,168,0 duplicate(SwdTrap3) 3_blank_4_c2 -1,0,0 job_sword1,40,175,0 duplicate(SwdTrap3) 3_blank_5_a -1,0,1 job_sword1,41,175,0 duplicate(SwdTrap3) 3_blank_5_b -1,0,1 job_sword1,41,171,0 duplicate(SwdTrap3) 3_blank_6_a -1,1,0 diff --git a/npc/jobs/1-1e/ninja.txt b/npc/jobs/1-1e/ninja.txt index 4fe0a6150..ff4ed9c37 100644 --- a/npc/jobs/1-1e/ninja.txt +++ b/npc/jobs/1-1e/ninja.txt @@ -447,7 +447,7 @@ que_ng,30,65,3 script Cougar Gai 730,{ } } -einbroch,184,194,3 script Suspicious Guy 881,{ +einbroch,184,194,3 script Suspicious Guy#nin 881,{ if(Class == Job_Ninja) { diff --git a/npc/jobs/2-1/assassin.txt b/npc/jobs/2-1/assassin.txt index 47fd7f866..ab6c3cbc4 100644 --- a/npc/jobs/2-1/assassin.txt +++ b/npc/jobs/2-1/assassin.txt @@ -34,6 +34,7 @@ //= 2.5 Fixed a Rogue exploit [Lupus] //= 2.6 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] //= 2.7 Several bugfixes with the help of Samuray22 and Barron-Monster. [L0ne_W0lf] +//= 2.8 Removed duplicate warps. [L0ne_W0lf] //============================================================ in_moc_16,19,33,1 script Guildsman#asn 55,{ @@ -1170,16 +1171,6 @@ OnTouch: } } -in_moc_16,18,8,0 script guild_to_16 45,1,1,{ -OnTouch: - warp "moc_fild16",205,291; -} - -moc_fild16,205,296,0 script 16_to_guild 45,1,1,{ -OnTouch: - warp "in_moc_16",18,11; -} - in_moc_16,1,1,0 script Beholder#ASNTEST -1,{ OnInit: disablenpc "Beholder#ASNTEST"; diff --git a/npc/jobs/2-1/hunter.txt b/npc/jobs/2-1/hunter.txt index 3a98889ba..6f5491115 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.8 +//= 2.9 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -40,6 +40,7 @@ // -Thanks to ultradamage. //= 2.7 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] //= 2.8 Several bugfixes with the help of Barron-Monster. [L0ne_W0lf] +//= 2.9 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ // Notices in the old Hunter Guild. @@ -61,7 +62,7 @@ in_hunter,99,99,4 script Hunter Info#hnt::HntNotice 727,{ close; } -pay_fild10,148,252,3 duplicate(HntNotice) Job Change Location Change Notice#hugel 857 +pay_fild10,148,252,3 duplicate(HntNotice) Job Change Location#hu 857 // Actual Job quest start //============================================================ diff --git a/npc/jobs/2-2/monk.txt b/npc/jobs/2-2/monk.txt index 177b6e484..47bd038eb 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.2 +//= 2.3 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -12,6 +12,7 @@ //===== Additional Comments: ================================= //= 2.2 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf] //= No longer uses function "F_BlockHigh" +//= 2.3 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ prt_monk,59,247,1 script Guarding Monk#mk 120,6,2,{ @@ -2200,7 +2201,7 @@ job_monk,225,180,1 script Hyunmoo#mk 89,{ } } -prt_monk,225,180,1 script Hyunmoo#mk 89,{ +prt_monk,225,180,1 script Hyunmoo#mk2 89,{ if (MONK_Q < 25) { mes "[Hyunmoo]"; mes "As I see vegetables growing, I feel myself growing within."; @@ -2417,7 +2418,7 @@ OnTouch: end; } -monk_test,88,91,1 script Proctor#mk 52,{ +monk_test,88,91,1 script Proctor#mk2 52,{ mes "[Proctor]"; mes "So, are you ready to undergo this spiritual training?"; next; diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt index 960b16ee7..b2dcd0f95 100644 --- a/npc/jobs/2-2/sage.txt +++ b/npc/jobs/2-2/sage.txt @@ -5,7 +5,7 @@ //= Unknown Translator (1.0) //= Darkchild (1.2) //===== Current Version: ===================================== -//= 2.2b +//= 2.3 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -15,7 +15,8 @@ //= 2.1 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf] //= No longer uses function "F_BlockHigh" //= 2.2 Small bug fix (== -> !=) thanks to Saithis. [L0ne_W0lf] -//= 2.2b ANotehr smakk bugfix, pointed out by Cara. [L0ne_W0lf] +//= 2.2b ANotehr smaLL bugfix, pointed out by Cara. [L0ne_W0lf] +//= 2.3 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ yuno_in02,38,61,5 script Dean of the Academy#sa 743,{ @@ -604,7 +605,7 @@ yuno_in03,154,35,4 script Staff of the Academy#a 742,{ } } -yuno_in03,105,177,5 script Written Test Professor#sa 754,{ +yuno_in03,105,177,5 script Written Test Professor#s 754,{ mes "[Claytos Verdo]"; if (BaseJob != Job_Mage) { if (BaseJob == Job_Sage) { @@ -1022,7 +1023,8 @@ L_AskQuestions: } } -yuno_in03,169,180,3 script Practical Examination Professor 755,{ +//Practical Examination Professer +yuno_in03,169,180,3 script Practical Examination P 755,{ mes "[Hermes Tris]"; if (BaseJob != Job_Mage) { if (BaseJob == Job_Sage) { diff --git a/npc/jobs/novice/novice.txt b/npc/jobs/novice/novice.txt index f9b81dd19..cd9007e54 100644 --- a/npc/jobs/novice/novice.txt +++ b/npc/jobs/novice/novice.txt @@ -2354,7 +2354,7 @@ L_equip: } //Training Center Employee -new_zone03,95,30,4 script Training Center Employee#1 84,{ +new_zone03,95,30,4 script Training Center Employee 84,{ mes "[Hoffman]"; mes "Hey there~"; mes "I'm here to provide"; diff --git a/npc/jobs/valkyrie.txt b/npc/jobs/valkyrie.txt index f3af075d9..83071ac34 100644 --- a/npc/jobs/valkyrie.txt +++ b/npc/jobs/valkyrie.txt @@ -5,7 +5,7 @@ //= finished, optimized and tested by Lupus //= L0ne_W0lf //===== Current Version: ===================================== -//= 2.7 +//= 2.8 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -33,6 +33,7 @@ //= 2.7a Added Function "F_BlockHigh" back in until rewriteing of the 2-x [L0ne_W0lf] //= scripts are comepleted. //= 2.7b Removed function "F_BlockHigh" as it's no longer used. [L0ne_W0lf] +//= 2.8 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ valkyrie,48,86,4 script Valkyrie# 811,{ @@ -386,6 +387,6 @@ S_WarpChar: // Warps //============================================================ -valkyrie,48,73,0 warp valk01 1,1,valkyrie,48,64 -valkyrie,48,66,0 warp valk01 1,1,valkyrie,48,75 +valkyrie,48,73,0 warp valk01#1 1,1,valkyrie,48,64 +valkyrie,48,66,0 warp valk01#2 1,1,valkyrie,48,75 diff --git a/npc/kafras/dts_warper.txt b/npc/kafras/dts_warper.txt index 8c8904332..bd23f807a 100644 --- a/npc/kafras/dts_warper.txt +++ b/npc/kafras/dts_warper.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Evera //===== Current Version: ===================================== -//= 2.3c +//= 2.4 //===== Compatible With: ===================================== //= eAthena //===== Description: ========================================= @@ -71,6 +71,7 @@ //= New $dtsday system and bug fix[Evera] //= 2.3a fixed 2 bugs with comparision [Lupus] //= 2.3b corrected Glast warp coords [Lupus] 2.3c Bailand -> Bayalan +//= 2.4 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ //Yuno @@ -94,7 +95,7 @@ prontera,164,125,6 script Kafra Voting Staff#02 115,{ //Cool Event Staff Headquarters NPCs //Kudiuu (Maintenance Guy) -lhz_in02,20,274,6 script Maintenance Guy 851,{ +lhz_in02,20,274,6 script Maintenance Guy#dts 851,{ mes "[Kudiuu]"; mes "Holy...!"; mes "Will this place"; diff --git a/npc/merchants/gemstone.txt b/npc/merchants/gemstone.txt index 3814ceb7c..f542cb75f 100644 --- a/npc/merchants/gemstone.txt +++ b/npc/merchants/gemstone.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= eAhena SVN //===== Description: ========================================= @@ -13,9 +13,10 @@ //= 1.0 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] //= Any notes pertaining to the prior trader may be found //= in the cities/payon.txt +//= 1.1 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ -payon,173,238,5 script Jade 754,{ +payon,173,238,5 script Jade#pay 754,{ //Ensure the player can hold at least one item //set max_max_c,CheckMaxCount; //if (max_max_c == 1) { diff --git a/npc/merchants/inn.txt b/npc/merchants/inn.txt index 7f81138f9..fc786cbfa 100644 --- a/npc/merchants/inn.txt +++ b/npc/merchants/inn.txt @@ -4,7 +4,7 @@ //= Darkchild (1.1) //= Playtester (1.2) //===== Current Version: ===================================== -//= 2.0 +//= 2.1 //===== Compatible With: ===================================== //= eAthena 1.0+ //===== Description: ========================================= @@ -34,18 +34,19 @@ //= 1.8 Corrected Geffen NPC. [L0ne_W0lf] //= 1.9 Added the Inn for Al De baran. [L0ne_W0lf] //= 2.0 Added Inn for the Town of Veins. [L0ne_W0lf] +//= 2.1 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ //======================== Prontera =================================== // West Side Inn ------------------- -prt_in,244,135,2 script Inn Employee::Sammy 53,{ +prt_in,244,135,2 script Inn Employee#Sammy 53,{ callfunc "F_InnMaid","[Employee Sammy]","Nenkaras","prt_in",238,130; warp "prt_in",247,104; end; } // East Side Inn ------------------ -prt_in,61,141,2 script Inn Employee::Ahlma#01 53,{ +prt_in,61,141,2 script Inn Employee#Ahlma 53,{ callfunc "F_InnMaid","[Emplyee Ahlma]","Nenkaras","prt_in",64,136; warp "prt_in",64,136; end; @@ -53,27 +54,27 @@ prt_in,61,141,2 script Inn Employee::Ahlma#01 53,{ //======================== Alberta ==================================== // North -------------------------- -alberta_in,32,142,5 script Inn Maid::Moira 53,{ +alberta_in,32,142,5 script Inn Maid#Moira 53,{ callfunc "F_InnMaid","[Moira]","North Inn","alberta_in",26,138; warp "alberta_in",18,188; end; } // South ----------------------------- -alberta_in,55,142,8 script Inn Maid::Tina 53,{ +alberta_in,55,142,8 script Inn Maid#Tina 53,{ callfunc "F_InnMaid","[Tina]","South Inn","alberta_in",60,140; warp "alberta_in",68,188; end; } //====================== Geffen ====================================== -geffen_in,70,64,5 script Inn Employee::Cena 53,{ +geffen_in,70,64,5 script Inn Employee#Cena 53,{ callfunc "F_InnMaid","[Employee Cena]","'Ifrit,' the only Inn in the city of Geffen.","geffen_in",70,59; warp "geffen_in",31,31; end; } //======================= Payon ====================================== -payon_in01,132,62,5 script Inn Employee::Ahee 53,{ +payon_in01,132,62,5 script Inn Employee#Ahee 53,{ callfunc "F_InnMaid","[Employee Ahee]","Payon Inn","payon_in01",136,61; warp "payon_in01",132,11; end; @@ -81,13 +82,13 @@ payon_in01,132,62,5 script Inn Employee::Ahee 53,{ //======================== Morocc ==================================== // North East -------------------------- -morocc_in,147,141,3 script Inn Employee::Hasna 53,{ +morocc_in,147,141,3 script Inn Employee#Hasna 53,{ callfunc "F_InnMaid","[Employee Hasna]","Morroc Inn","morocc_in",142,140; warp "morocc_in",173,135; end; } // South -------------------------------- -morocc_in,80,100,5 script Inn Employee::Manar 53,{ +morocc_in,80,100,5 script Inn Employee#Manar 53,{ callfunc "F_InnMaid","[Employee Manar]","Morroc Inn","morocc_in",78,95; warp "morocc_in",79,123; end; @@ -95,28 +96,28 @@ morocc_in,80,100,5 script Inn Employee::Manar 53,{ //====================== Aldebaran =================================== -aldeba_in,92,58,5 script Inn Maid 53,{ +aldeba_in,92,58,5 script Inn Maid#Rilim 53,{ callfunc "F_InnMaid","[Rilim]","Al De Baran Inn","aldeba_in",92,50; warp "aldeba_in",92,112; end; } //======================== Rachel ==================================== -ra_in01,376,69,4 script Inn Keeper 931,{ +ra_in01,376,69,4 script Inn Keeper#Annie 931,{ callfunc "F_InnMaid","[Annie]","Rachel Inn","ra_in01",375,58; warp "ra_in01",384,128; end; } //======================== Hugel ==================================== -hu_in01,246,107,3 script Inn Maid::Receptionist 53,{ +hu_in01,246,107,3 script Inn Maid#Receptionist 53,{ callfunc "F_InnMaid","[Receptionist]","Hugel Inn","hu_in01",263,95; warp "hu_in01",267,5; end; } //======================== Veins ==================================== -ve_in,157,219,5 script Inn Master::Receptionist 709,{ +ve_in,157,219,5 script Inn Master#Receptionist 709,{ mes "[Inn Master]"; mes "Good say~"; mes "Welcome to the"; diff --git a/npc/merchants/refine.txt b/npc/merchants/refine.txt index 181a0ce9f..d91b608b5 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.2b +//= 2.3 //===== Compatible With: ===================================== //= Any Athena Version //===== Description: ========================================= @@ -42,13 +42,14 @@ // - Thanks to Barron-Monster. //= 2.2b - Changed name from "Pharacon" to "Phracon". [Samuray22] // - Thanks to Barron-Monster. +//= 2.3 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ //========================================================= // Christopher: Geffen Blacksmith //========================================================= -geffen_in,110,172,2 script Christopher#1::Chris 63,{ +geffen_in,110,172,2 script Christopher#1::Chrisbs 63,{ mes "[Christopher Guillenrow]"; mes "Welcome to Christopher's Workshop. Ye can find all yer forging equipment here. So what can I help ye with?"; M_Menu: @@ -177,7 +178,7 @@ geffen_in,110,172,2 script Christopher#1::Chris 63,{ close; } -ein_in01,38,29,6 duplicate(Chris) Christopher#2 63 +ein_in01,38,29,6 duplicate(Chrisbs) Christopher#2 63 //===================================================================================== // Weapon/Armor Refiners diff --git a/npc/merchants/renters.txt b/npc/merchants/renters.txt index 0208b4288..2cd437663 100644 --- a/npc/merchants/renters.txt +++ b/npc/merchants/renters.txt @@ -22,7 +22,7 @@ //============================================================ // PecoPeco Breeder (for Knights)------------------------------------------- -prontera,55,350,5 script Peco Peco Breeder 105,{ +prontera,55,350,5 script Peco Peco Breeder#knt 105,{ if(Upper==0) set .@price,2500; //Normal Peco - default price if(Upper==1) set .@price,2500; //Armored Peco if(Upper==2) set .@price,2500; //Baby Peco @@ -77,7 +77,7 @@ prontera,55,350,5 script Peco Peco Breeder 105,{ } // Grand PecoPeco Breeder (for Crusaders)------------------------------------------- -prontera,232,318,3 script Peco Peco Breeder 105,{ +prontera,232,318,3 script Peco Peco Breeder#cru 105,{ if(Upper==0) set .@price,3500; //Normal Peco - default price if(Upper==1) set .@price,3500; //Armored Peco if(Upper==2) set .@price,3500; //Baby Peco @@ -132,7 +132,7 @@ mes "Welcome, Paladin."; } // Falcon Master-------------------------------------------------------------- -hu_in01,381,304,5 script Falcon Breeder 105,{ +hu_in01,381,304,5 script Falcon Breeder#hnt 105,{ if(Upper==0) set .@price,2500; //Normal Falcon - default price if(Upper==1) set .@price,2500; //Scarf Falcon if(Upper==2) set .@price,2500; //Baby Falcon diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt index 7664afe22..b99da0e94 100644 --- a/npc/merchants/shops.txt +++ b/npc/merchants/shops.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= eAthena Dev Team //===== Current Version: ===================================== -//= 2.2 +//= 2.3 //===== Compatible With: ===================================== //= eAthena 1.0+ //===== Description: ========================================= @@ -35,33 +35,34 @@ //= 2.1 Fixed missing item from "Fresh Fish" from cooking addition shops. [L0ne_W0lf] //= 2.1a Fixed the second "Line" selling in Comodo Weapon shop. (Should have been Whip) [L0ne_W0lf] //= 2.2 Added Veins shops. [L0ne_W0lf] +//= 2.3 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ //======================================================= // Alberta //======================================================= -alb2trea,87,65,5 shop Tool Dealer 83,1750:-1,1751:-1,1752:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1 -alberta_in,165,96,0 shop Item Collector 74,911:-1,528:-1 -alberta_in,182,97,0 shop Tool Dealer 73,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,2243:-1 -alberta_in,180,15,0 shop Armor Dealer 101,2101:-1,2103:-1,2401:-1,2403:-1,2405:-1,2501:-1,2503:-1,2505:-1,2203:-1,2201:-1,2205:-1,2226:-1,2301:-1,2303:-1,2305:-1,2321:-1,2328:-1,2332:-1,2307:-1,2309:-1,2312:-1,2314:-1,2628:-1 -alberta_in,188,21,0 shop Weapon Dealer 49,1750:-1,1751:-1,1101:-1,1104:-1,1107:-1,1201:-1,1204:-1,1207:-1,1601:-1,1701:-1,1301:-1,1351:-1,1354:-1,1357:-1,1360:-1 -alberta_in,175,97,4 shop Weapon Dealer 82,1146:-1,1245:-1 +alb2trea,87,65,5 shop Tool Dealer#alb 83,1750:-1,1751:-1,1752:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1 +alberta_in,165,96,0 shop Item Collector#alb 74,911:-1,528:-1 +alberta_in,182,97,0 shop Tool Dealer#alb2 73,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,2243:-1 +alberta_in,180,15,0 shop Armor Dealer#alb 101,2101:-1,2103:-1,2401:-1,2403:-1,2405:-1,2501:-1,2503:-1,2505:-1,2203:-1,2201:-1,2205:-1,2226:-1,2301:-1,2303:-1,2305:-1,2321:-1,2328:-1,2332:-1,2307:-1,2309:-1,2312:-1,2314:-1,2628:-1 +alberta_in,188,21,0 shop Weapon Dealer#alb 49,1750:-1,1751:-1,1101:-1,1104:-1,1107:-1,1201:-1,1204:-1,1207:-1,1601:-1,1701:-1,1301:-1,1351:-1,1354:-1,1357:-1,1360:-1 +alberta_in,175,97,4 shop Weapon Dealer#alb2 82,1146:-1,1245:-1 //======================================================= // Al De Baran //======================================================= -aldeba_in,20,60,0 shop Armor Dealer 101,2228:-1,2103:-1,2105:-1,2307:-1,2309:-1,2312:-1,2314:-1,2316:-1,2505:-1,2405:-1,2628:-1,2627:-1 -aldeba_in,28,54,0 shop Weapon Dealer 49,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1219:-1,1222:-1 -aldeba_in,22,47,4 shop Weapon Dealer 713,1146:-1,1245:-1 -aldeba_in,94,56,5 shop Tool Dealer 83,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,611:-1,610:-1 +aldeba_in,20,60,0 shop Armor Dealer#alde 101,2228:-1,2103:-1,2105:-1,2307:-1,2309:-1,2312:-1,2314:-1,2316:-1,2505:-1,2405:-1,2628:-1,2627:-1 +aldeba_in,28,54,0 shop Weapon Dealer#alde 49,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1219:-1,1222:-1 +aldeba_in,22,47,4 shop Weapon Dealer#alde2 713,1146:-1,1245:-1 +aldeba_in,94,56,5 shop Tool Dealer#alde 83,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,611:-1,610:-1 alde_alche,38,184,3 shop Material Seller#alche 755,7143:-1,7141:-1,7140:-1 //======================================================= // Amatsu //======================================================= -ama_in01,89,28,5 shop Armor Dealer 757,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1 -ama_in01,102,28,3 shop Weapon Dealer 766,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1 -ama_in01,24,30,5 shop Tool Dealer 763,1750:-1,1770:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1 +ama_in01,89,28,5 shop Armor Dealer#ama 757,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1 +ama_in01,102,28,3 shop Weapon Dealer#ama 766,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1 +ama_in01,24,30,5 shop Tool Dealer#ama 763,1750:-1,1770:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1 // Ninja Shops que_ng,72,31,2 shop Boonji#nin 83,13250:-1,13251:-1,13252:-1,13253:-1,13254:-1 que_ng,73,26,5 shop Boonray#nin 83,2117:-1,7521:-1,7522:-1,7523:-1,7524:-1 @@ -69,28 +70,28 @@ que_ng,73,26,5 shop Boonray#nin 83,2117:-1,7521:-1,7522:-1,7523:-1,7524:-1 //======================================================= // Ayothaya //======================================================= -ayo_in01,18,182,1 shop Tool Dealer 840,1750:-1,1770:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1 -ayo_in01,90,192,3 shop Weapon Dealer 843,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1 -ayo_in01,90,160,1 shop Armor Dealer 842,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1 +ayo_in01,18,182,1 shop Tool Dealer#ayo 840,1750:-1,1770:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1 +ayo_in01,90,192,3 shop Weapon Dealer#ayo 843,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1 +ayo_in01,90,160,1 shop Armor Dealer#ayo 842,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1 //======================================================= // Comodo //======================================================= -cmd_in01,117,165,4 shop Armor Dealer 101,2226:-1,2228:-1,2103:-1,2105:-1,2405:-1,2503:-1,2505:-1,2305:-1,2321:-1,2307:-1,2309:-1,2335:-1,2312:-1,2314:-1,2316:-1 -cmd_in01,128,165,2 shop Weapon Dealer 49,1901:-1,1903:-1,1905:-1,1909:-1,1911:-1,1907:-1,1950:-1,1952:-1,1954:-1,1958:-1,1960:-1,1956:-1 -cmd_in01,79,182,5 shop Tool Dealer 83,1770:-1,501:-1,502:-1,503:-1,504:-1,645:-1,656:-1,657:-1,601:-1,602:-1,611:-1,1065:-1 -comodo,296,125,4 shop Souvenir Vendor 101,965:-1,964:-1 -cmd_fild07,257,126,5 shop Tool Dealer 83,1770:-1,501:-1,502:-1,503:-1,504:-1,645:-1,656:-1,601:-1,602:-1,611:-1,1065:-1 -cmd_fild07,250,98,2 shop Weapon Dealer 49,1401:-1,1404:-1,1407:-1,1451:-1,1454:-1,1457:-1,1460:-1,1463:-1,1410:-1 -cmd_fild07,277,85,4 shop Armor Dealer 101,2226:-1,2228:-1,2103:-1,2105:-1,2405:-1,2503:-1,2505:-1,2305:-1,2321:-1,2307:-1,2309:-1,2335:-1,2312:-1,2314:-1,2316:-1 +cmd_in01,117,165,4 shop Armor Dealer#cmd 101,2226:-1,2228:-1,2103:-1,2105:-1,2405:-1,2503:-1,2505:-1,2305:-1,2321:-1,2307:-1,2309:-1,2335:-1,2312:-1,2314:-1,2316:-1 +cmd_in01,128,165,2 shop Weapon Dealer#cmd 49,1901:-1,1903:-1,1905:-1,1909:-1,1911:-1,1907:-1,1950:-1,1952:-1,1954:-1,1958:-1,1960:-1,1956:-1 +cmd_in01,79,182,5 shop Tool Dealer#cmd 83,1770:-1,501:-1,502:-1,503:-1,504:-1,645:-1,656:-1,657:-1,601:-1,602:-1,611:-1,1065:-1 +comodo,296,125,4 shop Souvenir Vendor#cmd 101,965:-1,964:-1 +cmd_fild07,257,126,5 shop Tool Dealer#cmd2 83,1770:-1,501:-1,502:-1,503:-1,504:-1,645:-1,656:-1,601:-1,602:-1,611:-1,1065:-1 +cmd_fild07,250,98,2 shop Weapon Dealer#cmd2 49,1401:-1,1404:-1,1407:-1,1451:-1,1454:-1,1457:-1,1460:-1,1463:-1,1410:-1 +cmd_fild07,277,85,4 shop Armor Dealer#cmd2 101,2226:-1,2228:-1,2103:-1,2105:-1,2405:-1,2503:-1,2505:-1,2305:-1,2321:-1,2307:-1,2309:-1,2335:-1,2312:-1,2314:-1,2316:-1 //======================================================= // Einbroch //======================================================= ein_in01,106,27,4 shop One Hand Weapon Dealer 850,1101:-1,1104:-1,1107:-1,1110:-1,1113:-1,1119:-1,1122:-1,1123:-1,1126:-1,1129:-1,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1219:-1,1222:-1,1301:-1,1401:-1,1404:-1,1407:-1,1501:-1,1504:-1,1507:-1,1510:-1,1513:-1,1516:-1,1519:-1,1522:-1,1801:-1,1803:-1,1805:-1,1807:-1,1809:-1,1811:-1 ein_in01,109,27,4 shop Two Hand Weapon Dealer 850,1116:-1,1151:-1,1154:-1,1157:-1,1160:-1,1351:-1,1354:-1,1357:-1,1360:-1,1410:-1,1451:-1,1454:-1,1457:-1,1460:-1,1463:-1,1250:-1,1252:-1,1254:-1 -ein_in01,119,26,4 shop Weapon Dealer 855,1247:-1,1248:-1,1249:-1,13000:-1 -ein_in01,189,15,1 shop Tool Dealer 850,1750:-1,1753:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1 +ein_in01,119,26,4 shop Weapon Dealer#ein 855,1247:-1,1248:-1,1249:-1,13000:-1 +ein_in01,189,15,1 shop Tool Dealer#ein 850,1750:-1,1753:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1 einbroch,138,66,4 shop Flu Mask Dealer#ein 850,5114:-1,2218:-1 einbroch,82,199,4 shop Paddler#ein 855,512:-1,645:-1,1750:-1,501:-1 //Official Gunslingers shops. @@ -100,14 +101,14 @@ que_ng,180,79,3 shop Johnny Waiker 900,13200:-1,13201:-1,13202:-1 //======================================================= // Geffen //======================================================= -geffen_in,26,178,4 shop Armor Dealer 66,2628:-1,2101:-1,2107:-1,2401:-1,2501:-1,2230:-1,2301:-1,2303:-1,2305:-1,2321:-1,2332:-1 -geffen_in,30,178,4 shop Weapon Dealer 47,1750:-1,1751:-1,1101:-1,1701:-1,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1601:-1,1604:-1,1607:-1,1610:-1 -geffen_in,22,171,7 shop Weapon Dealer 84,1146:-1,1245:-1 -geffen_in,74,144,0 shop Trader 66,911:-1,910:-1,912:-1 -geffen_in,77,167,0 shop Tool Dealer 68,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,2241:-1 -geffen_in,77,173,0 shop Magical Item Seller 64,717:-1,1601:-1,1604:-1,1607:-1,1610:-1,2232:-1,2321:-1,2332:-1 -geffen_in,171,123,4 shop Tool Dealer 64,1092:-1,1093:-1 -geffen,193,152,4 shop Pet Groomer 124,537:-1,643:-1,10013:-1,10014:-1 +geffen_in,26,178,4 shop Armor Dealer#gef 66,2628:-1,2101:-1,2107:-1,2401:-1,2501:-1,2230:-1,2301:-1,2303:-1,2305:-1,2321:-1,2332:-1 +geffen_in,30,178,4 shop Weapon Dealer#gef2 47,1750:-1,1751:-1,1101:-1,1701:-1,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1601:-1,1604:-1,1607:-1,1610:-1 +geffen_in,22,171,7 shop Weapon Dealer#gef 84,1146:-1,1245:-1 +geffen_in,74,144,0 shop Trader#gef 66,911:-1,910:-1,912:-1 +geffen_in,77,167,0 shop Tool Dealer#gef 68,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,2241:-1 +geffen_in,77,173,0 shop Magical Item Seller#gef 64,717:-1,1601:-1,1604:-1,1607:-1,1610:-1,2232:-1,2321:-1,2332:-1 +geffen_in,171,123,4 shop Tool Dealer#gef2 64,1092:-1,1093:-1 +geffen,193,152,4 shop Pet Groomer#gef 124,537:-1,643:-1,10013:-1,10014:-1 //======================================================= // Gonryun @@ -119,194 +120,194 @@ gonryun,173,84,3 shop Armor Dealer 770,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2 //======================================================= // Hugel //======================================================= -hugel,105,169,5 shop Vendor from Milk Ranch 90,519:-1 -hugel,77,167,3 shop Vegetable Gardener 891,522:-1,512:-1,513:-1,515:-1,516:-1,535:-1 -hu_in01,241,368,2 shop Tool Dealer 53,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1 -hu_in01,252,368,3 shop Tool Dealer 90,717:-1,2201:-1,910:-1,528:-1 -hu_in01,100,390,3 shop Bow Dealer 86,1701:-1,1707:-1,1718:-1,1714:-1 -hu_in01,94,390,3 shop Weapon Dealer 898,1116:-1,1154:-1,1354:-1,1201:-1 -hu_in01,94,313,3 shop Armor Dealer 86,2224:-1,2232:-1,2226:-1,2101:-1,2103:-1,2401:-1,2501:-1,2307:-1,2105:-1 +hugel,105,169,5 shop Vendor from Milk Ranch#h 90,519:-1 +hugel,77,167,3 shop Vegetable Gardener#hu 891,522:-1,512:-1,513:-1,515:-1,516:-1,535:-1 +hu_in01,241,368,2 shop Tool Dealer#hu 53,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1 +hu_in01,252,368,3 shop Tool Dealer#hu2 90,717:-1,2201:-1,910:-1,528:-1 +hu_in01,100,390,3 shop Bow Dealer#hu 86,1701:-1,1707:-1,1718:-1,1714:-1 +hu_in01,94,390,3 shop Weapon Dealer#hu 898,1116:-1,1154:-1,1354:-1,1201:-1 +hu_in01,94,313,3 shop Armor Dealer#hu 86,2224:-1,2232:-1,2226:-1,2101:-1,2103:-1,2401:-1,2501:-1,2307:-1,2105:-1 //======================================================= // Izlude //======================================================= -izlude_in,60,127,4 shop Weapon Dealer 72,1750:-1,1751:-1,1701:-1,1601:-1,1201:-1,1204:-1,1207:-1,1101:-1,1104:-1,1107:-1,1116:-1,1151:-1,1154:-1,1157:-1,1160:-1,1301:-1 -izlude_in,70,127,4 shop Armor Dealer 62,2103:-1,2105:-1,2403:-1,2405:-1,2503:-1,2505:-1,2226:-1,2228:-1,2303:-1,2305:-1,2328:-1,2307:-1,2309:-1,2312:-1,2314:-1,2316:-1,2628:-1 -izlude_in,115,61,0 shop Tool Dealer 47,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1 -izlude,105,99,0 shop Butcher 54,517:-1 -izlude,94,98,4 shop Fruit Gardener 53,512:-1,513:-1,515:-1,516:-1 -izlude,105,92,7 shop Vendor from Milk Ranch 90,519:-1 -izlude,164,138,4 shop Pet Groomer 124,537:-1,643:-1,10013:-1,10014:-1 +izlude_in,60,127,4 shop Weapon Dealer#iz 72,1750:-1,1751:-1,1701:-1,1601:-1,1201:-1,1204:-1,1207:-1,1101:-1,1104:-1,1107:-1,1116:-1,1151:-1,1154:-1,1157:-1,1160:-1,1301:-1 +izlude_in,70,127,4 shop Armor Dealer#iz 62,2103:-1,2105:-1,2403:-1,2405:-1,2503:-1,2505:-1,2226:-1,2228:-1,2303:-1,2305:-1,2328:-1,2307:-1,2309:-1,2312:-1,2314:-1,2316:-1,2628:-1 +izlude_in,115,61,0 shop Tool Dealer#iz 47,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1 +izlude,105,99,0 shop Butcher#iz 54,517:-1 +izlude,94,98,4 shop Fruit Gardene#izr 53,512:-1,513:-1,515:-1,516:-1 +izlude,105,92,7 shop Vendor from Milk Ranch#i 90,519:-1 +izlude,164,138,4 shop Pet Groomer#iz 124,537:-1,643:-1,10013:-1,10014:-1 //======================================================= // Jawaii //======================================================= -jawaii,186,174,3 shop Ice Cream Guy 85,563:-1,563:-1,563:-1,563:-1,563:-1,563:-1,563:-1 +jawaii,186,174,3 shop Ice Cream Guy#ja 85,563:-1,563:-1,563:-1,563:-1,563:-1,563:-1,563:-1 //======================================================= // Juno //======================================================= -yuno,218,97,5 shop Tool Dealer 84,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1 -yuno,226,107,5 shop Tool Dealer 83,911:-1,910:-1,912:-1 -yuno,197,114,4 shop Pet Groomer 124,537:-1,643:-1,10013:-1,10014:-1 -yuno,205,103,4 shop Mr. King's Shop 125,2340:-1,2341:-1,2411:-1,2222:-1,2230:-1,1721:-1 -yuno,163,187,5 shop Magical Item Seller 90,717:-1,1601:-1,1604:-1,1607:-1,1610:-1,2232:-1,2321:-1,2332:-1 -yuno_in01,25,34,5 shop Tool Dealer 83,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1 -yuno_in01,103,35,2 shop Weapon Dealer 49,1750:-1,1751:-1,1101:-1,1701:-1,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1601:-1,1604:-1,1607:-1,1610:-1 -yuno_in01,112,26,4 shop Armor Dealer 101,2628:-1,2101:-1,2107:-1,2401:-1,2501:-1,2230:-1,2301:-1,2303:-1,2305:-1,2321:-1,2332:-1 +yuno,218,97,5 shop Tool Dealer#yuno 84,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1 +yuno,226,107,5 shop Tool Dealer#yuno1 83,911:-1,910:-1,912:-1 +yuno,197,114,4 shop Pet Groomer#yuno 124,537:-1,643:-1,10013:-1,10014:-1 +yuno,205,103,4 shop Mr. King's Shop#yuno 125,2340:-1,2341:-1,2411:-1,2222:-1,2230:-1,1721:-1 +yuno,163,187,5 shop Magical Item Seller#yuno 90,717:-1,1601:-1,1604:-1,1607:-1,1610:-1,2232:-1,2321:-1,2332:-1 +yuno_in01,25,34,5 shop Tool Dealer#yuno2 83,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1 +yuno_in01,103,35,2 shop Weapon Dealer#yuno 49,1750:-1,1751:-1,1101:-1,1701:-1,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1601:-1,1604:-1,1607:-1,1610:-1 +yuno_in01,112,26,4 shop Armor Dealer#yuno 101,2628:-1,2101:-1,2107:-1,2401:-1,2501:-1,2230:-1,2301:-1,2303:-1,2305:-1,2321:-1,2332:-1 yuno_in03,176,22,3 shop Scroll Merchant#yuno03 89,7433:-1 //Temp shop in Yuno that sells Blank Scrolls //======================================================= // Lighthalzen //======================================================= -lighthalzen,69,75,5 shop Fruit Gardener 102,512:-1,513:-1 -lighthalzen,112,44,0 shop Flower Girl 90,712:-1,744:-1,748:-1 -lighthalzen,124,129,0 shop Vegetable Gardener 91,515:-1,516:-1,535:-1 -lighthalzen,220,122,3 shop Vendor from Milk Ranch 90,519:-1 -lighthalzen,222,191,4 shop Pet Groomer 125,537:-1,643:-1,10013:-1,10014:-1 -lhz_in02,286,95,4 shop Beginner's Merchant 62,5112:-1,2416:-1,2113:-1,2512:-1 -lhz_in02,271,99,5 shop Armor Dealer 851,2101:-1,2103:-1,2403:-1,2405:-1,2503:-1,2321:-1,2314:-1,2309:-1,2335:-1,2628:-1 -lhz_in02,276,99,4 shop Weapon Dealer 851,1201:-1,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1,13003:-1 -lhz_in02,273,35,4 shop Wand Dealer 854,1601:-1,1604:-1,1607:-1,1617:-1,1619:-1 -lhz_in02,105,21,3 shop Jeweler 91,721:-1,723:-1,726:-1,728:-1,729:-1,730:-1,2613:-1 -lhz_in02,17,220,5 shop Vegetable Gardener 91,515:-1,516:-1,535:-1 -lhz_in02,21,220,5 shop Fruit Gardener 102,512:-1,513:-1 -lhz_in02,32,219,5 shop Butcher 54,517:-1 -lhz_in02,38,145,5 shop Gift Merchant 91,734:-1,735:-1,736:-1,737:-1,746:-1 -lhz_in02,47,148,3 shop Wedding Shop Dealer 71,744:-1,745:-1,2338:-1,2206:-1,7170:-1 -lhz_in02,31,145,4 shop Tool Dealer 90,611:-1,503:-1,504:-1,506:-1,657:-1,656:-1,601:-1,602:-1,1065:-1,610:-1,1770:-1 -lhz_in02,85,216,5 shop Doll Supplier 862,740:-1,741:-1,742:-1 -lhz_in02,87,208,3 shop Toy Supplier 715,2243:-1,2212:-1,2242:-1,2241:-1 -lhz_in03,239,106,5 shop Tool Dealer 850,501:-1,502:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,611:-1 -lhz_in03,258,101,3 shop Arrow Merchant 855,1750:-1,1770:-1,1752:-1,1751:-1 -lhz_in03,249,24,4 shop Merchant 855,911:-1,910:-1,912:-1,528:-1 +lighthalzen,69,75,5 shop Fruit Gardener#lhz 102,512:-1,513:-1 +lighthalzen,112,44,0 shop Flower Girl#lhz 90,712:-1,744:-1,748:-1 +lighthalzen,124,129,0 shop Vegetable Gardener#lhz 91,515:-1,516:-1,535:-1 +lighthalzen,220,122,3 shop Vendor from Milk Ranch#l 90,519:-1 +lighthalzen,222,191,4 shop Pet Groomer#lhz 125,537:-1,643:-1,10013:-1,10014:-1 +lhz_in02,286,95,4 shop Beginner's Merchant#lhz 62,5112:-1,2416:-1,2113:-1,2512:-1 +lhz_in02,271,99,5 shop Armor Dealer#lhz 851,2101:-1,2103:-1,2403:-1,2405:-1,2503:-1,2321:-1,2314:-1,2309:-1,2335:-1,2628:-1 +lhz_in02,276,99,4 shop Weapon Dealer#lhz 851,1201:-1,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1,13003:-1 +lhz_in02,273,35,4 shop Wand Dealer#lhz 854,1601:-1,1604:-1,1607:-1,1617:-1,1619:-1 +lhz_in02,105,21,3 shop Jeweler#lhz 91,721:-1,723:-1,726:-1,728:-1,729:-1,730:-1,2613:-1 +lhz_in02,17,220,5 shop Vegetable Gardener#lhz2 91,515:-1,516:-1,535:-1 +lhz_in02,21,220,5 shop Fruit Gardener#lhz2 102,512:-1,513:-1 +lhz_in02,32,219,5 shop Butcher#lhz 54,517:-1 +lhz_in02,38,145,5 shop Gift Merchant#lhz 91,734:-1,735:-1,736:-1,737:-1,746:-1 +lhz_in02,47,148,3 shop Wedding Shop Dealer#lhz 71,744:-1,745:-1,2338:-1,2206:-1,7170:-1 +lhz_in02,31,145,4 shop Tool Dealer#lhz 90,611:-1,503:-1,504:-1,506:-1,657:-1,656:-1,601:-1,602:-1,1065:-1,610:-1,1770:-1 +lhz_in02,85,216,5 shop Doll Supplier#lhz 862,740:-1,741:-1,742:-1 +lhz_in02,87,208,3 shop Toy Supplier#lhz 715,2243:-1,2212:-1,2242:-1,2241:-1 +lhz_in03,239,106,5 shop Tool Dealer#lhz2 850,501:-1,502:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,611:-1 +lhz_in03,258,101,3 shop Arrow Merchant#lhz 855,1750:-1,1770:-1,1752:-1,1751:-1 +lhz_in03,249,24,4 shop Merchant#lhz 855,911:-1,910:-1,912:-1,528:-1 //======================================================= // Louyang //======================================================= -lou_in02,121,182,5 shop Armor Dealer 818,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1 -lou_in02,130,182,5 shop Weapon Dealer 822,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1 -lou_in02,239,176,5 shop Tool Dealer 818,1750:-1,1770:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1 +lou_in02,121,182,5 shop Armor Dealer#lou 818,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1 +lou_in02,130,182,5 shop Weapon Dealer#lou 822,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1 +lou_in02,239,176,5 shop Tool Dealer#lou 818,1750:-1,1770:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1 //======================================================= // Lutie //======================================================= -xmas_in,40,38,5 shop Tool Dealer 83,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,611:-1,610:-1 -xmas_in,168,104,4 shop Armor Dealer 101,2228:-1,2103:-1,2105:-1,2307:-1,2309:-1,2312:-1,2314:-1,2316:-1,2505:-1,2405:-1 -xmas_in,169,34,2 shop Gift Seller 702,2612:-1,744:-1,748:-1,736:-1,746:-1,740:-1,2613:-1 -xmas_in,174,98,2 shop Weapon Dealer 49,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1219:-1,1222:-1 +xmas_in,40,38,5 shop Tool Dealer#xmas 83,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,611:-1,610:-1 +xmas_in,168,104,4 shop Armor Dealer#xmas 101,2228:-1,2103:-1,2105:-1,2307:-1,2309:-1,2312:-1,2314:-1,2316:-1,2505:-1,2405:-1 +xmas_in,169,34,2 shop Gift Seller#xmas 702,2612:-1,744:-1,748:-1,736:-1,746:-1,740:-1,2613:-1 +xmas_in,174,98,2 shop Weapon Dealer#xmas 49,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1219:-1,1222:-1 //======================================================= // Morroc //======================================================= -morocc_in,141,67,0 shop Weapon Dealer 58,1750:-1,1751:-1,1701:-1,1601:-1,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1219:-1,1222:-1,1250:-1,1252:-1,1254:-1 -morocc_in,141,60,0 shop Armor Dealer 58,2101:-1,2103:-1,2401:-1,2403:-1,2405:-1,2501:-1,2503:-1,2218:-1,2301:-1,2303:-1,2305:-1,2321:-1,2328:-1,2332:-1,2307:-1,2309:-1,2335:-1,2628:-1 -morocc,35,69,6 shop Trader 89,2609:-1,1516:-1,1522:-1 -morocc,139,92,6 shop Trader 99,513:-1,513:-1,513:-1,513:-1,513:-1,513:-1 -morocc,145,44,6 shop Jeweler 99,730:-1,2613:-1 -morocc,147,102,4 shop Tool Dealer 93,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1 -morocc,151,243,6 shop Tool Dealer 99,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,2242:-1 -morocc,157,72,6 shop Butcher 85,517:-1 -morocc,166,51,2 shop Jeweler 102,721:-1,723:-1,726:-1,728:-1,729:-1 -morocc,170,101,2 shop Item Collector 85,911:-1,528:-1,919:-1,925:-1 -morocc,206,250,0 shop Item Collector 85,911:-1,528:-1,919:-1,925:-1 -morocc,244,134,5 shop Trader 93,2612:-1 -morocc,259,193,4 shop Trader 99,747:-1 -morocc,268,193,0 shop Trader 93,748:-1 -morocc,269,167,4 shop Pet Groomer 125,537:-1,643:-1,10013:-1,10014:-1 -morocc_in,132,57,0 shop Weapon Dealer 99,1146:-1,1245:-1 -in_moc_16,22,20,7 shop Sepulchral Merchant 880,1771:-1 +morocc_in,141,67,0 shop Weapon Dealer#moc 58,1750:-1,1751:-1,1701:-1,1601:-1,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1219:-1,1222:-1,1250:-1,1252:-1,1254:-1 +morocc_in,141,60,0 shop Armor Dealer#moc 58,2101:-1,2103:-1,2401:-1,2403:-1,2405:-1,2501:-1,2503:-1,2218:-1,2301:-1,2303:-1,2305:-1,2321:-1,2328:-1,2332:-1,2307:-1,2309:-1,2335:-1,2628:-1 +morocc,35,69,6 shop Trader#moc 89,2609:-1,1516:-1,1522:-1 +morocc,139,92,6 shop Trader#moc2 99,513:-1,513:-1,513:-1,513:-1,513:-1,513:-1 +morocc,145,44,6 shop Jeweler#moc 99,730:-1,2613:-1 +morocc,147,102,4 shop Tool Dealer#moc 93,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1 +morocc,151,243,6 shop Tool Dealer#moc2 99,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,2242:-1 +morocc,157,72,6 shop Butcher#moc 85,517:-1 +morocc,166,51,2 shop Jeweler#moc2 102,721:-1,723:-1,726:-1,728:-1,729:-1 +morocc,170,101,2 shop Item Collector#moc 85,911:-1,528:-1,919:-1,925:-1 +morocc,206,250,0 shop Item Collector#moc2 85,911:-1,528:-1,919:-1,925:-1 +morocc,244,134,5 shop Trader#moc3 93,2612:-1 +morocc,259,193,4 shop Trader#moc4 99,747:-1 +morocc,268,193,0 shop Trader#moc5 93,748:-1 +morocc,269,167,4 shop Pet Groomer#moc 125,537:-1,643:-1,10013:-1,10014:-1 +morocc_in,132,57,0 shop Weapon Dealer#moc2 99,1146:-1,1245:-1 +in_moc_16,22,20,7 shop Sepulchral Merchant#moc 880,1771:-1 //======================================================= // Niflheim //======================================================= -nif_in,37,93,1 shop Axe Dealer 801,1301:-1,1351:-1,1354:-1,1357:-1,1360:-1 -nif_in,37,84,1 shop Armor Dealer 801,2501:-1,2501:-1,2503:-1,2503:-1,2505:-1,2505:-1 -nif_in,145,23,1 shop Tool Dealer 801,535:-1,1062:-1,902:-1,7106:-1,537:-1,7154:-1,1052:-1,934:-1 +nif_in,37,93,1 shop Axe Dealer#nif 801,1301:-1,1351:-1,1354:-1,1357:-1,1360:-1 +nif_in,37,84,1 shop Armor Dealer#nif 801,2501:-1,2501:-1,2503:-1,2503:-1,2505:-1,2505:-1 +nif_in,145,23,1 shop Tool Dealer#nif 801,535:-1,1062:-1,902:-1,7106:-1,537:-1,7154:-1,1052:-1,934:-1 //======================================================= // Payon //======================================================= -payon_in01,15,119,0 shop Weapon Dealer 77,1750:-1,1751:-1,1101:-1,1104:-1,1107:-1,1201:-1,1204:-1,1207:-1,1601:-1,1701:-1,1704:-1,1707:-1,1710:-1,1713:-1,1714:-1,1718:-1 -payon_in01,5,129,7 shop Weapon Dealer 703,1146:-1,1245:-1 -payon_in01,7,119,2 shop Armor Dealer 76,2401:-1,2403:-1,2405:-1,2501:-1,2503:-1,2505:-1,2208:-1,2211:-1,2212:-1,2301:-1,2303:-1,2305:-1,2321:-1,2328:-1,2332:-1,2307:-1,2309:-1,2330:-1,2628:-1 -payon_in01,5,49,7 shop Tool Dealer 88,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1 -payon_in02,87,34,0 shop Tool Dealer 75,1750:-1,1751:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1 -payon,159,96,4 shop Tool Dealer 88,1750:-1,501:-1,645:-1,601:-1,602:-1 -payon,177,131,4 shop Pet Groomer 124,537:-1,643:-1,10013:-1,10014:-1 +payon_in01,15,119,0 shop Weapon Dealer#pay 77,1750:-1,1751:-1,1101:-1,1104:-1,1107:-1,1201:-1,1204:-1,1207:-1,1601:-1,1701:-1,1704:-1,1707:-1,1710:-1,1713:-1,1714:-1,1718:-1 +payon_in01,5,129,7 shop Weapon Dealer#pay2 703,1146:-1,1245:-1 +payon_in01,7,119,2 shop Armor Dealer#pay 76,2401:-1,2403:-1,2405:-1,2501:-1,2503:-1,2505:-1,2208:-1,2211:-1,2212:-1,2301:-1,2303:-1,2305:-1,2321:-1,2328:-1,2332:-1,2307:-1,2309:-1,2330:-1,2628:-1 +payon_in01,5,49,7 shop Tool Dealer#pay 88,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1 +payon_in02,87,34,0 shop Tool Dealer#pay2 75,1750:-1,1751:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1 +payon,159,96,4 shop Tool Dealer#pay3 88,1750:-1,501:-1,645:-1,601:-1,602:-1 +payon,177,131,4 shop Pet Groomer#pay 124,537:-1,643:-1,10013:-1,10014:-1 //======================================================= // Prontera //======================================================= -prontera,73,134,0 shop Vendor from Milk Ranch 90,519:-1 -prontera,104,49,0 shop Fruit Gardener 102,512:-1,513:-1 -prontera,64,125,0 shop Butcher 87,517:-1,528:-1 -prontera,58,182,0 shop Flower Girl 96,712:-1,744:-1 -prontera,113,42,0 shop Flower Lady 90,712:-1,744:-1 -prontera,105,87,0 shop Gift Merchant 91,734:-1,735:-1,736:-1,737:-1,746:-1 -prontera,218,211,4 shop Pet Groomer 125,537:-1,643:-1,10013:-1,10014:-1 -prontera,248,153,0 shop Doll Supplier 85,740:-1,741:-1,742:-1 -prontera,48,58,0 shop Vegetable Gardener 91,515:-1,516:-1,535:-1 -prt_church,108,124,4 shop Nun 79,2608:-1,2216:-1,5092:-1,2323:-1,2325:-1,1501:-1,1504:-1,1507:-1,1510:-1,1513:-1,1519:-1 -prt_fild05,290,221,2 shop Tool Dealer 83,1750:-1,611:-1,501:-1,502:-1,506:-1,645:-1,601:-1,602:-1 -prt_in,211,169,0 shop Wedding Shop Dealer 71,744:-1,745:-1,2338:-1,2206:-1,7170:-1 -prt_in,126,76,0 shop Tool Dealer 53,611:-1,1750:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,2239:-1 -prt_in,172,130,0 shop Weapon Dealer 54,1750:-1,1751:-1,1701:-1,1201:-1,1204:-1,1207:-1,1601:-1,1101:-1,1104:-1,1107:-1,1110:-1,1113:-1,1122:-1,1119:-1,1123:-1,1126:-1,1129:-1,1116:-1,1301:-1 -prt_in,172,132,0 shop Armor Dealer 48,2101:-1,2103:-1,2401:-1,2403:-1,2501:-1,2503:-1,2220:-1,2226:-1,2301:-1,2303:-1,2305:-1,2328:-1,2307:-1,2309:-1,2312:-1,2314:-1,2628:-1,2627:-1 -prt_in,171,140,0 shop Weapon Dealer 47,1401:-1,1404:-1,1407:-1,1451:-1,1454:-1,1457:-1,1460:-1,1463:-1,1410:-1 -prt_in,165,140,4 shop Weapon Dealer 66,1146:-1,1245:-1 -prt_monk,135,263,5 shop Weapon Dealer 726,1801:-1,1803:-1,1805:-1 +prontera,73,134,0 shop Vendor from Milk Ranch#p 90,519:-1 +prontera,104,49,0 shop Fruit Gardener#prt 102,512:-1,513:-1 +prontera,64,125,0 shop Butcher#prt 87,517:-1,528:-1 +prontera,58,182,0 shop Flower Girl#prt 96,712:-1,744:-1 +prontera,113,42,0 shop Flower Lady#prt 90,712:-1,744:-1 +prontera,105,87,0 shop Gift Merchant#prt 91,734:-1,735:-1,736:-1,737:-1,746:-1 +prontera,218,211,4 shop Pet Groomer#prt 125,537:-1,643:-1,10013:-1,10014:-1 +prontera,248,153,0 shop Doll Supplier#prt 85,740:-1,741:-1,742:-1 +prontera,48,58,0 shop Vegetable Gardener#prt 91,515:-1,516:-1,535:-1 +prt_church,108,124,4 shop Nun#prt 79,2608:-1,2216:-1,5092:-1,2323:-1,2325:-1,1501:-1,1504:-1,1507:-1,1510:-1,1513:-1,1519:-1 +prt_fild05,290,221,2 shop Tool Dealer#prt 83,1750:-1,611:-1,501:-1,502:-1,506:-1,645:-1,601:-1,602:-1 +prt_in,211,169,0 shop Wedding Shop Dealer#prt 71,744:-1,745:-1,2338:-1,2206:-1,7170:-1 +prt_in,126,76,0 shop Tool Dealer#prt1 53,611:-1,1750:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,2239:-1 +prt_in,172,130,0 shop Weapon Dealer#prt 54,1750:-1,1751:-1,1701:-1,1201:-1,1204:-1,1207:-1,1601:-1,1101:-1,1104:-1,1107:-1,1110:-1,1113:-1,1122:-1,1119:-1,1123:-1,1126:-1,1129:-1,1116:-1,1301:-1 +prt_in,172,132,0 shop Armor Dealer#prt 48,2101:-1,2103:-1,2401:-1,2403:-1,2501:-1,2503:-1,2220:-1,2226:-1,2301:-1,2303:-1,2305:-1,2328:-1,2307:-1,2309:-1,2312:-1,2314:-1,2628:-1,2627:-1 +prt_in,171,140,0 shop Weapon Dealer#prt2 47,1401:-1,1404:-1,1407:-1,1451:-1,1454:-1,1457:-1,1460:-1,1463:-1,1410:-1 +prt_in,165,140,4 shop Weapon Dealer#prt3 66,1146:-1,1245:-1 +prt_monk,135,263,5 shop Weapon Dealer#prt4 726,1801:-1,1803:-1,1805:-1 //======================================================= // Rachel //======================================================= -ra_in01,175,364,3 shop Armor Dealer 919,2101:-1,2103:-1,2403:-1,2405:-1,2503:-1,2321:-1,2314:-1,2309:-1,2335:-1,2628:-1 -ra_in01,257,269,3 shop Tool Dealer 919,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,611:-1,1065:-1,610:-1 -ra_in01,176,389,3 shop Weapon Dealer 931,1201:-1,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1,13003:-1,1601:-1,1604:-1,1607:-1 -ra_in01,254,300,3 shop Fruit Gardener 931,512:-1,513:-1 -rachel,65,80,0 shop Vegetable Gardener 919,515:-1,535:-1,516:-1 +ra_in01,175,364,3 shop Armor Dealer#ra 919,2101:-1,2103:-1,2403:-1,2405:-1,2503:-1,2321:-1,2314:-1,2309:-1,2335:-1,2628:-1 +ra_in01,257,269,3 shop Tool Dealer#ra 919,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,611:-1,1065:-1,610:-1 +ra_in01,176,389,3 shop Weapon Dealer#ra 931,1201:-1,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1,13003:-1,1601:-1,1604:-1,1607:-1 +ra_in01,254,300,3 shop Fruit Gardener#ra 931,512:-1,513:-1 +rachel,65,80,0 shop Vegetable Gardener#ra 919,515:-1,535:-1,516:-1 //======================================================= // Turtle Island //======================================================= -tur_dun01,158,54,6 shop Tool Dealer 99,1750:-1,501:-1,502:-1,503:-1,504:-1,506:-1,601:-1,602:-1,645:-1,656:-1,2242:-1 +tur_dun01,158,54,6 shop Tool Dealer#tu 99,1750:-1,501:-1,502:-1,503:-1,504:-1,506:-1,601:-1,602:-1,645:-1,656:-1,2242:-1 //======================================================= // Umbala //======================================================= -um_in,104,124,3 shop Tool Dealer 788,512:-1,515:-1,535:-1,516:-1,513:-1,517:-1,528:-1,537:-1,601:-1,602:-1,645:-1,656:-1,610:-1 -um_in,160,125,3 shop Weapon Dealer 789,1501:-1,1504:-1,1507:-1,1510:-1,1513:-1,1519:-1,1807:-1,1811:-1,1809:-1 +um_in,104,124,3 shop Tool Dealer#um 788,512:-1,515:-1,535:-1,516:-1,513:-1,517:-1,528:-1,537:-1,601:-1,602:-1,645:-1,656:-1,610:-1 +um_in,160,125,3 shop Weapon Dealer#um 789,1501:-1,1504:-1,1507:-1,1510:-1,1513:-1,1519:-1,1807:-1,1811:-1,1809:-1 //======================================================= // Veins //======================================================= -ve_in,386,245,3 shop Weapon Dealer 931,1201:-1,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1 -ve_in,336,243,3 shop Weapon Dealer 931,1407:-1,1457:-1,1354:-1,1519:-1,13003:-1 -ve_in,374,230,3 shop Armor Dealer 919,2101:-1,2103:-1,2403:-1,2405:-1,2503:-1,2321:-1,2314:-1,2309:-1,2335:-1,2628:-1 -ve_in,243,303,5 shop Tool Dealer 943,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,611:-1,1065:-1,610:-1 -ve_in,253,304,5 shop Fruit Gardener 941,512:-1,513:-1 -ve_in,252,313,0 shop Magical Item Seller 942,717:-1,1601:-1,1604:-1,1607:-1,1610:-1,2232:-1,2321:-1,2332:-1 +ve_in,386,245,3 shop Weapon Dealer#ve 931,1201:-1,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1 +ve_in,336,243,3 shop Weapon Dealer#ve2 931,1407:-1,1457:-1,1354:-1,1519:-1,13003:-1 +ve_in,374,230,3 shop Armor Dealer#ve 919,2101:-1,2103:-1,2403:-1,2405:-1,2503:-1,2321:-1,2314:-1,2309:-1,2335:-1,2628:-1 +ve_in,243,303,5 shop Tool Dealer#ve 943,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,611:-1,1065:-1,610:-1 +ve_in,253,304,5 shop Fruit Gardener#ve 941,512:-1,513:-1 +ve_in,252,313,0 shop Magical Item Seller#ve 942,717:-1,1601:-1,1604:-1,1607:-1,1610:-1,2232:-1,2321:-1,2332:-1 //======================================================= // Cooking Addition //=========================================================== -prontera,156,212,1 shop Chef Assistant 700,7454:-1,7456:-1,7482:-1,580:-1 -payon,206,119,5 shop Chef Assistant 89,7455:-1 -morocc,120,97,5 shop Chef Assistant 86,7455:-1,7453:-1,7454:-1,7456:-1,7452:-1 -geffen,196,111,3 shop Chef Assistant 85,7482:-1 -alberta,167,135,5 shop Chef Assistant 712,579:-1 -aldebaran,165,107,2 shop Chef Assistant 97,7456:-1,7452:-1,580:-1 -comodo,225,164,3 shop Chef Assistant 83,7455:-1,7453:-1,7454:-1,579:-1 -umbala,102,154,3 shop Chef Assistant 83,7456:-1,577:-1 -yuno,130,173,3 shop Chef Assistant 83,7457:-1,7482:-1 -einbroch,224,207,5 shop Chef Assistant 83,7457:-1 -lighthalzen,126,126,3 shop Chef Assistant 83,7456:-1,7452:-1 -amatsu,206,150,3 shop Chef Assistant 83,7453:-1,579:-1 -louyang,256,123,5 shop Chef Assistant 820,7454:-1,577:-1 -gonryun,147,101,5 shop Chef Assistant 83,7452:-1,580:-1 -ayothaya,203,178,3 shop Chef Assistant 83,7455:-1,577:-1 -xmas,152,137,5 shop Chef Assistant 83,7457:-1,577:-1 -niflheim,209,180,5 shop Chef Assistant 83,581:-1 +prontera,156,212,1 shop Chef Assistant#prt 700,7454:-1,7456:-1,7482:-1,580:-1 +payon,206,119,5 shop Chef Assistant#pay 89,7455:-1 +morocc,120,97,5 shop Chef Assistant#moc 86,7455:-1,7453:-1,7454:-1,7456:-1,7452:-1 +geffen,196,111,3 shop Chef Assistant#gef 85,7482:-1 +alberta,167,135,5 shop Chef Assistant#alb 712,579:-1 +aldebaran,165,107,2 shop Chef Assistant#alde 97,7456:-1,7452:-1,580:-1 +comodo,225,164,3 shop Chef Assistant#cmd 83,7455:-1,7453:-1,7454:-1,579:-1 +umbala,102,154,3 shop Chef Assistant#um 83,7456:-1,577:-1 +yuno,130,173,3 shop Chef Assistant#yuno 83,7457:-1,7482:-1 +einbroch,224,207,5 shop Chef Assistant#ein 83,7457:-1 +lighthalzen,126,126,3 shop Chef Assistant#lhz 83,7456:-1,7452:-1 +amatsu,206,150,3 shop Chef Assistant#ama 83,7453:-1,579:-1 +louyang,256,123,5 shop Chef Assistant#lou 820,7454:-1,577:-1 +gonryun,147,101,5 shop Chef Assistant#gon 83,7452:-1,580:-1 +ayothaya,203,178,3 shop Chef Assistant#ayo 83,7455:-1,577:-1 +xmas,152,137,5 shop Chef Assistant#xmas 83,7457:-1,577:-1 +niflheim,209,180,5 shop Chef Assistant#nif 83,581:-1 //===== Additional Comments(old): ================================= //= swapped shop titles in GONRYUN, thanks to Kashy diff --git a/npc/merchants/socket_enchant.txt b/npc/merchants/socket_enchant.txt index c37848b1e..d3b5a6d02 100644 --- a/npc/merchants/socket_enchant.txt +++ b/npc/merchants/socket_enchant.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= eAthena dev team //===== Current Version: ===================================== -//= 1.3 +//= 1.4 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -19,6 +19,7 @@ //= 1.1b Optimized/cleaned [ultramage] //= 1.2 Fixed some typos and a nasty bug. [SinSloth] //= 1.3 Fixed a wrong item ID with Sphinx Hat. [SinSloth] +//= 1.4 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ payon,140,151,5 script Seiyablem 84,{ @@ -400,9 +401,9 @@ function script Func_Socket { } } -lhz_in02,281,35,5 duplicate(Seiyablem) Seiyablem 84,0,0 -prt_in,33,70,5 duplicate(Seiyablem) Seiyablem 84,0,0 -morocc,51,41,5 duplicate(Seiyablem) Seiyablem 84,0,0 +lhz_in02,281,35,5 duplicate(Seiyablem) Seiyablem#lhz 84,0,0 +prt_in,33,70,5 duplicate(Seiyablem) Seiyablem#prt 84,0,0 +morocc,51,41,5 duplicate(Seiyablem) Seiyablem#moc 84,0,0 payon,143,143,7 script Young Man#socket 97,{ @@ -422,6 +423,6 @@ payon,143,143,7 script Young Man#socket 97,{ close; } -lhz_in02,269,33,5 duplicate(Young Man#socket) Young Man 97,0,0 -prt_in,31,57,1 duplicate(Young Man#socket) Young Man 97,0,0 -morocc,60,42,3 duplicate(Young Man#socket) Young Man 97,0,0 +lhz_in02,269,33,5 duplicate(Young Man#socket) Young Man#lhz 97,0,0 +prt_in,31,57,1 duplicate(Young Man#socket) Young Man#prt 97,0,0 +morocc,60,42,3 duplicate(Young Man#socket) Young Man#moc 97,0,0 diff --git a/npc/other/books.txt b/npc/other/books.txt index 5d23944e8..302b2019f 100644 --- a/npc/other/books.txt +++ b/npc/other/books.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= Eathena SVN //===== Description: ========================================= @@ -11,12 +11,13 @@ //= Various Books found in Prontera Library //===== Additional Comments: ================================= //= 1.0 First Version, rescripted to Aegis 10.3 standard. [L0ne_W0lf] +//= 1.1 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ // Prontera //============================================================ -prt_in,168,56,4 script Monster Encyclopedia#pront 111,{ +prt_in,168,56,4 script Monster Encyclopedia#prt 111,{ mes "^FF0000[Monster Encyclopedia]^000000"; mes "This is a Monster Encyclopedia"; mes "containing information on Water,"; @@ -396,7 +397,7 @@ prt_in,168,56,4 script Monster Encyclopedia#pront 111,{ } } -prt_in,159,56,4 script Monster Encyclopedia#2pront 111,{ +prt_in,159,56,4 script Monster Encyclopedia#2pr 111,{ mes "^FF0000[Monster Encyclopedia]^000000"; mes "This is a Monster Encyclopedia"; mes "containing information on Earth,"; @@ -875,7 +876,7 @@ prt_in,159,56,4 script Monster Encyclopedia#2pront 111,{ } } -prt_in,161,50,4 script Monster Encyclopedia#3pront 111,{ +prt_in,161,50,4 script Monster Encyclopedia#3pr 111,{ mes "^FF0000[Monster Encyclopedia]^000000"; mes "This is a Monster Encyclopedia"; mes "containing information on Dark,"; @@ -1243,7 +1244,7 @@ prt_in,161,50,4 script Monster Encyclopedia#3pront 111,{ } } -prt_in,172,96,4 script Monster Encyclopedia#4pront 111,{ +prt_in,172,96,4 script Monster Encyclopedia#4pr 111,{ mes "^FF0000[Dungeon Monster Encyclopedia]^000000"; mes "This is an Encyclopedia describing"; mes "monsters living in Dungeons."; @@ -1725,7 +1726,7 @@ prt_in,172,96,4 script Monster Encyclopedia#4pront 111,{ } -prt_in,164,96,4 script Monster Encyclopedia#5pront 111,{ +prt_in,164,96,4 script Monster Encyclopedia#5pr 111,{ mes "^FF0000[Dungeon Monster Encyclopedia]^000000"; mes "This is an Encyclopedia describing"; mes "Monsters living in Dungeons."; @@ -2303,7 +2304,7 @@ prt_in,164,96,4 script Monster Encyclopedia#5pront 111,{ } } -prt_in,172,102,4 script Monster Encyclopedia#6pront 111,{ +prt_in,172,102,4 script Monster Encyclopedia#6pr 111,{ mes "^FF0000[Dungeon Monster Encyclopedia]^000000"; mes "This is an Encyclopedia describing"; mes "Monsters living in Dungeons."; @@ -2811,7 +2812,7 @@ prt_in,172,102,4 script Monster Encyclopedia#6pront 111,{ } } -prt_in,164,102,4 script Monster Encyclopedia#7pront 111,{ +prt_in,164,102,4 script Monster Encyclopedia#7pr 111,{ mes "^FF0000[Dungeon Monster Encyclopedia]^000000"; mes "This is an Encyclopedia describing"; mes "Monsters living in Dungeons."; diff --git a/npc/other/comodo_gambling.txt b/npc/other/comodo_gambling.txt index 3209c9224..155e21031 100644 --- a/npc/other/comodo_gambling.txt +++ b/npc/other/comodo_gambling.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Reddozen, Cypress, Zefris //===== Current Version: ===================================== -//= 1.0 +//= 1.2 //===== Compatible With: ===================================== //= eAthena SVN 6769+ (temporary npc variables) //===== Description: ========================================= @@ -20,6 +20,7 @@ //= Added comments to items so people know what the NPC is about //= Added missing emotions and cutins //= 1.1- Updated prizes according to 11.1 NPC [Paradox924X] +//= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ comodo,219,160,3 script Kachua 91,{ @@ -499,7 +500,7 @@ comodo,204,148,7 script Devellin 90,{ close; } -comodo,210,154,4 script Suspicious Guy 118,{ +comodo,210,154,4 script Suspicious Guy#cmd 118,{ if (BaseClass == Job_Thief) { diff --git a/npc/other/msg_boards.txt b/npc/other/msg_boards.txt index ed414b16e..afa6ec819 100644 --- a/npc/other/msg_boards.txt +++ b/npc/other/msg_boards.txt @@ -4,7 +4,7 @@ //= kobra_k88 //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.4 +//= 1.5 //===== Compatible With: ===================================== //= [Aegis Conversion] //= eAthena 7.15 + @@ -22,11 +22,12 @@ //= 1.3 Removed Duplicates [Silent] //= 1.4 Rescripted to Aegis 10.3 standard. [L0ne_W0lf] //= 1.5 Removed a duplicate related to the Sign Quest. [SinSloth] +//= 1.5 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ // Prontera //============================================================ -prontera,158,213,1 script Sign Post#PrtSign1 111,{ +prontera,158,213,1 script Sign Post#Prt1 111,{ mes "^993300- The Sign Post Reads -^000000"; mes "North to Prontera Castle"; mes "North to Al De Baran"; @@ -40,7 +41,7 @@ prontera,158,213,1 script Sign Post#PrtSign1 111,{ close; } -prontera,156,197,1 script Prontera Bulletin#PrtSign2 111,{ +prontera,156,197,1 script Prontera Bulletin#Prt2 111,{ mes "^993300- The Prontera Bulletin Reads -^000000"; mes "Wanted: Two Clip Accessories"; mes "Please contact..."; @@ -53,19 +54,19 @@ prontera,156,197,1 script Prontera Bulletin#PrtSign2 111,{ close; } -prontera,278,212,1 script Sign#PrtSign3 111,{ +prontera,278,212,1 script Sign#Prt3 111,{ mes "^993300- The Sign Reads -^000000"; mes "Please help keep Prontera a clean place."; close; } -prontera,150,326,1 script Sign#PrtSign4 111,{ +prontera,150,326,1 script Sign#Prt4 111,{ mes "^993300- The Sign Reads -^000000"; mes "Citizens of Prontera are Welcomed in the Prontera Castle."; close; } -prontera,31,212,1 script Billboard#PrtSign5 111,{ +prontera,31,212,1 script Billboard#Prt5 111,{ mes "^993300- The Billboard Reads -^000000"; mes "~WANTED~"; mes "iROGM01"; @@ -77,13 +78,13 @@ prontera,31,212,1 script Billboard#PrtSign5 111,{ close; } -prontera,165,305,1 script Billboard#PrtSign6 111,{ +prontera,165,305,1 script Billboard#Prt6 111,{ mes "^993300- The Billboard Reads -^000000"; mes "We hope you enjoy your stay in Prontera."; close; } -prontera,145,304,1 script Sign#PrtSign7 111,{ +prontera,145,304,1 script Sign#Prt7 111,{ mes "^993300- The Sign Reads -^000000"; mes "Note:"; mes "I lost my cart in Mt. Mjolnir, if someone finds it please tell me, my life was in that bucket of goods!"; @@ -92,21 +93,21 @@ prontera,145,304,1 script Sign#PrtSign7 111,{ // Morroc //============================================================ -morocc,144,84,1 script Sign#MocSign1 111,{ +morocc,144,84,1 script Sign#Moc1 111,{ mes "^993300- The Sign Reads -^000000"; mes "Wanted: Body guard to protect my shop from thieves"; mes "Please contact Butcher"; close; } -morocc,145,83,1 script Sign#MocSign2 111,{ +morocc,145,83,1 script Sign#Moc2 111,{ mes "^993300- The Sign Reads -^000000"; mes "Selling, well groomed Peco Peco!"; mes "This beautiful specimen has only been ridden by myself, comes with a saddle, a harness and..."; close; } -morocc,32,174,1 script Bulletin#MocSign3 111,{ +morocc,32,174,1 script Bulletin#Moc3 111,{ mes "^993300- The Bulletin Reads -^000000"; mes "^0099FFMorroc women up in arms!^000000"; mes "A recent study has shown that the majority of male citizens in"; @@ -124,13 +125,13 @@ morocc,32,174,1 script Bulletin#MocSign3 111,{ close; } -morocc,168,266,1 script Sign#MocSign5 111,{ +morocc,168,266,1 script Sign#Moc5 111,{ mes "^993300- The Sign Reads -^000000"; mes "Welcome to Morroc."; close; } -morocc,168,264,1 script Billboard#MocSign6 111,{ +morocc,168,264,1 script Billboard#Moc6 111,{ mes "^993300- The Billboard Reads -^000000"; mes "^CC0033Battle Royal!^000000"; mes "Do you have what it takes to battle someone in a no holds barred, player vs. player game of death!"; @@ -138,7 +139,7 @@ morocc,168,264,1 script Billboard#MocSign6 111,{ close; } -morocc,298,211,1 script Sign#MocSign7 111,{ +morocc,298,211,1 script Sign#Moc7 111,{ mes "^993300- The Sign Reads -^000000"; mes "Welcome to Morroc."; close; @@ -146,20 +147,20 @@ morocc,298,211,1 script Sign#MocSign7 111,{ // Geffen //============================================================ -geffen,116,58,1 script Geffen Bulletin#GefSign1 111,{ +geffen,116,58,1 script Geffen Bulletin#Gef1 111,{ mes "^993300- The Geffen Bulletin Reads -^000000"; mes "Remember Wizard's...It's not how many skills you know, it's the magic that counts!"; close; } -geffen,61,174,1 script Sign#GefSign2 111,{ +geffen,61,174,1 script Sign#Gef2 111,{ OnClick: mes "^993300- The Sign Reads -^000000"; mes "- Seems to be written in a language unfamiliar to you -"; close; } -geffen,113,104,1 script Billboard#GefSign3 111,{ +geffen,113,104,1 script Billboard#Gef3 111,{ mes "^993300- The Billboard Reads -^000000"; mes "Selling: Brand new Chon Chon Doll!"; mes "What a great gift to give to a loved one, contact me now!"; @@ -171,7 +172,7 @@ geffen,113,104,1 script Billboard#GefSign3 111,{ close; } -geffen,119,190,1 script Sign Post#GefSign4 111,{ +geffen,119,190,1 script Sign Post#Gef4 111,{ mes "^993300- The Sign Post Reads -^000000"; mes "North to Geffen Fields"; mes "Northeast to Al De Baran"; @@ -185,13 +186,13 @@ geffen,119,190,1 script Sign Post#GefSign4 111,{ close; } -geffen,168,175,1 script Sign#GefSign5 111,{ +geffen,168,175,1 script Sign#Gef5 111,{ mes "^993300- The Sign Reads -^000000"; mes "''Your always welcomed in Geffen''"; close; } -geffen,183,61,1 script Sign#GefSign6 111,{ +geffen,183,61,1 script Sign#Gef6 111,{ mes "^993300- The Sign Reads -^000000"; mes "Welcome."; close; @@ -199,7 +200,7 @@ geffen,183,61,1 script Sign#GefSign6 111,{ // Al De Baran //============================================================ -aldebaran,181,172,1 script Billboard#AldeSign1 111,{ +aldebaran,181,172,1 script Billboard#Alde1 111,{ mes "^993300- The Billboard Reads -^000000"; mes "In Search of:"; mes "I lost my Bongun pet, it wasn't my fault, it just ran away..."; @@ -207,13 +208,13 @@ aldebaran,181,172,1 script Billboard#AldeSign1 111,{ close; } -aldebaran,133,104,1 script Al De Baran Bulletin#AldeSign2 111,{ +aldebaran,133,104,1 script Al De Baran Bulletin#Al2 111,{ mes "^993300- The Al De Baran Bulletin Reads -^000000"; mes "''Enjoy your stay in Al De Baran''"; close; } -aldebaran,54,223,1 script Billboard#AldeSign3 111,{ +aldebaran,54,223,1 script Billboard#Alde3 111,{ mes "^993300- The Billboard Reads -^000000"; mes "Help Wanted:"; mes "We are looking for young, strong and athletic people who are"; @@ -222,14 +223,14 @@ aldebaran,54,223,1 script Billboard#AldeSign3 111,{ close; } -aldebaran,197,228,1 script #AldeSign4 -1,1,1,{ +aldebaran,197,228,1 script #Alde4 -1,1,1,{ OnTouch: mes "[Home Owner]"; mes "Get off my roof you no good leecher!"; close; } -aldebaran,217,222,1 script Sign#AldeSign5 111,{ +aldebaran,217,222,1 script Sign#Alde5 111,{ mes "^993300- The Sign Reads -^000000"; mes "I saw Santa Claus in Lutie!"; mes "- The rest looks like scribble -"; @@ -238,13 +239,13 @@ aldebaran,217,222,1 script Sign#AldeSign5 111,{ // Izlude //============================================================ -izlude,54,139,1 script Sign#IzSign1 111,{ +izlude,54,139,1 script Sign#Iz1 111,{ mes "^993300- The Sign Reads -^000000"; mes "Welcome to the Swordsman Academy."; close; } -izlude,144,148,1 script Sign#IzSign2 111,{ +izlude,144,148,1 script Sign#Iz2 111,{ mes "^993300- The Sign Reads -^000000"; mes "Welcome."; close; @@ -252,19 +253,19 @@ izlude,144,148,1 script Sign#IzSign2 111,{ // Alberta //============================================================ -alberta,35,241,1 script Billboard#AlbSign1 111,{ +alberta,35,241,1 script Billboard#Alb1 111,{ mes "^993300- The Billboard Reads -^000000"; mes "Welcome to Alberta, the Merchant's paradise."; close; } -alberta,37,39,1 script Billboard#AlbSign2 111,{ +alberta,37,39,1 script Billboard#Alb2 111,{ mes "^993300- The Billboard Reads -^000000"; mes "Welcome."; close; } -alberta,99,151,1 script Sign#AlbSign3 111,{ +alberta,99,151,1 script Sign#Alb3 111,{ mes "^993300- The Sign Reads -^000000"; mes "Tools by the Cart full!"; mes "You need tools? We got'em!"; @@ -272,7 +273,7 @@ alberta,99,151,1 script Sign#AlbSign3 111,{ close; } -alberta,196,152,1 script Sign#AlbSign4 111,{ +alberta,196,152,1 script Sign#Alb4 111,{ mes "^993300- The Sign Reads -^000000"; mes "Docking and Shipment times very on load. For information regarding"; mes "Shipping and Receiving, please..."; @@ -280,7 +281,7 @@ alberta,196,152,1 script Sign#AlbSign4 111,{ close; } -alberta,149,54,1 script Sign#AlbSign5 111,{ +alberta,149,54,1 script Sign#Alb5 111,{ mes "^993300- The Sign Reads -^000000"; mes "Welcome."; close; diff --git a/npc/other/powernpc.txt b/npc/other/powernpc.txt index 98479a8d2..230ca6cd9 100644 --- a/npc/other/powernpc.txt +++ b/npc/other/powernpc.txt @@ -3,11 +3,11 @@ //===== By: ================================================== //= KarLaeda (Aegis script cnversion) //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= Athena SVN 9000+ //===== Additional Comments: ================================= -//= +//= 1.1 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ @@ -264,7 +264,7 @@ gon_test,42,89,4 script Summoner#gnp 774,{ end; } -gon_test,46,14,3 script Guide of field of fight#gnp 770,{ +gon_test,46,14,3 script Guide of field of fight 770,{ mes "[SongHeeYeon]"; mes "....."; mes "Hi, there~"; diff --git a/npc/other/pvp.txt b/npc/other/pvp.txt index 8623a80d8..05c56e2e5 100644 --- a/npc/other/pvp.txt +++ b/npc/other/pvp.txt @@ -3,9 +3,9 @@ //===== By: ================================================== //= kobra_k88; L0ne_W0lf //===== Current Version: ===================================== -//= 1.3 +//= 1.4 //===== Compatible With: ===================================== -//= eAthena 0.5.2 + +//= eAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= PvP NPCs that are found in the Inns in major cities. @@ -25,6 +25,7 @@ //= Removed all receptioned for Yoyo mode, with the //= exception of the "Free for all" mode. //= Added PVP event NPCs. +//= 1.4 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ // Morroc @@ -148,7 +149,7 @@ payon_in01,140,53,4 duplicate(PVPGateKeeper) Gate Keeper#pay 83 // PVP Yoyo Mode Staff //============================================================ -pvp_y_room,86,85,4 script Fight Square Reception Staff 105,{ +pvp_y_room,86,85,4 script Fight Square Reception#1 105,{ set .@mapcount_1,getmapusers("pvp_y_8-1"); set .@mapcount_2,getmapusers("pvp_y_8-2"); set .@mapcount_3,getmapusers("pvp_y_8-3"); @@ -195,7 +196,7 @@ S_CheckPVPRoom: // PVP Nightmare Mode Staff //============================================================ -pvp_n_room,30,85,4 script Fight Square Reception Staff 105,{ +pvp_n_room,30,85,4 script Fight Square Reception#2 105,{ set .@mapcount_1,getmapusers("pvp_n_8-1"); set .@mapcount_2,getmapusers("pvp_n_8-2"); set .@mapcount_3,getmapusers("pvp_n_8-3"); @@ -391,7 +392,7 @@ function script F_PVPNarrator { // Event Contestant Entrance //============================================================ -pvp_room,54,85,4 script Combat Square Register Staff 105,{ +pvp_room,54,85,4 script Registration Staff#1 105,{ if (countitem(7028) == 0) { mes "[PVP Combat Square Register Staff]"; mes "Eh? How did you get in here?"; @@ -464,7 +465,7 @@ OnInit: // Spectator Entrance //============================================================ -pvp_room,62,85,4 script Compete Square viewer's entrance::PVPSpectator 105,{ +pvp_room,62,85,4 script Spectator's Entrance#1::PVPSpectator 105,{ if (countitem(7029) == 0) { mes "[PVP Compete Square Register Staff]"; mes "This is the entrance for viewers."; @@ -491,15 +492,15 @@ OnInit: end; } -pvp_room,70,85,4 duplicate(PVPSpectator) Compete Square Register Staff 105 +pvp_room,70,85,4 duplicate(PVPSpectator) Spectator's Entrance#2 105 -pvp_room,78,85,4 duplicate(PVPSpectator) Combat Square Register Staff 105 +pvp_room,78,85,4 duplicate(PVPSpectator) Spectator's Entrance#3 105 -pvp_room,86,85,4 duplicate(PVPSpectator) Combat Square Register Staff 105 +pvp_room,86,85,4 duplicate(PVPSpectator) Spectator's Entrance#4 105 // Spectator Warps //============================================================ -pvp_2vs2,5,4,0 script Combat Square Staff::PVPSpecWarp 45,1,1,{ +pvp_2vs2,5,4,0 script Combat Square Staff#1::PVPSpecWarp 45,1,1,{ OnTouch: mes "[Combat Square Staff]"; mes "May I help you?"; @@ -511,13 +512,13 @@ OnTouch: end; } -pvp_2vs2,5,74,0 duplicate(PVPSpecWarp) Combat Square Staff 45,1,1 +pvp_2vs2,5,74,0 duplicate(PVPSpecWarp) Combat Square Staff#2 45,1,1 -pvp_2vs2,74,74,0 duplicate(PVPSpecWarp) Combat Square Staff 45,1,1 +pvp_2vs2,74,74,0 duplicate(PVPSpecWarp) Combat Square Staff#3 45,1,1 -pvp_2vs2,74,5,0 duplicate(PVPSpecWarp) Combat Square Staff 45,1,1 +pvp_2vs2,74,5,0 duplicate(PVPSpecWarp) Combat Square Staff#4 45,1,1 -pvp_2vs2,40,40,0 script Combat Square Staff 45,1,1,{ +pvp_2vs2,40,40,0 script Combat Square Staff#5 45,1,1,{ set mapmove,0; mes "[Combat Square Staff]"; mes "May I help you?"; @@ -535,7 +536,7 @@ pvp_2vs2,40,40,0 script Combat Square Staff 45,1,1,{ // PVP Area Exit warp //============================================================ -pvp_room,51,19,0 script out 45,4,2,{ +pvp_room,51,19,0 script out#eventpvp 45,4,2,{ OnTouch: mes "[Combat Square Staff]"; mes "Did you have fun in Combat Square?"; diff --git a/npc/quests/Kiel_Hyre_Quest.txt b/npc/quests/Kiel_Hyre_Quest.txt index c8eb041d2..e117c6409 100644 --- a/npc/quests/Kiel_Hyre_Quest.txt +++ b/npc/quests/Kiel_Hyre_Quest.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf (Script), DZeroX (Timer) //===== Current Version: ===================================== -//= 3.5 +//= 3.7 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -70,8 +70,9 @@ //= Note: There are many condition checks that should be omitted in the future fixed item names in item_db.txt / txt resources according the quest //= for items, should be used bitwise methods in a single variable. So let's fix the rest possible bugs (if they exist) and then optimize ^_- //= 3.5 Changed the way the Black Keycard distibuting NPCs work slighty. [L0ne_W0lf] -//= 3.6 Keil Hyre remove3s ALL outstanding quest items when he is talked [L0ne_W0lf] +//= 3.6 Keil Hyre removes ALL outstanding quest items when he is talked [L0ne_W0lf] //= to after finishing the quest. +//= 3.7 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ //============================================================================ // Kiel Hyre Quest/Robotic Lab Dungeon @@ -5347,7 +5348,7 @@ OnTouch: //---------------------------------------------------------------------------- // Mysterious Woman "Mitchell Layla" //---------------------------------------------------------------------------- -kh_mansion,25,79,4 script Mysterious Woman 727,3,3,{ +kh_mansion,25,79,4 script Mysterious Woman#kh 727,3,3,{ L_StartDialog: if (KielHyreQuest == 50) { mes "^3355FFYou awaken with your^000000"; @@ -6795,10 +6796,10 @@ kh_kiehl01,15,177,0 script Robots#kh2::RobotsKHQ 111,{ } kh_kiehl01,15,180,0 duplicate(RobotsKHQ) Robots#kh3 111 kh_kiehl01,15,182,0 duplicate(RobotsKHQ) Robots#kh4 111 -kh_kiehl01,35,187,0 duplicate(RobotsKHQ) Robots#kh1 111 -kh_kiehl01,37,187,0 duplicate(RobotsKHQ) Robots#kh2 111 -kh_kiehl01,39,187,0 duplicate(RobotsKHQ) Robots#kh3 111 -kh_kiehl01,41,187,0 duplicate(RobotsKHQ) Robots#kh4 111 +kh_kiehl01,35,187,0 duplicate(RobotsKHQ) Robots#kh5 111 +kh_kiehl01,37,187,0 duplicate(RobotsKHQ) Robots#kh6 111 +kh_kiehl01,39,187,0 duplicate(RobotsKHQ) Robots#kh7 111 +kh_kiehl01,41,187,0 duplicate(RobotsKHQ) Robots#kh8 111 //---------------------------------------------------------------------------- // Kiehl's Room; Big Door, (Fifth, and final) diff --git a/npc/quests/eye_of_hellion.txt b/npc/quests/eye_of_hellion.txt index ced206819..5706bf434 100644 --- a/npc/quests/eye_of_hellion.txt +++ b/npc/quests/eye_of_hellion.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= MasterOfMuppets //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= eAthena SVN 3422+(Requires jA Script System) //===== Description: ========================================= @@ -14,6 +14,7 @@ //= 1.0 First version [MasterOfMuppets] //= 1.1 a ',' that should be ';' [FlavioJS] //= 1.2 Fixed experience gains to match upcoming rate adjustments. [SinSloth] +//= 1.3 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ geffen,110,200,3 script Sage Welshyun 754,2,2,{ @@ -687,7 +688,7 @@ s_Sorry: } -prontera,224,84,1 script Training Dummy#HellionDummy 111,{ +prontera,224,84,1 script Training Dummy#HelDummy 111,{ if(HELLIONQ == 2)goto s_Hellion; mes "^3151FFIt's a training dummy"; @@ -727,7 +728,7 @@ s_Hellion: } -prt_in,128,79,0 script Unknown Machine#HellionMchn 111,{ +prt_in,128,79,0 script Unknown Machine#HelMchn 111,{ if(HELLIONQ == 6)goto s_Input2; if(HELLIONQ == 5)goto s_Input; mes "^3151FFIt's some sort of"; @@ -1233,7 +1234,7 @@ payon,101,191,1 script #HellionStepAct 139,1,1,{ } -payon,82,109,1 script Pile of Stones#HellionStones 111,{ +payon,82,109,1 script Pile of Stones#HelStones 111,{ if(HELLIONQ != 11)end; mes "[" + strcharinfo(0) + "]"; mes "Well, this is the place"; @@ -1302,7 +1303,7 @@ payon,240,161,1 script Vat#HellionVat 111,{ } -payon,159,130,1 script Wooden Floor#HellionFloor 111,{ +payon,159,130,1 script Wooden Floor#HelFloor 111,{ if(HELLIONQ > 15)goto s_Slab; if(HELLIONQ != 15)end; mes "[" + strcharinfo(0) + "]"; @@ -1381,7 +1382,7 @@ s_Slab: } -pay_arche,141,29,1 script Buddha Statue#HellionStat 111,3,3,{ +pay_arche,141,29,1 script Buddha Statue#HelStat 111,3,3,{ if(HELLIONQ != 17)end; mes "[" + strcharinfo(0) + "]"; mes "Hey, there's a huge"; diff --git a/npc/quests/quests_airship.txt b/npc/quests/quests_airship.txt index dae522872..7bfaf1108 100644 --- a/npc/quests/quests_airship.txt +++ b/npc/quests/quests_airship.txt @@ -3,7 +3,7 @@ //===== By: ================================================== // Samuray22 //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -18,6 +18,7 @@ //= 1.1 Added Heart Fragment quest. [SinSloth] //= 1.2 Change the laboratory code text to make it easier to //= understand. [SinSloth] +//= 1.3 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ //=======================================================================================================// @@ -853,7 +854,7 @@ function script cherno { //========Unidentified Machine #1 and #2======================= -ein_in01,127,94,5 script Unidentified Machine#machine1 111,{ +ein_in01,127,94,5 script Unidentified Machine#mac 111,{ callfunc "Machine"; } ein_in01,122,103,5 script Unidentified Machine 111,{ @@ -1007,7 +1008,7 @@ function script diary { //====================Expert Repairman============================= -ein_in01,117,80,5 script Unidentified Machine 111,{ +ein_in01,117,80,5 script Unidentified Machine#as 111,{ if(kain_ticket > 12) { mes "["+strcharinfo(0)+"]"; mes "This is the"; @@ -3122,6 +3123,6 @@ airplane_01,245,48,0 duplicate(boom) boom#air-5 139 airplane_01,235,39,0 duplicate(boom) boom#air-6 139 airplane_01,252,41,0 duplicate(boom) boom#air-7 139 airplane_01,252,63,0 duplicate(boom) boom#air-8 139 -airplane_01,234,65,0 duplicate(boom) boom#air-9::boom 139 -airplane_01,227,67,0 duplicate(boom) boom#air-10::boom 139 -airplane_01,249,50,0 duplicate(boom) boom#air-0::boom 139 +airplane_01,234,65,0 duplicate(boom) boom#air-9 139 +airplane_01,227,67,0 duplicate(boom) boom#air-10 139 +airplane_01,249,50,0 duplicate(boom) boom#air-0 139 diff --git a/npc/quests/quests_ayothaya.txt b/npc/quests/quests_ayothaya.txt index 96b3cc128..0a13ab861 100644 --- a/npc/quests/quests_ayothaya.txt +++ b/npc/quests/quests_ayothaya.txt @@ -3,7 +3,7 @@ //===== By =================================================== //= Fredzilla, MasterOfMuppets //===== Version ============================================== -//= 1.8 +//= 1.9 //===== Compatible With ====================================== //= eAthena 1.0 //===== Description ========================================== @@ -30,6 +30,7 @@ //= Shrimp, Dungeon, Tom Yum Goong [Evera] //= 1.7 Updated the Ayothaya Ring quest to the official one [MasterOfMuppets] //= 1.8 Fixed experience gains to match upcoming rate adjustments. [SinSloth] +//= 1.9 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ //============================================================ @@ -2590,7 +2591,7 @@ s_Busy: close; } -ayothaya,213,95,7 script Merchant 841,{ +ayothaya,213,95,7 script Merchant#chili 841,{ if(tomyumgoong == 4)goto s_Chili; s_JumpBack: mes "[Merchant Thongdum]"; diff --git a/npc/quests/quests_comodo.txt b/npc/quests/quests_comodo.txt index b86d8d692..1f0ecf1be 100644 --- a/npc/quests/quests_comodo.txt +++ b/npc/quests/quests_comodo.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88; L0ne_W0lf //===== Current Version: ===================================== -//= 1.3 +//= 1.4 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -23,6 +23,7 @@ //= 1.2 Added more quest from cities/comodo.txt [Evera] //= 1.2a missing label [Lupus] //= 1.3 Doomed sword quest rescripted to Aegis 10.3 standards. [L0ne_W0lf] +//= 1.4 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ // Headgear Quests 1 @@ -757,7 +758,7 @@ comodo,216,310,4 script BBQ Papa#cmd::CmdFamily 50,{ comodo,215,307,4 duplicate(CmdFamily) BBQ Mama#cmd 74 -comodo,213,310,4 duplicate(CmdFamily) BBQ Boy#cmd 706 +comodo,213,310,4 duplicate(CmdFamily) BBQ Boy#cmd2 706 cmd_in02,32,140,4 script Chief#cmd 49,{ if (dmdswrd_Q > 4) { diff --git a/npc/quests/quests_hugel.txt b/npc/quests/quests_hugel.txt index d4a2611a6..574ffff16 100644 --- a/npc/quests/quests_hugel.txt +++ b/npc/quests/quests_hugel.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= MasterOfMuppets & SinSloth //===== Current Version: ===================================== -//= 1.4 +//= 1.5 //===== Compatible With: ===================================== //= eAthena //===== Description: ========================================= @@ -16,6 +16,7 @@ //= 1.3 Added a Missing "close;". [Samuray22] //= -Thanks to Elfange //= 1.4 Fixed experience gains to match upcoming rate adjustments. [SinSloth] +//= 1.5 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ //------------------------------------------------------------------------- @@ -3343,7 +3344,7 @@ lhz_in03,39,44,3 script Enquro Carson 97,{ } -hu_in01,310,380,5 script Girl 891,{ +hu_in01,310,380,5 script Girl#hugel 891,{ if(hg_tre < 47) { @@ -10466,7 +10467,7 @@ OnTouch: } } -hugel,209,109,2 script Boatman 709,{ +hugel,209,109,2 script Boatman#hugel 709,{ mes "[Boatman]"; mes "Ah, hello~"; diff --git a/npc/quests/quests_juperos.txt b/npc/quests/quests_juperos.txt index 8cde9bbee..1a38aead7 100644 --- a/npc/quests/quests_juperos.txt +++ b/npc/quests/quests_juperos.txt @@ -3,7 +3,7 @@ //===== By =================================================== //= MasterOfMuppets //===== Version ============================================== -//= 1.1 +//= 1.2 //===== Compatible With ====================================== //= eAthena 1.0 //===== Description ========================================== @@ -12,6 +12,7 @@ //= 1.0 First version, partly implemented [MasterOfMuppets] //= 1.1 Added official Juperos Ruins History Quest. Thanks //= to Keplerk for his first version. [SinSloth] +//= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ yuno_in04,190,125,4 script Scholar 700,{ @@ -1285,7 +1286,7 @@ yuno_in04,186,125,4 script Bundle of Files 111,{ } } -yuno_in04,188,118,4 script Book 111,{ +yuno_in04,188,118,4 script Book#juperos 111,{ if(yuno_hist > 7) { @@ -1347,7 +1348,7 @@ yuno_in04,188,118,4 script Book 111,{ // Bronze Statue - juperos_01 99 112 -juperos_01,99,112,4 script Bronze Statue 844,{ +juperos_01,99,112,4 script Bronze Statue#1 844,{ if(yuno_hist > 3) { @@ -1713,7 +1714,7 @@ juperos_01,123,92,4 script Stone Statue 844,{ close; } -juperos_01,99,71,4 script Bronze Statue 844,{ +juperos_01,99,71,4 script Bronze Statue#2 844,{ mes "^3355FFIt's an elaborate"; mes "bronze statue that"; diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt index 01c063847..b4a6ac3f7 100644 --- a/npc/quests/quests_lighthalzen.txt +++ b/npc/quests/quests_lighthalzen.txt @@ -61,6 +61,7 @@ //= 3.5 Touch-ups to the Friendship quest. Added EXP reward. [L0ne_W0lf] //= Added cutins for "Maku" npc, and changed "set HP" to percentheal. //= 3.5a Adjusted EXP given by "Benkasttein" to be the same as that given by Maku. [L0ne_W0lf] +//= 3.6 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ lighthalzen,1,1,7 script sneakAddSuber -1,{ @@ -747,7 +748,7 @@ L_DONE: //--------------------------Documents-------------------------- -lhz_cube,237,198,0 script Documents 111,{ +lhz_cube,237,198,0 script Documents#lhz 111,{ if (MISC_QUEST&512 || cubekey&2) goto L_DONE; mes "There are tons of documents here."; next; @@ -2567,7 +2568,7 @@ s_Ask: } -yuno_in04,168,117,1 script Book 111,{ +yuno_in04,168,117,1 script Book#lhz 111,{ if(friendship3 >= 3)goto Book2; if(friendship3 == 2)goto Book; @@ -4532,7 +4533,7 @@ L_History: close; } -lhz_in01,27,247,5 script Representative 71,{ +lhz_in01,27,247,5 script Representative#lhz 71,{ if(lhz_curse > 6) { @@ -8409,7 +8410,7 @@ OnInit: end; } -lhz_in01,93,45,4 script Researcher 865,{ +lhz_in01,93,45,4 script Researcher#1 865,{ if(lhz_boss < 28) { @@ -8511,7 +8512,7 @@ lhz_in01,93,45,4 script Researcher 865,{ } } -lhz_in01,285,169,3 script Researcher 865,{ +lhz_in01,285,169,3 script Researcher#2 865,{ if(checkweight(7349,1) != 1) { diff --git a/npc/quests/quests_louyang.txt b/npc/quests/quests_louyang.txt index 1011496d3..0728b30b9 100644 --- a/npc/quests/quests_louyang.txt +++ b/npc/quests/quests_louyang.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Evera and The eAthena Dev Team //===== Current Version: ===================================== -//= 1.3 +//= 1.4 //===== Compatible With: ===================================== //= eAthena 1.0 //===== Description: ========================================= @@ -14,6 +14,7 @@ //= 1.1 Fixed double levelup bug [Lupus] //= 1.2 Added Revolution Quest. [SinSloth] //= 1.3 Fixed experience gains to match upcoming rate adjustments. [SinSloth] +//= 1.4 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ //============================================================ @@ -3587,7 +3588,7 @@ lou_in01,43,147,3 script Gunpowder Expert 750,{ } } -lou_in01,45,138,3 script Soldier 825,{ +lou_in01,45,138,3 script Soldier#1 825,{ if(countitem(7204)) { @@ -3607,7 +3608,7 @@ lou_in01,45,138,3 script Soldier 825,{ end; } -lou_in01,82,139,7 script Soldier 825,{ +lou_in01,82,139,7 script Soldier#2 825,{ if(countitem(7068) || countitem(7096) || countitem(7004)) { diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt index 35dc8615d..f362a8098 100644 --- a/npc/quests/quests_morocc.txt +++ b/npc/quests/quests_morocc.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== -//= 1.8 +//= 1.9 //===== Compatible With: ===================================== //= eAthena 7.15 + //===== Description: ========================================= @@ -19,6 +19,7 @@ //= 1.6a replaced item "names" with item id. [Lupus] //= 1.7 Fixed a bug with XP rewards. [SinSloth] //= 1.8 Fixed a bug which prevented reset of events. [SinSloth] +//= 1.9 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ @@ -72,7 +73,7 @@ morocc_in,142,100,4 script Pierce 89,{ //==================================================================================// // Binoculars Quest //==================================================================================// -morocc_in,76,163,4 script Marius 64,5,5{ +morocc_in,76,163,4 script Marius#binos 64,5,5{ mes "[Marius]"; mes "Ha! Ha! Ha! Another customer coming!"; mes "I know what you are gonna say."; @@ -142,7 +143,7 @@ morocc_in,76,163,4 script Marius 64,5,5{ // Dandelion's Request / Morocc Invasion quest //==================================================================================// -izlude,103,106,3 script Guildsman 48,3,3,{ +izlude,103,106,3 script Guildsman#1 48,3,3,{ if(checkweight(7416,1) != 1) { @@ -572,7 +573,7 @@ OnTouch: } } -prontera,237,313,3 script Nun 79,3,3,{ +prontera,237,313,3 script Nun#moc 79,3,3,{ if(checkweight(7416,1) != 1) { @@ -767,7 +768,7 @@ OnTouch: } } -alberta,129,59,3 script Guildsman 49,3,3,{ +alberta,129,59,3 script Guildsman#2 49,3,3,{ if(checkweight(7416,1) != 1) { @@ -1750,7 +1751,7 @@ OnTouch: } } -payon,231,323,3 script Guildsman 59,3,3,{ +payon,231,323,3 script Guildsman#3 59,3,3,{ if(checkweight(7416,1) != 1) { @@ -2489,7 +2490,7 @@ OnTouch: } } -que_job01,65,50,1 script #maobar4 45,2,2,{ +que_job01,65,50,1 script #maobar4-2 45,2,2,{ OnTouch: warp "que_job01",84,77; diff --git a/npc/quests/quests_prontera.txt b/npc/quests/quests_prontera.txt index c4beb255e..ca1e81472 100644 --- a/npc/quests/quests_prontera.txt +++ b/npc/quests/quests_prontera.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88; L0ne_W0lf //===== Current Version: ===================================== -//= 1.9 +//= 2.0 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -33,6 +33,7 @@ //= 1.7c replaced item "names" with item id. [Lupus] //= 1.8 Fixed experience gains to match upcoming rate adjustments. [SinSloth] //= 1.9 Fixed "him" -> "her" in Ph.D hat quest. THansk to yyCC. [L0ne_W0lf] +//= 2.0 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ // Prontera Culvert @@ -1771,7 +1772,7 @@ mjolnir_01,313,269,5 script Dazed Boy#prt 706,{ } } -mjolnir_01,316,268,3 script Exhausted-Looking Woman#prt 879,{ +mjolnir_01,316,268,3 script Exhausted-Looking Woman 879,{ //var max_max_c1 = CheckMaxCount 1201 1 //if (max_max_c1 == 1) { // mes "^3355FFWait a second!"; @@ -3202,7 +3203,7 @@ prt_church,24,111,5 script #prince3 887,{ } } -moc_fild16,201,295,5 script Assassin Guildsman#poison 884,{ +moc_fild16,201,295,5 script Assassin Guildsman#poiso 884,{ if (prt_curse == 23) { mes "[Assassin Guildsman]"; mes "What business"; diff --git a/npc/quests/quests_rachel.txt b/npc/quests/quests_rachel.txt index bc12a3e02..7360c41d5 100644 --- a/npc/quests/quests_rachel.txt +++ b/npc/quests/quests_rachel.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 2.0 +//= 2.1 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -49,6 +49,7 @@ //= the ontouch "key". Thanks to Gepard for pointing them out. //= 1.9 Fixed a misorder with variable checkings. [SinSloth] //= 2.0 Fixed experience gains to match upcoming rate adjustments. [SinSloth] +//= 2.1 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ // Lost Child Quest (Prerequisite to High Priest quest) @@ -932,7 +933,7 @@ rachel,138,73,5 script Idle Merchant#ra_in01 85,{ } -rachel,120,47,3 script Idle Merchant#ra_in01 85,{ +rachel,120,47,3 script Idle Merchant#ra_in01_2 85,{ if ((lost_boy < 5) || (lost_boy > 6)) { mes "[Idle Merchant]"; mes "I'm thinking of quitting"; @@ -3871,7 +3872,7 @@ OnEnable: // Donation Lottery Quest/High Priest Quest //============================================================ -ra_temple,119,180,0 script Temple Entrance#ra_temple 45,1,1,{ +ra_temple,119,180,0 script Temple Entrance#ra_tem 45,1,1,{ OnTouch: if ($rachel_donate >= 10000) { if (MISC_QUEST & 8192) { warp "ra_temin",169,23; end; } @@ -4872,7 +4873,7 @@ que_rachel,180,37,0 duplicate(nemma01) nemma03 -1,5,5 que_rachel,165,37,0 duplicate(nemma01) nemma04 -1,5,5 que_rachel,160,37,0 duplicate(nemma01) nemma05 -1,5,5 -que_rachel,169,18,0 script Quest Temple Exit#ra_temple 45,2,2,{ +que_rachel,169,18,0 script Quest Temple Exit#ra_tem 45,2,2,{ mes "^3355FFThe gate is closed.^000000"; next; @@ -6522,7 +6523,7 @@ OnTimer120000: } -rachel,163,152,0 script imir3#rachel -1,3,3,{ +rachel,163,152,0 script imir3#rachel2 -1,3,3,{ OnTouch: if (ra_tem_q == 22) { mes "^3355FFYou feel a slight headache"; diff --git a/npc/quests/seals/brisingamen_seal.txt b/npc/quests/seals/brisingamen_seal.txt index 5a62ba799..2dabc6d71 100644 --- a/npc/quests/seals/brisingamen_seal.txt +++ b/npc/quests/seals/brisingamen_seal.txt @@ -3,14 +3,15 @@ //===== By: ================================================== //= SinSloth //===== Current Version: ===================================== -//= 1.0a +//= 1.1 //===== Compatible With: ===================================== //= eAthena //===== Description: ========================================= //= Quest for breaking the seal of Brisingamen. //===== Additional Comments: ================================= -// 1.0 First version. Thanks to SinSloth for scripting it. [MasterOfMuppets] -// 1.0a Removed duplicates [Toms] +//= 1.0 First version. Thanks to SinSloth for scripting it. [MasterOfMuppets] +//= 1.0a Removed duplicates [Toms] +//= 1.1 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ prt_fild08,175,374,3 script Bard#brising 51,{ @@ -2832,7 +2833,7 @@ prt_church,113,103,1 script Praying Man 798,{ } -prt_castle,80,52,0 script Personnel Record#hiddenbook1 111,{ +prt_castle,80,52,0 script Personnel Record#book1 111,{ if($God2 < 50) { diff --git a/npc/quests/skills/bard_skills.txt b/npc/quests/skills/bard_skills.txt index 88efc87f0..f6a7b964d 100644 --- a/npc/quests/skills/bard_skills.txt +++ b/npc/quests/skills/bard_skills.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Lupus, Reddozen; L0ne_W0lf //===== Current Version: ===================================== -//= 1.4a +//= 1.5 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -22,6 +22,7 @@ //= 1.3b Split into different files [DracoRPG] //= 1.4 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] //= 1.4a Checks the proper variable now. (bard_q -> gef_bard_q) [L0ne_W0lf] +//= 1.5 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ prontera,174,328,3 script Young Man#bard_q1 89,3,3,{ @@ -376,7 +377,7 @@ OnTouch: end; } -morocc_in,169,72,7 script Spiteful-Looking Bard#skill_bard02 741,3,3,{ +morocc_in,169,72,7 script Spiteful-Looking Bard#bs 741,3,3,{ if (BaseJob == Job_Bard) { if (Class == Job_Clown && qskill_bard == 9) { if (getskilllv(1010) != 0) { diff --git a/npc/quests/skills/novice_skills.txt b/npc/quests/skills/novice_skills.txt index f67ff249a..1e513be95 100644 --- a/npc/quests/skills/novice_skills.txt +++ b/npc/quests/skills/novice_skills.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== -//= 1.5 +//= 1.6 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -11,6 +11,7 @@ //= Quest for skills: First Aid, Trick Dead //===== Additional Comments: ================================= //= 1.5 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf] +//= 1.6 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ prt_in,234,133,4 script Nami#qsk_nv 66,{ @@ -365,7 +366,7 @@ prt_in,73,87,4 script Chivalry Member#qsk_nv 65,{ } } -prt_castle,175,146,4 script Nursing Instructor#qsk_nv 50,{ +prt_castle,175,146,4 script Nursing Instructor#qsk_n 50,{ mes "[Dread Lord]"; mes ". . . . . . . . . ."; mes ". . . . . . . . . ."; diff --git a/npc/quests/thana_quest.txt b/npc/quests/thana_quest.txt index 138d3b276..2d3349ebe 100644 --- a/npc/quests/thana_quest.txt +++ b/npc/quests/thana_quest.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= [Ishizu-chan] //===== Current Version: ===================================== -//= 1.7 +//= 1.8 //===== Compatible With: ===================================== //= Any eAthena Version i guess? //===== Description: ========================================= @@ -19,6 +19,7 @@ //= 1.5 Fixed a bug in the number part of the quest. [SinSloth] //= 1.6 Fixed experience gains to match upcoming rate adjustments. [SinSloth] //= 1.7 Fixed a minor bug with prevented code part from reseting properly. [SinSloth] +//= 1.8 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ hu_fild01,140,163,5 script Tower Keeper 852,3,3,{ @@ -420,7 +421,7 @@ L_Ask1: close; } -tha_t01,140,78,4 script Guide 831,{ +tha_t01,140,78,4 script Guide#thana 831,{ if(!thana_quest) { @@ -756,7 +757,7 @@ OnTimer30000: end; } -tha_t03,67,70,0 script Machine Device 111,{ +tha_t03,67,70,0 script Machine Device#thana1 111,{ if((countitem(7421)) || (countitem(7426))) { @@ -877,7 +878,7 @@ tha_t03,67,70,0 script Machine Device 111,{ close; } -tha_t04,195,195,0 script Machine Device 111,{ +tha_t04,195,195,0 script Machine Device#thana2 111,{ if((countitem(7422)) || (countitem(7427))) { @@ -1046,7 +1047,7 @@ L_Input: goto L_Input; } -tha_t05,101,37,0 script Machine Device 111,{ +tha_t05,101,37,0 script Machine Device#thana3 111,{ if((countitem(7423)) || (countitem(7428))) { @@ -1148,7 +1149,7 @@ tha_t05,101,37,0 script Machine Device 111,{ } } -tha_t06,43,152,0 script Machine Device 111,{ +tha_t06,43,152,0 script Machine Device#thana4 111,{ if((countitem(7424)) || (countitem(7429))) { @@ -1447,7 +1448,7 @@ tha_t09,19,158,0 script Machine Device 111,{ close; } -tha_t04,150,44,0 script Seal 111,{ +tha_t04,150,44,0 script Seal#thana1 111,{ if(!countitem(7423)) { @@ -1522,7 +1523,7 @@ tha_t04,150,44,0 script Seal 111,{ } } -tha_t05,218,116,0 script Seal 111,{ +tha_t05,218,116,0 script Seal#thana2 111,{ if(!countitem(7421)) { @@ -1597,7 +1598,7 @@ tha_t05,218,116,0 script Seal 111,{ } } -tha_t06,226,230,0 script Seal 111,{ +tha_t06,226,230,0 script Seal#thana3 111,{ if(!countitem(7425)) { @@ -1673,7 +1674,7 @@ tha_t06,226,230,0 script Seal 111,{ } } -tha_t07,113,129,0 script Seal 111,{ +tha_t07,113,129,0 script Seal#thana4 111,{ if(!countitem(7422)) { @@ -1837,7 +1838,7 @@ tha_t10,129,159,0 script Seal 111,{ } } -tha_t12,96,58,0 script Stone Statue 111,{ +tha_t12,96,58,0 script Stone Statue#thana1 111,{ if(!$@thana_summon) { @@ -1903,7 +1904,7 @@ tha_t12,96,58,0 script Stone Statue 111,{ } } -tha_t12,104,18,0 script Stone Statue 111,{ +tha_t12,104,18,0 script Stone Statue#thana2 111,{ if($@thana_summon == 2) { @@ -1961,7 +1962,7 @@ tha_t12,104,18,0 script Stone Statue 111,{ } } -tha_t12,128,86,0 script Stone Statue 111,{ +tha_t12,128,86,0 script Stone Statue#thana3 111,{ if($@thana_summon == 3) { @@ -2018,7 +2019,7 @@ tha_t12,128,86,0 script Stone Statue 111,{ } } -tha_t12,161,58,0 script Stone Statue 111,{ +tha_t12,161,58,0 script Stone Statue#thana4 111,{ if($@thana_summon == 1) { @@ -2076,7 +2077,7 @@ tha_t12,161,58,0 script Stone Statue 111,{ } } -tha_t12,154,18,0 script Stone Statue 111,{ +tha_t12,154,18,0 script Stone Statue#thana5 111,{ if($@thana_summon == 4) { diff --git a/npc/warps/cities/amatsu.txt b/npc/warps/cities/amatsu.txt index 0a8858978..e995c8636 100644 --- a/npc/warps/cities/amatsu.txt +++ b/npc/warps/cities/amatsu.txt @@ -4,7 +4,7 @@ //= Athena (1.0) //= Nana (1.1) //===== Current Version: ===================================== -//= 1.4 +//= 1.5 //===== Compatible With: ===================================== //= Any Athena Version; RO Episode 6+ //===== Description: ========================================= @@ -12,6 +12,7 @@ //===== Additional Comments: ================================= //= 1.3 Fixed a warp-back [erKURITA] //= 1.4 Added Ninja's Warps. Thanks to RockmanEXE for the info. [erKURITA] +//= 1.5 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ //= Amatsu =================================================== @@ -27,10 +28,10 @@ ama_in01,77,177,0 warp warp1967 1,1,amatsu,246,160 ama_in01,86,23,0 warp warp2009 1,1,amatsu,129,117 ama_in01,88,94,0 warp warp2008 1,1,amatsu,52,145 ama_in02,127,163,0 warp warp1980 1,1,ama_in02,220,161 -ama_in02,195,44,0 warp warp1973 1,1,ama_in02,65,40 +ama_in02,195,44,0 warp warp1973a 1,1,ama_in02,65,40 ama_in02,215,150,0 warp warp1978 1,1,ama_in02,59,156 ama_in02,222,161,0 warp warp1979 1,1,ama_in02,130,163 -ama_in02,227,45,0 warp warp1973 1,1,amatsu,88,235 +ama_in02,227,45,0 warp warp1973b 1,1,amatsu,88,235 ama_in02,56,44,0 warp warp1975 1,1,ama_in02,59,144 ama_in02,59,142,0 warp warp1976 1,1,ama_in02,56,41 ama_in02,59,159,0 warp warp1977 1,1,ama_in02,215,152 diff --git a/npc/warps/cities/nameless.txt b/npc/warps/cities/nameless.txt index d9590aaa5..d57c697b4 100644 --- a/npc/warps/cities/nameless.txt +++ b/npc/warps/cities/nameless.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= $ephiroth //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= Any Athena Version //===== Description: ========================================= @@ -11,6 +11,7 @@ //===== Additional Comments: ================================= //= 1.0 Initial version [$ephiroth] //= 1.1 Added SinSloth's warper to this file [Playtester] +//= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ nameless_n,157,184,0 warp namelesswarp0401 1,1,abbey01,51,12 @@ -23,7 +24,7 @@ nameless_in,12,169,0 warp namelesswarp1006 1,1,nameless_i,82,256 nameless_i,78,94,0 warp namelesswarp1007 1,1,nameless_in,96,180 nameless_in,96,177,0 warp namelesswarp1008 1,1,nameless_i,81,96 -ve_fild07,128,131,3 script Desert Coast Man 943,{ +ve_fild07,128,131,3 script Desert Coast Man#na 943,{ mes "[Desert Coast Sailor]"; mes "Hey you! Yes, you!"; diff --git a/npc/warps/cities/niflheim.txt b/npc/warps/cities/niflheim.txt index 58824938f..61dffb504 100644 --- a/npc/warps/cities/niflheim.txt +++ b/npc/warps/cities/niflheim.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= PKGINGO (1.0) //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= Any Athena Version; RO Episode 6+ //===== Description: ========================================= @@ -12,6 +12,7 @@ //= Extracted from Vidar -> Athena //= V1.1: Added Inn and House warps needed for the Piano //= Quest. [Skotlex +//= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ //Niflheim Fields @@ -31,12 +32,12 @@ niflheim,219,199,0 warp nwarp13 1,1,nif_in,136,14 nif_in,134,12,0 warp nwarp14 1,1,niflheim,218,197 //House -niflheim,190,241,0 warp nwarp19 1,1,nif_in,81,77 -nif_in,78,74,0 warp nwarp20 1,1,niflheim,187,241 +niflheim,190,241,0 warp nwarp19a 1,1,nif_in,81,77 +nif_in,78,74,0 warp nwarp20a 1,1,niflheim,187,241 //Inn -niflheim,189,211,0 warp nwarp21 1,1,nif_in,20,14 -nif_in,23,12,0 warp nwarp22 1,1,niflheim,189,207 +niflheim,189,211,0 warp nwarp21a 1,1,nif_in,20,14 +nif_in,23,12,0 warp nwarp22a 1,1,niflheim,189,207 nif_in,34,34,0 warp nwarp23 1,1,nif_in,88,31 nif_in,88,29,0 warp nwarp24 1,1,nif_in,34,31 diff --git a/npc/warps/cities/prontera.txt b/npc/warps/cities/prontera.txt index eb1c1ff29..e22d27c39 100644 --- a/npc/warps/cities/prontera.txt +++ b/npc/warps/cities/prontera.txt @@ -4,7 +4,7 @@ //= Athena (1.0) //= Nana (1.2) //===== Current Version: ===================================== -//= 1.4 +//= 1.5 //===== Compatible With: ===================================== //= Any Athena Version //===== Description: ========================================= @@ -12,6 +12,7 @@ //===== Additional Comments: ================================= //= 1.3 prt19 warp fix [shadow] //= 1.4 Added warps for the sign quest [MasterOfMuppets] +//= 1.5 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ //= Prontera City ============================================ @@ -60,11 +61,11 @@ prt_in,48,65,0 warp prt18-1 1,3,prt_in,34,65 prt_in,53,105,0 warp prt03-1 1,2,prontera,136,186 prt_in,60,77,0 warp prt06-1 2,1,prontera,175,188 prt_in,68,130,0 warp prt08-1 2,1,prontera,204,188 -prt_in,69,65,0 warp prt19 1,3,prt_in,84,65 +prt_in,69,65,0 warp prt19a 1,3,prt_in,84,65 prt_in,70,143,0 warp prt20 2,1,prt_in,70,165 prt_in,70,162,0 warp prt20-1 2,1,prt_in,70,140 prt_in,80,113,0 warp prt11-1 2,1,prontera,48,343 -prt_in,82,65,0 warp prt19 1,3,prt_in,66,65 +prt_in,82,65,0 warp prt19b 1,3,prt_in,66,65 prt_in,227,15,0 warp prt20-2 2,2,prontera,263,275 //= Prontera Church ========================================== diff --git a/npc/warps/dungeons/alde_ct.txt b/npc/warps/dungeons/alde_ct.txt index a8dcef359..c4c44ec53 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.4 +//= 1.5 //===== Compatible With: ===================================== //= Any Athena Version; RO Episode 2+ //===== Description: ========================================= @@ -12,6 +12,7 @@ //= Split off Aldebaran.txt 1.1 fixed clt007 warp //= 1.3 Optimized [Lupus] //= 1.4 Removed Duplicates [Silent] +//= 1.5 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ //= Al De Baran Clock Tower @@ -156,8 +157,8 @@ c_tower4,189,40,4 script clt031r 45,2,2,{ //============================================================ //============================================================ alde_dun01,292,306,0 warp aldd01 2,1,alde_dun02,43,24 -alde_dun01,167,158,0 warp ald002 2,2,c_tower2,148,283 -alde_dun01,302,25,0 warp ald003 2,2,c_tower1,125,22 +alde_dun01,167,158,0 warp ald002a 2,2,c_tower2,148,283 +alde_dun01,302,25,0 warp ald003a 2,2,c_tower1,125,22 alde_dun02,43,20,0 warp aldd04 1,1,alde_dun01,292,300 alde_dun02,279,250,0 warp aldd05 2,2,alde_dun03,18,267 alde_dun02,122,169,0 warp ald006 2,2,c_tower3,47,41 diff --git a/npc/warps/dungeons/umbala_dun.txt b/npc/warps/dungeons/umbala_dun.txt index 9f3ce3000..e786b7a0e 100644 --- a/npc/warps/dungeons/umbala_dun.txt +++ b/npc/warps/dungeons/umbala_dun.txt @@ -3,13 +3,13 @@ //===== By: ================================================== //= Darkchild (1.0vA); Athena (1.0vB) //===== Current Version: ===================================== -//= 1.1 (Akaru) +//= 1.2 (Akaru) //===== Compatible With: ===================================== //= Any Athena Version; RO Episode 6+ //===== Description: ========================================= //= Warp Points for Umbala Dungeon (Yggdrasil Cave) //===== Additional Comments: ================================= -//= No comment! +//= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ //= Dungeon Level 1 ========================================== @@ -26,8 +26,8 @@ um_dun02,216,77,0 warp umba0018 1,1,um_dun02,217,88 um_dun02,216,84,0 warp umba0017 1,1,um_dun02,214,74 um_dun02,222,259,0 warp umba0015 1,1,um_dun02,234,255 um_dun02,231,255,0 warp umba0016 1,1,um_dun02,219,260 -um_dun02,25,244,0 warp umba0022 1,1,um_dun02,35,251 +um_dun02,25,244,0 warp umba0022a 1,1,um_dun02,35,251 um_dun02,33,249,0 warp umba0021 1,1,um_dun02,23,242 -um_dun02,51,26,0 warp umba0022 1,1,um_dun01,153,201 +um_dun02,51,26,0 warp umba0022b 1,1,um_dun01,153,201 um_dun02,60,88,0 warp umba0023 1,1,um_dun02,66,77 um_dun02,63,80,0 warp umba0024 1,1,um_dun02,59,92 diff --git a/npc/warps/fields/abyss_warper.txt b/npc/warps/fields/abyss_warper.txt index f927f8b22..d916d224a 100644 --- a/npc/warps/fields/abyss_warper.txt +++ b/npc/warps/fields/abyss_warper.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= erKURITA //===== Current Version: ===================================== -//= 1.3a +//= 1.4 //===== Compatible With: ===================================== //= Any Athena Version //===== Description: ========================================= @@ -14,9 +14,10 @@ //= 1.2 Fixed tab - missing pillar's appeared [Lupus] //= 1.3 Updated Abyss Lake entrance based on official [SinSloth] //= 1.3a Removed .GATs [Lupus] +//= 1.4 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ -hu_fild05,168,304,0 script Column 111,{ +hu_fild05,168,304,0 script Column#abyss1 111,{ mes "^3355FFThere are 3 oddly"; mes "shaped grooves on"; @@ -85,7 +86,7 @@ hu_fild05,168,304,0 script Column 111,{ close; } -hu_fild05,171,211,0 script Column 111,1,1,{ +hu_fild05,171,211,0 script Column#abyss2 111,1,1,{ mes "^3355FFThis column looks"; mes "very similar to the"; diff --git a/npc/warps/fields/glastheim.txt b/npc/warps/fields/glastheim.txt index adfcd9179..1564710da 100644 --- a/npc/warps/fields/glastheim.txt +++ b/npc/warps/fields/glastheim.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== -//= 1.3 +//= 1.4 //===== Compatible With: ===================================== //= Any Athena Version; RO Episode 2.x //===== Description: ========================================= @@ -11,6 +11,7 @@ //===== Additional Comments: ================================= //= Split off npc_warp.txt, 1.1 added gl18-2 [Lupus] //= optimized random warp [Lupus] fixed looped warps +//= 1.4 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ //Glastheim @@ -19,7 +20,7 @@ gl_cas01,135,40,0 warp gl01 1,1,gl_cas01,144,314 gl_cas01,149,314,0 warp gl02 1,1,gl_prison,14,70 gl_cas01,167,191,0 warp gl03 1,1,gl_prison,14,70 gl_cas01,185,236,0 warp gl06 1,1,gl_cas01,163,191 -gl_cas01,200,165,0 warp gl10 1,1,gl_cas02,104,25 +gl_cas01,200,165,0 warp gl10a 1,1,gl_cas02,104,25 gl_cas01,200,18,0 warp gl7-1 2,2,glast_01,200,294 gl_cas01,215,236,0 warp gl07 1,1,gl_cas01,238,192 gl_cas01,234,192,0 warp gl04 1,1,gl_prison,14,70 @@ -28,7 +29,7 @@ gl_cas01,372,39,0 warp gl08 1,1,gl_cas01,367,301 gl_cas02,104,15,0 warp gl10-1 1,1,gl_cas01,200,160 gl_cas02,104,193,0 warp gl8-1 1,1,glast_01,199,325 gl_church,156,4,0 warp gl9-1 1,1,glast_01,200,134 -gl_church,16,299,0 warp gl11 1,1,gl_chyard,147,284 +gl_church,16,299,0 warp gl11a 1,1,gl_chyard,147,284 gl_church,301,46,0 warp gl12 1,1,gl_chyard,147,15 gl_chyard,12,149,0 warp gl22 1,1,gl_sew02,29,270 gl_chyard,147,12,0 warp gl12-1 1,1,gl_church,295,46 diff --git a/npc/warps/fields/hugel_fild.txt b/npc/warps/fields/hugel_fild.txt index 2b7053cca..d8d9d2e41 100644 --- a/npc/warps/fields/hugel_fild.txt +++ b/npc/warps/fields/hugel_fild.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Sara-chan (1.0) //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= Any Athena Version; RO Episode 10+ //===== Description: ========================================= @@ -11,6 +11,7 @@ //===== Additional Comments: ================================= //= Initial Release //= 1.1 Official warps [Playtester] +//= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ //= Hugel Field ============================================== @@ -18,8 +19,8 @@ ein_fild04,343,293,0 warp hugel001 1,1,ein_fild05,80,294 ein_fild05,76,294,0 warp hugel001a 1,1,ein_fild04,336,292 ein_fild05,376,183,0 warp hugel002 1,1,ein_fild06,47,166 ein_fild06,42,171,0 warp hugel002a 1,1,ein_fild05,371,183 -ein_fild02,357,251,0 warp hugel003 1,1,yuno_fild04,38,280 -yuno_fild04,33,279,0 warp hugel003a 1,1,ein_fild02,350,250 +ein_fild02,357,251,0 warp hugel003-1 1,1,yuno_fild04,38,280 +yuno_fild04,33,279,0 warp hugel003a-1 1,1,ein_fild02,350,250 ein_fild01,349,369,0 warp hugel003 1,1,yuno_fild05,43,346 yuno_fild05,41,350,0 warp hugel003a 1,1,ein_fild01,345,367 ein_fild01,106,34,0 warp hugel004 1,1,ein_fild02,109,358 diff --git a/npc/warps/fields/lhalzen_fild.txt b/npc/warps/fields/lhalzen_fild.txt index bf57ed914..aa2e87bbb 100644 --- a/npc/warps/fields/lhalzen_fild.txt +++ b/npc/warps/fields/lhalzen_fild.txt @@ -11,10 +11,11 @@ //===== Additional Comments: ================================= //= 1.1 Applied Poki#3's fix for lhz001 & lhz001a [DracoRPG] //= 1.2 Updated the warp, according to korean eA site [Vicious] +//= 1.3 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ -lhz_fild01,210,18,0 warp lhz043 1,1,lighthalzen,214,324 -lighthalzen,214,329,0 warp lhz043a 1,1,lhz_fild01,210,23 +lhz_fild01,210,18,0 warp lhz043-1 1,1,lighthalzen,214,324 +lighthalzen,214,329,0 warp lhz043a-1 1,1,lhz_fild01,210,23 -lhz_fild01,367,222,0 warp lhz044 1,1,lhz_fild02,36,221 -lhz_fild02,29,219,0 warp lhz044a 1,1,lhz_fild01,361,222 +lhz_fild01,367,222,0 warp lhz044-1 1,1,lhz_fild02,36,221 +lhz_fild02,29,219,0 warp lhz044a-1 1,1,lhz_fild01,361,222 diff --git a/npc/warps/fields/morroc_fild.txt b/npc/warps/fields/morroc_fild.txt index 4d9fd13bc..8e36790a6 100644 --- a/npc/warps/fields/morroc_fild.txt +++ b/npc/warps/fields/morroc_fild.txt @@ -3,13 +3,14 @@ //===== By: ================================================== //= Nana (1.0) //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= Any Athena Version //===== Description: ========================================= //= Warp Points for Morroc Fields //===== Additional Comments: ================================= //= 1.1 changed 'anthell' to @anthell [Lupus] +//= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ //= Sograt Dessert =========================================== @@ -20,7 +21,7 @@ moc_fild01,301,16,0 warp mocf02 10,1,moc_fild02,77,338 moc_fild01,321,16,0 warp mocf02-1 10,1,moc_fild02,77,338 moc_fild01,341,16,0 warp mocf02-2 10,1,moc_fild02,77,338 moc_fild01,379,162,0 warp mocf011 2,12,pay_fild04,20,165 -moc_fild01,56,384,0 warp moc007 3,2,prt_fild08,54,24 +moc_fild01,56,384,0 warp moc007a 3,2,prt_fild08,54,24 moc_fild01,68,16,0 warp mocf01 15,3,moc_fild04,317,376 moc_fild02,228,29,0 warp mocf03 4,2,moc_fild13,298,367 moc_fild02,332,19,0 warp mocf04 5,3,moc_fild03,70,336 diff --git a/npc/warps/fields/mtmjolnir.txt b/npc/warps/fields/mtmjolnir.txt index 7523297cc..e95c0c97e 100644 --- a/npc/warps/fields/mtmjolnir.txt +++ b/npc/warps/fields/mtmjolnir.txt @@ -3,13 +3,14 @@ //===== By: ================================================== //= Nana (1.0) //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= Any Athena Version //===== Description: ========================================= //= Warp Points for Mt. Mjolnir //===== Additional Comments: ================================= //= 1.1 updating according to jA [Lupus] +//= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ //= Mt. Mjolnir ============================================== @@ -39,7 +40,7 @@ mjolnir_07,17,77,0 warp mjol11-1 2,4,mjolnir_06,380,74 mjolnir_07,214,383,0 warp mjol04-1 4,2,mjolnir_03,212,20 mjolnir_07,383,233,0 warp mjol12 2,4,mjolnir_08,33,234 mjolnir_07,383,362,0 warp mjol13 2,4,mjolnir_08,32,346 -mjolnir_08,159,373,0 warp mjol06 1,1,mjolnir_04,160,49 +mjolnir_08,159,373,0 warp mjol06a 1,1,mjolnir_04,160,49 mjolnir_08,185,28,0 warp mjol14 17,2,mjolnir_09,196,364 mjolnir_08,29,346,0 warp mjol13-1 2,4,mjolnir_07,380,362 mjolnir_08,30,234,0 warp mjol12-1 2,4,mjolnir_07,380,233 diff --git a/npc/warps/fields/rachel_fild.txt b/npc/warps/fields/rachel_fild.txt index b61bff8eb..f53d21039 100644 --- a/npc/warps/fields/rachel_fild.txt +++ b/npc/warps/fields/rachel_fild.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Playtester //===== Current Version: ===================================== -//= 1.0 +//= 1.2 //===== Compatible With: ===================================== //= Any Athena Version //===== Description: ========================================= @@ -11,6 +11,7 @@ //===== Additional Comments: ================================= //= 1.0 Initial version [Playtester] //= 1.1 Official warps [Playtester] +//= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ ra_fild01,233,333,0 warp ra000 1,1,ice_dun01,157,15 @@ -38,8 +39,8 @@ ra_fild13,295,346,0 warp ra021 1,1,ra_fild12,303,33 ra_fild11,360,226,0 warp ra022 1,1,rachel,30,125 ra_fild11,21,290,0 warp ra023 1,1,ra_fild10,379,283 ra_fild10,384,287,0 warp ra024 1,1,ra_fild11,28,290 -ra_fild11,202,335,0 warp ra025 1,1,ra_fild07,215,32 -ra_fild07,215,27,0 warp ra025 1,1,ra_fild11,201,329 +ra_fild11,202,335,0 warp ra025a 1,1,ra_fild07,215,32 +ra_fild07,215,27,0 warp ra025b 1,1,ra_fild11,201,329 ra_fild07,168,353,0 warp ra026 1,1,ra_fild02,171,45 ra_fild02,168,36,0 warp ra027 1,1,ra_fild07,168,349 ra_fild02,373,275,0 warp ra028 1,1,ra_fild03,28,294 diff --git a/npc/warps/other/jobquests.txt b/npc/warps/other/jobquests.txt index 82d307fb0..395a881b2 100644 --- a/npc/warps/other/jobquests.txt +++ b/npc/warps/other/jobquests.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== -//= 1.7 +//= 1.8 //===== Compatible With: ===================================== //= Any Athena Version; RO Version Ep4+ //===== Description: ========================================= @@ -20,6 +20,7 @@ //= 1.5 Replaced clone maps with the real ones [Lupus] //= 1.6 removed swordman quest map warps. They are now contained in the swordman quest. [L0ne_W0lf] //= 1.7 Updated some 2-2 job quest related warps. [L0ne_W0lf] +//= 1.8 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ @@ -65,8 +66,8 @@ monk_test,298,127,0 warp monk20 1,1,monk_test,268,125 //============================================================================== aldebaran,65,53,0 warp alche#1 1,1,alde_alche,20,175 aldebaran,53,65,0 warp alche#2 1,1,alde_alche,42,175 -alde_alche,19,171,0 warp alche#1 1,1,aldebaran,68,56 -alde_alche,42,171,0 warp alche#1 1,1,aldebaran,56,68 +alde_alche,19,171,0 warp alche#1-1 1,1,aldebaran,68,56 +alde_alche,42,171,0 warp alche#1-2 1,1,aldebaran,56,68 alde_alche,41,186,0 warp alche#1F_2F 1,1,alde_alche,113,178 alde_alche,114,183,0 warp alche#2F_1F 1,1,alde_alche,42,182 alde_alche,13,184,0 warp alche#1F_B1 1,1,alde_alche,88,113 diff --git a/src/map/npc.c b/src/map/npc.c index 0c04cfb73..b2de0af2a 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -1476,13 +1476,9 @@ static void npc_parsename(struct npc_data* nd, const char* name, const char* sta strcpy(this_mapname, (nd->bl.m==-1?"(not on a map)":mapindex_id2name(map[nd->bl.m].index))); strcpy(other_mapname, (dnd->bl.m==-1?"(not on a map)":mapindex_id2name(map[dnd->bl.m].index))); - //Commented out by ME-- L0ne_W0lf, and maybe one day we'll uncomment it again - //if and when I decide to/get all the warnings nad debug messages this horrible - //BROKEN thing ever shows. - //By the way, this_map and other_map are both WRONG. They are retuirning invalid results. - //ShowWarning("npc_parsename: Duplicate unique name in file '%s', line'%d'. Renaming '%s' to '%s'.\n", filepath, strline(buffer,start-buffer), nd->exname, newname); - //ShowDebug("this npc:\n display name '%s'\n unique name '%s'\n map=%s, x=%d, y=%d\n", nd->name, nd->exname, this_mapname, nd->bl.x, nd->bl.y); - //ShowDebug("other npc:\n display name '%s'\n unique name '%s'\n map=%s, x=%d, y=%d\n", dnd->name, dnd->exname, other_mapname, dnd->bl.x, dnd->bl.y); + ShowWarning("npc_parsename: Duplicate unique name in file '%s', line'%d'. Renaming '%s' to '%s'.\n", filepath, strline(buffer,start-buffer), nd->exname, newname); + ShowDebug("this npc:\n display name '%s'\n unique name '%s'\n map=%s, x=%d, y=%d\n", nd->name, nd->exname, this_mapname, nd->bl.x, nd->bl.y); + ShowDebug("other npc:\n display name '%s'\n unique name '%s'\n map=%s, x=%d, y=%d\n", dnd->name, dnd->exname, other_mapname, dnd->bl.x, dnd->bl.y); safestrncpy(nd->exname, newname, sizeof(nd->exname)); } } -- cgit v1.2.3-60-g2f50