diff options
| -rw-r--r-- | npc/Changelog.txt | 2 | ||||
| -rw-r--r-- | npc/cities/brasilis.txt | 88 | ||||
| -rw-r--r-- | npc/guides/guides_brasilis.txt | 110 | ||||
| -rw-r--r-- | npc/kafras/kafras_brasilis.txt | 35 | ||||
| -rw-r--r-- | npc/merchants/inn.txt | 48 | ||||
| -rw-r--r-- | npc/merchants/shops.txt | 28 | ||||
| -rw-r--r-- | npc/scripts_athena.conf | 3 | ||||
| -rw-r--r-- | npc/scripts_warps.conf | 1 |
8 files changed, 306 insertions, 9 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt index 36c88d854..a0bfe2fd8 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,5 +1,7 @@ Date Added ====== +2010/05/20 + * Rev. 14299 Added some Brasilis basic NPCs. [L0ne_W0lf] 2010/03/23 * Rev. 14269 Fixed a couple bugs in the episode 13.x quests. [L0ne_W0lf] - Fixed Half-buried Gem#1 not re-enabling. (bugreport:4129) diff --git a/npc/cities/brasilis.txt b/npc/cities/brasilis.txt new file mode 100644 index 000000000..5682c037c --- /dev/null +++ b/npc/cities/brasilis.txt @@ -0,0 +1,88 @@ +//===== eAthena Script ======================================= +//= Brasilis Town +//===== By: ================================================== +//= L0ne_W0lf +//===== Current Version: ===================================== +//= 1.0 +//===== Compatible With: ===================================== +//= eAthena SVN +//===== Description: ========================================= +//= [Aegis Conversion] +//= Brasilis Town Script +//===== Additional Comments: ================================= +//= 1.0 First version. Transportation and Basic NPCs. +//============================================================ + +alberta,247,115,3 script Brute Sailor#bra2 100,{ + mes "[Brute Sailor]"; + mes "Hey, have you heard of the place called Brasilis?"; + mes "It's a place that's as hot as the Morroc desert, and as dense as the forests of Payon."; + next; + mes "[Brute Sailor]"; + mes "I have a map to get there, if you want I can take you to Brasilis."; + mes "It will only cost you 10,000 zeny. What do you say?"; + next; + switch(select("Let's go to Brasilis!:Cancel.")) { + case 1: + if (Zeny > 9999 ) { + mes "[Brute Sailor]"; + mes "Great! Let's Go!"; + close2; + warp "brasilis",314,60; + end; + } + else { + mes "[Brute Sailor]"; + mes "I'm sorry but you don't have"; + mes "enough zeny now"; + mes "You need 10,000 zeny"; + mes "to go to Brasilis"; + mes "Thank you."; + close; + } + case 2: + mes "[Brute Sailor]"; + mes "Let me know if you change your mind."; + close; + } +} + +brasilis,316,57,3 script Brute Sailor#bra1 100,{ + mes "[Brute Sailor]"; + mes "My ship will be heading back to Alberta soon, would you like to go back?"; + next; + switch(select("Return to Alberta.:Cancel.")) { + case 1: + mes "[Brute Sailor]"; + mes "Alright, lets get going!"; + close2; + warp "alberta",244,115; + end; + case 2: + mes "[Brute Sailor]"; + mes "Let me know if you change your mind."; + close; + } +} + +brasilis,278,137,3 script Bulletin Board#bra1 858,{ + mes ":: Happy Toucan Inn ::"; + close; +} + +brasilis,244,248,1 script Bulletin Board#bra2 858,{ + mes ":: Brasilis Market ::"; + close; +} + +brasilis,155,165,3 script Bulletin Board#bra3 858,{ + mes ":: Brasilis Art Museum ::"; + close; +} + +brasilis,303,309,3 script Bulletin Board#bra4 858,{ + mes ":: Jungle Cable ::"; + mes " "; + mes "- Not recommended for the faint hearted! -"; + close; +} diff --git a/npc/guides/guides_brasilis.txt b/npc/guides/guides_brasilis.txt new file mode 100644 index 000000000..05b44e0d8 --- /dev/null +++ b/npc/guides/guides_brasilis.txt @@ -0,0 +1,110 @@ +//===== eAthena Script ======================================= +//= Brasilis Guide +//===== By: ================================================== +//= L0ne_W0lf +//===== Current Version: ===================================== +//= 1.0 +//===== Compatible With: ===================================== +//= eAthena SVN +//===== Description: ========================================= +//= [Aegis Conversion] +//= Guide for the city of Brasilis +//===== Additional Comments: ================================= +//= 1.0 First Version. +//============================================================ + +brasilis,219,97,3 script Brasilis Guide 478,{ + mes "[Brasilis Guide]"; + mes "Welcome to everyone that has come to Brasilis, a wonderfull land with"; + mes "a warm sun shining down on us."; + mes "If you have any question, just ask me."; + next; + switch(select("Ask where you can go.:Delete marks on the mini-map.:Cancel.")) { + case 1: + set .@compass_check,0; + mes "[Brasilis Guide]"; + mes "Where would you like to go?"; + if (.@compass_check == 0) { + mes "Would you like me"; + mes "to mark locations"; + mes "on your Mini-Map?"; + next; + switch(select("Yes:No")) { + case 1: + set .@compass_check,1; + break; + case 2: + set .@compass_check,2; + break; + } + } + next; + switch(select("Toucan Happy Inn:Jungle Cable:Art Museum:Brasilis Market:Cancel")) { + case 1: + mes "[Brasilis Guide]"; + mes "The Toucan Happy Inn is near here, it's located here ^FF0000+^000000."; + if (.@compass_check == 1) { + viewpoint 1,273,149,2,0xFF0000; + } + else { + viewpoint 0,273,149,2,0xFF0000; + } + break; + case 2: + mes "[Brasilis Guide]"; + mes "Want to travel to the Jungle? You can"; + mes "go to the Jungle Cable located here ^0xCC6600+^000000."; + if (.@compass_check == 1) { + viewpoint 1,308,333,3,0xCC6600; + } + else { + viewpoint 0,308,333,3,0xCC6600; + } + break; + case 3: + mes "[Brasilis Guide]"; + mes "The Art Museum, is the pride of Brasilis, it is located here ^00FF00+^000000."; + if (.@compass_check == 1) { + viewpoint 1,133,167,4,0x00FF00; + } + else { + viewpoint 0,133,167,4,0x00FF00; + } + break; + case 4: + mes "[Brasilis Guide]"; + mes "You can buy many items in the Market located here ^00FF00+^000000."; + if (.@compass_check == 1) { + viewpoint 1,238,248,5,0x00FF00; + } + else { + viewpoint 0,238,248,5,0x00FF00; + } + break; + case 5: + mes "[Brasilis Guide]"; + mes "If you want to delete the location"; + mes "marks from your mini-map, please"; + mes "choose 'Delete marks on the"; + mes "mini-map' from the menu."; + close; + } + break; + case 2: + viewpoint 2,273,149,2,0xFF0000; + viewpoint 2,308,333,3,0xCC6600; + viewpoint 0,133,167,4,0x00FF00; + viewpoint 0,238,248,5,0x00FF00; + set .@compass_check,0; + mes "[Brasilis Guide]"; + mes "I've deleted all marks on the mini-map."; + mes "Whenever you'd like to put marks"; + mes "there, you can ask me."; + close; + case 3: + mes "[Brasilis Guide]"; + mes "Exploring things here on your own can also be fun."; + mes "Anyway, take care."; + close; + } +} diff --git a/npc/kafras/kafras_brasilis.txt b/npc/kafras/kafras_brasilis.txt new file mode 100644 index 000000000..f71fdecc9 --- /dev/null +++ b/npc/kafras/kafras_brasilis.txt @@ -0,0 +1,35 @@ +//===== eAthena Script ======================================= +//= Brasilis Kafra +//===== By: ========================= +//= L0ne_W0lf +//===== Current Version: =================== +//= 1.0 +//===== Compatible With: ===================== +//= eAthena 1.0 +//===== Description: ============================================ +//= Description of argument settings for callfunc "F_Kafra". +//= arg(0): When set at 0 the default Kafra message is displayed. +//= When set to 1 the Niflhiem Kafra message is displayed. +//= When set to 2 the Guild Kafra message is displayed. +//= arg(1): Set to 1 to disable teleport menu option. Otherwise set to 0. +//= arg(2): Set to 1 to disable info menu. Otherwise set to 0. +//= arg(3): Cost of Storage service +//= arg(4): Cost of Rent a Pushcart service +//===== Additional Comments: ========================================== +//= v1.0 First version. +//===================================================================== + +brasilis,197,221,4 script Kafra Employee::kaf_bra 117,{ + cutin "kafra_01",2; + mes "[Kafra Employee]"; + mes "Welcome to the"; + mes "Kafra Corporation."; + mes "The Kafra services"; + mes "are always on your side."; + mes "How may I assist you?"; + callfunc "F_Kafra",5,3,0,80,700; + + M_Save: + savepoint "brasilis",197,219; + callfunc "F_KafEnd",0,1,"in the city of Brasilis"; +} 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 diff --git a/npc/scripts_athena.conf b/npc/scripts_athena.conf index 1b7630037..05ac01467 100644 --- a/npc/scripts_athena.conf +++ b/npc/scripts_athena.conf @@ -8,6 +8,7 @@ npc: npc/cities/alberta.txt npc: npc/cities/aldebaran.txt npc: npc/cities/amatsu.txt npc: npc/cities/ayothaya.txt +npc: npc/cities/brasilis.txt npc: npc/cities/comodo.txt npc: npc/cities/einbech.txt npc: npc/cities/einbroch.txt @@ -165,6 +166,7 @@ npc: npc/guides/guides_alb.txt npc: npc/guides/guides_alde.txt npc: npc/guides/guides_ama.txt npc: npc/guides/guides_ayo.txt +npc: npc/guides/guides_brasilis.txt npc: npc/guides/guides_cmd.txt npc: npc/guides/guides_einbe.txt npc: npc/guides/guides_einbr.txt @@ -189,6 +191,7 @@ npc: npc/guides/guides_veins.txt npc: npc/kafras/functions_kafras.txt npc: npc/kafras/kafras_alb.txt npc: npc/kafras/kafras_alde.txt +npc: npc/kafras/kafras_brasilis.txt npc: npc/kafras/kafras_com.txt npc: npc/kafras/kafras_dungeons.txt npc: npc/kafras/kafras_gef.txt diff --git a/npc/scripts_warps.conf b/npc/scripts_warps.conf index ed4c0337d..48d0423e5 100644 --- a/npc/scripts_warps.conf +++ b/npc/scripts_warps.conf @@ -7,6 +7,7 @@ npc: npc/warps/cities/alberta.txt npc: npc/warps/cities/aldebaran.txt npc: npc/warps/cities/amatsu.txt npc: npc/warps/cities/ayothaya.txt +npc: npc/warps/cities/brasilis.txt npc: npc/warps/cities/comodo.txt npc: npc/warps/cities/einbech.txt npc: npc/warps/cities/einbroch.txt |