diff --git a/npc/pre-re/other/arena/arena_aco.txt b/npc/other/arena/arena_aco.txt similarity index 100% rename from npc/pre-re/other/arena/arena_aco.txt rename to npc/other/arena/arena_aco.txt diff --git a/npc/pre-re/other/arena/arena_lvl50.txt b/npc/other/arena/arena_lvl50.txt similarity index 100% rename from npc/pre-re/other/arena/arena_lvl50.txt rename to npc/other/arena/arena_lvl50.txt diff --git a/npc/pre-re/other/arena/arena_lvl60.txt b/npc/other/arena/arena_lvl60.txt similarity index 100% rename from npc/pre-re/other/arena/arena_lvl60.txt rename to npc/other/arena/arena_lvl60.txt diff --git a/npc/pre-re/other/arena/arena_lvl70.txt b/npc/other/arena/arena_lvl70.txt similarity index 100% rename from npc/pre-re/other/arena/arena_lvl70.txt rename to npc/other/arena/arena_lvl70.txt diff --git a/npc/pre-re/other/arena/arena_lvl80.txt b/npc/other/arena/arena_lvl80.txt similarity index 100% rename from npc/pre-re/other/arena/arena_lvl80.txt rename to npc/other/arena/arena_lvl80.txt diff --git a/npc/pre-re/other/arena/arena_party.txt b/npc/other/arena/arena_party.txt similarity index 100% rename from npc/pre-re/other/arena/arena_party.txt rename to npc/other/arena/arena_party.txt diff --git a/npc/pre-re/other/arena/arena_point.txt b/npc/other/arena/arena_point.txt similarity index 100% rename from npc/pre-re/other/arena/arena_point.txt rename to npc/other/arena/arena_point.txt diff --git a/npc/pre-re/other/arena/arena_room.txt b/npc/other/arena/arena_room.txt similarity index 100% rename from npc/pre-re/other/arena/arena_room.txt rename to npc/other/arena/arena_room.txt diff --git a/npc/pre-re/scripts_athena.conf b/npc/pre-re/scripts_athena.conf index b9082d0531..754e365c8c 100644 --- a/npc/pre-re/scripts_athena.conf +++ b/npc/pre-re/scripts_athena.conf @@ -42,16 +42,6 @@ npc: npc/pre-re/merchants/ammo_dealer.txt npc: npc/pre-re/merchants/shops.txt // --------------------------- Others --------------------------- -// - Izlude Battle Arena ---------------------------------------- -npc: npc/pre-re/other/arena/arena_aco.txt -npc: npc/pre-re/other/arena/arena_lvl50.txt -npc: npc/pre-re/other/arena/arena_lvl60.txt -npc: npc/pre-re/other/arena/arena_lvl70.txt -npc: npc/pre-re/other/arena/arena_lvl80.txt -npc: npc/pre-re/other/arena/arena_party.txt -npc: npc/pre-re/other/arena/arena_point.txt -npc: npc/pre-re/other/arena/arena_room.txt -// -------------------------------------------------------------- npc: npc/pre-re/other/bulletin_boards.txt npc: npc/pre-re/other/mercenary_rent.txt npc: npc/pre-re/other/msg_boards.txt diff --git a/npc/pre-re/scripts_warps.conf b/npc/pre-re/scripts_warps.conf index 50e87d0d93..55b3350789 100644 --- a/npc/pre-re/scripts_warps.conf +++ b/npc/pre-re/scripts_warps.conf @@ -19,5 +19,4 @@ npc: npc/pre-re/warps/fields/veins_fild.txt npc: npc/pre-re/warps/fields/yuno_fild.txt // --------------------------- Others --------------------------- -npc: npc/pre-re/warps/other/arena.txt npc: npc/pre-re/warps/other/sign.txt diff --git a/npc/scripts_athena.conf b/npc/scripts_athena.conf index b5126570d0..872005d035 100644 --- a/npc/scripts_athena.conf +++ b/npc/scripts_athena.conf @@ -160,6 +160,16 @@ npc: npc/merchants/wander_pet_food.txt npc: npc/merchants/cashheadgear_dye.txt // --------------------------- Others --------------------------- +// - Izlude Battle Arena ---------------------------------------- +npc: npc/other/arena/arena_aco.txt +npc: npc/other/arena/arena_lvl50.txt +npc: npc/other/arena/arena_lvl60.txt +npc: npc/other/arena/arena_lvl70.txt +npc: npc/other/arena/arena_lvl80.txt +npc: npc/other/arena/arena_party.txt +npc: npc/other/arena/arena_point.txt +npc: npc/other/arena/arena_room.txt +// -------------------------------------------------------------- npc: npc/other/auction.txt npc: npc/other/books.txt npc: npc/other/bulletin_boards.txt diff --git a/npc/scripts_warps.conf b/npc/scripts_warps.conf index 38737b1a94..4a42ccfa2a 100644 --- a/npc/scripts_warps.conf +++ b/npc/scripts_warps.conf @@ -80,6 +80,7 @@ npc: npc/warps/fields/umbala_fild.txt // --------------------------- Others --------------------------- npc: npc/warps/other/airplane.txt +npc: npc/warps/other/arena.txt npc: npc/warps/other/god.txt npc: npc/warps/other/jobquests.txt npc: npc/warps/other/kiel.txt diff --git a/npc/pre-re/warps/other/arena.txt b/npc/warps/other/arena.txt similarity index 100% rename from npc/pre-re/warps/other/arena.txt rename to npc/warps/other/arena.txt