1 files changed, 52 insertions, 58 deletions
diff --git a/conf-tmpl/map_athena.conf b/conf-tmpl/map_athena.conf
index 22bd8cb65..7e4cabb04 100644
--- a/conf-tmpl/map_athena.conf
+++ b/conf-tmpl/map_athena.conf
@@ -103,9 +103,8 @@ npc: npc/sample/PCLoginEvent.txt
 // ---------------- Your Own Npcs -----------------------
 //Add Them Here ;)
 
-//---------------------- Global Scripts Functions -------------------------------
-npc: npc/other/Global_Functions.txt
-//------------------------------ Cities -----------------------------------------
+
+//------------------------ Cities ----------------------------
 npc: npc/cities/alberta.txt
 npc: npc/cities/aldebaran.txt
 npc: npc/cities/amatsu.txt
@@ -121,7 +120,8 @@ npc: npc/cities/gonryun.txt
 npc: npc/cities/umbala.txt
 npc: npc/cities/niflheim.txt
 
-//------------------------------ Jobs --------------------------------------
+
+//-------------------------- Jobs -------------------------------
 //Novice
 npc: npc/jobs/novice/novice.txt
 npc: npc/jobs/novice/supernovice.txt
@@ -169,14 +169,9 @@ npc: npc/jobs/2-2-1/Paladin.txt
 npc: npc/jobs/2-2-1/Professor.txt
 npc: npc/jobs/2-2-1/Stalker.txt
 
-//---------------------- Merchants --------------------------
-//Shops
-npc: npc/merchants/shops.txt
-
-//towns have good shops for 2-2 now
-//npc: npc/merchants/2-2shop.txt
 
-// Other sellers
+//------------------------- Merchants ----------------------------
+npc: npc/merchants/shops.txt
 npc: npc/merchants/refine.txt
 npc: npc/merchants/dye_maker.txt
 npc: npc/merchants/clothes_dyer.txt
@@ -187,12 +182,14 @@ npc: npc/merchants/milk_trader.txt
 npc: npc/merchants/renters.txt
 npc: npc/merchants/alchemist.txt
 
+// Custom
+//npc: npc/merchants/custom/2-2shop.txt
 // Free Falcon & Peco breeder, Free Carts
 //npc: npc/merchants/custom/breeder.txt
 
 
-//------------------------------- Quests ------------------------------------
-// Cities Quests
+//--------------------------- Quests ------------------------------
+// Item Quests
 npc: npc/quests/quests_alberta.txt
 npc: npc/quests/quests_aldebaran.txt
 npc: npc/quests/quests_comodo.txt
@@ -213,7 +210,6 @@ npc: npc/quests/doomed_swords.txt
 npc: npc/quests/bongun.txt
 npc: npc/quests/munak.txt
 npc: npc/quests/bongunsword.txt
-// Monster Taming
 npc: npc/quests/monstertamers.txt
 
 // Custom Quests, might be balance breaking (Enable if you want)
@@ -229,12 +225,11 @@ npc: npc/quests/custom/new_hats.txt
 // Above Npcs are better ^_^
 //npc: npc/quests/custom/event_32_new_hats.txt
 npc: npc/quests/custom/valhallen.txt
-npc: npc/quests/custom/uneasy_cemetery.txt
 //both Lord Kaho, but different and quest.txt has balmung to:
 //npc: npc/quests/custom/kaho_balmung.txt
 //npc: npc/quests/custom/kahohorn.txt
 
-//-------------------------- Skill Quests ---------------------------------
+//----------------------- Skill Quests -----------------------------
 npc: npc/quests/skills/acolyte_skills.txt
 npc: npc/quests/skills/archer_skills.txt
 npc: npc/quests/skills/mage_skills.txt
@@ -243,9 +238,9 @@ npc: npc/quests/skills/novice_skills.txt
 npc: npc/quests/skills/swordsman_skills.txt
 npc: npc/quests/skills/thief_skills.txt
 
-// Extra Skills NPC (Not required anymore since skill quests are done)
 //npc: npc/other/platinum_skills.txt
 
+
 // -------------------------- Guides -------------------------------
 npc: npc/guides/guides_alb.txt
 npc: npc/guides/guides_alde.txt
@@ -260,7 +255,8 @@ npc: npc/guides/guides_umb.txt
 npc: npc/guides/guides_nif.txt
 //more to come
 
-// -------------------------- Kafras -------------------------------------
+
+// -------------------------- Kafras --------------------------------
 npc: npc/kafras/functions_kafras.txt
 npc: npc/kafras/kafras_alb.txt
 npc: npc/kafras/kafras_alde.txt
@@ -275,14 +271,22 @@ npc: npc/kafras/kafras_yun.txt
 npc: npc/kafras/kafras_new.txt
 //more to come
 
-//---------------------------- Others -----------------------------------
+
+//---------------------------- Events --------------------------------
+npc: ncp/events/easter.txt
+//npc: npc/events/valentinesday.txt
+//npc: npc/events/alchemist.txt
+//npc: npc/events/twintowers.txt
+npc: npc/events/custom/uneasy_cemetery.txt
+//npc: npc/events/custom/draculax.txt
+
+
+//---------------------------- Others --------------------------------
 npc: npc/other/books.txt
 npc: npc/other/msg_boards.txt
 npc: npc/other/pvp.txt
 npc: npc/other/IceCream.txt
 npc: npc/other/card_remover.txt
-
-
 //npc: npc/other/wedding.txt
 //npc: npc/other/Valkyrie.txt
 //npc: npc/other/gefenia.txt
@@ -290,18 +294,18 @@ npc: npc/other/card_remover.txt
 //npc: npc/other/tougijou.txt
 //npc: npc/other/arena_mvp.txt
 
