From b773ff2c33884e924a34221a49af38bca1d185a4 Mon Sep 17 00:00:00 2001 From: daegaladh Date: Mon, 16 Jul 2012 15:32:00 +0000 Subject: Disabled and removed all renewal-only scripts from pre-re folder. You still can enable them in pre-renewal scripts conf files, but scripts are read from the re folder. Follow up r16387. Splitted some renewal-only NPCs from renters.txt into another file. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16430 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/re/merchants/renters.txt | 170 +------------------------------------------ npc/re/scripts_athena.conf | 45 ++++++------ npc/re/scripts_monsters.conf | 38 +++++----- npc/re/scripts_warps.conf | 35 +++++---- 4 files changed, 68 insertions(+), 220 deletions(-) (limited to 'npc/re') diff --git a/npc/re/merchants/renters.txt b/npc/re/merchants/renters.txt index a0a866ca5..0b7cafdd4 100644 --- a/npc/re/merchants/renters.txt +++ b/npc/re/merchants/renters.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88, mod by Lupus //===== Current Version: ===================================== -//= 2.0 +//= 2.1 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -22,6 +22,7 @@ //= 1.8 Added 3rd Job creature NPCs (Dragon/Gryphon) [L0ne_W0lf] //= 1.9 Enabled Gryphon Renter NPC and added Mado Gear NPC. [Masao] //= 2.0 Fixed problems with third classes and new mounts. [Euphy] +//= 2.1 Moved some renters to a separate renewal file. [Daegaladh] //============================================================ // PecoPeco Breeder (for Knights)------------------------------------------- @@ -211,171 +212,4 @@ hu_in01,381,304,5 script Falcon Breeder#hnt 105,{ mes "...Heh heh, jealous?"; close; } -} - -// Dragon Breeder on the Rune Knight job change map, couldn't find NPC on iRO. -job3_rune01,88,62,5 script Dragon Breeder 105,{ - mes "[Dragon Breeder]"; - if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) { - mes "Welcome. Would you like to rent a Dragon?"; - next; - switch(select("Yes:No")) { - case 1: - //if (!getskilllv("RK_DRAGONTRAINING")) { - if (!getskilllv("KN_RIDING")) { - mes "[Dragon Breeder]"; - mes "Please learn how to ride a Dragon first."; - close; - } - else if (checkriding()) { - mes "[Dragon Breeder]"; - mes "You already have a Dragon."; - close; - } - else if(ismounting()) { - mes "[Dragon Breeder]"; - mes "Please remove your cash mount."; - close; - } - setdragon; - close; - case 2: - mes "[Dragon Breeder]"; - mes "I see. Then have a great day."; - close; - } - } - mes "What are you doing here?"; - mes "Only Rune Knights can rent a Dragon."; - close; -} - -// Dragon/Gryphon Master -prontera,130,213,5 script Riding Creature Master 105,{ - mes "[Riding Creature Master]"; - if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) { - mes "Welcome. Would you like to rent a Dragon?"; - next; - switch(select("Yes:No")) { - case 1: - //if (!getskilllv("RK_DRAGONTRAINING")) { - if (!getskilllv("KN_RIDING")) { - mes "[Riding Creature Master]"; - mes "Please learn how to ride a Dragon first."; - close; - } - else if (checkriding()) { - mes "[Riding Creature Master]"; - mes "You already have a Dragon."; - close; - } - else if(ismounting()) { - mes "[Riding Creature Master]"; - mes "Please remove your cash mount."; - close; - } - setdragon; - close; - case 2: - mes "[Riding Creature Master]"; - mes "I see. Then have a great day."; - close; - } - } - if (Class == Job_Royal_Guard || Class == Job_Royal_Guard_T || Class == Job_Baby_Guard) { - mes "Welcome. Would you like to rent a Gryphon?"; - next; - switch(select("Yes:No")) { - case 1: - if(!getskilllv("KN_RIDING")) { - mes "[Riding Creature Master]"; - mes "Please learn how to ride a Gryphon first."; - close; - } - else if (checkriding()) { - mes "[Riding Creature Master]"; - mes "You already have a Gryphon."; - close; - } - else if(ismounting()) { - mes "[Riding Creature Master]"; - mes "Please remove your cash mount."; - close; - } - setriding; - close; - case 2: - mes "[Riding Creature Master]"; - mes "I see. Then have a great day."; - close; - } - } - mes "I'm here to provide Rune Knights and Royal Guards with riding creatures."; - close; -} - -// Peco removing NPC -prontera,125,208,5 script Peco Peco Remover 105,{ - mes "[Soldier]"; - mes "If you're unable to dismount from a Peco Peco"; - mes "for some unknown reason,"; - mes "please feel free to use my services."; - if (checkriding()) { - next; - mes "[Soldier]"; - mes "You're riding a Peco Peco."; - mes "Would you like to dismount?"; - next; - switch(select("Yes:No")) { - case 1: - setriding 0; - mes "[Soldier]"; - mes "Say, how does it feel to"; - mes "step on the ground on your own"; - mes "feet again?"; - close; - case 2: - mes "[Soldier]"; - mes "I see. Please feel free to ask me"; - mes "if you change your mind."; - close; - } - } - close; -} - -// Magic Gear Renter -prontera,163,178,4 script Magic Gear Master 105,{ - mes "[Magic Gear Master]"; - if (Class == Job_Mechanic || Class == Job_Mechanic_T || Class == Job_Baby_Mechanic) { - mes "Welcome. Would you like to rent a Magic Gear?"; - next; - switch(select("Yes:No")) { - case 1: - if (!getskilllv("NC_MADOLICENCE")) { - mes "[Magic Gear Master]"; - mes "Please learn how to use a Magic Gear first."; - close; - } - else if (checkmadogear()) { - mes "[Magic Gear Master]"; - mes "You already have a Magic Gear."; - close; - } - else if(ismounting()) { - mes "[Magic Gear Master]"; - mes "Please remove your cash mount."; - close; - } - setmadogear; - close; - case 2: - mes "[Magic Gear Master]"; - mes "I see. Then have a great day."; - close; - } - } - mes "How may I help you?"; - mes "Magic Gears are only available for Mechanics."; - close; } \ No newline at end of file diff --git a/npc/re/scripts_athena.conf b/npc/re/scripts_athena.conf index 4e02ec6b3..7c91a6dd7 100644 --- a/npc/re/scripts_athena.conf +++ b/npc/re/scripts_athena.conf @@ -2,16 +2,18 @@ // - Core Scripts - // -------------------------------------------------------------- +// -------------------------------------------------------------- +// ------------------------- RE - Cities ------------------------ +npc: npc/re/cities/brasilis.txt +npc: npc/re/cities/dewata.txt +npc: npc/re/cities/dicastes.txt // -------------------------------------------------------------- // --------------------------- Cities --------------------------- npc: npc/re/cities/alberta.txt npc: npc/re/cities/aldebaran.txt npc: npc/re/cities/amatsu.txt npc: npc/re/cities/ayothaya.txt -npc: npc/re/cities/brasilis.txt npc: npc/re/cities/comodo.txt -npc: npc/re/cities/dewata.txt -npc: npc/re/cities/dicastes.txt npc: npc/re/cities/einbech.txt npc: npc/re/cities/einbroch.txt npc: npc/re/cities/geffen.txt @@ -34,6 +36,13 @@ npc: npc/re/cities/umbala.txt npc: npc/re/cities/veins.txt npc: npc/re/cities/yuno.txt // -------------------------------------------------------------- +// ----------------------- RE - Merchant ------------------------ +npc: npc/re/merchants/shops_re.txt +npc: npc/re/merchants/renters_re.txt +npc: npc/re/merchants/3rd_trader.txt +npc: npc/re/merchants/diamond.txt +npc: npc/re/merchants/falcon_flute.txt +// -------------------------------------------------------------- // -------------------------- Merchant -------------------------- npc: npc/re/merchants/shops.txt npc: npc/re/merchants/refine.txt @@ -62,11 +71,7 @@ npc: npc/re/merchants/manuk.txt npc: npc/re/merchants/splendide.txt npc: npc/re/merchants/wander_pet_food.txt npc: npc/re/merchants/buying_shops.txt -npc: npc/re/merchants/3rd_trader.txt -npc: npc/re/merchants/diamond.txt npc: npc/re/merchants/cashheadgear_dye.txt -npc: npc/re/merchants/falcon_flute.txt -npc: npc/re/merchants/shops_re.txt // -------------------------------------------------------------- // ------------------------- Cash Shop -------------------------- // See file before enabling, as you may wish to change the @@ -85,10 +90,20 @@ npc: npc/re/airports/rachel.txt npc: npc/re/airports/yuno.txt // -------------------------------------------------------------- // ------------------------- RE - Quests ------------------------ -// npc: npc/re/quests/cupet.txt +//npc: npc/re/quests/cupet.txt npc: npc/re/quests/magic_books.txt npc: npc/re/quests/pile_bunker.txt - +// Eden Group +npc: npc/re/quests/eden/eden_common.txt +npc: npc/re/quests/eden/eden_service.txt +npc: npc/re/quests/eden/eden_quests.txt +npc: npc/re/quests/eden/11-25.txt +npc: npc/re/quests/eden/26-40.txt +npc: npc/re/quests/eden/41-55.txt +npc: npc/re/quests/eden/56-70.txt +npc: npc/re/quests/eden/71-85.txt +npc: npc/re/quests/eden/86-90.txt +npc: npc/re/quests/eden/91-99.txt // -------------------------------------------------------------- // --------------------------- Quests --------------------------- npc: npc/re/quests/quests_alberta.txt @@ -203,18 +218,6 @@ npc: npc/re/quests/okolnir/godse_sch04.txt npc: npc/re/quests/okolnir/godse_sch05.txt npc: npc/re/quests/quests_13_1.txt npc: npc/re/quests/quests_13_2.txt -// Eden Group -npc: npc/re/quests/eden/eden_common.txt -npc: npc/re/quests/eden/eden_service.txt -npc: npc/re/quests/eden/eden_quests.txt -npc: npc/re/quests/eden/11-25.txt -npc: npc/re/quests/eden/26-40.txt -npc: npc/re/quests/eden/41-55.txt -npc: npc/re/quests/eden/56-70.txt -npc: npc/re/quests/eden/71-85.txt -npc: npc/re/quests/eden/86-90.txt -npc: npc/re/quests/eden/91-99.txt -npc: npc/re/quests/homu_s.txt // -------------------------------------------------------------- // --------------------------- Guides --------------------------- npc: npc/re/guides/guides_alberta.txt diff --git a/npc/re/scripts_monsters.conf b/npc/re/scripts_monsters.conf index ccb880db0..a0646893b 100644 --- a/npc/re/scripts_monsters.conf +++ b/npc/re/scripts_monsters.conf @@ -1,3 +1,23 @@ +// -------------------------------------------------------------- +// - RE Monster Scripts - +// -------------------------------------------------------------- +npc: npc/re/mobs/towns/brasilis.txt + +npc: npc/re/mobs/fields/brasilis.txt +npc: npc/re/mobs/fields/bifrost.txt +npc: npc/re/mobs/fields/dewata.txt +npc: npc/re/mobs/fields/dicastes.txt +npc: npc/re/mobs/fields/malaya.txt +npc: npc/re/mobs/fields/splendide.txt + +npc: npc/re/mobs/dungeons/bra_dun.txt +npc: npc/re/mobs/dungeons/dew_dun.txt +npc: npc/re/mobs/dungeons/dic_dun.txt +npc: npc/re/mobs/dungeons/iz_dun_re.txt +npc: npc/re/mobs/dungeons/lhz_dun_re.txt +npc: npc/re/mobs/dungeons/ma_dun.txt +npc: npc/re/mobs/dungeons/mal_dun.txt + // -------------------------------------------------------------- // - Monster Scripts - // -------------------------------------------------------------- @@ -6,13 +26,9 @@ npc: npc/re/mobs/pvp.txt npc: npc/re/mobs/jail.txt npc: npc/re/mobs/bossnia.txt -npc: npc/re/mobs/towns/brasilis.txt - npc: npc/re/mobs/fields/amatsu.txt npc: npc/re/mobs/fields/ayothaya.txt -npc: npc/re/mobs/fields/brasilis.txt npc: npc/re/mobs/fields/comodo.txt -//dicastes is in scripts_renewal.conf npc: npc/re/mobs/fields/einbroch.txt npc: npc/re/mobs/fields/geffen.txt npc: npc/re/mobs/fields/gonryun.txt @@ -29,15 +45,9 @@ npc: npc/re/mobs/fields/niflheim.txt npc: npc/re/mobs/fields/payon.txt npc: npc/re/mobs/fields/prontera.txt npc: npc/re/mobs/fields/rachel.txt -//splendide fields is in scripts_renewal.conf npc: npc/re/mobs/fields/umbala.txt npc: npc/re/mobs/fields/veins.txt npc: npc/re/mobs/fields/yuno.txt -npc: npc/re/mobs/fields/bifrost.txt -npc: npc/re/mobs/fields/dewata.txt -npc: npc/re/mobs/fields/dicastes.txt -npc: npc/re/mobs/fields/malaya.txt -npc: npc/re/mobs/fields/splendide.txt npc: npc/re/mobs/dungeons/abbey.txt npc: npc/re/mobs/dungeons/abyss.txt @@ -46,9 +56,7 @@ npc: npc/re/mobs/dungeons/ama_dun.txt npc: npc/re/mobs/dungeons/anthell.txt npc: npc/re/mobs/dungeons/ayo_dun.txt npc: npc/re/mobs/dungeons/beach_dun.txt -npc: npc/re/mobs/dungeons/bra_dun.txt npc: npc/re/mobs/dungeons/c_tower.txt -//dicastes is in scripts_renewal.conf npc: npc/re/mobs/dungeons/ein_dun.txt npc: npc/re/mobs/dungeons/gef_dun.txt npc: npc/re/mobs/dungeons/gefenia.txt @@ -80,10 +88,4 @@ npc: npc/re/mobs/dungeons/treasure.txt npc: npc/re/mobs/dungeons/tur_dun.txt npc: npc/re/mobs/dungeons/xmas_dun.txt npc: npc/re/mobs/dungeons/yggdrasil.txt -npc: npc/re/mobs/dungeons/lhz_dun_re.txt -npc: npc/re/mobs/dungeons/iz_dun_re.txt -npc: npc/re/mobs/dungeons/dew_dun.txt -npc: npc/re/mobs/dungeons/dic_dun.txt -npc: npc/re/mobs/dungeons/ma_dun.txt -npc: npc/re/mobs/dungeons/mal_dun.txt // -------------------------------------------------------------- diff --git a/npc/re/scripts_warps.conf b/npc/re/scripts_warps.conf index 9c3fd8d31..a55970805 100644 --- a/npc/re/scripts_warps.conf +++ b/npc/re/scripts_warps.conf @@ -1,3 +1,25 @@ +// -------------------------------------------------------------- +// - RE Warp Scripts - +// -------------------------------------------------------------- + +// --------------------------- Cities --------------------------- +npc: npc/re/warps/cities/brasilis.txt +npc: npc/re/warps/cities/dewata.txt +npc: npc/re/warps/cities/dicastes.txt +npc: npc/re/warps/cities/eclage.txt +npc: npc/re/warps/cities/malangdo.txt +npc: npc/re/warps/cities/malaya.txt +// -------------------------- Dungeons -------------------------- +npc: npc/re/warps/dungeons/bra_dun.txt +npc: npc/re/warps/dungeons/dic_dun.txt +npc: npc/re/warps/dungeons/ecl_dun.txt +// --------------------------- Fields --------------------------- +npc: npc/re/warps/fields/bif_fild.txt +npc: npc/re/warps/fields/bra_fild.txt +npc: npc/re/warps/fields/dic_fild.txt +npc: npc/re/warps/fields/man_fild.txt + + // -------------------------------------------------------------- // - Warp Scripts - // -------------------------------------------------------------- @@ -7,11 +29,7 @@ npc: npc/re/warps/cities/alberta.txt npc: npc/re/warps/cities/aldebaran.txt npc: npc/re/warps/cities/amatsu.txt npc: npc/re/warps/cities/ayothaya.txt -npc: npc/re/warps/cities/brasilis.txt npc: npc/re/warps/cities/comodo.txt -npc: npc/re/warps/cities/dewata.txt -npc: npc/re/warps/cities/dicastes.txt -npc: npc/re/warps/cities/eclage.txt npc: npc/re/warps/cities/einbech.txt npc: npc/re/warps/cities/einbroch.txt npc: npc/re/warps/cities/geffen.txt @@ -21,8 +39,6 @@ npc: npc/re/warps/cities/izlude.txt npc: npc/re/warps/cities/lighthalzen.txt npc: npc/re/warps/cities/louyang.txt npc: npc/re/warps/cities/lutie.txt -npc: npc/re/warps/cities/malangdo.txt -npc: npc/re/warps/cities/malaya.txt npc: npc/re/warps/cities/manuk.txt npc: npc/re/warps/cities/mid_camp.txt npc: npc/re/warps/cities/morroc.txt @@ -45,10 +61,7 @@ npc: npc/re/warps/dungeons/ama_dun.txt npc: npc/re/warps/dungeons/anthell.txt npc: npc/re/warps/dungeons/ayo_dun.txt npc: npc/re/warps/dungeons/beach_dun.txt -npc: npc/re/warps/dungeons/bra_dun.txt npc: npc/re/warps/dungeons/c_tower.txt -npc: npc/re/warps/dungeons/dic_dun.txt -npc: npc/re/warps/dungeons/ecl_dun.txt npc: npc/re/warps/dungeons/ein_dun.txt npc: npc/re/warps/dungeons/gef_dun.txt npc: npc/re/warps/dungeons/gon_dun.txt @@ -77,10 +90,7 @@ npc: npc/re/warps/dungeons/xmas_dun.txt // --------------------------- Fields --------------------------- npc: npc/re/warps/fields/abyss_warper.txt npc: npc/re/warps/fields/amatsu_fild.txt -npc: npc/re/warps/fields/bif_fild.txt -npc: npc/re/warps/fields/bra_fild.txt npc: npc/re/warps/fields/com_fild.txt -npc: npc/re/warps/fields/dic_fild.txt npc: npc/re/warps/fields/ein_fild.txt npc: npc/re/warps/fields/gefenia.txt npc: npc/re/warps/fields/geffen_fild.txt @@ -89,7 +99,6 @@ npc: npc/re/warps/fields/hugel_fild.txt npc: npc/re/warps/fields/jawaii.txt npc: npc/re/warps/fields/lhalzen_fild.txt npc: npc/re/warps/fields/lutie_fild.txt -npc: npc/re/warps/fields/man_fild.txt npc: npc/re/warps/fields/morroc_fild.txt npc: npc/re/warps/fields/mtmjolnir.txt npc: npc/re/warps/fields/payon_fild.txt -- cgit v1.2.3-70-g09d2