Change all script folders

Script files fixes are comming

2 files changed, 8 insertions, 325 deletions

diff --git a/conf/map_athena.conf b/conf/map_athena.conf
index 25ea0676..82e8c08b 100644
--- a/conf/map_athena.conf
+++ b/conf/map_athena.conf
@@ -1,323 +1,17 @@
 // eAthena Map-Server Configuration File
 
-// Maps
-map: new_39-1.gat
-map: new_38-1.gat
-map: new_37-1.gat
-map: new_36-1.gat
-map: new_35-1.gat
-map: new_34-1.gat
-map: new_33-1.gat
-map: new_32-1.gat
-map: new_31-1.gat
-map: new_30-1.gat
-map: new_29-1.gat
-map: new_28-1.gat
-map: new_27-1.gat
-map: new_26-1.gat
-map: new_25-1.gat
-map: new_24-1.gat
-map: new_23-1.gat
-map: new_22-1.gat
-map: new_21-1.gat
-map: new_20-1.gat
-map: new_19-1.gat
-map: new_18-1.gat
-map: new_17-1.gat
-map: new_16-1.gat
-map: new_15-1.gat
-map: new_14-1.gat
-map: new_13-1.gat
-map: new_12-1.gat
-map: new_11-1.gat
-map: new_10-1.gat
-map: new_9-1.gat
-map: new_8-1.gat
-map: new_7-1.gat
-map: new_6-1.gat
-map: new_5-1.gat
-map: new_4-1.gat
-map: new_3-1.gat
-map: new_2-1.gat
-map: new_1-1.gat
+// Database autosave time, in seconds.
+autosave_time: 60
 
-// NPC Functions
-npc: npc/functions/banker.txt
-npc: npc/functions/barber.txt
-npc: npc/functions/game_rules.txt
-npc: npc/functions/inn.txt
-npc: npc/functions/mob_points.txt
-npc: npc/functions/process_equip.txt
-npc: npc/functions/slot_machine.txt
-npc: npc/functions/soul_menhir.txt
+// Message of the day file, when a character logs on, this message is displayed.
+motd_txt: conf/motd.txt
 
-// NPCs (ordered by map number).
+// When @help or @h is typed when you are a gm, this is displayed for helping new gms understand gm commands.
+help_txt: conf/help.txt
 
-// new_1-1 Western desert
-// npc: npc/western-desert/dark_mage.txt
-npc: npc/new_1-1-western-desert/rogue.txt
-npc: npc/new_1-1-western-desert/merchant.txt
-npc: npc/new_1-1-western-desert/monsters.txt
-npc: npc/new_1-1-western-desert/nomads.txt
-npc: npc/new_1-1-western-desert/passages.txt
+mapreg_txt: save/mapreg.txt
 
