diff options
Diffstat (limited to 'npc/merchants')
| -rw-r--r-- | npc/merchants/gemstone.txt | 5 | ||||
| -rw-r--r-- | npc/merchants/inn.txt | 27 | ||||
| -rw-r--r-- | npc/merchants/refine.txt | 7 | ||||
| -rw-r--r-- | npc/merchants/renters.txt | 6 | ||||
| -rw-r--r-- | npc/merchants/shops.txt | 323 | ||||
| -rw-r--r-- | npc/merchants/socket_enchant.txt | 15 |
6 files changed, 194 insertions, 189 deletions
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 |