diff options
| author | Lupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-06-13 15:00:53 +0000 |
|---|---|---|
| committer | Lupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-06-13 15:00:53 +0000 |
| commit | 03d918be79b86e03e37e97479d6e57d9e168798a (patch) | |
| tree | f8382a0009673d4a7d7cbe12c259beffe0a604fb /npc/merchants | |
| parent | d72f64de14e5fd7b9cd1dfae235f08f156c65ccb (diff) | |
| download | hercules-03d918be79b86e03e37e97479d6e57d9e168798a.tar.gz hercules-03d918be79b86e03e37e97479d6e57d9e168798a.tar.bz2 hercules-03d918be79b86e03e37e97479d6e57d9e168798a.tar.xz hercules-03d918be79b86e03e37e97479d6e57d9e168798a.zip | |
* Updated moscovia.txt inn.txt mosk_dun.txt shops.txt from jA
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12823 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/merchants')
| -rw-r--r-- | npc/merchants/inn.txt | 36 | ||||
| -rw-r--r-- | npc/merchants/shops.txt | 9 |
2 files changed, 44 insertions, 1 deletions
diff --git a/npc/merchants/inn.txt b/npc/merchants/inn.txt index c314c01f5..faf41aeaf 100644 --- a/npc/merchants/inn.txt +++ b/npc/merchants/inn.txt @@ -4,7 +4,7 @@ //= Darkchild (1.1) //= Playtester (1.2) //===== Current Version: ===================================== -//= 2.4 +//= 2.5 //===== Compatible With: ===================================== //= eAthena 1.0+ //===== Description: ========================================= @@ -39,6 +39,7 @@ //= 2.2 Small update to Vein's Inn Master. [L0ne_W0lf] //= 2.3 Added Lighthalzen Inn from Lighthalzen town file. [L0ne_W0lf] //= 2.4 Fixed Inn Employee#Ahlma warping to same destination as save point, bugreport: 191. +//= 2.5 Added Moskovia Gostinitsa (Inn) from jA //============================================================ @@ -203,6 +204,39 @@ ve_in,157,219,5 script Inn Master#Receptionist 709,{ close; } +//======================== Moscovia ==================================== +mosk_in,135,191,5 script Hotel Inn#Receptionist 961,{ + mes "[Hotel Inn]"; + mes "Good day~"; + mes "Welcome to the"; + mes "most comfortable"; + mes "inn here in Moscovia~"; + next; + menu "Save",Msave, "Take a Rest -> 5000 zeny",Mrent, "Cancel",Mend; + + Msave: + mes "[Hotel Inn]"; + mes "Your respawn point"; + mes "has been saved in Moscovia."; + mes "Enjoy your stay in town~"; + savepoint "mosk_in",142,189; + close; + Mrent: + mes "[Hotel Inn]"; + if(Zeny < 5000){ + mes "I'm sorry, but you don't have enough money to check in."; + mes "The service charge is 5,000 zeny."; + close; + } + mes "Enjoy your stay~"; + close2; + set Zeny,Zeny - 5000; + percentheal 100,100; + warp "mosk_in",215,181; + + Mend: + close; +} //======================= Inn Function ============================== function script F_InnMaid { diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt index 80438b83c..29f8e530a 100644 --- a/npc/merchants/shops.txt +++ b/npc/merchants/shops.txt @@ -290,6 +290,15 @@ 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#mosc 968,512:-1,513:-1,515:-1,516:-1 +moscovia,199,110,3 shop Milk#mosc 959,519:-1 + +//======================================================= // Cooking Addition //=========================================================== prontera,156,212,1 shop Chef Assistant#prt 700,7454:-1,7456:-1,7482:-1,580:-1 |