-// new-2_1 Cave level 1
-npc: npc/new_2-1-cave1/miners.txt
-npc: npc/new_2-1-cave1/monsters.txt
-npc: npc/new_2-1-cave1/passages.txt
-
-// new_3-1 Tulimshar
-npc: npc/new_3-1-tulimshar/banker.txt
-npc: npc/new_3-1-tulimshar/barber.txt
-npc: npc/new_3-1-tulimshar/bard.txt
-npc: npc/new_3-1-tulimshar/bleacher.txt
-npc: npc/new_3-1-tulimshar/children.txt
-npc: npc/new_3-1-tulimshar/constable.txt
-npc: npc/new_3-1-tulimshar/elanore.txt
-npc: npc/new_3-1-tulimshar/guards.txt
-npc: npc/new_3-1-tulimshar/guide.txt
-npc: npc/new_3-1-tulimshar/man.txt
-npc: npc/new_3-1-tulimshar/merchant.txt
-npc: npc/new_3-1-tulimshar/monster_guide.txt
-npc: npc/new_3-1-tulimshar/monsters.txt
-npc: npc/new_3-1-tulimshar/passages.txt
-npc: npc/new_3-1-tulimshar/rewards_master.txt
-npc: npc/new_3-1-tulimshar/rules.txt
-npc: npc/new_3-1-tulimshar/sandra.txt
-npc: npc/new_3-1-tulimshar/vincent.txt
-npc: npc/new_3-1-tulimshar/soul-menhir.txt
-npc: npc/new_3-1-tulimshar/workers.txt
-
-// new_4-1 Small bat cave
-npc: npc/new_4-1-cave-small/hermit.txt
-npc: npc/new_4-1-cave-small/monsters.txt
-npc: npc/new_4-1-cave-small/passages.txt
-
-// new_5-1 Cave level 2 (Underground Palace)
-npc: npc/new_5-1-cave2/chest.txt
-npc: npc/new_5-1-cave2/monsters.txt
-npc: npc/new_5-1-cave2/passages.txt
-
-// new_6-1 Arena
-npc: npc/new_6-1-arena/guards.txt
-npc: npc/new_6-1-arena/monsters.txt
-npc: npc/new_6-1-arena/pvpflag.txt
-
-// new_7-1 Eastern desert
-npc: npc/new_7-1-eastern-desert/monsters.txt
-npc: npc/new_7-1-eastern-desert/passages.txt
-npc: npc/new_7-1-eastern-desert/npcs.txt
-
-// new_8-1 Tulimshar indoor
-npc: npc/new_8-1-tulimshar/casino.txt
-npc: npc/new_8-1-tulimshar/omar.txt
-npc: npc/new_8-1-tulimshar/passages.txt
-npc: npc/new_8-1-tulimshar/phaet.txt
-npc: npc/new_8-1-tulimshar/shops.txt
-npc: npc/new_8-1-tulimshar/troupe_leader.txt
-
-// new_9-1 Woodland
-npc: npc/new_9-1-woodland/alchemist.txt
-npc: npc/new_9-1-woodland/monsters.txt
-npc: npc/new_9-1-woodland/passages.txt
-npc: npc/new_9-1-woodland/oscar.txt
-
-// new_10-1 Xmas snow map
-npc: npc/new_10-1-xmas/monsters.txt
-npc: npc/new_10-1-xmas/passages.txt
-// npc: npc/new_10-1-xmas/santa.txt
-npc: npc/new_10-1-xmas/snowman.txt
-npc: npc/new_10-1-xmas/taro.txt
-
-// new_11-1 Snow village
-// npc: npc/new_11-1-snow-village/monsters.txt
-npc: npc/new_11-1-snow-village/sexchanger.txt
-npc: npc/new_11-1-snow-village/startrek.txt
-npc: npc/new_11-1-snow-village/passages.txt
-npc: npc/new_11-1-snow-village/soul-menhir.txt
-npc: npc/new_11-1-snow-village/amrak.txt
-
-// new_12-1 Ice cave
-npc: npc/new_12-1-ice-cave/monsters.txt
-npc: npc/new_12-1-ice-cave/passages.txt
-
-// new_13-1 Snow village shops.
-npc: npc/new_13-1-snow-village-shops/shops.txt
-npc: npc/new_13-1-snow-village-shops/passages.txt
-npc: npc/new_13-1-snow-village-shops/furquest.txt
-
-// new_14-1 South-woodland
-npc: npc/new_14-1-south-woodland/monsters.txt
-npc: npc/new_14-1-south-woodland/passages.txt
-
-// new_15-1 Woodland-desert link
-npc: npc/new_15-1-woodland-desert/monsters.txt
-npc: npc/new_15-1-woodland-desert/passages.txt
-
-// new_16-1 South-west woodland
-npc: npc/new_16-1-south-east-woodland/monsters.txt
-npc: npc/new_16-1-south-east-woodland/passages.txt
-
-// new_17-1 Big cave
-npc: npc/new_17-1-cave-big/monsters.txt
-npc: npc/new_17-1-cave-big/passages.txt
-
-// new_18-1 Woodland village surroundings
-npc: npc/new_18-1-woodland-village/monsters.txt
-npc: npc/new_18-1-woodland-village/passages.txt
-npc: npc/new_18-1-woodland-village/george.txt
-npc: npc/new_18-1-woodland-village/hinnak.txt
-
-// new_19-1 Woodland village
-npc: npc/new_19-1-woodland-village/jack.txt
-npc: npc/new_19-1-woodland-village/milly.txt
-npc: npc/new_19-1-woodland-village/old_man.txt
-npc: npc/new_19-1-woodland-village/old_woman.txt
-npc: npc/new_19-1-woodland-village/passages.txt
-npc: npc/new_19-1-woodland-village/sabine.txt
-npc: npc/new_19-1-woodland-village/soul-menhir.txt
-
-// new_20-1 Woodland village indoor
-npc: npc/new_20-1-woodland-village/alan.txt
-npc: npc/new_20-1-woodland-village/doctor.txt
-npc: npc/new_20-1-woodland-village/drunks.txt
-npc: npc/new_20-1-woodland-village/inspector.txt
-npc: npc/new_20-1-woodland-village/kfahr.txt
-npc: npc/new_20-1-woodland-village/misc.txt
-npc: npc/new_20-1-woodland-village/nicholas.txt
-npc: npc/new_20-1-woodland-village/nurse.txt
-npc: npc/new_20-1-woodland-village/passages.txt
-npc: npc/new_20-1-woodland-village/richard.txt
-npc: npc/new_20-1-woodland-village/selim.txt
-npc: npc/new_20-1-woodland-village/shops.txt
-npc: npc/new_20-1-woodland-village/waitress.txt
-
-// new_21-1 Ice cave 2
-npc: npc/new_21-1-ice-cave2/monsters.txt
-npc: npc/new_21-1-ice-cave2/passages.txt
-
-// new_22-1 Snake cave
-npc: npc/new_22-1-snake-cave/monsters.txt
-npc: npc/new_22-1-snake-cave/passages.txt
-
-// new_23-1 Dimonds Cove
-npc: npc/new_23-1-dimonds-cove/passages.txt
-npc: npc/new_23-1-dimonds-cove/dimonds.txt
-npc: npc/new_23-1-dimonds-cove/doug.txt
-npc: npc/new_23-1-dimonds-cove/loratay.txt
-npc: npc/new_23-1-dimonds-cove/workers.txt
-
-// new_24-1 Eastern desert mountain passage
-npc: npc/new_24-1-eastern-desert-mountain-passage/mika.txt
-npc: npc/new_24-1-eastern-desert-mountain-passage/monsters.txt
-npc: npc/new_24-1-eastern-desert-mountain-passage/pachua.txt
-npc: npc/new_24-1-eastern-desert-mountain-passage/passages.txt
-
-// new_25-1 Eastern desert cave
-npc: npc/new_25-1-eastern-desert-cave/monsters.txt
-npc: npc/new_25-1-eastern-desert-cave/passages.txt
-
-// new_26-1 Forest Hill 1
-npc: npc/new_26-1-hill1/monsters.txt
-npc: npc/new_26-1-hill1/passages.txt
-npc: npc/new_26-1-hill1/shops.txt
-
-// new_27-1 Forest Hill 2 (Cave)
-npc: npc/new_27-1-hill2/monsters.txt
-npc: npc/new_27-1-hill2/passages.txt
-
-// new_28-1 Forest east of map 26
-npc: npc/new_28-1-hillwest/passages.txt
-npc: npc/new_28-1-hillwest/monsters.txt
-
-// new_29-1 Forest west of map 9
-npc: npc/new_29-1-west-woodland/passages.txt
-npc: npc/new_29-1-west-woodland/monsters.txt
-npc: npc/new_29-1-west-woodland/taro.txt
-npc: npc/new_29-1-west-woodland/wedding-officiator.txt
-
-// new_30-1 Caves for map 29
-npc: npc/new_30-1-west-woodland-cave/passages.txt
-npc: npc/new_30-1-west-woodland-cave/monsters.txt
-
-// new_31-1 Forest west of map 14
-npc: npc/new_31-1-southwest-woodland/passages.txt
-npc: npc/new_31-1-southwest-woodland/monsters.txt
-npc: npc/new_31-1-southwest-woodland/alice.txt
-
-// new_32-1 Forest south of map 14
-npc: npc/new_32-1-south-woodland-2/passages.txt
-npc: npc/new_32-1-south-woodland-2/monsters.txt
-
-// new_33-1 Forest north of map 28
-npc: npc/new_33-1-hill-northwest/passages.txt
-npc: npc/new_33-1-hill-northwest/monsters.txt
-
-// new_34-1 Beach west of Tulimshar
-npc: npc/new_34-1-north-beach/passages.txt
-npc: npc/new_34-1-north-beach/monsters.txt
-
-// new_35-1 Cave beneath Hurnscald
-npc: npc/new_35-1-woodland-village/passages.txt
-npc: npc/new_35-1-woodland-village/monsters.txt
-
-// new_36-1 Magic house in forest 28
-npc: npc/new_36-1-magic-house/passages.txt
-npc: npc/new_36-1-magic-house/wizard.txt
-npc: npc/new_36-1-magic-house/apprentice.txt
-npc: npc/new_36-1-magic-house/notes.txt
-
-// new_37-1 Mine north of Hurnscald
-npc: npc/new_37-1-woodland-mine/miners.txt
-npc: npc/new_37-1-woodland-mine/monsters.txt
-npc: npc/new_37-1-woodland-mine/passages.txt
-
-// new_38-1 Mines north of Hurnscald (indoor)
-npc: npc/new_38-1-woodland-mine/angus.txt
-npc: npc/new_38-1-woodland-mine/books.txt
-npc: npc/new_38-1-woodland-mine/caul.txt
-npc: npc/new_38-1-woodland-mine/miners.txt
-npc: npc/new_38-1-woodland-mine/monsters.txt
-npc: npc/new_38-1-woodland-mine/passages.txt
-npc: npc/new_38-1-woodland-mine/receptionist.txt
-
-// Christmas 2006
-// npc: npc/xmas/xmas1.txt
-// npc: npc/xmas/xmas2.txt
-// npc: npc/xmas/xmas3.txt
-// npc: npc/xmas/xmas4.txt
-// npc: npc/xmas/xmas5.txt
-// npc: npc/xmas/xmas6.txt
-// npc: npc/xmas/xmas7.txt
-// npc: npc/xmas/xmas8.txt
-// npc: npc/xmas/xmas9.txt
-// npc: npc/xmas/xmas10.txt
-// npc: npc/xmas/xmas11.txt
-// npc: npc/xmas/xmas12.txt
-// npc: npc/xmas/xmas13.txt
-// npc: npc/xmas/xmas14.txt
-// npc: npc/xmas/xmas15.txt
-// npc: npc/xmas/xmas16.txt
-// npc: npc/xmas/xmas17.txt
-// npc: npc/xmas/xmas18.txt
-// npc: npc/xmas/xmas19.txt
-// npc: npc/xmas/xmas20.txt
-
-// Halloween 2007
-// npc: npc/halloween/2007/monsters.txt
-// npc: npc/halloween/2007/summon.txt
-
-// Christmas 2007
-// npc: npc/xmas2007/pre-xmas.txt
-// npc: npc/xmas2007/after-xmas.txt
-
-// Easter 2008
-// npc: npc/easter2008/monsters.txt
-// npc: npc/easter2008/npc.txt
-
-// Halloween 2008
-// npc: npc/halloween/2008/monsters.txt
-// npc: npc/halloween/2008/prize_master.txt
+import: npc/scripts.conf
 
 // local settings for this server in this file
 import: conf/map_local.conf
diff --git a/conf/map_local.conf.example b/conf/map_local.conf.example
index 42e98bce..0f09bf59 100644
--- a/conf/map_local.conf.example
+++ b/conf/map_local.conf.example
@@ -13,14 +13,3 @@ char_port: 6122
 map_ip:81.161.192.4
 // Map Server Port
 map_port: 5122
-
-// Database autosave time, in seconds.
-autosave_time: 60
-
-// Message of the day file, when a character logs on, this message is displayed.
-motd_txt: conf/motd.txt
-
-// When @help or @h is typed when you are a gm, this is displayed for helping new gms understand gm commands.
-help_txt: conf/help.txt
-
-mapreg_txt: save/mapreg.txt