summaryrefslogtreecommitdiff
path: root/npc/merchants
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-08-10 20:46:27 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-08-10 20:46:27 +0000
commita2ec62d8f24cbc11dcb646712c4c16a5cf897372 (patch)
treeaaead75f19d72e72fbf60aeca5e1020c314f68e8 /npc/merchants
parenta1b41fc31ea08bd869e609bb41dd8ba011dcbb66 (diff)
downloadhercules-a2ec62d8f24cbc11dcb646712c4c16a5cf897372.tar.gz
hercules-a2ec62d8f24cbc11dcb646712c4c16a5cf897372.tar.bz2
hercules-a2ec62d8f24cbc11dcb646712c4c16a5cf897372.tar.xz
hercules-a2ec62d8f24cbc11dcb646712c4c16a5cf897372.zip
* Raised MAX_MERCENARY_CLASS to 44 for new mercenaries.
* Raised max_lv to allow values up to 150 in battle.conf. * Raised MAX_SKILL_TREE 77 in prep for 3rd class skill trees. * Upped max_lv and max_aura to 150, and max_aspd to 193. * Added Brasilis database updates from trunk r14928. * Added scripts and NPC Brasilis updates from trunk r14928. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14931 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/merchants')
-rw-r--r--npc/merchants/inn.txt48
-rw-r--r--npc/merchants/shops.txt10
2 files changed, 27 insertions, 31 deletions
diff --git a/npc/merchants/inn.txt b/npc/merchants/inn.txt
index f05d390f5..5d307eabd 100644
--- a/npc/merchants/inn.txt
+++ b/npc/merchants/inn.txt
@@ -4,7 +4,7 @@
//= Darkchild (1.1)
//= Playtester (1.2)
//===== Current Version: =====================================
-//= 3.0
+//= 3.0a
//===== Compatible With: =====================================
//= eAthena 1.0+
//===== Description: =========================================
@@ -45,6 +45,7 @@
//= 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]
+//= 3.0a Updated dialog for Brasilis inn. [L0ne_W0lf]
//============================================================
@@ -205,46 +206,41 @@ 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.";
+bra_in01,27,24,3 script Hotel Keeper#bra1 478,{
+ mes "[Hotel Keeper]";
+ mes "Welcome to the beautiful Brasilis Hotel.";
next;
- switch(select("Save:Take Rest - 5,000 zeny:Cancel")) {
+ switch(select("Save:Rest -5000 zeny")) {
case 1:
- mes "[Receptionist]";
- mes "Would you like me to save your respawn point here?";
+ mes "[Hotel Keeper]";
+ mes "Do you want to save here at the Brasilis Hotel?";
next;
- switch(select("No, thanks.:Sure!")) {
+ switch(select("No thank you.:Absolutely.")) {
case 1:
- mes "[Receptionist]";
- mes "Alright, please come back if you change your mind.";
+ mes "[Hotel Keeper]";
+ mes "Ok then, enjoy your stay.";
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.";
+ mes "[Hotel Keeper]";
+ mes "Your respawn has been saved here at the hotel. I hope that you enjoy your stay here in Brasilis.";
+ savepoint "bra_in01",144,69;
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.";
+ if (Zeny > 4999) {
+ mes "[Hotel Keeper]";
+ mes "I will show you a great room.";
close2;
set zeny,zeny-5000;
percentheal 100,100;
warp "bra_in01",144,69;
end;
}
- case 3:
- close;
+ else {
+ mes "[Hotel Keeper]";
+ mes "I'm sorry, but the service charge is 5,000 zeny per night.";
+ close;
+ }
}
}
diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt
index 43fcd3744..bb73df394 100644
--- a/npc/merchants/shops.txt
+++ b/npc/merchants/shops.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= eAthena Dev Team
//===== Current Version: =====================================
-//= 2.7b
+//= 2.8
//===== Compatible With: =====================================
//= eAthena 1.0+
//===== Description: =========================================
@@ -31,6 +31,7 @@
//= Re-added Bill of Birds to Morroc Item Collectors.
//= 2.7a Actually applied the right update to the comodo weapon shop. [L0ne_W0lf]
//= 2.7b Corrected Brasilis Fruit Merchant. (bugreport:4278) [L0ne_W0lf]
+//= 2.8 Updates to Brasilis Merchants. [L0ne_W0lf]
//============================================================
//=======================================================
@@ -73,11 +74,10 @@ 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#bra 478,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1,610:-1
+brasilis,252,257,3 shop Tool Dealer#bra 478,645:-1,656:-1,601:-1,602:-1,611:-1,1065:-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#bra 476,11515:-1,513:-1,11516:-1
+brasilis,201,309,3 shop Pet Groomer#bra 476,537:-1,643:-1
+brasilis,221,128,3 shop Fruit Gardener#bra 477,11515:-1,513:-1,11516:-1
//=======================================================
// Comodo