summaryrefslogtreecommitdiff
path: root/npc/merchants
diff options
context:
space:
mode:
Diffstat (limited to 'npc/merchants')
-rw-r--r--npc/merchants/inn.txt48
-rw-r--r--npc/merchants/shops.txt28
2 files changed, 67 insertions, 9 deletions
diff --git a/npc/merchants/inn.txt b/npc/merchants/inn.txt
index 51c77d4bc..f05d390f5 100644
--- a/npc/merchants/inn.txt
+++ b/npc/merchants/inn.txt
@@ -4,7 +4,7 @@
//= Darkchild (1.1)
//= Playtester (1.2)
//===== Current Version: =====================================
-//= 2.9
+//= 3.0
//===== Compatible With: =====================================
//= eAthena 1.0+
//===== Description: =========================================
@@ -44,6 +44,7 @@
//= 2.7 Removed Morroc Inns as per episode 12.1. [L0ne_W0lf]
//= 2.8 Removed Moscovia Inn; Its in quests/quest_moscovia.txt [Kisuka]
//= 2.9 Added switch menus, updated to match AEGIS scripts. [Kisuka]
+//= 3.0 Added Brasilis inn receptionist. [L0ne_W0lf]
//============================================================
@@ -195,6 +196,7 @@ ve_in,157,219,5 script Inn Master#Receptionist 709,{
set Zeny,Zeny - 5000;
percentheal 100,100;
warp "ve_in",184,228;
+ end;
case 3:
mes "[Inn Master]";
mes "Please come again.";
@@ -202,6 +204,50 @@ ve_in,157,219,5 script Inn Master#Receptionist 709,{
}
}
+//======================== Brasilis =================================
+bra_in01,27,24,3 script Receptionist#bra 478,{
+ mes "[Receptionist]";
+ mes "Welcome to the 'Happy Toucan' Inn,";
+ mes "we have everything to make you feel at home.";
+ next;
+ switch(select("Save:Take Rest - 5,000 zeny:Cancel")) {
+ case 1:
+ mes "[Receptionist]";
+ mes "Would you like me to save your respawn point here?";
+ next;
+ switch(select("No, thanks.:Sure!")) {
+ case 1:
+ mes "[Receptionist]";
+ mes "Alright, please come back if you change your mind.";
+ close;
+ case 2:
+ savepoint "bra_in01",143,68;
+ mes "[Receptionist]";
+ mes "Your respawn point has been saved.";
+ mes "Enjoy your stay in Brasilius and don't forget to check our natural beauties.";
+ close;
+ }
+ case 2:
+ if (Zeny < 5000) {
+ mes "[Receptionist]";
+ mes "I'm sorry, but the service charge is 5,000 zeny.";
+ mes "Please make sure that you have enough money to check in next time, okay?";
+ close;
+ }
+ else {
+ mes "[Receptionist]";
+ mes "I'll take you to your room.";
+ close2;
+ set zeny,zeny-5000;
+ percentheal 100,100;
+ warp "bra_in01",144,69;
+ end;
+ }
+ case 3:
+ close;
+ }
+}
+
//======================= Inn Function ==============================
function script F_InnMaid {
mes getarg(0);
diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt
index 89f5f9fc9..d413d1a33 100644
--- a/npc/merchants/shops.txt
+++ b/npc/merchants/shops.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= eAthena Dev Team
//===== Current Version: =====================================
-//= 2.5
+//= 2.6
//===== Compatible With: =====================================
//= eAthena 1.0+
//===== Description: =========================================
@@ -38,6 +38,8 @@
//= 2.3 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
//= 2.4 Fixed Jawaii Ice cream salesman. [L0ne_W0lf]
//= 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.
//============================================================
//=======================================================
@@ -77,6 +79,16 @@ ayo_in01,90,192,3 shop Weapon Dealer#ayo 843,1207:-1,1216:-1,1107:-1,1122:-1,111
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
//=======================================================
+// 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
+// Apple -> Acai_Fruit
+//brasilis,221,128,4 shop Fruit Merchant 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
@@ -110,7 +122,7 @@ 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
+geffen,193,152,4 shop Pet Groomer#gef 124,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1
//=======================================================
// Gonryun
@@ -139,7 +151,7 @@ izlude_in,115,61,0 shop Tool Dealer#iz 47,611:-1,501:-1,502:-1,503:-1,504:-1,506
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
+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
//=======================================================
// Jawaii
@@ -151,7 +163,7 @@ jawaii,186,174,3 shop Ice Cream Guy#ja 85,536:-1,536:-1,536:-1,536:-1,536:-1,536
//=======================================================
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,197,114,4 shop Pet Groomer#yuno 124,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-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
@@ -166,7 +178,7 @@ 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
+lighthalzen,222,191,4 shop Pet Groomer#lhz 125,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-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
@@ -215,7 +227,7 @@ moc_ruins,71,139,5 shop Trader#moc3 93,2612:-1
moc_ruins,125,135,6 shop Trader#moc4 89,2609:-1,1516:-1,1522:-1
moc_ruins,87,109,0 shop Butcher#moc 58,517:-1
moc_ruins,90,149,6 shop Trader#moc5 99,513:-1,513:-1,513:-1,513:-1,513:-1,513:-1
-moc_ruins,118,170,4 shop Pet Groomer#moc 125,537:-1,643:-1,10013:-1,10014:-1
+moc_ruins,118,170,4 shop Pet Groomer#moc 125,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1
morocc_in,141,67,0 shop Weapon Dealer#moc1 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_in,132,57,0 shop Weapon Dealer#moc2 99,1146:-1,1245:-1
@@ -236,7 +248,7 @@ payon_in01,7,119,2 shop Armor Dealer#pay 76,2401:-1,2403:-1,2405:-1,2501:-1,2503
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
+payon,177,131,4 shop Pet Groomer#pay 124,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1
//=======================================================
// Prontera
@@ -247,7 +259,7 @@ 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,218,211,4 shop Pet Groomer#prt 125,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-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