Full npc folder reorganization. (I hope I didn't break anything D:)

-Now common scripts goes to the main npc folder, and pre-re-only/re-only ones goes to their respective folders.
-NPCs with practically the same script but little differences have been left in the main folder and uses the command checkre() for the differences.
-For those NPCs with different coordinates but same script, the script has been left in the main folder but the NPCs splitted as duplicates.
-All pre-renewal files has been reverted back to their pre-renewal behavior.

TODO:
-Correct pre-re quest rewards.
-Check for pre-re/re differences in mapflags.

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

1 files changed, 41 insertions, 354 deletions

diff --git a/npc/re/scripts_athena.conf b/npc/re/scripts_athena.conf
index c4cefe3e7..2f4367553 100644
--- a/npc/re/scripts_athena.conf
+++ b/npc/re/scripts_athena.conf
@@ -1,230 +1,23 @@
 // --------------------------------------------------------------
-// -                        Core Scripts                        -
+// -                    Renewal Core Scripts                    -
 // --------------------------------------------------------------
 
-// --------------------------------------------------------------
+// -------------------------- Airport ---------------------------
+npc: npc/re/airports/izlude.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/comodo.txt
-npc: npc/re/cities/einbech.txt
-npc: npc/re/cities/einbroch.txt
-npc: npc/re/cities/geffen.txt
-npc: npc/re/cities/gonryun.txt
-npc: npc/re/cities/hugel.txt
-npc: npc/re/cities/izlude.txt
-npc: npc/re/cities/jawaii.txt
-npc: npc/re/cities/lighthalzen.txt
-npc: npc/re/cities/louyang.txt
-npc: npc/re/cities/lutie.txt
-npc: npc/re/cities/manuk.txt
-npc: npc/re/cities/morocc.txt
-npc: npc/re/cities/moscovia.txt
-npc: npc/re/cities/niflheim.txt
-npc: npc/re/cities/payon.txt
-npc: npc/re/cities/prontera.txt
-npc: npc/re/cities/rachel.txt
-npc: npc/re/cities/splendide.txt
-npc: npc/re/cities/umbala.txt
-npc: npc/re/cities/veins.txt
-npc: npc/re/cities/yuno.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
-npc: npc/re/merchants/refine.txt
-npc: npc/re/merchants/dye_maker.txt
-//npc: npc/re/merchants/clothes_dyer.txt
-npc: npc/re/merchants/hair_dyer.txt
-npc: npc/re/merchants/hair_style.txt
-npc: npc/re/merchants/old_pharmacist.txt
-npc: npc/re/merchants/inn.txt
-npc: npc/re/merchants/milk_trader.txt
-npc: npc/re/merchants/renters.txt
-npc: npc/re/merchants/alchemist.txt
-//npc: npc/re/merchants/icecream.txt
-npc: npc/re/merchants/quivers.txt
-npc: npc/re/merchants/kunai_maker.txt
-npc: npc/re/merchants/ammo_boxes.txt
-npc: npc/re/merchants/ammo_dealer.txt
-npc: npc/re/merchants/socket_enchant.txt
-npc: npc/re/merchants/socket_enchant2.txt
-npc: npc/re/merchants/novice_exchange.txt
-npc: npc/re/merchants/gemstone.txt
-npc: npc/re/merchants/advanced_refiner.txt
-npc: npc/re/merchants/elemental_trader.txt
-npc: npc/re/merchants/enchan_arm.txt
-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/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.
-//npc: npc/re/merchants/cash_trader.txt
-// Cash Item Hair Styles
-//npc: npc/re/merchants/cash_hair.txt
-// --------------------------------------------------------------
-// -------------------------- Airport ---------------------------
-npc: npc/re/airports/airships.txt
-npc: npc/re/airports/einbroch.txt
-npc: npc/re/airports/hugel.txt
-npc: npc/re/airports/izlude.txt
-npc: npc/re/airports/lighthalzen.txt
-npc: npc/re/airports/rachel.txt
-npc: npc/re/airports/yuno.txt
-// --------------------------------------------------------------
-// --------------------------- Quests ---------------------------
-npc: npc/re/quests/quests_alberta.txt
-npc: npc/re/quests/quests_aldebaran.txt
-npc: npc/re/quests/quests_amatsu.txt
-npc: npc/re/quests/quests_ayothaya.txt
-npc: npc/re/quests/quests_comodo.txt
-npc: npc/re/quests/quests_ein.txt
-npc: npc/re/quests/quests_geffen.txt
-npc: npc/re/quests/quests_gonryun.txt
-npc: npc/re/quests/quests_hugel.txt
-npc: npc/re/quests/quests_izlude.txt
-npc: npc/re/quests/quests_juperos.txt
-npc: npc/re/quests/quests_lighthalzen.txt
-npc: npc/re/quests/quests_louyang.txt
-npc: npc/re/quests/quests_lutie.txt
-npc: npc/re/quests/quests_morocc.txt
-npc: npc/re/quests/quests_moscovia.txt
-npc: npc/re/quests/quests_nameless.txt
-npc: npc/re/quests/quests_niflheim.txt
-npc: npc/re/quests/quests_payon.txt
-npc: npc/re/quests/quests_prontera.txt
-npc: npc/re/quests/quests_rachel.txt
-npc: npc/re/quests/quests_umbala.txt
-npc: npc/re/quests/quests_veins.txt
-npc: npc/re/quests/quests_yuno.txt
-npc: npc/re/quests/mrsmile.txt
-npc: npc/re/quests/bunnyband.txt
-npc: npc/re/quests/juice_maker.txt
-npc: npc/re/quests/counteragent_mixture.txt
-npc: npc/re/quests/doomed_swords.txt
-npc: npc/re/quests/doomed_swords_quest.txt
-npc: npc/re/quests/monstertamers.txt
-npc: npc/re/quests/Lvl4_weapon_quest.txt
-npc: npc/re/quests/thana_quest.txt
-npc: npc/re/quests/eye_of_hellion.txt
-npc: npc/re/quests/quests_airship.txt
-//The Sign Quest
-//Insure that the time zone set corrisponds with the server's.
-//For more info, read the comments in npc/re/quests/The_Sign_Quest.txt
-npc: npc/re/quests/The_Sign_Quest.txt
-npc: npc/re/quests/Kiel_Hyre_Quest.txt
-//The God Item Quest Files
-npc: npc/re/quests/seals/brisingamen_seal.txt
-// Controller file, allow GMs to change variables.
-//npc: npc/re/quests/seals/god_global.txt
-npc: npc/re/quests/seals/god_weapon_creation.txt
-npc: npc/re/quests/seals/megingard_seal.txt
-npc: npc/re/quests/seals/mjolnir_seal.txt
-npc: npc/re/quests/seals/sleipnir_seal.txt
-//
-npc: npc/re/quests/newgears/2004_headgears.txt
-npc: npc/re/quests/newgears/2005_headgears.txt
-//Official Quest. Reward: 1 old blue box.
-npc: npc/re/quests/obb_quest.txt
-npc: npc/re/quests/cooking_quest.txt
-npc: npc/re/quests/newgears/2006_headgear.txt
-npc: npc/re/quests/gunslinger_quests.txt
-npc: npc/re/quests/ninja_quests.txt
-npc: npc/re/quests/2008_newhat_mir.txt
-//Quests-Tutorials for basic classes (1st class quests)
-npc: npc/re/quests/first_class/tu_acolyte.txt
-npc: npc/re/quests/first_class/tu_archer.txt
-npc: npc/re/quests/first_class/tu_magician01.txt
-npc: npc/re/quests/first_class/tu_ma_th01.txt
-npc: npc/re/quests/first_class/tu_merchant.txt
-npc: npc/re/quests/first_class/tu_sword.txt
-npc: npc/re/quests/first_class/tu_thief01.txt
-//Wandering Minstrel Quest
-npc: npc/re/quests/Bard_Quest.txt
-// Repeatable EXP Quests: Currently not available in RE.
-//npc: npc/re/quests/collection/quest_alligator.txt
-//npc: npc/re/quests/collection/quest_caramel.txt
-//npc: npc/re/quests/collection/quest_disguiseloliruri.txt
-//npc: npc/re/quests/collection/quest_mantis.txt
-//npc: npc/re/quests/collection/quest_zhupolong.txt
-//Exploitable due to vendor selling Acorns in Moscovia
-//npc: npc/re/quests/collection/quest_coco.txt
-//npc: npc/re/quests/collection/quest_creamy.txt
-//npc: npc/re/quests/collection/quest_demonpungus.txt
-//npc: npc/re/quests/collection/quest_dokebi.txt
-//npc: npc/re/quests/collection/quest_dryad.txt
-//npc: npc/re/quests/collection/quest_fabre.txt
-//npc: npc/re/quests/collection/quest_frilldora.txt
-//Exploitable due to vendor selling Antelope Horns in Niflheim
-//npc: npc/re/quests/collection/quest_goat.txt
-//npc: npc/re/quests/collection/quest_golem.txt
-//npc: npc/re/quests/collection/quest_hode.txt
-//npc: npc/re/quests/collection/quest_leafcat.txt
-//Exploitable due to vendor selling Bill of Birds in Morroc
-//npc: npc/re/quests/collection/quest_pecopeco.txt
-//npc: npc/re/quests/collection/quest_pupa.txt
-//Town Relay Quests
-npc: npc/re/quests/2007_relay.txt
-//Guild Relay Quests
-npc: npc/re/quests/guildrelay.txt
-//npc: npc/re/quests/newgears/2008_headgear.txt
-//Falicious Okolnir
-//God Item Second Edition Quests
-npc: npc/re/quests/okolnir/godse_aru01.txt
-npc: npc/re/quests/okolnir/godse_aru02.txt
-npc: npc/re/quests/okolnir/godse_aru03.txt
-npc: npc/re/quests/okolnir/godse_aru04.txt
-npc: npc/re/quests/okolnir/godse_aru05.txt
-npc: npc/re/quests/okolnir/godse_sch01.txt
-npc: npc/re/quests/okolnir/godse_sch02.txt
-npc: npc/re/quests/okolnir/godse_sch03.txt
-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
-// --------------------------------------------------------------
-// ------------------------- RE - Quests ------------------------
-npc: npc/re/quests/quests_brasilis.txt
-npc: npc/re/quests/quests_dewata.txt
-npc: npc/re/quests/quests_dicastes.txt
-//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
-// --------------------------------------------------------------
+npc: npc/re/cities/izlude.txt
+npc: npc/re/cities/jawaii.txt
+
 // --------------------------- Guides ---------------------------
 npc: npc/re/guides/guides_alberta.txt
 npc: npc/re/guides/guides_aldebaran.txt
 npc: npc/re/guides/guides_amatsu.txt
 npc: npc/re/guides/guides_ayothaya.txt
+npc: npc/re/guides/guides_brasilis.txt
 npc: npc/re/guides/guides_comodo.txt
 npc: npc/re/guides/guides_einbroch.txt
 npc: npc/re/guides/guides_geffen.txt
@@ -232,8 +25,9 @@ npc: npc/re/guides/guides_gonryun.txt
 npc: npc/re/guides/guides_hugel.txt
 npc: npc/re/guides/guides_izlude.txt
 npc: npc/re/guides/guides_juno.txt
-npc: npc/re/guides/guides_louyang.txt
 npc: npc/re/guides/guides_lighthalzen.txt
+npc: npc/re/guides/guides_louyang.txt
+npc: npc/re/guides/guides_lutie.txt
 npc: npc/re/guides/guides_morroc.txt
 npc: npc/re/guides/guides_moscovia.txt
 npc: npc/re/guides/guides_niflheim.txt
@@ -242,148 +36,41 @@ 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
-// --------------------------------------------------------------
-// ------------------------- RE - Guides ------------------------
-npc: npc/re/guides/guides_brasilis.txt
-npc: npc/re/guides/guides_lutie.txt
-// --------------------------------------------------------------
+
 // ---------------- Kafras & Cool Event Corp. -------------------
-npc: npc/re/kafras/functions_kafras.txt
-npc: npc/re/kafras/kafras_alb.txt
-npc: npc/re/kafras/kafras_alde.txt
-npc: npc/re/kafras/kafras_brasilis.txt
-npc: npc/re/kafras/kafras_com.txt
-npc: npc/re/kafras/kafras_dungeons.txt
-npc: npc/re/kafras/kafras_gef.txt
 npc: npc/re/kafras/kafras_izl.txt
-npc: npc/re/kafras/kafras_mor.txt
-npc: npc/re/kafras/kafras_mosk.txt
-npc: npc/re/kafras/kafras_pay.txt
-npc: npc/re/kafras/kafras_pron.txt
-npc: npc/re/kafras/kafras_yun.txt
-npc: npc/re/kafras/kafras_new.txt
-npc: npc/re/kafras/cool_event_corp.txt
-npc: npc/re/kafras/dts_warper.txt
-// --------------------------------------------------------------
-// --------------------------- Events ---------------------------
-//npc: npc/re/events/bossnia.txt
-//npc: npc/re/events/valentinesday.txt
-//npc: npc/re/events/xmas.txt
-//Official idRO Idul Fitri Event
-//npc: npc/re/events/idul_fitri.txt
-//npc: npc/re/events/dumplingfestival.txt
-//Official kRO, idRO Skill Reset Event
-//npc: npc/re/events/event_skill_reset.txt
-//npc: npc/re/events/whiteday.txt
-//npc: npc/re/events/twintowers.txt
-//Official indian Ro Event Children Week
-//npc: npc/re/events/children_week.txt
-//Official Lunar New Year (2008) event (iRO)
-//npc: npc/re/events/lunar_2008.txt
-//Official St. Patrick's Day (2008) event (iRO)
-//npc: npc/re/events/StPatrick_2008.txt
-//Official Easter (2008) event (iRO)
-//npc: npc/re/events/easter_2008.txt
-//Official Valentine's Day events (iRO)
-//npc: npc/re/events/valentinesday_2009.txt
-//npc: npc/re/events/valentinesday_2012.txt
-//Official Christmas events (iRO)
-//npc: npc/re/events/christmas_2005.txt
-//npc: npc/re/events/christmas_2008.txt
-//Official Memorial Day (2009) event (iRO)
-//npc: npc/re/events/MemorialDay_2008.txt
-//Official Halloween events (iRO)
-//npc: npc/re/events/halloween_2006.txt
-//npc: npc/re/events/halloween_2008.txt
-//npc: npc/re/events/halloween_2009.txt
-
-// God Item SE post-creation event.
-npc: npc/re/events/god_se_festival.txt
 
-//Events related to WoE SE Guild Dungeons.
-npc: npc/re/events/gdevent_aru.txt
-npc: npc/re/events/gdevent_sch.txt
+// -------------------------- Merchant --------------------------
+npc: npc/re/merchants/3rd_trader.txt
+npc: npc/re/merchants/diamond.txt
+npc: npc/re/merchants/falcon_flute.txt
+npc: npc/re/merchants/inn.txt
+npc: npc/re/merchants/renters.txt
+npc: npc/re/merchants/shops.txt
 
-//Novice WoE is a kRO Event, after the event, the scripts were disabled.
-//Novice Castles don't have real dungeons. They're connected to the common ones.
-//So it's better not to uncomment this line.
-//npc: npc/re/events/nguild/nguild_dunsw.txt
-//npc: npc/re/events/nguild/nguild_treas.txt
-//npc: npc/re/events/nguild/nguild_guardians.txt
-//npc: npc/re/events/nguild/nguild_warper.txt
-//npc: npc/re/events/nguild/nguild_ev_agit.txt
-//npc: npc/re/events/nguild/nguild_flags.txt
-//npc: npc/re/events/nguild/nguild_managers.txt
-//npc: npc/re/events/nguild/nguild_kafras.txt
-// --------------------------------------------------------------
 // --------------------------- Others ---------------------------
-npc: npc/re/other/auction.txt
-npc: npc/re/other/books.txt
-npc: npc/re/other/bulletin_boards.txt
-npc: npc/re/other/comodo_gambling.txt
-//npc: npc/re/other/card_trader.txt
-npc: npc/re/other/divorce.txt
-npc: npc/re/other/fortune.txt
-npc: npc/re/other/gympass.txt
-npc: npc/re/other/hugel_bingo.txt
-npc: npc/re/other/mail.txt
-npc: npc/re/other/marriage.txt
-npc: npc/re/other/monster_museum.txt
-//npc: npc/re/other/msg_boards.txt
-npc: npc/re/other/poring_war.txt
-npc: npc/re/other/powernpc.txt
-npc: npc/re/other/pvp.txt
-npc: npc/re/other/resetskill.txt
-npc: npc/re/other/guildpvp.txt
-npc: npc/re/other/sealstatus.txt
 npc: npc/re/other/mercenary_rent.txt
+
+// --------------------------- Quests ---------------------------
+// - Eden Group -------------------------------------------------
+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/eden/eden_common.txt
+npc: npc/re/quests/eden/eden_quests.txt
+npc: npc/re/quests/eden/eden_service.txt
 // --------------------------------------------------------------
-// -------------------- Turbo Track Arena -----------------------
-npc: npc/re/other/turbotrack/Turbo_Track.txt
-// Normal Courses (Non-PVP)
-npc: npc/re/other/turbotrack/Normal_Solo.txt
-npc: npc/re/other/turbotrack/Normal_4.txt
-npc: npc/re/other/turbotrack/Normal_8.txt
-npc: npc/re/other/turbotrack/Normal_16.txt
-// Expert Courses (PVP)
-npc: npc/re/other/turbotrack/Expert_4.txt
-npc: npc/re/other/turbotrack/Expert_8.txt
-npc: npc/re/other/turbotrack/Expert_16.txt
-// --------------------------------------------------------------
-// ------------------- Izlude Battle Arena ----------------------
-npc: npc/re/other/arena/arena_room.txt
-npc: npc/re/other/arena/arena_lvl50.txt
-npc: npc/re/other/arena/arena_lvl60.txt
-npc: npc/re/other/arena/arena_lvl70.txt
-npc: npc/re/other/arena/arena_lvl80.txt
-npc: npc/re/other/arena/arena_party.txt
-npc: npc/re/other/arena/arena_point.txt
-npc: npc/re/other/arena/arena_aco.txt
-// --------------------------------------------------------------
-// -------------------- Hugel Monster Races ---------------------
-npc: npc/re/other/monster_race.txt
-// --------------------------------------------------------------
-// --------------------- Battle Grounds -------------------------
-// Common NPCs
-npc: npc/re/battleground/bg_common.txt
-// Tierra Gorge
-npc: npc/re/battleground/tierra/tierra_enter.txt
-npc: npc/re/battleground/tierra/tierra01.txt
-npc: npc/re/battleground/tierra/tierra02.txt
-// Flavius
-npc: npc/re/battleground/flavius/flavius_enter.txt
-npc: npc/re/battleground/flavius/flavius01.txt
-npc: npc/re/battleground/flavius/flavius02.txt
-// Kreiger Von Midgard
-npc: npc/re/battleground/kvm/kvm_enter.txt
-npc: npc/re/battleground/kvm/kvm_item_pay.txt
-npc: npc/re/battleground/kvm/kvm01.txt
-npc: npc/re/battleground/kvm/kvm02.txt
-npc: npc/re/battleground/kvm/kvm03.txt
-// --------------------------------------------------------------
-// ------------------------ Instances ---------------------------
-npc: npc/re/instances/SealedShrine.txt
-npc: npc/re/instances/EndlessTower.txt
-npc: npc/re/instances/OrcsMemory.txt
-npc: npc/re/instances/NydhoggsNest.txt
-// --------------------------------------------------------------
+//npc: npc/re/quests/cupet.txt
+npc: npc/re/quests/homu_s.txt
+npc: npc/re/quests/magic_books.txt
+npc: npc/re/quests/mrsmile.txt
+npc: npc/re/quests/pile_bunker.txt
+npc: npc/re/quests/quests_brasilis.txt
+npc: npc/re/quests/quests_dewata.txt
+npc: npc/re/quests/quests_dicastes.txt
+npc: npc/re/quests/quests_izlude.txt
+npc: npc/re/quests/quests_lighthalzen.txt