* 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

8 files changed, 260 insertions, 266 deletions

diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index 0e7675642..33df8a59b 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -3365,23 +3365,25 @@ return 1 if the option is set and 0 if the option is not set.
 
 Option numbers valid for the first (option) version of this command are:
 
-0x1     - Sight in effect.
-0x2     - Hide in effect.
-0x4     - Cloaking in effect.
-0x8     - Cart number 1 present.
-0x10    - Falcon present.
-0x20    - Peco Peco present.
-0x40    - GM Perfect Hide in effect.
-0x80    - Cart number 2 present.
-0x100   - Cart number 3 present.
-0x200   - Cart number 4 present.
-0x400   - Cart number 5 present.
-0x800   - Orc head present.
-0x1000  - The character is wearing a wedding sprite.
-0x2000  - Ruwach is in effect.
-0x4000  - Chasewalk in effect.
-0x8000  - Flying or Xmas suit.
-0x10000 - Sighttrasher.
+0x1       - Sight in effect.
+0x2       - Hide in effect.
+0x4       - Cloaking in effect.
+0x8       - Cart number 1 present.
+0x10      - Falcon present.
+0x20      - Peco Peco present.
+0x40      - GM Perfect Hide in effect.
+0x80      - Cart number 2 present.
+0x100     - Cart number 3 present.
+0x200     - Cart number 4 present.
+0x400     - Cart number 5 present.
+0x800     - Orc head present.
+0x1000    - The character is wearing a wedding sprite.
+0x2000    - Ruwach is in effect.
+0x4000    - Chasewalk in effect.
+0x8000    - Flying or Xmas suit.
+0x10000   - Sighttrasher.
+0x100000  - Warg present.
+0x200000  - The character is riding a warg.
 
 Option numbers valid for the second version (opt1) of this command are:
 
