* Follow-up r16430, moved all the RE entries in the .conf files behind the pre-RE entries

* Re-added a missing .conf entry, bugreport:6256
* Edited "WoE Time Explanation" documentation (doc\woe_time_explanation.txt)
* Added Warg documentation to checkoption/setoption, thanks to QQfoolsorellina tid:120670 (doc\script_commands.txt)

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16435 54d463be-8e91-2dee-dedb-b68131a5f0ec

3 files changed, 68 insertions, 69 deletions

diff --git a/npc/pre-re/scripts_athena.conf b/npc/pre-re/scripts_athena.conf
index aab693bc3..0b8f1c9a2 100644
--- a/npc/pre-re/scripts_athena.conf
+++ b/npc/pre-re/scripts_athena.conf
@@ -3,11 +3,6 @@
 // --------------------------------------------------------------
 
 // --------------------------------------------------------------
-// ------------------------- 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
@@ -36,12 +31,10 @@ 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
+// ------------------------- RE - Cities ------------------------
+//npc: npc/re/cities/brasilis.txt
+//npc: npc/re/cities/dewata.txt
+//npc: npc/re/cities/dicastes.txt
 // --------------------------------------------------------------
 // -------------------------- Merchant --------------------------
 npc: npc/pre-re/merchants/shops.txt
@@ -73,6 +66,13 @@ npc: npc/pre-re/merchants/wander_pet_food.txt
 npc: npc/pre-re/merchants/buying_shops.txt
 npc: npc/pre-re/merchants/cashheadgear_dye.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
+// --------------------------------------------------------------
 // ------------------------- Cash Shop --------------------------
 // See file before enabling, as you may wish to change the
 // point value of items to suit your own needs.
@@ -89,22 +89,6 @@ npc: npc/pre-re/airports/lighthalzen.txt
 npc: npc/pre-re/airports/rachel.txt
 npc: npc/pre-re/airports/yuno.txt
 // --------------------------------------------------------------
-// ------------------------- RE - Quests ------------------------
-//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
 npc: npc/pre-re/quests/quests_aldebaran.txt
@@ -219,6 +203,23 @@ 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
 // --------------------------------------------------------------
+// ------------------------- RE - Quests ------------------------
+//npc: npc/re/quests/cupet.txt
+//npc: npc/re/quests/magic_books.txt
+//npc: npc/re/quests/pile_bunker.txt
+//npc: npc/re/quests/homu_s.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
+// --------------------------------------------------------------
 // --------------------------- Guides ---------------------------
 npc: npc/pre-re/guides/guides_alberta.txt
 npc: npc/pre-re/guides/guides_aldebaran.txt
@@ -243,7 +244,6 @@ npc: npc/pre-re/guides/guides_prontera.txt
 npc: npc/pre-re/guides/guides_rachel.txt
 npc: npc/pre-re/guides/guides_umbala.txt
 npc: npc/pre-re/guides/guides_veins.txt
-
 // --------------------------------------------------------------
 // ---------------- Kafras & Cool Event Corp. -------------------
 npc: npc/pre-re/kafras/functions_kafras.txt
diff --git a/npc/pre-re/scripts_monsters.conf b/npc/pre-re/scripts_monsters.conf
index 70970e4bf..2be09a3ec 100644
--- a/npc/pre-re/scripts_monsters.conf
+++ b/npc/pre-re/scripts_monsters.conf
@@ -1,23 +1,4 @@
 // --------------------------------------------------------------
-// -                     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/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
@@ -88,4 +69,23 @@ npc: npc/pre-re/mobs/dungeons/treasure.txt
 npc: npc/pre-re/mobs/dungeons/tur_dun.txt
 npc: npc/pre-re/mobs/dungeons/xmas_dun.txt
 npc: npc/pre-re/mobs/dungeons/yggdrasil.txt
+
+// --------------------------------------------------------------
+// -                     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/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
 // --------------------------------------------------------------
diff --git a/npc/pre-re/scripts_warps.conf b/npc/pre-re/scripts_warps.conf
index f986af523..4ffe5bbb9 100644
--- a/npc/pre-re/scripts_warps.conf
+++ b/npc/pre-re/scripts_warps.conf
@@ -1,26 +1,4 @@
 // --------------------------------------------------------------
-// -                       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                        -
 // --------------------------------------------------------------
 
@@ -121,4 +99,25 @@ npc: npc/pre-re/warps/other/god.txt
 npc: npc/pre-re/warps/other/paradise.txt
 npc: npc/pre-re/warps/other/s_workshop.txt
 npc: npc/pre-re/warps/pvp/pvp.txt
+
+// --------------------------------------------------------------
+// -                       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
 // --------------------------------------------------------------