-//---------------------------- Events -----------------------------------
-// jRO/kRO/mRO/tRO/etc NPC: Valentine's Day (Sells Chocolates)
-//npc: npc/events/valentinesday.txt
-// ?RO NPC: Alchemist (Allows trading of elemental stones)
-//npc: npc/events/alchemist.txt
-// mRO NPC: Twin Towers (Free Warp to several dungeons)
-//npc: npc/events/twintowers.txt
+// Global Scripts Functions ------------------
+npc: npc/other/Global_Functions.txt
+
 
-//-------------------------- Unofficial NPCs ------------------------------
-// Bank Npc
+//------------------------- Unofficial NPCs --------------------------
 npc: npc/other/kafra_bank.txt
 //npc: npc/other/bank.txt
+//npc: npc/jobs/custom/reset.txt
+//npc: npc/jobs/custom/jobchange.txt
+//npc: npc/other/heal.txt
+//npc: npc/other/heal_payment.txt
+npc: npc/other/blackjack.txt
 
 // Warper NPC (Enable for free warp service)
 // 1st is Warper with only option for cities and dungeons
@@ -309,26 +313,17 @@ npc: npc/other/kafra_bank.txt
 // 2nd you can choose which lvl of the dungeon (you have to disabled 1 if you use 2!)
 //npc: npc/other/warper2.txt
 
-// Reset NPC (Enable for special reset events)
-//npc: npc/jobs/custom/reset.txt
-//Multi-Jobchanger
-//npc: npc/jobs/custom/jobchange.txt
-
 // Free Stylist NPC - Cloths/Hair Dye - (Requires 77 dye palletes)
 //npc: npc/merchants/custom/dye.txt
 
-// Free healing
-//npc: npc/other/heal.txt
-// Payment healings
-//npc: npc/other/heal_payment.txt
-
-// Dracula X Script to display usage of npcskilleffect command
-//npc: npc/events/custom/draculax.txt
-
 // Dev NPCs
 npc: npc/other/devnpc.txt
 
-//--------------------------- Guild Wars ------------------------------------
+//= MC Cameri's Bank NPC
+//npc: npc/other/mc_cameri/bank.txt
+
+
+//-------------------------- Guild Wars ---------------------------------
 //Guild Wars: General
 npc: npc/guild/gldfunc_manager.txt
 npc: npc/guild/gldfunc_dunsw.txt
@@ -384,7 +379,7 @@ npc: npc/guild/nguild/nguild_treas.txt
 npc: npc/guild/nguild/nguild_guardians.txt
 
 
-//----------------------- Guild Wars(Non-optimized) -------------------------
+//------------------ Guild Wars(Non-optimized) -----------------------
 //Guild Wars: General
 //npc: npc/guild/old/ev_agit_event.txt
 
@@ -466,7 +461,7 @@ npc: npc/guild/nguild/nguild_guardians.txt
 
 
 //--------------------- Warps ---------------------------
-//= Cities ==============================================
+//= Cities ============================
 npc: npc/warps/cities/alberta.txt
 npc: npc/warps/cities/aldebaran.txt
 npc: npc/warps/cities/amatsu.txt
@@ -483,7 +478,7 @@ npc: npc/warps/cities/prontera.txt
 npc: npc/warps/cities/umbala.txt
 npc: npc/warps/cities/yggdrasil.txt
 npc: npc/warps/cities/yuno.txt
-//= Dungeons ===========================================
+//= Dungeons =============================
 npc: npc/warps/dungeons/alberta_duns.txt
 npc: npc/warps/dungeons/alde_ct.txt
 npc: npc/warps/dungeons/amatsu_dun.txt
@@ -501,7 +496,7 @@ npc: npc/warps/dungeons/payon_dun.txt
 npc: npc/warps/dungeons/prt_dun.txt
 npc: npc/warps/dungeons/umbala_dun.txt
 npc: npc/warps/dungeons/yuno_dun.txt
-//= Fields =============================================
+//= Fields ===============================
 npc: npc/warps/fields/amatsu_fild.txt
 npc: npc/warps/fields/com_fild.txt
 npc: npc/warps/fields/gefenia.txt
@@ -515,16 +510,15 @@ npc: npc/warps/fields/payon_fild.txt
 npc: npc/warps/fields/prontera_fild.txt
 npc: npc/warps/fields/umbala_fild.txt
 npc: npc/warps/fields/yuno_fild.txt
-//= Guilds =============================================
+//= Guilds ==============================
 npc: npc/warps/guild/guildcastles.txt
-//= Other ==============================================
+//= Other ================================
 npc: npc/warps/other/jobquests.txt
 npc: npc/warps/other/other.txt
-//= MC Cameri's Bank NPC ===============================
-//npc: npc/warps/other/mc_cameri/bank.txt
-//= PVP ================================================
+//= PVP ==================================
 npc: npc/warps/pvp/pvp.txt
 
+
 //--------------------- Mobs ---------------------------
 npc: npc/mobs/pvp.txt
 npc: npc/mobs/fields/amatsu.txt
@@ -1048,11 +1042,11 @@ map: louyang.gat
 //Requires kRO Sakray 04-07 or newer
 //(Akaru's SuperGRF required version: 1.53)
 //map: siege_test.gat
-//map: n_castle.gat
-//map: nguild_gef.gat
-//map: nguild_prt.gat
-//map: nguild_pay.gat
-//map: nguild_alde.gat
+map: n_castle.gat
+map: nguild_gef.gat
+map: nguild_prt.gat
+map: nguild_pay.gat
+map: nguild_alde.gat
 
 //--- Ep6.7 - Jawaii ---
 //Requires kRO Sakray 06-22 or newer