summaryrefslogtreecommitdiff
path: root/npc/pre-re
diff options
context:
space:
mode:
Diffstat (limited to 'npc/pre-re')
-rw-r--r--npc/pre-re/merchants/renters.txt170
-rw-r--r--npc/pre-re/scripts_athena.conf47
-rw-r--r--npc/pre-re/scripts_jobs.conf26
-rw-r--r--npc/pre-re/scripts_monsters.conf27
-rw-r--r--npc/pre-re/scripts_warps.conf37
5 files changed, 84 insertions, 223 deletions
diff --git a/npc/pre-re/merchants/renters.txt b/npc/pre-re/merchants/renters.txt
index a0a866ca5..0b7cafdd4 100644
--- a/npc/pre-re/merchants/renters.txt
+++ b/npc/pre-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/pre-re/scripts_athena.conf b/npc/pre-re/scripts_athena.conf
index 5a4a1da50..aab693bc3 100644
--- a/npc/pre-re/scripts_athena.conf
+++ b/npc/pre-re/scripts_athena.conf
@@ -3,15 +3,17 @@
// --------------------------------------------------------------
// --------------------------------------------------------------
+// ------------------------- RE - Cities ------------------------
+//npc: npc/re/cities/brasilis.txt
+//npc: npc/re/cities/dewata.txt
+//npc: npc/re/cities/dicastes.txt
+// --------------------------------------------------------------
// --------------------------- Cities ---------------------------
npc: npc/pre-re/cities/alberta.txt
npc: npc/pre-re/cities/aldebaran.txt
npc: npc/pre-re/cities/amatsu.txt
npc: npc/pre-re/cities/ayothaya.txt
-npc: npc/pre-re/cities/brasilis.txt
npc: npc/pre-re/cities/comodo.txt
-npc: npc/pre-re/cities/dewata.txt
-npc: npc/pre-re/cities/dicastes.txt
npc: npc/pre-re/cities/einbech.txt
npc: npc/pre-re/cities/einbroch.txt
npc: npc/pre-re/cities/geffen.txt
@@ -34,6 +36,13 @@ npc: npc/pre-re/cities/umbala.txt
npc: npc/pre-re/cities/veins.txt
npc: npc/pre-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/pre-re/merchants/shops.txt
npc: npc/pre-re/merchants/refine.txt
@@ -62,10 +71,7 @@ npc: npc/pre-re/merchants/manuk.txt
npc: npc/pre-re/merchants/splendide.txt
npc: npc/pre-re/merchants/wander_pet_food.txt
npc: npc/pre-re/merchants/buying_shops.txt
-npc: npc/pre-re/merchants/3rd_trader.txt
-npc: npc/pre-re/merchants/diamond.txt
npc: npc/pre-re/merchants/cashheadgear_dye.txt
-npc: npc/pre-re/merchants/falcon_flute.txt
// --------------------------------------------------------------
// ------------------------- Cash Shop --------------------------
// See file before enabling, as you may wish to change the
@@ -84,10 +90,20 @@ npc: npc/pre-re/airports/rachel.txt
npc: npc/pre-re/airports/yuno.txt
// --------------------------------------------------------------
// ------------------------- RE - Quests ------------------------
-// npc: npc/pre-re/quests/cupet.txt
-npc: npc/pre-re/quests/magic_books.txt
-npc: npc/pre-re/quests/pile_bunker.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/pre-re/quests/quests_alberta.txt
@@ -202,17 +218,6 @@ npc: npc/pre-re/quests/okolnir/godse_sch04.txt
npc: npc/pre-re/quests/okolnir/godse_sch05.txt
npc: npc/pre-re/quests/quests_13_1.txt
npc: npc/pre-re/quests/quests_13_2.txt
-// Eden Group
-npc: npc/pre-re/quests/eden/eden_common.txt
-npc: npc/pre-re/quests/eden/eden_service.txt
-npc: npc/pre-re/quests/eden/eden_quests.txt
-npc: npc/pre-re/quests/eden/11-25.txt
-npc: npc/pre-re/quests/eden/26-40.txt
-npc: npc/pre-re/quests/eden/41-55.txt
-npc: npc/pre-re/quests/eden/56-70.txt
-npc: npc/pre-re/quests/eden/71-85.txt
-npc: npc/pre-re/quests/eden/86-90.txt
-npc: npc/pre-re/quests/eden/91-99.txt
// --------------------------------------------------------------
// --------------------------- Guides ---------------------------
npc: npc/pre-re/guides/guides_alberta.txt
diff --git a/npc/pre-re/scripts_jobs.conf b/npc/pre-re/scripts_jobs.conf
index 760e9560c..28e23d4ab 100644
--- a/npc/pre-re/scripts_jobs.conf
+++ b/npc/pre-re/scripts_jobs.conf
@@ -55,20 +55,20 @@ npc: npc/pre-re/jobs/2-1e/StarGladiator.txt
// -- 2-2E
npc: npc/pre-re/jobs/2-2e/SoulLinker.txt
// -- 3-1
-npc: npc/pre-re/jobs/3-1/archbishop.txt
-npc: npc/pre-re/jobs/3-1/mechanic.txt
-npc: npc/pre-re/jobs/3-1/ranger.txt
-npc: npc/pre-re/jobs/3-1/rune_knight.txt
-npc: npc/pre-re/jobs/3-1/warlock.txt
-//npc: npc/pre-re/jobs/3-1/guillotine.txt
+//npc: npc/re/jobs/3-1/archbishop.txt
+//npc: npc/re/jobs/3-1/mechanic.txt
+//npc: npc/re/jobs/3-1/ranger.txt
+//npc: npc/re/jobs/3-1/rune_knight.txt
+//npc: npc/re/jobs/3-1/warlock.txt
+//npc: npc/re/jobs/3-1/guillotine.txt
// -- 3-2
-npc: npc/pre-re/jobs/3-2/minstrel.txt
-npc: npc/pre-re/jobs/3-2/wanderer.txt
-npc: npc/pre-re/jobs/3-2/royal_guard.txt
-npc: npc/pre-re/jobs/3-2/sorcerer.txt
-npc: npc/pre-re/jobs/3-2/sura.txt
-npc: npc/pre-re/jobs/3-2/shadow_chaser.txt
-npc: npc/pre-re/jobs/3-2/genetic.txt
+//npc: npc/re/jobs/3-2/minstrel.txt
+//npc: npc/re/jobs/3-2/wanderer.txt
+//npc: npc/re/jobs/3-2/royal_guard.txt
+//npc: npc/re/jobs/3-2/sorcerer.txt
+//npc: npc/re/jobs/3-2/sura.txt
+//npc: npc/re/jobs/3-2/shadow_chaser.txt
+//npc: npc/re/jobs/3-2/genetic.txt
// --------------------------------------------------------------
// ------------------------ Skill Quests ------------------------
npc: npc/pre-re/quests/skills/acolyte_skills.txt
diff --git a/npc/pre-re/scripts_monsters.conf b/npc/pre-re/scripts_monsters.conf
index a19706d33..39bfa12b5 100644
--- a/npc/pre-re/scripts_monsters.conf
+++ b/npc/pre-re/scripts_monsters.conf
@@ -1,4 +1,24 @@
// --------------------------------------------------------------
+// - 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 -
// --------------------------------------------------------------
npc: npc/pre-re/mobs/citycleaners.txt
@@ -6,13 +26,9 @@ npc: npc/pre-re/mobs/pvp.txt
npc: npc/pre-re/mobs/jail.txt
npc: npc/pre-re/mobs/bossnia.txt
-npc: npc/pre-re/mobs/towns/brasilis.txt
-
npc: npc/pre-re/mobs/fields/amatsu.txt
npc: npc/pre-re/mobs/fields/ayothaya.txt
-npc: npc/pre-re/mobs/fields/brasilis.txt
npc: npc/pre-re/mobs/fields/comodo.txt
-//dicastes is in scripts_renewal.conf
npc: npc/pre-re/mobs/fields/einbroch.txt
npc: npc/pre-re/mobs/fields/geffen.txt
npc: npc/pre-re/mobs/fields/gonryun.txt
@@ -29,7 +45,6 @@ npc: npc/pre-re/mobs/fields/niflheim.txt
npc: npc/pre-re/mobs/fields/payon.txt
npc: npc/pre-re/mobs/fields/prontera.txt
npc: npc/pre-re/mobs/fields/rachel.txt
-//splendide fields is in scripts_renewal.conf
npc: npc/pre-re/mobs/fields/umbala.txt
npc: npc/pre-re/mobs/fields/veins.txt
npc: npc/pre-re/mobs/fields/yuno.txt
@@ -41,9 +56,7 @@ npc: npc/pre-re/mobs/dungeons/ama_dun.txt
npc: npc/pre-re/mobs/dungeons/anthell.txt
npc: npc/pre-re/mobs/dungeons/ayo_dun.txt
npc: npc/pre-re/mobs/dungeons/beach_dun.txt
-npc: npc/pre-re/mobs/dungeons/bra_dun.txt
npc: npc/pre-re/mobs/dungeons/c_tower.txt
-//dicastes is in scripts_renewal.conf
npc: npc/pre-re/mobs/dungeons/ein_dun.txt
npc: npc/pre-re/mobs/dungeons/gef_dun.txt
npc: npc/pre-re/mobs/dungeons/gefenia.txt
diff --git a/npc/pre-re/scripts_warps.conf b/npc/pre-re/scripts_warps.conf
index 154e3b6bc..f986af523 100644
--- a/npc/pre-re/scripts_warps.conf
+++ b/npc/pre-re/scripts_warps.conf
@@ -1,4 +1,26 @@
// --------------------------------------------------------------
+// - 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/pre-re/warps/cities/alberta.txt
npc: npc/pre-re/warps/cities/aldebaran.txt
npc: npc/pre-re/warps/cities/amatsu.txt
npc: npc/pre-re/warps/cities/ayothaya.txt
-npc: npc/pre-re/warps/cities/brasilis.txt
npc: npc/pre-re/warps/cities/comodo.txt
-npc: npc/pre-re/warps/cities/dewata.txt
-npc: npc/pre-re/warps/cities/dicastes.txt
-npc: npc/pre-re/warps/cities/eclage.txt
npc: npc/pre-re/warps/cities/einbech.txt
npc: npc/pre-re/warps/cities/einbroch.txt
npc: npc/pre-re/warps/cities/geffen.txt
@@ -21,8 +39,6 @@ npc: npc/pre-re/warps/cities/izlude.txt
npc: npc/pre-re/warps/cities/lighthalzen.txt
npc: npc/pre-re/warps/cities/louyang.txt
npc: npc/pre-re/warps/cities/lutie.txt
-npc: npc/pre-re/warps/cities/malangdo.txt
-npc: npc/pre-re/warps/cities/malaya.txt
npc: npc/pre-re/warps/cities/manuk.txt
npc: npc/pre-re/warps/cities/mid_camp.txt
npc: npc/pre-re/warps/cities/morroc.txt
@@ -45,10 +61,7 @@ npc: npc/pre-re/warps/dungeons/ama_dun.txt
npc: npc/pre-re/warps/dungeons/anthell.txt
npc: npc/pre-re/warps/dungeons/ayo_dun.txt
npc: npc/pre-re/warps/dungeons/beach_dun.txt
-npc: npc/pre-re/warps/dungeons/bra_dun.txt
npc: npc/pre-re/warps/dungeons/c_tower.txt
-npc: npc/pre-re/warps/dungeons/dic_dun.txt
-npc: npc/pre-re/warps/dungeons/ecl_dun.txt
npc: npc/pre-re/warps/dungeons/ein_dun.txt
npc: npc/pre-re/warps/dungeons/gef_dun.txt
npc: npc/pre-re/warps/dungeons/gon_dun.txt
@@ -72,15 +85,12 @@ npc: npc/pre-re/warps/dungeons/tha_t.txt
npc: npc/pre-re/warps/dungeons/thor_v.txt
npc: npc/pre-re/warps/dungeons/treasure.txt
npc: npc/pre-re/warps/dungeons/tur_dun.txt
-//npc: npc/pre-re/warps/dungeons/um_dun.txt
+npc: npc/pre-re/warps/dungeons/um_dun.txt
npc: npc/pre-re/warps/dungeons/xmas_dun.txt
// --------------------------- Fields ---------------------------
npc: npc/pre-re/warps/fields/abyss_warper.txt
npc: npc/pre-re/warps/fields/amatsu_fild.txt
-npc: npc/pre-re/warps/fields/bif_fild.txt
-npc: npc/pre-re/warps/fields/bra_fild.txt
npc: npc/pre-re/warps/fields/com_fild.txt
-npc: npc/pre-re/warps/fields/dic_fild.txt
npc: npc/pre-re/warps/fields/ein_fild.txt
npc: npc/pre-re/warps/fields/gefenia.txt
npc: npc/pre-re/warps/fields/geffen_fild.txt
@@ -89,7 +99,6 @@ npc: npc/pre-re/warps/fields/hugel_fild.txt
npc: npc/pre-re/warps/fields/jawaii.txt
npc: npc/pre-re/warps/fields/lhalzen_fild.txt
npc: npc/pre-re/warps/fields/lutie_fild.txt
-npc: npc/pre-re/warps/fields/man_fild.txt
npc: npc/pre-re/warps/fields/morroc_fild.txt
npc: npc/pre-re/warps/fields/mtmjolnir.txt
npc: npc/pre-re/warps/fields/payon_fild.txt
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-02 17:01:53 +0000