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

1 files changed, 24 insertions, 21 deletions

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
@@ -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/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