- Merged /branches/renewal/conf (partial)

- Merged /branches/renewal/db (only mob_db.txt and mob_skill_db.txt)
- Merged /branches/renewal/npc (full)

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

1 files changed, 41 insertions, 31 deletions

diff --git a/npc/scripts_athena.conf b/npc/scripts_athena.conf
index 166a7e22c..828365fc2 100644
--- a/npc/scripts_athena.conf
+++ b/npc/scripts_athena.conf
@@ -143,29 +143,30 @@ npc: npc/quests/first_class/tu_sword.txt
 npc: npc/quests/first_class/tu_thief01.txt
 //Wandering Minstrel Quest
 npc: npc/quests/Bard_Quest.txt
-// Repeatable EXP quests;
-npc: npc/quests/collection/quest_alligator.txt
-npc: npc/quests/collection/quest_caramel.txt
+// Repeatable EXP quests; Currently not avaliable in RE.
+//npc: npc/quests/collection/quest_alligator.txt
+//npc: npc/quests/collection/quest_caramel.txt
 //Exploitable due to vendor selling Acorns in Moscovia
 //npc: npc/quests/collection/quest_coco.txt
-npc: npc/quests/collection/quest_creamy.txt
-npc: npc/quests/collection/quest_demonpungus.txt
-npc: npc/quests/collection/quest_dokebi.txt
-npc: npc/quests/collection/quest_dryad.txt
-npc: npc/quests/collection/quest_fabre.txt
-npc: npc/quests/collection/quest_frilldora.txt
+//npc: npc/quests/collection/quest_creamy.txt
+//npc: npc/quests/collection/quest_demonpungus.txt
+//npc: npc/quests/collection/quest_dokebi.txt
+//npc: npc/quests/collection/quest_dryad.txt
+//npc: npc/quests/collection/quest_fabre.txt
+//npc: npc/quests/collection/quest_frilldora.txt
 //Exploitable due to vendor selling Antelope Horns in Niflheim
 //npc: npc/quests/collection/quest_goat.txt
-npc: npc/quests/collection/quest_golem.txt
-npc: npc/quests/collection/quest_hode.txt
-npc: npc/quests/collection/quest_leafcat.txt
+//npc: npc/quests/collection/quest_golem.txt
+//npc: npc/quests/collection/quest_hode.txt
+//npc: npc/quests/collection/quest_leafcat.txt
 //Exploitable due to vendor selling Bill of Birds in Morroc
 //npc: npc/quests/collection/quest_pecopeco.txt
-npc: npc/quests/collection/quest_pupa.txt
+//npc: npc/quests/collection/quest_pupa.txt
 //Town Relay Quests
 npc: npc/quests/2007_relay.txt
 //Guild Relay Quests
 npc: npc/quests/guildrelay.txt
+//npc: npc/quests/newgears/2008_headgear.txt
 //Falicious Okolnir
 //God Item Second Edition Quests
 npc: npc/quests/okolnir/godse_aru01.txt
@@ -180,30 +181,39 @@ npc: npc/quests/okolnir/godse_sch04.txt
 npc: npc/quests/okolnir/godse_sch05.txt
 npc: npc/quests/quests_13_1.txt
 npc: npc/quests/quests_13_2.txt
+// Eden Group
+npc: npc/quests/eden/eden_common.txt
+npc: npc/quests/eden/eden_service.txt
+npc: npc/quests/eden/eden_quests.txt
+npc: npc/quests/eden/11-25.txt
+npc: npc/quests/eden/26-40.txt
+npc: npc/quests/eden/41-55.txt
+npc: npc/quests/eden/56-70.txt
+npc: npc/quests/eden/71-85.txt
 // --------------------------------------------------------------
 // --------------------------- Guides ---------------------------
-npc: npc/guides/guides_alb.txt
-npc: npc/guides/guides_alde.txt
-npc: npc/guides/guides_ama.txt
-npc: npc/guides/guides_ayo.txt
+npc: npc/guides/guides_alberta.txt
+npc: npc/guides/guides_aldebaran.txt
+npc: npc/guides/guides_amatsu.txt
+npc: npc/guides/guides_ayothaya.txt
 npc: npc/guides/guides_brasilis.txt
-npc: npc/guides/guides_cmd.txt
-npc: npc/guides/guides_einbe.txt
-npc: npc/guides/guides_einbr.txt
-npc: npc/guides/guides_gef.txt
-npc: npc/guides/guides_gon.txt
-npc: npc/guides/guides_hu.txt
-npc: npc/guides/guides_izl.txt
+npc: npc/guides/guides_comodo.txt
+npc: npc/guides/guides_einbroch.txt
+npc: npc/guides/guides_geffen.txt
+npc: npc/guides/guides_gonryun.txt
+npc: npc/guides/guides_hugel.txt
+npc: npc/guides/guides_izlude.txt
 npc: npc/guides/guides_juno.txt
 npc: npc/guides/guides_louyang.txt
-npc: npc/guides/guides_lhz.txt
-npc: npc/guides/guides_moc.txt
-npc: npc/guides/guides_mosk.txt
-npc: npc/guides/guides_nif.txt
-npc: npc/guides/guides_pay.txt
-npc: npc/guides/guides_pron.txt
+npc: npc/guides/guides_lighthalzen.txt
+npc: npc/guides/guides_lutie.txt
+npc: npc/guides/guides_morroc.txt
+npc: npc/guides/guides_moscovia.txt
+npc: npc/guides/guides_niflheim.txt
+npc: npc/guides/guides_payon.txt
+npc: npc/guides/guides_prontera.txt
 npc: npc/guides/guides_rachel.txt
-npc: npc/guides/guides_um.txt
+npc: npc/guides/guides_umbala.txt
 npc: npc/guides/guides_veins.txt
 
 // --------------------------------------------------------------