From 0782cabc543c151f724f38f5132ab948f6346af4 Mon Sep 17 00:00:00 2001 From: Playtester Date: Sat, 5 May 2007 13:42:37 +0000 Subject: Updated Food Seller to official git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10466 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/Changelog.txt | 1 + npc/merchants/shops.txt | 35 ++++++++++++++++++----------------- 2 files changed, 19 insertions(+), 17 deletions(-) (limited to 'npc') diff --git a/npc/Changelog.txt b/npc/Changelog.txt index bed0735ba..4190d001e 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,6 +1,7 @@ Date Added ====== 2007/05/06 + * Updated Food Seller to official [Playtester] * Small Veins field spawn and warp adjustments [Playtester] * Revised 1/3 of the cities scripts. Thanks to CAHTEXNIK [Lupus] 2007/05/05 diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt index 54826d1f5..e4f43e213 100644 --- a/npc/merchants/shops.txt +++ b/npc/merchants/shops.txt @@ -38,7 +38,7 @@ alberta_in,180,15,1 shop Armor Dealer 101,2101:-1,2103:-1,2401:-1,2403:-1,2405:- alberta_in,188,21,1 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,1771:-1 alberta_in,175,97,4 shop Weapon Dealer 82,1146:-1,1245:-1 //alberta_in,18,59,5 shop Miner 48,1010:-1,1011:-1 -alberta,167,135,4 shop Ingredient Seller 712,579:-1 +alberta,167,135,5 shop Chef Assistant 712,579:-1 //======================================================= //AL DE BARAN @@ -49,7 +49,7 @@ 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,601:-1,602:-1,611:-1,610:-1,645:-1,656:-1 //For Homunculus alde_alche,38,184,2 shop Homunculus Supplies 755,7143:-1,7141:-1,7140:-1,12040:-1 -aldebaran,166,109,7 shop Ingredient Seller 750,580:-1,7482:-1 //temp goods +aldebaran,165,107,2 shop Chef Assistant 97,7456:-1,7452:-1,580:-1 //======================================================= //AMATSU @@ -69,7 +69,7 @@ aldebaran,166,109,7 shop Ingredient Seller 750,580:-1,7482:-1 //temp goods ama_in01,89,28,4 shop Armor Dealer 757,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2314:-1,2627:-1 ama_in01,102,28,4 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,4 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 -amatsu,205,150,2 shop Ingredient Seller 83,7453:-1,579:-1 +amatsu,206,150,3 shop Chef Assistant 83,7453:-1,579:-1 //| Official Ninja Shops que_ng,72,31,2 shop Bunji 83,13250:-1,13251:-1,13252:-1,13253:-1,13254:-1 que_ng,73,26,5 shop Bunrei 83,2117:-1,7521:-1,7522:-1,7523:-1,7524:-1 @@ -80,7 +80,7 @@ que_ng,73,26,5 shop Bunrei 83,2117:-1,7521:-1,7522:-1,7523:-1,7524:-1 ayo_in01,18,182,8 shop Tool Dealer 840,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 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 -ayothaya,202,178,4 shop Food Seller 750,7456:-1,577:-1 +ayothaya,203,178,3 shop Chef Assistant 83,7455:-1,577:-1 //======================================================= //COMODO @@ -90,7 +90,7 @@ cmd_in01,131,165,4 shop Weapon Dealer 49,1901:-1,1903:-1,1905:-1,1907:-1,1950:-1 cmd_in01,79,182,4 shop Tool Dealer 83,1753:-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 Merchant 101,965:-1,964:-1 comodo,244,296,7 shop Item Collector 74,909:-1 -comodo,224,164,4 shop Food Seller 750,7455:-1 +comodo,225,164,3 shop Chef Assistant 83,7455:-1,7453:-1,7454:-1,579:-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 @@ -109,9 +109,11 @@ ein_in01,109,27,4 shop Two-Hand Weapon Dealer 850,1116:-1,1151:-1,1154:-1,1157:- ein_in01,119,26,4 shop Weapon Dealer 855,1247:-1,1248:-1,1249:-1,13000:-1 einbroch,138,66,3 shop Head Gear Dealer 850,5114:-1,2218:-1 einbroch,82,199,3 shop Paddler 855,512:-1,645:-1,1750:-1,501:-1 +einbroch,224,207,5 shop Chef Assistant 83,7457:-1 //Official Gunslingers shops. que_ng,179,91,3 shop Chivas Regal 900,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1 que_ng,180,79,3 shop Johnny Walker 900,13200:-1,13201:-1,13202:-1 + //======================================================= //GEFFEN //======================================================= @@ -123,7 +125,7 @@ geffen_in,77,167,1 shop Tool Dealer 68,1750:-1,611:-1,501:-1,502:-1,503:-1,504:- geffen_in,77,173,1 shop Magical Tool Trader 64,717:-1,1601:-1,1604:-1,1607:-1,1610:-1,2232:-1,2321:-1,2332:-1 geffen_in,171,123,1 shop Tool Dealer 64,1092:-1,1093:-1 geffen,193,152,3 shop Pet Merchant 125,537:-1,643:-1,10013:-1,10014:-1 -geffen,135,64,3 shop Ingredient Seller 750,580:-1,7482:-1 //temp coords, temp goods +geffen,196,111,3 shop Chef Assistant 85,7482:-1 //======================================================= //GONRYUN @@ -131,7 +133,7 @@ geffen,135,64,3 shop Ingredient Seller 750,580:-1,7482:-1 //temp coords, temp go gonryun,147,84,4 shop Tool Dealer 777,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 gonryun,174,101,4 shop Weapon Dealer 774,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1 gonryun,173,84,4 shop Armor Dealer 770,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1 -gonryun,148,101,4 shop Food Seller 750,580:-1,7452:-1 +gonryun,147,101,5 shop Chef Assistant 83,7452:-1,580:-1 //======================================================= //HUGEL @@ -161,14 +163,14 @@ izlude,164,138,4 shop Pet Merchant 125,537:-1,643:-1,10013:-1,10014:-1 lou_in02,121,181,5 shop Armor Dealer 818,2101:-1,2103:-1,2401:-1,2403:-1,2501:-1,2503:-1,2211:-1,2305:-1,2328:-1,2332:-1,2321:-1 lou_in02,130,182,5 shop Weapon Dealer 774,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,1753:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,611:-1,1065:-1 -louyang,255,123,4 shop Food Seller 750,7454:-1,577:-1 +louyang,256,123,5 shop Chef Assistant 820,7454:-1,577:-1 //======================================================= //LIGHTHALZEN //======================================================= lighthalzen,69,75,5 shop Fruit Gardener 102,512:-1,513:-1 lighthalzen,112,44,8 shop Flower Girl 90,712:-1,744:-1,748:-1 -lighthalzen,126,126,4 shop Food Seller 83,7456:-1,7452:-1 +lighthalzen,126,126,3 shop Chef Assistant 83,7456:-1,7452:-1 lighthalzen,124,129,8 shop Vegetable Gardener 91,515:-1,516:-1,535:-1 lighthalzen,222,191,4 shop Pet Merchant 125,537:-1,643:-1,10013:-1,10014:-1 lhz_in02,286,95,4 shop Begginer's Merchant 62,1621:-1,5112:-1,2416:-1,2113:-1,2512:-1 @@ -195,6 +197,7 @@ xmas_in,168,104,4 shop Armor Dealer 101,2228:-1,2103:-1,2105:-1,2307:-1,2309:-1, xmas_in,169,34,2 shop Gift Merchant 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,1771:-1 xmas,144,207,4 shop Tool Dealer 83,601:-1,602:-1 +xmas,152,137,5 shop Chef Assistant 83,7457:-1,577:-1 //======================================================= //MORROC @@ -214,7 +217,7 @@ morocc,244,134,1 shop Trader 93,2612:-1 morocc,259,193,1 shop Trader 99,747:-1 morocc,268,193,1 shop Trader 93,748:-1 morocc,269,167,4 shop Pet Merchant 125,537:-1,643:-1,10013:-1,10014:-1 -morocc,120,97,5 shop Ingredient Seller 86,7452:-1,7453:-1,7454:-1,7455:-1,7456:-1 +morocc,120,97,5 shop Chef Assistant 86,7455:-1,7453:-1,7454:-1,7456:-1,7452:-1 //morocc_in,65,37,4 shop Miner 48,1010:-1,1011:-1 morocc_in,132,57,0 shop Weapon Dealer 99,1146:-1,1245:-1 @@ -231,7 +234,7 @@ nif_in,154,21,3 shop Tool Dealer 798,535:-1,1062:-1,902:-1,7106:-1,537:-1,7154:- //niflheim,224,185,3 shop Fruit Merchant 795,512:-1,513:-1 //niflheim,209,161,3 shop Butcher 794,517:-1,528:-1 //niflheim,205,152,3 shop Gift Merchant 795,734:-1,735:-1,736:-1,737:-1,746:-1 -niflheim,205,158,1 shop Ingredient Seller 795,581:-1 //temp coords, temp spr ID +niflheim,209,180,5 shop Chef Assistant 83,581:-1 //======================================================= //PAYON @@ -242,7 +245,7 @@ payon_in01,15,119,4 shop Armor Dealer 77,2401:-1,2403:-1,2405:-1,2501:-1,2503:-1 payon_in01,5,49,0 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,1 shop Tool Dealer 98,1750:-1,1751:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,525:-1,601:-1,602:-1,1065:-1,645:-1,656:-1 payon,159,96,5 shop Tool Dealer 88,1750:-1,501:-1,645:-1,601:-1,602:-1 -payon,205,119,4 shop Food Seller 750,7455:-1 +payon,209,119,5 shop Chef Assistant 89,7455:-1 payon,104,63,4 shop Pet Merchant 125,537:-1,643:-1,10013:-1,10014:-1 pay_arche,125,108,1 shop Milk Merchant 90,519:-1 pay_arche,132,101,1 shop Vegetable Merchant 102,515:-1,516:-1 @@ -259,7 +262,7 @@ prontera,113,42,1 shop Flower Lady 90,712:-1,744:-1 prontera,105,87,1 shop Gift Merchant 91,734:-1,735:-1,736:-1,737:-1,746:-1 prontera,218,211,4 shop Pet Merchant 125,537:-1,643:-1,10013:-1,10014:-1 prontera,248,153,1 shop Doll Merchant 85,740:-1,741:-1,742:-1 -prontera,156,212,2 shop Food Seller 700,7454:-1,7452:-1,7482:-1,580:-1 +prontera,156,212,1 shop Chef Assistant 700,7454:-1,7456:-1,7482:-1,580:-1 prontera,48,58,7 shop Vegetable Gardener 91,515:-1,516:-1,535:-1 prt_church,108,124,1 shop Nun 79,2608:-1,2216:-1,2323:-1,2325:-1,1501:-1,1504:-1,1507:-1,1510:-1,1513:-1,1519:-1,5092:-1 prt_fild05,290,221,1 shop Tool Dealer 83,1750:-1,611:-1,501:-1,502:-1,506:-1,601:-1,602:-1,645:-1,656:-1 @@ -294,8 +297,7 @@ um_in,151,125,4 shop Armor Merchant 49,2103:-1,2105:-1,2403:-1,2405:-1,2503:-1,2 //um_in,159,123,3 shop Weapon Merchant 52,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 //um_in,98,124,3 shop Tool Merchant 47,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,525:-1,601:-1,602:-1,1750:-1,1065:-1 //um_in,103,124,4 shop Food Merchant 91,515:-1,516:-1,535:-1,519:-1,517:-1 -umbala,101,154,4 shop Food Seller 750,7456:-1,577:-1 - +umbala,102,154,3 shop Chef Assistant 83,7456:-1,577:-1 //======================================================= //YUNO @@ -310,8 +312,7 @@ yuno_in01,25,34,4 shop Tool Dealer 83,611:-1,1750:-1,501:-1,502:-1,503:-1,504:-1 yuno_in01,104,35,4 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,1771:-1 yuno_in01,112,25,5 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_in03,176,22,3 shop Scroll Seller 89,7433:-1 //Temp shop in Yuno that sells Blank Scrolls -yuno,133,171,2 shop Ingredient Seller 750,7457:-1,7482:-1 - +yuno,130,173,3 shop Chef Assistant 83,7457:-1,7482:-1 //======================================================= // ST. CAPITOLINA ABBEY -- cgit v1.2.3-60-g2f50