diff --git a/doc/woe_time_explanation.txt b/doc/woe_time_explanation.txt
index 340261c11..57951e885 100644
--- a/doc/woe_time_explanation.txt
+++ b/doc/woe_time_explanation.txt
@@ -1,111 +1,104 @@
-//| ~~~~~ How to set WoE times, by erKURITA: ~~~~~
-//| 
-//| Basically, there are 2 commands that affects the WoE times,
-//| OnClock<time>: and gettime(<type).
-//| 
-//| OnClock<time> runs when the said time where <time> is has been reached.
-//| The format of time is hhmm, being h = hour, m = minute.
-//| OnClock2350: would run at 23:50 on Computer's time.
-//| 
-//| gettime(<type) is a function which is used to make a check
-//| for a desired amount of information regarding time. The types are:
-//| 1 - Seconds (of a minute)
-//| 2 - Minutes (of an hour)
-//| 3 - Hour (of a day). Hour goes from 0 to 23.
-//| 4 - Week day (0 for Sunday, 6 is Saturday)
-//| 5 - Day of the month.
-//| 6 - Number of the month.
-//| 7 - Year.
-//| 8 - Day of the year.
-//| 
-//| Days (explained later) :
-//| 	Monday		= 1
-//| 	Tuesday		= 2
-//|	Wednesday 	= 3
-//|	Thursday	= 4
-//| 	Friday		= 5
-//| 	Saturday	= 6
-//| 	Sunday		= 0
-//| 
-//| This way, we can check for a desired minute, hour, day, month, etc.
-//| 
-//| Now the structure:
-//| 
-//|	OnClock2100:	//start time for Tues(2), Thurs(4)
-//|	OnClock2300:	//end time for Tues(2), Thurs(4)
-//|	OnClock1600:	//start time for Sat(6)
-//|	OnClock1800:	//end time for Sat(6)
-//| 
-//| These 4 labels will run one after the other. It's acomodated so, 
-//| The Tuesday at 21:00 and 23:00 they will run, and go to the next
-//| part of the script:
-//| 
-//|	if((gettime(4)==2) && (gettime(3)>=21 && gettime(3)<23)) goto L_Start;
-//|	if((gettime(4)==4) && (gettime(3)>=21 && gettime(3)<23)) goto L_Start;
-//|	if((gettime(4)==6) && (gettime(3)>=16 && gettime(3)<18)) goto L_Start;
-//| 
-//| This part will check for the times. Since both Starting and Ending times
-//| run through the same chain of commands, there are necesary checks to ensure
-//| it's the right time. Let's take the following example:
-//| 
-//|	if((gettime(4)==2) && (gettime(3)>=21 && gettime(3)<23))
-//| 
-//| The first gettime is checking for a type 4, the day of the week, and it's
-//| comparing it to the one desired, which is 2, that's Tuesday. If the comparation
-//| is true and both sides are equal, it will return 1. 1 means true, 0 means false
-//| in comparations and conditions.
-//| 
-//| The second gettime is checking for a type 3, which is the hour, and it's
-//| comparing it to 21, and if the first part is greater or equal (>=) than the second,
-//| the comparation will return 1.
-//| 
-//| The third and last gettime is checking again for the hour, but the time has to be less
-//| than the said time, in this case, 23.
-//| 
-//| Now, look at the parentheses. Parentheses are very important when making comparations
-//| and conditions. Check the order of these. I'll place dummy characters for this example:
-//| 
-//| 	if ((X && (Y && Z)) goto L_Start;
-//| 
-//| It's saying, if Y and Z are true, the condition meets. Now let's replace that comparation
-//| with another dummy character. We're doing (Y && Z) = G:
-//| 
-//| 	if (X && G) goto L_Start;
-//| 
-//| It's saying, if X and G are true, the condition meets, thus it has to go to L_Start.
-//| 
-//| Now, the last part of the script, regarding the end of WoE time:
-//| 
-//|	if((gettime(4)==2) && (gettime(3)==23)) goto L_End;
-//|	if((gettime(4)==4) && (gettime(3)==23)) goto L_End;
-//|	if((gettime(4)==6) && (gettime(3)==18)) goto L_End;
-//| 	end;
-//| 
-//| This is the same as before, but it's checking for the day in the first gettime, and
-//| the hour on the second. If both conditions are true, the WoE will end. We're checking 
-//| here for the end time, not the start.
-//| 
-//| Another important thing is OnAgitInit: . This special label will be run as soon as the
-//| castle data is loaded from the char data. So it will check for the above start and end time
-//| to see if it's in WoE time, hence why the hours has to be checked.
-//| 
-//| Now a example of how to set the WoE so it starts on Monday, at 4 pm and ends up at 10 pm:
-//| 
-//| OnClock1600: //| 16:00 = 4 pm
-//| OnClock2200: //| 22:00 = 10 pm
-//| 
-//| OnAgitInit: //| there has to be ONLY ONE of these labels, so put the OnClock above this
-//| 		//| and the checks below.
-//| 
-//| if ((gettime(4)==1) && (gettime(3)>=16 && gettime(3)<22)) goto L_Start;
-//| 
-//| if ((gettime(4)==1) && (gettime(3)==22) goto L_End;
-//| end;//| VERY IMPORTANT TO PLACE AND END AFTER THE LAST END CHECK. You don't want to 
-//| 	//| start the WoE w/o being on the right times/day
-//| 
-//| I hope this has been clear enough. Remember to put the checks in a logical way, e.g:
-//| Monday checks first, then Thursday, etc.
-//| Any questions Pm me (erKURITA) or go to irc channel on irc.deltaanime.net in #athena
-//| channel. Do not PM on IRC w/o asking please.
-//| 
-//| ~ erKURITA
+//===== Athena Doc ========================================
+//= WoE Time Explanation
+//===== By ================================================
+//= erKURITA
+//===== Version ===========================================
+//= 1.1
+//=========================================================
+//= 1.1 - Edited and reformatted. [Euphy]
+//===== Description =======================================
+//= Details on the behavior of the default WoE controller.
+//=========================================================
+
+There are 2 main commands that determine WoE times:
+OnClock<time>: and gettime(<type>).
+
+OnClock<time> triggers when <time> is reached.
+The format is HHMM, with H = hour, M = minute.
+OnClock2350: would run at 23:50, server time.
+
+gettime(<type>) is a function that checks for certain
+information regarding time. The types are:
+
+	1 - Seconds (of a minute)
+	2 - Minutes (of an hour)
+	3 - Hour (of a day), ranging from 0 to 23
+	4 - Weekday, ranging from 0 (Sunday) to 6 (Saturday)
+	5 - Day of the month
+	6 - Number of the month
+	7 - Year
+	8 - Day of the year
+
+This way, we can check for a desired minute, hour, day, month, etc.
+
+-------------------------------------------------------------------------------
+
+Now the structure:
+
+	OnClock2100:	// Start time for Tues(2), Thurs(4)
+	OnClock2300:	// End time for Tues(2), Thurs(4)
+	OnClock1600:	// Start time for Sat(6)
+	OnClock1800:	// End time for Sat(6)
+
+These 4 labels will run one after the other, reaching the next check:
+
+	if((gettime(4)==2) && (gettime(3)>=21 && gettime(3)<23)) goto L_Start;
+	if((gettime(4)==4) && (gettime(3)>=21 && gettime(3)<23)) goto L_Start;
+	if((gettime(4)==6) && (gettime(3)>=16 && gettime(3)<18)) goto L_Start;
+
+This part will check for the times. Since both Start and End times run
+through the same chain of commands, these are important checks to ensure
+it's the right time. Let's take the following example:
+
+	if((gettime(4)==2) && (gettime(3)>=21 && gettime(3)<23))
+
+The first gettime() is checking for a type 4, the day of the week, and it's
+comparing it to the one desired, which is 2 (Tuesday). The function will
+return either 1 (true) or 0 (false).
+
+The second gettime is checking for a type 3, the hour, and it's comparing
+it to 21. If the first part is greater or equal (>=) than the second,
+the comparation will return 1.
+
+The third and last gettime is checking again for the hour, but the time has to be less
+than the said time (in this case, 23).
+
+Now, look at the parentheses. Parentheses are very important when making comparations
+and conditions. Check the order of these. I'll place dummy characters for this example:
+
+	if ((X && (Y && Z)) goto L_Start;
+
+It's saying, if Y and Z are true, the condition is met. Now let's use another set
+of dummy characters. We're checking if (Y && Z) = G:
+
+	if (X && G) goto L_Start;
+
+It's saying that if X and G are true, the condition is met, thus proceeding to L_Start.
+
+Now, the last part of the script, regarding the end of WoE time:
+
+	if((gettime(4)==2) && (gettime(3)==23)) goto L_End;
+	if((gettime(4)==4) && (gettime(3)==23)) goto L_End;
+	if((gettime(4)==6) && (gettime(3)==18)) goto L_End;
+	end;
+
+This is the same as before, but it's checking for the day in the first gettime() and
+the hour on the second. If both conditions are true, WoE will end. We're checking 
+here for the end time, not the start.
+
+Another important thing is "OnAgitInit:". This special label will be run as soon as the
+castle data is loaded from the char data. It will check for the above start and end times
+to see if it's in WoE time, hence why the hours have to be checked.
+
+-------------------------------------------------------------------------------
+
+Now a example of how to set the WoE so it starts on Monday, at 4 pm and ends up at 10 pm:
+
+	OnClock1600: // 16:00 = 4 pm
+	OnClock2200: // 22:00 = 10 pm
+
+	OnAgitInit: // This can only be written once: put OnClock above and the checks below.
+
+	if ((gettime(4)==1) && (gettime(3)>=16 && gettime(3)<22)) goto L_Start;
+	if ((gettime(4)==1) && (gettime(3)==22) goto L_End;
+	end; // Don't forget this!
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
 // --------------------------------------------------------------
diff --git a/npc/re/scripts_athena.conf b/npc/re/scripts_athena.conf
index 7c91a6dd7..f9988fffc 100644
--- a/npc/re/scripts_athena.conf
+++ b/npc/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/re/cities/alberta.txt
 npc: npc/re/cities/aldebaran.txt
@@ -36,12 +31,10 @@ 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
+// ------------------------- RE - Cities ------------------------
+npc: npc/re/cities/brasilis.txt
+npc: npc/re/cities/dewata.txt
+npc: npc/re/cities/dicastes.txt
 // --------------------------------------------------------------
 // -------------------------- Merchant --------------------------
 npc: npc/re/merchants/shops.txt
@@ -73,6 +66,13 @@ npc: npc/re/merchants/wander_pet_food.txt
 npc: npc/re/merchants/buying_shops.txt
 npc: npc/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/re/airports/lighthalzen.txt
 npc: npc/re/airports/rachel.txt
 npc: npc/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/re/quests/quests_alberta.txt
 npc: npc/re/quests/quests_aldebaran.txt
@@ -219,6 +203,23 @@ npc: npc/re/quests/okolnir/godse_sch05.txt
 npc: npc/re/quests/quests_13_1.txt
 npc: npc/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/re/guides/guides_alberta.txt
 npc: npc/re/guides/guides_aldebaran.txt
@@ -243,7 +244,6 @@ npc: npc/re/guides/guides_prontera.txt
 npc: npc/re/guides/guides_rachel.txt
 npc: npc/re/guides/guides_umbala.txt
 npc: npc/re/guides/guides_veins.txt
-
 // --------------------------------------------------------------
 // ---------------- Kafras & Cool Event Corp. -------------------
 npc: npc/re/kafras/functions_kafras.txt
diff --git a/npc/re/scripts_monsters.conf b/npc/re/scripts_monsters.conf
index ef57910bb..967dd5dcc 100644
--- a/npc/re/scripts_monsters.conf
+++ b/npc/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/re/mobs/citycleaners.txt
@@ -44,6 +25,7 @@ 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
+npc: npc/re/mobs/fields/splendide.txt
 npc: npc/re/mobs/fields/umbala.txt
 npc: npc/re/mobs/fields/veins.txt
 npc: npc/re/mobs/fields/yuno.txt
@@ -87,4 +69,23 @@ 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
+
+// --------------------------------------------------------------
+// -                     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/re/scripts_warps.conf b/npc/re/scripts_warps.conf
index a55970805..9a8b8890f 100644
--- a/npc/re/scripts_warps.conf
+++ b/npc/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/re/warps/other/god.txt
 npc: npc/re/warps/other/paradise.txt
 npc: npc/re/warps/other/s_workshop.txt
 npc: npc/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
 // --------------------------------------------------------------