diff options
| -rw-r--r-- | npc/Changelog.txt | 1 | ||||
| -rw-r--r-- | npc/merchants/inn.txt | 36 | ||||
| -rw-r--r-- | npc/merchants/shops.txt | 9 | ||||
| -rw-r--r-- | npc/warps/cities/moscovia.txt | 52 | ||||
| -rw-r--r-- | npc/warps/dungeons/mosk_dun.txt | 9 |
5 files changed, 76 insertions, 31 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt index a8b4cb406..7588ec717 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -2,6 +2,7 @@ Date Added ====== 2008/06/13 + * Updated moscovia.txt inn.txt mosk_dun.txt shops.txt from jA * Converted getskilllv and skill commands integers to strings. Follow up on r12814 * Fixed stripped hairband and blue hairband checking the wrong amount of items, bugreport:1674 [Brainstorm] 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 diff --git a/npc/warps/cities/moscovia.txt b/npc/warps/cities/moscovia.txt index e0bb8fd6f..3a0d88f23 100644 --- a/npc/warps/cities/moscovia.txt +++ b/npc/warps/cities/moscovia.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= $ephiroth //===== Current Version: ===================================== -//= 1.0 +//= 1.2 //===== Compatible With: ===================================== //= Any Athena Version //===== Description: ========================================= @@ -12,36 +12,36 @@ //= 1.0 Initial version [$ephiroth] //= 1.1 Fixed "Private House" Warps. [Samuray22] // -Thanks to $ephiroth +//= 1.2 Updated from jA //============================================================ // ---[ Mansion ]--- -moscovia,224,235,0 warp moskwarp1001 1,1,mosk_in,96,91 -mosk_in,93,91,0 warp moskwarp1002 1,1,moscovia,224,232 -mosk_in,100,126,0 warp moskwarp1003 1,1,mosk_in,21,116 -mosk_in,21,113,0 warp moskwarp1004 1,1,mosk_in,100,123 +moscovia,256,138,0 warp moskwarp1001 1,1,mosk_in,96,61 +mosk_in,93,61,0 warp moskwarp1002 1,1,moscovia,255,140 +mosk_in,99,126,0 warp moskwarp1003 1,1,mosk_in,21,116 +mosk_in,21,113,0 warp moskwarp1004 1,1,mosk_in,99,123 // ---[ Weapon House ]--- -moscovia,185,189,0 warp moskwarp1005 1,1,mosk_in,16,179 -mosk_in,13,179,0 warp moskwarp1006 1,1,moscovia,188,193 -moscovia,203,171,0 warp moskwarp1007 1,1,mosk_in,85,179 -mosk_in,88,179,0 warp moskwarp1008 1,1,moscovia,205,168 +moscovia,185,188,0 warp moskwarp1005 1,1,mosk_in,15,179 +mosk_in,12,179,0 warp moskwarp1006 1,1,moscovia,186,191 +moscovia,203,171,0 warp moskwarp1007 1,1,mosk_in,86,180 +mosk_in,89,180,0 warp moskwarp1008 1,1,moscovia,204,169 // ---[ Instrument House / Tool Dealer ]--- -moscovia,223,174,0 warp moskwarp1009 1,1,mosk_in,14,245 -mosk_in,11,245,0 warp moskwarp1010 1,1,moscovia,220,177 +moscovia,223,174,0 warp moskwarp1009 1,1,mosk_in,14,246 +mosk_in,11,246,0 warp moskwarp1010 1,1,moscovia,222,176 // ---[ Inn ]--- -moscovia,229,207,0 warp moskwarp1011 1,1,mosk_in,141,178 -mosk_in,141,175,0 warp moskwarp1012 1,1,moscovia,226,204 -mosk_in,150,191,0 warp moskwarp1013 1,1,mosk_in,206,187 -mosk_in,203,187,0 warp moskwarp1014 1,1,mosk_in,147,191 +moscovia,229,208,0 warp moskwarp1011 1,1,mosk_in,142,178 +mosk_in,142,175,0 warp moskwarp1012 1,1,moscovia,227,207 +mosk_in,150,192,0 warp moskwarp1013 1,1,mosk_in,204,188 +mosk_in,202,188,0 warp moskwarp1014 1,1,mosk_in,148,192 // ---[ Mansion ]--- -moscovia,256,138,0 warp moskwarp1015 1,1,mosk_in,211,114 -mosk_in,211,111,0 warp moskwarp1016 1,1,moscovia,254,141 -mosk_in,221,128,0 warp moskwarp1017 1,1,mosk_in,287,120 -mosk_in,287,117,0 warp moskwarp1018 1,1,mosk_in,221,125 +moscovia,256,179,0 warp moskwarp1015 1,1,mosk_in,211,114 +mosk_in,211,111,0 warp moskwarp1016 1,1,moscovia,253,179 +mosk_in,222,128,0 warp moskwarp1017 1,1,mosk_in,288,118 +mosk_in,288,116,0 warp moskwarp1018 1,1,mosk_in,222,126 // ---[ Private House ]--- -moscovia,195,80,0 warp moskwarp1019 1,1,mosk_in,215,40 -mosk_in,215,37,0 warp moskwarp1020 1,1,moscovia,194,78 -// ---[ Private House ]--- -moscovia,205,98,0 warp moskwarp1021 1,1,mosk_in,213,256 -mosk_in,213,253,0 warp moskwarp1022 1,1,moscovia,202,96 -mosk_in,219,272,0 warp moskwarp1023 1,1,mosk_in,151,276 -mosk_in,151,273,0 warp moskwarp1024 1,1,mosk_in,219,269 +moscovia,205,98,0 warp moskwarp1021 1,1,mosk_in,214,255 +mosk_in,214,252,0 warp moskwarp1022 1,1,moscovia,203,96 +mosk_in,220,273,0 warp moskwarp1023 1,1,mosk_in,152,275 +mosk_in,152,272,0 warp moskwarp1024 1,1,mosk_in,220,270 + +mosk_in,215,36,0 warp moskwarp1025 1,1,mosk_dun02,53,217 diff --git a/npc/warps/dungeons/mosk_dun.txt b/npc/warps/dungeons/mosk_dun.txt index 55d31b40d..dc2693f14 100644 --- a/npc/warps/dungeons/mosk_dun.txt +++ b/npc/warps/dungeons/mosk_dun.txt @@ -3,18 +3,19 @@ //===== By: ================================================== //= $ephiroth //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= Any Athena Version //===== Description: ========================================= //= Warp Points for Moscovia Dungeon //===== Additional Comments: ================================= //= 1.0 Initial version [$ephiroth] +//= 1.1 Updated ftom jA //============================================================ -mosk_fild02,190,256,0 warp moskwarp4001 1,1,mosk_dun01,190,46 -mosk_dun01,190,43,0 warp moskwarp4002 1,1,mosk_fild02,190,253 - +mosk_fild02,190,257,0 warp moscoviawarp0401 1,1,mosk_dun01,189,45 +mosk_dun02,53,220,0 warp moscoviawarp0101 1,1,mosk_in,215,41 +mosk_dun01,189,42,0 warp moscoviawarp0501 1,1,mosk_fild02,190,254 mosk_dun01,200,272,0 warp moskwarp4003 1,1,mosk_dun02,163,31 mosk_dun02,165,28,0 warp moskwarp4004 1,1,mosk_dun01,200,269 |