summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--npc/Changelog.txt6
-rw-r--r--npc/merchants/shops.txt82
-rw-r--r--npc/merchants/wander_pet_food.txt75
-rw-r--r--npc/scripts_athena.conf1
4 files changed, 126 insertions, 38 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 84e5f01cf..97b39190f 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,11 @@
Date Added
======
+ * Rev. 14315 Shop update, and added Wanderer pet food maker NPC. [L0ne_W0lf]
+ - Added Trading merchants, (ninja& gunslinger) to Izlude and Alberta.
+ - Made Brasilis shop names unique, and uncommented.
+ - Changed the whip sold in comodo weapon shop. (1956 ->1960)
+ - Added Fire and Silver arrow to Einbroch tool dealer.
+ - Re-added Bill of Birds to Morroc Item Collectors.
2010/05/29
* Rev. 14313 Updated F_CashPartyCall to use warpparty. Renamed original function to F_CashPartyCall2 and commented out. [L0ne_W0lf]
* Fixed an error in the monster race npcs calling a nonexistant OnEnable.
diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt
index d413d1a33..c04324d4c 100644
--- a/npc/merchants/shops.txt
+++ b/npc/merchants/shops.txt
@@ -3,29 +3,13 @@
//===== By: ==================================================
//= eAthena Dev Team
//===== Current Version: =====================================
-//= 2.6
+//= 2.7
//===== Compatible With: =====================================
//= eAthena 1.0+
//===== Description: =========================================
//=
//===== Additional Comments: =================================
//= For earlier update notes see the bottom.
-//= 1.22 Thx8) Removed Berserk Potions from all shops but Comodo [Lupus]
-//= 1.3 Added Gunslinger shops. Credits goes to RockmanEXE for the info [erKURITA]
-//= Added Bucket Hat to Flu Mask dealer and modified it's name to a more logical one :P [erKURITA]
-//= 1.4 Added an ingredient seller to Morroc, thanks to Muad_Dib [MasterOfMuppets]
-//= a Removed doubled Morocc Ing.Seller, arranged the rest Ing.Sellers according to the city names [Lupus]
-//= 1.4b Commented out temp Gunslinger shops. [Lupus]
-//= 1.5 Removed Temp gunslinger shops and moved up the official ones. [erKURITA]
-//= Added Official Ninja shops in their correct location and commented a few
-//= shops. Thanks to RockmanEXE and Muad_Dib [erKURITA]
-//= 1.6 Implemented a missing Tool Shop in Lighthalzen [MasterOfMuppets]
-//= 1.7 Added some missing iRO - Lighthalzen NPCs [Musashiden]
-//= 1.8 Added Rachel Official shops. Special Thanks to RockmanEXE. [erKURITA]
-//= 1.9 Uncommented Homunculus shop, since Homunculus is working on trunk now. [Evera]
-//= 1.9a Pet Merchant -> Lighthalzen [erKURITA]
-//= 1.9b Added items to Chivas Regal
-//= 1.9c Slight update for Rachel shop: Tool Dealer -> Fruit Gardener [L0ne_W0lf]
//= 2.0 updated several shop npcs. [L0ne_W0lf]
//= Added proper Venom Knife dealer, and consiquently removed wenom Knives from weapon dealers.
//= Moved all Cooking related NPCs to their own section.
@@ -40,6 +24,11 @@
//= 2.5 Updated Morroc shops to episode 12.1. [L0ne_W0lf]
//= 2.6 Added Brasilis shops. [L0ne_W0lf]
//= Updated Pet Groomers with four new pet feeds.
+//= 2.7 Added Trading merchants, (ninja& gunslinger) to Izlude and Alberta. [L0ne_W0lf]
+//= Made Brasilis shop names unique, and uncommented.
+//= Changed the whip sold in comodo weapon shop. (1956 ->1960)
+//= Added Fire and Silver arrow to Einbroch tool dealer.
+//= Re-added Bill of Birds to Morroc Item Collectors.
//============================================================
//=======================================================
@@ -51,6 +40,7 @@ alberta_in,182,97,0 shop Tool Dealer#alb2 73,1750:-1,611:-1,501:-1,502:-1,503:-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
+alberta_in,176,81,3 shop Trading Merchant#alb 900,13200:-1,13201:-1,13202:-1,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-1
//=======================================================
// Al De Baran
@@ -81,18 +71,17 @@ ayo_in01,90,160,1 shop Armor Dealer#ayo 842,2211:-1,2401:-1,2403:-1,2501:-1,2503
//=======================================================
// Brasilis
//=======================================================
-brasilis,252,257,5 shop Tool Dealer 478,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1,610:-1
-brasilis,244,243,3 shop Weapon Dealer 477,1407:-1,1457:-1,1354:-1,1519:-1,13003:-1
-// Correct Prices for last three feeds.
-//brasilis,201,309,4 shop Pet Groomer 476,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1
+brasilis,252,257,5 shop Tool Dealer#bra 478,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1,610:-1
+brasilis,244,243,3 shop Weapon Dealer#bra 477,1407:-1,1457:-1,1354:-1,1519:-1,13003:-1
+brasilis,201,309,4 shop Pet Groomer#bra 476,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1
// Apple -> Acai_Fruit
-//brasilis,221,128,4 shop Fruit Merchant 476,12369:-1,513:-1,512:-1
+brasilis,221,128,4 shop Fruit Merchant#bra 476,12369:-1,513:-1,512:-1
//=======================================================
// Comodo
//=======================================================
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,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,1952:-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
@@ -105,7 +94,7 @@ cmd_fild07,277,85,4 shop Armor Dealer#cmd2 101,2226:-1,2228:-1,2103:-1,2105:-1,2
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#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
+ein_in01,189,15,1 shop Tool Dealer#ein 850,1750:-1,1752:-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
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.
@@ -135,7 +124,7 @@ gonryun,173,84,3 shop Armor Dealer#gon 770,2211:-1,2401:-1,2403:-1,2501:-1,2503:
// Hugel
//=======================================================
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
+hugel,77,167,3 shop Vegetable Gardener#hu 892,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
@@ -152,6 +141,7 @@ izlude,105,99,0 shop Butcher#iz 54,517:-1
izlude,94,98,4 shop Fruit Gardener#iz 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,554:-1,6113:-1,6114:-1,6115:-1
+izlude_in,121,64,3 shop Trading Merchant#iz 900,13200:-1,13201:-1,13202:-1,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-1
//=======================================================
// Jawaii
@@ -217,8 +207,8 @@ xmas_in,174,98,2 shop Weapon Dealer#xmas 49,1201:-1,1204:-1,1207:-1,1210:-1,1213
in_moc_16,22,20,7 shop Sepulchral Merchant#moc 880,1771:-1
moc_ruins,91,128,4 shop Tool Dealer#moc1 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
moc_ruins,114,63,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
-moc_ruins,93,53,2 shop Item Collector#moc1 85,911:-1,528:-1,919:-1
-moc_ruins,81,113,0 shop Item Collector#moc2 85,911:-1,528:-1,919:-1
+moc_ruins,93,53,2 shop Item Collector#moc1 85,911:-1,528:-1,919:-1,925:-1
+moc_ruins,81,113,0 shop Item Collector#moc2 85,911:-1,528:-1,919:-1,925:-1
moc_ruins,110,105,2 shop Jeweler#moc1 102,721:-1,723:-1,726:-1,728:-1,729:-1
moc_ruins,52,85,6 shop Jeweler#moc2 99,730:-1,2613:-1
moc_ruins,113,126,4 shop Trader#moc1 99,747:-1
@@ -233,6 +223,15 @@ morocc_in,141,60,0 shop Armor Dealer#moc 58,2101:-1,2103:-1,2401:-1,2403:-1,2405
morocc_in,132,57,0 shop Weapon Dealer#moc2 99,1146:-1,1245:-1
//=======================================================
+// Moscovia
+//=======================================================
+mosk_in,21,254,5 shop Tool Dealer#mosk 968,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1
+mosk_in,31,180,3 shop Weapon Dealer#mosk 968,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1
+mosk_in,79,178,1 shop Armor Dealer#mosk 961,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1
+moscovia,152,71,4 shop Fruit Gardener#mosk 968,512:-1,513:-1,515:-1,516:-1
+moscovia,199,110,3 shop Vendor from Milk Ranch#m 959,519:-1
+
+//=======================================================
// Niflheim
//=======================================================
nif_in,37,93,1 shop Axe Dealer#nif 801,1301:-1,1351:-1,1354:-1,1357:-1,1360:-1
@@ -279,7 +278,7 @@ ra_in01,175,364,3 shop Armor Dealer#ra 919,2101:-1,2103:-1,2403:-1,2405:-1,2503:
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
+rachel,65,80,1 shop Vegetable Gardener#ra 919,515:-1,535:-1,516:-1
//=======================================================
// Turtle Island
@@ -303,17 +302,8 @@ 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
//=======================================================
-// Moscovia
-//=======================================================
-mosk_in,21,254,5 shop Tool Dealer#mosk 968,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1
-mosk_in,31,180,3 shop Weapon Dealer#mosk 968,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1
-mosk_in,79,177,1 shop Armor Dealer#mosk 961,2211:-1,2401:-1,2403:-3,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1
-moscovia,152,71,4 shop Fruit Gardener#mosk 968,512:-1,513:-1,515:-1,516:-1
-moscovia,199,110,3 shop Vendor from Milk Ranch#m 959,519:-1
-
-//=======================================================
// Cooking Addition
-//===========================================================
+//=======================================================
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
moc_ruins,115,123,5 shop Chef Assistant#moc 86,7455:-1,7453:-1,7454:-1,7456:-1,7452:-1
@@ -358,4 +348,20 @@ niflheim,209,180,5 shop Chef Assistant#nif 83,581:-1
//= 1.21 Added another weapon dealer to Einbroch, thanks to Muad_Dib [MasterOfMuppets]
//= - Fixed up the missing sprites for you Lupus :)
//= - Guys, I suggest we crop these comments and put them at the bottom soon
+//= 1.22 Thx8) Removed Berserk Potions from all shops but Comodo [Lupus]
+//= 1.3 Added Gunslinger shops. Credits goes to RockmanEXE for the info [erKURITA]
+//= Added Bucket Hat to Flu Mask dealer and modified it's name to a more logical one :P [erKURITA]
+//= 1.4 Added an ingredient seller to Morroc, thanks to Muad_Dib [MasterOfMuppets]
+//= a Removed doubled Morocc Ing.Seller, arranged the rest Ing.Sellers according to the city names [Lupus]
+//= 1.4b Commented out temp Gunslinger shops. [Lupus]
+//= 1.5 Removed Temp gunslinger shops and moved up the official ones. [erKURITA]
+//= Added Official Ninja shops in their correct location and commented a few
+//= shops. Thanks to RockmanEXE and Muad_Dib [erKURITA]
+//= 1.6 Implemented a missing Tool Shop in Lighthalzen [MasterOfMuppets]
+//= 1.7 Added some missing iRO - Lighthalzen NPCs [Musashiden]
+//= 1.8 Added Rachel Official shops. Special Thanks to RockmanEXE. [erKURITA]
+//= 1.9 Uncommented Homunculus shop, since Homunculus is working on trunk now. [Evera]
+//= 1.9a Pet Merchant -> Lighthalzen [erKURITA]
+//= 1.9b Added items to Chivas Regal
+//= 1.9c Slight update for Rachel shop: Tool Dealer -> Fruit Gardener [L0ne_W0lf]
//============================================================
diff --git a/npc/merchants/wander_pet_food.txt b/npc/merchants/wander_pet_food.txt
new file mode 100644
index 000000000..802680eeb
--- /dev/null
+++ b/npc/merchants/wander_pet_food.txt
@@ -0,0 +1,75 @@
+//===== eAthena Script =======================================
+//= Spirit Liquor trader.
+//===== By: ==================================================
+//= eAthena dev team
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= eAthena SVN
+//===== Description: =========================================
+//= [Aegis Conversion]
+//= Trade Broken Liquor Jars and alcohol for wanderer
+//= pet food, 'Spirit Liquor'
+//===== Additional Comments: =================================
+//= 1.0 First version
+//============================================================
+
+prontera,218,218,3 script Pet Enthusiast 96,{
+ mes "[Pet Enthusiast Jenny]";
+ mes "Oh, Hi there!";
+ mes "Are you a lover of animals like I am?";
+ next;
+ mes "[Pet Enthusiast Jenny]";
+ mes "I now that it's really hard to keep your cute pets happy.";
+ mes "All it takes is the right kind of food.";
+ next;
+ mes "[Pet Enthusiast Jenny]";
+ mes "I know that sometimes it is really hard to get the right food for your pet.";
+ next;
+ mes "[Pet Enthusiast Jenny]";
+ mes "Do you have any food that you are looking for?";
+ next;
+ switch(select("Yes:No")) {
+ case 1:
+ if ((countitem(7158) > 19) && (countitem(970) > 0)) {
+ mes "[Pet Enthusiast Jenny]";
+ mes "Oh, you have ^ff000020 Broken Liquor Jar^000000s and ^ff00001 Alcohol^000000!";
+ mes "Do you want to exchange them for";
+ mes "^ff000020 Spirit Liquor^000000 for your Wanderer pet?";
+ next;
+ switch(select("Yes, please!:No thank you.")) {
+ case 1:
+ mes "[Pet Enthusiast Jenny]";
+ mes "Ok here you go then.";
+ mes "I hope it keeps your";
+ mes "cute pet happy.";
+ delitem 7158,20; //Broken_Wine_Vessel
+ delitem 970,1; //Alchol
+ getitem 7824,20; //Spirit_Liquor
+ close;
+ case 2:
+ mes "[Pet Enthusiast Jenny]";
+ mes "Hehe, well just let me know if you change your mind.";
+ close;
+ }
+ }
+ else {
+ mes "[Pet Enthusiast Jenny]";
+ mes "Actually, right now I can help you get Spirit Liquor for Wanderer pets.";
+ next;
+ mes "[Pet Enthusiast Jenny]";
+ mes "All you have to do is bring me ^FF0000 20 Broken Liquor Jars^000000 and ^FF0000 1 Alcohol^000000.";
+ mes "I can give you ^FF0000 20 Spirit Liquor^000000 for that.";
+ next;
+ mes "You can get the Broken Liquor Jars from Tengu monsters in Amatsu dungeon.";
+ close;
+ }
+ case 2:
+ close;
+ }
+}
+
+prontera,220,218,3 script Berry Toe 955,{
+ specialeffect EF_CHANGEDARK;
+ end;
+}
diff --git a/npc/scripts_athena.conf b/npc/scripts_athena.conf
index 05ac01467..53f656da8 100644
--- a/npc/scripts_athena.conf
+++ b/npc/scripts_athena.conf
@@ -56,6 +56,7 @@ npc: npc/merchants/gemstone.txt
npc: npc/merchants/advanced_refiner.txt
npc: npc/merchants/elemental_trader.txt
npc: npc/merchants/enchan_arm.txt
+npc: npc/merchants/wander_pet_food.txt
// Cash Shop
// See file before enabling, as you may wish to change the
// point value of items to suit your own needs.